Merge pull request #86 from virtualeconomy/develop

release: v0.2.4

Author: poiug07vsys

.gitignore

@@ -1,4 +1,5 @@
 /dist
 /lib
 /node_modules
-*.env
+*.env
+test*.js

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@virtualeconomy/js-vsys",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "The official JavaScript SDK for VSYS APIs",
   "keywords": [
     "vsys",
@@ -24,10 +24,12 @@
     "axlsign": "^1.0.0",
     "bignumber.js": "^9.0.2",
     "blakejs": "^1.1.1",
+    "bn.js": "^5.2.1",
     "bs58": "^5.0.0",
     "buffer": "^6.0.3",
     "crypto-js": "^4.1.1",
     "js-sha256": "^0.9.0",
+    "js-sha512": "^0.8.0",
     "keccak256": "^1.0.6",
     "node-fetch": "^2.6.0"
   },

package.json

@@ -0,0 +1,82 @@
+/**
+ * multisign_spec tests module multisign
+ * @module multiSignSpec
+ */
+
+'use strict';
+
+import { Buffer } from 'buffer';
+import Axlsign from 'axlsign';
+import bs58 from 'bs58';
+import * as jv from '../src/index.js';
+
+const PRI_KEY_1 = 'EV9ADJzYKZpk4MjxEkXxDSfRRSzBFnA9LEQNbepKZRFc';
+const PRI_KEY_2 = '3hQRGJkqKFbks77cZ12ugHxDtbweH3EZjhfVzfr4RqPs';
+
+const MSG = Buffer.from('test');
+const RAND = Buffer.from('b298c9d1947fcb8373a200232b6f6c79f7854814c74e66613b2ea0c843bdad50cb3c8373942f0a8a0aaada8c238c011279554f7459bab560b6eb43992aaf3886', 'hex');
+
+const MULPK1 = new jv.MultiSignPriKey(Buffer.from(bs58.decode(PRI_KEY_1)));
+const MULPK2 = new jv.MultiSignPriKey(Buffer.from(bs58.decode(PRI_KEY_2)));
+
+describe('Test multisign', function() {
+    it('should work with one key', () => {
+        const A = MULPK1.A;
+        const allAs = [A];
+
+        const xA = MULPK1.getxA([A]);
+        const xAs = [xA];
+        const unionA = jv.MultiSign.getUnionA(xAs);
+
+        const R = MULPK1.getR(MSG, RAND);
+        const Rs = [R];
+        const unionR = jv.MultiSign.getUnionR(Rs);
+
+        const subSig = MULPK1.sign(MSG, RAND, unionA, unionR, allAs);
+        const mulSig = jv.MultiSign.getSig(unionA, unionR, [subSig]);
+
+        const bpA = MULPK1.getbpA(allAs);
+        const bpAs = [bpA];
+        const mulPub = jv.MultiSign.getPub(bpAs);
+
+        const rawSig = Buffer.from(Axlsign.sign(MULPK1.priKey, MSG, RAND));
+
+        expect(rawSig.equals(mulSig)).toBeTrue();
+
+        const rawPub = Buffer.from(Axlsign.derivePublicKey(MULPK1.priKey));
+        expect(rawPub.equals(mulPub)).toBeTrue();
+
+        const valid = Axlsign.verify(mulPub, MSG, mulSig);
+        expect(valid).toBeTrue();
+    });
+
+    it('should work with two keys', () => {
+        const A1 = MULPK1.A; 
+        const A2 = MULPK2.A; 
+
+        const allAs = [A1, A2];
+
+        const xA1 = MULPK1.getxA(allAs);
+        const xA2 = MULPK2.getxA(allAs);
+        const xAs = [xA1, xA2];
+        const unionA = jv.MultiSign.getUnionA(xAs);
+
+        const R1 = MULPK1.getR(MSG, RAND);
+        const R2 = MULPK2.getR(MSG, RAND);
+        const Rs = [R1, R2];
+        const unionR = jv.MultiSign.getUnionR(Rs);
+
+        const subSig1 = MULPK1.sign(MSG, RAND, unionA, unionR, allAs);
+        const subSig2 = MULPK2.sign(MSG, RAND, unionA, unionR, allAs);
+        const sigs = [subSig1, subSig2];
+        const mulSig = jv.MultiSign.getSig(unionA, unionR, sigs);
+
+        const bpA1 = MULPK1.getbpA(allAs);
+        const bpA2 = MULPK2.getbpA(allAs);
+        const bpAs = [bpA1, bpA2];
+        const mulPub = jv.MultiSign.getPub(bpAs);
+
+        const valid = Axlsign.verify(mulPub, MSG, mulSig);
+        expect(valid).toBeTrue();
+    });
+});

spec/multisign_spec.js

@@ -16,7 +16,7 @@ import * as nft_ctrt_v2 from './nft_ctrt_v2.js';
 import * as sys_ctrt from './sys_ctrt.js';
 
 /** TokCtrtType is the class for token contract types */
-class TokCtrtType extends en.Enum {
+export class TokCtrtType extends en.Enum {
   static elems = {
     NFT: 'NonFungibleContract',
     NFT_V2_BLACKLIST: 'NFTContractWithBlacklist',

src/contract/tok_ctrt_factory.js

@@ -145,7 +145,7 @@ class Long extends DataEntry {
    * @returns {Long} The data entry.
    */
   static fromBytes(b) {
-    return new this(new md.Long.fromNumber(bp.unpackUInt64(b)));
+    return new this(md.Long.fromNumber(bp.unpackUInt64(b)));
   }
 
   /**

src/data_entry.js

@@ -4,6 +4,7 @@ export * from './account.js';
 export * from './tx_req.js';
 export * from './model.js';
 export * as de from './data_entry.js';
+export * from './multisign.js';
 export * from './contract/ctrt.js';
 export * from './contract/lock_ctrt.js';
 export * from './contract/atomic_swap_ctrt.js';

src/index.js

@@ -724,12 +724,22 @@ export class TokenID extends FixedSizedB58Str {
     return this.data === this.constructor.TESTNET_VSYS_TOK_ID;
   }
 
+  /**
+   * tokIdx returns the token index from the token id.
+   * @returns {TokenIdx} The token index.
+   */
+  get tokIdx() {
+    const tokIdNoChecksum = this.bytes.slice(0, -4);
+    const tokIdxBytes = tokIdNoChecksum.slice(-4);
+    return new TokenIdx(bp.unpackUInt32(tokIdxBytes));
+  }
+
   /**
    * getCtrtId gets the contract ID of the given token ID.
    * @returns {CtrtID} The contract ID.
    */
   getCtrtId() {
-    const b = bs58.decode(this.data);
+    const b = this.bytes;
     const rawCtrtId = b.slice(
       1,
       b.length - CtrtMeta.TOKEN_IDX_BYTES_LEN - CtrtMeta.CHECKSUM_LEN