@xyo-network/xl1-protocol-sdk 1.26.42 → 1.26.44

package/dist/neutral/index.mjs

@@ -956,7 +956,7 @@ var TelemetryConfigZod = z14.object({
 }).describe("Telemetry configuration options");
 
 // src/config/Validation.ts
-import { AddressZod as AddressZod2, asAddress } from "@xylabs/sdk-js";
+import { AddressZod as AddressZod2 } from "@xylabs/sdk-js";
 import { globalRegistry as globalRegistry11, z as z15 } from "zod";
 
 // src/primitives/block/range/blockRangeSteps.ts
@@ -1891,26 +1891,16 @@ function findUncles(context, finalizedWindowedChain, blocks) {
 
 // src/config/Validation.ts
 var ValidationConfigZod = z15.object({
-  allowedRewardRedeemers: z15.preprocess((val) => {
-    if (typeof val === "string") {
-      return val.split(",").map((s) => asAddress(s.trim()));
-    }
-    return val;
-  }, z15.array(AddressZod2).optional().register(globalRegistry11, {
+  allowedRewardRedeemers: z15.array(AddressZod2).optional().register(globalRegistry11, {
     description: "List of allowed reward redeemer addresses, if undefined anyone can participate",
     title: "allowedRewardRedeemers",
     type: "array"
-  })),
-  allowedRewardEscrowAccountSigners: z15.preprocess((val) => {
-    if (typeof val === "string") {
-      return val.split(",").map((s) => asAddress(s.trim()));
-    }
-    return val;
-  }, z15.array(AddressZod2).optional().register(globalRegistry11, {
+  }),
+  allowedRewardEscrowAccountSigners: z15.array(AddressZod2).optional().register(globalRegistry11, {
     description: "List of allowed reward escrow account signer addresses, if undefined anyone can participate",
     title: "allowedRewardEscrowAccountSigners",
     type: "array"
-  })),
+  }),
   minCandidates: z15.coerce.number().default(DEFAULT_MIN_CANDIDATES).register(globalRegistry11, {
     default: DEFAULT_MIN_CANDIDATES,
     description: "Minimum number of uncle candidates before selecting the best uncle",
@@ -3216,7 +3206,7 @@ async function balancesStepSummaryFromRange(context, semaphores, blockViewer, su
 
 // src/summary/primitives/balances/balancesSummary.ts
 import {
-  asAddress as asAddress2,
+  asAddress,
   assertEx as assertEx26,
   spanRootAsync as spanRootAsync3
 } from "@xylabs/sdk-js";
@@ -3240,7 +3230,7 @@ async function balancesSummary(context, semaphores, blockViewer, summaryMap, con
     const balances = {};
     for (const summary of summaries) {
       for (const [address, balance] of Object.entries(summary.balances)) {
-        const validAddress = asAddress2(address, () => `Invalid address: ${address}`);
+        const validAddress = asAddress(address, () => `Invalid address: ${address}`);
         balances[validAddress] = (balances[validAddress] ?? 0n) + parseSignedBigInt(balance);
       }
     }
@@ -3430,7 +3420,7 @@ async function transfersStepSummaryFromRange(context, semaphores, blockViewer, s
 
 // src/summary/primitives/transfers/transfersSummary.ts
 import {
-  asAddress as asAddress3,
+  asAddress as asAddress2,
   assertEx as assertEx30,
   spanRootAsync as spanRootAsync6
 } from "@xylabs/sdk-js";
@@ -3454,10 +3444,10 @@ async function transfersSummary(context, semaphores, blockViewer, summaryMap, co
     const transfers = {};
     for (const summary of summaries) {
       for (const [from, toMap] of Object.entries(summary.transfers)) {
-        const validFrom = asAddress3(from, () => `Invalid address: ${from}`);
+        const validFrom = asAddress2(from, () => `Invalid address: ${from}`);
         transfers[validFrom] = transfers[validFrom] ?? {};
         for (const [to, transfer] of Object.entries(toMap)) {
-          const validTo = asAddress3(to, () => `Invalid address: ${to}`);
+          const validTo = asAddress2(to, () => `Invalid address: ${to}`);
           transfers[validFrom][validTo] = (transfers[validFrom][validTo] ?? 0n) + parseSignedBigInt(transfer);
         }
       }
@@ -4588,11 +4578,13 @@ import {
 import {
   BlockValidationViewerMoniker as BlockValidationViewerMoniker2,
   ChainContractViewerMoniker as ChainContractViewerMoniker4,
+  DeadLetterQueueRunnerMoniker,
   DEFAULT_MAX_EXP_AHEAD,
   FinalizationViewerMoniker as FinalizationViewerMoniker4,
   isSignedHydratedBlockWithHashMeta,
   isSignedHydratedTransactionWithHashMeta,
   MempoolRunnerMoniker,
+  TransactionRejectionSchema,
   TransactionValidationViewerMoniker
 } from "@xyo-network/xl1-protocol-lib";
 import { Mutex } from "async-mutex";
@@ -4602,6 +4594,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
   moniker = SimpleMempoolRunner.defaultMoniker;
   _blockValidationViewer;
   _chainContractViewer;
+  _deadLetterQueueRunner;
   _finalizationViewer;
   _transactionValidationViewer;
   _syncMutex = new Mutex();
@@ -4649,6 +4642,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
     this._chainContractViewer = await this.locator.getInstance(ChainContractViewerMoniker4);
     this._finalizationViewer = await this.locator.getInstance(FinalizationViewerMoniker4);
     this._transactionValidationViewer = await this.locator.getInstance(TransactionValidationViewerMoniker);
+    this._deadLetterQueueRunner = await this.locator.tryGetInstance(DeadLetterQueueRunnerMoniker);
   }
   async prunePendingBlocks({
     batchSize = 10,
@@ -4751,6 +4745,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
         if (!validated) {
           this.logger?.debug(`Pruning transaction ${bundles[remainingTransactionMap[i]]._hash} during transaction validation`);
           this.logger?.debug(`  - validation result: ${r.at(0)?.message}`);
+          await this.routeRejectedTransaction(remainingTransactions[i], r);
         }
         valid[remainingTransactionMap[i]] = validated;
       }
@@ -4819,6 +4814,20 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       this._syncTimerId = null;
     }
   }
+  async routeRejectedTransaction(transaction, errors) {
+    if (!this._deadLetterQueueRunner) return;
+    const rejectionErrors = errors.map((e) => ({
+      hash: transaction[0]._hash,
+      name: e.name ?? "TransactionStateValidationError",
+      message: String(e.message ?? e)
+    }));
+    await this._deadLetterQueueRunner.rejectTransaction({
+      schema: TransactionRejectionSchema,
+      transaction,
+      errors: rejectionErrors,
+      rejector: "mempool"
+    });
+  }
   async simpleBlockValidationCheck(payloads) {
     const headNumber = await this.finalizationViewer.headNumber();
     const chainId = await this.chainContractViewer.chainId();
@@ -5376,7 +5385,7 @@ SimpleStakeEventsViewer = __decorateClass([
 ], SimpleStakeEventsViewer);
 
 // src/simple/StakeTotalsViewer/SimpleStakeTotalsViewer.ts
-import { asAddress as asAddress4 } from "@xylabs/sdk-js";
+import { asAddress as asAddress3 } from "@xylabs/sdk-js";
 import { assertEx as assertEx41 } from "@xylabs/sdk-js";
 import {
   StakeTotalsViewerMoniker,
@@ -5402,7 +5411,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.stakeViewer.activeStakes();
     for (const position of positions) {
-      if ((position.removeBlock === 0 || position.removeBlock > time) && asAddress4(position.staked) === asAddress4(staked)) {
+      if ((position.removeBlock === 0 || position.removeBlock > time) && asAddress3(position.staked) === asAddress3(staked)) {
         active += position.amount;
       }
     }
@@ -5412,7 +5421,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.stakeViewer.activeStakes();
     for (const position of positions) {
-      if ((position.removeBlock === 0 || position.removeBlock > time) && asAddress4(position.staker) === asAddress4(staker)) {
+      if ((position.removeBlock === 0 || position.removeBlock > time) && asAddress3(position.staker) === asAddress3(staker)) {
         active += position.amount;
       }
     }
@@ -5439,7 +5448,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let pending = 0n;
     const positions = await this.stakeViewer.removedStakes();
     for (const position of positions) {
-      if (position.removeBlock !== 0 && position.removeBlock <= time && (position.withdrawBlock === 0 || position.withdrawBlock > time) && asAddress4(position.staker) === asAddress4(staker)) {
+      if (position.removeBlock !== 0 && position.removeBlock <= time && (position.withdrawBlock === 0 || position.withdrawBlock > time) && asAddress3(position.staker) === asAddress3(staker)) {
         pending += position.amount;
       }
     }
@@ -5459,7 +5468,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let withdrawn = 0n;
     const positions = await this.stakeViewer.withdrawnStakes();
     for (const position of positions) {
-      if (position.withdrawBlock !== 0 && position.withdrawBlock <= time && asAddress4(position.staker) === asAddress4(staker)) {
+      if (position.withdrawBlock !== 0 && position.withdrawBlock <= time && asAddress3(position.staker) === asAddress3(staker)) {
         withdrawn += position.amount;
       }
     }
@@ -5475,7 +5484,7 @@ SimpleStakeTotalsViewer = __decorateClass([
 
 // src/simple/StakeViewer/SimpleStakeViewer.ts
 import {
-  asAddress as asAddress5,
+  asAddress as asAddress4,
   toAddress as toAddress6
 } from "@xylabs/sdk-js";
 import { assertEx as assertEx42 } from "@xylabs/sdk-js";
@@ -5506,7 +5515,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.activeStakes();
     for (const position of positions) {
-      if (position.removeBlock === 0 && asAddress5(position.staked) === asAddress5(staked)) {
+      if (position.removeBlock === 0 && asAddress4(position.staked) === asAddress4(staked)) {
         active += position.amount;
       }
     }
@@ -5516,7 +5525,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.activeStakes();
     for (const position of positions) {
-      if (position.removeBlock === 0 && asAddress5(position.staker) === asAddress5(staker)) {
+      if (position.removeBlock === 0 && asAddress4(position.staker) === asAddress4(staker)) {
         active += position.amount;
       }
     }
@@ -5549,7 +5558,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let pending = 0n;
     const positions = await this.removedStakes();
     for (const position of positions) {
-      if (position.removeBlock !== 0 && position.withdrawBlock === 0 && asAddress5(position.staker) === asAddress5(staker)) {
+      if (position.removeBlock !== 0 && position.withdrawBlock === 0 && asAddress4(position.staker) === asAddress4(staker)) {
         pending += position.amount;
       }
     }
@@ -5565,15 +5574,15 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     return assertEx42(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];
+    return this.positions.filter((s) => asAddress4(s.staker) === asAddress4(staker))[slot];
   }
   stakesByStaked(staked, range = [0, void 0]) {
     const endBlock = range[1] ?? Number.MAX_SAFE_INTEGER;
-    return this.positions.filter((s) => asAddress5(s.staked) === asAddress5(staked) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
+    return this.positions.filter((s) => asAddress4(s.staked) === asAddress4(staked) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
   }
   stakesByStaker(staker, range = [0, void 0]) {
     const endBlock = range[1] ?? Number.MAX_SAFE_INTEGER;
-    return this.positions.filter((s) => asAddress5(s.staker) === asAddress5(staker) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
+    return this.positions.filter((s) => asAddress4(s.staker) === asAddress4(staker) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
   }
   stakingTokenAddress() {
     return toAddress6("0x000000000000000000000000000011");
@@ -5592,7 +5601,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let withdrawn = 0n;
     const positions = await this.withdrawnStakes();
     for (const position of positions) {
-      if (position.withdrawBlock !== 0 && asAddress5(position.staker) === asAddress5(staker)) {
+      if (position.withdrawBlock !== 0 && asAddress4(position.staker) === asAddress4(staker)) {
         withdrawn += position.amount;
       }
     }