suidouble 0.0.48 → 0.0.49

package/README.md

@@ -49,7 +49,7 @@ const { SuiMaster } = require('suidouble');
 You can initialize it directly, if you have keypair, secret phrase and can use it in code (so on node.js side - server side or CLI apps):
 ```javascript
 const suiMaster = new SuiMaster({
-    keypair: Ed25519Keypair,
+    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 
 });
@@ -64,6 +64,12 @@ const suiMaster = new SuiMaster({
     accountIndex: 1, // derive path index (you can generate few addresses with same seed phrase)
     provider: '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', 
+});
 ```
 
 Also, there's option to generate pseudo-random phrases and wallets from strings, works like a charm for testing:

package/lib/SuiMaster.js

@@ -10,6 +10,8 @@ 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');
 
@@ -34,14 +36,36 @@ class SuiMaster extends SuiCommonMethods {
         } else if (params.keypair) {
             this._keypair = params.keypair;
         } else if (params.phrase) {
-            if (!params.accountIndex) {
-                this._keypair = Ed25519Keypair.deriveKeypair(params.phrase);
+            if (params.keypairAlgo && (''+params.keypairAlgo).toLowerCase() == 'secp256r1') {
+                if (!params.accountIndex) {
+                    this._keypair = Secp256r1Keypair.deriveKeypair(params.phrase);
+                } else {
+                    // remember you can generate many addresses with same seed?
+                    const derivePath = `m/74'/784'/${params.accountIndex}'/0/0`;
+                    this._keypair = Secp256r1Keypair.deriveKeypair(params.phrase, derivePath);
+                }
+            } else if (params.keypairAlgo && (''+params.keypairAlgo).toLowerCase() == 'secp256k1') {
+                if (!params.accountIndex) {
+                    this._keypair = Secp256k1Keypair.deriveKeypair(params.phrase);
+                } else {
+                    // remember you can generate many addresses with same seed?
+                    const derivePath = `m/54'/784'/${params.accountIndex}'/0/0`;
+                    this._keypair = Secp256k1Keypair.deriveKeypair(params.phrase, derivePath);
+                }
             } else {
-                // remember you can generate many addresses with same seed?
-                const derivePath = `m/44'/784'/${params.accountIndex}'/0'/0'`;
-                this._keypair = Ed25519Keypair.deriveKeypair(params.phrase, derivePath);
+                // default is Ed25519{
+                // default is Ed25519
+
+                if (!params.accountIndex) {
+                    this._keypair = Ed25519Keypair.deriveKeypair(params.phrase);
+                } else {
+                    // remember you can generate many addresses with same seed?
+                    const derivePath = `m/44'/784'/${params.accountIndex}'/0'/0'`;
+                    this._keypair = Ed25519Keypair.deriveKeypair(params.phrase, derivePath);
+                }
             }
 
+
             this.log('goint to use keypair of', this._keypair.getPublicKey().toSuiAddress());
         } else if (params.as) {
             // generate pseudo-random keypair

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suidouble",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "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.41.0",
+    "@mysten/sui.js": "^0.42.0",
     "@wallet-standard/core": "^1.0.3"
   },
   "devDependencies": {

package/test/sui_master_basic.test.js

@@ -55,6 +55,39 @@ test('keypair generation with seed phrase works ok', async t => {
     t.equal(`${suiMasterNextAccount.address}`, `0xa6fb5c51b751e07a3e3b3af1f40f3115004702aad5a96263ff0be9078195f43b`, 'Ed25519 next account generated ok');
 });
 
+test('keypair generation with seed phrase works ok with secp256r1', async t => {
+    // Ed25519
+    const phrase = 'seek weekend run rival noodle dog alone mosquito decide hover aerobic fiction'; // 
+    const suiMaster = new SuiMaster({provider: 'test', phrase: phrase, keypairAlgo: 'secp256r1'});
+    await suiMaster.initialize();
+
+    t.equal(`${suiMaster.address}`, `0x444f18d480b4d776d7679fae88ebb4f274941a81c3d98db430f7bd13f82e287d`, 'secp256r1 generated ok');
+
+    const suiMasterNextAccount = new SuiMaster({provider: 'test', phrase: phrase, accountIndex: 1, keypairAlgo: 'secp256r1'}); // default = 0
+    await suiMasterNextAccount.initialize();
+
+    t.notEqual(`${suiMaster.address}`, `${suiMasterNextAccount.address}`);
+
+    t.equal(`${suiMasterNextAccount.address}`, `0xae496597c64aa6b1aaa03792c0ba0a725b1212adcb0df85d22c447cd57c21c95`, 'secp256r1 next account generated ok');
+});
+
+
+test('keypair generation with seed phrase works ok with secp256k1', async t => {
+    // Ed25519
+    const phrase = 'seek weekend run rival noodle dog alone mosquito decide hover aerobic fiction'; // 
+    const suiMaster = new SuiMaster({provider: 'test', phrase: phrase, keypairAlgo: 'secp256k1'});
+    await suiMaster.initialize();
+
+    t.equal(`${suiMaster.address}`, `0x86a5dd3def25cab060af90f438842524894c7901839a954b2e9547ecc0f35ef8`, 'secp256k1 generated ok');
+
+    const suiMasterNextAccount = new SuiMaster({provider: 'test', phrase: phrase, accountIndex: 1, keypairAlgo: 'secp256k1'}); // default = 0
+    await suiMasterNextAccount.initialize();
+
+    t.notEqual(`${suiMaster.address}`, `${suiMasterNextAccount.address}`);
+
+    t.equal(`${suiMasterNextAccount.address}`, `0xc5390344b0344a3e657176eaf72ca00ecf3ed4ec791640b6fc65a11cb680c53f`, 'secp256k1 next account generated ok');
+});
+
 test('SuiMaster has MIST_PER_SUI property available as BigInt', async t => {
     const suiMaster = new SuiMaster({provider: 'test', as: 'somebody'});
 

package/test/test_move_contracts/suidouble_chat/Move.lock

@@ -3,7 +3,7 @@
 [move]
 version = 0
 manifest_digest = "F8C73BB1CA5B2EEF078E6FD0C793EF387322A4AD49DECCFE6AAD9F5F81C198C8"
-deps_digest = "112928C94A84031C09CD9B9D1D44B149B73FC0EEA5FA8D8B2D7CA4D91936335A"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
 
 dependencies = [
   { name = "Sui" },