@xyo-network/xl1-rpc 1.8.1 → 1.8.3

package/dist/neutral/index.mjs

@@ -232,64 +232,14 @@ var MemoryXyoNetwork = class {
   }
 };
 
-// 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/HttpRpcXyoConnection.ts
+import { isDefined as isDefined2 } from "@xylabs/typeof";
 
-// 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 PayloadBuilder2.hash(txBW);
-  console.log("\u2705 confirming transaction:", txBWHash, "\n");
-  let confirmed = false;
-  let attempts = 0;
-  while (!confirmed) {
-    const tx = await provider.viewer?.transactionByHash(txBWHash);
-    if (tx) {
-      confirmed = true;
-      console.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
-      onConfirm?.(txBWHash);
-    } else {
-      attempts++;
-      if (attempts > CONFIRMATION_ATTEMPTS) {
-        console.error(`\u26A0\uFE0F Transaction not confirmed after ${CONFIRMATION_ATTEMPTS} attempts`);
-        onTimeout?.();
-        return;
-      } else {
-        console.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
-        await delay2(DELAY_BETWEEN_ATTEMPTS);
-      }
-    }
-  }
-}, "confirmTransaction");
+// src/transport/HttpRpcTransport.ts
+import { AxiosJson } from "@xylabs/axios";
+import { isError, isUndefinedOrNull } from "@xylabs/typeof";
+import { isAxiosError } from "axios";
+import { v4 } from "uuid";
 
 // src/types/ErrorCodes.ts
 var JsonRpcErrorCodes = {
@@ -951,10 +901,6 @@ var XyoGatewayRpcSchemas = {
 };
 
 // src/transport/HttpRpcTransport.ts
-import { AxiosJson } from "@xylabs/axios";
-import { isError, isUndefinedOrNull } from "@xylabs/typeof";
-import { isAxiosError } from "axios";
-import { v4 } from "uuid";
 var HttpRpcTransport = class {
   static {
     __name(this, "HttpRpcTransport");
@@ -1035,7 +981,7 @@ var MemoryRpcTransport = class {
 };
 
 // src/transport/post-message/PostMessageRpcTransport.ts
-import { isDefined as isDefined2 } from "@xylabs/typeof";
+import { isDefined } from "@xylabs/typeof";
 import { v4 as v43 } from "uuid";
 
 // src/transport/post-message/helpers.ts
@@ -1074,7 +1020,7 @@ var PostMessageRpcTransport = class {
       id,
       method
     };
-    body.params = isDefined2(params) && isDefined2(schemas[method]) ? schemas[method].params.to.parse(params) : params;
+    body.params = isDefined(params) && isDefined(schemas[method]) ? schemas[method].params.to.parse(params) : params;
     return await new Promise((resolve, reject) => {
       const id2 = body.id;
       const handler = /* @__PURE__ */ __name((event) => {
@@ -1111,7 +1057,7 @@ var JsonRpcXyoRunner = class {
 
 // src/provider/runner/MemoryXyoRunner.ts
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
-import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { flattenHydratedTransaction } from "@xyo-network/xl1-protocol-sdk";
 var MemoryXyoRunner = class {
   static {
@@ -1121,7 +1067,7 @@ var MemoryXyoRunner = class {
   async broadcastTransaction(transaction) {
     const archivist = await this.getArchivist();
     await archivist.insert(flattenHydratedTransaction(transaction));
-    return await PayloadBuilder3.hash(transaction[0]);
+    return await PayloadBuilder.hash(transaction[0]);
   }
   async getArchivist() {
     if (!this._archivist) {
@@ -1136,7 +1082,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 PayloadBuilder4 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder2 } 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 {
@@ -1153,7 +1099,7 @@ var NodeXyoRunner = class {
   async broadcastTransaction(transaction) {
     const flattened = flattenHydratedTransaction2(transaction);
     const pendingArchivist = await this.getPendingArchivist();
-    const txHash = await PayloadBuilder4.hash(transaction[0]);
+    const txHash = await PayloadBuilder2.hash(transaction[0]);
     const payloadBundle = {
       schema: PayloadBundleSchema,
       payloads: flattened,
@@ -1299,7 +1245,7 @@ var JsonRpcXyoViewer = class {
 
 // src/provider/provider/XyoConnection.ts
 import { assertEx as assertEx3 } from "@xylabs/assert";
-import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder3 } 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";
@@ -1358,8 +1304,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 PayloadBuilder5.addStorageMeta(signedTransaction),
-      await PayloadBuilder5.addStorageMeta(elevatedPayloads)
+      await PayloadBuilder3.addStorageMeta(signedTransaction),
+      await PayloadBuilder3.addStorageMeta(elevatedPayloads)
     ];
     if (isDataLakeProvider(storage)) {
       const wrapper = await HydratedTransactionWrapper.parse(hydratedTransaction);
@@ -1370,17 +1316,18 @@ var XyoConnection = class {
   }
 };
 
-// src/provider/provider/RpcXyoConnection.ts
-var RpcXyoConnection = class extends XyoConnection {
+// src/provider/provider/HttpRpcXyoConnection.ts
+var HttpRpcXyoConnection = class extends XyoConnection {
   static {
-    __name(this, "RpcXyoConnection");
+    __name(this, "HttpRpcXyoConnection");
   }
   constructor(params) {
-    const transport = new HttpRpcTransport(params.endpoint, {
+    const { account, endpoint } = params;
+    const signer = isDefined2(account) ? new MemoryXyoSigner(account) : void 0;
+    const transport = new HttpRpcTransport(endpoint, {
       ...XyoRunnerRpcSchemas,
       ...XyoViewerRpcSchemas
     });
-    const signer = params.account ? new MemoryXyoSigner(params.account) : void 0;
     const runner = new JsonRpcXyoRunner(transport);
     const viewer = new JsonRpcXyoViewer(transport);
     super({
@@ -1390,6 +1337,11 @@ var RpcXyoConnection = class extends XyoConnection {
     });
   }
 };
+var RpcXyoConnection = class extends HttpRpcXyoConnection {
+  static {
+    __name(this, "RpcXyoConnection");
+  }
+};
 export {
   AbstractXyoGateway,
   AllRpcSchemas,
@@ -1397,6 +1349,7 @@ export {
   CaveatsSchema,
   ChainConnectionSchema,
   HttpRpcTransport,
+  HttpRpcXyoConnection,
   InvokerPermissionSchema,
   JsonRpcErrorCodes,
   JsonRpcXyoRunner,
@@ -1421,8 +1374,6 @@ export {
   XyoSignerRpcSchemas,
   XyoViewerRpcSchemas,
   buildSessionMessageRequest,
-  confirmSubmittedTransaction,
-  confirmTransaction,
   createRequestSchema,
   createResponseSchema,
   getPermissionsStoreFromTransport,