@xyo-network/xl1-protocol-sdk 1.19.7 → 1.19.9

package/dist/neutral/index.mjs

@@ -2036,7 +2036,7 @@ async function weightedStakeForRangeByPosition(context, blockViewer, externalRan
       )).toSorted((a, b) => a.time - b.time);
       let currentTime = externalRange[0];
       let currentStake = 0n;
-      if (isDefined12(staked) && mergedEvents[0].args.staked !== staked) {
+      if (isDefined12(staked) && mergedEvents.at(0)?.args.staked !== staked) {
         return 0n;
       }
       for (const event of mergedEvents) {
@@ -3753,6 +3753,9 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   finalizationViewer;
   _payloadCache;
   _signedHydratedBlockCache;
+  get chainContractViewer() {
+    return this.params.chainContractViewer;
+  }
   get finalizedArchivist() {
     return this.params.finalizedArchivist;
   }
@@ -3774,8 +3777,14 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     return this._store;
   }
   static async paramsHandler(params) {
-    assertEx29(params.finalizedArchivist, () => "finalizedArchivist is required");
-    return { ...await super.paramsHandler(params) };
+    return {
+      ...await super.paramsHandler(params),
+      chainContractViewer: assertEx29(
+        params.chainContractViewer ?? await params.context?.locator.getInstance(ChainContractViewerMoniker),
+        () => "chainContractViewer is required"
+      ),
+      finalizedArchivist: assertEx29(params.finalizedArchivist, () => "finalizedArchivist is required")
+    };
   }
   async blockByHash(hash) {
     return await this.spanAsync("blockByHash", async () => {
@@ -3831,11 +3840,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async chainId(blockNumber = "latest") {
     return await this.spanAsync("chainId", async () => {
-      const block = assertEx29(
-        blockNumber === "latest" ? await this.currentBlock() : await this.blockByNumber(blockNumber),
-        () => `Could not find block for block number ${blockNumber}`
-      );
-      return block[0].chain;
+      return blockNumber === "latest" ? await this.chainContractViewer.chainId() : await this.chainContractViewer.chainIdAtBlockNumber(blockNumber);
     }, { timeBudgetLimit: 200 });
   }
   async createHandler() {
@@ -3883,7 +3888,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
 };
 __publicField(SimpleBlockViewer, "defaultMoniker", BlockViewerMoniker);
-__publicField(SimpleBlockViewer, "dependencies", [FinalizationViewerMoniker]);
+__publicField(SimpleBlockViewer, "dependencies", [FinalizationViewerMoniker, ChainContractViewerMoniker]);
 __publicField(SimpleBlockViewer, "monikers", [BlockViewerMoniker]);
 SimpleBlockViewer = __decorateClass([
   creatableProvider()
@@ -4014,17 +4019,68 @@ SimpleBlockValidationViewer = __decorateClass([
   creatableProvider()
 ], SimpleBlockValidationViewer);
 
+// src/simple/chainContractViewer/SimpleChainContractViewer.ts
+import {
+  assertEx as assertEx31
+} from "@xylabs/sdk-js";
+var SimpleChainContractViewer = class extends AbstractCreatableProvider {
+  moniker = SimpleChainContractViewer.defaultMoniker;
+  chainId() {
+    return this.params.chainId;
+  }
+  async chainIdAtBlockNumber(blockNumber) {
+    return await withContextCacheResponse(this.context, "chainIdAtBlockNumber", `${blockNumber}`, async () => {
+      let chainId = this.chainId();
+      let contractViewer = this;
+      let forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
+      while (forkedAtBlockNumber !== null && blockNumber <= forkedAtBlockNumber) {
+        contractViewer = assertEx31(await contractViewer.forkedChainContractViewer());
+        forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
+        chainId = await contractViewer.chainId();
+      }
+      return chainId;
+    });
+  }
+  forkedAtBlockNumber() {
+    return this.params.forkedAtBlockNumber ?? null;
+  }
+  forkedAtHash() {
+    return this.params.forkedAtHash ?? null;
+  }
+  forkedChainContractViewer() {
+    return this.params.forkedChainContractViewer ?? null;
+  }
+  forkedChainId() {
+    return this.params.forkedChainId ?? null;
+  }
+  minWithdrawalBlocks() {
+    return this.params.minWithdrawalBlocks;
+  }
+  rewardsContract() {
+    return this.params.rewardsContract;
+  }
+  stakingTokenAddress() {
+    return this.params.stakingTokenAddress;
+  }
+};
+__publicField(SimpleChainContractViewer, "defaultMoniker", ChainContractViewerMoniker);
+__publicField(SimpleChainContractViewer, "dependencies", []);
+__publicField(SimpleChainContractViewer, "monikers", [ChainContractViewerMoniker]);
+SimpleChainContractViewer = __decorateClass([
+  creatableProvider()
+], SimpleChainContractViewer);
+
 // src/simple/chainStake/SimpleStakeViewer.ts
 import {
   asAddress as asAddress5,
   toAddress as toAddress9
 } from "@xylabs/sdk-js";
-import { assertEx as assertEx31 } from "@xylabs/sdk-js";
+import { assertEx as assertEx32 } from "@xylabs/sdk-js";
 var SimpleStakeViewer = class extends AbstractCreatableProvider {
   moniker = SimpleStakeViewer.defaultMoniker;
   _chainStakeEventsViewer;
   get stakeEvents() {
-    return assertEx31(this._chainStakeEventsViewer, () => "Stake events viewer not set");
+    return assertEx32(this._chainStakeEventsViewer, () => "Stake events viewer not set");
   }
   get chainMap() {
     return this.params.chainMap;
@@ -4061,7 +4117,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._chainStakeEventsViewer = assertEx31(
+    this._chainStakeEventsViewer = assertEx32(
       await this.locateAndCreate(StakeEventsViewerMoniker),
       () => "Failed to create StakeEventsViewer"
     );
@@ -4091,7 +4147,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     return toAddress9(toAddress9(1n));
   }
   stakeById(id) {
-    return assertEx31(this.positions[id], () => new Error(`Stake with id ${id} not found`));
+    return assertEx32(this.positions[id], () => new Error(`Stake with id ${id} not found`));
   }
   stakeByStaker(staker, slot) {
     return this.positions.filter((s) => asAddress5(s.staker) === asAddress5(staker))[slot];
@@ -4254,7 +4310,7 @@ SimpleFinalizationRunner = __decorateClass([
 
 // src/simple/finalization/SimpleFinalizationViewer.ts
 import {
-  assertEx as assertEx32
+  assertEx as assertEx33
 } from "@xylabs/sdk-js";
 import {
   asSignedHydratedBlockWithStorageMeta as asSignedHydratedBlockWithStorageMeta2
@@ -4279,7 +4335,7 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
     return this._store;
   }
   static async paramsHandler(params) {
-    assertEx32(params.finalizedArchivist, () => "finalizedArchivist is required");
+    assertEx33(params.finalizedArchivist, () => "finalizedArchivist is required");
     return { ...await super.paramsHandler(params) };
   }
   async createHandler() {
@@ -4288,13 +4344,13 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   }
   async head() {
     return await this.spanAsync("head", async () => {
-      const currentHead = assertEx32(await this.getCurrentHead(), () => "Could not find most recent block [currentBlock]");
+      const currentHead = assertEx33(await this.getCurrentHead(), () => "Could not find most recent block [currentBlock]");
       const cache = this.hydratedBlockCache;
       const block = await cache.get(currentHead._hash);
       if (!block) {
         console.log(`Could not find current block with hash ${currentHead._hash}`);
       }
-      return assertEx32(block, () => "Could not find current block");
+      return assertEx33(block, () => "Could not find current block");
     }, { timeBudgetLimit: 200 });
   }
   async headBlock() {
@@ -4340,7 +4396,7 @@ var SimpleXyoGateway = class _SimpleXyoGateway extends AbstractCreatableProvider
 
 // src/simple/gateway/SimpleXyoGatewayRunner.ts
 import {
-  assertEx as assertEx33,
+  assertEx as assertEx34,
   BigIntToJsonZod,
   isDefined as isDefined19
 } from "@xylabs/sdk-js";
@@ -4364,7 +4420,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
     return this._signer;
   }
   async addPayloadsToChain(onChain, offChain, options) {
-    const viewer = assertEx33(this.connection.viewer, () => "No viewer available on connection");
+    const viewer = assertEx34(this.connection.viewer, () => "No viewer available on connection");
     const {
       nbf,
       exp,
@@ -4380,7 +4436,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
   async addTransactionToChain(tx) {
     const connection = this.connection;
     const signer = this.signer;
-    const runner = assertEx33(connection.runner, () => "No runner available on connection");
+    const runner = assertEx34(connection.runner, () => "No runner available on connection");
     const signedTx = await signer.signTransaction(tx);
     await this.addPayloadsToDataLakes(signedTx[1]);
     return [await runner.broadcastTransaction(
@@ -4389,7 +4445,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
   }
   async confirmSubmittedTransaction(txHash, options) {
     return await confirmSubmittedTransaction(
-      assertEx33(this.connection.viewer, () => "Connection viewer is undefined"),
+      assertEx34(this.connection.viewer, () => "Connection viewer is undefined"),
       txHash,
       options
     );
@@ -4429,7 +4485,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
 };
 
 // src/simple/mempool/SimpleMempoolRunner.ts
-import { assertEx as assertEx34 } from "@xylabs/sdk-js";
+import { assertEx as assertEx35 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder18 } from "@xyo-network/payload-builder";
 var SimpleMempoolRunner = class extends AbstractCreatableProvider {
   moniker = SimpleMempoolRunner.defaultMoniker;
@@ -4442,8 +4498,8 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
   static async paramsHandler(params) {
     return {
       ...await super.paramsHandler(params),
-      pendingBlocksArchivist: assertEx34(params?.pendingBlocksArchivist, () => "pendingBlocksArchivist is required"),
-      pendingTransactionsArchivist: assertEx34(params?.pendingTransactionsArchivist, () => "pendingTransactionsArchivist is required")
+      pendingBlocksArchivist: assertEx35(params?.pendingBlocksArchivist, () => "pendingBlocksArchivist is required"),
+      pendingTransactionsArchivist: assertEx35(params?.pendingTransactionsArchivist, () => "pendingTransactionsArchivist is required")
     };
   }
   async submitBlocks(blocks) {
@@ -4676,7 +4732,7 @@ var SimpleXyoNetwork = class {
 };
 
 // src/simple/permissions/SimpleXyoPermissions.ts
-import { assertEx as assertEx35 } from "@xylabs/sdk-js";
+import { assertEx as assertEx36 } from "@xylabs/sdk-js";
 var SimpleXyoPermissions = class {
   invoker;
   _store;
@@ -4685,7 +4741,7 @@ var SimpleXyoPermissions = class {
     this.invoker = store.invoker;
   }
   get store() {
-    return assertEx35(this._store, () => "Store must be defined to get permissions");
+    return assertEx36(this._store, () => "Store must be defined to get permissions");
   }
   async getPermissions() {
     return await this.store.getPermissions();
@@ -4738,7 +4794,7 @@ var SimpleXyoPermissions = class {
 };
 
 // src/simple/permissions/store/MemoryPermissions.ts
-import { assertEx as assertEx36 } from "@xylabs/sdk-js";
+import { assertEx as assertEx37 } from "@xylabs/sdk-js";
 var MemoryPermissionsStore = class {
   _invoker;
   permissions = [];
@@ -4746,7 +4802,7 @@ var MemoryPermissionsStore = class {
     this._invoker = invoker;
   }
   get invoker() {
-    return assertEx36(this._invoker, () => "Invoker must be defined to get permissions");
+    return assertEx37(this._invoker, () => "Invoker must be defined to get permissions");
   }
   async getPermissions() {
     await Promise.resolve();
@@ -4907,10 +4963,10 @@ SimpleStakeEventsViewer = __decorateClass([
   creatableProvider()
 ], SimpleStakeEventsViewer);
 
-// src/simple/timesync/SimpleTimeSyncViewer.ts
+// src/simple/timeSync2/SimpleTimeSyncViewer.ts
 import {
   asHash as asHash6,
-  assertEx as assertEx37,
+  assertEx as assertEx38,
   isDefined as isDefined22
 } from "@xylabs/sdk-js";
 import {
@@ -4930,7 +4986,7 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
   async convertTime(fromDomain, toDomain, from) {
     switch (fromDomain) {
       case "xl1": {
-        const [block, payloads] = assertEx37(await this.blockViewer.blockByNumber(asXL1BlockNumber10(from, true)), () => "Block not found");
+        const [block, payloads] = assertEx38(await this.blockViewer.blockByNumber(asXL1BlockNumber10(from, true)), () => "Block not found");
         const timeSchemaIndex = block.payload_schemas.indexOf(TimeSchema);
         const hash = timeSchemaIndex === -1 ? void 0 : block.payload_hashes[timeSchemaIndex];
         const timePayload = asTimePayload2(isDefined22(hash) ? payloads.find((p) => p._hash === hash) : void 0);
@@ -4985,10 +5041,10 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
         return [Date.now(), null];
       }
       case "ethereum": {
-        const provider = assertEx37(this.ethProvider, () => "Ethereum provider not configured");
+        const provider = assertEx38(this.ethProvider, () => "Ethereum provider not configured");
         const blockNumber = await provider.getBlockNumber() ?? 0;
         const block = await provider.getBlock(blockNumber);
-        const blockHash = asHash6(assertEx37(block?.hash, () => "Block hash not found"), true);
+        const blockHash = asHash6(assertEx38(block?.hash, () => "Block hash not found"), true);
         return [blockNumber, blockHash];
       }
       default: {
@@ -5003,7 +5059,7 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
       // this is for the previous block
       xl1,
       // this is for the previous block
-      xl1Hash: assertEx37(xl1Hash, () => "No xl1 hash available from time sync service"),
+      xl1Hash: assertEx38(xl1Hash, () => "No xl1 hash available from time sync service"),
       epoch: Date.now()
     };
     if (isDefined22(this.ethProvider)) {
@@ -5024,7 +5080,7 @@ SimpleTimeSyncViewer = __decorateClass([
 
 // src/simple/windowedBlock/SimpleWindowedBlockViewer.ts
 import {
-  assertEx as assertEx38,
+  assertEx as assertEx39,
   exists as exists7,
   isNull as isNull2
 } from "@xylabs/sdk-js";
@@ -5091,7 +5147,7 @@ var SimpleWindowedBlockViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._blockViewer = assertEx38(
+    this._blockViewer = assertEx39(
       this.params.blockViewer ?? await this.locator.getInstance(BlockViewerMoniker),
       () => "BlockViewer instance is required"
     );
@@ -5100,13 +5156,13 @@ var SimpleWindowedBlockViewer = class extends AbstractCreatableProvider {
     this._transactionHashMap = new MemoryMap();
   }
   currentBlock() {
-    return assertEx38(this._chain.at(-1));
+    return assertEx39(this._chain.at(-1));
   }
   currentBlockHash() {
-    return assertEx38(this._chain.at(-1)?.[0]._hash);
+    return assertEx39(this._chain.at(-1)?.[0]._hash);
   }
   currentBlockNumber() {
-    return assertEx38(this._chain.at(-1)?.[0].block);
+    return assertEx39(this._chain.at(-1)?.[0].block);
   }
   async payloadByHash(hash) {
     const payloads = await this.payloadsByHash([hash]);
@@ -5265,13 +5321,13 @@ var RuntimeStatusMonitor = class extends LoggerStatusReporter {
 };
 
 // src/time/primitives/xl1BlockNumberToEthBlockNumber.ts
-import { assertEx as assertEx39 } from "@xylabs/sdk-js";
+import { assertEx as assertEx40 } from "@xylabs/sdk-js";
 import { asTimePayload as asTimePayload3, TimeSchema as TimeSchema2 } from "@xyo-network/xl1-protocol";
 async function xl1BlockNumberToEthBlockNumber(context, xl1BlockNumber) {
   const blockHash = await hashFromBlockNumber(context, xl1BlockNumber);
   const hydratedBlock = await hydrateBlock(context.store, blockHash);
   const timePayload = asTimePayload3(hydratedBlock[1].find((p) => p.schema === TimeSchema2), { required: true });
-  return assertEx39(timePayload.ethereum, () => "No ethereum timestamp found on block");
+  return assertEx40(timePayload.ethereum, () => "No ethereum timestamp found on block");
 }
 
 // src/wallet/generateXyoBaseWalletFromPhrase.ts
@@ -5369,6 +5425,7 @@ export {
   SimpleBlockRewardViewer,
   SimpleBlockValidationViewer,
   SimpleBlockViewer,
+  SimpleChainContractViewer,
   SimpleDataLakeRunner,
   SimpleDataLakeViewer,
   SimpleFinalizationRunner,