@1sat/actions 0.0.214 → 0.0.216

package/dist/utils/listingToken.test.js

@@ -0,0 +1,36 @@
+import { BSV21 } from '@1sat/templates';
+import { TOKEN_CONTENT_TYPE } from '@1sat/types';
+import { P2PKH, PrivateKey } from '@bsv/sdk';
+import { describe, expect, test } from 'bun:test';
+import { isBsv21Transfer, isTokenListing, listedTransfer, tokenTransferLock, } from './listingToken.js';
+describe('listedTransfer', () => {
+    test('locks BSV21.transfer with the integer amt', () => {
+        const id = `${'ab'.repeat(32)}_0`;
+        const amt = '9007199254740993';
+        const token = listedTransfer({
+            tags: [`type:${TOKEN_CONTENT_TYPE}`, `bsv21:${id}`, `amt:${amt}`],
+            customInstructions: JSON.stringify({ id, amt, op: 'transfer' }),
+        });
+        expect(token).toEqual({ id, amt });
+        if (!token || !isBsv21Transfer(token))
+            throw new Error('expected bsv21');
+        const address = PrivateKey.fromRandom().toAddress();
+        const script = tokenTransferLock(address, token);
+        expect(BSV21.decode(script)?.tokenData.amt).toBe(amt);
+        expect(BSV21.decode(script)?.tokenData.id).toBe(id);
+        expect(BSV21.decode(script)?.tokenData.op).toBe('transfer');
+        expect(script.toHex()).not.toBe(new P2PKH().lock(address).toHex());
+    });
+    test('throws when MIME is application/bsv-20 but amt is missing', () => {
+        expect(() => listedTransfer({ tags: [`type:${TOKEN_CONTENT_TYPE}`] })).toThrow('token-listing-requires-transfer-identity');
+    });
+    test('does not treat a bsv21 overlay tag as an NFT', () => {
+        const id = `${'ab'.repeat(32)}_0`;
+        expect(listedTransfer({
+            tags: [`bsv21:${id}`, 'amt:1111'],
+        })).toEqual({ id, amt: '1111' });
+        expect(isTokenListing({ tags: [`type:${TOKEN_CONTENT_TYPE}`] })).toBe(true);
+        expect(isTokenListing({ tags: ['ordlock'] })).toBe(false);
+    });
+});
+//# sourceMappingURL=listingToken.test.js.map

package/dist/utils/listingToken.test.js.map

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

package/dist/utils/ordlockCancelLength.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Unlocking-script length to reserve when cancelling a listing, chosen from
+ * the listing's actual locking script (read out of its BEEF): v2 cancels
+ * carry the `ol2:cancel` marker and are 11 bytes longer than v1.
+ *
+ * Falls back to the v2 length (the larger bound) when the script cannot be
+ * found, so createAction never under-reserves.
+ */
+export declare function ordLockCancelUnlockLength(beef: number[], outpoint: string): number;
+//# sourceMappingURL=ordlockCancelLength.d.ts.map

package/dist/utils/ordlockCancelLength.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ordlockCancelLength.d.ts","sourceRoot":"","sources":["../../src/utils/ordlockCancelLength.ts"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,EAAE,MAAM,GACd,MAAM,CAUR"}

package/dist/utils/ordlockCancelLength.js

@@ -0,0 +1,23 @@
+import { ORDLOCK_CANCEL_UNLOCK_LENGTH, ORDLOCK_V2_CANCEL_UNLOCK_LENGTH, OrdLockV2, } from '@1sat/templates';
+import { parseOutpoint } from '@1sat/utils';
+import { Beef } from '@bsv/sdk';
+/**
+ * Unlocking-script length to reserve when cancelling a listing, chosen from
+ * the listing's actual locking script (read out of its BEEF): v2 cancels
+ * carry the `ol2:cancel` marker and are 11 bytes longer than v1.
+ *
+ * Falls back to the v2 length (the larger bound) when the script cannot be
+ * found, so createAction never under-reserves.
+ */
+export function ordLockCancelUnlockLength(beef, outpoint) {
+    try {
+        const { txid, vout } = parseOutpoint(outpoint);
+        const script = Beef.fromBinary(beef).findTxid(txid)?.tx?.outputs[vout]?.lockingScript;
+        if (script && !OrdLockV2.isOrdLockV2(script)) {
+            return ORDLOCK_CANCEL_UNLOCK_LENGTH;
+        }
+    }
+    catch { }
+    return ORDLOCK_V2_CANCEL_UNLOCK_LENGTH;
+}
+//# sourceMappingURL=ordlockCancelLength.js.map

package/dist/utils/ordlockCancelLength.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ordlockCancelLength.js","sourceRoot":"","sources":["../../src/utils/ordlockCancelLength.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,4BAA4B,EAC5B,+BAA+B,EAC/B,SAAS,GACT,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAE/B;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB,CACxC,IAAc,EACd,QAAgB;IAEhB,IAAI,CAAC;QACJ,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAA;QAC9C,MAAM,MAAM,GACX,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,aAAa,CAAA;QACvE,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,OAAO,4BAA4B,CAAA;QACpC,CAAC;IACF,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,OAAO,+BAA+B,CAAA;AACvC,CAAC"}

package/dist/utils/ordlockCancelLength.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ordlockCancelLength.test.d.ts.map

package/dist/utils/ordlockCancelLength.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ordlockCancelLength.test.d.ts","sourceRoot":"","sources":["../../src/utils/ordlockCancelLength.test.ts"],"names":[],"mappings":""}

package/dist/utils/ordlockCancelLength.test.js

@@ -0,0 +1,33 @@
+import { describe, expect, it } from 'bun:test';
+import { ORDLOCK_CANCEL_UNLOCK_LENGTH, ORDLOCK_V2_CANCEL_UNLOCK_LENGTH, OrdLockV2, } from '@1sat/templates';
+import { ORD_LOCK_PREFIX, ORD_LOCK_SUFFIX } from '@1sat/types';
+import { Beef, P2PKH, PrivateKey, Script, Transaction, Utils, } from '@bsv/sdk';
+import { ordLockCancelUnlockLength } from './ordlockCancelLength.js';
+const addr = new PrivateKey(9001).toAddress();
+const pkh = Utils.fromBase58Check(addr).data;
+function v1Lock() {
+    return Script.fromHex(`${ORD_LOCK_PREFIX}14${Utils.toHex(pkh)}22e803000000000000${'19'}${new P2PKH().lock(pkh).toHex()}${ORD_LOCK_SUFFIX}`);
+}
+describe('ordLockCancelUnlockLength', () => {
+    const tx = new Transaction();
+    tx.addOutput({ satoshis: 1, lockingScript: v1Lock() });
+    tx.addOutput({
+        satoshis: 1,
+        lockingScript: OrdLockV2.lock(addr, addr, 1000),
+    });
+    const beef = new Beef();
+    beef.mergeTransaction(tx);
+    const bin = beef.toBinary();
+    const txid = tx.id('hex');
+    it('picks the v1 length for a v1 listing', () => {
+        expect(ordLockCancelUnlockLength(bin, `${txid}.0`)).toBe(ORDLOCK_CANCEL_UNLOCK_LENGTH);
+    });
+    it('picks the v2 length for a v2 listing', () => {
+        expect(ordLockCancelUnlockLength(bin, `${txid}.1`)).toBe(ORDLOCK_V2_CANCEL_UNLOCK_LENGTH);
+    });
+    it('falls back to the larger v2 bound when the output is not in the BEEF', () => {
+        expect(ordLockCancelUnlockLength(bin, `${'00'.repeat(32)}.0`)).toBe(ORDLOCK_V2_CANCEL_UNLOCK_LENGTH);
+        expect(ordLockCancelUnlockLength([], `${txid}.0`)).toBe(ORDLOCK_V2_CANCEL_UNLOCK_LENGTH);
+    });
+});
+//# sourceMappingURL=ordlockCancelLength.test.js.map

package/dist/utils/ordlockCancelLength.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ordlockCancelLength.test.js","sourceRoot":"","sources":["../../src/utils/ordlockCancelLength.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EACN,4BAA4B,EAC5B,+BAA+B,EAC/B,SAAS,GACT,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC9D,OAAO,EACN,IAAI,EAEJ,KAAK,EACL,UAAU,EACV,MAAM,EACN,WAAW,EACX,KAAK,GACL,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAA;AAEpE,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAA;AAC7C,MAAM,GAAG,GAAG,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,IAAgB,CAAA;AAExD,SAAS,MAAM;IACd,OAAO,MAAM,CAAC,OAAO,CACpB,GAAG,eAAe,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,qBAAqB,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,eAAe,EAAE,CACpH,CAAA;AACF,CAAC;AAED,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IAC1C,MAAM,EAAE,GAAG,IAAI,WAAW,EAAE,CAAA;IAC5B,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,EAAmB,EAAE,CAAC,CAAA;IACvE,EAAE,CAAC,SAAS,CAAC;QACZ,QAAQ,EAAE,CAAC;QACX,aAAa,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAkB;KAChE,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACvB,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;IAC3B,MAAM,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAEzB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CACvD,4BAA4B,CAC5B,CAAA;IACF,CAAC,CAAC,CAAA;IACF,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CACvD,+BAA+B,CAC/B,CAAA;IACF,CAAC,CAAC,CAAA;IACF,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC/E,MAAM,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAClE,+BAA+B,CAC/B,CAAA;QACD,MAAM,CAAC,yBAAyB,CAAC,EAAE,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CACtD,+BAA+B,CAC/B,CAAA;IACF,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/actions",
-  "version": "0.0.214",
+  "version": "0.0.216",
   "description": "Action definitions for the 1Sat SDK",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,19 +29,19 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/client": "0.0.52",
-    "@1sat/templates": "0.0.34",
-    "@1sat/types": "0.0.44",
-    "@1sat/utils": "0.0.35",
-    "@1sat/wallet": "0.0.107",
+    "@1sat/client": "0.0.53",
+    "@1sat/templates": "0.0.35",
+    "@1sat/types": "0.0.45",
+    "@1sat/utils": "0.0.36",
+    "@1sat/wallet": "0.0.108",
     "@bsv/message-box-client": "^2.5.0"
   },
   "peerDependencies": {
-    "@bsv/sdk": "^2.5.0"
+    "@bsv/sdk": "^2.6.0"
   },
   "devDependencies": {
-    "@1sat/wallet-remote": "0.0.64",
-    "@bsv/sdk": "^2.5.0",
+    "@1sat/wallet-remote": "0.0.65",
+    "@bsv/sdk": "^2.6.0",
     "typescript": "^5.9.3"
   }
 }