npm - ecash-agora - Versions diffs - 0.4.0 → 1.0.0 - Mend

ecash-agora 0.4.0 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/README.md +5 -1
package/dist/agora.d.ts +1 -5
package/dist/agora.d.ts.map +1 -1
package/dist/agora.js +4 -4
package/dist/agora.js.map +1 -1
package/package.json +2 -2
package/tests/oneshot.test.ts +6 -11
package/tests/partial-helper-alp.ts +6 -11
package/tests/partial-helper-slp.ts +6 -9
package/tests/partial.alp.bigsats.test.ts +12 -59
package/tests/partial.alp.test.ts +12 -33
package/tests/partial.locktime.test.ts +11 -26
package/tests/partial.slp.bigsats.test.ts +11 -60
package/tests/partial.slp.test.ts +12 -35

package/README.md CHANGED Viewed

@@ -112,7 +112,7 @@ const txBuilder = new TxBuilder({
         { value: 546, script: buyerP2pkh },
     ],
 });
-const acceptTx = txBuilder.sign(ecc);
+const acceptTx = txBuilder.sign();
 await chronik.broadcastTx(acceptTx.ser());
 ```
@@ -178,3 +178,7 @@ Running from `bitcoin-abc/modules/ecash-agora` if your build dir is `bitcoin-abc
 ### 0.4.0
 -   Add `getAgoraPartialAcceptFuelInputs` and `getAgoraCancelFuelInputs` [D17637](https://reviews.bitcoinabc.org/D17637)
+### 1.0.0
+-   Remove unneeded `ecc` param from various functions [D17640](https://reviews.bitcoinabc.org/D17640)

package/dist/agora.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { ChronikClient, Token, WsEndpoint } from 'chronik-client';
-import { Ecc, Op, OutPoint, Script, Tx, TxBuilderInput, TxInput } from 'ecash-lib';
+import { Op, OutPoint, Script, Tx, TxBuilderInput, TxInput } from 'ecash-lib';
 import { AgoraOneshot } from './oneshot.js';
 import { AgoraPartial, AgoraPartialParams } from './partial.js';
 /** Offer variant, determines the Script used to enforce the offer */
@@ -54,8 +54,6 @@ export declare class AgoraOffer {
      * `fuelInputs` has to provide enough sats for this offer to cover ask + tx fee.
      * */
     acceptTx(params: {
-        /** ECC object to sign signatures. */
-        ecc: Ecc;
         /**
          * Arbitrary secret key to sign the accept tx with. Recommended to set
          * this to a random key. Must be paired with covenantSk.
@@ -110,8 +108,6 @@ export declare class AgoraOffer {
      * `fuelInputs` must cover the tx fee, you can calculate it with cancelFeeSats.
      **/
     cancelTx(params: {
-        /** ECC object to sign signatures. */
-        ecc: Ecc;
         /**
          * Cancel secret key of the offer, must be paired with the cancelPk of
          * the offer.

package/dist/agora.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"agora.d.ts","sourceRoot":"","sources":["../src/agora.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,aAAa,EAGb,KAAK,EAGL,UAAU,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,~~EAMH~~,~~GAAG,EAIH,~~EAAE,EAEF,QAAQ,EAER,MAAM,EAMN,EAAE,EAEF,cAAc,EAEd,OAAO,EAEV,MAAM,WAAW,CAAC;AAEnB,OAAO,EACH,YAAY,EAGf,MAAM,cAAc,CAAC;AACtB,OAAO,EACH,YAAY,EAEZ,kBAAkB,EAErB,MAAM,cAAc,CAAC;AAatB,qEAAqE;AACrE,MAAM,MAAM,iBAAiB,GACvB;IACI,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,YAAY,CAAC;CACxB,GACD;IACI,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,YAAY,CAAC;CACxB,CAAC;AAER,0DAA0D;AAC1D,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC;AAE7D,2BAA2B;AAC3B,MAAM,WAAW,SAAS;IACtB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,UAAU;IACZ,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,CAAC,EAAE,SAAS,CAAC;gBAEV,MAAM,EAAE;QACvB,OAAO,EAAE,iBAAiB,CAAC;QAC3B,QAAQ,EAAE,QAAQ,CAAC;QACnB,cAAc,EAAE,OAAO,CAAC;QACxB,KAAK,EAAE,KAAK,CAAC;QACb,MAAM,EAAE,gBAAgB,CAAC;QACzB,SAAS,CAAC,EAAE,SAAS,CAAC;KACzB;IAWD;;;;;;;SAOK;IACE,QAAQ,CAAC,MAAM,EAAE;QACpB~~,qCAAqC;QACrC,GAAG,EAAE,GAAG,CAAC;QACT~~;;;YAGI;QACJ,UAAU,EAAE,UAAU,CAAC;QACvB;;;YAGI;QACJ,UAAU,EAAE,UAAU,CAAC;QACvB;;;;;;;YAOI;QACJ,UAAU,EAAE,cAAc,EAAE,CAAC;QAC7B,mEAAmE;QACnE,eAAe,EAAE,MAAM,CAAC;QACxB,oDAAoD;QACpD,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,+CAA+C;QAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,8CAA8C;QAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,iFAAiF;QACjF,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG,EAAE;IAqBN;;;;;QAKI;IACG,aAAa,CAAC,MAAM,EAAE;QACzB,mEAAmE;QACnE,eAAe,EAAE,MAAM,CAAC;QACxB,mBAAmB;QACnB,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;QAC/B,8CAA8C;QAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,MAAM;IAkBV,OAAO,CAAC,gBAAgB;IAwHxB;;;;;;QAMI;IACG,QAAQ,CAAC,MAAM,EAAE;QACpB~~,qCAAqC;QACrC,GAAG,EAAE,GAAG,CAAC;QACT~~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"}
1	+ {"version":3,"file":"agora.d.ts","sourceRoot":"","sources":["../src/agora.ts"],"names":[],"mappings":"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"}

package/dist/agora.js CHANGED Viewed

@@ -57,7 +57,7 @@ class AgoraOffer {
             acceptedTokens: params.acceptedTokens,
             allowUnspendable,
         });
-        return txBuild.sign(params.ecc, feePerKb, dustAmount);
+        return txBuild.sign({ feePerKb, dustLimit: dustAmount });
     }
     /**
      * How many extra satoshis are required to fuel this offer so it can be
@@ -79,7 +79,7 @@ class AgoraOffer {
             ],
             acceptedTokens: params.acceptedTokens,
         });
-        const measureTx = txBuild.sign(new ecash_lib_1.EccDummy());
+        const measureTx = txBuild.sign({ ecc: new ecash_lib_1.EccDummy() });
         return BigInt(Math.ceil((measureTx.serSize() * feePerKb) / 1000));
     }
     _acceptTxBuilder(params) {
@@ -186,7 +186,7 @@ class AgoraOffer {
                 params.recipientScript,
             ],
         });
-        return txBuild.sign(params.ecc, feePerKb, dustAmount);
+        return txBuild.sign({ feePerKb, dustLimit: dustAmount });
     }
     /**
      * How many extra satoshis are required to fuel cancelling this offer,
@@ -211,7 +211,7 @@ class AgoraOffer {
                 },
             ],
         });
-        const measureTx = txBuild.sign(new ecash_lib_1.EccDummy());
+        const measureTx = txBuild.sign({ ecc: new ecash_lib_1.EccDummy() });
         return BigInt(Math.ceil((measureTx.serSize() * feePerKb) / 1000));
     }
     _cancelTxBuilder(params) {

package/dist/agora.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"agora.js","sourceRoot":"","sources":["../src/agora.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"agora.js","sourceRoot":"","sources":["../src/agora.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "ecash-agora",
-    "version": "0.4.0",
+    "version": "1.0.0",
     "description": "Library for interacting with the eCash Agora protocol",
     "main": "./dist/index.js",
     "scripts": {
@@ -47,6 +47,6 @@
     },
     "dependencies": {
         "chronik-client": "^2.1.1",
-        "ecash-lib": "^1.5.1"
+        "ecash-lib": "^2.0.0"
     }
 }

package/tests/oneshot.test.ts CHANGED Viewed

@@ -17,7 +17,6 @@ import {
     TxInput,
     TxOutput,
     fromHex,
-    initWasm,
     shaRmd160,
     slpGenesis,
     slpSend,
@@ -54,13 +53,11 @@ const SLP_TOKEN_TYPE_NFT1_CHILD = {
 describe('SLP', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
+    const ecc = new Ecc();
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
         await runner.setupCoins(NUM_COINS, COIN_VALUE);
     });
@@ -130,7 +127,7 @@ describe('SLP', () => {
                 { value: 10000, script: sellerP2pkh },
             ],
         });
-        const genesisTx = txBuildGenesisGroup.sign(ecc);
+        const genesisTx = txBuildGenesisGroup.sign();
         const genesisTxid = (await chronik.broadcastTx(genesisTx.ser())).txid;
         const groupTokenId = genesisTxid;
@@ -179,7 +176,7 @@ describe('SLP', () => {
                 { value: 8000, script: sellerP2pkh },
             ],
         });
-        const genesisChildTx = txBuildGenesisChild.sign(ecc);
+        const genesisChildTx = txBuildGenesisChild.sign();
         const genesisChildTxid = (
             await chronik.broadcastTx(genesisChildTx.ser())
         ).txid;
@@ -252,7 +249,7 @@ describe('SLP', () => {
                 { value: 7000, script: agoraAdP2sh },
             ],
         });
-        const adSetupTx = txBuildAdSetup.sign(ecc);
+        const adSetupTx = txBuildAdSetup.sign();
         const adSetupTxid = (await chronik.broadcastTx(adSetupTx.ser())).txid;
         // 4. Seller finishes offer setup + sends NFT to the advertised P2SH
@@ -282,7 +279,7 @@ describe('SLP', () => {
                 { value: 546, script: agoraP2sh },
             ],
         });
-        const offerTx = txBuildOffer.sign(ecc);
+        const offerTx = txBuildOffer.sign();
         const offerPromise = listenNext();
         const offerTxid = (await chronik.broadcastTx(offerTx.ser())).txid;
         const offerOutpoint: OutPoint = {
@@ -410,7 +407,7 @@ describe('SLP', () => {
         });
         // Accepting trade failed, must send 80000 sats to seller, but sent 79999
-        const acceptFailTx = txBuildAcceptFail.sign(ecc);
+        const acceptFailTx = txBuildAcceptFail.sign();
         // OP_EQUALVERIFY failed
         assert.isRejected(chronik.broadcastTx(acceptFailTx.ser()));
@@ -458,7 +455,6 @@ describe('SLP', () => {
             }),
         ).to.equal(BigInt(cancelFeeSats));
         const cancelTx = offer1.cancelTx({
-            ecc,
             cancelSk: sellerSk,
             fuelInputs: [offer1AdInput],
             recipientScript: newAgoraP2sh,
@@ -650,7 +646,6 @@ describe('SLP', () => {
             }),
         ).to.equal(BigInt(acceptFeeSats));
         const acceptSuccessTx = offer2.acceptTx({
-            ecc,
             covenantSk: buyerSk,
             covenantPk: buyerPk,
             fuelInputs: [offer2AcceptInput],

package/tests/partial-helper-alp.ts CHANGED Viewed

@@ -23,13 +23,12 @@ import { AgoraPartial } from '../src/partial.js';
 import { Agora, AgoraOffer } from '../src/agora.js';
 export function makeAlpGenesis(params: {
-    ecc: Ecc;
     tokenType: number;
     fuelInput: TxBuilderInput;
     tokenAmounts: Amount[];
     extraOutputs: TxBuilderOutput[];
 }) {
-    const { ecc, tokenType, fuelInput } = params;
+    const { tokenType, fuelInput } = params;
     const txBuildGenesisGroup = new TxBuilder({
         inputs: [fuelInput],
         outputs: [
@@ -52,24 +51,22 @@ export function makeAlpGenesis(params: {
             ...params.extraOutputs,
         ],
     });
-    return txBuildGenesisGroup.sign(ecc);
+    return txBuildGenesisGroup.sign();
 }
 export async function makeAlpOffer(params: {
     chronik: ChronikClient;
-    ecc: Ecc;
     agoraPartial: AgoraPartial;
     makerSk: Uint8Array;
     fuelInput: TxBuilderInput;
 }): Promise<AgoraOffer> {
-    const { chronik, ecc, agoraPartial, makerSk, fuelInput } = params;
-    const makerPk = ecc.derivePubkey(makerSk);
+    const { chronik, agoraPartial, makerSk, fuelInput } = params;
+    const makerPk = new Ecc().derivePubkey(makerSk);
     const makerPkh = shaRmd160(makerPk);
     const makerP2pkh = Script.p2pkh(makerPkh);
     const genesisOutputSats = 2000;
     const genesisTx = makeAlpGenesis({
-        ecc,
         tokenType: agoraPartial.tokenType,
         fuelInput,
         tokenAmounts: [agoraPartial.offeredTokens()],
@@ -114,7 +111,7 @@ export async function makeAlpOffer(params: {
             { value: 546, script: agoraP2sh },
         ],
     });
-    const offerTx = txBuildOffer.sign(ecc);
+    const offerTx = txBuildOffer.sign();
     await chronik.broadcastTx(offerTx.ser());
     const agora = new Agora(chronik);
@@ -127,7 +124,6 @@ export async function makeAlpOffer(params: {
 export async function takeAlpOffer(params: {
     chronik: ChronikClient;
-    ecc: Ecc;
     offer: AgoraOffer;
     takerSk: Uint8Array;
     takerInput: TxBuilderInput;
@@ -135,11 +131,10 @@ export async function takeAlpOffer(params: {
     allowUnspendable?: boolean;
 }) {
     const takerSk = params.takerSk;
-    const takerPk = params.ecc.derivePubkey(takerSk);
+    const takerPk = new Ecc().derivePubkey(takerSk);
     const takerPkh = shaRmd160(takerPk);
     const takerP2pkh = Script.p2pkh(takerPkh);
     const acceptTx = params.offer.acceptTx({
-        ecc: params.ecc,
         covenantSk: params.takerSk,
         covenantPk: takerPk,
         fuelInputs: [params.takerInput],

package/tests/partial-helper-slp.ts CHANGED Viewed

@@ -21,13 +21,12 @@ import { Agora, AgoraOffer } from '../src/agora.js';
 export async function makeSlpOffer(params: {
     chronik: ChronikClient;
-    ecc: Ecc;
     agoraPartial: AgoraPartial;
     makerSk: Uint8Array;
     fuelInput: TxBuilderInput;
 }): Promise<AgoraOffer> {
-    const { chronik, ecc, agoraPartial, makerSk, fuelInput } = params;
-    const makerPk = ecc.derivePubkey(makerSk);
+    const { chronik, agoraPartial, makerSk, fuelInput } = params;
+    const makerPk = new Ecc().derivePubkey(makerSk);
     const makerPkh = shaRmd160(makerPk);
     const makerP2pkh = Script.p2pkh(makerPkh);
@@ -49,7 +48,7 @@ export async function makeSlpOffer(params: {
             { value: genesisOutputSats, script: makerP2pkh },
         ],
     });
-    const genesisTx = txBuildGenesisGroup.sign(ecc);
+    const genesisTx = txBuildGenesisGroup.sign();
     const genesisTxid = (await chronik.broadcastTx(genesisTx.ser())).txid;
     const tokenId = genesisTxid;
     agoraPartial.tokenId = tokenId;
@@ -87,7 +86,7 @@ export async function makeSlpOffer(params: {
             { value: adSetupSats, script: agoraAdP2sh },
         ],
     });
-    const adSetupTx = txBuildAdSetup.sign(ecc);
+    const adSetupTx = txBuildAdSetup.sign();
     const adSetupTxid = (await chronik.broadcastTx(adSetupTx.ser())).txid;
     const agoraScript = agoraPartial.script();
@@ -118,7 +117,7 @@ export async function makeSlpOffer(params: {
             { value: 546, script: agoraP2sh },
         ],
     });
-    const offerTx = txBuildOffer.sign(ecc);
+    const offerTx = txBuildOffer.sign();
     await chronik.broadcastTx(offerTx.ser());
     const agora = new Agora(chronik);
@@ -131,7 +130,6 @@ export async function makeSlpOffer(params: {
 export async function takeSlpOffer(params: {
     chronik: ChronikClient;
-    ecc: Ecc;
     offer: AgoraOffer;
     takerSk: Uint8Array;
     takerInput: TxBuilderInput;
@@ -139,11 +137,10 @@ export async function takeSlpOffer(params: {
     allowUnspendable?: boolean;
 }) {
     const takerSk = params.takerSk;
-    const takerPk = params.ecc.derivePubkey(takerSk);
+    const takerPk = new Ecc().derivePubkey(takerSk);
     const takerPkh = shaRmd160(takerPk);
     const takerP2pkh = Script.p2pkh(takerPkh);
     const acceptTx = params.offer.acceptTx({
-        ecc: params.ecc,
         covenantSk: params.takerSk,
         covenantPk: takerPk,
         fuelInputs: [params.takerInput],

package/tests/partial.alp.bigsats.test.ts CHANGED Viewed

@@ -16,7 +16,6 @@ import {
     alpSend,
     emppScript,
     fromHex,
-    initWasm,
     shaRmd160,
     toHex,
 } from 'ecash-lib';
@@ -37,29 +36,18 @@ const BASE_PARAMS_ALP = {
 const BIGSATS = 149 * 5000000000 - 20000;
-let makerSk: Uint8Array;
-let makerPk: Uint8Array;
-let makerPkh: Uint8Array;
-let makerScript: Script;
-let makerScriptHex: string;
-let takerSk: Uint8Array;
-let takerPk: Uint8Array;
-let takerPkh: Uint8Array;
-let takerScript: Script;
-let takerScriptHex: string;
-function initKeys(ecc: Ecc) {
-    makerSk = fromHex('33'.repeat(32));
-    makerPk = ecc.derivePubkey(makerSk);
-    makerPkh = shaRmd160(makerPk);
-    makerScript = Script.p2pkh(makerPkh);
-    makerScriptHex = toHex(makerScript.bytecode);
-    takerSk = fromHex('44'.repeat(32));
-    takerPk = ecc.derivePubkey(takerSk);
-    takerPkh = shaRmd160(takerPk);
-    takerScript = Script.p2pkh(takerPkh);
-    takerScriptHex = toHex(takerScript.bytecode);
-}
+const ecc = new Ecc();
+const makerSk = fromHex('33'.repeat(32));
+const makerPk = ecc.derivePubkey(makerSk);
+const makerPkh = shaRmd160(makerPk);
+const makerScript = Script.p2pkh(makerPkh);
+const makerScriptHex = toHex(makerScript.bytecode);
+const takerSk = fromHex('44'.repeat(32));
+const takerPk = ecc.derivePubkey(takerSk);
+const takerPkh = shaRmd160(takerPk);
+const takerScript = Script.p2pkh(takerPkh);
+const takerScriptHex = toHex(takerScript.bytecode);
 async function makeBuilderInputs(
     runner: TestRunner,
@@ -84,14 +72,10 @@ async function makeBuilderInputs(
 describe('AgoraPartial ALP 7450M XEC vs 2p48-1 full accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -141,14 +125,12 @@ describe('AgoraPartial ALP 7450M XEC vs 2p48-1 full accept', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
         });
         const acceptTxid = await takeAlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -189,11 +171,8 @@ describe('AgoraPartial 7450M XEC vs 2p48-1 small accept', () => {
     let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -244,7 +223,6 @@ describe('AgoraPartial 7450M XEC vs 2p48-1 small accept', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -252,7 +230,6 @@ describe('AgoraPartial 7450M XEC vs 2p48-1 small accept', () => {
         const acceptedTokens = 0x1000000n;
         const acceptTxid = await takeAlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -298,14 +275,10 @@ describe('AgoraPartial 7450M XEC vs 2p48-1 small accept', () => {
 describe('AgoraPartial 7450M XEC vs 2p47-1 full accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -354,14 +327,12 @@ describe('AgoraPartial 7450M XEC vs 2p47-1 full accept', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
         });
         const acceptTxid = await takeAlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -400,14 +371,10 @@ describe('AgoraPartial 7450M XEC vs 2p47-1 full accept', () => {
 describe('AgoraPartial ALP 7450M XEC vs 2p47-1 small accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -458,7 +425,6 @@ describe('AgoraPartial ALP 7450M XEC vs 2p47-1 small accept', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -466,7 +432,6 @@ describe('AgoraPartial ALP 7450M XEC vs 2p47-1 small accept', () => {
         const acceptedTokens = 0x1000000n;
         const acceptTxid = await takeAlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -512,14 +477,10 @@ describe('AgoraPartial ALP 7450M XEC vs 2p47-1 small accept', () => {
 describe('AgoraPartial ALP 7450M XEC vs 100 full accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -567,14 +528,12 @@ describe('AgoraPartial ALP 7450M XEC vs 100 full accept', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
         });
         const acceptTxid = await takeAlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -610,14 +569,10 @@ describe('AgoraPartial ALP 7450M XEC vs 100 full accept', () => {
 describe('AgoraPartial ALP 7450M XEC vs 100 small accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -661,14 +616,12 @@ describe('AgoraPartial ALP 7450M XEC vs 100 small accept', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
         });
         const acceptTxid = await takeAlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,

package/tests/partial.alp.test.ts CHANGED Viewed

@@ -16,7 +16,6 @@ import {
     alpSend,
     emppScript,
     fromHex,
-    initWasm,
     shaRmd160,
     toHex,
 } from 'ecash-lib';
@@ -39,21 +38,21 @@ const BASE_PARAMS_ALP = {
     dustAmount: DEFAULT_DUST_LIMIT,
 };
+const ecc = new Ecc();
+const makerSk = fromHex('33'.repeat(32));
+const makerPk = ecc.derivePubkey(makerSk);
+const makerPkh = shaRmd160(makerPk);
+const makerScript = Script.p2pkh(makerPkh);
+const makerScriptHex = toHex(makerScript.bytecode);
+const takerSk = fromHex('44'.repeat(32));
+const takerPk = ecc.derivePubkey(takerSk);
+const takerPkh = shaRmd160(takerPk);
+const takerScript = Script.p2pkh(takerPkh);
+const takerScriptHex = toHex(takerScript.bytecode);
 describe('AgoraPartial ALP', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
-    let makerSk: Uint8Array;
-    let makerPk: Uint8Array;
-    let makerPkh: Uint8Array;
-    let makerScript: Script;
-    let makerScriptHex: string;
-    let takerSk: Uint8Array;
-    let takerPk: Uint8Array;
-    let takerPkh: Uint8Array;
-    let takerScript: Script;
-    let takerScriptHex: string;
     async function makeBuilderInputs(
         values: number[],
@@ -75,22 +74,9 @@ describe('AgoraPartial ALP', () => {
     }
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
         await runner.setupCoins(NUM_COINS, COIN_VALUE);
-        makerSk = fromHex('33'.repeat(32));
-        makerPk = ecc.derivePubkey(makerSk);
-        makerPkh = shaRmd160(makerPk);
-        makerScript = Script.p2pkh(makerPkh);
-        makerScriptHex = toHex(makerScript.bytecode);
-        takerSk = fromHex('44'.repeat(32));
-        takerPk = ecc.derivePubkey(takerSk);
-        takerPkh = shaRmd160(takerPk);
-        takerScript = Script.p2pkh(takerPkh);
-        takerScriptHex = toHex(takerScript.bytecode);
     });
     after(() => {
@@ -450,14 +436,12 @@ describe('AgoraPartial ALP', () => {
             const offer = await makeAlpOffer({
                 chronik,
-                ecc,
                 agoraPartial,
                 makerSk,
                 fuelInput,
             });
             const acceptTxid = await takeAlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,
@@ -564,7 +548,6 @@ describe('AgoraPartial ALP', () => {
             });
             const cancelTxSer = newOffer
                 .cancelTx({
-                    ecc,
                     cancelSk: makerSk,
                     fuelInputs: await makeBuilderInputs([
                         Number(cancelFeeSats),
@@ -642,7 +625,6 @@ describe('AgoraPartial ALP', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -662,7 +644,6 @@ describe('AgoraPartial ALP', () => {
         await assert.isRejected(
             takeAlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,
@@ -702,7 +683,6 @@ describe('AgoraPartial ALP', () => {
         const offer = await makeAlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -719,7 +699,6 @@ describe('AgoraPartial ALP', () => {
         await assert.isRejected(
             takeAlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,

package/tests/partial.locktime.test.ts CHANGED Viewed

@@ -17,7 +17,6 @@ import {
     alpSend,
     emppScript,
     fromHex,
-    initWasm,
     shaRmd160,
 } from 'ecash-lib';
 import { TestRunner } from 'ecash-lib/dist/test/testRunner.js';
@@ -39,19 +38,19 @@ const BASE_PARAMS_ALP = {
     dustAmount: DEFAULT_DUST_LIMIT,
 };
+const ecc = new Ecc();
+const makerSk = fromHex('33'.repeat(32));
+const makerPk = ecc.derivePubkey(makerSk);
+const makerPkh = shaRmd160(makerPk);
+const makerScript = Script.p2pkh(makerPkh);
+const takerSk = fromHex('44'.repeat(32));
+const takerPk = ecc.derivePubkey(takerSk);
+const takerPkh = shaRmd160(takerPk);
+const takerScript = Script.p2pkh(takerPkh);
 describe('AgoraPartial enforcedLockTime', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
-    let makerSk: Uint8Array;
-    let makerPk: Uint8Array;
-    let makerPkh: Uint8Array;
-    let makerScript: Script;
-    let takerSk: Uint8Array;
-    let takerPk: Uint8Array;
-    let takerPkh: Uint8Array;
-    let takerScript: Script;
     async function makeBuilderInputs(
         values: number[],
@@ -73,20 +72,9 @@ describe('AgoraPartial enforcedLockTime', () => {
     }
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
         await runner.setupCoins(NUM_COINS, COIN_VALUE);
-        makerSk = fromHex('33'.repeat(32));
-        makerPk = ecc.derivePubkey(makerSk);
-        makerPkh = shaRmd160(makerPk);
-        makerScript = Script.p2pkh(makerPkh);
-        takerSk = fromHex('44'.repeat(32));
-        takerPk = ecc.derivePubkey(takerSk);
-        takerPkh = shaRmd160(takerPk);
-        takerScript = Script.p2pkh(takerPkh);
     });
     after(() => {
@@ -113,7 +101,6 @@ describe('AgoraPartial enforcedLockTime', () => {
         const genesisOutputSats = 2000;
         const genesisTx = makeAlpGenesis({
-            ecc,
             tokenType: agoraPartial.tokenType,
             fuelInput,
             tokenAmounts: [
@@ -167,7 +154,7 @@ describe('AgoraPartial enforcedLockTime', () => {
                     { value: 546, script: agoraP2sh },
                 ],
             });
-            const offerTx = txBuildOffer.sign(ecc);
+            const offerTx = txBuildOffer.sign();
             await chronik.broadcastTx(offerTx.ser());
         }
@@ -187,7 +174,6 @@ describe('AgoraPartial enforcedLockTime', () => {
         // Cannot co-spend other identical offer (due to different locktime)
         const failedAcceptTx = offersLocktime1[0].acceptTx({
-            ecc,
             covenantSk: takerSk,
             covenantPk: takerPk,
             fuelInputs: [
@@ -214,7 +200,6 @@ describe('AgoraPartial enforcedLockTime', () => {
         // for identical other offers, otherwise someone can spend them in a
         // single transaction, burning one of the offers.
         const successAcceptTx = offersLocktime1[0].acceptTx({
-            ecc,
             covenantSk: takerSk,
             covenantPk: takerPk,
             fuelInputs: [

package/tests/partial.slp.bigsats.test.ts CHANGED Viewed

@@ -14,7 +14,6 @@ import {
     Script,
     TxBuilderInput,
     fromHex,
-    initWasm,
     shaRmd160,
     slpSend,
     toHex,
@@ -36,29 +35,17 @@ const BASE_PARAMS_SLP = {
 const BIGSATS = 149 * 5000000000 - 20000;
-let makerSk: Uint8Array;
-let makerPk: Uint8Array;
-let makerPkh: Uint8Array;
-let makerScript: Script;
-let makerScriptHex: string;
-let takerSk: Uint8Array;
-let takerPk: Uint8Array;
-let takerPkh: Uint8Array;
-let takerScript: Script;
-let takerScriptHex: string;
-function initKeys(ecc: Ecc) {
-    makerSk = fromHex('33'.repeat(32));
-    makerPk = ecc.derivePubkey(makerSk);
-    makerPkh = shaRmd160(makerPk);
-    makerScript = Script.p2pkh(makerPkh);
-    makerScriptHex = toHex(makerScript.bytecode);
-    takerSk = fromHex('44'.repeat(32));
-    takerPk = ecc.derivePubkey(takerSk);
-    takerPkh = shaRmd160(takerPk);
-    takerScript = Script.p2pkh(takerPkh);
-    takerScriptHex = toHex(takerScript.bytecode);
-}
+const ecc = new Ecc();
+const makerSk = fromHex('33'.repeat(32));
+const makerPk = ecc.derivePubkey(makerSk);
+const makerPkh = shaRmd160(makerPk);
+const makerScript = Script.p2pkh(makerPkh);
+const makerScriptHex = toHex(makerScript.bytecode);
+const takerSk = fromHex('44'.repeat(32));
+const takerPk = ecc.derivePubkey(takerSk);
+const takerPkh = shaRmd160(takerPk);
+const takerScript = Script.p2pkh(takerPkh);
+const takerScriptHex = toHex(takerScript.bytecode);
 async function makeBuilderInputs(
     runner: TestRunner,
@@ -83,14 +70,10 @@ async function makeBuilderInputs(
 describe('Agora Partial 7450M XEC vs 2p64-1 full accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -142,14 +125,12 @@ describe('Agora Partial 7450M XEC vs 2p64-1 full accept', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
         });
         const acceptTxid = await takeSlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -184,14 +165,10 @@ describe('Agora Partial 7450M XEC vs 2p64-1 full accept', () => {
 describe('Agora Partial 7450M XEC vs 2p64-1 small accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -242,7 +219,6 @@ describe('Agora Partial 7450M XEC vs 2p64-1 small accept', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -250,7 +226,6 @@ describe('Agora Partial 7450M XEC vs 2p64-1 small accept', () => {
         const acceptedTokens = 0x10000000000n;
         const acceptTxid = await takeSlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -293,14 +268,10 @@ describe('Agora Partial 7450M XEC vs 2p64-1 small accept', () => {
 describe('Agora Partial 7450M XEC vs 2p63-1 full accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -352,7 +323,6 @@ describe('Agora Partial 7450M XEC vs 2p63-1 full accept', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -360,7 +330,6 @@ describe('Agora Partial 7450M XEC vs 2p63-1 full accept', () => {
         const acceptedTokens = agoraPartial.offeredTokens();
         const acceptTxid = await takeSlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -396,14 +365,10 @@ describe('Agora Partial 7450M XEC vs 2p63-1 full accept', () => {
 describe('Agora Partial 7450M XEC vs 2p63-1 small accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -454,7 +419,6 @@ describe('Agora Partial 7450M XEC vs 2p63-1 small accept', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -462,7 +426,6 @@ describe('Agora Partial 7450M XEC vs 2p63-1 small accept', () => {
         const acceptedTokens = 0x100000000n;
         const acceptTxid = await takeSlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -505,14 +468,10 @@ describe('Agora Partial 7450M XEC vs 2p63-1 small accept', () => {
 describe('Agora Partial 7450M XEC vs 100 full accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -560,14 +519,12 @@ describe('Agora Partial 7450M XEC vs 100 full accept', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
         });
         const acceptTxid = await takeSlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,
@@ -598,14 +555,10 @@ describe('Agora Partial 7450M XEC vs 100 full accept', () => {
 describe('Agora Partial 7450M XEC vs 100 small accept', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
-        initKeys(ecc);
         await runner.setupCoins(1, BIGSATS + 11000);
     });
@@ -649,14 +602,12 @@ describe('Agora Partial 7450M XEC vs 100 small accept', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
         });
         const acceptTxid = await takeSlpOffer({
             chronik,
-            ecc,
             offer,
             takerSk,
             takerInput,

package/tests/partial.slp.test.ts CHANGED Viewed

@@ -14,7 +14,6 @@ import {
     Script,
     TxBuilderInput,
     fromHex,
-    initWasm,
     shaRmd160,
     slpSend,
     toHex,
@@ -38,21 +37,21 @@ const BASE_PARAMS_SLP = {
     dustAmount: DEFAULT_DUST_LIMIT,
 };
+const ecc = new Ecc();
+const makerSk = fromHex('33'.repeat(32));
+const makerPk = ecc.derivePubkey(makerSk);
+const makerPkh = shaRmd160(makerPk);
+const makerScript = Script.p2pkh(makerPkh);
+const makerScriptHex = toHex(makerScript.bytecode);
+const takerSk = fromHex('44'.repeat(32));
+const takerPk = ecc.derivePubkey(takerSk);
+const takerPkh = shaRmd160(takerPk);
+const takerScript = Script.p2pkh(takerPkh);
+const takerScriptHex = toHex(takerScript.bytecode);
 describe('AgoraPartial SLP', () => {
     let runner: TestRunner;
     let chronik: ChronikClient;
-    let ecc: Ecc;
-    let makerSk: Uint8Array;
-    let makerPk: Uint8Array;
-    let makerPkh: Uint8Array;
-    let makerScript: Script;
-    let makerScriptHex: string;
-    let takerSk: Uint8Array;
-    let takerPk: Uint8Array;
-    let takerPkh: Uint8Array;
-    let takerScript: Script;
-    let takerScriptHex: string;
     async function makeBuilderInputs(
         values: number[],
@@ -74,22 +73,9 @@ describe('AgoraPartial SLP', () => {
     }
     before(async () => {
-        await initWasm();
         runner = await TestRunner.setup('setup_scripts/ecash-agora_base');
         chronik = runner.chronik;
-        ecc = runner.ecc;
         await runner.setupCoins(NUM_COINS, COIN_VALUE);
-        makerSk = fromHex('33'.repeat(32));
-        makerPk = ecc.derivePubkey(makerSk);
-        makerPkh = shaRmd160(makerPk);
-        makerScript = Script.p2pkh(makerPkh);
-        makerScriptHex = toHex(makerScript.bytecode);
-        takerSk = fromHex('44'.repeat(32));
-        takerPk = ecc.derivePubkey(takerSk);
-        takerPkh = shaRmd160(takerPk);
-        takerScript = Script.p2pkh(takerPkh);
-        takerScriptHex = toHex(takerScript.bytecode);
     });
     after(() => {
@@ -505,14 +491,12 @@ describe('AgoraPartial SLP', () => {
             const offer = await makeSlpOffer({
                 chronik,
-                ecc,
                 agoraPartial,
                 makerSk,
                 fuelInput,
             });
             const acceptTxid = await takeSlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,
@@ -608,7 +592,6 @@ describe('AgoraPartial SLP', () => {
             });
             const cancelTxSer = newOffer
                 .cancelTx({
-                    ecc,
                     cancelSk: makerSk,
                     fuelInputs: await makeBuilderInputs([
                         Number(cancelFeeSats),
@@ -687,7 +670,6 @@ describe('AgoraPartial SLP', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -707,7 +689,6 @@ describe('AgoraPartial SLP', () => {
         await assert.isRejected(
             takeSlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,
@@ -747,7 +728,6 @@ describe('AgoraPartial SLP', () => {
         const offer = await makeSlpOffer({
             chronik,
-            ecc,
             agoraPartial,
             makerSk,
             fuelInput,
@@ -765,7 +745,6 @@ describe('AgoraPartial SLP', () => {
         await assert.isRejected(
             takeSlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,
@@ -779,7 +758,6 @@ describe('AgoraPartial SLP', () => {
         await assert.isRejected(
             takeSlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,
@@ -793,7 +771,6 @@ describe('AgoraPartial SLP', () => {
         await assert.isRejected(
             takeSlpOffer({
                 chronik,
-                ecc,
                 takerSk,
                 offer,
                 takerInput,