suidouble 0.0.51 → 1.0.4-2

package/README.md

@@ -51,31 +51,31 @@ You can initialize it directly, if you have keypair, secret phrase and can use i
 const suiMaster = new SuiMaster({
     keypair: Ed25519Keypair || Secp256r1Keypair || Secp256k1Keypair,
     debug: true,    // echo testing messages to console
-    provider: 'test', // 'test', 'dev', 'local', 'main' or instance of this lib's SuiLocalTestValidator, or instance of Sui's JsonRpcProvider 
+    client: 'test', // 'test', 'dev', 'local', 'main' or instance of this lib's SuiLocalTestValidator
 });
 const suiMaster = new SuiMaster({
     debug: false,
     phrase: 'thrive mean two thrive mean two thrive mean two thrive mean two', // secret phrase to generate keypair
-    provider: 'dev', 
+    client: 'dev', 
 });
 const suiMaster = new SuiMaster({
     debug: false,
     phrase: 'thrive mean two thrive mean two thrive mean two thrive mean two', // secret phrase to generate keypair
     accountIndex: 1, // derive path index (you can generate few addresses with same seed phrase)
-    provider: 'dev', 
+    client: 'dev', 
 });
 const suiMaster = new SuiMaster({
     debug: false,
     phrase: 'thrive mean two thrive mean two thrive mean two thrive mean two', // secret phrase to generate keypair
     keypairAlgo: 'secp256k1', // 'secp256r1' or 'secp256r1' or 'ed25519' default is ed25519
-    provider: 'dev', 
+    client: 'dev', 
 });
 ```
 
 Also, there's option to generate pseudo-random phrases and wallets from strings, works like a charm for testing:
 ```javascript
-const suiMasterAsAdmin = new SuiMaster({ as: 'admin', provider: 'dev', });
-const suiMasterAsUser = new SuiMaster({ as: 'user', provider: 'dev', });
+const suiMasterAsAdmin = new SuiMaster({ as: 'admin', client: 'dev', });
+const suiMasterAsUser = new SuiMaster({ as: 'user', client: 'dev', });
 ```
 
 On browser side, you'd probably want to use Sui wallets extensions adapters to sign message and don't store any keypairs or secret phrases in your code. So there's SuiInBrowser class for this, which can setup suiMaster instance for you. See 'Sui Move Connect in browser' section or sample UI application's code for more details.
@@ -199,7 +199,7 @@ await module.unsubscribeEvents();
 
 ```javascript
 // executing method with parameters of (chat_shop: &ChatShop, metadata: vector<u8>, text: vector<u8>)
-const res = await contract.moveCall('chat', 'post', ['0x10cded4f9df05e37b44e3be2ffa9004dec77786950719fad6083694fdca45bf2', [3,24,55], 'anotherparam']);
+const res = await contract.moveCall('chat', 'post', ['0x10cded4f9df05e37b44e3be2ffa9004dec77786950719fad6083694fdca45bf2', contract.arg('vector<u8>', [3,24,55]), contract.arg('string', 'anotherparam') ]);
 // or await contract.modules.chat.moveCall('methodname', ['somedata', [3,24,55], 'anotherparam']);
     console.log(res);
     for (const object of res.created) {
@@ -213,6 +213,42 @@ const res = await contract.moveCall('chat', 'post', ['0x10cded4f9df05e37b44e3be2
     }
 ```
 
+##### move methods argumets types
+
+Sui forces you to specify argument type in SDK v1.0, so we are going to follow this paradigm. With few little helpers. Both `SuiPackage` and `SuiPackageModule` have methods to make Inputs.Pure with bcs for you based on the desired type, you can use for executing `suiPackage.moveCall` or `suiPackageModule.moveCall`:
+
+```javascript
+const arguments = [];
+arguments.push(contract.arg('bool', true));
+arguments.push(contract.arg('u8', 222));
+arguments.push(contract.arg('u16', 2222));
+arguments.push(contract.arg('u32', 3333));
+arguments.push(contract.arg('u64', 4444));
+arguments.push(contract.arg('u128', 5555));
+arguments.push(contract.arg('u256', 6666));
+arguments.push(contract.arg('address', '0xd9a95d7cc137f71dd7766f02791536453062a7509e9f461620cc4f583b09134c'));
+arguments.push(contract.arg('string', 'some utf-8 💧string'));
+arguments.push(contract.arg('vector<u8>', 222)); // works for other vectors with primitive contents, e.g. u128, bool etc
+```
+
+Take a look at unit test covering all types arguments [here](test/different_types_args.test.js)
+
+##### move methods typed arguments
+
+To specify types for move methods declared as:
+
+```rust
+public entry fun method<T>(...)
+```
+
+you can specify `typeArguments` as a 3rd parameter to `suiPackageModule.moveCall` or 4th to `suiPackage.moveCall`:
+
+```javascript
+await mod.moveCall('test_method', [ store.id ], [ '0xca90beae66f23df1a830357c92e0a4348b6164d142c96b06936c5f28fdeaa99f::different_types::Store' ]);
+await contract.moveCall('module_name', 'test_method', [ store.id ], [ '0xca90beae66f23df1a83036936c5f28fdeaa99f::different_types::Store' ]);
+```
+
+
 ##### sending sui / coins with smart contract methods
 
 If you need to transfer some SUI/coins as part of executing contract method, you can use a magic parameter in form of:
@@ -234,7 +270,7 @@ So executing
 const params = [
     chatShopObjectId,
     {type: '0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN', amount: '9.99'},
-    messageText,
+    contract.arg('string', messageText),
 ];
 const moveCallResult = await contract.moveCall('suidouble_chat', 'post_pay', params);
 ```
@@ -247,7 +283,7 @@ Some smart contracts requires clients to send coins in form of vectors. This is
 const params = [
     chatShopObjectId,
     [{type: '0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN', amount: '9.99'}],
-    messageText,
+    contract.arg('string', messageText),
 ];
 ```
 
@@ -265,7 +301,7 @@ const txb = new TransactionBlock();
 txb.moveCall({
     target: `package_id::module_id::method_name`,
     arguments: [
-        txb.pure(something),
+        txb.pure(contract.arg('u256', something)),
         txb.object(someid),
     ],
 });
@@ -306,8 +342,8 @@ Builds a package and publish it to blockchain. CLI thing, as it needs `execSync`
 ```javascript
 const { SuiMaster } = require('suidouble');
 
-const provider = 'dev';
-const suiMaster = new SuiMaster({ debug: true, as: 'admin', provider: provider, });
+const client = 'dev';
+const suiMaster = new SuiMaster({ debug: true, as: 'admin', client: client, });
 
 await suiMaster.requestSuiFromFaucet();
 await suiMaster.getBalance();
@@ -327,9 +363,9 @@ Same, it's for CLI as it re-builds the package.
 ```javascript
 const { SuiMaster } = require('suidouble');
 
-const provider = 'local';// or await SuiLocalTestValidator.launch({debug: true, epochDuration: 30000});
+const client = 'local';// or await SuiLocalTestValidator.launch({debug: true, epochDuration: 30000});
 
-const suiMaster = new SuiMaster({ debug: true, as: 'admin', provider: provider, });
+const suiMaster = new SuiMaster({ debug: true, as: 'admin', client: client, });
 await suiMaster.requestSuiFromFaucet();
 await suiMaster.getBalance();
 
@@ -362,7 +398,7 @@ await testScenario.init();
 
 await testScenario.nextTx('admin', async()=>{
     const chatShop = testScenario.takeShared('ChatShop');
-    await testScenario.moveCall('chat', 'post', [chatShop.address, 'posting a message', 'metadata']);
+    await testScenario.moveCall('chat', 'post', [chatShop.address, testScenario.arg('string', 'posting a message'), testScenario.arg('string', 'metadata') ]);
     const chatTopMessage = testScenario.takeShared('ChatTopMessage');
 
     assert(chatTopMessage != null);
@@ -371,7 +407,7 @@ await testScenario.nextTx('admin', async()=>{
 
 await testScenario.nextTx('somebody', async()=>{
     const chatTopMessage = testScenario.takeShared('ChatTopMessage');
-    await testScenario.moveCall('chat', 'reply', [chatTopMessage.address, 'posting a response', 'metadata']);
+    await testScenario.moveCall('chat', 'reply', [chatTopMessage.address, testScenario.arg('string', 'posting a response'), testScenario.arg('string', 'metadata') ]);
     const chatResponse = testScenario.takeFromSender('ChatResponse');
 
     assert(chatResponse != null);
@@ -420,7 +456,7 @@ suiInBrowser.addEventListener('connected', async()=>{
         console.log('event', event.parsedJson);
     }
 
-    const res = await contract.moveCall('chat', 'post', ['somedata', [3,24,55], 'anotherparam']);
+    const res = await contract.moveCall('chat', 'post', [contract.arg('string', 'somedata'), contract.arg('vector<u8>', 'somedata') ]);
     console.log(res);
     for (const object of res.created) {
         console.log('created', object.address, 'with type of', object.typeName); // instances of SuiObject (@todo: write documentation for it)

package/index.js

@@ -2,9 +2,9 @@ const SuiMaster = require('./lib/SuiMaster.js');
 const SuiInBrowser = require('./lib/SuiInBrowser.js');
 const SuiTestScenario = require('./lib/SuiTestScenario.js');
 const SuiObject = require('./lib/SuiObject.js');
+const SuiUtils = require('./lib/SuiUtils.js');
 const SuiLocalTestValidator = require('./lib/SuiLocalTestValidator.js');
-
-const { TransactionBlock,Transactions } = require('@mysten/sui.js/transactions');
+const { Transaction, Commands } = require('@mysten/sui/transactions');
 
 module.exports = {
     SuiMaster,
@@ -13,7 +13,7 @@ module.exports = {
     SuiTestScenario,
     SuiLocalTestValidator,
     MIST_PER_SUI: SuiMaster.MIST_PER_SUI,
-
-    TransactionBlock: TransactionBlock,
-    Transactions: Transactions,
+    Transaction: Transaction,
+    Commands: Commands,
+    SuiUtils: SuiUtils,
 };

package/lib/SuiCoin.js

@@ -1,4 +1,7 @@
-const { Transactions } = require('@mysten/sui.js/transactions');
+const { Commands } = require('@mysten/sui/transactions');
+const { bcs } = require('@mysten/sui/bcs');
+// console.log(bcs);
+
 
 const safeList = {
     'sui:mainnet': {
@@ -159,7 +162,7 @@ class SuiCoin {
 
         let result = null;
         try {
-            result = await this.suiMaster.provider.getCoinMetadata({
+            result = await this.suiMaster.client.getCoinMetadata({
                     coinType: this.coinType,
                 });
         } catch (e) {
@@ -180,7 +183,7 @@ class SuiCoin {
         let result = null;
         let cursor = null;
         do {
-            result = await this.suiMaster.provider.getCoins({
+            result = await this.suiMaster.client.getCoins({
                 owner: owner,
                 coinType: this.coinType,
                 limit: 50,
@@ -212,18 +215,24 @@ class SuiCoin {
         if (coinIds.length == 1) {
             // only one coin object enough to cover the expense
             if (this.isSUI()) {
-                const coinInput = txb.add(Transactions.SplitCoins(txb.gas, [txb.pure(expectedAmountAsBigInt)]));
+                // console.log(txb.gas);
+                // console.log(bcs);
+                // console.log(txb.pure(bcs.vector(bcs.u64).serialize([expectedAmountAsBigInt])));
+                // console.log(txb.pure.u64(expectedAmountAsBigInt));
+                // txb.pure(bcs.vector(bcs.u64).serialize(['0x123']))
+
+                const coinInput = txb.add(Commands.SplitCoins(txb.gas, [txb.pure.u64(expectedAmountAsBigInt)]));
                 return coinInput;
             } else {
                 // some other coin
-                const coinInput = txb.add(Transactions.SplitCoins(txb.object(coinIds[0]), [txb.pure(expectedAmountAsBigInt)]));
+                const coinInput = txb.add(Commands.SplitCoins(txb.object(coinIds[0]), [txb.pure(expectedAmountAsBigInt)]));
                 return coinInput;
             }
         } else {
             // few coin objects to merge
             const coinIdToMergeIn = coinIds.shift();
-            txb.add(Transactions.MergeCoins(txb.object(coinIdToMergeIn), coinIds.map((id)=>{return txb.object(id);})));
-            const coinInputSplet = txb.add(Transactions.SplitCoins(txb.object(coinIdToMergeIn), [txb.pure(expectedAmountAsBigInt)]));
+            txb.add(Commands.MergeCoins(txb.object(coinIdToMergeIn), coinIds.map((id)=>{return txb.object(id);})));
+            const coinInputSplet = txb.add(Commands.SplitCoins(txb.object(coinIdToMergeIn), [txb.pure(expectedAmountAsBigInt)]));
 
             return coinInputSplet;
         }
@@ -238,7 +247,7 @@ class SuiCoin {
         let result = null;
         let cursor = null;
         do {
-            result = await this.suiMaster.provider.getCoins({
+            result = await this.suiMaster.client.getCoins({
                 owner: owner,
                 coinType: this.coinType,
                 limit: 50,

package/lib/SuiInBrowser.js

@@ -2,7 +2,7 @@ const SuiCommonMethods = require('./SuiCommonMethods.js');
 const SuiInBrowserAdapter = require('./SuiInBrowserAdapter.js');
 const WalletsStandardCore = require('@wallet-standard/core');
 const icons = require('./data/icons.json');
-const { SuiClient, getFullnodeUrl } = require('@mysten/sui.js/client');
+const { SuiClient, getFullnodeUrl } = require('@mysten/sui/client');
 
 const SuiMaster = require('./SuiMaster.js');
 
@@ -22,7 +22,7 @@ class SuiInBrowser extends SuiCommonMethods {
         this._isConnected = false;
         this._isConnecting = false;
 
-        this._provider = null;
+        this._client = null;
         this._suiMaster = null;
 
         setTimeout(()=>{
@@ -42,17 +42,21 @@ class SuiInBrowser extends SuiCommonMethods {
         return await this._activeAdapter.signAndExecuteTransactionBlock(params);
     }
 
-    get provider() {
-        return this._provider;
+    async signAndExecuteTransaction(params) {
+        return await this._activeAdapter.signAndExecuteTransaction(params);
     }
 
-    async getProvider() {
-        await this.initProvider();
-        return this._provider;
+    get client() {
+        return this._client;
+    }
+
+    async getClient() {
+        await this.initClient();
+        return this._client;
     }
 
     async getSuiMaster() {
-        await this.initProvider();
+        await this.initClient();
         return this._suiMaster;
     }
 
@@ -117,11 +121,11 @@ class SuiInBrowser extends SuiCommonMethods {
 
         if (this._connectedChain != wasConnectedToChain) {
             this.log('chain was switched');
-            this._provider = null;
+            this._client = null;
             this._suiMaster = null;
         }
 
-        this.initProvider();
+        this.initClient();
 
         this.emit('connected');
     }
@@ -168,8 +172,8 @@ class SuiInBrowser extends SuiCommonMethods {
         return this._connectedChain ? this._connectedChain : this._defaultChain;
     }
 
-    async initProvider() {
-        if (this._provider) {
+    async initClient() {
+        if (this._client) {
             return true;
         }
 
@@ -182,16 +186,17 @@ class SuiInBrowser extends SuiCommonMethods {
             throw new Error('invalid chain: '+chainName);
         }
 
-        this._provider = new SuiClient({url: 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,
-            provider: this._provider,
+            client: this._client,
         });
     }
 
     async initialize() {
-        await this.initProvider(); // set default provider
+        await this.initClient(); // set default client
 
         // create empty adapters (we need instances even if they are not installed)
         for (const possibleAdapterParams of SuiInBrowser.getPossibleWallets()) {

package/lib/SuiInBrowserAdapter.js

@@ -8,6 +8,8 @@ const Feature = {
     EVENTS: 'standard:events',
     SUI_SIGN_AND_EXECUTE_TX_BLOCK: 'sui:signAndExecuteTransactionBlock',
     SUI_SIGN_TX_BLOCK: 'sui:signTransactionBlock',
+    SUI_SIGN_AND_EXECUTE_TX: 'sui:signAndExecuteTransaction',
+    SUI_SIGN_TX: 'sui:signTransaction',
     SUI_SIGN_MESSAGE: 'sui:signMessage'
 };
 
@@ -30,10 +32,30 @@ class SuiInBrowserAdapter extends SuiCommonMethods {
         this._isConnected = false;
     }
 
+    async signAndExecuteTransaction(params) {
+        if (this.hasFeature(Feature.SUI_SIGN_AND_EXECUTE_TX)) {
+            return await this.getFeature(Feature.SUI_SIGN_AND_EXECUTE_TX).signAndExecuteTransaction(params);
+        } else {
+            // outdated wallet?
+            params.transactionBlock = params.transaction;
+            return await this.getFeature(Feature.SUI_SIGN_AND_EXECUTE_TX_BLOCK).signAndExecuteTransactionBlock(params);
+        }
+    }
+
     async signAndExecuteTransactionBlock(params) {
         return await this.getFeature(Feature.SUI_SIGN_AND_EXECUTE_TX_BLOCK).signAndExecuteTransactionBlock(params);
     }
 
+    async signTransactionBlock(params) {
+        if (this.hasFeature(Feature.SUI_SIGN_TX)) {
+            return await this.getFeature(Feature.SUI_SIGN_TX).signTransaction(params);
+        } else {
+            // outdated wallet?
+            params.transactionBlock = params.transaction;
+            return await this.getFeature(Feature.SUI_SIGN_TX_BLOCK).signTransactionBlock(params);
+        }
+    }
+
     async signTransactionBlock(params) {
         return await this.getFeature(Feature.SUI_SIGN_TX_BLOCK).signTransactionBlock(params);
     }

package/lib/SuiLocalTestValidator.js

@@ -3,7 +3,8 @@ const SuiCliCommands = require('./SuiCliCommands.js');
 const SuiCommonMethods = require('./SuiCommonMethods.js');
 // const { JsonRpcProvider, localnetConnection, devnetConnection } = require('@mysten/sui.js');
 
-const { SuiClient, getFullnodeUrl } = require('@mysten/sui.js/client');
+const { SuiClient, getFullnodeUrl, SuiHTTPTransport } = require('@mysten/sui/client');
+const SuiUtils = require('./SuiUtils.js');
 
 class SuiLocalTestValidator extends SuiCommonMethods {
     constructor(params = {}) {
@@ -28,12 +29,20 @@ class SuiLocalTestValidator extends SuiCommonMethods {
         return this._providerName;
     }
 
-    get provider() {
+    get client() {
         if (this._providerName === 'sui:localnet') {
-            return new SuiClient({url: getFullnodeUrl('localnet')});
+            return new SuiClient({
+                    transport: new SuiHTTPTransport({
+                        url: getFullnodeUrl('localnet'),
+                        WebSocketConstructor: SuiUtils.WebSocketConstructor(),
+                    }),
+                });
         } else if (this._providerName === 'sui:devnet') {
             // if testFallbackEnabled == true and we can't start local node
-            return new SuiClient({url: getFullnodeUrl('devnet')});//JsonRpcProvider(devnetConnection);
+            return new SuiClient({
+                url: getFullnodeUrl('devnet'),
+                WebSocketConstructor: SuiUtils.WebSocketConstructor(),
+            });
         }
     }
 

package/lib/SuiMaster.js

@@ -7,13 +7,14 @@ const SuiObject = require('./SuiObject.js');
 const SuiTransaction = require('./SuiTransaction.js');
 const SuiEvent = require('./SuiEvent.js');
 const SuiCoins = require('./SuiCoins.js');
-const { SuiClient, getFullnodeUrl } = require('@mysten/sui.js/client');
-const { MIST_PER_SUI } = require('@mysten/sui.js/utils');
-const { Ed25519Keypair } = require('@mysten/sui.js/keypairs/ed25519');
-const { Secp256r1Keypair } = require('@mysten/sui.js/keypairs/secp256r1');
-const { Secp256k1Keypair } = require('@mysten/sui.js/keypairs/secp256k1');
-const { requestSuiFromFaucetV0, getFaucetHost } = require('@mysten/sui.js/faucet');
-const { TransactionBlock, Transactions } = require('@mysten/sui.js/transactions');
+const SuiUtils = require('./SuiUtils.js');
+const { MIST_PER_SUI } = require('@mysten/sui/utils');
+const { Ed25519Keypair } = require('@mysten/sui/keypairs/ed25519');
+const { Secp256r1Keypair } = require('@mysten/sui/keypairs/secp256r1');
+const { Secp256k1Keypair } = require('@mysten/sui/keypairs/secp256k1');
+const { requestSuiFromFaucetV0, getFaucetHost } = require('@mysten/sui/faucet');
+const { Transaction, Commands } = require('@mysten/sui/transactions');
+
 
 class SuiMaster extends SuiCommonMethods {
     constructor(params = {}) {
@@ -65,7 +66,6 @@ class SuiMaster extends SuiCommonMethods {
                 }
             }
 
-
             this.log('goint to use keypair of', this._keypair.getPublicKey().toSuiAddress());
         } else if (params.as) {
             // generate pseudo-random keypair
@@ -74,69 +74,12 @@ class SuiMaster extends SuiCommonMethods {
             this.log('goint to use keypair of', this._keypair.getPublicKey().toSuiAddress());
         }
 
-        this._provider = null;
-        this._providerName = null;
-        if (params.provider) {
-            if (params.provider == 'local' || (params.provider.constructor && params.provider.constructor.name && params.provider.constructor.name == 'SuiLocalTestValidator')) {
-                if (params.provider == 'local') {
-                    this._provider = new SuiClient({url: getFullnodeUrl('localnet')});
-                    this._providerName = 'sui:localnet'; 
-                } else {
-                    // SuiLocalTestValidator
-                    this._providerName = params.provider.providerName;
-                    this._provider = params.provider.provider;
-                }
-                // this._provider = new sui.JsonRpcProvider(sui.localnetConnection);
-                // this._providerName = 'sui:localnet'; 
-            } else if (params.provider == 'test' || params.provider == 'testnet') {
-                this._provider = new SuiClient({url: getFullnodeUrl('testnet')});
-                this._providerName = 'sui:testnet';
-            } else if (params.provider == 'dev' || params.provider == 'devnet') {
-                this._provider = new SuiClient({url: getFullnodeUrl('devnet')});
-                this._providerName = 'sui:devnet';
-            } else if (params.provider == 'main' || params.provider == 'mainnet') {
-                this._provider = new SuiClient({url: getFullnodeUrl('mainnet')});
-                this._providerName = 'sui:mainnet';
-
-                this.log('we are on the mainnet, working with real money, be careful');
-            } else {
-                if (params.provider && params.provider.constructor && params.provider.constructor.name && params.provider.constructor.name == 'SuiClient') {
-                    this._provider = params.provider;
-                    const url = params.provider.transport.websocketClient.endpoint;
-
-                    if (url.indexOf('devnet') !== -1) {
-                        this._providerName = 'sui:devnet';
-                    } else if (url.indexOf('testnet') !== -1) {
-                        this._providerName = 'sui:testnet';
-                    } else if (url.indexOf('mainnet') !== -1) {
-                        this._providerName = 'sui:mainnet';
-                    } else if (url.indexOf('127.0.0.1') !== -1) {
-                        this._providerName = 'sui:localnet';
-                    } else {
-                        // just keep provider name as unique to fullnode URL to keep separate ObjectStorage instances
-                        this._providerName = url.split('//')[1];
-                    }
-                } else if (params.provider && params.provider.connection && params.provider.connection.fullnode) {
-                    this._provider = params.provider;
-
-                    if (params.provider.connection.fullnode.indexOf('devnet') !== -1) {
-                        this._providerName = 'sui:devnet';
-                    } else if (params.provider.connection.fullnode.indexOf('testnet') !== -1) {
-                        this._providerName = 'sui:testnet';
-                    } else if (params.provider.connection.fullnode.indexOf('mainnet') !== -1) {
-                        this._providerName = 'sui:mainnet';
-                    } else if (params.provider.connection.fullnode.indexOf('127.0.0.1') !== -1) {
-                        this._providerName = 'sui:localnet';
-                    } else {
-                        // just keep provider name as unique to fullnode URL to keep separate ObjectStorage instances
-                        this._providerName = params.provider.connection.fullnode;
-                    }
-                }
-            }
-        }
 
-        if (!this._provider) {
-            throw new Error('Can not do anything without provider. Set params.provider at least to `local`');
+        this._client = SuiUtils.normalizeClient(params.client);
+        this._providerName = this._client ? this._client.providerName : null;
+
+        if (!this._client) {
+            throw new Error('Can not do anything without SuiClient. Set params.client at least to `local`');
         }
 
         // we are differient single instances of object storage by provider name (so we can separate like devnet-testnet entities if needed)
@@ -155,6 +98,10 @@ class SuiMaster extends SuiCommonMethods {
         });
     }
 
+    get utils() {
+        return SuiUtils;
+    }
+
     get suiCoins() {
         return this._suiCoins;
     }
@@ -163,12 +110,12 @@ class SuiMaster extends SuiCommonMethods {
         return BigInt(MIST_PER_SUI);
     }
 
-    get TransactionBlock() {
-        return TransactionBlock;
+    get Transaction() {
+        return Transaction;
     }
 
-    get Transactions() {
-        return Transactions;
+    get Commands() {
+        return Commands;
     }
 
     /**
@@ -200,8 +147,8 @@ class SuiMaster extends SuiCommonMethods {
 
     static instancesCount = 0;
 
-    get provider() {
-        return this._provider;
+    get client() {
+        return this._client;
     }
 
     get connectedChain() {
@@ -237,9 +184,9 @@ class SuiMaster extends SuiCommonMethods {
         return suiPackage;
     }
 
-    async getProvider() {
+    async getClient() {
         await this.initialize();
-        return this._provider;
+        return this._client;
     }
 
     async initialize() {
@@ -253,7 +200,7 @@ class SuiMaster extends SuiCommonMethods {
 
         // this._keypair = sui.Ed25519Keypair.deriveKeypair(this._phrase);
         if (!this._signer && this._keypair) { // we may optionally go without signer, to work in read-only mode
-            this._signer = this._keypair;//new sui.RawSigner(this._keypair, this._provider);
+            this._signer = this._keypair;//
         }
 
         // const publicKey = this._keypair.getPublicKey();
@@ -267,8 +214,6 @@ class SuiMaster extends SuiCommonMethods {
                 this._address = await this._signer.getAddress(); // old method
             }
 
-            // console.log(this._signer);
-            // console.log(this._providerName);
             this.log('initialized. connected as', this._address);
         } else {
             this.log('initialized in read-only mode.');
@@ -278,22 +223,23 @@ class SuiMaster extends SuiCommonMethods {
         return true;
     }
 
-    async signAndExecuteTransactionBlock(params) {
+    async signAndExecuteTransaction(params) {
         if (this._keypair) {
             params.signer = this._keypair;
-            return this._provider.signAndExecuteTransactionBlock(params);
+            return this._client.signAndExecuteTransaction(params);
         } else if (this._signer) {
-            return this._signer.signAndExecuteTransactionBlock(params);
+            return this._signer.signAndExecuteTransaction(params);
         }
     }
 
   async requestSuiFromFaucet() {
         await this.initialize();
         let amount = BigInt(0);
-        const faucetHost = getFaucetHost(this._providerName.split('sui:').join(''));
-        if (faucetHost === "mainnet") {
-            this.log(`no faucet on ${faucetHost}`);
+         const provider = this._providerName.split('sui:').join('');
+        if (provider === "mainnet") {
+            this.log(`no faucet on ${provider}`);
         } else {
+            const faucetHost = getFaucetHost(provider);
             this.log(`requesting sui from faucet... ${faucetHost}`);
             const requested = await requestSuiFromFaucetV0({
                 host: faucetHost,
@@ -418,11 +364,10 @@ class SuiMaster extends SuiCommonMethods {
 
         return paginatedResponse;
     }
-
 };
 
 SuiMaster.MIST_PER_SUI = BigInt(MIST_PER_SUI);
-SuiMaster.TransactionBlock = TransactionBlock;
-SuiMaster.Transactions = Transactions;
+SuiMaster.Transaction = Transaction;
+SuiMaster.Commands = Commands;
 
 module.exports = SuiMaster;

package/lib/SuiMemoryObjectStorage.js

@@ -86,7 +86,7 @@ class SuiMemoryObjectStorage extends SuiCommonMethods {
                 console.warn = (e)=>{
                     consoleWarnMessage = e;
                 };
-                resultsSlice = await this._suiMaster._provider.multiGetObjects({
+                resultsSlice = await this._suiMaster._client.multiGetObjects({
                     ids: objectIdsSlice,
                     options: { showType: true, showContent: true, showOwner: true, showDisplay: true, },
                   });