Merge pull request #468 from bob-collective/feat/check-mempool-tx-run…

…e-pt2 chore: replace runestonejs with magiceden runestone
bob-collective · Jan 31, 2025 · 9217101 · 9217101
2 parents 59afafa + 01fba8c
commit 9217101
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 40 deletions.
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
diff --git a/sdk/package.json b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gobob/bob-sdk",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -39,11 +39,11 @@
     "yargs": "^17.5.1"
   },
   "dependencies": {
+    "@magiceden-oss/runestone-lib": "^1.0.2",
     "@scure/base": "^1.1.7",
     "@scure/btc-signer": "^1.3.2",
     "bitcoin-address-validation": "^2.2.3",
     "bitcoinjs-lib": "^6.1.6",
-    "ethers": "^6.13.2",
-    "runestone-js": "0.3.0"
+    "ethers": "^6.13.2"
   }
 }
diff --git a/sdk/src/runes.ts b/sdk/src/runes.ts
@@ -1,16 +1,17 @@
 import * as bitcoin from 'bitcoinjs-lib';
 import { EsploraClient } from './esplora';
-// This implementation is based on ord 0.17.1, *use this as a reference only
-import { Runestone } from 'runestone-js';
+import { Cenotaph, RunestoneSpec, tryDecodeRunestone } from '@magiceden-oss/runestone-lib';
 
-export function parseRunestone(tx: bitcoin.Transaction): Runestone | undefined {
-    for (const out of tx.outs) {
-        if (out.script[0] === bitcoin.opcodes.OP_RETURN && out.script[1] === bitcoin.opcodes.OP_13) {
-            // skip OP_RETURN OP_13 OP_PUSHBYTES
-            const pureOutputBuffer = out.script.subarray(3);
-            return Runestone.dechiper(pureOutputBuffer);
-        }
-    }
+export function parseRunestone(tx: bitcoin.Transaction): RunestoneSpec | Cenotaph | null {
+    const rune = tryDecodeRunestone({
+        vout: tx.outs.map((out) => ({
+            scriptPubKey: {
+                hex: out.script.toString('hex'),
+            },
+        })),
+    });
+
+    return rune;
 }
 
 export async function getTxRunestone(esploraClient: EsploraClient, txid: string) {

diff --git a/sdk/test/utxo.test.ts b/sdk/test/utxo.test.ts
@@ -40,8 +40,8 @@ describe('UTXO Tests', () => {
             // TODO: Use a real P2SH-P2WPKH address
             // TODO: Add the pubkey to allow spending from the outputs
             // '3DFVKuT9Ft4rWpysAZ1bHpg55EBy1HVPcr',
-            // P2PKH: https://blockstream.info/address/1Kr6QSydW9bFQG1mXiPNNu6WpJGmUa9i1g
-            '1Kr6QSydW9bFQG1mXiPNNu6WpJGmUa9i1g',
+            // P2PKH: https://blockstream.info/address/1PM46U2c5LhkcQXnHwfwQU6V1y4F4L7Ct4
+            '1PM46U2c5LhkcQXnHwfwQU6V1y4F4L7Ct4',
             // P2TR https://blockstream.info/address/bc1peqr5a5kfufvsl66444jm9y8qq0s87ph0zv4lfkcs7h40ew02uvsqkhjav0
             'bc1peqr5a5kfufvsl66444jm9y8qq0s87ph0zv4lfkcs7h40ew02uvsqkhjav0',
         ];
@@ -304,8 +304,8 @@ describe('UTXO Tests', () => {
             // P2SH-P2WPKH: https://blockstream.info/address/3DFVKuT9Ft4rWpysAZ1bHpg55EBy1HVPcr
             // TODO: As above, add a correct P2SH-P2WPKH address with its pub key
             // '3DFVKuT9Ft4rWpysAZ1bHpg55EBy1HVPcr',
-            // P2PKH: https://blockstream.info/address/1Kr6QSydW9bFQG1mXiPNNu6WpJGmUa9i1g
-            '1Kr6QSydW9bFQG1mXiPNNu6WpJGmUa9i1g',
+            // P2PKH: https://blockstream.info/address/1PM46U2c5LhkcQXnHwfwQU6V1y4F4L7Ct4
+            '1PM46U2c5LhkcQXnHwfwQU6V1y4F4L7Ct4',
             // P2TR https://blockstream.info/address/bc1peqr5a5kfufvsl66444jm9y8qq0s87ph0zv4lfkcs7h40ew02uvsqkhjav0
             'bc1peqr5a5kfufvsl66444jm9y8qq0s87ph0zv4lfkcs7h40ew02uvsqkhjav0',
         ];