ecash-lib 1.2.2-rc → 1.2.2-rc10

package/dist/ecc.d.ts

@@ -8,16 +8,21 @@ export interface Ecc {
     schnorrSign(seckey: Uint8Array, msg: Uint8Array): Uint8Array;
 }
 /** Ecc implementation using WebAssembly */
-export declare let Ecc: {
-    new (): Ecc;
-};
+declare class EccUninitialized implements Ecc {
+    constructor();
+    derivePubkey(_seckey: Uint8Array): Uint8Array;
+    ecdsaSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
+    schnorrSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
+}
 /** Dummy Ecc impl that always returns 0, useful for measuring tx size */
 export declare class EccDummy implements Ecc {
     derivePubkey(_seckey: Uint8Array): Uint8Array;
     ecdsaSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
     schnorrSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
 }
+export declare let Ecc: typeof EccUninitialized;
 export declare function __setEcc(ecc: {
     new (): Ecc;
 }): void;
+export {};
 //# sourceMappingURL=ecc.d.ts.map

package/dist/ecc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ecc.d.ts","sourceRoot":"","sources":["../src/ecc.ts"],"names":[],"mappings":"AAIA,6DAA6D;AAC7D,MAAM,WAAW,GAAG;IAChB,2CAA2C;IAC3C,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAAC;IAE7C,8DAA8D;IAC9D,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,UAAU,CAAC;IAE3D,+DAA+D;IAC/D,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,UAAU,CAAC;CAChE;AAED,2CAA2C;AAC3C,eAAO,IAAI,GAAG,EAAE;IAAE,QAAQ,GAAG,CAAA;CAAE,CAAC;AAEhC,yEAAyE;AACzE,qBAAa,QAAS,YAAW,GAAG;IAChC,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU;IAI7C,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU;IAI5D,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU;CAGjE;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE;IAAE,QAAQ,GAAG,CAAA;CAAE,QAM5C"}
+{"version":3,"file":"ecc.d.ts","sourceRoot":"","sources":["../src/ecc.ts"],"names":[],"mappings":"AAIA,6DAA6D;AAC7D,MAAM,WAAW,GAAG;IAChB,2CAA2C;IAC3C,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAAC;IAE7C,8DAA8D;IAC9D,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,UAAU,CAAC;IAE3D,+DAA+D;IAC/D,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,UAAU,CAAC;CAChE;AAED,2CAA2C;AAC3C,cAAM,gBAAiB,YAAW,GAAG;;IAOjC,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU;IAI7C,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU;IAI5D,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU;CAGjE;AAED,yEAAyE;AACzE,qBAAa,QAAS,YAAW,GAAG;IAChC,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU;IAI7C,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU;IAI5D,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU;CAGjE;AAID,eAAO,IAAI,GAAG,yBAOV,CAAC;AAEL,wBAAgB,QAAQ,CAAC,GAAG,EAAE;IAAE,QAAQ,GAAG,CAAA;CAAE,QAS5C"}

package/dist/ecc.js

@@ -3,7 +3,24 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__setEcc = exports.EccDummy = exports.Ecc = void 0;
+exports.__setEcc = exports.Ecc = exports.EccDummy = void 0;
+/** Ecc implementation using WebAssembly */
+class EccUninitialized {
+    constructor() {
+        if (!exports.Ecc.prototype.derivePubkey) {
+            throw new Error('Ecc not initialized. Call initWasm first.');
+        }
+    }
+    derivePubkey(_seckey) {
+        throw new Error('Ecc not initialized. Call initWasm first.');
+    }
+    ecdsaSign(_seckey, _msg) {
+        throw new Error('Ecc not initialized. Call initWasm first.');
+    }
+    schnorrSign(_seckey, _msg) {
+        throw new Error('Ecc not initialized. Call initWasm first.');
+    }
+}
 /** Dummy Ecc impl that always returns 0, useful for measuring tx size */
 class EccDummy {
     derivePubkey(_seckey) {
@@ -17,9 +34,20 @@ class EccDummy {
     }
 }
 exports.EccDummy = EccDummy;
+// Ecc is EccUninitialized if not available in globalThis
+// Ecc is as expected if initWasm() has placed it in globalThis
+exports.Ecc = (() => {
+    const globalEcc = globalThis.ecashlib?.Ecc;
+    return globalEcc || EccUninitialized;
+})();
 function __setEcc(ecc) {
     exports.Ecc = ecc;
-    Object.assign(globalThis, { ecashlib: { Ecc: ecc } });
+    Object.assign(globalThis, {
+        ecashlib: {
+            ...(globalThis.ecashlib || {}),
+            Ecc: ecc,
+        },
+    });
 }
 exports.__setEcc = __setEcc;
 //# sourceMappingURL=ecc.js.map

package/dist/ecc.js.map

@@ -1 +1 @@
-{"version":3,"file":"ecc.js","sourceRoot":"","sources":["../src/ecc.ts"],"names":[],"mappings":";AAAA,4CAA4C;AAC5C,mEAAmE;AACnE,sEAAsE;;;AAiBtE,yEAAyE;AACzE,MAAa,QAAQ;IACjB,YAAY,CAAC,OAAmB;QAC5B,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,OAAmB,EAAE,IAAgB;QAC3C,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,OAAmB,EAAE,IAAgB;QAC7C,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;CACJ;AAZD,4BAYC;AAED,SAAgB,QAAQ,CAAC,GAAoB;IACzC,WAAG,GAAG,GAAG,CAAC;IAEV,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAEjD,CAAC,CAAC;AACP,CAAC;AAND,4BAMC"}
+{"version":3,"file":"ecc.js","sourceRoot":"","sources":["../src/ecc.ts"],"names":[],"mappings":";AAAA,4CAA4C;AAC5C,mEAAmE;AACnE,sEAAsE;;;AActE,2CAA2C;AAC3C,MAAM,gBAAgB;IAClB;QACI,IAAI,CAAC,WAAG,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QACjE,CAAC;IACL,CAAC;IAED,YAAY,CAAC,OAAmB;QAC5B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC;IAED,SAAS,CAAC,OAAmB,EAAE,IAAgB;QAC3C,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC;IAED,WAAW,CAAC,OAAmB,EAAE,IAAgB;QAC7C,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC;CACJ;AAED,yEAAyE;AACzE,MAAa,QAAQ;IACjB,YAAY,CAAC,OAAmB;QAC5B,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,OAAmB,EAAE,IAAgB;QAC3C,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,OAAmB,EAAE,IAAgB;QAC7C,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;CACJ;AAZD,4BAYC;AAED,yDAAyD;AACzD,+DAA+D;AACpD,QAAA,GAAG,GAAG,CAAC,GAAG,EAAE;IACnB,MAAM,SAAS,GACX,UAGH,CAAC,QAAQ,EAAE,GAAG,CAAC;IAChB,OAAO,SAAS,IAAI,gBAAgB,CAAC;AACzC,CAAC,CAAC,EAAE,CAAC;AAEL,SAAgB,QAAQ,CAAC,GAAoB;IACzC,WAAG,GAAG,GAAG,CAAC;IAEV,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,QAAQ,EAAE;YACN,GAAG,CAAE,UAAkC,CAAC,QAAQ,IAAI,EAAE,CAAC;YACvD,GAAG,EAAE,GAAG;SACX;KAC0B,CAAC,CAAC;AACrC,CAAC;AATD,4BASC"}

package/dist/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAIhD,wBAAgB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAMnD;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAMpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAMtD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,cAAc,QAMjD"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAIhD,wBAAgB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAMnD;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAMpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAMtD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,cAAc,QASjD"}

package/dist/hash.js

@@ -19,7 +19,12 @@ function shaRmd160(data) {
 exports.shaRmd160 = shaRmd160;
 function __setHashes(hashes) {
     HASHES = hashes;
-    Object.assign(globalThis, { ecashlib: { HASHES: hashes } });
+    Object.assign(globalThis, {
+        ecashlib: {
+            ...(globalThis.ecashlib || {}),
+            HASHES: hashes,
+        },
+    });
 }
 exports.__setHashes = __setHashes;
 //# sourceMappingURL=hash.js.map

package/dist/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":";AAAA,4CAA4C;AAC5C,mEAAmE;AACnE,sEAAsE;;;AAItE,IAAI,MAAsB,CAAC;AAE3B,SAAgB,MAAM,CAAC,IAAgB;IACnC,OACI,UAGH,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAND,wBAMC;AACD,SAAgB,OAAO,CAAC,IAAgB;IACpC,OACI,UAGH,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAND,0BAMC;AACD,SAAgB,SAAS,CAAC,IAAgB;IACtC,OACI,UAGH,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAND,8BAMC;AAED,SAAgB,WAAW,CAAC,MAAsB;IAC9C,MAAM,GAAG,MAAM,CAAC;IAEhB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAEvD,CAAC,CAAC;AACP,CAAC;AAND,kCAMC"}
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":";AAAA,4CAA4C;AAC5C,mEAAmE;AACnE,sEAAsE;;;AAItE,IAAI,MAAsB,CAAC;AAE3B,SAAgB,MAAM,CAAC,IAAgB;IACnC,OACI,UAGH,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAND,wBAMC;AACD,SAAgB,OAAO,CAAC,IAAgB;IACpC,OACI,UAGH,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAND,0BAMC;AACD,SAAgB,SAAS,CAAC,IAAgB;IACtC,OACI,UAGH,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAND,8BAMC;AAED,SAAgB,WAAW,CAAC,MAAsB;IAC9C,MAAM,GAAG,MAAM,CAAC;IAEhB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,QAAQ,EAAE;YACN,GAAG,CAAE,UAAkC,CAAC,QAAQ,IAAI,EAAE,CAAC;YACvD,MAAM,EAAE,MAAM;SACjB;KAC0B,CAAC,CAAC;AACrC,CAAC;AATD,kCASC"}

package/global.d.ts

@@ -2,7 +2,50 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-import { Ecc } from './src/ecc';
+/**
+ * global.d.ts
+ *
+ * Extend globalThis to include a new namespace, ecashlib
+ * We use this namespace to store lib functions that are only
+ * available after initWasm()
+ *
+ * We store all lib methods in ecashlib namespace to reduce chances of
+ * namespace collision in global this
+ *
+ * In general, dependency injection is a better practice, and this is what
+ * ecash-lib used until 1.2.2
+ *
+ * However dependency injection caused issues with libraries that used ecash-lib
+ * as a dependency, like ecash-agora. Methods that "should" have been available
+ * after initWasm() would not be available.
+ *
+ * Resolved by adding to globalThis (as responsibly as possible)
+ */
+
+// BEGIN DUPLICATED CLASS DEFINITIONS
+
+/**
+ * Note
+ * These definitions are duplicated in src/ecc.ts
+ * Could not import it here as it leads to rel path errors in the
+ * published dependency when it is consumed by other apps
+ */
+
+/** Interface to abstract over Elliptic Curve Cryptography */
+export interface Ecc {
+    /** Derive a public key from secret key. */
+    derivePubkey(seckey: Uint8Array): Uint8Array;
+
+    /** Sign an ECDSA signature. msg needs to be a 32-byte hash */
+    ecdsaSign(seckey: Uint8Array, msg: Uint8Array): Uint8Array;
+
+    /** Sign a Schnorr signature. msg needs to be a 32-byte hash */
+    schnorrSign(seckey: Uint8Array, msg: Uint8Array): Uint8Array;
+}
+
+/** Ecc implementation using WebAssembly */
+export let Ecc: { new (): Ecc };
+// END DUPLICATED CLASS DEFINITIONS
 
 export interface EcashLibHashes {
     sha256: (data: Uint8Array) => Uint8Array;
@@ -10,7 +53,7 @@ export interface EcashLibHashes {
     shaRmd160: (data: Uint8Array) => Uint8Array;
 }
 
-// Extend global this to include hashes
+// Extend global this to include HASHES and Ecc
 declare global {
     interface GlobalThis {
         ecashlib: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ecash-lib",
-    "version": "1.2.2-rc",
+    "version": "1.2.2-rc10",
     "description": "Library for eCash transaction building",
     "main": "./dist/indexNodeJs.js",
     "browser": "./dist/indexBrowser.js",