cleanup "dojo"s, fix INSUFFICIENT_FUNDS

Author: tonesnotes

src/sdk/WalletError.ts

@@ -56,7 +56,6 @@ export class WalletError extends Error implements WalletErrorObject {
   /**
    * Recovers all public fields from WalletError derived error classes and relevant Error derived errors.
    *
-   * Critical client data fields are preserved across HTTP DojoExpress / DojoExpressClient encoding.
    */
   static fromUnknown(err: unknown): WalletError {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/storage/StorageProvider.ts

@@ -217,7 +217,7 @@ export abstract class StorageProvider
 
   /**
    * Given an array of transaction txids with current ProvenTxReq ready-to-share status,
-   * lookup their DojoProvenTxReqApi req records.
+   * lookup their ProvenTxReqApi req records.
    * For the txids with reqs and status still ready to send construct a single merged beef.
    *
    * @param txids
@@ -408,9 +408,6 @@ export abstract class StorageProvider
    *
    * For 'status' of 'failed', attempts to make outputs previously allocated as inputs to this transaction usable again.
    *
-   * @throws ERR_DOJO_COMPLETED_TX if current status is 'completed' and new status is not 'completed.
-   * @throws ERR_DOJO_PROVEN_TX if transaction has proof or provenTxId and new status is not 'completed'.
-   *
    * @param status
    * @param transactionId
    * @param userId

src/storage/methods/createAction.ts

@@ -711,7 +711,7 @@ async function validateRequiredInputs(
 }
 
 async function validateNoSendChange(
-  dojo: StorageProvider,
+  storage: StorageProvider,
   userId: number,
   vargs: sdk.ValidCreateActionArgs,
   changeBasket: table.OutputBasket
@@ -725,7 +725,7 @@ async function validateNoSendChange(
   if (noSendChange && noSendChange.length > 0) {
     for (const op of noSendChange) {
       const output = verifyOneOrNone(
-        await dojo.findOutputs({
+        await storage.findOutputs({
           partial: { userId, txid: op.txid, vout: op.vout }
         })
       )
@@ -754,7 +754,7 @@ async function validateNoSendChange(
 }
 
 async function fundNewTransactionSdk(
-  dojo: StorageProvider,
+  storage: StorageProvider,
   userId: number,
   vargs: sdk.ValidCreateActionArgs,
   ctx: CreateTransactionSdkContext
@@ -796,7 +796,7 @@ async function fundNewTransactionSdk(
       const o = noSendChange.pop()!
       outputs[o.outputId!] = o
       // allocate the output in storage, noSendChange is by definition spendable false and part of noSpend transaction batch.
-      await dojo.updateOutput(o.outputId!, {
+      await storage.updateOutput(o.outputId!, {
         spendable: false,
         spentBy: ctx.transactionId
       })
@@ -810,7 +810,7 @@ async function fundNewTransactionSdk(
     }
 
     const basketId = ctx.changeBasket.basketId!
-    const o = await dojo.allocateChangeInput(
+    const o = await storage.allocateChangeInput(
       userId,
       basketId,
       targetSatoshis,
@@ -833,7 +833,7 @@ async function fundNewTransactionSdk(
       noSendChange.push(nsco)
       return
     }
-    await dojo.updateOutput(outputId, {
+    await storage.updateOutput(outputId, {
       spendable: true,
       spentBy: undefined
     })
@@ -910,7 +910,7 @@ function trimInputBeef(
 }
 
 async function mergeAllocatedChangeBeefs(
-  dojo: StorageProvider,
+  storage: StorageProvider,
   userId: number,
   vargs: sdk.ValidCreateActionArgs,
   allocatedChange: table.Output[],
@@ -931,7 +931,7 @@ async function mergeAllocatedChangeBeefs(
       !beef.findTxid(o.txid!) &&
       !vargs.options.knownTxids.find(txid => txid === o.txid)
     ) {
-      await dojo.getBeefForTransaction(o.txid!, options)
+      await storage.getBeefForTransaction(o.txid!, options)
     }
   }
   return trimInputBeef(beef, vargs)

src/storage/methods/generateChange.ts

@@ -331,7 +331,7 @@ export async function generateChangeSdk(
     return r
   } catch (eu: unknown) {
     const e = sdk.WalletError.fromUnknown(eu)
-    if (e.code === 'ERR_DOJO_NOT_SUFFICIENT_FUNDS') throw eu
+    if (e.code === 'WERR_INSUFFICIENT_FUNDS') throw eu
 
     // Capture the params in cloud run log which has a 100k text length limit per line.
     // logGenerateChangeSdkParams(params, eu)

src/storage/schema/tables/ProvenTxReq.ts

@@ -21,12 +21,12 @@ export interface ProvenTxReq extends ProvenTxReqDynamics {
   batch?: string
   /**
    * JSON string of processing history.
-   * Parses to `DojoProvenTxReqHistoryApi`.
+   * Parses to `ProvenTxReqHistoryApi`.
    */
   history: string
   /**
    * JSON string of data to drive notifications when this request completes.
-   * Parses to `DojoProvenTxReqNotifyApi`.
+   * Parses to `ProvenTxReqNotifyApi`.
    */
   notify: string
   rawTx: number[]
@@ -54,12 +54,12 @@ export interface ProvenTxReqDynamics extends sdk.EntityTimeStamp {
   batch?: string
   /**
    * JSON string of processing history.
-   * Parses to `DojoProvenTxReqHistoryApi`.
+   * Parses to `ProvenTxReqHistoryApi`.
    */
   history: string
   /**
    * JSON string of data to drive notifications when this request completes.
-   * Parses to `DojoProvenTxReqNotifyApi`.
+   * Parses to `ProvenTxReqNotifyApi`.
    */
   notify: string
 }