Merge branch 'develop' into feat/custom-testnet-1

_raw/locales/en/messages.json

@@ -2323,7 +2323,7 @@
         "title": "Welcome to Rabby Wallet",
         "desc": "The game-changing wallet for Ethereum and all EVM chains",
         "createNewAddress": "Create a new address",
-        "importAddress": "I already have a address"
+        "importAddress": "I already have an address"
       },
       "createNewAddress": {
         "title": "Create New Seed Phrase",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rabby",
-  "version": "0.93.1",
+  "version": "0.93.2",
   "description": "A browser plugin for DeFi users",
   "scripts": {
     "clean": "mkdir -p dist && rm -rf dist/*",
@@ -56,7 +56,7 @@
     "@rabby-wallet/eth-lattice-keyring": "1.2.1",
     "@rabby-wallet/eth-simple-keyring": "5.0.1",
     "@rabby-wallet/eth-trezor-keyring": "2.6.1",
-    "@rabby-wallet/eth-walletconnect-keyring": "2.1.3",
+    "@rabby-wallet/eth-walletconnect-keyring": "2.1.5",
     "@rabby-wallet/eth-watch-keyring": "1.0.0",
     "@rabby-wallet/gnosis-sdk": "1.3.9",
     "@rabby-wallet/page-provider": "0.4.2",

src/background/controller/provider/controller.ts

@@ -44,6 +44,7 @@ import {
   KEYRING_CATEGORY_MAP,
   EVENTS,
   INTERNAL_REQUEST_SESSION,
+  INTERNAL_REQUEST_ORIGIN,
 } from 'consts';
 import buildinProvider from 'background/utils/buildinProvider';
 import BaseController from '../base';
@@ -165,9 +166,11 @@ class ProviderController extends BaseController {
   ethRpc = (req, forceChainServerId?: string) => {
     const {
       data: { method, params },
-      session: { origin },
+      session: { origin: _origin },
     } = req;
 
+    let origin = _origin;
+
     if (
       !permissionService.hasPermission(origin) &&
       !SAFE_RPC_METHODS.includes(method)
@@ -176,6 +179,14 @@ class ProviderController extends BaseController {
     }
 
     const site = permissionService.getSite(origin);
+
+    if (method === 'net_version') {
+      if (!site?.isConnected) {
+        return Promise.resolve('1');
+      }
+      origin = INTERNAL_REQUEST_ORIGIN;
+    }
+
     let chainServerId = CHAINS[CHAINS_ENUM.ETH].serverId;
     if (site) {
       chainServerId =

src/background/controller/wallet.ts

@@ -25,6 +25,7 @@ import {
   HDKeyRingLastAddAddrTimeService,
   bridgeService,
   gasAccountService,
+  uninstalledService,
 } from 'background/service';
 import buildinProvider, {
   EthereumProvider,
@@ -1493,6 +1494,8 @@ export class WalletController extends BaseController {
     } else {
       setPopupIcon(isDefaultWallet ? 'rabby' : 'metamask');
     }
+
+    uninstalledService.syncStatus();
   };
   isUnlocked = () => keyringService.isUnlocked();
 
@@ -4908,6 +4911,8 @@ export class WalletController extends BaseController {
     await userGuideService.activeUserGuide();
     return true;
   };
+
+  uninstalledSyncStatus = uninstalledService.syncStatus;
 }
 
 const wallet = new WalletController();

src/background/index.ts

@@ -34,6 +34,7 @@ import {
   HDKeyRingLastAddAddrTimeService,
   bridgeService,
   gasAccountService,
+  uninstalledService,
 } from './service';
 import { providerController, walletController } from './controller';
 import { getOriginFromUrl } from '@/utils';
@@ -105,6 +106,7 @@ async function restoreAppState() {
   await HDKeyRingLastAddAddrTimeService.init();
   await bridgeService.init();
   await gasAccountService.init();
+  await uninstalledService.init();
 
   await walletController.tryUnlock();
 
@@ -145,6 +147,8 @@ async function restoreAppState() {
       });
     }
   });
+
+  uninstalledService.setUninstalled();
 }
 
 restoreAppState();

src/background/service/index.ts

@@ -21,3 +21,4 @@ export { default as RabbyPointsService } from './rabbyPoints';
 export { default as HDKeyRingLastAddAddrTimeService } from './HDKeyRingLastAddAddrTime';
 export { default as bridgeService } from './bridge';
 export { default as gasAccountService } from './gasAccount';
+export { default as uninstalledService } from './uninstalled';

src/background/service/keyring/index.ts

@@ -45,6 +45,7 @@ import {
   passwordDecrypt,
   passwordClearKey,
 } from 'background/utils/password';
+import uninstalledMetricService from '../uninstalled';
 
 export const KEYRING_SDK_TYPES = {
   SimpleKeyring,
@@ -175,6 +176,9 @@ export class KeyringService extends EventEmitter {
             name: alias,
           });
         }
+        uninstalledMetricService.setWalletByKeyringType(
+          KEYRING_TYPE.SimpleKeyring
+        );
         return this.persistAllKeyrings.bind(this);
       })
       .then(this.setUnlocked.bind(this))
@@ -483,6 +487,7 @@ export class KeyringService extends EventEmitter {
     return selectedKeyring
       .addAccounts(1)
       .then(() => {
+        uninstalledMetricService.setWalletByKeyringType(selectedKeyring.type);
         if (selectedKeyring.getAccountsWithBrand) {
           return selectedKeyring.getAccountsWithBrand();
         } else {

src/background/service/transactionHistory.ts

@@ -23,6 +23,7 @@ import {
   ActionRequireData,
   ParsedTransactionActionData,
 } from '@rabby-wallet/rabby-action';
+import { uninstalledService } from '.';
 
 export interface TransactionHistoryItem {
   rawTx: Tx;
@@ -91,6 +92,8 @@ class TxHistory {
   private _txHistoryLimit = 100;
 
   addSigningTx(tx: Tx) {
+    uninstalledService.setTx();
+
     const id = nanoid();
 
     this._signingTxList.push({

src/background/service/uninstalled.ts

@@ -0,0 +1,120 @@
+import { createPersistStore } from 'background/utils';
+import { keyringService, transactionHistoryService } from '.';
+import { KEYRING_CLASS } from '@/constant';
+import browser from 'webextension-polyfill';
+
+export type UninstalledStore = {
+  imported: boolean;
+  tx?: boolean;
+  wallet?: boolean;
+  local?: boolean;
+};
+
+class Uninstalled {
+  store: UninstalledStore = {
+    imported: false,
+    tx: false,
+    wallet: false,
+    local: false,
+  };
+
+  init = async () => {
+    const storage = await createPersistStore<UninstalledStore>({
+      name: 'UninstalledMetric',
+      template: {
+        imported: false,
+        tx: false,
+        wallet: false,
+        local: false,
+      },
+    });
+
+    this.store = storage || this.store;
+  };
+
+  syncStatus = async () => {
+    if (
+      !this.store.tx &&
+      transactionHistoryService.store.transactions &&
+      Object.keys(transactionHistoryService.store.transactions).length
+    ) {
+      this.setTx();
+      this.setImported();
+    }
+
+    if (this.store.wallet) {
+      return;
+    }
+
+    const typedAccounts = await keyringService.getAllTypedAccounts();
+    if (typedAccounts.length) {
+      typedAccounts.forEach((account) => {
+        this.setWalletByKeyringType(account.type);
+      });
+    }
+  };
+
+  setImported = () => {
+    this.store.imported = true;
+    this.setUninstalled();
+  };
+
+  setWallet = () => {
+    this.store.wallet = true;
+    this.setUninstalled();
+  };
+
+  setTx = () => {
+    this.store.tx = true;
+    this.setUninstalled();
+  };
+
+  setLocal = () => {
+    this.store.local = true;
+    this.setUninstalled();
+  };
+
+  setWalletByKeyringType = (keyringType: string) => {
+    if (this.store.imported && this.store.wallet && this.store.local) {
+      return;
+    }
+    this.setImported();
+    let isLocal = false;
+    let isHardware = false;
+    isLocal = ([
+      KEYRING_CLASS.PRIVATE_KEY,
+      KEYRING_CLASS.MNEMONIC,
+    ] as string[]).includes(keyringType);
+    isHardware = ([
+      ...Object.values(KEYRING_CLASS.HARDWARE),
+    ] as string[]).includes(keyringType);
+    if (isLocal) {
+      this.setLocal();
+    }
+    if (isLocal || isHardware) {
+      this.setWallet();
+    }
+  };
+
+  setUninstalled = () => {
+    let search = '';
+    if (this.store.imported) {
+      search = 'i';
+    }
+    if (this.store.wallet) {
+      search += 'w';
+    }
+
+    if (this.store.tx) {
+      search += 't';
+    }
+    if (this.store.local) {
+      search += 'l';
+    }
+    browser.runtime.setUninstallURL(
+      `https://rabby.io/uninstalled?r=${encodeURIComponent(search)}`
+    );
+  };
+}
+
+export default new Uninstalled();

src/manifest/mv2/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "0.93.1",
+  "version": "0.93.2",
   "default_locale": "en",
   "description": "__MSG_appDescription__",
   "icons": {

src/manifest/mv3/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "0.93.1",
+  "version": "0.93.2",
   "default_locale": "en",
   "description": "__MSG_appDescription__",
   "icons": {

src/ui/views/NewUserImport/Success.tsx

@@ -34,6 +34,8 @@ const AccountItem = ({ account }: { account: Account }) => {
 
   const [defaultName, setDefaultName] = useState(name || '');
 
+  const wallet = useWallet();
+
   const updateRef = useRef(null);
 
   const update = React.useCallback(() => {
@@ -42,7 +44,6 @@ const AccountItem = ({ account }: { account: Account }) => {
   }, [updateAlias, localName, defaultName]);
 
   useClickAway(updateRef, () => {
-    console.log('edit', edit);
     if (edit) {
       update();
     }
@@ -54,6 +55,10 @@ const AccountItem = ({ account }: { account: Account }) => {
     }
   }, [edit]);
 
+  useEffect(() => {
+    wallet.uninstalledSyncStatus();
+  }, []);
+
   if (!account) {
     return null;
   }

yarn.lock

@@ -4687,10 +4687,10 @@
     ethereumjs-util "^7.1.5"
     hdkey "0.8.0"
 
-"@rabby-wallet/[email protected].3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@rabby-wallet/eth-walletconnect-keyring/-/eth-walletconnect-keyring-2.1.3.tgz#8ea63178e2fa4c9369ba2ea1df6940d016d32c2a"
-  integrity sha512-Yvx1uCC/E8Zv53vx0ZjHpXL+udZLgLfnER37O04i6pN2aRFmh9SFPh9nnNn7+Nh/i/Q2gz4UziCu6AjIdq5I1w==
+"@rabby-wallet/[email protected].5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@rabby-wallet/eth-walletconnect-keyring/-/eth-walletconnect-keyring-2.1.5.tgz#f8a3e6c8c20bc0106583ac501c29fef19c4f2d3d"
+  integrity sha512-eYvr46YOnuzApgjssdyk7HzG3YXBFBit9eju9QIvE+WmZ0e1oov3/uqqQVNhCVu3WqpSBQ70bma/2tjiFPae9A==
   dependencies:
     "@ethereumjs/tx" "^3.5.2"
     "@rabby-wallet/wc-client" "^1.8.10"