@xyo-network/xl1-rpc 1.7.17 → 1.7.18

package/dist/neutral/index.mjs

@@ -101,15 +101,44 @@ var JsonRpcXyoGateway = class extends AbstractXyoGateway {
 };
 
 // src/provider/host/MemoryXyoGateway.ts
-import { isDefined as isDefined2 } from "@xylabs/typeof";
+import { isDefined as isDefined3 } from "@xylabs/typeof";
 
-// src/provider/provider/confirmTransaction.ts
+// src/provider/provider/confirmSubmittedTransaction.ts
 import { delay } from "@xylabs/delay";
+import { isDefined } from "@xylabs/typeof";
 import { PayloadBuilder } from "@xyo-network/payload-builder";
+var DEFAULT_CONFIRMATION_ATTEMPTS = 20;
+var DEFAULT_DELAY_BETWEEN_ATTEMPTS = 1e3;
+var confirmSubmittedTransaction = /* @__PURE__ */ __name(async (provider, txBW, options) => {
+  const { attempts: maxAttempts = DEFAULT_CONFIRMATION_ATTEMPTS, delay: attemptDelay = DEFAULT_DELAY_BETWEEN_ATTEMPTS } = options || {};
+  const txBWHash = await PayloadBuilder.hash(txBW);
+  options?.logger?.log("\u2705 confirming transaction:", txBWHash, "\n");
+  let attempts = 0;
+  while (true) {
+    const tx = await provider.viewer?.transactionByHash(txBWHash) ?? void 0;
+    if (isDefined(tx)) {
+      options?.logger?.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
+      return tx;
+    } else {
+      attempts++;
+      if (attempts > maxAttempts) {
+        options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
+        throw new Error(`Transaction ${txBWHash} not confirmed after ${maxAttempts} attempts`);
+      } else {
+        options?.logger?.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
+        await delay(attemptDelay);
+      }
+    }
+  }
+}, "confirmSubmittedTransaction");
+
+// src/provider/provider/confirmTransaction.ts
+import { delay as delay2 } from "@xylabs/delay";
+import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
 var CONFIRMATION_ATTEMPTS = 20;
 var DELAY_BETWEEN_ATTEMPTS = 1e3;
 var confirmTransaction = /* @__PURE__ */ __name(async (provider, txBW, onConfirm, onTimeout) => {
-  const txBWHash = await PayloadBuilder.hash(txBW);
+  const txBWHash = await PayloadBuilder2.hash(txBW);
   console.log("\u2705 confirming transaction:", txBWHash, "\n");
   let confirmed = false;
   let attempts = 0;
@@ -127,7 +156,7 @@ var confirmTransaction = /* @__PURE__ */ __name(async (provider, txBW, onConfirm
         return;
       } else {
         console.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
-        await delay(DELAY_BETWEEN_ATTEMPTS);
+        await delay2(DELAY_BETWEEN_ATTEMPTS);
       }
     }
   }
@@ -883,7 +912,7 @@ var MemoryRpcTransport = class {
 };
 
 // src/transport/post-message/PostMessageRpcTransport.ts
-import { isDefined } from "@xylabs/typeof";
+import { isDefined as isDefined2 } from "@xylabs/typeof";
 import { v4 as v43 } from "uuid";
 
 // src/transport/post-message/helpers.ts
@@ -922,7 +951,7 @@ var PostMessageRpcTransport = class {
       id,
       method
     };
-    body.params = isDefined(params) && isDefined(schemas[method]) ? schemas[method].params.to.parse(params) : params;
+    body.params = isDefined2(params) && isDefined2(schemas[method]) ? schemas[method].params.to.parse(params) : params;
     return await new Promise((resolve, reject) => {
       const id2 = body.id;
       const handler = /* @__PURE__ */ __name((event) => {
@@ -959,7 +988,7 @@ var JsonRpcXyoRunner = class {
 
 // src/provider/runner/MemoryXyoRunner.ts
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
-import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
 import { flattenHydratedTransaction } from "@xyo-network/xl1-protocol-sdk";
 var MemoryXyoRunner = class {
   static {
@@ -969,7 +998,7 @@ var MemoryXyoRunner = class {
   async broadcastTransaction(transaction) {
     const archivist = await this.getArchivist();
     await archivist.insert(flattenHydratedTransaction(transaction));
-    return await PayloadBuilder2.hash(transaction[0]);
+    return await PayloadBuilder3.hash(transaction[0]);
   }
   async getArchivist() {
     if (!this._archivist) {
@@ -984,7 +1013,7 @@ var MemoryXyoRunner = class {
 // src/provider/runner/NodeXyoRunner.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
 import { asArchivistInstance } from "@xyo-network/archivist-model";
-import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/payload-builder";
 import { PayloadBundleSchema } from "@xyo-network/payload-model";
 import { flattenHydratedTransaction as flattenHydratedTransaction2 } from "@xyo-network/xl1-protocol-sdk";
 var NodeXyoRunner = class {
@@ -1001,7 +1030,7 @@ var NodeXyoRunner = class {
   async broadcastTransaction(transaction) {
     const flattened = flattenHydratedTransaction2(transaction);
     const pendingArchivist = await this.getPendingArchivist();
-    const txHash = await PayloadBuilder3.hash(transaction[0]);
+    const txHash = await PayloadBuilder4.hash(transaction[0]);
     const payloadBundle = {
       schema: PayloadBundleSchema,
       payloads: flattened,
@@ -1147,7 +1176,7 @@ var JsonRpcXyoViewer = class {
 
 // src/provider/provider/XyoConnection.ts
 import { assertEx as assertEx3 } from "@xylabs/assert";
-import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
 import { isAnyPayload } from "@xyo-network/payload-model";
 import { defaultTransactionFees, isDataLakeProvider } from "@xyo-network/xl1-protocol";
 import { HydratedTransactionWrapper } from "@xyo-network/xl1-wrappers";
@@ -1206,8 +1235,8 @@ var XyoConnection = class {
     if (fromResolved === void 0) throw new Error("Failed to determine from address");
     const signedTransaction = assertEx3(await signer.createSignedTransaction(chainResolved, elevatedPayloads, additionalPayloads, nbfResolved, expResolved, feesResolved, fromResolved), () => "Failed to create transaction");
     const hydratedTransaction = [
-      await PayloadBuilder4.addStorageMeta(signedTransaction),
-      await PayloadBuilder4.addStorageMeta(elevatedPayloads)
+      await PayloadBuilder5.addStorageMeta(signedTransaction),
+      await PayloadBuilder5.addStorageMeta(elevatedPayloads)
     ];
     if (isDataLakeProvider(storage)) {
       const wrapper = await HydratedTransactionWrapper.parse(hydratedTransaction);
@@ -1260,7 +1289,7 @@ var MemoryXyoGateway = class extends AbstractXyoGateway {
     return this._signer;
   }
   activeConnection() {
-    return isDefined2(this._activeConnectionId) ? this._connections.get(this._activeConnectionId) : void 0;
+    return isDefined3(this._activeConnectionId) ? this._connections.get(this._activeConnectionId) : void 0;
   }
   addConnection(configOrName, connection) {
     if (typeof configOrName === "string" && connection !== void 0) {
@@ -1297,7 +1326,7 @@ var MemoryXyoGateway = class extends AbstractXyoGateway {
     return this._permissionsStore.revokePermissions(permissions);
   }
   setActiveConnectionIdIfUndefined(id) {
-    if (!isDefined2(this._activeConnectionId)) {
+    if (!isDefined3(this._activeConnectionId)) {
       this._activeConnectionId = id;
     }
   }
@@ -1448,6 +1477,7 @@ export {
   XyoSignerRpcSchemas,
   XyoViewerRpcSchemas,
   buildSessionMessageRequest,
+  confirmSubmittedTransaction,
   confirmTransaction,
   createRequestSchema,
   createResponseSchema,