refactor(sdk): performance improvements (#48)

* perf: access collection inscription from tx response Co-authored-by: KevinK <[email protected]> * feat: extend publish/mint fn to accept RBF flag * refactor(rpc): return detailed error message * refactor: set `enableRBF` optional in createPsbt fn --------- Co-authored-by: KevinK <[email protected]>
sadoprotocol · Aug 18, 2023 · 532f233 · 532f233
1 parent 1403ec9
commit 532f233
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/packages/sdk/src/api/jsonrpc.ts b/packages/sdk/src/api/jsonrpc.ts
@@ -50,7 +50,7 @@ class JsonRpc {
     if (response.status === 200) {
       const json = await response.json()
       if (json.error) {
-        throw new Error(json.error.message)
+        throw new Error(json.error.data || json.error.message)
       }
       return json.result
     }

diff --git a/packages/sdk/src/inscription/collection.ts b/packages/sdk/src/inscription/collection.ts
@@ -52,8 +52,12 @@ export async function mintFromCollection(options: MintFromCollectionOptions) {
     throw new Error("Failed to get raw transaction for id: " + colTxId)
   }
 
-  const colMeta = tx.vout[colVOut].inscriptions[0].meta
+  const collection = tx.vout[colVOut].inscriptions[0]
+  if (!collection) {
+    throw new Error("Invalid collection")
+  }
 
+  const colMeta = collection.meta
   let validInscription = false
 
   for (let i = 0; i < colMeta?.insc.length; i++) {
@@ -70,15 +74,6 @@ export async function mintFromCollection(options: MintFromCollectionOptions) {
     throw new Error("Invalid inscription iid supplied.")
   }
 
-  const [collection] = await OrditApi.fetchInscriptions({
-    outpoint: options.collectionOutpoint,
-    network: options.network
-  })
-
-  if (!collection) {
-    throw new Error("Invalid collection")
-  }
-
   const meta: any = {
     p: "vord",
     v: 1,
@@ -136,6 +131,7 @@ export type PublishCollectionOptions = Pick<GetWalletOptions, "safeMode"> & {
   publicKey: string
   outs?: Outputs
   encodeMetadata?: boolean
+  enableRBF?: boolean
 }
 
 export type CollectionInscription = {
@@ -161,6 +157,7 @@ export type MintFromCollectionOptions = Pick<GetWalletOptions, "safeMode"> & {
   outs?: Outputs
   traits?: any
   encodeMetadata?: boolean
+  enableRBF?: boolean
 }
 
 type Outputs = Array<{ address: string; value: number }>
diff --git a/packages/sdk/src/transactions/OrdTransaction.ts b/packages/sdk/src/transactions/OrdTransaction.ts
@@ -41,6 +41,7 @@ export class OrdTransaction {
   #outs: Outputs = []
   #safeMode: OnOffUnion
   #encodeMetadata: boolean
+  #enableRBF: boolean
 
   constructor({
     feeRate = 10,
@@ -50,6 +51,7 @@ export class OrdTransaction {
     publicKey,
     outs = [],
     encodeMetadata = false,
+    enableRBF = true,
     ...otherOptions
   }: OrdTransactionOptions) {
     if (!publicKey || !otherOptions.changeAddress || !otherOptions.destination || !otherOptions.mediaContent) {
@@ -68,6 +70,7 @@ export class OrdTransaction {
     this.#outs = outs
     this.#safeMode = !otherOptions.safeMode ? "on" : otherOptions.safeMode
     this.#encodeMetadata = encodeMetadata
+    this.#enableRBF = enableRBF
 
     const xKey = getAddressesFromPublicKey(publicKey, network, "p2tr")[0].xkey
 
@@ -108,7 +111,7 @@ export class OrdTransaction {
     const psbt = new bitcoin.Psbt({ network: networkObj })
 
     psbt.addInput({
-      sequence: 0xfffffffd, // Needs to be at least 2 below max int value to be RBF
+      sequence: this.#enableRBF ? 0xfffffffd : 0xffffffff,
       hash: this.#suitableUnspent.txid,
       index: parseInt(this.#suitableUnspent.n),
       tapInternalKey: Buffer.from(this.#xKey, "hex"),
@@ -337,6 +340,7 @@ export type OrdTransactionOptions = Pick<GetWalletOptions, "safeMode"> & {
   publicKey: string
   outs?: Outputs
   encodeMetadata?: boolean
+  enableRBF?: boolean
 }
 
 type Outputs = Array<{ address: string; value: number }>
diff --git a/packages/sdk/src/transactions/psbt.ts b/packages/sdk/src/transactions/psbt.ts
@@ -215,7 +215,7 @@ export type CreatePsbtOptions = {
     address: string
     cardinals: number
   }[]
-  enableRBF: boolean
+  enableRBF?: boolean
   pubKey: string
   network: Network
   safeMode?: OnOffUnion