ecash-lib 1.2.2-rc4 → 1.2.2-rc5

package/dist/ecc.d.ts

@@ -7,18 +7,9 @@ export interface Ecc {
     /** Sign a Schnorr signature. msg needs to be a 32-byte hash */
     schnorrSign(seckey: Uint8Array, msg: Uint8Array): Uint8Array;
 }
-/** Uninitialized Ecc impl that throws an error asking for initWasm */
-export declare class EccBeforeWasm implements Ecc {
-    constructor();
-    derivePubkey(_seckey: Uint8Array): Uint8Array;
-    ecdsaSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
-    schnorrSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
-}
 /** Ecc implementation using WebAssembly */
 export declare let Ecc: {
     new (): Ecc;
-} | {
-    new (): EccBeforeWasm;
 };
 /** Dummy Ecc impl that always returns 0, useful for measuring tx size */
 export declare class EccDummy implements Ecc {

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,sEAAsE;AACtE,qBAAa,aAAc,YAAW,GAAG;;IAKrC,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,2CAA2C;AAC3C,eAAO,IAAI,GAAG,EAAE;IAAE,QAAQ,GAAG,CAAA;CAAE,GAAG;IAAE,QAAQ,aAAa,CAAA;CAAE,CAAC;AAE5D,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,QAS5C"}
+{"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,QAS5C"}

package/dist/ecc.js

@@ -3,23 +3,7 @@
 // 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 = exports.EccBeforeWasm = void 0;
-/** Uninitialized Ecc impl that throws an error asking for initWasm */
-class EccBeforeWasm {
-    constructor() {
-        throw new Error('Ecc is not initialized, initWasm() must be called');
-    }
-    derivePubkey(_seckey) {
-        throw new Error('Ecc is not initialized, initWasm() must be called');
-    }
-    ecdsaSign(_seckey, _msg) {
-        throw new Error('Ecc is not initialized, initWasm() must be called');
-    }
-    schnorrSign(_seckey, _msg) {
-        throw new Error('Ecc is not initialized, initWasm() must be called');
-    }
-}
-exports.EccBeforeWasm = EccBeforeWasm;
+exports.__setEcc = exports.EccDummy = exports.Ecc = void 0;
 /** Dummy Ecc impl that always returns 0, useful for measuring tx size */
 class EccDummy {
     derivePubkey(_seckey) {

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;;;AActE,sEAAsE;AACtE,MAAa,aAAa;IACtB;QACI,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACzE,CAAC;IAED,YAAY,CAAC,OAAmB;QAC5B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACzE,CAAC;IAED,SAAS,CAAC,OAAmB,EAAE,IAAgB;QAC3C,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACzE,CAAC;IAED,WAAW,CAAC,OAAmB,EAAE,IAAgB;QAC7C,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACzE,CAAC;CACJ;AAhBD,sCAgBC;AAKD,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;QACtB,QAAQ,EAAE;YACN,GAAG,CAAE,UAAkC,CAAC,QAAQ,IAAI,EAAE,CAAC;YACvD,GAAG,EAAE,GAAG;SACX;KAC0B,CAAC,CAAC;AACrC,CAAC;AATD,4BASC"}
+{"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;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/global.d.ts

@@ -3,11 +3,34 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 /**
- * Note this is duplicated in src/ecc.ts
- * We could not import it here as it leads to rel path errors in the
+ * 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
  */
-// BEGIN DUPLICATED CLASS DEFS
+
 /** Interface to abstract over Elliptic Curve Cryptography */
 export interface Ecc {
     /** Derive a public key from secret key. */
@@ -22,7 +45,7 @@ export interface Ecc {
 
 /** Ecc implementation using WebAssembly */
 export let Ecc: { new (): Ecc };
-// END DUPLICATED CLASS DEFS
+// END DUPLICATED CLASS DEFINITIONS
 
 export interface EcashLibHashes {
     sha256: (data: Uint8Array) => Uint8Array;
@@ -30,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-rc4",
+    "version": "1.2.2-rc5",
     "description": "Library for eCash transaction building",
     "main": "./dist/indexNodeJs.js",
     "browser": "./dist/indexBrowser.js",