Merge branch 'main' into feat/add-assethub

enkryptcom · Apr 2, 2024 · 81981f1 · 81981f1 · github-actions · Apr 2, 2024
2 parents c2bc3e2 + 5ff4758
commit 81981f1
Show file tree

Hide file tree

Showing 26 changed files with 57 additions and 40 deletions.
diff --git a/packages/extension/configs/rollup.config.base.mjs b/packages/extension/configs/rollup.config.base.mjs
@@ -18,6 +18,7 @@ const base = {
     replace({
       preventAssignment: true,
       __VERSION__: JSON.stringify(packageJson.version),
+      __IS_OPERA__: process.env.BROWSER === "opera-edge",
     }),
     typescript(),
     commonjs(),

diff --git a/packages/extension/configs/testNullCompiler.js b/packages/extension/configs/testNullCompiler.js
@@ -1,5 +1,6 @@
 const noop = () => 1;
 global.__VERSION__ = "test";
+global.__IS_OPERA__ = false;
 require.extensions[".css"] = noop;
 require.extensions[".scss"] = noop;
 require.extensions[".png"] = noop;

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "1.36.0",
+  "version": "1.37.1",
   "private": true,
   "scripts": {
     "zip": "cd dist; zip -r release.zip *;",
     "build:chrome": "cross-env BROWSER='chrome' vue-cli-service build && yarn build:rollup",
-    "build:operaedge": "cross-env BROWSER='opera-edge' vue-cli-service build && yarn build:rollup",
+    "build:operaedge": "cross-env BROWSER='opera-edge' vue-cli-service build && cross-env BROWSER='opera-edge' yarn build:rollup",
     "build:firefox": "cross-env BROWSER='firefox' vue-cli-service build && yarn build:rollup && node configs/get-system-info.js",
     "lint": "vue-cli-service lint --fix",
     "build:rollup": "cross-env minify=on rollup --config configs/rollup.config.contentscript.mjs && cross-env minify=on rollup --config configs/rollup.config.inject.mjs",

diff --git a/packages/extension/src/libs/metrics/amplitude.ts b/packages/extension/src/libs/metrics/amplitude.ts
@@ -1,4 +1,4 @@
-import { init, track, Types } from "@amplitude/analytics-browser";
+import { init, track, Types, setOptOut } from "@amplitude/analytics-browser";
 import { detectBrowser, detectOS } from "@action/utils/browser";
 import SettingsState from "../settings-state";
 
@@ -32,7 +32,7 @@ class Metrics {
         instanceName: process.env.IS_DEV
           ? "enkrypt-extension-dev"
           : "enkrypt-extension",
-        optOut: false,
+        optOut: !set.isMetricsEnabled,
         serverUrl: process.env.IS_DEV
           ? "https://analytics-enkrypt-dev.mewwallet.dev/record"
           : "https://analytics-enkrypt.mewwallet.dev/record",
@@ -63,6 +63,9 @@ class Metrics {
       }
     );
   }
+  setOptOut(val: boolean) {
+    setOptOut(val);
+  }
 }
 
 export default Metrics;
diff --git a/packages/extension/src/libs/metrics/index.ts b/packages/extension/src/libs/metrics/index.ts
@@ -7,6 +7,7 @@ import {
   NFTEventType,
   NetworkChangeEvents,
   SendEventType,
+  SettingEventType,
   SwapEventType,
 } from "./types";
 
@@ -68,11 +69,22 @@ const trackDAppsEvents = (
 ) => {
   metrics.track("dapps", { event, ...options });
 };
+
+const optOutofMetrics = (optOut: boolean) => {
+  metrics.setOptOut(false);
+  metrics.track("settings", {
+    event: SettingEventType.OptOut,
+    value: optOut ? 1 : 0,
+  });
+  metrics.setOptOut(optOut);
+};
+
 export {
   trackNetworkSelected,
   trackSwapEvents,
   trackBuyEvents,
   trackSendEvents,
   trackNFTEvents,
   trackDAppsEvents,
+  optOutofMetrics,
 };
diff --git a/packages/extension/src/libs/metrics/types.ts b/packages/extension/src/libs/metrics/types.ts
@@ -38,3 +38,7 @@ export enum NFTEventType {
 export enum DAppsEventType {
   DAppsOpen = "dapps_open",
 }
+
+export enum SettingEventType {
+  OptOut = "opt_out",
+}
diff --git a/packages/extension/src/libs/nft-handlers/simplehash.ts b/packages/extension/src/libs/nft-handlers/simplehash.ts
@@ -24,7 +24,6 @@ export default async (
     [NetworkNames.MaticZK]: "polygon-zkevm",
     [NetworkNames.ZkSync]: "zksync-era",
     [NetworkNames.ZkSyncGoerli]: "zksync-era-testnet",
-    [NetworkNames.Goerli]: "ethereum-goerli",
     [NetworkNames.Base]: "base",
   };
   if (!Object.keys(supportedNetworks).includes(network.name))

diff --git a/packages/extension/src/libs/settings-state/index.ts b/packages/extension/src/libs/settings-state/index.ts
@@ -49,6 +49,7 @@ class SettingsState {
     const settings: EnkryptSettingsType = {
       installedTimestamp: 0,
       randomUserID: "",
+      isMetricsEnabled: true,
     };
     return merge(settings, state);
   }

diff --git a/packages/extension/src/libs/settings-state/types.ts b/packages/extension/src/libs/settings-state/types.ts
@@ -20,6 +20,7 @@ export interface BtcSettingsType {
 export interface EnkryptSettingsType {
   installedTimestamp: number;
   randomUserID: string;
+  isMetricsEnabled: boolean;
 }
 export interface SettingsType {
   evm: EVMSettingsType;

diff --git a/packages/extension/src/providers/ethereum/inject.ts b/packages/extension/src/providers/ethereum/inject.ts
@@ -146,6 +146,9 @@ const injectDocument = (
   const provider = new Provider(options);
   const proxiedProvider = new Proxy(provider, ProxyHandler);
   document["enkrypt"]["providers"][options.name] = provider;
+  if (__IS_OPERA__) {
+    document[options.name] = proxiedProvider; // Opera expects you to inject immediatly and their wallet switcher will handle conflicts
+  }
   options
     .sendMessageHandler(
       ProviderName.enkrypt,

diff --git a/...es/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts b/...es/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts
@@ -2,7 +2,6 @@ import { NetworkNames } from "@enkryptcom/types";
 
 const NetworkEndpoints: Record<string, string> = {
   [NetworkNames.Ethereum]: "https://api.etherscan.io/",
-  [NetworkNames.Goerli]: "https://api-goerli.etherscan.io/",
   [NetworkNames.Binance]: "https://api.bscscan.com/",
   [NetworkNames.Matic]: "https://api.polygonscan.com/",
   [NetworkNames.Moonbeam]: "https://api-moonbeam.moonscan.io/",

diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/configs.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/configs.ts
@@ -3,7 +3,6 @@ import { NetworkNames } from "@enkryptcom/types";
 const NetworkEndpoints = {
   [NetworkNames.Ethereum]: "https://nodes.mewapi.io/rpc/eth",
   [NetworkNames.Sepolia]: "https://nodes.mewapi.io/rpc/sepolia",
-  [NetworkNames.Goerli]: "https://nodes.mewapi.io/rpc/goerli",
   [NetworkNames.EthereumClassic]: "https://nodes.mewapi.io/rpc/etc",
 };
 

diff --git a/packages/extension/src/providers/ethereum/networks/form-testnet.ts b/packages/extension/src/providers/ethereum/networks/form-testnet.ts
@@ -15,7 +15,7 @@ const formTestnetOptions: EvmNetworkOptions = {
   currencyName: "ETH",
   currencyNameLong: "Ethereum",
   node: "wss://testnet-rpc.form.network/ws",
-  icon: require("./icons/eth.svg"),
+  icon: require("./icons/form.png"),
   activityHandler: wrapActivityHandler(EtherscanActivity),
 };
 

diff --git a/packages/extension/src/providers/ethereum/networks/goerli.ts b/packages/extension/src/providers/ethereum/networks/goerli.ts
diff --git a/packages/extension/src/providers/ethereum/networks/icons/form.png b/packages/extension/src/providers/ethereum/networks/icons/form.png
diff --git a/packages/extension/src/providers/ethereum/networks/index.ts b/packages/extension/src/providers/ethereum/networks/index.ts
@@ -1,5 +1,4 @@
 import ethNode from "./eth";
-import goerliNode from "./goerli";
 import etcNode from "./etc";
 import maticNode from "./matic";
 import maticZkNode from "./maticzk";
@@ -35,7 +34,6 @@ import formTestnet from "./form-testnet";
 import artheraTestNode from "./aat";
 
 export default {
-  goerli: goerliNode,
   sepolia: sepoliaNode,
   ethereum: ethNode,
   etc: etcNode,

diff --git a/packages/extension/src/providers/ethereum/tests/ethereum.events.mocha.ts b/packages/extension/src/providers/ethereum/tests/ethereum.events.mocha.ts
@@ -22,6 +22,7 @@ const defaultSettings = {
   enkrypt: {
     installedTimestamp: 0,
     randomUserID: "",
+    isMetricsEnabled: true,
   },
   manifestVersion: 3,
 };

diff --git a/packages/extension/src/providers/ethereum/tests/ethereum.requests.mocha.ts b/packages/extension/src/providers/ethereum/tests/ethereum.requests.mocha.ts
@@ -23,6 +23,7 @@ const defaultSettings = {
   enkrypt: {
     installedTimestamp: 0,
     randomUserID: "",
+    isMetricsEnabled: true,
   },
   manifestVersion: 3,
 };

diff --git a/packages/extension/src/providers/polkadot/tests/polkadot.requests.mocha.ts b/packages/extension/src/providers/polkadot/tests/polkadot.requests.mocha.ts
@@ -64,6 +64,7 @@ const tempWindow: EnkryptWindow = {
       enkrypt: {
         installedTimestamp: 0,
         randomUserID: "",
+        isMetricsEnabled: true,
       },
       manifestVersion: 3,
     },

diff --git a/packages/extension/src/types/shims-vue.d.ts b/packages/extension/src/types/shims-vue.d.ts
@@ -1,3 +1,4 @@
 declare module "*.vue";
 declare module "vue3-lottie";
 declare const __VERSION__: string;
+declare const __IS_OPERA__: boolean;
diff --git a/packages/extension/src/ui/action/views/settings/views/settings-general/index.vue b/packages/extension/src/ui/action/views/settings/views/settings-general/index.vue
@@ -38,6 +38,18 @@
       <p>Enable Enkrypt act like Unisat wallet for dapps</p>
     </div>
 
+    <settings-switch
+      title="Disable Amplitude Events"
+      :is-checked="!isMetricsEnabled"
+      @update:check="toggleMetricsEnabled"
+    />
+    <div class="settings__label">
+      <p>
+        MEW uses Amplitude events to improve Enkrypt. No identifiable
+        information is collected.
+      </p>
+    </div>
+
     <!-- <base-select
       :select="selecTimer"
       title="Auto-lock timer"
@@ -58,16 +70,19 @@ import SettingsInnerHeader from "@action/views/settings/components/settings-inne
 import SettingsSwitch from "@action/views/settings/components/settings-switch.vue";
 import SettingsState from "@/libs/settings-state";
 import { SettingsType } from "@/libs/settings-state/types";
+import { optOutofMetrics } from "@/libs/metrics";
 
 const settingsState = new SettingsState();
 const isEthereumDisabled = ref(false);
 const isPolkadotjsDisabled = ref(false);
 const isUnisatEnabled = ref(true);
+const isMetricsEnabled = ref(true);
 onMounted(async () => {
   const allSettings: SettingsType = await settingsState.getAllSettings();
   isEthereumDisabled.value = allSettings.evm.inject.disabled;
   isPolkadotjsDisabled.value = !allSettings.substrate.injectPolkadotjs;
   isUnisatEnabled.value = allSettings.btc.injectUnisat;
+  isMetricsEnabled.value = allSettings.enkrypt.isMetricsEnabled;
 });
 const toggleEthereumDisable = async (isChecked: boolean) => {
   const evmSettings = await settingsState.getEVMSettings();
@@ -87,6 +102,12 @@ const toggleUnisatEnable = async (isChecked: boolean) => {
   btcSettings.injectUnisat = isChecked;
   await settingsState.setBtcSettings(btcSettings);
 };
+const toggleMetricsEnabled = async (isChecked: boolean) => {
+  const enkryptSettings = await settingsState.getEnkryptSettings();
+  enkryptSettings.isMetricsEnabled = !isChecked;
+  await settingsState.setEnkryptSettings(enkryptSettings);
+  optOutofMetrics(isChecked);
+};
 </script>
 
 <style lang="less">

diff --git a/packages/hw-wallets/src/configs.ts b/packages/hw-wallets/src/configs.ts
@@ -15,7 +15,6 @@ const ledgerAppNames = {
   [NetworkNames.Binance]: "Ethereum",
   [NetworkNames.Rootstock]: "RSK",
   [NetworkNames.EthereumClassic]: "Ethereum Classic",
-  [NetworkNames.Goerli]: "Ethereum",
   [NetworkNames.Acala]: "Acala",
   [NetworkNames.Kusama]: "Kusama",
   [NetworkNames.Polkadot]: "Polkadot",

diff --git a/packages/hw-wallets/src/ledger/ethereum/configs.ts b/packages/hw-wallets/src/ledger/ethereum/configs.ts
@@ -31,6 +31,5 @@ const supportedPaths = {
     bip44Paths.ethereumLedger,
     bip44Paths.ethereumLedgerLive,
   ],
-  [NetworkNames.Goerli]: [bip44Paths.ethereumTestnetLedger],
 };
 export { supportedPaths };
diff --git a/packages/hw-wallets/src/trezor/configs.ts b/packages/hw-wallets/src/trezor/configs.ts
@@ -7,7 +7,6 @@ const supportedPaths = {
   [NetworkNames.Avalanche]: [bip44Paths.ethereum],
   [NetworkNames.Binance]: [bip44Paths.ethereum],
   [NetworkNames.EthereumClassic]: [bip44Paths.ethereumClassic],
-  [NetworkNames.Goerli]: [bip44Paths.ethereumTestnet],
   [NetworkNames.Rootstock]: [bip44Paths.rootstock],
 };
 export { supportedPaths };
diff --git a/packages/swap/tests/rango.test.ts b/packages/swap/tests/rango.test.ts
@@ -71,7 +71,7 @@ describe("Rango Provider", () => {
     );
     expect(quote?.fromTokenAmount.toString()).to.be.eq(amount.toString());
     expect(quote?.toTokenAmount.gtn(0)).to.be.eq(true);
-    expect(quote?.additionalNativeFees.eqn(0)).to.be.eq(true);
+    expect(quote?.additionalNativeFees.eqn(0)).to.be.eq(false);
     const swap = await rango.getSwap(quote!.quote);
     expect(swap?.transactions.length).to.be.eq(1);
   }).timeout(25000);

diff --git a/packages/types/src/networks.ts b/packages/types/src/networks.ts
@@ -3,7 +3,6 @@ export enum NetworkNames {
   Okc = "OKT",
   Binance = "BNB",
   EthereumClassic = "ETC",
-  Goerli = "GOERLI",
   Sepolia = "SEPOLIA",
   Matic = "MATIC",
   MaticZK = "MATICZK",