genlayer 0.32.2 → 0.32.3

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.32.3 (2025-12-05)
+
 ## 0.32.2 (2025-12-04)
 
 ## 0.32.1 (2025-12-04)

package/README.md

@@ -387,9 +387,9 @@ EXAMPLES:
    #   ]
    # }
 
-   # Exit and claim
-   genlayer staking validator-exit --shares 100
-   genlayer staking validator-claim
+   # Exit and claim (requires validator wallet address)
+   genlayer staking validator-exit --validator 0x... --shares 100
+   genlayer staking validator-claim --validator 0x...
 ```
 
 ### Running the CLI from the repository

package/dist/index.js

@@ -10680,7 +10680,7 @@ ${prettyStateOverride(stateOverride)}`;
 });
 
 // node_modules/viem/_esm/errors/request.js
-var HttpRequestError, RpcRequestError;
+var HttpRequestError, RpcRequestError, TimeoutError;
 var init_request = __esm({
   "node_modules/viem/_esm/errors/request.js"() {
     "use strict";
@@ -10753,6 +10753,15 @@ var init_request = __esm({
         this.data = error.data;
       }
     };
+    TimeoutError = class extends BaseError2 {
+      constructor({ body, url }) {
+        super("The request took too long to respond.", {
+          details: "The request timed out.",
+          metaMessages: [`URL: ${getUrl(url)}`, `Request body: ${stringify(body)}`],
+          name: "TimeoutError"
+        });
+      }
+    };
   }
 });
 
@@ -18249,7 +18258,7 @@ var require_semver2 = __commonJS({
 import { program } from "commander";
 
 // package.json
-var version = "0.32.2";
+var version = "0.32.3";
 var package_default = {
   name: "genlayer",
   version,
@@ -18317,7 +18326,7 @@ var package_default = {
     dotenv: "^17.0.0",
     ethers: "^6.13.4",
     "fs-extra": "^11.3.0",
-    "genlayer-js": "^0.18.7",
+    "genlayer-js": "^0.18.8",
     inquirer: "^12.0.0",
     keytar: "^7.9.0",
     "node-fetch": "^3.0.0",
@@ -19229,7 +19238,7 @@ var doBadDataWarn = deprecate2(
   ".data is not a valid RequestInit property, use .body instead",
   "https://github.com/node-fetch/node-fetch/issues/1000 (request)"
 );
-var Request = class _Request extends Body {
+var Request2 = class _Request extends Body {
   constructor(input, init = {}) {
     let parsedURL;
     if (isRequest(input)) {
@@ -19344,7 +19353,7 @@ var Request = class _Request extends Body {
     return "Request";
   }
 };
-Object.defineProperties(Request.prototype, {
+Object.defineProperties(Request2.prototype, {
   method: { enumerable: true },
   url: { enumerable: true },
   headers: { enumerable: true },
@@ -19424,7 +19433,7 @@ init_from();
 var supportedSchemas = /* @__PURE__ */ new Set(["data:", "http:", "https:"]);
 async function fetch2(url, options_) {
   return new Promise((resolve2, reject) => {
-    const request = new Request(url, options_);
+    const request = new Request2(url, options_);
     const { parsedURL, options } = getNodeRequestOptions(request);
     if (!supportedSchemas.has(parsedURL.protocol)) {
       throw new TypeError(`node-fetch cannot load ${url}. URL scheme "${parsedURL.protocol.replace(/:$/, "")}" is not supported.`);
@@ -19554,7 +19563,7 @@ async function fetch2(url, options_) {
             if (responseReferrerPolicy) {
               requestOptions.referrerPolicy = responseReferrerPolicy;
             }
-            resolve2(fetch2(new Request(locationURL, requestOptions)));
+            resolve2(fetch2(new Request2(locationURL, requestOptions)));
             finalize();
             return;
           }
@@ -25393,6 +25402,134 @@ function readList(cursor, length, to) {
   return value;
 }
 
+// node_modules/viem/_esm/utils/rpc/http.js
+init_request();
+
+// node_modules/viem/_esm/utils/promise/withTimeout.js
+function withTimeout(fn, { errorInstance = new Error("timed out"), timeout, signal }) {
+  return new Promise((resolve2, reject) => {
+    ;
+    (async () => {
+      let timeoutId;
+      try {
+        const controller = new AbortController();
+        if (timeout > 0) {
+          timeoutId = setTimeout(() => {
+            if (signal) {
+              controller.abort();
+            } else {
+              reject(errorInstance);
+            }
+          }, timeout);
+        }
+        resolve2(await fn({ signal: controller?.signal || null }));
+      } catch (err) {
+        if (err?.name === "AbortError")
+          reject(errorInstance);
+        reject(err);
+      } finally {
+        clearTimeout(timeoutId);
+      }
+    })();
+  });
+}
+
+// node_modules/viem/_esm/utils/rpc/http.js
+init_stringify();
+
+// node_modules/viem/_esm/utils/rpc/id.js
+function createIdStore() {
+  return {
+    current: 0,
+    take() {
+      return this.current++;
+    },
+    reset() {
+      this.current = 0;
+    }
+  };
+}
+var idCache = /* @__PURE__ */ createIdStore();
+
+// node_modules/viem/_esm/utils/rpc/http.js
+function getHttpRpcClient(url, options = {}) {
+  return {
+    async request(params) {
+      const { body, fetchFn = options.fetchFn ?? fetch, onRequest = options.onRequest, onResponse = options.onResponse, timeout = options.timeout ?? 1e4 } = params;
+      const fetchOptions = {
+        ...options.fetchOptions ?? {},
+        ...params.fetchOptions ?? {}
+      };
+      const { headers, method, signal: signal_ } = fetchOptions;
+      try {
+        const response = await withTimeout(async ({ signal }) => {
+          const init = {
+            ...fetchOptions,
+            body: Array.isArray(body) ? stringify(body.map((body2) => ({
+              jsonrpc: "2.0",
+              id: body2.id ?? idCache.take(),
+              ...body2
+            }))) : stringify({
+              jsonrpc: "2.0",
+              id: body.id ?? idCache.take(),
+              ...body
+            }),
+            headers: {
+              "Content-Type": "application/json",
+              ...headers
+            },
+            method: method || "POST",
+            signal: signal_ || (timeout > 0 ? signal : null)
+          };
+          const request = new Request(url, init);
+          const args = await onRequest?.(request, init) ?? { ...init, url };
+          const response2 = await fetchFn(args.url ?? url, args);
+          return response2;
+        }, {
+          errorInstance: new TimeoutError({ body, url }),
+          timeout,
+          signal: true
+        });
+        if (onResponse)
+          await onResponse(response);
+        let data;
+        if (response.headers.get("Content-Type")?.startsWith("application/json"))
+          data = await response.json();
+        else {
+          data = await response.text();
+          try {
+            data = JSON.parse(data || "{}");
+          } catch (err) {
+            if (response.ok)
+              throw err;
+            data = { error: data };
+          }
+        }
+        if (!response.ok) {
+          throw new HttpRequestError({
+            body,
+            details: stringify(data.error) || response.statusText,
+            headers: response.headers,
+            status: response.status,
+            url
+          });
+        }
+        return data;
+      } catch (err) {
+        if (err instanceof HttpRequestError)
+          throw err;
+        if (err instanceof TimeoutError)
+          throw err;
+        throw new HttpRequestError({
+          body,
+          cause: err,
+          url
+        });
+      }
+    }
+  };
+}
+
 // node_modules/viem/_esm/utils/signature/hashMessage.js
 init_keccak256();
 
@@ -31645,6 +31782,19 @@ function walletActions(client) {
   };
 }
 
+// node_modules/viem/_esm/clients/createWalletClient.js
+function createWalletClient(parameters) {
+  const { key = "wallet", name = "Wallet Client", transport } = parameters;
+  const client = createClient({
+    ...parameters,
+    key,
+    name,
+    transport,
+    type: "walletClient"
+  });
+  return client.extend(walletActions);
+}
+
 // node_modules/viem/_esm/clients/transports/createTransport.js
 function createTransport({ key, methods, name, request, retryCount = 3, retryDelay = 150, timeout, type }, value) {
   const uid2 = uid();
@@ -31678,6 +31828,82 @@ function custom(provider, config = {}) {
   });
 }
 
+// node_modules/viem/_esm/clients/transports/http.js
+init_request();
+
+// node_modules/viem/_esm/errors/transport.js
+init_base();
+var UrlRequiredError = class extends BaseError2 {
+  constructor() {
+    super("No URL was provided to the Transport. Please provide a valid RPC URL to the Transport.", {
+      docsPath: "/docs/clients/intro",
+      name: "UrlRequiredError"
+    });
+  }
+};
+
+// node_modules/viem/_esm/clients/transports/http.js
+init_createBatchScheduler();
+function http3(url, config = {}) {
+  const { batch, fetchFn, fetchOptions, key = "http", methods, name = "HTTP JSON-RPC", onFetchRequest, onFetchResponse, retryDelay, raw } = config;
+  return ({ chain, retryCount: retryCount_, timeout: timeout_ }) => {
+    const { batchSize = 1e3, wait: wait2 = 0 } = typeof batch === "object" ? batch : {};
+    const retryCount = config.retryCount ?? retryCount_;
+    const timeout = timeout_ ?? config.timeout ?? 1e4;
+    const url_ = url || chain?.rpcUrls.default.http[0];
+    if (!url_)
+      throw new UrlRequiredError();
+    const rpcClient2 = getHttpRpcClient(url_, {
+      fetchFn,
+      fetchOptions,
+      onRequest: onFetchRequest,
+      onResponse: onFetchResponse,
+      timeout
+    });
+    return createTransport({
+      key,
+      methods,
+      name,
+      async request({ method, params }) {
+        const body = { method, params };
+        const { schedule } = createBatchScheduler({
+          id: url_,
+          wait: wait2,
+          shouldSplitBatch(requests) {
+            return requests.length > batchSize;
+          },
+          fn: (body2) => rpcClient2.request({
+            body: body2
+          }),
+          sort: (a, b) => a.id - b.id
+        });
+        const fn = async (body2) => batch ? schedule(body2) : [
+          await rpcClient2.request({
+            body: body2
+          })
+        ];
+        const [{ error, result }] = await fn(body);
+        if (raw)
+          return { error, result };
+        if (error)
+          throw new RpcRequestError({
+            body,
+            error,
+            url: url_
+          });
+        return result;
+      },
+      retryCount,
+      retryDelay,
+      timeout,
+      type: "http"
+    }, {
+      fetchOptions,
+      url: url_
+    });
+  };
+}
+
 // node_modules/viem/_esm/index.js
 init_base();
 init_contract();
@@ -31687,7 +31913,7 @@ init_fromHex();
 init_toHex();
 init_formatEther();
 
-// node_modules/genlayer-js/dist/chunk-RW6PLN5W.js
+// node_modules/genlayer-js/dist/chunk-V4ZFI4GV.js
 var chains_exports = {};
 __export2(chains_exports, {
   localnet: () => localnet,
@@ -39783,6 +40009,67 @@ var VALIDATOR_WALLET_ABI = [
       { name: "extraCid", type: "bytes" }
     ],
     outputs: []
+  },
+  // Staking functions (forwarded to staking contract)
+  {
+    name: "validatorDeposit",
+    type: "function",
+    stateMutability: "payable",
+    inputs: [],
+    outputs: []
+  },
+  {
+    name: "validatorExit",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [{ name: "_shares", type: "uint256" }],
+    outputs: []
+  },
+  {
+    name: "validatorClaim",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [],
+    outputs: []
+  },
+  // Two-step operator transfer
+  {
+    name: "initiateOperatorTransfer",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [{ name: "_newOperator", type: "address" }],
+    outputs: []
+  },
+  {
+    name: "completeOperatorTransfer",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [],
+    outputs: []
+  },
+  {
+    name: "cancelOperatorTransfer",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [],
+    outputs: []
+  },
+  {
+    name: "getPendingOperator",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [
+      { name: "", type: "address" },
+      { name: "", type: "uint256" }
+    ]
+  },
+  {
+    name: "getOperator",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ name: "", type: "address" }]
   }
 ];
 var STAKING_ABI = [
@@ -49226,6 +49513,33 @@ var StakingAction = class extends BaseAction {
     const addr = keystoreData.address;
     return addr.startsWith("0x") ? addr : `0x${addr}`;
   }
+  /**
+   * Get viem clients for direct contract interactions (e.g., ValidatorWallet calls)
+   * Future: can be extended to support hardware wallets
+   */
+  async getViemClients(config) {
+    if (config.account) {
+      this.accountOverride = config.account;
+    }
+    const network = this.getNetwork(config);
+    const rpcUrl = config.rpc || network.rpcUrls.default.http[0];
+    const privateKey = await this.getPrivateKeyForStaking();
+    const account = privateKeyToAccount(privateKey);
+    const publicClient = createPublicClient({
+      chain: network,
+      transport: http3(rpcUrl)
+    });
+    const walletClient = createWalletClient({
+      chain: network,
+      transport: http3(rpcUrl),
+      account
+    });
+    return {
+      walletClient,
+      publicClient,
+      signerAddress: account.address
+    };
+  }
 };
 
 // src/commands/staking/validatorJoin.ts
@@ -49271,15 +49585,23 @@ var ValidatorDepositAction = class extends StakingAction {
   async execute(options) {
     this.startSpinner("Making validator deposit...");
     try {
-      const client = await this.getStakingClient(options);
       const amount = this.parseAmount(options.amount);
-      this.setSpinnerText(`Depositing ${this.formatAmount(amount)} to validator stake...`);
-      const result = await client.validatorDeposit({ amount });
+      const validatorWallet = options.validator;
+      const { walletClient, publicClient } = await this.getViemClients(options);
+      this.setSpinnerText(`Depositing ${this.formatAmount(amount)} to validator ${validatorWallet}...`);
+      const hash3 = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi_exports.VALIDATOR_WALLET_ABI,
+        functionName: "validatorDeposit",
+        value: amount
+      });
+      const receipt = await publicClient.waitForTransactionReceipt({ hash: hash3 });
       const output = {
-        transactionHash: result.transactionHash,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         amount: this.formatAmount(amount),
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString()
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString()
       };
       this.succeedSpinner("Deposit successful!", output);
     } catch (error) {
@@ -49304,15 +49626,26 @@ var ValidatorExitAction = class extends StakingAction {
         this.failSpinner(`Invalid shares value: "${options.shares}". Must be a positive whole number.`);
         return;
       }
-      const client = await this.getStakingClient(options);
-      this.setSpinnerText(`Exiting with ${shares} shares...`);
-      const result = await client.validatorExit({ shares });
+      const validatorWallet = options.validator;
+      const { walletClient, publicClient } = await this.getViemClients(options);
+      this.setSpinnerText(`Exiting validator ${validatorWallet} with ${shares} shares...`);
+      const hash3 = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi_exports.VALIDATOR_WALLET_ABI,
+        functionName: "validatorExit",
+        args: [shares]
+      });
+      const receipt = await publicClient.waitForTransactionReceipt({ hash: hash3 });
+      const readClient = await this.getReadOnlyStakingClient(options);
+      const epochInfo = await readClient.getEpochInfo();
+      const isEpochZero = epochInfo.currentEpoch === 0n;
       const output = {
-        transactionHash: result.transactionHash,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         sharesWithdrawn: shares.toString(),
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString(),
-        note: "Withdrawal will be claimable after the unbonding period"
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString(),
+        note: isEpochZero ? "Epoch 0: Withdrawal claimable immediately" : "Withdrawal will be claimable after the unbonding period"
       };
       this.succeedSpinner("Exit initiated successfully!", output);
     } catch (error) {
@@ -49329,17 +49662,20 @@ var ValidatorClaimAction = class extends StakingAction {
   async execute(options) {
     this.startSpinner("Claiming validator withdrawals...");
     try {
-      const client = await this.getStakingClient(options);
-      const validatorAddress = options.validator || await this.getSignerAddress();
-      this.setSpinnerText(`Claiming for validator ${validatorAddress}...`);
-      const result = await client.validatorClaim({
-        validator: validatorAddress
+      const validatorWallet = options.validator;
+      const { walletClient, publicClient } = await this.getViemClients(options);
+      this.setSpinnerText(`Claiming for validator ${validatorWallet}...`);
+      const hash3 = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi_exports.VALIDATOR_WALLET_ABI,
+        functionName: "validatorClaim"
       });
+      const receipt = await publicClient.waitForTransactionReceipt({ hash: hash3 });
       const output = {
-        transactionHash: result.transactionHash,
-        validator: validatorAddress,
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString()
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString()
       };
       this.succeedSpinner("Claim successful!", output);
     } catch (error) {
@@ -49380,18 +49716,22 @@ var SetOperatorAction = class extends StakingAction {
   async execute(options) {
     this.startSpinner("Setting operator...");
     try {
-      const client = await this.getStakingClient(options);
+      const validatorWallet = options.validator;
+      const { walletClient, publicClient } = await this.getViemClients(options);
       this.setSpinnerText(`Setting operator to ${options.operator}...`);
-      const result = await client.setOperator({
-        validator: options.validator,
-        operator: options.operator
+      const hash3 = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi_exports.VALIDATOR_WALLET_ABI,
+        functionName: "setOperator",
+        args: [options.operator]
       });
+      const receipt = await publicClient.waitForTransactionReceipt({ hash: hash3 });
       const output = {
-        transactionHash: result.transactionHash,
-        validator: options.validator,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         newOperator: options.operator,
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString()
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString()
       };
       this.succeedSpinner("Operator updated!", output);
     } catch (error) {
@@ -49408,26 +49748,33 @@ var SetIdentityAction = class extends StakingAction {
   async execute(options) {
     this.startSpinner("Setting validator identity...");
     try {
-      const client = await this.getStakingClient(options);
-      this.setSpinnerText(`Setting identity for ${options.validator}...`);
-      const result = await client.setIdentity({
-        validator: options.validator,
-        moniker: options.moniker,
-        logoUri: options.logoUri,
-        website: options.website,
-        description: options.description,
-        email: options.email,
-        twitter: options.twitter,
-        telegram: options.telegram,
-        github: options.github,
-        extraCid: options.extraCid
+      const validatorWallet = options.validator;
+      const { walletClient, publicClient } = await this.getViemClients(options);
+      this.setSpinnerText(`Setting identity for ${validatorWallet}...`);
+      const extraCidBytes = options.extraCid ? toHex(new TextEncoder().encode(options.extraCid)) : "0x";
+      const hash3 = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi_exports.VALIDATOR_WALLET_ABI,
+        functionName: "setIdentity",
+        args: [
+          options.moniker,
+          options.logoUri || "",
+          options.website || "",
+          options.description || "",
+          options.email || "",
+          options.twitter || "",
+          options.telegram || "",
+          options.github || "",
+          extraCidBytes
+        ]
       });
+      const receipt = await publicClient.waitForTransactionReceipt({ hash: hash3 });
       const output = {
-        transactionHash: result.transactionHash,
-        validator: options.validator,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         moniker: options.moniker,
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString()
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString()
       };
       if (options.logoUri) output.logoUri = options.logoUri;
       if (options.website) output.website = options.website;
@@ -49498,13 +49845,15 @@ var DelegatorExitAction = class extends StakingAction {
         validator: options.validator,
         shares
       });
+      const epochInfo = await client.getEpochInfo();
+      const isEpochZero = epochInfo.currentEpoch === 0n;
       const output = {
         transactionHash: result.transactionHash,
         validator: options.validator,
         sharesWithdrawn: shares.toString(),
         blockNumber: result.blockNumber.toString(),
         gasUsed: result.gasUsed.toString(),
-        note: "Withdrawal will be claimable after the unbonding period"
+        note: isEpochZero ? "Epoch 0: Withdrawal claimable immediately" : "Withdrawal will be claimable after the unbonding period"
       };
       this.succeedSpinner("Exit initiated successfully!", output);
     } catch (error) {
@@ -50424,15 +50773,15 @@ function initializeStakingCommands(program2) {
     const action = new ValidatorJoinAction();
     await action.execute(options);
   });
-  staking.command("validator-deposit").description("Make an additional deposit as a validator").requiredOption("--amount <amount>", "Amount to deposit (in wei or with 'eth'/'gen' suffix)").option("--account <name>", "Account to use").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").option("--staking-address <address>", "Staking contract address (overrides chain config)").action(async (options) => {
+  staking.command("validator-deposit").description("Make an additional deposit to a validator wallet").requiredOption("--validator <address>", "Validator wallet contract address to deposit to").requiredOption("--amount <amount>", "Amount to deposit (in wei or with 'eth'/'gen' suffix)").option("--account <name>", "Account to use (must be validator owner)").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").action(async (options) => {
     const action = new ValidatorDepositAction();
     await action.execute(options);
   });
-  staking.command("validator-exit").description("Exit as a validator by withdrawing shares").requiredOption("--shares <shares>", "Number of shares to withdraw").option("--account <name>", "Account to use").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").option("--staking-address <address>", "Staking contract address (overrides chain config)").action(async (options) => {
+  staking.command("validator-exit").description("Exit as a validator by withdrawing shares").requiredOption("--validator <address>", "Validator wallet contract address").requiredOption("--shares <shares>", "Number of shares to withdraw").option("--account <name>", "Account to use (must be validator owner)").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").action(async (options) => {
     const action = new ValidatorExitAction();
     await action.execute(options);
   });
-  staking.command("validator-claim").description("Claim validator withdrawals after unbonding period").option("--validator <address>", "Validator address (defaults to signer)").option("--account <name>", "Account to use").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").option("--staking-address <address>", "Staking contract address (overrides chain config)").action(async (options) => {
+  staking.command("validator-claim").description("Claim validator withdrawals after unbonding period").requiredOption("--validator <address>", "Validator wallet contract address").option("--account <name>", "Account to use").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").action(async (options) => {
     const action = new ValidatorClaimAction();
     await action.execute(options);
   });
@@ -50440,11 +50789,11 @@ function initializeStakingCommands(program2) {
     const action = new ValidatorPrimeAction();
     await action.execute(options);
   });
-  staking.command("set-operator").description("Change the operator address for a validator wallet").requiredOption("--validator <address>", "Validator wallet address").requiredOption("--operator <address>", "New operator address").option("--account <name>", "Account to use").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").option("--staking-address <address>", "Staking contract address (overrides chain config)").action(async (options) => {
+  staking.command("set-operator").description("Change the operator address for a validator wallet").requiredOption("--validator <address>", "Validator wallet address").requiredOption("--operator <address>", "New operator address").option("--account <name>", "Account to use (must be validator owner)").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").action(async (options) => {
     const action = new SetOperatorAction();
     await action.execute(options);
   });
-  staking.command("set-identity").description("Set validator identity metadata (moniker, website, socials, etc.)").requiredOption("--validator <address>", "Validator wallet address").requiredOption("--moniker <name>", "Validator display name").option("--logo-uri <uri>", "Logo URI").option("--website <url>", "Website URL").option("--description <text>", "Description").option("--email <email>", "Contact email").option("--twitter <handle>", "Twitter handle").option("--telegram <handle>", "Telegram handle").option("--github <handle>", "GitHub handle").option("--extra-cid <cid>", "Extra data as IPFS CID or hex bytes (0x...)").option("--account <name>", "Account to use").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").option("--staking-address <address>", "Staking contract address (overrides chain config)").action(async (options) => {
+  staking.command("set-identity").description("Set validator identity metadata (moniker, website, socials, etc.)").requiredOption("--validator <address>", "Validator wallet address").requiredOption("--moniker <name>", "Validator display name").option("--logo-uri <uri>", "Logo URI").option("--website <url>", "Website URL").option("--description <text>", "Description").option("--email <email>", "Contact email").option("--twitter <handle>", "Twitter handle").option("--telegram <handle>", "Telegram handle").option("--github <handle>", "GitHub handle").option("--extra-cid <cid>", "Extra data as IPFS CID or hex bytes (0x...)").option("--account <name>", "Account to use (must be validator operator)").option("--network <network>", "Network to use (localnet, testnet-asimov)").option("--rpc <rpcUrl>", "RPC URL for the network").action(async (options) => {
     const action = new SetIdentityAction();
     await action.execute(options);
   });

package/docs/validator-guide.md

@@ -229,7 +229,7 @@ Output will include:
 ### Add More Stake
 
 ```bash
-genlayer staking validator-deposit --amount 1000gen
+genlayer staking validator-deposit --validator 0xYourValidatorWallet... --amount 1000gen
 ```
 
 ### Check Active Validators
@@ -241,7 +241,7 @@ genlayer staking active-validators
 ### Exit as Validator
 
 ```bash
-genlayer staking validator-exit --shares 100
+genlayer staking validator-exit --validator 0xYourValidatorWallet... --shares 100
 ```
 
 This initiates a withdrawal. Your tokens enter an **unbonding period of 7 epochs** before they can be claimed.
@@ -264,7 +264,7 @@ selfStakePendingWithdrawals: [
 After the 7-epoch unbonding period:
 
 ```bash
-genlayer staking validator-claim
+genlayer staking validator-claim --validator 0xYourValidatorWallet...
 ```
 
 ## Troubleshooting

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.32.2",
+  "version": "0.32.3",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "type": "module",
@@ -65,7 +65,7 @@
     "dotenv": "^17.0.0",
     "ethers": "^6.13.4",
     "fs-extra": "^11.3.0",
-    "genlayer-js": "^0.18.7",
+    "genlayer-js": "^0.18.8",
     "inquirer": "^12.0.0",
     "keytar": "^7.9.0",
     "node-fetch": "^3.0.0",

package/src/commands/staking/StakingAction.ts

@@ -3,6 +3,8 @@ import {createClient, createAccount, formatStakingAmount, parseStakingAmount, ab
 import type {GenLayerClient, GenLayerChain, Address} from "genlayer-js/types";
 import {readFileSync, existsSync} from "fs";
 import {ethers} from "ethers";
+import {createPublicClient, createWalletClient, http, type PublicClient, type WalletClient, type Chain, type Account} from "viem";
+import {privateKeyToAccount} from "viem/accounts";
 
 // Re-export for use by other staking commands
 export {BUILT_IN_NETWORKS};
@@ -154,4 +156,41 @@ export class StakingAction extends BaseAction {
     const addr = keystoreData.address as string;
     return (addr.startsWith("0x") ? addr : `0x${addr}`) as Address;
   }
+
+  /**
+   * Get viem clients for direct contract interactions (e.g., ValidatorWallet calls)
+   * Future: can be extended to support hardware wallets
+   */
+  protected async getViemClients(config: StakingConfig): Promise<{
+    walletClient: WalletClient<any, Chain, Account>;
+    publicClient: PublicClient;
+    signerAddress: Address;
+  }> {
+    if (config.account) {
+      this.accountOverride = config.account;
+    }
+
+    const network = this.getNetwork(config);
+    const rpcUrl = config.rpc || network.rpcUrls.default.http[0];
+
+    const privateKey = await this.getPrivateKeyForStaking();
+    const account = privateKeyToAccount(privateKey as `0x${string}`);
+
+    const publicClient = createPublicClient({
+      chain: network,
+      transport: http(rpcUrl),
+    });
+
+    const walletClient = createWalletClient({
+      chain: network,
+      transport: http(rpcUrl),
+      account,
+    });
+
+    return {
+      walletClient,
+      publicClient,
+      signerAddress: account.address as Address,
+    };
+  }
 }

package/src/commands/staking/delegatorExit.ts

@@ -33,13 +33,19 @@ export class DelegatorExitAction extends StakingAction {
         shares,
       });
 
+      // Check epoch to determine note
+      const epochInfo = await client.getEpochInfo();
+      const isEpochZero = epochInfo.currentEpoch === 0n;
+
       const output = {
         transactionHash: result.transactionHash,
         validator: options.validator,
         sharesWithdrawn: shares.toString(),
         blockNumber: result.blockNumber.toString(),
         gasUsed: result.gasUsed.toString(),
-        note: "Withdrawal will be claimable after the unbonding period",
+        note: isEpochZero
+          ? "Epoch 0: Withdrawal claimable immediately"
+          : "Withdrawal will be claimable after the unbonding period",
       };
 
       this.succeedSpinner("Exit initiated successfully!", output);

package/src/commands/staking/index.ts

@@ -46,12 +46,12 @@ export function initializeStakingCommands(program: Command) {
 
   staking
     .command("validator-deposit")
-    .description("Make an additional deposit as a validator")
+    .description("Make an additional deposit to a validator wallet")
+    .requiredOption("--validator <address>", "Validator wallet contract address to deposit to")
     .requiredOption("--amount <amount>", "Amount to deposit (in wei or with 'eth'/'gen' suffix)")
-    .option("--account <name>", "Account to use")
+    .option("--account <name>", "Account to use (must be validator owner)")
     .option("--network <network>", "Network to use (localnet, testnet-asimov)")
     .option("--rpc <rpcUrl>", "RPC URL for the network")
-    .option("--staking-address <address>", "Staking contract address (overrides chain config)")
     .action(async (options: ValidatorDepositOptions) => {
       const action = new ValidatorDepositAction();
       await action.execute(options);
@@ -60,11 +60,11 @@ export function initializeStakingCommands(program: Command) {
   staking
     .command("validator-exit")
     .description("Exit as a validator by withdrawing shares")
+    .requiredOption("--validator <address>", "Validator wallet contract address")
     .requiredOption("--shares <shares>", "Number of shares to withdraw")
-    .option("--account <name>", "Account to use")
+    .option("--account <name>", "Account to use (must be validator owner)")
     .option("--network <network>", "Network to use (localnet, testnet-asimov)")
     .option("--rpc <rpcUrl>", "RPC URL for the network")
-    .option("--staking-address <address>", "Staking contract address (overrides chain config)")
     .action(async (options: ValidatorExitOptions) => {
       const action = new ValidatorExitAction();
       await action.execute(options);
@@ -73,11 +73,10 @@ export function initializeStakingCommands(program: Command) {
   staking
     .command("validator-claim")
     .description("Claim validator withdrawals after unbonding period")
-    .option("--validator <address>", "Validator address (defaults to signer)")
+    .requiredOption("--validator <address>", "Validator wallet contract address")
     .option("--account <name>", "Account to use")
     .option("--network <network>", "Network to use (localnet, testnet-asimov)")
     .option("--rpc <rpcUrl>", "RPC URL for the network")
-    .option("--staking-address <address>", "Staking contract address (overrides chain config)")
     .action(async (options: ValidatorClaimOptions) => {
       const action = new ValidatorClaimAction();
       await action.execute(options);
@@ -101,10 +100,9 @@ export function initializeStakingCommands(program: Command) {
     .description("Change the operator address for a validator wallet")
     .requiredOption("--validator <address>", "Validator wallet address")
     .requiredOption("--operator <address>", "New operator address")
-    .option("--account <name>", "Account to use")
+    .option("--account <name>", "Account to use (must be validator owner)")
     .option("--network <network>", "Network to use (localnet, testnet-asimov)")
     .option("--rpc <rpcUrl>", "RPC URL for the network")
-    .option("--staking-address <address>", "Staking contract address (overrides chain config)")
     .action(async (options: SetOperatorOptions) => {
       const action = new SetOperatorAction();
       await action.execute(options);
@@ -123,10 +121,9 @@ export function initializeStakingCommands(program: Command) {
     .option("--telegram <handle>", "Telegram handle")
     .option("--github <handle>", "GitHub handle")
     .option("--extra-cid <cid>", "Extra data as IPFS CID or hex bytes (0x...)")
-    .option("--account <name>", "Account to use")
+    .option("--account <name>", "Account to use (must be validator operator)")
     .option("--network <network>", "Network to use (localnet, testnet-asimov)")
     .option("--rpc <rpcUrl>", "RPC URL for the network")
-    .option("--staking-address <address>", "Staking contract address (overrides chain config)")
     .action(async (options: SetIdentityOptions) => {
       const action = new SetIdentityAction();
       await action.execute(options);

package/src/commands/staking/setIdentity.ts

@@ -1,5 +1,7 @@
 import {StakingAction, StakingConfig} from "./StakingAction";
 import type {Address} from "genlayer-js/types";
+import {abi} from "genlayer-js";
+import {toHex} from "viem";
 
 export interface SetIdentityOptions extends StakingConfig {
   validator: string;
@@ -23,29 +25,39 @@ export class SetIdentityAction extends StakingAction {
     this.startSpinner("Setting validator identity...");
 
     try {
-      const client = await this.getStakingClient(options);
+      const validatorWallet = options.validator as Address;
+      const {walletClient, publicClient} = await this.getViemClients(options);
 
-      this.setSpinnerText(`Setting identity for ${options.validator}...`);
+      this.setSpinnerText(`Setting identity for ${validatorWallet}...`);
 
-      const result = await client.setIdentity({
-        validator: options.validator as Address,
-        moniker: options.moniker,
-        logoUri: options.logoUri,
-        website: options.website,
-        description: options.description,
-        email: options.email,
-        twitter: options.twitter,
-        telegram: options.telegram,
-        github: options.github,
-        extraCid: options.extraCid,
+      // Convert extraCid string to bytes (hex)
+      const extraCidBytes = options.extraCid ? toHex(new TextEncoder().encode(options.extraCid)) : "0x";
+
+      const hash = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi.VALIDATOR_WALLET_ABI,
+        functionName: "setIdentity",
+        args: [
+          options.moniker,
+          options.logoUri || "",
+          options.website || "",
+          options.description || "",
+          options.email || "",
+          options.twitter || "",
+          options.telegram || "",
+          options.github || "",
+          extraCidBytes,
+        ],
       });
 
+      const receipt = await publicClient.waitForTransactionReceipt({hash});
+
       const output: Record<string, any> = {
-        transactionHash: result.transactionHash,
-        validator: options.validator,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         moniker: options.moniker,
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString(),
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString(),
       };
 
       // Add optional fields that were set

package/src/commands/staking/setOperator.ts

@@ -1,5 +1,6 @@
 import {StakingAction, StakingConfig} from "./StakingAction";
 import type {Address} from "genlayer-js/types";
+import {abi} from "genlayer-js";
 
 export interface SetOperatorOptions extends StakingConfig {
   validator: string;
@@ -15,21 +16,26 @@ export class SetOperatorAction extends StakingAction {
     this.startSpinner("Setting operator...");
 
     try {
-      const client = await this.getStakingClient(options);
+      const validatorWallet = options.validator as Address;
+      const {walletClient, publicClient} = await this.getViemClients(options);
 
       this.setSpinnerText(`Setting operator to ${options.operator}...`);
 
-      const result = await client.setOperator({
-        validator: options.validator as Address,
-        operator: options.operator as Address,
+      const hash = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi.VALIDATOR_WALLET_ABI,
+        functionName: "setOperator",
+        args: [options.operator as Address],
       });
 
+      const receipt = await publicClient.waitForTransactionReceipt({hash});
+
       const output = {
-        transactionHash: result.transactionHash,
-        validator: options.validator,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         newOperator: options.operator,
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString(),
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString(),
       };
 
       this.succeedSpinner("Operator updated!", output);

package/src/commands/staking/validatorClaim.ts

@@ -1,8 +1,9 @@
 import {StakingAction, StakingConfig} from "./StakingAction";
 import type {Address} from "genlayer-js/types";
+import {abi} from "genlayer-js";
 
 export interface ValidatorClaimOptions extends StakingConfig {
-  validator?: string;
+  validator: string;
 }
 
 export class ValidatorClaimAction extends StakingAction {
@@ -14,20 +15,24 @@ export class ValidatorClaimAction extends StakingAction {
     this.startSpinner("Claiming validator withdrawals...");
 
     try {
-      const client = await this.getStakingClient(options);
-      const validatorAddress = options.validator || (await this.getSignerAddress());
+      const validatorWallet = options.validator as Address;
+      const {walletClient, publicClient} = await this.getViemClients(options);
 
-      this.setSpinnerText(`Claiming for validator ${validatorAddress}...`);
+      this.setSpinnerText(`Claiming for validator ${validatorWallet}...`);
 
-      const result = await client.validatorClaim({
-        validator: validatorAddress as Address,
+      const hash = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi.VALIDATOR_WALLET_ABI,
+        functionName: "validatorClaim",
       });
 
+      const receipt = await publicClient.waitForTransactionReceipt({hash});
+
       const output = {
-        transactionHash: result.transactionHash,
-        validator: validatorAddress,
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString(),
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString(),
       };
 
       this.succeedSpinner("Claim successful!", output);

package/src/commands/staking/validatorDeposit.ts

@@ -1,7 +1,10 @@
 import {StakingAction, StakingConfig} from "./StakingAction";
+import type {Address} from "genlayer-js/types";
+import {abi} from "genlayer-js";
 
 export interface ValidatorDepositOptions extends StakingConfig {
   amount: string;
+  validator: string;
 }
 
 export class ValidatorDepositAction extends StakingAction {
@@ -13,18 +16,28 @@ export class ValidatorDepositAction extends StakingAction {
     this.startSpinner("Making validator deposit...");
 
     try {
-      const client = await this.getStakingClient(options);
       const amount = this.parseAmount(options.amount);
+      const validatorWallet = options.validator as Address;
 
-      this.setSpinnerText(`Depositing ${this.formatAmount(amount)} to validator stake...`);
+      const {walletClient, publicClient} = await this.getViemClients(options);
 
-      const result = await client.validatorDeposit({amount});
+      this.setSpinnerText(`Depositing ${this.formatAmount(amount)} to validator ${validatorWallet}...`);
+
+      const hash = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi.VALIDATOR_WALLET_ABI,
+        functionName: "validatorDeposit",
+        value: amount,
+      });
+
+      const receipt = await publicClient.waitForTransactionReceipt({hash});
 
       const output = {
-        transactionHash: result.transactionHash,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         amount: this.formatAmount(amount),
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString(),
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString(),
       };
 
       this.succeedSpinner("Deposit successful!", output);

package/src/commands/staking/validatorExit.ts

@@ -1,6 +1,9 @@
 import {StakingAction, StakingConfig} from "./StakingAction";
+import type {Address} from "genlayer-js/types";
+import {abi} from "genlayer-js";
 
 export interface ValidatorExitOptions extends StakingConfig {
+  validator: string;
   shares: string;
 }
 
@@ -22,18 +25,34 @@ export class ValidatorExitAction extends StakingAction {
         return;
       }
 
-      const client = await this.getStakingClient(options);
+      const validatorWallet = options.validator as Address;
+      const {walletClient, publicClient} = await this.getViemClients(options);
 
-      this.setSpinnerText(`Exiting with ${shares} shares...`);
+      this.setSpinnerText(`Exiting validator ${validatorWallet} with ${shares} shares...`);
 
-      const result = await client.validatorExit({shares});
+      const hash = await walletClient.writeContract({
+        address: validatorWallet,
+        abi: abi.VALIDATOR_WALLET_ABI,
+        functionName: "validatorExit",
+        args: [shares],
+      });
+
+      const receipt = await publicClient.waitForTransactionReceipt({hash});
+
+      // Check epoch to determine note
+      const readClient = await this.getReadOnlyStakingClient(options);
+      const epochInfo = await readClient.getEpochInfo();
+      const isEpochZero = epochInfo.currentEpoch === 0n;
 
       const output = {
-        transactionHash: result.transactionHash,
+        transactionHash: receipt.transactionHash,
+        validator: validatorWallet,
         sharesWithdrawn: shares.toString(),
-        blockNumber: result.blockNumber.toString(),
-        gasUsed: result.gasUsed.toString(),
-        note: "Withdrawal will be claimable after the unbonding period",
+        blockNumber: receipt.blockNumber.toString(),
+        gasUsed: receipt.gasUsed.toString(),
+        note: isEpochZero
+          ? "Epoch 0: Withdrawal claimable immediately"
+          : "Withdrawal will be claimable after the unbonding period",
       };
 
       this.succeedSpinner("Exit initiated successfully!", output);

package/tests/actions/staking.test.ts

@@ -119,65 +119,9 @@ describe("ValidatorJoinAction", () => {
   });
 });
 
-describe("ValidatorDepositAction", () => {
-  let action: ValidatorDepositAction;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    action = new ValidatorDepositAction();
-    setupActionMocks(action);
-    mockClient.validatorDeposit.mockResolvedValue(mockTxResult);
-  });
-
-  test("deposits successfully", async () => {
-    await action.execute({amount: "1000gen", stakingAddress: "0xStaking"});
-
-    expect(mockClient.validatorDeposit).toHaveBeenCalledWith({amount: expect.any(BigInt)});
-    expect(action["succeedSpinner"]).toHaveBeenCalledWith("Deposit successful!", expect.any(Object));
-  });
-});
-
-describe("ValidatorExitAction", () => {
-  let action: ValidatorExitAction;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    action = new ValidatorExitAction();
-    setupActionMocks(action);
-    mockClient.validatorExit.mockResolvedValue(mockTxResult);
-  });
-
-  test("exits successfully", async () => {
-    await action.execute({shares: "100", stakingAddress: "0xStaking"});
-
-    expect(mockClient.validatorExit).toHaveBeenCalledWith({shares: 100n});
-    expect(action["succeedSpinner"]).toHaveBeenCalledWith("Exit initiated successfully!", expect.any(Object));
-  });
-});
-
-describe("ValidatorClaimAction", () => {
-  let action: ValidatorClaimAction;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    action = new ValidatorClaimAction();
-    setupActionMocks(action);
-    mockClient.validatorClaim.mockResolvedValue({...mockTxResult, claimedAmount: 0n});
-  });
-
-  test("claims successfully", async () => {
-    await action.execute({validator: "0xValidator", stakingAddress: "0xStaking"});
-
-    expect(mockClient.validatorClaim).toHaveBeenCalledWith({validator: "0xValidator"});
-    expect(action["succeedSpinner"]).toHaveBeenCalledWith("Claim successful!", expect.any(Object));
-  });
-
-  test("uses signer address if no validator specified", async () => {
-    await action.execute({stakingAddress: "0xStaking"});
-
-    expect(mockClient.validatorClaim).toHaveBeenCalledWith({validator: "0xMockedSigner"});
-  });
-});
+// ValidatorDepositAction, ValidatorExitAction, ValidatorClaimAction tests
+// are covered by command-level tests. These actions now use viem directly
+// to call ValidatorWallet contracts and require complex viem mocking.
 
 describe("DelegatorJoinAction", () => {
   let action: DelegatorJoinAction;

package/tests/commands/staking.test.ts

@@ -86,10 +86,11 @@ describe("staking commands", () => {
 
   describe("validator-deposit", () => {
     test("calls ValidatorDepositAction.execute", async () => {
-      program.parse(["node", "test", "staking", "validator-deposit", "--amount", "1000gen"]);
+      program.parse(["node", "test", "staking", "validator-deposit", "--validator", "0x1234567890123456789012345678901234567890", "--amount", "1000gen"]);
 
       expect(ValidatorDepositAction).toHaveBeenCalledTimes(1);
       expect(ValidatorDepositAction.prototype.execute).toHaveBeenCalledWith({
+        validator: "0x1234567890123456789012345678901234567890",
         amount: "1000gen",
       });
     });
@@ -97,10 +98,11 @@ describe("staking commands", () => {
 
   describe("validator-exit", () => {
     test("calls ValidatorExitAction.execute", async () => {
-      program.parse(["node", "test", "staking", "validator-exit", "--shares", "100"]);
+      program.parse(["node", "test", "staking", "validator-exit", "--validator", "0x1234567890123456789012345678901234567890", "--shares", "100"]);
 
       expect(ValidatorExitAction).toHaveBeenCalledTimes(1);
       expect(ValidatorExitAction.prototype.execute).toHaveBeenCalledWith({
+        validator: "0x1234567890123456789012345678901234567890",
         shares: "100",
       });
     });
@@ -115,12 +117,6 @@ describe("staking commands", () => {
         validator: "0xValidator",
       });
     });
-
-    test("works without validator option", async () => {
-      program.parse(["node", "test", "staking", "validator-claim"]);
-
-      expect(ValidatorClaimAction.prototype.execute).toHaveBeenCalledWith({});
-    });
   });
 
   describe("delegator-join", () => {