@xyo-network/xl1-rpc 3.0.6 → 3.0.7

package/dist/neutral/client/index.mjs

@@ -1572,11 +1572,8 @@ import { creatableProvider } from "@xyo-network/xl1-protocol-sdk";
 import { AccountBalanceViewerMoniker } from "@xyo-network/xl1-protocol-lib";
 
 // src/provider/viewer/JsonRpcViewer.ts
-import {
-  AbstractCreatableProvider,
-  HttpRpcRemoteConfigZod,
-  PostMessageRpcRemoteConfigZod
-} from "@xyo-network/xl1-protocol-sdk";
+import { isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { AbstractCreatableProvider } from "@xyo-network/xl1-protocol-sdk";
 
 // src/transport/HttpRpcTransport.ts
 import {
@@ -1841,6 +1838,14 @@ var PostMessageRpcTransport = class {
 };
 
 // src/provider/viewer/JsonRpcViewer.ts
+function resolveRpcConnection(connections) {
+  const named = connections["default-rpc"];
+  if (isDefined5(named) && named.type === "rpc") {
+    return named;
+  }
+  const first = Object.values(connections).find((connection) => connection?.type === "rpc");
+  return first;
+}
 var AbstractJsonRpcViewer = class extends AbstractCreatableProvider {
   _transport;
   get transport() {
@@ -1851,15 +1856,14 @@ var AbstractJsonRpcViewer = class extends AbstractCreatableProvider {
     await super.createHandler();
   }
   createTransport() {
-    const httpRemoteConfig = HttpRpcRemoteConfigZod.safeParse(this.config.remote.rpc);
-    if (httpRemoteConfig.success) {
-      const { url } = httpRemoteConfig.data;
-      return new HttpRpcTransport(url, this.schemas());
-    }
-    const postMessageRemoteConfig = PostMessageRpcRemoteConfigZod.safeParse(this.config.remote.rpc);
-    if (postMessageRemoteConfig.success) {
-      const { networkId, sessionId } = postMessageRemoteConfig.data;
-      return new PostMessageRpcTransport(networkId, this.schemas(), sessionId, this.logger);
+    const connection = resolveRpcConnection(this.config.connections);
+    if (isDefined5(connection)) {
+      if (connection.protocol === "postMessage" || isDefined5(connection.networkId)) {
+        return new PostMessageRpcTransport(connection.networkId ?? "", this.schemas(), connection.sessionId ?? "", this.logger);
+      }
+      if (isDefined5(connection.url)) {
+        return new HttpRpcTransport(connection.url, this.schemas());
+      }
     }
     throw new Error("Unable to create transport");
   }
@@ -1924,20 +1928,20 @@ import {
 } from "@xyo-network/xl1-protocol-sdk";
 
 // src/provider/viewer/JsonRpcBlockViewer/JsonRpcBlockViewerMethods.ts
-import { isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { isDefined as isDefined6 } from "@xylabs/sdk-js";
 import { BlockViewerMoniker } from "@xyo-network/xl1-protocol-lib";
 var JsonRpcBlockViewerMethods = class extends AbstractJsonRpcViewer {
   moniker = BlockViewerMoniker;
   async blocksByHash(hash, limit) {
     return await this.transport.sendRequest(
       "blockViewer_blocksByHash",
-      isDefined5(limit) ? [hash, limit] : [hash]
+      isDefined6(limit) ? [hash, limit] : [hash]
     );
   }
   async blocksByNumber(block, limit) {
     return await this.transport.sendRequest(
       "blockViewer_blocksByNumber",
-      isDefined5(limit) ? [block, limit] : [block]
+      isDefined6(limit) ? [block, limit] : [block]
     );
   }
   async blocksByStep(stepLevel, stepIndex) {
@@ -2782,11 +2786,16 @@ import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/sdk-js";
 import { elevatedTransaction, MempoolRunnerMoniker } from "@xyo-network/xl1-protocol-lib";
 
 // src/provider/runner/JsonRpcRunner.ts
-import {
-  AbstractCreatableProvider as AbstractCreatableProvider2,
-  HttpRpcRemoteConfigZod as HttpRpcRemoteConfigZod2,
-  PostMessageRpcRemoteConfigZod as PostMessageRpcRemoteConfigZod2
-} from "@xyo-network/xl1-protocol-sdk";
+import { isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { AbstractCreatableProvider as AbstractCreatableProvider2 } from "@xyo-network/xl1-protocol-sdk";
+function resolveRpcConnection2(connections) {
+  const named = connections["default-rpc"];
+  if (isDefined7(named) && named.type === "rpc") {
+    return named;
+  }
+  const first = Object.values(connections).find((connection) => connection?.type === "rpc");
+  return first;
+}
 var AbstractJsonRpcRunner = class extends AbstractCreatableProvider2 {
   get transport() {
     return this.params.transport;
@@ -2796,15 +2805,14 @@ var AbstractJsonRpcRunner = class extends AbstractCreatableProvider2 {
     await super.createHandler();
   }
   createTransport() {
-    const httpRemoteConfig = HttpRpcRemoteConfigZod2.safeParse(this.config.remote.rpc);
-    if (httpRemoteConfig.success) {
-      const { url } = httpRemoteConfig.data;
-      return new HttpRpcTransport(url, this.schemas());
-    }
-    const postMessageRemoteConfig = PostMessageRpcRemoteConfigZod2.safeParse(this.config.remote.rpc);
-    if (postMessageRemoteConfig.success) {
-      const { networkId, sessionId } = postMessageRemoteConfig.data;
-      return new PostMessageRpcTransport(networkId, this.schemas(), sessionId, this.logger);
+    const connection = resolveRpcConnection2(this.config.connections);
+    if (isDefined7(connection)) {
+      if (connection.protocol === "postMessage" || isDefined7(connection.networkId)) {
+        return new PostMessageRpcTransport(connection.networkId ?? "", this.schemas(), connection.sessionId ?? "", this.logger);
+      }
+      if (isDefined7(connection.url)) {
+        return new HttpRpcTransport(connection.url, this.schemas());
+      }
     }
     throw new Error("Unable to create transport");
   }