ecash-agora 2.2.0 → 2.5.0

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

@@ -51,7 +51,10 @@ async function makeBuilderInputs(
     runner: TestRunner,
     values: bigint[],
 ): Promise<TxBuilderInput[]> {
-    const txid = await runner.sendToScript(values, makerScript);
+    const txid = await runner.sendToTwoScripts(
+        { script: makerScript, sats: values[0] },
+        { script: takerScript, sats: values[1] },
+    );
     return values.map((sats, outIdx) => ({
         input: {
             prevOut: {
@@ -82,10 +85,7 @@ describe('Agora Partial 7450M XEC vs 2p64-1 full accept', () => {
     });
 
     it('Agora Partial 7450M XEC vs 2p64-1 full accept', async () => {
-        const [fuelInput, takerInput] = await makeBuilderInputs(runner, [
-            10000n,
-            BIGSATS,
-        ]);
+        const [fuelInput] = await makeBuilderInputs(runner, [10000n, BIGSATS]);
 
         const agora = new Agora(chronik);
         const agoraPartial = await agora.selectParams({
@@ -131,7 +131,6 @@ describe('Agora Partial 7450M XEC vs 2p64-1 full accept', () => {
             chronik,
             offer,
             takerSk,
-            takerInput,
             acceptedAtoms: agoraPartial.offeredAtoms(),
         });
 
@@ -173,10 +172,7 @@ describe('Agora Partial 7450M XEC vs 2p64-1 small accept', () => {
     });
 
     it('Agora Partial 7450M XEC vs 2p64-1 small accept', async () => {
-        const [fuelInput, takerInput] = await makeBuilderInputs(runner, [
-            10000n,
-            BIGSATS,
-        ]);
+        const [fuelInput] = await makeBuilderInputs(runner, [10000n, BIGSATS]);
 
         const agora = new Agora(chronik);
         const agoraPartial = await agora.selectParams({
@@ -224,7 +220,6 @@ describe('Agora Partial 7450M XEC vs 2p64-1 small accept', () => {
             chronik,
             offer,
             takerSk,
-            takerInput,
             acceptedAtoms,
         });
 
@@ -274,10 +269,7 @@ describe('Agora Partial 7450M XEC vs 2p63-1 full accept', () => {
     });
 
     it('Agora Partial 7450M XEC vs 2p63-1 full accept', async () => {
-        const [fuelInput, takerInput] = await makeBuilderInputs(runner, [
-            10000n,
-            BIGSATS,
-        ]);
+        const [fuelInput] = await makeBuilderInputs(runner, [10000n, BIGSATS]);
 
         const agora = new Agora(chronik);
         const agoraPartial = await agora.selectParams({
@@ -326,7 +318,6 @@ describe('Agora Partial 7450M XEC vs 2p63-1 full accept', () => {
             chronik,
             offer,
             takerSk,
-            takerInput,
             acceptedAtoms,
         });
 
@@ -369,10 +360,7 @@ describe('Agora Partial 7450M XEC vs 2p63-1 small accept', () => {
     });
 
     it('Agora Partial 7450M XEC vs 2p63-1 small accept', async () => {
-        const [fuelInput, takerInput] = await makeBuilderInputs(runner, [
-            10000n,
-            BIGSATS,
-        ]);
+        const [fuelInput] = await makeBuilderInputs(runner, [10000n, BIGSATS]);
 
         const agora = new Agora(chronik);
         const agoraPartial = await agora.selectParams({
@@ -420,7 +408,6 @@ describe('Agora Partial 7450M XEC vs 2p63-1 small accept', () => {
             chronik,
             offer,
             takerSk,
-            takerInput,
             acceptedAtoms,
         });
 
@@ -470,10 +457,7 @@ describe('Agora Partial 7450M XEC vs 100 full accept', () => {
     });
 
     it('Agora Partial 7450M XEC vs 100 full accept', async () => {
-        const [fuelInput, takerInput] = await makeBuilderInputs(runner, [
-            10000n,
-            BIGSATS,
-        ]);
+        const [fuelInput] = await makeBuilderInputs(runner, [10000n, BIGSATS]);
 
         const agora = new Agora(chronik);
         const agoraPartial = await agora.selectParams({
@@ -517,7 +501,6 @@ describe('Agora Partial 7450M XEC vs 100 full accept', () => {
             chronik,
             offer,
             takerSk,
-            takerInput,
             acceptedAtoms: 100n,
         });
         const acceptTx = await chronik.tx(acceptTxid);
@@ -559,10 +542,7 @@ describe('Agora Partial 7450M XEC vs 100 small accept', () => {
     });
 
     it('Agora Partial 7450M XEC vs 100 small accept', async () => {
-        const [fuelInput, takerInput] = await makeBuilderInputs(runner, [
-            10000n,
-            BIGSATS,
-        ]);
+        const [fuelInput] = await makeBuilderInputs(runner, [10000n, BIGSATS]);
 
         const agora = new Agora(chronik);
         const agoraPartial = await agora.selectParams({
@@ -602,7 +582,6 @@ describe('Agora Partial 7450M XEC vs 100 small accept', () => {
             chronik,
             offer,
             takerSk,
-            takerInput,
             acceptedAtoms: 1n,
         });
         const acceptTx = await chronik.tx(acceptTxid);

package/tests/partial.slp.test.ts

@@ -23,6 +23,7 @@ import { TestRunner } from 'ecash-lib/dist/test/testRunner.js';
 import { AgoraPartial } from '../src/partial.js';
 import { makeSlpOffer, takeSlpOffer } from './partial-helper-slp.js';
 import { Agora, TakenInfo } from '../src/agora.js';
+import { Wallet } from 'ecash-wallet/src/wallet.js';
 
 use(chaiAsPromised);
 
@@ -56,7 +57,10 @@ describe('AgoraPartial SLP', () => {
     async function makeBuilderInputs(
         values: bigint[],
     ): Promise<TxBuilderInput[]> {
+        // NB for these "not big sats" tests, we can just send to both, no need to sendToTwoScripts
         const txid = await runner.sendToScript(values, makerScript);
+        // Send some cash to the taker, since the accept() tests spend from this wallet
+        await runner.sendToScript(values, takerScript);
         return values.map((sats, outIdx) => ({
             input: {
                 prevOut: {
@@ -472,6 +476,7 @@ describe('AgoraPartial SLP', () => {
         },
     ];
 
+    let cancelTxsMatchCount = 0;
     for (const testCase of TEST_CASES) {
         it(`AgoraPartial SLP ${testCase.offeredAtoms} for ${testCase.info}`, async () => {
             const agora = new Agora(chronik);
@@ -484,10 +489,7 @@ describe('AgoraPartial SLP', () => {
             });
             const askedSats = agoraPartial.askedSats(testCase.acceptedAtoms);
             const requiredSats = askedSats + 2000n;
-            const [fuelInput, takerInput] = await makeBuilderInputs([
-                4000n,
-                requiredSats,
-            ]);
+            const [fuelInput] = await makeBuilderInputs([4000n, requiredSats]);
 
             const offer = await makeSlpOffer({
                 chronik,
@@ -499,7 +501,6 @@ describe('AgoraPartial SLP', () => {
                 chronik,
                 takerSk,
                 offer,
-                takerInput,
                 acceptedAtoms: testCase.acceptedAtoms,
                 allowUnspendable: testCase.allowUnspendable,
             });
@@ -586,17 +587,40 @@ describe('AgoraPartial SLP', () => {
                 recipientScript: makerScript,
                 extraInputs: [fuelInput], // dummy input for measuring
             });
-            const cancelTxSer = newOffer
-                .cancelTx({
-                    cancelSk: makerSk,
-                    fuelInputs: await makeBuilderInputs([cancelFeeSats]),
-                    recipientScript: makerScript,
-                })
-                .ser();
-            const cancelTxid = (await chronik.broadcastTx(cancelTxSer)).txid;
-            const cancelTx = await chronik.tx(cancelTxid);
-            expect(cancelTx.outputs[1].token?.atoms).to.equal(leftoverTokens);
-            expect(cancelTx.outputs[1].outputScript).to.equal(makerScriptHex);
+            const cancelTx = newOffer.cancelTx({
+                cancelSk: makerSk,
+                fuelInputs: await makeBuilderInputs([cancelFeeSats]),
+                recipientScript: makerScript,
+            });
+            const cancelTxid = cancelTx.txid();
+
+            // Let's build and broadcast using cancel() instead
+            const cancelWallet = Wallet.fromSk(makerSk, chronik);
+            await cancelWallet.sync();
+            const cancelResult = await newOffer.cancel({
+                wallet: cancelWallet,
+            });
+            const broadcastCancelTxid = cancelResult.broadcasted[0];
+            if (broadcastCancelTxid === cancelTxid) {
+                cancelTxsMatchCount++;
+                console.log(
+                    `${cancelTxsMatchCount} of ${TEST_CASES.length} produce equal txids with cancelTx() and cancel()`,
+                );
+
+                // Between ~5 and ~8 of 46 of these txs are identical from each method
+
+                // On inspection, when cancel() txid does not match,
+                // it is because cancel has selected different fuel inputs
+                // This is expected behavior, these txs still show change
+                // going to the cancel wallet as expected
+            }
+            const cancelChronikTx = await chronik.tx(broadcastCancelTxid);
+            expect(cancelChronikTx.outputs[1].token?.atoms).to.equal(
+                leftoverTokens,
+            );
+            expect(cancelChronikTx.outputs[1].outputScript).to.equal(
+                makerScriptHex,
+            );
 
             // takerIndex is 2 for full accept, 3 for partial accept
             const takerIndex = isFullAccept ? 2 : 3;
@@ -655,10 +679,7 @@ describe('AgoraPartial SLP', () => {
         });
         const askedSats = agoraPartial.askedSats(thisTestCase.acceptedAtoms);
         const requiredSats = askedSats + 2000n;
-        const [fuelInput, takerInput] = await makeBuilderInputs([
-            4000n,
-            requiredSats,
-        ]);
+        const [fuelInput] = await makeBuilderInputs([4000n, requiredSats]);
 
         const offer = await makeSlpOffer({
             chronik,
@@ -683,7 +704,6 @@ describe('AgoraPartial SLP', () => {
                 chronik,
                 takerSk,
                 offer,
-                takerInput,
                 acceptedAtoms: thisTestCase.acceptedAtoms,
                 allowUnspendable: false,
             }),
@@ -713,10 +733,7 @@ describe('AgoraPartial SLP', () => {
         const acceptedAtoms = 500n;
         const askedSats = agoraPartial.askedSats(acceptedAtoms);
         const requiredSats = askedSats + 2000n;
-        const [fuelInput, takerInput] = await makeBuilderInputs([
-            4000n,
-            requiredSats,
-        ]);
+        const [fuelInput] = await makeBuilderInputs([4000n, requiredSats]);
 
         const offer = await makeSlpOffer({
             chronik,
@@ -739,7 +756,6 @@ describe('AgoraPartial SLP', () => {
                 chronik,
                 takerSk,
                 offer,
-                takerInput,
                 acceptedAtoms: acceptedAtoms,
                 allowUnspendable: false,
             }),
@@ -752,7 +768,6 @@ describe('AgoraPartial SLP', () => {
                 chronik,
                 takerSk,
                 offer,
-                takerInput,
                 acceptedAtoms: acceptedAtoms,
                 allowUnspendable: undefined,
             }),
@@ -765,7 +780,6 @@ describe('AgoraPartial SLP', () => {
                 chronik,
                 takerSk,
                 offer,
-                takerInput,
                 acceptedAtoms: acceptedAtoms,
             }),
             expectedError,