Ton with temporal overwrite (#562)

* Adding ton to ios project * Adding updating ton build file * Adding improvements * Adding to ton window object * Adding disconnect * Adding new packages * Parse seq & auto connect boolean * Parse seq & auto connect boolean * Accept nonce and hash * Build new nonce support * Wrapping boc
trustwallet · Oct 4, 2024 · a090fd0 · a090fd0
1 parent 759cf4a
commit a090fd0
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 29 deletions.
diff --git a/android/lib/src/main/res/raw/trust_min.js b/android/lib/src/main/res/raw/trust_min.js
diff --git a/bun.lockb b/bun.lockb
diff --git a/packages/android-web3-provider/index.ts b/packages/android-web3-provider/index.ts
@@ -11,6 +11,9 @@ import { ICosmosProviderConfig } from '@trustwallet/web3-provider-cosmos/types/C
 import { IEthereumProviderConfig } from '@trustwallet/web3-provider-ethereum/types/EthereumProvider';
 import { AptosProvider } from '@trustwallet/web3-provider-aptos';
 import { IAptosProviderConfig } from '@trustwallet/web3-provider-aptos/types/AptosProvider';
+import { TonBridge, TonProvider } from '@trustwallet/web3-provider-ton';
+import { ITonProviderConfig } from '@trustwallet/web3-provider-ton/types/TonProvider';
+import { ITonBridgeConfig } from '@trustwallet/web3-provider-ton/types/TonBridge';
 
 const core = (strategy: AdapterStrategyType, handler?: IHandler) =>
   new Web3Provider({ strategy, handler });
@@ -24,10 +27,17 @@ const ethereum = (config: IEthereumProviderConfig) =>
 
 const aptos = (config: IAptosProviderConfig) => new AptosProvider(config);
 
+const ton = (config: ITonProviderConfig) => new TonProvider(config);
+
+const tonBridge = (config: ITonBridgeConfig, provider: TonProvider) =>
+  new TonBridge(config, provider);
+
 window.trustwallet = {
   core,
   solana,
   cosmos,
   ethereum,
   aptos,
+  ton,
+  tonBridge,
 };
diff --git a/packages/android-web3-provider/package.json b/packages/android-web3-provider/package.json
@@ -24,7 +24,8 @@
     "@trustwallet/web3-provider-solana": "workspace:*",
     "@trustwallet/web3-provider-cosmos": "workspace:*",
     "@trustwallet/web3-provider-aptos": "workspace:*",
+    "@trustwallet/web3-provider-ton": "workspace:*",
     "rollup-plugin-polyfill-node": "0.13.0"
   },
-  "devDependencies": { }
+  "devDependencies": {}
 }
diff --git a/packages/ios-web3-provider/package.json b/packages/ios-web3-provider/package.json
@@ -19,7 +19,6 @@
     "dev": "bun build ./index.ts --outdir ./dist --watch"
   },
   "dependencies": {
-    "ton": "^13.9.0",
     "@trustwallet/web3-provider-core": "workspace:*",
     "@trustwallet/web3-provider-ethereum": "workspace:*",
     "@trustwallet/web3-provider-solana": "workspace:*",

diff --git a/packages/ios-web3-provider/swift/TrustWeb3Provider.swift b/packages/ios-web3-provider/swift/TrustWeb3Provider.swift
@@ -12,15 +12,24 @@ public struct TrustWeb3Provider {
         public let ethereum: EthereumConfig
         public let solana: SolanaConfig
         public let aptos: AptosConfig
+        public let ton: TonConfig
+        public let appVersion: String
+        public let autoConnect: Bool
 
         public init(
             ethereum: EthereumConfig,
             solana: SolanaConfig,
-            aptos: AptosConfig = AptosConfig(network: "Mainnet", chainId: "1")
+            aptos: AptosConfig = AptosConfig(network: "Mainnet", chainId: "1"),
+            ton: TonConfig,
+            appVersion: String,
+            autoConnect: Bool
         ) {
             self.ethereum = ethereum
             self.solana = solana
             self.aptos = aptos
+            self.ton = ton
+            self.appVersion = appVersion
+            self.autoConnect = autoConnect
         }
 
         public struct EthereumConfig: Equatable {
@@ -43,6 +52,11 @@ public struct TrustWeb3Provider {
             }
         }
 
+        public struct TonConfig: Equatable {
+            public init() {
+            }
+        }
+
         public struct AptosConfig: Equatable {
             public let network: String
             public let chainId: String
@@ -113,13 +127,44 @@ public struct TrustWeb3Provider {
                 const solana = trustwallet.solana(config.solana);
                 const cosmos = trustwallet.cosmos();
                 const aptos = trustwallet.aptos(config.aptos);
+                const ton = trustwallet.ton();
+
+                const walletInfo = {
+                  deviceInfo: {
+                    platform: 'iphone',
+
+                    // TODO: Change to trust
+                    appName: 'OpenMask',
+                    appVersion: "\(config.appVersion)",
+                    maxProtocolVersion: 2,
+                    features: [
+                      'SendTransaction',
+                      {
+                        name: 'SendTransaction',
+                        maxMessages: 4,
+                      },
+                    ],
+                  },
+                  walletInfo: {
+                    // TODO: Change to trust
+                    name: 'OpenMask',
+                    image: 'https://assets-cdn.trustwallet.com/dapps/trust.logo.png',
+                    about_url: 'https://trustwallet.com/about-us',
+                  },
+                  isWalletBrowser: \(config.autoConnect),
+                };
 
-                core.registerProviders([ethereum, solana, cosmos, aptos].map(provider => {
+                const tonBridge = trustwallet.tonBridge(walletInfo, ton);
+
+                core.registerProviders([ethereum, solana, cosmos, aptos, ton].map(provider => {
                   provider.sendResponse = core.sendResponse.bind(core);
                   provider.sendError = core.sendError.bind(core);
                   return provider;
                 }));
 
+                // TODO: remove after updating to trust
+                window.openmask = { tonconnect: tonBridge, provider: ton };
+
                 // Custom methods
                 ethereum.emitChainChanged = (chainId) => {
                   ethereum.setChainId('0x' + parseInt(chainId || '1').toString(16));
@@ -151,10 +196,12 @@ public struct TrustWeb3Provider {
                 trustwallet.cosmos = cosmos;
                 trustwallet.TrustCosmos = trustwallet.cosmos;
                 trustwallet.aptos = aptos;
+                trustwallet.ton = ton;
 
                 window.ethereum = trustwallet.ethereum;
                 window.keplr = trustwallet.cosmos;
                 window.aptos = trustwallet.aptos;
+                window.ton = trustwallet.ton;
 
                 const getDefaultCosmosProvider = (chainId) => {
                   return trustwallet.cosmos.getOfflineSigner(chainId);

diff --git a/packages/ios-web3-provider/swift/trust-min.js b/packages/ios-web3-provider/swift/trust-min.js
diff --git a/packages/ios-web3-provider/tsconfig.json b/packages/ios-web3-provider/tsconfig.json
@@ -1,6 +1,12 @@
 {
   "extends": "../../tsconfig.json",
-  "exclude": ["package.json", "rollup.config.js", "tsconfig.json", "tests", "./dist"],
+  "exclude": [
+    "package.json",
+    "rollup.config.js",
+    "tsconfig.json",
+    "tests",
+    "./dist"
+  ],
   "compilerOptions": {
     "rootDir": "./",
     "outDir": "./dist/types",

diff --git a/packages/ton/MobileAdapter.ts b/packages/ton/MobileAdapter.ts
@@ -1,5 +1,4 @@
 import { TonProvider } from './TonProvider';
-import { Address } from 'ton';
 
 interface ITransaction {
   valid_until: number;
@@ -27,9 +26,6 @@ export class MobileAdapter {
             messages: (transaction?.messages || []).map(
               ({ state_init, ...message }) => ({
                 ...message,
-                address: Address.parse(message.address).toString({
-                  bounceable: false,
-                }),
                 stateInit: state_init,
               }),
             ),
@@ -60,12 +56,17 @@ export class MobileAdapter {
         return this.provider.internalRequest<T>('signMessage', params);
 
       case 'ton_sendTransaction':
-      case 'tonConnect_sendTransaction':
-        return this.provider.internalRequest<T>(
+      case 'tonConnect_sendTransaction': {
+        const res = await this.provider.internalRequest<string>(
           'signTransaction',
           MobileAdapter.mapToCamelCase((params as object[])[0] as ITransaction),
         );
 
+        const { nonce, hash } = JSON.parse(res);
+
+        return method === 'ton_sendTransaction' ? nonce : { boc: hash };
+      }
+
       case 'ton_requestAccounts': {
         const res = await this.provider.internalRequest<string>(
           'requestAccounts',

diff --git a/packages/ton/TonBridge.ts b/packages/ton/TonBridge.ts
@@ -83,6 +83,15 @@ export class TonBridge implements TonConnectBridge {
     });
   }
 
+  async disconnect() {
+    await this.provider.send('tonConnect_disconnect', {});
+
+    return this.emit({
+      event: 'disconnect',
+      payload: {},
+    });
+  }
+
   /**
    * Return and call callbacks
    * @param event

diff --git a/packages/ton/package.json b/packages/ton/package.json
@@ -18,9 +18,7 @@
     "build:source": "bun build:clean; rollup --config ./rollup.config.js; bun run build:types",
     "dev": "bun build ./index.ts --outdir ./dist --watch"
   },
-  "peerDependencies": {
-    "ton": "^13.9.0"
-  },
+  "peerDependencies": {},
   "dependencies": {
     "@trustwallet/web3-provider-core": "workspace:*"
   }