genlayer-js 0.18.7 → 0.18.9

package/dist/index.js

@@ -5,7 +5,7 @@ import {
   localnet,
   studionet,
   testnetAsimov
-} from "./chunk-RW6PLN5W.js";
+} from "./chunk-V3MYVW3P.js";
 import {
   CalldataAddress,
   isDecidedState,
@@ -743,10 +743,44 @@ var _sendTransaction = async ({
       data: encodedData,
       value
     });
-  } catch (error) {
-    console.warn("Gas estimation failed, using fallback value:", error);
+  } catch (err) {
+    console.error("Gas estimation failed, using default 200_000:", err);
     estimatedGas = 200000n;
   }
+  if (validatedSenderAccount?.type === "local") {
+    if (!validatedSenderAccount?.signTransaction) {
+      throw new Error("Account does not support signTransaction");
+    }
+    const gasPriceHex = await client.request({
+      method: "eth_gasPrice"
+    });
+    const transactionRequest2 = {
+      account: validatedSenderAccount,
+      to: client.chain.consensusMainContract?.address,
+      data: encodedData,
+      type: "legacy",
+      nonce: Number(nonce),
+      value,
+      gas: estimatedGas,
+      gasPrice: BigInt(gasPriceHex),
+      chainId: client.chain.id
+    };
+    const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest2);
+    const txHash = await client.sendRawTransaction({ serializedTransaction });
+    const receipt = await publicClient.waitForTransactionReceipt({ hash: txHash });
+    if (receipt.status === "reverted") {
+      throw new Error("Transaction reverted");
+    }
+    const newTxEvents = parseEventLogs({
+      abi: client.chain.consensusMainContract?.abi,
+      eventName: "NewTransaction",
+      logs: receipt.logs
+    });
+    if (newTxEvents.length === 0) {
+      throw new Error("Transaction not processed by consensus");
+    }
+    return newTxEvents[0].args["txId"];
+  }
   const transactionRequest = await client.prepareTransactionRequest({
     account: validatedSenderAccount,
     to: client.chain.consensusMainContract?.address,
@@ -756,37 +790,17 @@ var _sendTransaction = async ({
     value,
     gas: estimatedGas
   });
-  if (validatedSenderAccount?.type !== "local") {
-    const formattedRequest = {
-      from: transactionRequest.from,
-      to: transactionRequest.to,
-      data: encodedData,
-      value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0",
-      gas: transactionRequest.gas ? `0x${transactionRequest.gas.toString(16)}` : "0x5208"
-    };
-    return await client.request({
-      method: "eth_sendTransaction",
-      params: [formattedRequest]
-    });
-  }
-  if (!validatedSenderAccount?.signTransaction) {
-    throw new Error("Account does not support signTransaction");
-  }
-  const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest);
-  const txHash = await client.sendRawTransaction({ serializedTransaction });
-  const receipt = await publicClient.waitForTransactionReceipt({ hash: txHash });
-  if (receipt.status === "reverted") {
-    throw new Error("Transaction reverted");
-  }
-  const newTxEvents = parseEventLogs({
-    abi: client.chain.consensusMainContract?.abi,
-    eventName: "NewTransaction",
-    logs: receipt.logs
+  const formattedRequest = {
+    from: transactionRequest.from,
+    to: transactionRequest.to,
+    data: encodedData,
+    value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0",
+    gas: transactionRequest.gas ? `0x${transactionRequest.gas.toString(16)}` : "0x5208"
+  };
+  return await client.request({
+    method: "eth_sendTransaction",
+    params: [formattedRequest]
   });
-  if (newTxEvents.length === 0) {
-    throw new Error("Transaction not processed by consensus");
-  }
-  return newTxEvents[0].args["txId"];
 };
 
 // src/config/transactions.ts
@@ -1672,6 +1686,7 @@ var stakingActions = (client, publicClient) => {
       const contract = getReadOnlyStakingContract();
       const [
         epoch,
+        finalized,
         validatorMinStake,
         delegatorMinStake,
         activeCount,
@@ -1681,6 +1696,7 @@ var stakingActions = (client, publicClient) => {
         epochEven
       ] = await Promise.all([
         contract.read.epoch(),
+        contract.read.finalized(),
         contract.read.validatorMinStake(),
         contract.read.delegatorMinStake(),
         contract.read.activeValidatorsCount(),
@@ -1690,8 +1706,7 @@ var stakingActions = (client, publicClient) => {
         contract.read.epochEven()
       ]);
       const currentEpochData = epoch % 2n === 0n ? epochEven : epochOdd;
-      const currentEpochStart = new Date(Number(currentEpochData.start) * 1e3);
-      const currentEpochEnd = currentEpochData.end > 0n ? new Date(Number(currentEpochData.end) * 1e3) : null;
+      const currentEpochEnd = currentEpochData.end > 0n;
       let nextEpochEstimate = null;
       if (!currentEpochEnd) {
         const duration = epoch === 0n ? epochZeroMinDuration : epochMinDuration;
@@ -1700,20 +1715,42 @@ var stakingActions = (client, publicClient) => {
       }
       return {
         currentEpoch: epoch,
+        lastFinalizedEpoch: finalized,
         validatorMinStake: formatStakingAmount(validatorMinStake),
         validatorMinStakeRaw: validatorMinStake,
         delegatorMinStake: formatStakingAmount(delegatorMinStake),
         delegatorMinStakeRaw: delegatorMinStake,
         activeValidatorsCount: activeCount,
         epochMinDuration,
-        currentEpochStart,
-        currentEpochEnd,
-        nextEpochEstimate,
-        inflation: formatStakingAmount(currentEpochData.inflation),
-        inflationRaw: currentEpochData.inflation,
-        totalWeight: currentEpochData.weight,
-        totalClaimed: formatStakingAmount(currentEpochData.claimed),
-        totalClaimedRaw: currentEpochData.claimed
+        nextEpochEstimate
+      };
+    },
+    getEpochData: async (epochNumber) => {
+      const contract = getReadOnlyStakingContract();
+      const [currentEpoch, epochOdd, epochEven] = await Promise.all([
+        contract.read.epoch(),
+        contract.read.epochOdd(),
+        contract.read.epochEven()
+      ]);
+      if (epochNumber > currentEpoch) {
+        throw new Error(`Epoch ${epochNumber} has not started yet (current: ${currentEpoch})`);
+      }
+      if (epochNumber < currentEpoch - 1n && currentEpoch > 0n) {
+        throw new Error(`Epoch ${epochNumber} data no longer available (only current and previous epoch stored)`);
+      }
+      const epochData = epochNumber % 2n === 0n ? epochEven : epochOdd;
+      return {
+        start: epochData.start,
+        end: epochData.end,
+        inflation: epochData.inflation,
+        weight: epochData.weight,
+        weightDeposit: epochData.weightDeposit,
+        weightWithdrawal: epochData.weightWithdrawal,
+        vcount: epochData.vcount,
+        claimed: epochData.claimed,
+        stakeDeposit: epochData.stakeDeposit,
+        stakeWithdrawal: epochData.stakeWithdrawal,
+        slashed: epochData.slashed
       };
     },
     getActiveValidators: async () => {
@@ -1747,6 +1784,11 @@ var stakingActions = (client, publicClient) => {
         permanentlyBanned: v.permanentlyBanned
       }));
     },
+    getSlashingAddress: async () => {
+      const contract = getReadOnlyStakingContract();
+      const externalContracts = await contract.read.contracts();
+      return externalContracts[4];
+    },
     getStakingContract,
     parseStakingAmount,
     formatStakingAmount
@@ -1785,7 +1827,7 @@ function chainActions(client) {
 }
 
 // src/client/client.ts
-var getCustomTransportConfig = (config) => {
+var getCustomTransportConfig = (config, chainConfig) => {
   const isAddress = typeof config.account !== "object";
   return {
     async request({ method, params = [] }) {
@@ -1801,11 +1843,8 @@ var getCustomTransportConfig = (config) => {
         }
       }
       {
-        if (!config.chain) {
-          throw new Error("Chain is not set");
-        }
         try {
-          const response = await fetch(config.chain.rpcUrls.default.http[0], {
+          const response = await fetch(chainConfig.rpcUrls.default.http[0], {
             method: "POST",
             headers: {
               "Content-Type": "application/json"
@@ -1835,7 +1874,7 @@ var createClient = (config = { chain: localnet }) => {
   if (config.endpoint) {
     chainConfig.rpcUrls.default.http = [config.endpoint];
   }
-  const customTransport = custom(getCustomTransportConfig(config), { retryCount: 0, retryDelay: 0 });
+  const customTransport = custom(getCustomTransportConfig(config, chainConfig), { retryCount: 0, retryDelay: 0 });
   const publicClient = createPublicClient(chainConfig, customTransport).extend(
     publicActions
   );

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-DM646L5c.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, a4 as DelegatorClaimOptions, a3 as DelegatorExitOptions, a2 as DelegatorJoinOptions, U as DelegatorJoinResult, K as EpochData, O as EpochInfo, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, L as LeaderReceipt, M as MethodDescription, N as Network, P as PendingDeposit, F as PendingWithdrawal, a1 as SetIdentityOptions, a0 as SetOperatorOptions, y as SnapSource, J as StakeInfo, a5 as StakingActions, z as StakingContract, Q as StakingTransactionResult, k as TransactionHash, x as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, w as TransactionType, _ as ValidatorClaimOptions, Y as ValidatorDepositOptions, Z as ValidatorExitOptions, B as ValidatorIdentity, E as ValidatorInfo, X as ValidatorJoinOptions, R 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-D9ONjYgl.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-9QkkDjYm.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, a4 as DelegatorClaimOptions, a3 as DelegatorExitOptions, a2 as DelegatorJoinOptions, U as DelegatorJoinResult, K as EpochData, O as EpochInfo, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, L as LeaderReceipt, M as MethodDescription, N as Network, P as PendingDeposit, F as PendingWithdrawal, a1 as SetIdentityOptions, a0 as SetOperatorOptions, y as SnapSource, J as StakeInfo, a5 as StakingActions, z as StakingContract, Q as StakingTransactionResult, k as TransactionHash, x as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, w as TransactionType, _ as ValidatorClaimOptions, Y as ValidatorDepositOptions, Z as ValidatorExitOptions, B as ValidatorIdentity, E as ValidatorInfo, X as ValidatorJoinOptions, R 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-ZDqJWXj0.js';
 export { G as GenLayerChain } from '../chains-B7B7UXdn.js';

package/package.json

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

package/src/abi/staking.ts

@@ -6,6 +6,9 @@ export const VALIDATOR_WALLET_ABI = [
   {name: "TransferFailed", type: "error", inputs: []},
   {name: "OperatorTransferNotReady", type: "error", inputs: []},
   {name: "NoPendingOperator", type: "error", inputs: []},
+  // OpenZeppelin Ownable errors
+  {name: "OwnableUnauthorizedAccount", type: "error", inputs: [{name: "account", type: "address"}]},
+  {name: "OwnableInvalidOwner", type: "error", inputs: [{name: "owner", type: "address"}]},
 
   // Functions
   {
@@ -69,6 +72,67 @@ export const VALIDATOR_WALLET_ABI = [
     ],
     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"}],
+  },
 ] as const;
 
 export const STAKING_ABI = [
@@ -250,6 +314,13 @@ export const STAKING_ABI = [
     inputs: [],
     outputs: [{name: "", type: "uint256"}],
   },
+  {
+    name: "finalized",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{name: "", type: "uint256"}],
+  },
   {
     name: "validatorMinStake",
     type: "function",
@@ -298,6 +369,7 @@ export const STAKING_ABI = [
           {name: "claimed", type: "uint256"},
           {name: "stakeDeposit", type: "uint256"},
           {name: "stakeWithdrawal", type: "uint256"},
+          {name: "slashed", type: "uint256"},
         ],
       },
     ],
@@ -322,6 +394,7 @@ export const STAKING_ABI = [
           {name: "claimed", type: "uint256"},
           {name: "stakeDeposit", type: "uint256"},
           {name: "stakeWithdrawal", type: "uint256"},
+          {name: "slashed", type: "uint256"},
         ],
       },
     ],
@@ -562,4 +635,53 @@ export const STAKING_ABI = [
       {name: "amount", type: "uint256", indexed: false},
     ],
   },
+  {
+    name: "ValidatorPrime",
+    type: "event",
+    inputs: [
+      {name: "validator", type: "address", indexed: false},
+      {name: "epoch", type: "uint256", indexed: false},
+      {name: "validatorRewards", type: "uint256", indexed: false},
+      {name: "delegatorRewards", type: "uint256", indexed: false},
+    ],
+  },
+  // External contracts getter
+  {
+    name: "contracts",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [
+      {name: "gen", type: "address"},
+      {name: "transactions", type: "address"},
+      {name: "idleness", type: "address"},
+      {name: "tribunal", type: "address"},
+      {name: "slashing", type: "address"},
+      {name: "consensus", type: "address"},
+      {name: "validatorWalletFactory", type: "address"},
+      {name: "nftMinter", type: "address"},
+    ],
+  },
+] as const;
+
+// Slash contract ABI for slashing events
+export const SLASH_ABI = [
+  {
+    name: "SlashedFromIdleness",
+    type: "event",
+    inputs: [
+      {name: "validator", type: "address", indexed: true},
+      {name: "txId", type: "bytes32", indexed: false},
+      {name: "epoch", type: "uint256", indexed: false},
+      {name: "percentage", type: "uint256", indexed: false},
+    ],
+  },
+  {
+    name: "SlashEnacted",
+    type: "event",
+    inputs: [
+      {name: "validator", type: "address", indexed: true},
+      {name: "epoch", type: "uint256", indexed: false},
+    ],
+  },
 ] as const;

package/src/client/client.ts

@@ -33,7 +33,7 @@ interface ClientConfig {
   provider?: EthereumProvider; // Custom provider for wallet framework integration
 }
 
-const getCustomTransportConfig = (config: ClientConfig) => {
+const getCustomTransportConfig = (config: ClientConfig, chainConfig: GenLayerChain) => {
   const isAddress = typeof config.account !== "object";
 
   return {
@@ -51,12 +51,8 @@ const getCustomTransportConfig = (config: ClientConfig) => {
       }
 
       {
-        if (!config.chain) {
-          throw new Error("Chain is not set");
-        }
-
         try {
-          const response = await fetch(config.chain.rpcUrls.default.http[0], {
+          const response = await fetch(chainConfig.rpcUrls.default.http[0], {
             method: "POST",
             headers: {
               "Content-Type": "application/json",
@@ -91,7 +87,7 @@ export const createClient = (config: ClientConfig = {chain: localnet}): GenLayer
     chainConfig.rpcUrls.default.http = [config.endpoint];
   }
 
-  const customTransport = custom(getCustomTransportConfig(config), {retryCount: 0, retryDelay: 0});
+  const customTransport = custom(getCustomTransportConfig(config, chainConfig as GenLayerChain), {retryCount: 0, retryDelay: 0});
   const publicClient = createPublicClient(chainConfig as GenLayerChain, customTransport).extend(
     publicActions,
   );

package/src/contracts/actions.ts

@@ -301,8 +301,8 @@ const _sendTransaction = async ({
   }
 
   const validatedSenderAccount = validateAccount(senderAccount);
-
   const nonce = await client.getCurrentNonce({address: validatedSenderAccount.address});
+
   let estimatedGas: bigint;
   try {
     estimatedGas = await client.estimateTransactionGas({
@@ -311,58 +311,77 @@ const _sendTransaction = async ({
       data: encodedData,
       value: value,
     });
-  } catch (error) {
-    console.warn("Gas estimation failed, using fallback value:", error);
+  } catch (err) {
+    console.error("Gas estimation failed, using default 200_000:", err);
     estimatedGas = 200_000n;
   }
-  const transactionRequest = await client.prepareTransactionRequest({
-    account: validatedSenderAccount,
-    to: client.chain.consensusMainContract?.address as Address,
-    data: encodedData,
-    type: "legacy",
-    nonce: Number(nonce),
-    value: value,
-    gas: estimatedGas,
-  });
 
-  if (validatedSenderAccount?.type !== "local") {
-    const formattedRequest = {
-      from: transactionRequest.from,
-      to: transactionRequest.to,
+  // For local accounts, build transaction request directly to avoid viem's
+  // prepareTransactionRequest which calls eth_fillTransaction (unsupported by GenLayer RPC)
+  if (validatedSenderAccount?.type === "local") {
+    if (!validatedSenderAccount?.signTransaction) {
+      throw new Error("Account does not support signTransaction");
+    }
+
+    const gasPriceHex = (await client.request({
+      method: "eth_gasPrice",
+    })) as string;
+
+    const transactionRequest = {
+      account: validatedSenderAccount,
+      to: client.chain.consensusMainContract?.address as Address,
       data: encodedData,
-      value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0",
-      gas: transactionRequest.gas ? `0x${transactionRequest.gas.toString(16)}` : "0x5208",
+      type: "legacy" as const,
+      nonce: Number(nonce),
+      value: value,
+      gas: estimatedGas,
+      gasPrice: BigInt(gasPriceHex),
+      chainId: client.chain.id,
     };
 
-    return await client.request({
-      method: "eth_sendTransaction",
-      params: [formattedRequest as any],
-    });
-  }
+    const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest);
+    const txHash = await client.sendRawTransaction({serializedTransaction: serializedTransaction});
+    const receipt = await publicClient.waitForTransactionReceipt({hash: txHash});
 
-  if (!validatedSenderAccount?.signTransaction) {
-    throw new Error("Account does not support signTransaction");
-  }
-
-  const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest);
+    if (receipt.status === "reverted") {
+      throw new Error("Transaction reverted");
+    }
 
-  const txHash = await client.sendRawTransaction({serializedTransaction: serializedTransaction});
+    const newTxEvents = parseEventLogs({
+      abi: client.chain.consensusMainContract?.abi as any,
+      eventName: "NewTransaction",
+      logs: receipt.logs,
+    }) as unknown as {args: {txId: `0x${string}`}}[];
 
-  const receipt = await publicClient.waitForTransactionReceipt({hash: txHash});
+    if (newTxEvents.length === 0) {
+      throw new Error("Transaction not processed by consensus");
+    }
 
-  if (receipt.status === "reverted") {
-    throw new Error("Transaction reverted");
+    return newTxEvents[0].args["txId"];
   }
 
-  const newTxEvents = parseEventLogs({
-    abi: client.chain.consensusMainContract?.abi as any,
-    eventName: "NewTransaction",
-    logs: receipt.logs,
-  }) as unknown as {args: {txId: `0x${string}`}}[];
+  // For external wallets (e.g., MetaMask via AppKit), use prepareTransactionRequest
+  // which will route eth_* calls through the provider
+  const transactionRequest = await client.prepareTransactionRequest({
+    account: validatedSenderAccount,
+    to: client.chain.consensusMainContract?.address as Address,
+    data: encodedData,
+    type: "legacy",
+    nonce: Number(nonce),
+    value: value,
+    gas: estimatedGas,
+  });
 
-  if (newTxEvents.length === 0) {
-    throw new Error("Transaction not processed by consensus");
-  }
+  const formattedRequest = {
+    from: transactionRequest.from,
+    to: transactionRequest.to,
+    data: encodedData,
+    value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0",
+    gas: transactionRequest.gas ? `0x${transactionRequest.gas.toString(16)}` : "0x5208",
+  };
 
-  return newTxEvents[0].args["txId"];
+  return await client.request({
+    method: "eth_sendTransaction",
+    params: [formattedRequest as any],
+  });
 };