Merge pull request #162 from AElfProject/feature/multi-transaction

Feature/multi transaction
AElfProject · Oct 8, 2024 · 8f4814f · 8f4814f
2 parents 44d9f7a + 4b11962
commit 8f4814f
Show file tree

Hide file tree

Showing 9 changed files with 1,661 additions and 1,478 deletions.
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/packages/example/craco.config.js b/packages/example/craco.config.js
@@ -40,10 +40,10 @@ module.exports = {
     },
   },
   devServer: {
-    https: {
-      key: './ssl/server.key', 
-      cert: './ssl/server.cert', 
-    },
+    // https: {
+    //   key: './ssl/server.key', 
+    //   cert: './ssl/server.cert', 
+    // },
     proxy: {
       '/v1/api': {
         target: 'https://did-portkey-test.portkey.finance',

diff --git a/packages/example/package.json b/packages/example/package.json
@@ -14,7 +14,7 @@
     "@portkey-v1/types": "1.5.4-alpha.22",
     "@portkey-v1/utils": "1.5.4-alpha.22",
     "@portkey/contracts": "^2.7.1-alpha.0",
-    "@portkey/did-ui-react": "^2.7.1-alpha.0",
+    "@portkey/did-ui-react": "^2.11.0",
     "@portkey/request": "^2.7.1-alpha.0",
     "@portkey/services": "^2.7.1-alpha.0",
     "@portkey/types": "^2.7.1-alpha.0",

diff --git a/packages/example/src/components/CallContract.tsx b/packages/example/src/components/CallContract.tsx
@@ -1,4 +1,11 @@
-import { CallContractParams, WebLoginState, useCallContract, useCurrentChainSync, useWebLogin } from 'aelf-web-login';
+import {
+  CallContractParams,
+  IMultiTransactionParams,
+  WebLoginState,
+  useCallContract,
+  useCurrentChainSync,
+  useWebLogin,
+} from 'aelf-web-login';
 import { useState } from 'react';
 import configJson from '../assets/config.json';
 import configTdvwJson from '../assets/config.tdvw.json';
@@ -67,7 +74,7 @@ export default function CallContract() {
   const { wallet, callContract, version } = useWebLogin();
   const getAccountTDVW = useGetAccount('tDVW');
   const getCurrentChainIdSync = useCurrentChainSync('tDVW');
-  const { callViewMethod, callSendMethod } = useCallContract();
+  const { callViewMethod, callSendMethod, sendMultiTransaction } = useCallContract();
   const { callViewMethod: callViewMethodAELF, callSendMethod: callSendMethodAELF } = useCallContract({
     chainId: 'AELF',
     rpcUrl: 'https://aelf-test-node.aelf.io',
@@ -77,7 +84,53 @@ export default function CallContract() {
     rpcUrl: 'https://tdvw-test-node.aelf.io',
   });
 
+  interface IParmsItem {
+    caHash: string;
+    symbol: string;
+    amount: string;
+    to: string;
+  }
+
+  const paramsForMuti: IMultiTransactionParams<IParmsItem> = {
+    multiChainInfo: {
+      AELF: {
+        chainUrl: 'https://aelf-test-node.aelf.io/',
+        contractAddress: '238X6iw1j8YKcHvkDYVtYVbuYk2gJnK8UoNpVCtssynSpVC8hb',
+      },
+      tDVW: {
+        chainUrl: 'https://tdvw-test-node.aelf.io/',
+        contractAddress: '238X6iw1j8YKcHvkDYVtYVbuYk2gJnK8UoNpVCtssynSpVC8hb',
+      },
+    },
+    gatewayUrl: 'https://gateway-test.aelf.io',
+    chainId: 'tDVW',
+    params: {
+      AELF: {
+        method: 'ManagerTransfer',
+        params: {
+          caHash: wallet.portkeyInfo.caInfo.caHash,
+          symbol: 'ELF',
+          amount: '10000000',
+          to: 'GyQX6t18kpwaD9XHXe1ToKxfov8mSeTLE9q9NwUAeTE8tULZk',
+        },
+      },
+      tDVW: {
+        method: 'ManagerTransfer',
+        params: {
+          caHash: wallet.portkeyInfo.caInfo.caHash,
+          symbol: 'ELF',
+          amount: '15000000',
+          to: 'GyQX6t18kpwaD9XHXe1ToKxfov8mSeTLE9q9NwUAeTE8tULZk',
+        },
+      },
+    },
+  };
+
   const examples = [
+    useExampleCall('test sendMultiTransaction', async () => {
+      return await sendMultiTransaction(paramsForMuti);
+    }),
+
     useExampleCall('call getBalance', async () => {
       return callContractWithLog(callViewMethod, {
         contractAddress: configJson.multiToken,

diff --git a/packages/login/package.json b/packages/login/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aelf-web-login",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "main": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
   "exports": {
@@ -49,11 +49,11 @@
   },
   "dependencies": {
     "@aelf-react/core": "^0.1.19",
-    "@portkey/detect-provider": "2.0.0-alpha.5",
-    "@portkey/provider-types": "2.0.0-alpha.5",
+    "@portkey/detect-provider": "^2.3.5-alpha.2",
+    "@portkey/provider-types": "^2.3.5-alpha.2",
     "@types/bn.js": "^5.1.3",
     "aelf-bridge": "^0.0.11-alpha.4",
-    "aelf-sdk": "^3.3.0",
+    "aelf-sdk": "^3.4.16-alpha.7",
     "ahooks": "^3.7.7",
     "antd": "^4.24.4",
     "bn.js": "^5.2.1",
@@ -70,7 +70,7 @@
     "@portkey-v1/types": "1.5.4-alpha.22",
     "@portkey-v1/utils": "1.5.4-alpha.22",
     "@portkey/contracts": "^2.7.1-alpha.0",
-    "@portkey/did-ui-react": "^2.7.1-alpha.0",
+    "@portkey/did-ui-react": "^2.11.0",
     "@portkey/request": "^2.7.1-alpha.0",
     "@portkey/services": "^2.7.1-alpha.0",
     "@portkey/types": "^2.7.1-alpha.0",
@@ -88,7 +88,7 @@
     "@portkey-v1/types": "1.5.4-alpha.22",
     "@portkey-v1/utils": "1.5.4-alpha.22",
     "@portkey/contracts": "^2.7.1-alpha.0",
-    "@portkey/did-ui-react": "^2.7.1-alpha.0",
+    "@portkey/did-ui-react": "^2.11.0",
     "@portkey/request": "^2.7.1-alpha.0",
     "@portkey/services": "^2.7.1-alpha.0",
     "@portkey/types": "^2.7.1-alpha.0",

diff --git a/packages/login/src/hooks/useCallContract.ts b/packages/login/src/hooks/useCallContract.ts
@@ -8,6 +8,8 @@ import {
   CallContractHookInterface,
   CallContractHookOptions,
   CallContractParams,
+  IMultiTransactionParams,
+  IMultiTransactionResult,
   IPortkeySendAdapterProps,
 } from '../types';
 import { getConfig } from '../config';
@@ -233,9 +235,16 @@ export default function useCallContract(options?: CallContractHookOptions): Call
     ],
   );
 
+  const sendMultiTransaction = useCallback(async function sendMultiTransactionFunc<T>(
+    params: IMultiTransactionParams<T>,
+  ): Promise<IMultiTransactionResult> {
+    return did.sendMultiTransaction(params);
+  }, []);
+
   return {
     contractHookId: `${loginId}_${chainId}_${walletType}}`,
     callViewMethod,
     callSendMethod,
+    sendMultiTransaction,
   };
 }
diff --git a/packages/login/src/types.ts b/packages/login/src/types.ts
@@ -75,6 +75,31 @@ export interface CallContractParams<T> {
   };
 }
 
+type MultiChainInfo = Partial<{
+  [x in ChainId]: {
+    chainUrl: string;
+    contractAddress: string;
+  };
+}>;
+
+type MultiParams<T> = Partial<{
+  [x in ChainId]: {
+    method: string;
+    params: T;
+  };
+}>;
+
+export interface IMultiTransactionParams<T> {
+  multiChainInfo: MultiChainInfo;
+  gatewayUrl: string;
+  chainId: ChainId;
+  params: MultiParams<T>;
+}
+
+export interface IMultiTransactionResult {
+  string: string[];
+}
+
 export type CallContractFunc<T, R> = (params: CallContractParams<T>) => Promise<R>;
 
 /**
@@ -171,6 +196,7 @@ export type CallContractHookOptions = {
 
 export type CallContractHookInterface = {
   contractHookId: string;
+  sendMultiTransaction<T>(params: IMultiTransactionParams<T>): Promise<IMultiTransactionResult>;
   callViewMethod<T, R>(params: CallContractParams<T>): Promise<R>;
   callSendMethod<T, R>(params: CallContractParams<T>, sendOptions: SendOptions | SendOptionsV1 | undefined): Promise<R>;
 };

diff --git a/packages/login/src/wallets/portkey/usePortkey/index.ts b/packages/login/src/wallets/portkey/usePortkey/index.ts
@@ -227,6 +227,8 @@ export function usePortkey({
       setPreparing(true);
       setLoading(true);
       try {
+        setApproveModalInTG(false);
+        setModalOpen(false);
         localStorage.setItem(PORTKEY_ORIGIN_CHAIN_ID_KEY, didWalletInfo.chainId);
         try {
           if (didWalletInfo.chainId !== chainId) {
@@ -273,7 +275,6 @@ export function usePortkey({
         // debugger;
         setLoading(false);
         setPreparing(false);
-        setApproveModalInTG(false);
       }
     },
     [appName, chainId, eventEmitter, setLoading, setLoginError, setLoginState, setApproveModalInTG, setWalletType],