suidouble 0.0.15 → 0.0.16

package/README.md

@@ -17,6 +17,7 @@ Set of provider, package and object classes for javascript representation of Sui
 - [Connecting web3 dapps to Sui](#sui-move-connect-in-browser)
 - [Todo](#todo)
 
+Also take a look at sample Vue dapp application [source code](https://github.com/suidouble/suidouble-sample-app) or [check it online](https://suidouble-sample-app.herokuapp.com/).
 
 ### installation
 

package/lib/SuiCliCommands.js

@@ -20,14 +20,40 @@ class SuiCliCommands {
             throw new Error('can not spawn a proccess in this env');
         }
 
-        const proc = doSpawn(command, [], {
-            env: {
-                ...process.env,
-                ...envVars,
-            }
+        return await new Promise((res,rej)=>{
+            let success = true;
+            let e = null;
+            const proc = doSpawn(command, [], {
+                env: {
+                    ...process.env,
+                    ...envVars,
+                }
+            });
+            proc.on('error', function(err) {
+                success = false;
+                e = err;
+            });
+
+            setTimeout(()=>{
+                if (success) {
+                    res(proc);
+                } else {
+                    rej(e);
+                }
+            }, 100);
         });
 
-        return proc;
+        // const proc = doSpawn(command, [], {
+        //     env: {
+        //         ...process.env,
+        //         ...envVars,
+        //     }
+        // });
+        // proc.on('error', function(err) {
+        //     console.log('Oh noez, teh errurz: ' + err);
+        // });
+
+        // return proc;
     }
 
     static async exec(command) {

package/lib/SuiInBrowser.js

@@ -11,7 +11,7 @@ class SuiInBrowser extends SuiCommonMethods {
 
         this._adapters = {};
 
-        this._defaultChain = 'sui:devnet';
+        this._defaultChain = params.defaultChain || 'sui:devnet';
 
         this._activeAdapter = null;
         this._connectedAddress = null;

package/lib/SuiLocalTestValidator.js

@@ -1,6 +1,7 @@
 // const { spawn } = require('child_process');
 const SuiCliCommands = require('./SuiCliCommands.js');
 const SuiCommonMethods = require('./SuiCommonMethods.js');
+const { JsonRpcProvider, localnetConnection, devnetConnection } = require('@mysten/sui.js');
 
 class SuiLocalTestValidator extends SuiCommonMethods {
     constructor(params = {}) {
@@ -8,6 +9,28 @@ class SuiLocalTestValidator extends SuiCommonMethods {
 
         this._child = null;
         this._active = false;
+
+        this._testFallbackEnabled = false;
+        if (params.testFallbackEnabled) { 
+            // option for unit tests to fallback to sui:dev network in case 
+            // there is no local validator installed
+            this._testFallbackEnabled = true;
+        }
+
+        this._providerName = 'sui:localnet';
+    }
+
+    get providerName() {
+        return this._providerName;
+    }
+
+    get provider() {
+        if (this._providerName === 'sui:localnet') {
+            return new JsonRpcProvider(localnetConnection);
+        } else if (this._providerName === 'sui:devnet') {
+            // if testFallbackEnabled == true and we can't start local node
+            return new JsonRpcProvider(devnetConnection);
+        }
     }
 
     get active() {
@@ -30,13 +53,28 @@ class SuiLocalTestValidator extends SuiCommonMethods {
     }
 
     async launch() {
-        if (this._child && this._active) {
+        if (this._active) {
             return this;
         }
 
         this.log('launching sui-test-validator ...');
 
-        this._child = await SuiCliCommands.spawn('sui-test-validator', { RUST_LOG: 'consensus=off' });
+        try {
+            this._child = await SuiCliCommands.spawn('sui-test-validator', { RUST_LOG: 'consensus=off' });
+        } catch (e) {
+            if (this._testFallbackEnabled) {
+                // can't start local node. Let's switch to sui:dev
+                this.log('can not start local node. Fallback to sui:dev...');
+
+                this._child = null;
+                this._active = true;
+                this._providerName = 'sui:devnet';
+
+                return this;
+            } else {
+                throw e;
+            }
+        }
 
         this.__readyLaunchedPromiseResolver = null;
         this.__readyLaunchedPromise = new Promise((res)=>{
@@ -67,6 +105,7 @@ class SuiLocalTestValidator extends SuiCommonMethods {
         });
 
         process.on('exit', ()=>{
+            console.log('this._testFallbackEnabled', this._testFallbackEnabled);
             if (this._child) {
                 this._child.kill();
             }

package/lib/SuiMaster.js

@@ -34,8 +34,16 @@ class SuiMaster extends SuiCommonMethods {
         this._providerName = null;
         if (params.provider) {
             if (params.provider == 'local' || (params.provider.constructor && params.provider.constructor.name && params.provider.constructor.name == 'SuiLocalTestValidator')) {
-                this._provider = new sui.JsonRpcProvider(sui.localnetConnection);
-                this._providerName = 'sui:localnet'; 
+                if (params.provider == 'local') {
+                    this._provider = new sui.JsonRpcProvider(sui.localnetConnection);
+                    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 sui.JsonRpcProvider(sui.testnetConnection);
                 this._providerName = 'sui:testnet';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suidouble",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "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": {

package/test/sui_in_browser.test.js

@@ -0,0 +1,65 @@
+'use strict'
+
+// just a basic test of InBrowser classes. No real interaction, just structure and events
+
+const t = require('tap');
+const { test } = t;
+
+const { SuiInBrowser } = require('..');
+
+test('as single instance', async t => {
+    // probably you'd want a single instance of SuiInBrowser class on your dapp,
+    // so initialize it via class' static method:
+    const suiInBrowser = SuiInBrowser.getSingleton();
+    const suiInBrowserCopy = SuiInBrowser.getSingleton();
+
+    t.equal(suiInBrowser, suiInBrowserCopy);
+});
+
+test('initialization', async t => {
+    const suiInBrowser = new SuiInBrowser({});
+
+    t.ok(suiInBrowser);
+
+    const gotAdapters = [];
+    // it should emit 'adapter' events, even though they are not installed (remember, we are in node.js now)
+    // adapter has propery of .isInstalled
+    suiInBrowser.addEventListener('adapter', (e)=>{
+        gotAdapters.push(e.detail);
+    });
+
+    // emit is not instant, but on *nextTick*
+    await new Promise((res)=>setTimeout(res, 100));
+
+    t.ok(gotAdapters.length > 0);
+
+    const suiWalletAdapter = gotAdapters.find((adapter)=>(adapter.name == 'Sui Wallet')); // there're few, but lets test one
+
+    t.ok(suiWalletAdapter);
+
+    t.equal(suiWalletAdapter.name, 'Sui Wallet');
+    t.ok(!suiWalletAdapter.isInstalled);
+    t.ok(suiWalletAdapter.icon);
+    t.ok(suiWalletAdapter.icon.indexOf('data:image/') != -1); // icon is data-url
+
+    t.ok(suiWalletAdapter.getDownloadURL()); // url to install extension
+    t.ok(suiWalletAdapter.getDownloadURL().indexOf('https://') != -1);
+
+    // we can get instance of suiMaster out of suiInBrowser even if we are not connected to wallet
+    // it will work without signer, but you can read data from chain
+    const suiMaster = await suiInBrowser.getSuiMaster();
+
+    t.ok(suiMaster);
+    t.ok(!suiMaster.connectedAddress); // nothing
+    t.ok(suiMaster.connectedChain);     // but there's chain
+
+    // by default, SuiInBrowser gets you devnet connection (it's overloaded by Wallet Extension current chain)
+    t.equal(suiMaster.connectedChain, 'sui:devnet'); 
+
+});
+
+test('initialization via mainnet', async t => {
+    const suiInBrowser = new SuiInBrowser({defaultChain: 'sui:mainnet'});
+    const suiMaster = await suiInBrowser.getSuiMaster();
+    t.equal(suiMaster.connectedChain, 'sui:mainnet'); 
+});

package/test/sui_master_onlocal.test.js

@@ -16,7 +16,7 @@ let contractAddressV2 = null;
 let chatShopObjectId = null;
 
 test('spawn local test node', async t => {
-    suiLocalTestValidator = await SuiLocalTestValidator.launch();
+    suiLocalTestValidator = await SuiLocalTestValidator.launch({ testFallbackEnabled: true });
     t.ok(suiLocalTestValidator.active);
 
     // SuiLocalTestValidator runs as signle instance. So you can't start it twice with static method
@@ -25,7 +25,7 @@ test('spawn local test node', async t => {
 });
 
 test('init suiMaster and connect it to local test validator', async t => {
-    suiMaster = new SuiMaster({provider: suiLocalTestValidator, as: 'somebody'});
+    suiMaster = new SuiMaster({provider: suiLocalTestValidator, as: 'somebody', debug: false});
     await suiMaster.initialize();
 
     t.ok(suiMaster.address); // there should be some address