suidouble 1.14.3 → 1.15.1-2

package/index.js

@@ -7,6 +7,7 @@ import SuiLocalTestValidator from './lib/SuiLocalTestValidator.js';
 import SuiMemoryObjectStorage from './lib/SuiMemoryObjectStorage.js';
 import SuiCoin from './lib/SuiCoin.js';
 import SuiCoins from './lib/SuiCoins.js';
+import SuiPaginatedResponse from './lib/SuiPaginatedResponse.js';
 import { Transaction, Commands } from '@mysten/sui/transactions';
 import { bcs } from '@mysten/sui/bcs';
 
@@ -28,4 +29,5 @@ export {
     SuiMemoryObjectStorage,
     SuiCoin,
     SuiCoins,
+    SuiPaginatedResponse,
 };

package/lib/SuiCoin.js

@@ -103,10 +103,10 @@ export default class SuiCoin {
             const asBig = BigInt(Math.floor(Number(asFloatString)));
 
             if (asBig > 1000n) {
-                if (asBig < 1000000n) return this.formatWithAbbr(asBig, 1000n, 'K');
-                if (asBig >= 1000000n && asBig < 1000000000n) return this.formatWithAbbr(asBig, 1000000n, 'M');
-                if (asBig >= 1000000000n && asBig < 1000000000000n) return this.formatWithAbbr(asBig, 1000000000n, 'B');
-                if (asBig >= 1000000000000n) return this.formatWithAbbr(asBig, 1000000000000n, 'T');
+                if (asBig < 1000000n) return this.formatWithAbbr(asBig, 1000n, 'K', separateThousands);
+                if (asBig >= 1000000n && asBig < 1000000000n) return this.formatWithAbbr(asBig, 1000000n, 'M', separateThousands);
+                if (asBig >= 1000000000n && asBig < 1000000000000n) return this.formatWithAbbr(asBig, 1000000000n, 'B', separateThousands);
+                if (asBig >= 1000000000000n) return this.formatWithAbbr(asBig, 1000000000000n, 'T', separateThousands);
             }
         }
 
@@ -133,12 +133,20 @@ export default class SuiCoin {
      * 
      * @returns {string}
      */
-    formatWithAbbr(amount, measureUnit, abbrSymbol) {
-        let showAmount = (''+(Number(amount) / Number(measureUnit / 1000n)));
+    formatWithAbbr(amount, measureUnit, abbrSymbol, separateThousands = false) {
+        let showAmount = (''+Math.floor(Number(amount) / Number(measureUnit / 1000n)));
         showAmount = showAmount.padEnd(4, '0');
 
         const result = Intl.NumberFormat('en-US').format(Number(showAmount));
-        return result.replace(',', '.') + abbrSymbol;
+
+        let separator = '';
+        if (separateThousands) {
+            separator = (typeof separateThousands === 'string') ? separateThousands : ',';
+        }
+
+        const pcs = result.split(',');
+        const lastPc = pcs.pop();
+        return pcs.join( separator ) + '.' + lastPc + abbrSymbol;
     }
 
 
@@ -222,7 +230,7 @@ export default class SuiCoin {
         }
 
         if (this.__getMetadataPromise) {
-            return await this.__getMetadataPromise();
+            return await this.__getMetadataPromise;
         }
 
         // be sure it asyncs in 1 thread

package/lib/SuiMaster.js

@@ -162,6 +162,13 @@ export default class SuiMaster extends SuiCommonMethods {
     get SuiEvent() {
         return SuiEvent;
     }
+    /**
+     * Referencing it here to get rid of circullar dependency. So you can always call SuiPaginatedResponse contructor if you have instance of SuiMaster
+     */
+    get SuiPaginatedResponse() {
+        return SuiPaginatedResponse;
+    }
+    /**
 
     /**
      * Storage storing all objects interacted by this suiMaster
@@ -406,10 +413,13 @@ export default class SuiMaster extends SuiCommonMethods {
     }
 
     async fetchTransactions(params = {}) {
-        const filter = {};
+        let filter = {};
         if (params.fromAddress) {
             filter.FromAddress = params.fromAddress;
         }
+        if (params.filter) {
+            filter = params.filter;
+        }
 
         const queryParams = {
             descending_order: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suidouble",
-  "version": "1.14.3",
+  "version": "1.15.1-2",
   "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",
   "type": "module",
@@ -22,7 +22,7 @@
   "author": "suidouble (https://github.com/suidouble)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@mysten/sui": "^1.14.3",
+    "@mysten/sui": "^1.15.1",
     "@polymedia/coinmeta": "^0.0.17",
     "@wallet-standard/core": "^1.0.3",
     "websocket": "^1.0.35"

package/test/coins.test.js

@@ -108,11 +108,27 @@ test('string representation (withAbbr) works ok', async t => {
     const toDisplayM2 = suiCoin.amountToString(suiMaster.MIST_PER_SUI * BigInt(2000000) + BigInt(900), {withAbbr: true}); // 1000 SUI + 1 mist
     t.equal(toDisplayM2, '2.000M');
 
+    const toDisplayM2spec = suiCoin.amountToString(148518424765531477n, {withAbbr: true}); // 1000 SUI + 1 mist
+    t.equal(toDisplayM2spec, '148.518M');
+    
+
     const toDisplayB1 = suiCoin.amountToString(suiMaster.MIST_PER_SUI * BigInt(1000000000) + BigInt(1), {withAbbr: true}); // 1000 SUI + 1 mist
     t.equal(toDisplayB1, '1.000B');
 
+    const toDisplayB2spec = suiCoin.amountToString(148518424765531477000n, {withAbbr: true}); // 1000 SUI + 1 mist
+    t.equal(toDisplayB2spec, '148.518B');
+
     const toDisplayT1 = suiCoin.amountToString(suiMaster.MIST_PER_SUI * BigInt(1000000000000) + BigInt(1), {withAbbr: true}); // 1000 SUI + 1 mist
     t.equal(toDisplayT1, '1.000T');
+
+    const toDisplayT2spec = suiCoin.amountToString(148518424765531477000000n, {withAbbr: true}); // 1000 SUI + 1 mist
+    t.equal(toDisplayT2spec, '148.518T');
+
+    const toDisplayT20spec = suiCoin.amountToString(148518424765531477000000000n, {withAbbr: true}); // 1000 SUI + 1 mist
+    t.equal(toDisplayT20spec, '148518.424T');
+
+    const toDisplayT20spec2 = suiCoin.amountToString(148518424765531477000000000n, {withAbbr: true, separateThousands: true}); // 1000 SUI + 1 mist
+    t.equal(toDisplayT20spec2, '148,518.424T');
 });