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

feat: add slot and logic for forgetting pin code
AElfProject · Oct 24, 2024 · 0cebaec · 0cebaec
2 parents 59b99f5 + 2ed50f8
commit 0cebaec
Show file tree

Hide file tree

Showing 16 changed files with 231 additions and 190 deletions.
diff --git a/README.md b/README.md
@@ -27,20 +27,21 @@
 # Install
 
 ```sh
-yarn add @aelf-web-login/wallet-adapter-night-elf @aelf-web-login/wallet-adapter-portkey-aa @aelf-web-login/wallet-adapter-portkey-discover @aelf-web-login/wallet-adapter-react @aelf-web-login/wallet-adapter-base @aelf-web-login/wallet-adapter-bridge @aelf-web-login/utils
+yarn add @aelf-web-login/wallet-adapter-night-elf @aelf-web-login/wallet-adapter-portkey-aa @aelf-web-login/wallet-adapter-portkey-discover @aelf-web-login/wallet-adapter-react @aelf-web-login/wallet-adapter-base @aelf-web-login/wallet-adapter-bridge @aelf-web-login/utils @portkey/did-ui-react
 ```
 
 Then the `package.json` will be like this
 
 ```json
 "dependencies": {
-    "@aelf-web-login/wallet-adapter-night-elf": "^0.1.0",
-    "@aelf-web-login/wallet-adapter-portkey-aa": "^0.1.0",
-    "@aelf-web-login/wallet-adapter-portkey-discover": "^0.1.0",
-    "@aelf-web-login/wallet-adapter-react": "^0.1.0",
-    "@aelf-web-login/wallet-adapter-base": "^0.1.0",
-    "@aelf-web-login/wallet-adapter-bridge": "^0.1.0",
-    "@aelf-web-login/utils": "^0.1.0",
+    "@aelf-web-login/wallet-adapter-night-elf": "^0.1.7",
+    "@aelf-web-login/wallet-adapter-portkey-aa": "^0.1.7",
+    "@aelf-web-login/wallet-adapter-portkey-discover": "^0.1.7",
+    "@aelf-web-login/wallet-adapter-react": "^0.1.7",
+    "@aelf-web-login/wallet-adapter-base": "^0.1.7",
+    "@aelf-web-login/wallet-adapter-bridge": "^0.1.7",
+    "@aelf-web-login/utils": "^0.1.7",
+    "@portkey/did-ui-react": "^2.13.2",
 }
 ```
 
@@ -67,7 +68,7 @@ const RPC_SERVER_AELF = 'https://aelf-test-node.aelf.io';
 const RPC_SERVER_TDVV = 'https://tdvv-public-node.aelf.io';
 const RPC_SERVER_TDVW = 'https://tdvw-test-node.aelf.io';
 const GRAPHQL_SERVER =
-  'https://dapp-aa-portkey-test.portkey.finance/Portkey_DID/PortKeyIndexerCASchema/graphql';
+  'https://dapp-aa-portkey-test.portkey.finance/aefinder-v2/api/app/graphql/portkey';
 const CONNECT_SERVER = 'https://auth-aa-portkey-test.portkey.finance';
 const SERVICE_SERVER = 'https://aa-portkey-test.portkey.finance';
 const TELEGRAM_BOT_ID = 'xx';
@@ -103,7 +104,7 @@ const baseConfig = {
   // },
   // omitTelegramScript: false,
   // cancelAutoLoginInTelegram: false,
-  enableAcceleration: true,
+  enableAcceleration: false,
   networkType: NETWORK_TYPE,
   showVconsole: false,
   chainId: CHAIN_ID,

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.17",
+  "version": "0.1.18",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -33,8 +33,8 @@
     "@babel/core": "^7.24.7",
     "@babel/preset-env": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
-    "@portkey/did-ui-react": "^2.11.0",
-    "@portkey/types": "^2.11.0",
+    "@portkey/did-ui-react": "^2.13.2",
+    "@portkey/types": "^2.13.2",
     "@types/jest": "^29.5.12",
     "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
@@ -44,7 +44,7 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@portkey/did-ui-react": "^2.11.0"
+    "@portkey/did-ui-react": "^2.13.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

diff --git a/packages/base/src/adapter.ts b/packages/base/src/adapter.ts
@@ -32,7 +32,7 @@ export interface IWalletAdapter<Name extends string = string> {
   noNeedForConfirm?: boolean;
 
   login(arg?: DIDWalletInfo): Promise<TWalletInfo>;
-  logout(): Promise<void>;
+  logout(isForgetPin?: boolean): Promise<void>;
   loginEagerly(type?: string): Promise<void>;
   // getAccounts(chainId: TChainId): Promise<string>;
   // callContract<T, R>(params: ICallContractParams<T>): Promise<R>;
@@ -67,7 +67,7 @@ export abstract class BaseWalletAdapter<Name extends string = string>
   abstract wallet: TWalletInfo;
 
   abstract login(arg?: DIDWalletInfo): Promise<TWalletInfo>;
-  abstract logout(): Promise<void>;
+  abstract logout(isForgetPin?: boolean): Promise<void>;
   abstract loginEagerly(type?: string): Promise<void>;
   // abstract getAccounts(chainId: TChainId): Promise<string>;
   // abstract callContract<T, R>(params: ICallContractParams<T>): Promise<R>;

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.17",
+  "version": "0.1.18",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -29,21 +29,21 @@
   },
   "dependencies": {
     "@aelf-web-login/wallet-adapter-base": "workspace:*",
-    "@portkey/services": "^2.11.0",
+    "@portkey/services": "^2.13.2",
     "@reduxjs/toolkit": "^2.2.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@portkey/did-ui-react": "^2.11.0",
+    "@portkey/did-ui-react": "^2.13.2",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "antd": "4.24.14",
     "father": "^4.3.8",
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@portkey/did-ui-react": "^2.11.0"
+    "@portkey/did-ui-react": "^2.13.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

diff --git a/packages/bridge/src/bridge.ts b/packages/bridge/src/bridge.ts
@@ -99,19 +99,19 @@ class Bridge {
     });
   };
 
-  doubleCheckDisconnect = async () => {
+  doubleCheckDisconnect = async (isForgetPin?: boolean) => {
     if (isDisconnectClicked) {
       return;
     }
     isDisconnectClicked = true;
-    await this.activeWallet?.logout();
+    await this.activeWallet?.logout(isForgetPin);
     this.closeConfirmLogoutPanel();
     this.closeLockPanel();
     isDisconnectClicked = false;
     this._logoutResolve(true);
   };
 
-  disConnect = async (): Promise<boolean> => {
+  disConnect = async (isForgetPin?: boolean): Promise<boolean> => {
     return new Promise((resolve, reject) => {
       this._logoutResolve = resolve;
       this._logoutReject = reject;
@@ -121,7 +121,7 @@ class Bridge {
         try {
           if (this.isAAWallet) {
             if (this.activeWallet!.noNeedForConfirm) {
-              await this.doubleCheckDisconnect();
+              await this.doubleCheckDisconnect(isForgetPin);
             } else {
               this.openConfirmLogoutPanel();
             }
@@ -228,6 +228,7 @@ class Bridge {
     dispatch(clearWalletInfo());
     dispatch(clearWalletType());
     dispatch(clearLoginError());
+    dispatch(setLocking(false));
   };
 
   onLockHandler = () => {

diff --git a/packages/bridge/src/ui.css b/packages/bridge/src/ui.css
@@ -152,3 +152,17 @@
   justify-content: space-between;
   align-items: center;
 }
+.unlock-footer-text{
+  color: #55585E;
+  font-size: 14px;
+  font-weight: 400;
+  text-align: center;
+  line-height: 20px;
+  margin-left: 14px;
+  margin-right: 14px;
+  .unlock-footer-text-href{
+    color: #5D42FF;
+    padding: 0 4px;
+    cursor: pointer;
+  }
+}
diff --git a/packages/bridge/src/ui.tsx b/packages/bridge/src/ui.tsx
@@ -270,7 +270,7 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
         await bridgeInstance.doubleCheckDisconnect();
         TelegramPlatform.close();
       };
-      TelegramPlatform.initializeTelegramWebApp({ handleLogout });
+      TelegramPlatform.initializeTelegramWebApp({ tgUserChanged: handleLogout });
     };
 
     console.log('begin to init and execute handleTelegram', TelegramPlatform.isTelegramPlatform());
@@ -464,6 +464,26 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
     isShowNestedModal,
   ]);
 
+  const onForgetPinHandler = useCallback(async () => {
+    // await bridgeInstance.onPortkeyAAUnLock(defaultPin);
+    await bridgeInstance.disConnect(true);
+    if (TelegramPlatform.isTelegramPlatform()) {
+      TelegramPlatform.close();
+    }
+  }, [bridgeInstance]);
+
+  const forgetPinElement = useMemo(() => {
+    return (
+      <div className="unlock-footer-text">
+        Forgot your PIN? Click
+        <span className="unlock-footer-text-href" onClick={onForgetPinHandler}>
+          here
+        </span>
+        to log back in.
+      </div>
+    );
+  }, [onForgetPinHandler]);
+
   return (
     // <PortkeyProvider networkType={baseConfig.networkType} theme="dark">
     <div>
@@ -477,6 +497,7 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
           onChange={setPassword}
           onCancel={onCloseWrapperInternal}
           onUnlock={onUnlockInternal}
+          footer={forgetPinElement}
         />
       ) : (
         <DynamicWrapper

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.17",
+  "version": "0.1.18",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/starter/package.json b/packages/starter/package.json
@@ -54,11 +54,11 @@
     "@aelf-web-login/wallet-adapter-portkey-aa": "workspace:*",
     "@aelf-web-login/wallet-adapter-portkey-discover": "workspace:*",
     "@aelf-web-login/wallet-adapter-react": "workspace:*",
+    "@portkey/did-ui-react": "^2.13.2",
+    "aelf-sdk": "^3.4.16-alpha.7",
     "flatted": "^3.3.1",
     "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "@portkey/did-ui-react": "^2.11.0",
-    "aelf-sdk": "^3.4.16-alpha.7"
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
     "@types/react": "^18.3.1",

diff --git a/packages/starter/src/Demo/demo.tsx b/packages/starter/src/Demo/demo.tsx
@@ -21,7 +21,7 @@ const RPC_SERVER_AELF = 'https://explorer-test.aelf.io/chain';
 const RPC_SERVER_TDVV = 'https://explorer-test-side02.aelf.io/chain';
 const RPC_SERVER_TDVW = 'https://explorer-test-side02.aelf.io/chain';
 const GRAPHQL_SERVER =
-  'https://dapp-aa-portkey-test.portkey.finance/Portkey_DID/PortKeyIndexerCASchema/graphql';
+  'https://dapp-aa-portkey-test.portkey.finance/aefinder-v2/api/app/graphql/portkey';
 const CONNECT_SERVER = 'https://auth-aa-portkey-test.portkey.finance';
 const SERVICE_SERVER = 'https://aa-portkey-test.portkey.finance';
 const TELEGRAM_BOT_ID = '7329439364';
@@ -60,7 +60,7 @@ const baseConfig = {
   // ConfirmLogoutDialog: CustomizedConfirmLogoutDialog,
   // SignInComponent: SignInProxy,
   defaultPin: '111111',
-  enableAcceleration: true,
+  enableAcceleration: false,
   PortkeyProviderProps: {
     theme: 'light' as any,
   },
@@ -82,7 +82,7 @@ const wallets = [
     appName: APP_NAME,
     chainId: CHAIN_ID,
     autoShowUnlock: true,
-    noNeedForConfirm: false,
+    noNeedForConfirm: true,
   }),
   new PortkeyDiscoverWallet({
     networkType: NETWORK_TYPE,

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/utils",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "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.17",
+  "version": "0.1.18",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -26,13 +26,13 @@
   },
   "dependencies": {
     "@aelf-web-login/wallet-adapter-base": "workspace:*",
-    "@portkey/contracts": "^2.11.0",
+    "@portkey/contracts": "^2.13.2",
     "aelf-bridge": "^0.0.11-alpha.4",
     "bn.js": "^5.2.1"
   },
   "devDependencies": {
     "@aelf-react/types": "^0.1.10",
-    "@portkey/types": "^2.11.0",
+    "@portkey/types": "^2.13.2",
     "@types/bn.js": "^5.1.5",
     "father": "^4.3.8",
     "typescript": "^5.3.3"

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.17",
+  "version": "0.1.18",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -26,17 +26,17 @@
   },
   "dependencies": {
     "@aelf-web-login/wallet-adapter-base": "workspace:*",
-    "@portkey/contracts": "^2.11.0",
-    "@portkey/utils": "^2.11.0"
+    "@portkey/contracts": "^2.13.2",
+    "@portkey/utils": "^2.13.2"
   },
   "devDependencies": {
-    "@portkey/did-ui-react": "^2.11.0",
-    "@portkey/types": "^2.11.0",
+    "@portkey/did-ui-react": "^2.13.2",
+    "@portkey/types": "^2.13.2",
     "father": "^4.3.8",
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@portkey/did-ui-react": "^2.11.0"
+    "@portkey/did-ui-react": "^2.13.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

diff --git a/packages/wallets/portkey-aa/src/index.ts b/packages/wallets/portkey-aa/src/index.ts
@@ -193,18 +193,21 @@ export class PortkeyAAWallet extends BaseWalletAdapter {
     this.emit('disconnected', true);
   }
 
-  async logout() {
+  async logout(isForgetPin = false) {
     try {
       const originChainId = enhancedLocalStorage.getItem(PORTKEY_ORIGIN_CHAIN_ID_KEY);
       if (!originChainId) {
         return;
       }
-      await did.logout(
-        {
-          chainId: originChainId as TChainId,
-        },
-        { onMethod: 'transactionHash' },
-      );
+      console.log('isForgetPin', isForgetPin);
+      if (!isForgetPin) {
+        await did.logout(
+          {
+            chainId: originChainId as TChainId,
+          },
+          { onMethod: 'transactionHash' },
+        );
+      }
 
       this._wallet = null;
       this._loginState = LoginStateEnum.INITIAL;

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.17",
+  "version": "0.1.18",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -26,14 +26,14 @@
   },
   "dependencies": {
     "@aelf-web-login/wallet-adapter-base": "workspace:*",
-    "@portkey/contracts": "^2.11.0",
+    "@portkey/contracts": "^2.13.2",
     "@portkey/detect-provider": "^2.3.5-alpha.2",
     "@portkey/provider-types": "^2.3.5-alpha.2",
-    "@portkey/utils": "^2.11.0",
+    "@portkey/utils": "^2.13.2",
     "bn.js": "^5.2.1"
   },
   "devDependencies": {
-    "@portkey/types": "^2.11.0",
+    "@portkey/types": "^2.13.2",
     "@types/bn.js": "^5.1.5",
     "father": "^4.3.8",
     "typescript": "^5.3.3"