Feat: support aptos signAndSubmitTransaction (#261)

* feat: support aptos signAndSubmitTransaction * chore: release version 2.1.20
OneKeyHQ · Dec 5, 2024 · 2f131db · 2f131db
1 parent 7428b11
commit 2f131db
Show file tree

Hide file tree

Showing 37 changed files with 278 additions and 162 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,9 +29,9 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-events": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-events": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
     "ms": "^2.1.3"

diff --git a/packages/core/src/versionInfo.ts b/packages/core/src/versionInfo.ts
@@ -1,5 +1,5 @@
 
-const version = '2.1.17';
+const version = '2.1.19';
 const versionBuild = '2020-0101-1';
 
 export default {

diff --git a/packages/desktop/desktop-bridge-injected/package.json b/packages/desktop/desktop-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/desktop-bridge-injected",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -34,7 +34,7 @@
     "electron": "^17.2.0"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20"
   }
 }
diff --git a/packages/empty/package.json b/packages/empty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-empty",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-errors",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-events",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/example/components/chains/aptosStandard/example.tsx b/packages/example/components/chains/aptosStandard/example.tsx
@@ -25,6 +25,10 @@ import {
   Ed25519PublicKey,
   Ed25519Signature,
   AccountAuthenticatorEd25519,
+  AccountAddress,
+  U64,
+  U256,
+  isEncodedEntryFunctionArgument,
 } from '@aptos-labs/ts-sdk';
 import {
   WalletReadyState,
@@ -314,6 +318,70 @@ function Example() {
         />
       </ApiGroup>
 
+      <ApiGroup title="SignAndSubmitTransaction Test">
+        <ApiPayload
+          title="signAndSubmitTransaction Normal Argument"
+          description="Normal Argument 测试"
+          presupposeParams={[
+            {
+              id: 'sender',
+              name: 'sender',
+              value: JSON.stringify({
+                recipient: account?.address ?? '',
+                amount: 100000,
+                coinType: '0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b',
+              }),
+            },
+          ]}
+          onExecute={async (request: string) => {
+            const { recipient, amount, coinType } = JSON.parse(request);
+            return {
+              result: await signAndSubmitTransaction({
+                sender: account?.address ?? '',
+                data: {
+                  function: '0x1::primary_fungible_store::transfer',
+                  typeArguments: ['0x1::fungible_asset::Metadata'],
+                  functionArguments: [coinType, recipient as string, amount as number],
+                },
+              }),
+            };
+          }}
+        />
+
+        <ApiPayload
+          title="signAndSubmitTransaction Encode Argument"
+          description="Encode Argument 测试 (OneKey、OKX、MizuWallet 等都不支持)"
+          presupposeParams={[
+            {
+              id: 'sender',
+              name: 'sender',
+              value: JSON.stringify({
+                recipient: account?.address ?? '',
+                amount: 100000,
+                coinType: '0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b',
+              }),
+            },
+          ]}
+          onExecute={async (request: string) => {
+            const { recipient, amount, coinType } = JSON.parse(request);
+            return {
+              result: await signAndSubmitTransaction({
+                sender: account?.address ?? '',
+                data: {
+                  function: '0x1::primary_fungible_store::transfer',
+                  typeArguments: ['0x1::fungible_asset::Metadata'],
+                  functionArguments: [
+                    coinType,
+                    AccountAddress.from(recipient as string),
+                    new U64(amount as number),
+                  ],
+                },
+              }),
+            };
+          }}
+        />
+      </ApiGroup>
+
       <DappList dapps={dapps} />
     </>
   );
@@ -326,6 +394,7 @@ function AptosConnectButton() {
 
   const walletsRef = useRef<(Wallet | AptosStandardSupportedWallet)[]>([]);
   walletsRef.current = wallets.filter((wallet) => wallet.readyState === WalletReadyState.Installed);
+  console.log('Aptos Standard Wallets:', walletsRef.current);
 
   const onConnectWallet = useCallback(
     async (selectedWallet: IKnownWallet) => {

diff --git a/packages/example/package.json b/packages/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-example",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",
@@ -25,17 +25,17 @@
     "@metamask/onboarding": "^1.0.1",
     "@mizuwallet-sdk/core": "^1.4.0",
     "@mysten/dapp-kit": "0.13.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19",
-    "@onekeyfe/onekey-aptos-provider": "2.1.19",
-    "@onekeyfe/onekey-cardano-provider": "2.1.19",
-    "@onekeyfe/onekey-conflux-provider": "2.1.19",
-    "@onekeyfe/onekey-cosmos-provider": "2.1.19",
-    "@onekeyfe/onekey-near-provider": "2.1.19",
-    "@onekeyfe/onekey-solana-provider": "2.1.19",
-    "@onekeyfe/onekey-sui-provider": "2.1.19",
-    "@onekeyfe/onekey-tron-provider": "2.1.19",
-    "@onekeyfe/onekey-webln-provider": "2.1.19",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20",
+    "@onekeyfe/onekey-aptos-provider": "2.1.20",
+    "@onekeyfe/onekey-cardano-provider": "2.1.20",
+    "@onekeyfe/onekey-conflux-provider": "2.1.20",
+    "@onekeyfe/onekey-cosmos-provider": "2.1.20",
+    "@onekeyfe/onekey-near-provider": "2.1.20",
+    "@onekeyfe/onekey-solana-provider": "2.1.20",
+    "@onekeyfe/onekey-sui-provider": "2.1.20",
+    "@onekeyfe/onekey-tron-provider": "2.1.20",
+    "@onekeyfe/onekey-webln-provider": "2.1.20",
     "@polkadot/api": "^9.11.3",
     "@polkadot/extension-dapp": "^0.47.5",
     "@radix-ui/react-checkbox": "^1.1.0",

diff --git a/packages/extension/extension-bridge-hosted/package.json b/packages/extension/extension-bridge-hosted/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-hosted",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,8 +28,8 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/extension/extension-bridge-injected/package.json b/packages/extension/extension-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-injected",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,7 +28,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20"
   }
 }
diff --git a/packages/injected/package.json b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-injected",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -42,12 +42,12 @@
     "electron": "*"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19",
-    "@onekeyfe/desktop-bridge-injected": "2.1.19",
-    "@onekeyfe/extension-bridge-injected": "2.1.19",
-    "@onekeyfe/inpage-providers-hub": "2.1.19",
-    "@onekeyfe/native-bridge-injected": "2.1.19",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20",
+    "@onekeyfe/desktop-bridge-injected": "2.1.20",
+    "@onekeyfe/extension-bridge-injected": "2.1.20",
+    "@onekeyfe/inpage-providers-hub": "2.1.20",
+    "@onekeyfe/native-bridge-injected": "2.1.20",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0"
   }

diff --git a/packages/native/native-bridge-injected/package.json b/packages/native/native-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/native-bridge-injected",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,7 +28,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20"
   }
 }
diff --git a/packages/providers/inpage-providers-hub/package.json b/packages/providers/inpage-providers-hub/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/inpage-providers-hub",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -30,26 +30,26 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19",
-    "@onekeyfe/onekey-algo-provider": "2.1.19",
-    "@onekeyfe/onekey-alph-provider": "2.1.19",
-    "@onekeyfe/onekey-aptos-provider": "2.1.19",
-    "@onekeyfe/onekey-bfc-provider": "2.1.19",
-    "@onekeyfe/onekey-btc-provider": "2.1.19",
-    "@onekeyfe/onekey-cardano-provider": "2.1.19",
-    "@onekeyfe/onekey-conflux-provider": "2.1.19",
-    "@onekeyfe/onekey-cosmos-provider": "2.1.19",
-    "@onekeyfe/onekey-eth-provider": "2.1.19",
-    "@onekeyfe/onekey-nostr-provider": "2.1.19",
-    "@onekeyfe/onekey-polkadot-provider": "2.1.19",
-    "@onekeyfe/onekey-private-provider": "2.1.19",
-    "@onekeyfe/onekey-scdo-provider": "2.1.19",
-    "@onekeyfe/onekey-solana-provider": "2.1.19",
-    "@onekeyfe/onekey-sui-provider": "2.1.19",
-    "@onekeyfe/onekey-ton-provider": "2.1.19",
-    "@onekeyfe/onekey-tron-provider": "2.1.19",
-    "@onekeyfe/onekey-webln-provider": "2.1.19",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20",
+    "@onekeyfe/onekey-algo-provider": "2.1.20",
+    "@onekeyfe/onekey-alph-provider": "2.1.20",
+    "@onekeyfe/onekey-aptos-provider": "2.1.20",
+    "@onekeyfe/onekey-bfc-provider": "2.1.20",
+    "@onekeyfe/onekey-btc-provider": "2.1.20",
+    "@onekeyfe/onekey-cardano-provider": "2.1.20",
+    "@onekeyfe/onekey-conflux-provider": "2.1.20",
+    "@onekeyfe/onekey-cosmos-provider": "2.1.20",
+    "@onekeyfe/onekey-eth-provider": "2.1.20",
+    "@onekeyfe/onekey-nostr-provider": "2.1.20",
+    "@onekeyfe/onekey-polkadot-provider": "2.1.20",
+    "@onekeyfe/onekey-private-provider": "2.1.20",
+    "@onekeyfe/onekey-scdo-provider": "2.1.20",
+    "@onekeyfe/onekey-solana-provider": "2.1.20",
+    "@onekeyfe/onekey-sui-provider": "2.1.20",
+    "@onekeyfe/onekey-ton-provider": "2.1.20",
+    "@onekeyfe/onekey-tron-provider": "2.1.20",
+    "@onekeyfe/onekey-webln-provider": "2.1.20",
     "web3": "^1.7.3"
   },
   "devDependencies": {

diff --git a/packages/providers/onekey-algo-provider/package.json b/packages/providers/onekey-algo-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-algo-provider",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,9 +28,9 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19",
-    "@onekeyfe/extension-bridge-injected": "2.1.19"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20",
+    "@onekeyfe/extension-bridge-injected": "2.1.20"
   }
 }
diff --git a/packages/providers/onekey-alph-provider/package.json b/packages/providers/onekey-alph-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-alph-provider",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -31,9 +31,9 @@
     "@alephium/get-extension-wallet": "^1.5.2",
     "@alephium/walletconnect-provider": "^1.5.2",
     "@alephium/web3": "^1.5.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.19",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.19",
-    "@onekeyfe/extension-bridge-injected": "2.1.19"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.20",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.20",
+    "@onekeyfe/extension-bridge-injected": "2.1.20"
   }
 }