genlayer-js 0.18.5 → 0.18.7

package/dist/types/index.d.cts

@@ -1,3 +1,3 @@
 export { Account, Address } from 'viem';
-export { I as BannedValidatorInfo, d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, o as DECIDED_STATES, a as DecodedCallData, D as DecodedDeployData, a3 as DelegatorClaimOptions, a2 as DelegatorExitOptions, a1 as DelegatorJoinOptions, R as DelegatorJoinResult, K as EpochData, L as EpochInfo, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, P as PendingDeposit, F as PendingWithdrawal, a0 as SetIdentityOptions, $ as SetOperatorOptions, y as SnapSource, J as StakeInfo, a4 as StakingActions, z as StakingContract, O as StakingTransactionResult, k as TransactionHash, x as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, w as TransactionType, Z as ValidatorClaimOptions, X as ValidatorDepositOptions, Y as ValidatorExitOptions, B as ValidatorIdentity, E as ValidatorInfo, U as ValidatorJoinOptions, Q as ValidatorJoinResult, _ as ValidatorPrimeOptions, A as ValidatorView, s as VoteType, W as WithdrawalCommit, p as isDecidedState, q as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, u as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-Dfaw9WiR.cjs';
+export { I as BannedValidatorInfo, d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, o as DECIDED_STATES, a as DecodedCallData, D as DecodedDeployData, a3 as DelegatorClaimOptions, a2 as DelegatorExitOptions, a1 as DelegatorJoinOptions, R as DelegatorJoinResult, K as EpochData, L as EpochInfo, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, P as PendingDeposit, F as PendingWithdrawal, a0 as SetIdentityOptions, $ as SetOperatorOptions, y as SnapSource, J as StakeInfo, a4 as StakingActions, z as StakingContract, O as StakingTransactionResult, k as TransactionHash, x as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, w as TransactionType, Z as ValidatorClaimOptions, X as ValidatorDepositOptions, Y as ValidatorExitOptions, B as ValidatorIdentity, E as ValidatorInfo, U as ValidatorJoinOptions, Q as ValidatorJoinResult, _ as ValidatorPrimeOptions, A as ValidatorView, s as VoteType, W as WithdrawalCommit, p as isDecidedState, q as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, u as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-DM646L5c.cjs';
 export { G as GenLayerChain } from '../chains-B7B7UXdn.cjs';

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
 export { Account, Address } from 'viem';
-export { I as BannedValidatorInfo, d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, o as DECIDED_STATES, a as DecodedCallData, D as DecodedDeployData, a3 as DelegatorClaimOptions, a2 as DelegatorExitOptions, a1 as DelegatorJoinOptions, R as DelegatorJoinResult, K as EpochData, L as EpochInfo, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, P as PendingDeposit, F as PendingWithdrawal, a0 as SetIdentityOptions, $ as SetOperatorOptions, y as SnapSource, J as StakeInfo, a4 as StakingActions, z as StakingContract, O as StakingTransactionResult, k as TransactionHash, x as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, w as TransactionType, Z as ValidatorClaimOptions, X as ValidatorDepositOptions, Y as ValidatorExitOptions, B as ValidatorIdentity, E as ValidatorInfo, U as ValidatorJoinOptions, Q as ValidatorJoinResult, _ as ValidatorPrimeOptions, A as ValidatorView, s as VoteType, W as WithdrawalCommit, p as isDecidedState, q as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, u as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-DPyenUTZ.js';
+export { I as BannedValidatorInfo, d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, o as DECIDED_STATES, a as DecodedCallData, D as DecodedDeployData, a3 as DelegatorClaimOptions, a2 as DelegatorExitOptions, a1 as DelegatorJoinOptions, R as DelegatorJoinResult, K as EpochData, L as EpochInfo, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, P as PendingDeposit, F as PendingWithdrawal, a0 as SetIdentityOptions, $ as SetOperatorOptions, y as SnapSource, J as StakeInfo, a4 as StakingActions, z as StakingContract, O as StakingTransactionResult, k as TransactionHash, x as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, w as TransactionType, Z as ValidatorClaimOptions, X as ValidatorDepositOptions, Y as ValidatorExitOptions, B as ValidatorIdentity, E as ValidatorInfo, U as ValidatorJoinOptions, Q as ValidatorJoinResult, _ as ValidatorPrimeOptions, A as ValidatorView, s as VoteType, W as WithdrawalCommit, p as isDecidedState, q as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, u as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-9QkkDjYm.js';
 export { G as GenLayerChain } from '../chains-B7B7UXdn.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "genlayer-js",
   "type": "module",
-  "version": "0.18.5",
+  "version": "0.18.7",
   "description": "GenLayer JavaScript SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/abi/staking.ts

@@ -1,5 +1,13 @@
 // ValidatorWallet ABI for querying and managing validator wallet
 export const VALIDATOR_WALLET_ABI = [
+  // Custom errors
+  {name: "NotOperator", type: "error", inputs: []},
+  {name: "InvalidAddress", type: "error", inputs: []},
+  {name: "TransferFailed", type: "error", inputs: []},
+  {name: "OperatorTransferNotReady", type: "error", inputs: []},
+  {name: "NoPendingOperator", type: "error", inputs: []},
+
+  // Functions
   {
     name: "operator",
     type: "function",
@@ -64,19 +72,51 @@ export const VALIDATOR_WALLET_ABI = [
 ] as const;
 
 export const STAKING_ABI = [
-  // Custom errors
-  {name: "BelowMinStake", type: "error", inputs: []},
-  {name: "AlreadyValidator", type: "error", inputs: []},
-  {name: "NotValidator", type: "error", inputs: []},
-  {name: "NotOwner", type: "error", inputs: []},
-  {name: "NotOperator", type: "error", inputs: []},
-  {name: "ValidatorBanned", type: "error", inputs: []},
-  {name: "ValidatorQuarantined", type: "error", inputs: []},
-  {name: "InsufficientShares", type: "error", inputs: []},
-  {name: "NothingToClaim", type: "error", inputs: []},
-  {name: "NotYetClaimable", type: "error", inputs: []},
-  {name: "ZeroAmount", type: "error", inputs: []},
-  {name: "InvalidOperator", type: "error", inputs: []},
+  // Custom errors from IGenLayerStaking
+  {name: "OnlyGEN", type: "error", inputs: []},
+  {name: "OnlyTribunal", type: "error", inputs: []},
+  {name: "OnlyIdleness", type: "error", inputs: []},
+  {name: "OnlyTransactions", type: "error", inputs: []},
+  {name: "OnlyIdlenessOrTribunal", type: "error", inputs: []},
+  {name: "OnlyTransactionsOrTribunal", type: "error", inputs: []},
+  {name: "InvalidAtEpoch", type: "error", inputs: []},
+  {name: "MaxValidatorsCannotBeZero", type: "error", inputs: []},
+  {name: "ValidatorExitExceedsShares", type: "error", inputs: []},
+  {name: "DelegatorExitExceedsShares", type: "error", inputs: []},
+  {name: "DelegatorMayNotJoinWithZeroValue", type: "error", inputs: []},
+  {name: "DelegatorMayNotJoinTwoValidatorsSimultaneously", type: "error", inputs: []},
+  {name: "DelegatorBelowMinimumStake", type: "error", inputs: []},
+  {name: "DelegatorExitWouldBeBelowMinimum", type: "error", inputs: []},
+  {name: "ValidatorNotActive", type: "error", inputs: []},
+  {name: "ValidatorMayNotBeDelegator", type: "error", inputs: []},
+  {name: "ValidatorMustNotBeDelegator", type: "error", inputs: []},
+  {name: "ValidatorMayNotJoinWithZeroValue", type: "error", inputs: []},
+  {name: "ValidatorMayNotDepositZeroValue", type: "error", inputs: []},
+  {name: "ValidatorWithdrawalExceedsStake", type: "error", inputs: []},
+  {name: "ValidatorAlreadyJoined", type: "error", inputs: []},
+  {name: "ValidatorNotJoined", type: "error", inputs: []},
+  {name: "ValidatorBelowMinimumStake", type: "error", inputs: []},
+  {name: "OperatorAlreadyAssigned", type: "error", inputs: []},
+  {name: "InvalidOperatorAddress", type: "error", inputs: []},
+  {name: "MaxNumberOfValidatorsReached", type: "error", inputs: []},
+  {name: "ValidatorsConsumed", type: "error", inputs: []},
+  {name: "ValidatorsUnavailable", type: "error", inputs: []},
+  {name: "EpochNotFinished", type: "error", inputs: []},
+  {name: "EpochNotFinalized", type: "error", inputs: []},
+  {name: "InflationInvalidAmount", type: "error", inputs: []},
+  {name: "InflationAlreadyReceived", type: "error", inputs: []},
+  {name: "InflationAlreadyInitialized", type: "error", inputs: []},
+  {name: "EpochAlreadyFinalized", type: "error", inputs: []},
+  {name: "PendingTribunals", type: "error", inputs: [{name: "epoch", type: "uint256"}]},
+  {name: "FailedTransfer", type: "error", inputs: [{name: "validator", type: "address"}]},
+  {name: "NFTMinterCallFailed", type: "error", inputs: []},
+  {name: "DeepthoughtCallFailed", type: "error", inputs: []},
+  {name: "NFTMinterNotConfigured", type: "error", inputs: []},
+  {name: "NumberOfValidatorsExceedsAvailable", type: "error", inputs: []},
+  {name: "EpochAdvanceNotReady", type: "error", inputs: []},
+  {name: "PreviousEpochNotFinalizable", type: "error", inputs: []},
+  {name: "NoBurning", type: "error", inputs: []},
+  {name: "ReductionFactorCannotBeZero", type: "error", inputs: []},
 
   // Validator functions
   {
@@ -293,6 +333,13 @@ export const STAKING_ABI = [
     inputs: [],
     outputs: [{name: "", type: "uint256"}],
   },
+  {
+    name: "epochZeroMinDuration",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{name: "", type: "uint256"}],
+  },
   {
     name: "getQuarantinedValidators",
     type: "function",

package/src/staking/actions.ts

@@ -1,4 +1,4 @@
-import {getContract, decodeEventLog, PublicClient, Client, Transport, Chain, Account, Address as ViemAddress, GetContractReturnType, toHex, encodeFunctionData, BaseError, ContractFunctionRevertedError} from "viem";
+import {getContract, decodeEventLog, PublicClient, Client, Transport, Chain, Account, Address as ViemAddress, GetContractReturnType, toHex, encodeFunctionData, BaseError, ContractFunctionRevertedError, decodeErrorResult, RawContractError} from "viem";
 import {GenLayerClient, GenLayerChain, Address} from "@/types";
 import {STAKING_ABI, VALIDATOR_WALLET_ABI} from "@/abi/staking";
 import {parseStakingAmount, formatStakingAmount} from "./utils";
@@ -32,11 +32,55 @@ type WalletClientWithAccount = Client<Transport, Chain, Account>;
 const FALLBACK_GAS = 1000000n;
 const GAS_BUFFER_MULTIPLIER = 2n;
 
+// Combined ABI for error decoding (both staking and validator wallet errors)
+const COMBINED_ERROR_ABI = [...STAKING_ABI, ...VALIDATOR_WALLET_ABI];
+
 function extractRevertReason(err: unknown): string {
   if (err instanceof BaseError) {
+    // Try to find raw error data and decode it with our ABI
+    const rawError = err.walk((e) => e instanceof RawContractError);
+    if (rawError instanceof RawContractError && rawError.data && typeof rawError.data === "string") {
+      try {
+        const decoded = decodeErrorResult({
+          abi: COMBINED_ERROR_ABI,
+          data: rawError.data as `0x${string}`,
+        });
+        return decoded.errorName;
+      } catch {
+        // Fall through to other methods
+      }
+    }
+
+    // Try to extract error data from the cause chain
+    let current: unknown = err;
+    while (current) {
+      if (current && typeof current === "object") {
+        const obj = current as Record<string, unknown>;
+        // Check for data property that looks like hex error data
+        if (obj.data && typeof obj.data === "string" && obj.data.startsWith("0x")) {
+          try {
+            const decoded = decodeErrorResult({
+              abi: COMBINED_ERROR_ABI,
+              data: obj.data as `0x${string}`,
+            });
+            return decoded.errorName;
+          } catch {
+            // Continue searching
+          }
+        }
+        current = obj.cause;
+      } else {
+        break;
+      }
+    }
+
     const revertError = err.walk((e) => e instanceof ContractFunctionRevertedError);
     if (revertError instanceof ContractFunctionRevertedError) {
-      return revertError.data?.errorName || revertError.reason || "Unknown reason";
+      // If viem already decoded it, use that
+      if (revertError.data?.errorName) {
+        return revertError.data.errorName;
+      }
+      return revertError.reason || "Unknown reason";
     }
     if (err.shortMessage) return err.shortMessage;
   }
@@ -513,16 +557,25 @@ export const stakingActions = (
     getEpochInfo: async (): Promise<EpochInfo> => {
       const contract = getReadOnlyStakingContract();
 
-      const [epoch, validatorMinStake, delegatorMinStake, activeCount, epochMinDuration, epochOdd, epochEven] =
-        await Promise.all([
-          contract.read.epoch() as Promise<bigint>,
-          contract.read.validatorMinStake() as Promise<bigint>,
-          contract.read.delegatorMinStake() as Promise<bigint>,
-          contract.read.activeValidatorsCount() as Promise<bigint>,
-          contract.read.epochMinDuration() as Promise<bigint>,
-          contract.read.epochOdd() as Promise<any>,
-          contract.read.epochEven() as Promise<any>,
-        ]);
+      const [
+        epoch,
+        validatorMinStake,
+        delegatorMinStake,
+        activeCount,
+        epochMinDuration,
+        epochZeroMinDuration,
+        epochOdd,
+        epochEven,
+      ] = await Promise.all([
+        contract.read.epoch() as Promise<bigint>,
+        contract.read.validatorMinStake() as Promise<bigint>,
+        contract.read.delegatorMinStake() as Promise<bigint>,
+        contract.read.activeValidatorsCount() as Promise<bigint>,
+        contract.read.epochMinDuration() as Promise<bigint>,
+        contract.read.epochZeroMinDuration() as Promise<bigint>,
+        contract.read.epochOdd() as Promise<any>,
+        contract.read.epochEven() as Promise<any>,
+      ]);
 
       // Current epoch data (even epochs use epochEven, odd use epochOdd)
       const currentEpochData = epoch % 2n === 0n ? epochEven : epochOdd;
@@ -530,9 +583,11 @@ export const stakingActions = (
       const currentEpochEnd = currentEpochData.end > 0n ? new Date(Number(currentEpochData.end) * 1000) : null;
 
       // Estimate next epoch: current start + min duration (if epoch hasn't ended)
+      // Epoch 0 uses epochZeroMinDuration, all other epochs use epochMinDuration
       let nextEpochEstimate: Date | null = null;
       if (!currentEpochEnd) {
-        const estimatedEndMs = Number(currentEpochData.start + epochMinDuration) * 1000;
+        const duration = epoch === 0n ? epochZeroMinDuration : epochMinDuration;
+        const estimatedEndMs = Number(currentEpochData.start + duration) * 1000;
         nextEpochEstimate = new Date(estimatedEndMs);
       }