suidouble 0.0.36 → 0.0.38

package/index.js

@@ -3,6 +3,7 @@ const SuiInBrowser = require('./lib/SuiInBrowser.js');
 const SuiTestScenario = require('./lib/SuiTestScenario.js');
 const SuiObject = require('./lib/SuiObject.js');
 const SuiLocalTestValidator = require('./lib/SuiLocalTestValidator.js');
+const sui = require('@mysten/sui.js');
 
 module.exports = {
     SuiMaster,
@@ -11,4 +12,7 @@ module.exports = {
     SuiTestScenario,
     SuiLocalTestValidator,
     MIST_PER_SUI: SuiMaster.MIST_PER_SUI,
+
+    TransactionBlock: sui.TransactionBlock,
+    Transactions: sui.Transactions,
 };

package/lib/SuiMaster.js

@@ -97,6 +97,7 @@ class SuiMaster extends SuiCommonMethods {
         // we are differient single instances of object storage by provider name (so we can separate like devnet-testnet entities if needed)
         this._objectStorage = SuiMemoryObjectStorage.instanceOf(this._providerName, {
             debug: this._debug,
+            suiMaster: this,
         });
 
         this._initialized = false;

package/lib/SuiMemoryObjectStorage.js

@@ -4,6 +4,7 @@ class SuiMemoryObjectStorage extends SuiCommonMethods {
     constructor(params = {}) {
         super(params);
 
+        this._suiMaster = params.suiMaster;
         this._objects = {};
     }
 
@@ -60,6 +61,68 @@ class SuiMemoryObjectStorage extends SuiCommonMethods {
         return null;
     }
 
+    async fetchObjects() {
+        const objectsToFetch = this.asArray(); //Object.values(this._objects);
+
+        const objectIds = [];
+        for (const object of objectsToFetch) {
+            if (!object.isDeleted && objectIds.indexOf(object.address) === -1) {
+                objectIds.push(object.address);
+            }
+        }
+
+        this.log('querying details about', objectIds.length, 'objects');
+        this.log(objectIds);
+
+        let results = [];
+        const maxCountToFetch = 50;
+        for (let i = 0; i < objectIds.length; i += maxCountToFetch) {
+            const objectIdsSlice = objectIds.slice(i, i + maxCountToFetch);
+
+            let resultsSlice = [];
+            let consoleWarnMessage = null;
+            try {
+                const originalConsoleWarn = console.warn;
+                console.warn = (e)=>{
+                    consoleWarnMessage = e;
+                };
+                resultsSlice = await this._suiMaster._provider.multiGetObjects({
+                    ids: objectIdsSlice,
+                    options: { showType: true, showContent: true, showOwner: true, showDisplay: true, },
+                  });
+                console.warn = originalConsoleWarn;
+            } catch(e) {
+                console.error(e);
+            }
+
+            if (consoleWarnMessage) {
+                this.log('got', resultsSlice.length, 'objects but with warning (ok, but probably it is different client vs rpc versions)');
+            } else {
+                this.log('got', resultsSlice.length, 'objects');
+            }
+
+            if (resultsSlice && resultsSlice.length) {
+                results = results.concat(resultsSlice);
+            }
+        }
+
+        for (const object of objectsToFetch) {
+            const foundInResults = results.find(element => object.idEquals(element?.data?.objectId));
+            if (foundInResults) {
+                object.tryToFillDataFromObjectChange(foundInResults);
+                // this.log('got updates for object', object.address, object.fields);
+            } else {
+                // object is removed?
+                const foundInRemoved = results.find(element => (element?.error?.code == 'deleted' && object.idEquals(element?.error?.object_id)));
+                if (foundInRemoved) {
+                    object.markAsDeleted();
+                } else {
+                    this.log('not found in results', object);
+                }
+            }
+        }
+    }
+
     static _instances = {};
 
     static instanceOf(validatorId, params = {}) {

package/lib/SuiPackageModule.js

@@ -115,29 +115,34 @@ class SuiPackageModule extends SuiCommonMethods {
     async moveCall(methodName, params) {
         await this._package.checkOnChainIfNeeded();
 
-        const tx = new sui.TransactionBlock();
-
-        const callArgs = [];
-
-        for (let param of params) {
-            if (param && param.type && param.amount && param.type === 'SUI') {
-                let amount = BigInt(param.amount);
-                const coin = tx.add(sui.Transactions.SplitCoins(tx.gas, [tx.pure(amount)]));
-                callArgs.push(coin);
-            } else if (param && Array.isArray(param) && param.length == 1 && param[0].type && param[0].amount && param[0].type === 'SUI') {
-                // vector<Coin<SUI>>
-                let amount = BigInt(param[0].amount);
-                const coin = tx.add(sui.Transactions.SplitCoins(tx.gas, [tx.pure(amount)]));
-                callArgs.push(tx.makeMoveVec({ objects: [coin]}));
-            } else {
-                callArgs.push(tx.pure(param));
+        let tx = null;
+        if (params.tx) {
+            tx = params.tx;
+        } else {
+            tx = new sui.TransactionBlock();
+
+            const callArgs = [];
+    
+            for (let param of params) {
+                if (param && param.type && param.amount && param.type === 'SUI') {
+                    let amount = BigInt(param.amount);
+                    const coin = tx.add(sui.Transactions.SplitCoins(tx.gas, [tx.pure(amount)]));
+                    callArgs.push(coin);
+                } else if (param && Array.isArray(param) && param.length == 1 && param[0].type && param[0].amount && param[0].type === 'SUI') {
+                    // vector<Coin<SUI>>
+                    let amount = BigInt(param[0].amount);
+                    const coin = tx.add(sui.Transactions.SplitCoins(tx.gas, [tx.pure(amount)]));
+                    callArgs.push(tx.makeMoveVec({ objects: [coin]}));
+                } else {
+                    callArgs.push(tx.pure(param));
+                }
             }
+            
+            tx.moveCall({
+                target: `${this._package.address}::${this._moduleName}::${methodName}`,
+                arguments: callArgs,
+            });
         }
-        
-        tx.moveCall({
-            target: `${this._package.address}::${this._moduleName}::${methodName}`,
-            arguments: callArgs,
-        });
 
         const result = await this._suiMaster._signer.signAndExecuteTransactionBlock({
             transactionBlock: tx,
@@ -246,66 +251,7 @@ class SuiPackageModule extends SuiCommonMethods {
     }
 
     async fetchObjects() {
-        const objectsToFetch = this.objectStorage.asArray(); //Object.values(this._objects);
-
-        const objectIds = [];
-        for (const object of objectsToFetch) {
-            if (!object.isDeleted && objectIds.indexOf(object.address) === -1) {
-                objectIds.push(object.address);
-            }
-        }
-
-        this.log('querying details about', objectIds.length, 'objects');
-        this.log(objectIds);
-
-        let results = [];
-        const maxCountToFetch = 50;
-        for (let i = 0; i < objectIds.length; i += maxCountToFetch) {
-            const objectIdsSlice = objectIds.slice(i, i + maxCountToFetch);
-
-            let resultsSlice = [];
-            let consoleWarnMessage = null;
-            try {
-                const originalConsoleWarn = console.warn;
-                console.warn = (e)=>{
-                    consoleWarnMessage = e;
-                };
-                resultsSlice = await this._suiMaster._provider.multiGetObjects({
-                    ids: objectIdsSlice,
-                    // only fetch the object type
-                    options: { showType: true, showContent: true, showOwner: true, showDisplay: true, },
-                  });
-                console.warn = originalConsoleWarn;
-            } catch(e) {
-                console.error(e);
-            }
-
-            if (consoleWarnMessage) {
-                this.log('got', resultsSlice.length, 'objects but with warning (ok, but probably it is different client vs rpc versions)');
-            } else {
-                this.log('got', resultsSlice.length, 'objects');
-            }
-
-            if (resultsSlice && resultsSlice.length) {
-                results = results.concat(resultsSlice);
-            }
-        }
-
-        for (const object of objectsToFetch) {
-            const foundInResults = results.find(element => object.idEquals(element?.data?.objectId));
-            if (foundInResults) {
-                object.tryToFillDataFromObjectChange(foundInResults);
-                // this.log('got updates for object', object.address, object.fields);
-            } else {
-                // object is removed?
-                const foundInRemoved = results.find(element => (element?.error?.code == 'deleted' && object.idEquals(element?.error?.object_id)));
-                if (foundInRemoved) {
-                    object.markAsDeleted();
-                } else {
-                    this.log('not found in results', object);
-                }
-            }
-        }
+        return await this.objectStorage.fetchObjects();
     }
 
     async getNormalizedPackageAddress() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suidouble",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "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.js": "^0.37.1",
+    "@mysten/sui.js": "^0.39.0",
     "@wallet-standard/core": "^1.0.3"
   },
   "devDependencies": {