Merge pull request #169 from AElfProject/feature/ecoEarn-support

Feature/eco earn support
AElfProject · Oct 21, 2024 · 59b99f5 · 59b99f5
2 parents b186594 + 7196729
commit 59b99f5
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -105,7 +105,6 @@ const baseConfig = {
   // cancelAutoLoginInTelegram: false,
   enableAcceleration: true,
   networkType: NETWORK_TYPE,
-  chainId: CHAIN_ID,
   showVconsole: false,
   chainId: CHAIN_ID,
   keyboard: true,

diff --git a/packages/base/package.json b/packages/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-base",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/base/src/types.ts b/packages/base/src/types.ts
@@ -20,7 +20,7 @@ export enum LoginStateEnum {
 export type TWalletInfo =
   | {
       name?: string;
-      address?: string;
+      address: string;
       extraInfo?: {
         [key: string]: any;
       };

diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-bridge",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/bridge/src/ui.tsx b/packages/bridge/src/ui.tsx
@@ -268,6 +268,7 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
         isToggleAccountRef.current = true;
         await bridgeInstance.onPortkeyAAUnLock(defaultPin);
         await bridgeInstance.doubleCheckDisconnect();
+        TelegramPlatform.close();
       };
       TelegramPlatform.initializeTelegramWebApp({ handleLogout });
     };

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-react",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/utils",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/night-elf/package.json b/packages/wallets/night-elf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-night-elf",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/night-elf/src/AelfBridgeCheck.ts b/packages/wallets/night-elf/src/AelfBridgeCheck.ts
@@ -13,17 +13,24 @@ export default class AelfBridgeCheck {
         const bridgeInstance = new AElfBridge({
           timeout: 3000,
         });
-        bridgeInstance.connect().then((isConnected: boolean) => {
-          if (timeout) return;
-          if (isConnected) {
-            resolve(true);
-          } else {
-            reject({
-              error: 200001,
-              message: 'timeout, please use AELF Wallet APP or open the page in PC',
-            });
-          }
-        });
+        console.log('bridgeInstance', bridgeInstance);
+        bridgeInstance
+          .connect()
+          .then((isConnected: boolean) => {
+            console.log('bridgeInstance isConnected', isConnected);
+            if (timeout) return;
+            if (isConnected) {
+              resolve(true);
+            } else {
+              reject({
+                error: 200001,
+                message: 'timeout, please use AELF Wallet APP or open the page in PC',
+              });
+            }
+          })
+          .catch((e: any) => {
+            console.log('error in catch:', e);
+          });
         setTimeout(() => {
           timeout = true;
           reject({
@@ -57,7 +64,7 @@ export default class AelfBridgeCheck {
     };
     aelfInstanceByBridge.logout = (_: any, callback: () => void) => {
       accountInfo = null;
-      callback();
+      callback?.();
     };
     return aelfInstanceByBridge;
   }

diff --git a/packages/wallets/night-elf/src/index.ts b/packages/wallets/night-elf/src/index.ts
@@ -151,7 +151,7 @@ export class NightElfWallet extends BaseWalletAdapter {
       }
 
       const result = await defaultAElfBridge.logout({ address });
-      if (result.error) throw result;
+      if (result?.error) throw result;
 
       this._wallet = null;
       this._loginState = LoginStateEnum.INITIAL;
@@ -277,7 +277,7 @@ export class NightElfWallet extends BaseWalletAdapter {
       contractAddress: contractAddress,
       aelfInstance: bridge,
       account: {
-        address: this._wallet.address!,
+        address: this._wallet.address,
       },
     });
   }

diff --git a/packages/wallets/night-elf/src/utils.ts b/packages/wallets/night-elf/src/utils.ts
@@ -8,21 +8,29 @@ export const getBridges = async (nodes: INightElfWalletAdapterConfig['nodes'], a
   const { isMobile } = utils;
   try {
     const isAElfBridge = isMobile() && !(window as any)?.NightElf;
+    console.log('aelf-wallet-debug----------1');
+    console.log(`isMobile(): ${isMobile()}`);
+    console.log(`(window as any)?.NightElf: ${(window as any)?.NightElf}`);
+
     const connector = (
       await (isAElfBridge ? import('./AelfBridgeCheck') : import('./NightElfCheck'))
     ).default;
+    console.log('connector', connector);
     // check connector
     await connector.getInstance().check();
+    console.log('aelf-wallet-debug----------2');
 
     let firstKey = '';
     const bridges: { [key: string]: AElfDappBridge } = {};
+    console.log('nodes:', nodes);
     if (!nodes || Object.keys(nodes).length === 0) {
       throw makeError(ERR_CODE.INIT_BRIDGE_ERROR);
     }
     Object.entries(nodes).forEach(([k, v]) => {
       if (!firstKey) firstKey = k;
       bridges[k] = connector.initAelfInstanceByExtension(v.rpcUrl, appName);
     });
+    console.log('aelf-wallet-debug----------3');
     const node = nodes[firstKey];
     const bridge = bridges[firstKey];
     return { bridge, node, bridges };

diff --git a/packages/wallets/portkey-aa/package.json b/packages/wallets/portkey-aa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-portkey-aa",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/portkey-aa/src/index.ts b/packages/wallets/portkey-aa/src/index.ts
@@ -60,6 +60,10 @@ export class PortkeyAAWallet extends BaseWalletAdapter {
     this.autoRequestAccountHandler();
   }
 
+  setChainId(chainId: TChainId) {
+    this._config.chainId = chainId;
+  }
+
   get loginState() {
     return this._loginState;
   }

diff --git a/packages/wallets/portkey-discover/package.json b/packages/wallets/portkey-discover/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-portkey-discover",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/portkey-discover/src/index.ts b/packages/wallets/portkey-discover/src/index.ts
@@ -404,7 +404,7 @@ export class PortkeyDiscoverWallet extends BaseWalletAdapter {
     }
     const finalChainId = chainId || this._chainId;
     const contract = await this.getContract(finalChainId, contractAddress);
-    const rs = contract.callSendMethod(methodName, this._wallet.address!, args, sendOptions);
+    const rs = contract.callSendMethod(methodName, this._wallet.address, args, sendOptions);
     return rs as R;
   }