suidouble 1.11.0 → 1.13.0-1

package/lib/SuiInBrowser.js

@@ -25,6 +25,8 @@ class SuiInBrowser extends SuiCommonMethods {
         this._client = null;
         this._suiMaster = null;
 
+        this._rpcSettings = null;
+
         setTimeout(()=>{
             this.initialize();
         }, 50);
@@ -119,6 +121,10 @@ class SuiInBrowser extends SuiCommonMethods {
         const wasConnectedToChain = this._connectedChain;
         this._connectedChain = suiInBrowserAdapter.connectedChain;
 
+        if (this._connectedChain == 'sui:unknown') {
+            this._connectedChain = 'sui:mainnet'; // custom RPC in Sui Wallet
+        }
+
         if (this._connectedChain != wasConnectedToChain) {
             this.log('chain was switched');
             this._client = null;
@@ -130,6 +136,23 @@ class SuiInBrowser extends SuiCommonMethods {
         this.emit('connected');
     }
 
+    /**
+     * Switch connection to use custom RPC endpoint
+     * @param {Object} params parameters
+     * @param {string} params.url rpc url
+     * @param {Object} params.rpc rpc settings
+     * @param {Object.<string, string>} params.rpc.headers rpc headers
+     */
+    async setRPC(params = {}) {
+        this._rpcSettings = params;
+        this._client = null;
+        this._suiMaster = null;
+
+        await this.initClient();
+
+        this.emit('rpc');
+    }
+
     adapterDisconnected(suiInBrowserAdapter) {
         this._isConnected = false;
         this._connectedAddress = null;
@@ -181,13 +204,17 @@ class SuiInBrowser extends SuiCommonMethods {
         const chainSettings = SuiInBrowser.getChainsSettings();
         // https://github.com/MystenLabs/sui/blob/827f1138a09190975172ec99389751ca95cce5df/sdk/typescript/src/rpc/connection.ts#L32
 
-        if (!chainSettings[chainName]) {
+        if (this._rpcSettings) {
+            this._rpcSettings.providerName = chainName;
+            this._client = SuiMaster.SuiUtils.suiClientForRPC(this._rpcSettings);
+        } else if (!chainSettings[chainName]) {
             this.log('error', 'invalid chain', chainName);
             throw new Error('invalid chain: '+chainName);
+        } else {
+            this._client = new SuiClient({url: chainSettings[chainName].fullnode});
+            this._client.endpoint = chainSettings[chainName].fullnode;
         }
 
-        this._client = new SuiClient({url: chainSettings[chainName].fullnode});
-        this._client.endpoint = chainSettings[chainName].fullnode;
         this._suiMaster = new SuiMaster({
             debug: this._debug,
             signer: this,
@@ -218,8 +245,6 @@ class SuiInBrowser extends SuiCommonMethods {
                 });
             }
         });
-
-
     }
 
     static getChainsSettings() {

package/lib/SuiMaster.js

@@ -402,5 +402,6 @@ class SuiMaster extends SuiCommonMethods {
 SuiMaster.MIST_PER_SUI = BigInt(MIST_PER_SUI);
 SuiMaster.Transaction = Transaction;
 SuiMaster.Commands = Commands;
+SuiMaster.SuiUtils = SuiUtils;
 
 module.exports = SuiMaster;

package/lib/SuiUtils.js

@@ -104,6 +104,30 @@ class SuiUtils extends SuiCommonMethods {
         return WebSocketClient;
     }
 
+    /**
+     * Makes an instance for SuiClient for a specific chain using RPC
+     * @param {Object} params parameters
+     * @param {string} params.chainname 'mainnet', 'devnet', 'testnet', 'localnet'
+     * @param {string} params.url rpc url
+     * @param {Object} params.rpc rpc settings
+     * @param {Object.<string, string>} params.rpc.headers rpc headers
+     * @returns SuiClient
+     */
+    static suiClientForRPC(params = {}) {
+        const providerName = params.providerName || params.chainname || params.chain;
+        delete params.providerName;
+        delete params.chainName;
+        delete params.chain;
+        params.WebSocketConstructor = SuiUtils.WebSocketConstructor();
+
+        const transport = new SuiHTTPTransport(params);
+        const client = new SuiClient({ transport: transport });
+
+        client.providerName = providerName;
+
+        return client;
+    }
+
     /**
      * Makes an instance for SuiClient for a specific chain, eg: 'mainnet'
      * @param {string} chainname 
@@ -161,7 +185,12 @@ class SuiUtils extends SuiCommonMethods {
                         url = clientParam.transport.websocketClient.endpoint;
                     }
 
-                    if (url.indexOf('devnet') !== -1) {
+                    if (clientParam.providerName) {
+                        providerName = clientParam.providerName;
+                        if (['devnet', 'mainnet', 'testnet', 'localnet'].indexOf(clientParam.providerName) === -1) {
+                            providerName = 'sui:'+clientParam.providerName; // no prefix - add prefix
+                        }
+                    } else if (url.indexOf('devnet') !== -1) {
                         providerName = 'sui:devnet';
                     } else if (url.indexOf('testnet') !== -1) {
                         providerName = 'sui:testnet';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suidouble",
-  "version": "1.11.0",
+  "version": "1.13.0-1",
   "description": "Set of provider, package and object classes for javascript representation of Sui Move smart contracts. Use same code for publishing, upgrading, integration testing, interaction with smart contracts and integration in browser web3 dapps",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
   "author": "Jeka Kiselyov <jeka911@gmail.com> (https://github.com/jeka-kiselyov)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@mysten/sui": "^1.11.0",
+    "@mysten/sui": "^1.13.0",
     "@wallet-standard/core": "^1.0.3",
     "websocket": "^1.0.35"
   },

package/test/rpc.test.js

@@ -0,0 +1,38 @@
+'use strict'
+
+const t = require('tap');
+const { test } = t;
+
+const { SuiMaster } = require('..');
+
+let suiMaster = null;
+
+test('spawn local test node', async t => {
+        const rpcClient = SuiMaster.SuiUtils.suiClientForRPC({
+                chain: 'mainnet',
+                url: 'https://fullnode.mainnet.sui.io',
+                rpc: {
+                    // headers: {"x-allthatnode-api-key": "xxxxxxxxxx"},
+                }
+            });
+            
+        const suiMaster = new SuiMaster({
+                client: rpcClient,
+                as: 'somebody', // pseudo-address
+            });
+        await suiMaster.initialize();
+
+        t.ok(suiMaster.address); // there should be some address
+        t.ok(`${suiMaster.address}`.indexOf('0x') === 0); // adress is string starting with '0x'
+
+
+        const suiCoin = suiMaster.suiCoins.get('sui');
+        await suiCoin.getMetadata();
+
+        const balance = await suiCoin.getBalance('0xac5bceec1b789ff840d7d4e6ce4ce61c90d190a7f8c4f4ddf0bff6ee2413c33c');
+        
+        t.ok(balance > 0n);
+});
+
+test('stops', async t => {
+});