suidouble 1.0.5 → 1.6.0

package/README.md

@@ -294,20 +294,21 @@ Don't forget to test transactions sending real money on devnet/testnet first!
 
 ##### composing transaction block yourself
 
-If you need more flexebility, there's always an option to construct the transaction block yourself:
+If you need more flexebility, there's always an option to construct the transaction yourself:
 
 ```javascript
-const { TransactionBlock, Transactions } = require('suidobule'); // this exposes classes from the "@mysten/sui.js", so you don't have to import them separately
+const { Transaction, txInput } = require('suidobule'); // this exposes classes from the "@mysten/sui.js", so you don't have to import them separately
 
-const txb = new TransactionBlock();
-txb.moveCall({
+const tx = new Transaction();
+tx.moveCall({
     target: `package_id::module_id::method_name`,
     arguments: [
-        txb.pure(contract.arg('u256', something)),
-        txb.object(someid),
+        txInput(tx, 'u256', some_value),
+        txInput(tx, 'vector<bool>', some_array),
+        tx.object('0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c'), // object ids are ok t
     ],
 });
-const moveCallResult = await contract.moveCall('suidouble_chat', 'post_pay', {tx: txb});
+const moveCallResult = await contract.moveCall('suidouble_chat', 'post_pay', {tx: tx});
 ```
 
 

package/index.js

@@ -16,4 +16,5 @@ module.exports = {
     Transaction: Transaction,
     Commands: Commands,
     SuiUtils: SuiUtils,
+    txInput: SuiUtils.txInput,
 };

package/lib/SuiPackage.js

@@ -452,8 +452,8 @@ class SuiPackage extends SuiObject {
 
         const authorizeUpgradeArguments = [
             cap,
-            tx.pure(this.arg('u8', UpgradePolicyCOMPATIBLE)), 
-            tx.pure(this.arg('vector<u8>', this._builtDigest)),
+            this._suiMaster.utils.txInput(tx, 'u8', UpgradePolicyCOMPATIBLE), 
+            this._suiMaster.utils.txInput(tx, 'vector<u8>', this._builtDigest), 
         ];
 
         const ticket = tx.moveCall({

package/lib/SuiPackageModule.js

@@ -166,6 +166,11 @@ class SuiPackageModule extends SuiCommonMethods {
                     const txCoinToSend = await suiCoin.coinOfAmountToTxCoin(tx, ownerAddress, param[0].amount);
 
                     callArgs.push(tx.makeMoveVec({ type: suiCoin.coinObjectType, elements: [txCoinToSend]}));
+                } else if (typeof param === 'string' && param.indexOf('0x') === 0) {
+                    callArgs.push(tx.object(param));
+                } else if (param && param.Pure && param.Pure.bytes) {
+                    // already Pure
+                    callArgs.push(this._suiMaster.utils.txInput(tx, param));
                 } else {
                     callArgs.push(tx.pure(param));
                 }

package/lib/SuiUtils.js

@@ -1,6 +1,7 @@
 const SuiCommonMethods = require('./SuiCommonMethods.js');
-const { Inputs } = require('@mysten/sui/transactions');
+const { Inputs, Transaction, Argument } = require('@mysten/sui/transactions');
 const { bcs } = require('@mysten/sui/bcs');
+const { fromB64 } = require('@mysten/bcs');
 const { SuiClient, getFullnodeUrl, SuiHTTPTransport } = require('@mysten/sui/client');
 const { normalizeSuiAddress } = require('@mysten/sui/utils');
 
@@ -8,6 +9,23 @@ const WebSocketClient = require('websocket').w3cwebsocket;
 
 class SuiUtils extends SuiCommonMethods {
 
+    /**
+     * Attacha the parameter input into transaction, to be used for moveCall
+     * accepts an Inputs.Pure (result of .pureInput) or type + value directly
+     * 
+     * @param {Transaction} tx 
+     * @param {Inputs.Pure | String} typeOrInput 
+     * @param {any | undefined} value 
+     * @returns Argument
+     */
+    static txInput(tx, typeOrInput, value = null) {
+        if (typeOrInput && typeOrInput.Pure && typeOrInput.Pure.bytes) {
+            return tx.pure(this.pureInputToBytes(typeOrInput));
+        } else {
+            return tx.pure(this.pureInputToBytes(this.pureInput(typeOrInput, value)));
+        }
+    }
+
     /**
      * Returns and Inputs.Pure for a given type
      *   to be used as moveCall parameters
@@ -58,6 +76,14 @@ class SuiUtils extends SuiCommonMethods {
         }
     }
 
+    /**
+     * Convert sui's PureInput into bcs serialized bytes
+     * @param {Inputs.Pure} pureInput 
+     */
+    static pureInputToBytes(pureInput) {
+        return fromB64(pureInput.Pure.bytes);
+    }
+
     /**
      * Wrapper for sui's utils normalizeSuiAddress
      * Perform the following operations:

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "suidouble",
-  "version": "1.0.5",
+  "version": "1.6.0",
   "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": {
-    "test": "tap -j=1 ./test/*.test.js",
-    "coverage": "tap -j=1 ./test/*.test.js"
+    "test": "tap -j1 -t120 ./test/*.test.js",
+    "coverage": "tap -j1 -t120 ./test/*.test.js"
   },
   "keywords": [
     "sui",
@@ -21,12 +21,12 @@
   "author": "Jeka Kiselyov <jeka911@gmail.com> (https://github.com/jeka-kiselyov)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@mysten/sui": "1.0.5",
+    "@mysten/sui": "^1.6.0",
     "@wallet-standard/core": "^1.0.3",
     "websocket": "^1.0.35"
   },
   "devDependencies": {
-    "tap": "^16.3.4"
+    "tap": "^21.0.1"
   },
   "browser": {
     "child_process": false,
@@ -34,9 +34,5 @@
     "path": false
   },
   "tap": {
-    "branches": 90,
-    "lines": 90,
-    "functions": 90,
-    "statements": 90
   }
 }

package/test/coins.test.js

@@ -89,7 +89,7 @@ test('getting coin objects for a transaction', async t => {
 
     const tx = new Transaction();
     const coinInput = await suiCoin.coinOfAmountToTxCoin(tx, suiMaster.address, suiMaster.MIST_PER_SUI); // pick 1 SUI
-    tx.transferObjects([coinInput], tx.pure('0x1d20dcdb2bca4f508ea9613994683eb4e76e9c4ed371169677c1be02aaf0b12a')); // send it anywhere
+    tx.transferObjects([coinInput], '0x1d20dcdb2bca4f508ea9613994683eb4e76e9c4ed371169677c1be02aaf0b12a'); // send it anywhere
 
     const result = await suiMaster.signAndExecuteTransaction({
         transaction: tx,