ecash-lib 1.2.2-rc13 → 1.2.2-rc14

package/dist/ecc.d.ts

@@ -14,8 +14,14 @@ export declare class EccDummy implements Ecc {
     schnorrSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
 }
 /** Ecc implementation using WebAssembly */
-export declare let Ecc: {
-    new (): Ecc;
+/** Ecc implementation using WebAssembly */
+/** Ecc implementation using WebAssembly */
+export declare const Ecc: {
+    new (): {
+        derivePubkey(_seckey: Uint8Array): Uint8Array;
+        ecdsaSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
+        schnorrSign(_seckey: Uint8Array, _msg: Uint8Array): Uint8Array;
+    };
 };
 export declare function __setEcc(ecc: {
     new (): 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,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,2CAA2C;AAC3C,eAAO,IAAI,GAAG,EAAE;IAAE,QAAQ,GAAG,CAAA;CAAE,CAAC;AAEhC,wBAAgB,QAAQ,CAAC,GAAG,EAAE;IAAE,QAAQ,GAAG,CAAA;CAAE,QAe5C"}
+{"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,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;AAuBD,2CAA2C;AA6C3C,2CAA2C;AAC3C,2CAA2C;AAG3C,eAAO,MAAM,GAAG;;8BAEc,UAAU,GAAG,UAAU;2BAI1B,UAAU,QAAQ,UAAU,GAAG,UAAU;6BAIvC,UAAU,QAAQ,UAAU,GAAG,UAAU;;CAcrE,CAAC;AAEF,wBAAgB,QAAQ,CAAC,GAAG,EAAE;IAAE,QAAQ,GAAG,CAAA;CAAE,QAsB5C"}

package/dist/ecc.js

@@ -17,19 +17,100 @@ class EccDummy {
     }
 }
 exports.EccDummy = EccDummy;
+/** Uninitialized Ecc for fallback */
+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.');
+    }
+}
+/** Ecc implementation using WebAssembly */
+//export let Ecc: { new (): Ecc };
+// note this doesn't work bc we can't build ecash-lib without it throwing an undefined error
+// otherwise it would probably work
+//export const Ecc = (globalThis as unknown as GlobalThis).ecashlib.Ecc;
+// This won't work because it gets assigned when it runs
+// TODO next step is to re-explore grok's getter setter solution
+/* Uncomment these to get back to the failure you understand
+export let Ecc = (() => {
+    return 'ecashlib' in globalThis &&
+        'Ecc' in (globalThis as unknown as GlobalThis).ecashlib
+        ? (globalThis as unknown as GlobalThis).ecashlib.Ecc
+        : EccUninitialized;
+})();
+
+export function __setEcc(ecc: { new (): Ecc }) {
+    console.log(
+        `ecashlib in globalThis BEFORE injection`,
+        'ecashlib' in globalThis,
+    );
+    Object.assign(globalThis, {
+        ecashlib: {
+            ...((globalThis as Record<string, any>).ecashlib || {}),
+            Ecc: ecc,
+        },
+    } as Partial<typeof globalThis>);
+    console.log(
+        `ecashlib in globalThis AFTER injection`,
+        'ecashlib' in globalThis,
+    );
+
+    // Update Ecc now that we know it is available in globalThis
+    console.log(`Updating Ecc in __setEcc`);
+    console.log(`Ecc before update`, Ecc);
+    // Re-assign
+    // But if we call initWasm() in parent lib, it does not reassign in the child lib
+    // So we need to "get it right" without any re-assigning
+    Ecc = (globalThis as unknown as GlobalThis).ecashlib.Ecc;
+    console.log(`Ecc after update`, Ecc);
+}
+*/
+/** Ecc implementation using WebAssembly */
+/** Ecc implementation using WebAssembly */
+// Define Ecc as a getter function
+exports.Ecc = new Proxy(class {
+    derivePubkey(_seckey) {
+        return new Uint8Array(33);
+    }
+    ecdsaSign(_seckey, _msg) {
+        return new Uint8Array(73);
+    }
+    schnorrSign(_seckey, _msg) {
+        return new Uint8Array(64);
+    }
+}, {
+    construct: () => {
+        const currentEcc = 'ecashlib' in globalThis &&
+            'Ecc' in globalThis.ecashlib
+            ? globalThis.ecashlib.Ecc
+            : EccUninitialized;
+        return new currentEcc();
+    },
+});
 function __setEcc(ecc) {
-    console.log(`globalThis before injection`, globalThis);
+    console.log(`Ecc before update`, exports.Ecc);
+    console.log(`ecashlib in globalThis BEFORE injection`, 'ecashlib' in globalThis);
     Object.assign(globalThis, {
         ecashlib: {
             ...(globalThis.ecashlib || {}),
             Ecc: ecc,
         },
     });
-    console.log(`globalThis after injection`, globalThis);
+    console.log(`ecashlib in globalThis AFTER injection`, 'ecashlib' in globalThis);
     // Update Ecc now that we know it is available in globalThis
-    console.log(`updating Ecc`);
-    console.log(`Ecc before update`, exports.Ecc);
-    exports.Ecc = globalThis.ecashlib.Ecc;
+    //console.log(`Updating Ecc in __setEcc`);
+    //console.log(`Ecc before update`, Ecc);
+    //Ecc = ecc; // This will use the setter defined above
     console.log(`Ecc after update`, exports.Ecc);
 }
 exports.__setEcc = __setEcc;

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,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;AAKD,SAAgB,QAAQ,CAAC,GAAoB;IACzC,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAC;IACvD,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;IACjC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC;IAEtD,4DAA4D;IAC5D,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC5B,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAG,CAAC,CAAC;IACtC,WAAG,GAAI,UAAoC,CAAC,QAAQ,CAAC,GAAG,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,WAAG,CAAC,CAAC;AACzC,CAAC;AAfD,4BAeC"}
+{"version":3,"file":"ecc.js","sourceRoot":"","sources":["../src/ecc.ts"],"names":[],"mappings":";AAAA,4CAA4C;AAC5C,mEAAmE;AACnE,sEAAsE;;;AActE,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,qCAAqC;AACrC,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,2CAA2C;AAC3C,kCAAkC;AAElC,4FAA4F;AAC5F,mCAAmC;AACnC,wEAAwE;AAExE,wDAAwD;AACxD,gEAAgE;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiCE;AAEF,2CAA2C;AAC3C,2CAA2C;AAE3C,kCAAkC;AACrB,QAAA,GAAG,GAAG,IAAI,KAAK,CACxB;IACI,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,EACD;IACI,SAAS,EAAE,GAAG,EAAE;QACZ,MAAM,UAAU,GACZ,UAAU,IAAI,UAAU;YACxB,KAAK,IAAK,UAAoC,CAAC,QAAQ;YACnD,CAAC,CAAE,UAAoC,CAAC,QAAQ,CAAC,GAAG;YACpD,CAAC,CAAC,gBAAgB,CAAC;QAC3B,OAAO,IAAI,UAAU,EAAE,CAAC;IAC5B,CAAC;CACJ,CACJ,CAAC;AAEF,SAAgB,QAAQ,CAAC,GAAoB;IACzC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAG,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CACP,yCAAyC,EACzC,UAAU,IAAI,UAAU,CAC3B,CAAC;IACF,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;IACjC,OAAO,CAAC,GAAG,CACP,wCAAwC,EACxC,UAAU,IAAI,UAAU,CAC3B,CAAC;IAEF,4DAA4D;IAC5D,0CAA0C;IAC1C,wCAAwC;IACxC,sDAAsD;IACtD,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,WAAG,CAAC,CAAC;AACzC,CAAC;AAtBD,4BAsBC"}

package/package.json

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