Merge pull request #148 from OneKeyHQ/optimize/aptosInterface

Optimize/aptos interface
OneKeyHQ · Jan 15, 2024 · 33ed7e1 · 33ed7e1
2 parents 795ee2f + 7194470
commit 33ed7e1
Show file tree

Hide file tree

Showing 35 changed files with 546 additions and 149 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,9 +29,9 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "1.1.52",
-    "@onekeyfe/cross-inpage-provider-events": "1.1.52",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.52",
+    "@onekeyfe/cross-inpage-provider-errors": "1.1.53",
+    "@onekeyfe/cross-inpage-provider-events": "1.1.53",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.53",
     "events": "^3.3.0",
     "lodash": "^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 = '1.1.51';
+const version = '1.1.53';
 const versionBuild = '2020-0101-1';
 
 export default {

diff --git a/packages/core/src/walletProperty.ts b/packages/core/src/walletProperty.ts
@@ -46,7 +46,13 @@ export function checkEnableDefineProperty(property: string) {
   return false;
 }
 
-export function defineWindowProperty(property: string, provider: unknown) {
+export function defineWindowProperty(
+  property: string,
+  provider: unknown,
+  options?: {
+    enumerable?: boolean;
+  },
+) {
   if (!checkWalletSwitchEnable(property)) return;
   const enable = checkEnableDefineProperty(property);
   const proxyProvider = new Proxy(provider as object, {
@@ -61,7 +67,7 @@ export function defineWindowProperty(property: string, provider: unknown) {
         ((window as any)[property] ?? {})[key] = (proxyProvider as any)[key];
       });
       Object.defineProperty(window, property, {
-        enumerable: true,   // Object.keys loop check inject
+        enumerable: options?.enumerable ?? false, // Object.keys loop check inject
         configurable: false, // prevent redefined
         get() {
           return proxyProvider;

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": "1.1.52",
+  "version": "1.1.53",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -34,7 +34,7 @@
     "electron": "^17.2.0"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "1.1.52",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.52"
+    "@onekeyfe/cross-inpage-provider-core": "1.1.53",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.53"
   }
 }
diff --git a/packages/empty/package.json b/packages/empty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-empty",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "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": "1.1.52",
+  "version": "1.1.53",
   "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": "1.1.52",
+  "version": "1.1.53",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/example/components/cosmos/CosmosExample.tsx b/packages/example/components/cosmos/CosmosExample.tsx
@@ -123,7 +123,7 @@ export default function App() {
           {
             "type": "cosmos-sdk/MsgSend",
             "value": {
-              "from_address": "cosmos1l8va6sd7caxkgk4vsnazaxavqn644ayqcn9sst",
+              "from_address": address,
               "to_address": "cosmos19c2m35cfae5lj89x9025plknhjlhe6raj3ma9t",
               "amount": [
                 {
@@ -162,7 +162,7 @@ export default function App() {
           {
             "type": "cosmos-sdk/MsgSend",
             "value": {
-              "from_address": "cosmos1l8va6sd7caxkgk4vsnazaxavqn644ayqcn9sst",
+              "from_address": address,
               "to_address": "cosmos19c2m35cfae5lj89x9025plknhjlhe6raj3ma9t",
               "amount": [
                 {

diff --git a/packages/example/package.json b/packages/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-example",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",
@@ -16,17 +16,17 @@
     "@ethersproject/bytes": "^5.0.6",
     "@metamask/onboarding": "^1.0.1",
     "@mysten/wallet-kit": "^0.7.2",
-    "@onekeyfe/cross-inpage-provider-core": "1.1.52",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.52",
-    "@onekeyfe/onekey-aptos-provider": "1.1.52",
-    "@onekeyfe/onekey-cardano-provider": "1.1.52",
-    "@onekeyfe/onekey-conflux-provider": "1.1.52",
-    "@onekeyfe/onekey-cosmos-provider": "1.1.52",
-    "@onekeyfe/onekey-near-provider": "1.1.52",
-    "@onekeyfe/onekey-solana-provider": "1.1.52",
-    "@onekeyfe/onekey-sui-provider": "1.1.52",
-    "@onekeyfe/onekey-tron-provider": "1.1.52",
-    "@onekeyfe/onekey-webln-provider": "1.1.52",
+    "@onekeyfe/cross-inpage-provider-core": "1.1.53",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.53",
+    "@onekeyfe/onekey-aptos-provider": "1.1.53",
+    "@onekeyfe/onekey-cardano-provider": "1.1.53",
+    "@onekeyfe/onekey-conflux-provider": "1.1.53",
+    "@onekeyfe/onekey-cosmos-provider": "1.1.53",
+    "@onekeyfe/onekey-near-provider": "1.1.53",
+    "@onekeyfe/onekey-solana-provider": "1.1.53",
+    "@onekeyfe/onekey-sui-provider": "1.1.53",
+    "@onekeyfe/onekey-tron-provider": "1.1.53",
+    "@onekeyfe/onekey-webln-provider": "1.1.53",
     "@polkadot/api": "^9.11.3",
     "@polkadot/extension-dapp": "^0.44.8",
     "@solana/web3.js": "^1.41.3",

diff --git a/packages/example/pages/index.tsx b/packages/example/pages/index.tsx
@@ -179,6 +179,11 @@ const data: ITreeNodeData[] = [
         name: 'Aptos',
         href: '/aptos',
         icon: 'https://onekey-asset.com/assets/apt/apt.png',
+      },{
+        id: uuid.v4(),
+        name: 'AptosWalletAdapter',
+        href: 'https://aptos-labs.github.io/aptos-wallet-adapter/',
+        icon: 'https://onekey-asset.com/assets/apt/apt.png',
       },
       {
         id: uuid.v4(),