@forevermoney/sdk 0.1.0 → 0.4.0

package/dist/index.js

@@ -1,11 +1,18 @@
 // src/core/addresses.ts
-import { isHex, u8aToHex } from "@polkadot/util";
 import {
-  decodeAddress,
-  encodeAddress,
-  evmToAddress
-} from "@polkadot/util-crypto";
-import { ZeroAddress, getAddress, isAddress } from "ethers";
+  AccountId,
+  Blake2256,
+  getSs58AddressInfo
+} from "@polkadot-api/substrate-bindings";
+import {
+  bytesToHex,
+  concat,
+  getAddress,
+  hexToBytes,
+  isAddress,
+  stringToBytes,
+  zeroAddress
+} from "viem";
 
 // src/core/errors.ts
 var ForeverMoneyError = class extends Error {
@@ -22,22 +29,33 @@ var ForeverMoneyError = class extends Error {
 // src/core/addresses.ts
 var BITTENSOR_SS58_PREFIX = 42;
 function normalizeEvmAddress(value) {
-  if (!isAddress(value) || value === ZeroAddress) {
+  const candidate = typeof value === "string" && /^0x[0-9A-F]{40}$/.test(value) ? value.toLowerCase() : value;
+  if (!isAddress(candidate) || candidate === zeroAddress) {
     throw new ForeverMoneyError(
       "INVALID_ADDRESS",
       "Expected a non-zero EVM address."
     );
   }
-  return getAddress(value);
+  return getAddress(candidate);
 }
 function evmToMirrorSS58(evmAddress) {
-  return evmToAddress(normalizeEvmAddress(evmAddress), BITTENSOR_SS58_PREFIX);
+  return AccountId(BITTENSOR_SS58_PREFIX).dec(
+    Blake2256(
+      concat([
+        stringToBytes("evm:"),
+        hexToBytes(normalizeEvmAddress(evmAddress))
+      ])
+    )
+  );
 }
 function decodeBittensorAddress(value) {
   try {
-    if (!value || isHex(value)) throw new Error("Raw hex is not SS58.");
-    const publicKey = decodeAddress(value, false, BITTENSOR_SS58_PREFIX);
-    if (publicKey.length !== 32) throw new Error("Invalid key length.");
+    if (typeof value !== "string" || !value || value.startsWith("0x"))
+      throw new Error("Raw hex is not SS58.");
+    const info = getSs58AddressInfo(value);
+    if (!info.isValid || info.ss58Format !== BITTENSOR_SS58_PREFIX || info.publicKey.length !== 32)
+      throw new Error("Invalid Bittensor address.");
+    const publicKey = info.publicKey;
     return publicKey;
   } catch {
     throw new ForeverMoneyError(
@@ -47,7 +65,7 @@ function decodeBittensorAddress(value) {
   }
 }
 function normalizeSS58(value) {
-  return encodeAddress(decodeBittensorAddress(value), BITTENSOR_SS58_PREFIX);
+  return AccountId(BITTENSOR_SS58_PREFIX).dec(decodeBittensorAddress(value));
 }
 function isBittensorSS58(value) {
   try {
@@ -58,14 +76,14 @@ function isBittensorSS58(value) {
   }
 }
 function ss58ToPublicKey(value) {
-  return u8aToHex(decodeBittensorAddress(value));
+  return bytesToHex(decodeBittensorAddress(value));
 }
 
 // src/core/amounts.ts
-import { MaxUint256, formatUnits, parseUnits } from "ethers";
+import { maxUint256, formatUnits, parseUnits } from "viem";
 
 // src/chains/deployment.ts
-import { getAddress as getAddress2 } from "ethers";
+import { getAddress as getAddress2 } from "viem";
 var BASE_CHAIN_ID = 8453;
 var ROBINHOOD_CHAIN_ID = 4663;
 var SUBTENSOR_CHAIN_ID = 964;
@@ -74,7 +92,8 @@ var ROBINHOOD_CCIP_SELECTOR = 6180753054346818345n;
 var SUBTENSOR_CCIP_SELECTOR = 2135107236357186872n;
 var RAO_PER_TAO = 1000000000n;
 var EVM_WEI_PER_RAO = 1000000000n;
-var FOREVERMONEY_DEPLOYMENT_VERSION = "1.1.0";
+var SN80_NETUID = 80n;
+var FOREVERMONEY_DEPLOYMENT_VERSION = "1.2.0";
 var foreverMoneyDeployment = Object.freeze({
   version: FOREVERMONEY_DEPLOYMENT_VERSION,
   base: Object.freeze({
@@ -83,10 +102,16 @@ var foreverMoneyDeployment = Object.freeze({
     chainId: BASE_CHAIN_ID,
     ccipSelector: BASE_CCIP_SELECTOR,
     contracts: Object.freeze({
-      gateway: getAddress2("0x5EF3d7D19e4b233a1A169DA0d5CB02ec6b160a2C"),
+      gateway: getAddress2("0x1da2415229b614C787e145D1D7346eb496319C52"),
+      legacyGateway: getAddress2(
+        "0x5EF3d7D19e4b233a1A169DA0d5CB02ec6b160a2C"
+      ),
       wrappedTao: getAddress2(
         "0xf3081494b87e8d5fb7960f066e931d1d0e6e3d67"
       ),
+      wrappedSn80: getAddress2(
+        "0x6f63d869011f95274498023b4abfc00b30c34378"
+      ),
       ccipRouter: getAddress2(
         "0x881e3A65B4d4a04dD529061dd0071cf975F58bCD"
       ),
@@ -112,7 +137,10 @@ var foreverMoneyDeployment = Object.freeze({
     chainId: ROBINHOOD_CHAIN_ID,
     ccipSelector: ROBINHOOD_CCIP_SELECTOR,
     contracts: Object.freeze({
-      gateway: getAddress2("0x53Dcc4FE04193e489BE537F722F65317DB1E65d8"),
+      gateway: getAddress2("0xf27fdA637131E25B2A1b4865ED9597d881980c7E"),
+      legacyGateway: getAddress2(
+        "0x53Dcc4FE04193e489BE537F722F65317DB1E65d8"
+      ),
       wrappedTao: getAddress2(
         "0xf3081494B87e8D5fb7960f066E931D1D0e6E3d67"
       ),
@@ -128,13 +156,19 @@ var foreverMoneyDeployment = Object.freeze({
     chainId: SUBTENSOR_CHAIN_ID,
     ccipSelector: SUBTENSOR_CCIP_SELECTOR,
     contracts: Object.freeze({
-      gateway: getAddress2("0x998f20Fea90bF7792774dECc7f994716442B1705"),
+      gateway: getAddress2("0xcd0C6d98D0A126B1c113d15b4c28F38321437787"),
+      legacyGateway: getAddress2(
+        "0x998f20Fea90bF7792774dECc7f994716442B1705"
+      ),
       alphaVault: getAddress2(
         "0x11837459896D96F821a8D88eC93a3C8D152033D4"
       ),
       wrappedTao: getAddress2(
         "0xC5b6C1632d34901239396F5E1BDe54B342900256"
       ),
+      wrappedSn80: getAddress2(
+        "0xfD628dE75EF96f0A5C59659159C6cA81E0DC2222"
+      ),
       ccipRouter: getAddress2(
         "0xD941fBEcD2b971d0F54b4C34286C95faB52B60B8"
       ),
@@ -203,7 +237,7 @@ function assertWholeRao(amountWei) {
       "The amount cannot be negative."
     );
   }
-  if (amountWei > MaxUint256) {
+  if (amountWei > maxUint256) {
     throw new ForeverMoneyError(
       "INVALID_TRANSACTION_PLAN",
       "The amount exceeds uint256."
@@ -229,7 +263,7 @@ function formatTaoAmount(amountWei) {
       "A TAO amount cannot be negative."
     );
   }
-  if (amountWei > MaxUint256) {
+  if (amountWei > maxUint256) {
     throw new ForeverMoneyError(
       "INVALID_TRANSACTION_PLAN",
       "The TAO amount exceeds uint256."
@@ -241,7 +275,8 @@ function formatTaoAmount(amountWei) {
       "TAO amounts must resolve to a whole RAO."
     );
   }
-  return formatUnits(amountWei, 18);
+  const formatted = formatUnits(amountWei, 18);
+  return formatted.includes(".") ? formatted : `${formatted}.0`;
 }
 function mulDivCeil(value, numerator, denominator) {
   return (value * numerator + denominator - 1n) / denominator;
@@ -264,7 +299,7 @@ function feeWithBuffer(fee) {
     BASIS_POINTS + NETWORK_FEE_BUFFER_BPS,
     BASIS_POINTS
   );
-  if (buffered > MaxUint256) {
+  if (buffered > maxUint256) {
     throw new ForeverMoneyError(
       "INVALID_TRANSACTION_PLAN",
       "The buffered network fee exceeds uint256."
@@ -290,7 +325,7 @@ function gasLimitWithBuffer(gasLimit) {
     BASIS_POINTS + GAS_LIMIT_BUFFER_BPS,
     BASIS_POINTS
   );
-  if (buffered > MaxUint256) {
+  if (buffered > maxUint256) {
     throw new ForeverMoneyError(
       "INVALID_TRANSACTION_PLAN",
       "The buffered gas limit exceeds uint256."
@@ -314,23 +349,34 @@ var SPOKE_GATEWAY_ABI = Object.freeze([
   "function ROUTER() view returns (address)",
   "function BITTENSOR_SELECTOR() view returns (uint64)",
   "function SUBTENSOR_GATEWAY() view returns (address)",
+  "function maxIntegratorFeeBps() view returns (uint16)",
+  "function bridgeFeeBps() view returns (uint16)",
   "function quoteBridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit) view returns (uint256 fee)",
   "function bridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit) payable returns (bytes32 messageId)",
+  "function quoteBridgeToFinneyWithFee(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit,uint256 gasLimit,(address recipient,uint16 bps) integrator) view returns (uint256 fee,uint256 cut,uint256 amountCrossing)",
+  "function bridgeToFinneyWithFee(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit,uint256 gasLimit,(address recipient,uint16 bps) integrator) payable returns (bytes32 messageId)",
   "event BridgedToFinney(address indexed token,address indexed sender,bytes32 indexed ss58,uint256 amount,bytes32 messageId)"
 ]);
 var ALPHA_GATEWAY_ABI = Object.freeze([
   "function ROUTER() view returns (address)",
   "function allowedLane(uint64 selector) view returns (bool)",
+  "function maxIntegratorFeeBps() view returns (uint16)",
+  "function bridgeFeeBps() view returns (uint16)",
+  "function integratorTaoTopUp(uint256 taoAmount,uint16 bps) pure returns (uint256)",
   "function quoteBridgeOut(uint64 destSelector,address token,address recipient,uint256 mintedAmount) view returns (uint256 fee)",
   "function bridgeOut(uint64 destSelector,address token,address recipient,uint256 taoAmount,uint256 stakedAlphaRao,uint256 minTokenOut) payable returns (bytes32 messageId)",
+  "function integratorCut(uint256 amount,uint16 bps) pure returns (uint256)",
+  "function quoteBridgeOutWithFee(uint64 destSelector,address token,address recipient,uint256 mintedAmount,uint256 taoAmount,uint256 stakedAlphaRao,(address recipient,uint16 bps) integrator) view returns (uint256 fee,uint256 nativeTopUp,uint256 alphaTopUp,uint256 amountCrossing)",
+  "function bridgeOutWithFee(uint64 destSelector,address token,address recipient,uint256 taoAmount,uint256 stakedAlphaRao,uint256 minTokenOut,(address recipient,uint16 bps) integrator) payable returns (bytes32 messageId)",
   "function claimLiquid(address token,uint256 minTaoOut,address to)",
   "function claimNative(address to)",
   "function claimStaked(address token,bytes32 destColdkey,address to)",
   "function claimToken(address token,address to)",
   "function claimableNative(address account) view returns (uint256)",
-  "function claimableToken(address account,address token) view returns (uint256)",
+  "function claimableToken(address token,address account) view returns (uint256)",
   "event BridgedOut(uint64 destChainSelector,address indexed token,address indexed sender,address indexed recipient,uint256 minted,bytes32 messageId)",
   "event Claimable(address indexed token,address indexed user,uint256 native,uint256 wsn)",
+  "event NotDelivered(uint64 indexed sourceChainSelector,address indexed token,uint256 amount,uint8 reason)",
   "event DeliveredLiquid(address indexed token,bytes32 indexed ss58,uint256 taoOut)",
   "event DeliveredStaked(address indexed token,bytes32 indexed ss58,uint256 alphaRao)"
 ]);
@@ -374,10 +420,10 @@ var foreverMoneyAbis = Object.freeze({
 });
 
 // src/bridge/plans.ts
-import { Contract, Interface } from "ethers";
+import { encodeFunctionData, parseAbi } from "viem";
 
 // src/core/plans.ts
-import { keccak256, toUtf8Bytes } from "ethers";
+import { keccak256, stringToBytes as stringToBytes2 } from "viem";
 function createTransactionPlan(plan) {
   const steps = plan.steps.map(
     (step2) => Object.freeze({
@@ -394,12 +440,12 @@ function createTransactionPlan(plan) {
   };
   return Object.freeze({
     ...versionedPlan,
-    hash: keccak256(toUtf8Bytes(JSON.stringify(versionedPlan)))
+    hash: keccak256(stringToBytes2(JSON.stringify(versionedPlan)))
   });
 }
 
 // src/core/validation.ts
-import { MaxUint256 as MaxUint2562, ZeroHash, isHexString } from "ethers";
+import { maxUint256 as maxUint2562, zeroHash, isHex } from "viem";
 function assertBigInt(amount, label) {
   if (typeof amount !== "bigint") {
     throw new ForeverMoneyError(
@@ -422,7 +468,7 @@ function assertPositiveAmount(amount, label) {
       `${label} cannot be negative.`
     );
   }
-  if (amount > MaxUint2562) {
+  if (amount > maxUint2562) {
     throw new ForeverMoneyError(
       "INVALID_TRANSACTION_PLAN",
       `${label} exceeds uint256.`
@@ -437,7 +483,7 @@ function assertNonNegativeAmount(amount, label) {
       `${label} cannot be negative.`
     );
   }
-  if (amount > MaxUint2562) {
+  if (amount > maxUint2562) {
     throw new ForeverMoneyError(
       "INVALID_TRANSACTION_PLAN",
       `${label} exceeds uint256.`
@@ -469,7 +515,7 @@ function assertRecord(value, label) {
   }
 }
 function normalizeBytes32(value, label) {
-  if (!isHexString(value, 32)) {
+  if (!isHex(value, { strict: true }) || value.length !== 66) {
     throw new ForeverMoneyError(
       "INVALID_BYTES32",
       `${label} must be a 32-byte hex value.`
@@ -478,16 +524,111 @@ function normalizeBytes32(value, label) {
   return value.toLowerCase();
 }
 function normalizeOptionalBytes32(value, label) {
-  return value === void 0 ? ZeroHash : normalizeBytes32(value, label);
+  return value === void 0 ? zeroHash : normalizeBytes32(value, label);
 }
 
 // src/bridge/plans.ts
-var erc20Interface = new Interface(ERC20_ABI);
-var spokeInterface = new Interface(SPOKE_GATEWAY_ABI);
-var alphaInterface = new Interface(ALPHA_GATEWAY_ABI);
-var stakingInterface = new Interface(STAKING_ABI);
+var erc20Abi = parseAbi(ERC20_ABI);
+var spokeAbi = parseAbi(SPOKE_GATEWAY_ABI);
+var alphaAbi = parseAbi(ALPHA_GATEWAY_ABI);
+var stakingAbi = parseAbi(STAKING_ABI);
 var MIN_LIQUID_EVM_TO_SUBTENSOR_WEI = 10000000000000000n;
 var MIN_LIQUID_BASE_TO_SUBTENSOR_WEI = MIN_LIQUID_EVM_TO_SUBTENSOR_WEI;
+var MIN_LIQUID_SUBTENSOR_TO_EVM_WEI = 2000000n * EVM_WEI_PER_RAO;
+var MAX_PARTNER_FEE_BPS = 1e4;
+var NO_PARTNER_FEE = {
+  recipient: "0x0000000000000000000000000000000000000000",
+  bps: 0
+};
+function resolvePartnerFee(fee, gateway) {
+  if (fee === void 0) return NO_PARTNER_FEE;
+  if (typeof fee.bps !== "number" || !Number.isInteger(fee.bps) || fee.bps < 0 || fee.bps > MAX_PARTNER_FEE_BPS) {
+    throw new ForeverMoneyError(
+      "INVALID_PARTNER_FEE",
+      `Partner fee bps must be an integer between 0 and ${MAX_PARTNER_FEE_BPS}.`,
+      { bps: fee.bps }
+    );
+  }
+  if (fee.bps === 0) return NO_PARTNER_FEE;
+  const recipient = normalizeEvmAddress(fee.recipient);
+  if (recipient === NO_PARTNER_FEE.recipient || recipient.toLowerCase() === gateway.toLowerCase()) {
+    throw new ForeverMoneyError(
+      "INVALID_PARTNER_FEE",
+      "Partner fee recipient must not be the zero address or the gateway.",
+      { recipient }
+    );
+  }
+  return { recipient, bps: fee.bps };
+}
+function partnerFeeCut(amount, bps) {
+  return amount * BigInt(bps) / 10000n;
+}
+function partnerFeeTaoTopUp(taoAmount, bps) {
+  const raw = partnerFeeCut(taoAmount, bps);
+  if (raw === 0n) return 0n;
+  return (raw + EVM_WEI_PER_RAO - 1n) / EVM_WEI_PER_RAO * EVM_WEI_PER_RAO;
+}
+function assertPartnerFeeAllowed(fee, maxBps) {
+  if (fee.bps > maxBps) {
+    throw new ForeverMoneyError(
+      "INVALID_PARTNER_FEE",
+      `Partner fee of ${fee.bps} bps exceeds the gateway maximum of ${maxBps} bps.`,
+      { bps: fee.bps, maxBps }
+    );
+  }
+}
+function bridgeAsset(evmChain, asset = "tao") {
+  if (asset !== "tao" && asset !== "sn80") {
+    throw new ForeverMoneyError(
+      "INVALID_TRANSACTION_PLAN",
+      'Asset must be "tao" or "sn80".'
+    );
+  }
+  if (asset === "sn80" && evmChain !== "base") {
+    throw new ForeverMoneyError(
+      "INVALID_TRANSACTION_PLAN",
+      "SN80 bridging is supported between Base and Subtensor."
+    );
+  }
+  const evm = getForeverMoneyEvmDeployment(evmChain);
+  return asset === "sn80" ? {
+    evmToken: foreverMoneyDeployment.base.contracts.wrappedSn80,
+    subtensorToken: foreverMoneyDeployment.subtensor.contracts.wrappedSn80,
+    label: "SN80",
+    wrappedLabel: "SN80"
+  } : {
+    evmToken: evm.contracts.wrappedTao,
+    subtensorToken: foreverMoneyDeployment.subtensor.contracts.wrappedTao,
+    label: "TAO",
+    wrappedLabel: "wrapped TAO"
+  };
+}
+function assertAssetMode(asset, mode) {
+  if (asset === "sn80" && mode !== "staked") {
+    throw new ForeverMoneyError(
+      "INVALID_TRANSACTION_PLAN",
+      "SN80 bridging requires staked subnet 80 input or delivery; liquid TAO conversion is not supported."
+    );
+  }
+}
+function sourceNetuid(input) {
+  if (input.source !== "staked") return void 0;
+  const netuid = input.netuid ?? (input.asset === "sn80" ? SN80_NETUID : void 0);
+  if (netuid === void 0) {
+    throw new ForeverMoneyError(
+      "INVALID_TRANSACTION_PLAN",
+      "A netuid is required when bridging staked TAO."
+    );
+  }
+  assertNonNegativeAmount(netuid, "netuid");
+  if (input.asset === "sn80" && netuid !== SN80_NETUID) {
+    throw new ForeverMoneyError(
+      "INVALID_TRANSACTION_PLAN",
+      "SN80 staking approvals must use netuid 80."
+    );
+  }
+  return netuid;
+}
 function assertDelivery(value) {
   if (value !== "liquid" && value !== "staked") {
     throw new ForeverMoneyError(
@@ -517,6 +658,19 @@ function assertBaseToSubtensorAmount(amountWei, delivery) {
     );
   }
 }
+function assertSubtensorToEvmAmount(amountWei, source) {
+  assertWholeRao(amountWei);
+  if (source === "liquid" && amountWei < MIN_LIQUID_SUBTENSOR_TO_EVM_WEI) {
+    throw new ForeverMoneyError(
+      "AMOUNT_BELOW_MINIMUM",
+      "Bridging liquid TAO from Subtensor requires at least 0.002 TAO.",
+      {
+        amountWei: amountWei.toString(),
+        minimumAmountWei: MIN_LIQUID_SUBTENSOR_TO_EVM_WEI.toString()
+      }
+    );
+  }
+}
 function transactionStep(kind, label, chainId, from, to, data, value, gasLimit) {
   return {
     kind,
@@ -531,9 +685,94 @@ function transactionStep(kind, label, chainId, from, to, data, value, gasLimit)
     }
   };
 }
+function partnerFeeSummary(charged, unit, fee) {
+  if (fee.bps === 0) return "";
+  return ` Partner fee: ${charged} wei of ${unit} (${fee.bps} bps) on top, paid to ${fee.recipient}.`;
+}
+function encodeSpokeBridge(token, amountWei, exit, fee) {
+  return fee.bps === 0 ? encodeFunctionData({
+    abi: spokeAbi,
+    functionName: "bridgeToFinney",
+    args: [token, amountWei, exit]
+  }) : encodeFunctionData({
+    abi: spokeAbi,
+    functionName: "bridgeToFinneyWithFee",
+    args: [token, amountWei, exit, 0n, fee]
+  });
+}
+function encodeHubBridge(destSelector, token, recipient, taoAmount, stakedAlphaRao, minTokenOut, fee) {
+  const args = [
+    destSelector,
+    token,
+    recipient,
+    taoAmount,
+    stakedAlphaRao,
+    minTokenOut
+  ];
+  return fee.bps === 0 ? encodeFunctionData({
+    abi: alphaAbi,
+    functionName: "bridgeOut",
+    args
+  }) : encodeFunctionData({
+    abi: alphaAbi,
+    functionName: "bridgeOutWithFee",
+    args: [...args, fee]
+  });
+}
+async function quoteSpokeWithFee(provider, gateway, token, amountWei, exit, fee) {
+  const maxBps = await provider.readContract({
+    address: gateway,
+    abi: spokeAbi,
+    functionName: "maxIntegratorFeeBps"
+  });
+  assertPartnerFeeAllowed(fee, maxBps);
+  const [networkFee] = await provider.readContract({
+    address: gateway,
+    abi: spokeAbi,
+    functionName: "quoteBridgeToFinneyWithFee",
+    args: [token, amountWei, exit, 0n, fee]
+  });
+  return networkFee;
+}
+async function quoteHubWithFee(provider, gateway, destSelector, token, recipient, mintedAmount, taoAmount, stakedAlphaRao, fee) {
+  const maxBps = await provider.readContract({
+    address: gateway,
+    abi: alphaAbi,
+    functionName: "maxIntegratorFeeBps"
+  });
+  assertPartnerFeeAllowed(fee, maxBps);
+  const [networkFee, taoTopUp, alphaTopUpRao, crossing] = await provider.readContract({
+    address: gateway,
+    abi: alphaAbi,
+    functionName: "quoteBridgeOutWithFee",
+    args: [
+      destSelector,
+      token,
+      recipient,
+      mintedAmount,
+      taoAmount,
+      stakedAlphaRao,
+      fee
+    ]
+  });
+  if (crossing !== mintedAmount || taoTopUp !== partnerFeeTaoTopUp(taoAmount, fee.bps) || alphaTopUpRao !== partnerFeeCut(stakedAlphaRao, fee.bps)) {
+    throw new ForeverMoneyError(
+      "INVALID_PROVIDER_RESPONSE",
+      "The gateway partner fee quote does not match the SDK fee calculation.",
+      {
+        crossing: crossing.toString(),
+        taoTopUp: taoTopUp.toString(),
+        alphaTopUpRao: alphaTopUpRao.toString()
+      }
+    );
+  }
+  return { networkFee, taoTopUp, alphaTopUpRao };
+}
 function buildEvmToSubtensorPlan(input) {
   const sender = normalizeEvmAddress(input.sender);
+  const asset = bridgeAsset(input.evmChain, input.asset);
   assertDelivery(input.delivery);
+  assertAssetMode(input.asset, input.delivery);
   assertBaseToSubtensorAmount(input.amountWei, input.delivery);
   assertNonNegativeAmount(input.allowanceWei, "Token allowance");
   assertNonNegativeAmount(input.exactNetworkFeeWei, "Network fee");
@@ -545,19 +784,25 @@ function buildEvmToSubtensorPlan(input) {
     minTaoOut: input.amountWei
   };
   const evm = getForeverMoneyEvmDeployment(input.evmChain);
+  const partnerFee = resolvePartnerFee(
+    input.partnerFee,
+    evm.contracts.gateway
+  );
+  const cut = partnerFeeCut(input.amountWei, partnerFee.bps);
   const steps = [];
-  if (input.allowanceWei < input.amountWei) {
+  if (input.allowanceWei < input.amountWei + cut) {
     steps.push(
       transactionStep(
         "approval",
-        "Approve wrapped TAO for the ForeverMoney gateway",
+        `Approve ${asset.wrappedLabel} for the ForeverMoney gateway`,
         evm.chainId,
         sender,
-        evm.contracts.wrappedTao,
-        erc20Interface.encodeFunctionData("approve", [
-          evm.contracts.gateway,
-          input.amountWei
-        ]),
+        asset.evmToken,
+        encodeFunctionData({
+          abi: erc20Abi,
+          functionName: "approve",
+          args: [evm.contracts.gateway, input.amountWei + cut]
+        }),
         0n
       )
     );
@@ -566,13 +811,15 @@ function buildEvmToSubtensorPlan(input) {
   steps.push(
     transactionStep(
       "transaction",
-      `Bridge wrapped TAO from ${evm.name} to Subtensor (${input.delivery})`,
+      `Bridge ${asset.wrappedLabel} from ${evm.name} to Subtensor (${input.delivery})`,
       evm.chainId,
       sender,
       evm.contracts.gateway,
-      spokeInterface.encodeFunctionData(
-        "bridgeToFinney(address,uint256,(bytes32,address,bool,uint256))",
-        [evm.contracts.wrappedTao, input.amountWei, exit]
+      encodeSpokeBridge(
+        asset.evmToken,
+        input.amountWei,
+        exit,
+        partnerFee
       ),
       value,
       input.estimatedBridgeGas === void 0 ? void 0 : gasLimitWithBuffer(input.estimatedBridgeGas)
@@ -580,7 +827,7 @@ function buildEvmToSubtensorPlan(input) {
   );
   return createTransactionPlan({
     action: evm.key === "base" ? "bridge.base-to-subtensor" : "bridge.robinhood-to-subtensor",
-    summary: `Bridge ${input.amountWei} wei of wrapped TAO from ${evm.name} to ${destination}.`,
+    summary: `Bridge ${input.amountWei} wei of ${asset.wrappedLabel} from ${evm.name} to ${destination}.${partnerFeeSummary(cut, asset.wrappedLabel, partnerFee)}`,
     steps
   });
 }
@@ -590,21 +837,23 @@ function buildBaseToSubtensorPlan(input) {
 function buildSubtensorToEvmPlan(input) {
   const sender = normalizeEvmAddress(input.sender);
   const recipient = normalizeEvmAddress(input.recipient);
+  const asset = bridgeAsset(input.evmChain, input.asset);
   assertSource(input.source);
-  assertWholeRao(input.amountWei);
+  assertAssetMode(input.asset, input.source);
+  const netuid = sourceNetuid(input);
+  assertSubtensorToEvmAmount(input.amountWei, input.source);
   assertNonNegativeAmount(input.exactNetworkFeeWei, "Network fee");
   const { subtensor } = foreverMoneyDeployment;
   const evm = getForeverMoneyEvmDeployment(input.evmChain);
+  const partnerFee = resolvePartnerFee(
+    input.partnerFee,
+    subtensor.contracts.gateway
+  );
   const amountRao = input.amountWei / EVM_WEI_PER_RAO;
+  const alphaTopUpRao = input.source === "staked" ? partnerFeeCut(amountRao, partnerFee.bps) : 0n;
+  const taoTopUp = input.source === "liquid" ? partnerFeeTaoTopUp(input.amountWei, partnerFee.bps) : 0n;
   const steps = [];
   if (input.source === "staked") {
-    if (input.netuid === void 0) {
-      throw new ForeverMoneyError(
-        "INVALID_TRANSACTION_PLAN",
-        "A netuid is required when bridging staked TAO."
-      );
-    }
-    assertNonNegativeAmount(input.netuid, "netuid");
     if (input.stakingAllowanceRao === void 0) {
       throw new ForeverMoneyError(
         "INVALID_TRANSACTION_PLAN",
@@ -612,19 +861,23 @@ function buildSubtensorToEvmPlan(input) {
       );
     }
     assertNonNegativeAmount(input.stakingAllowanceRao, "Staking allowance");
-    if (input.stakingAllowanceRao < amountRao) {
+    if (input.stakingAllowanceRao < amountRao + alphaTopUpRao) {
       steps.push(
         transactionStep(
           "approval",
-          "Approve staked TAO for the ForeverMoney gateway",
+          `Approve staked ${asset.label} for the ForeverMoney gateway`,
           subtensor.chainId,
           sender,
           subtensor.contracts.stakingPrecompile,
-          stakingInterface.encodeFunctionData("approve", [
-            subtensor.contracts.gateway,
-            input.netuid,
-            amountRao
-          ]),
+          encodeFunctionData({
+            abi: stakingAbi,
+            functionName: "approve",
+            args: [
+              subtensor.contracts.gateway,
+              netuid,
+              amountRao + alphaTopUpRao
+            ]
+          }),
           0n
         )
       );
@@ -637,30 +890,35 @@ function buildSubtensorToEvmPlan(input) {
   }
   const taoAmount = input.source === "liquid" ? input.amountWei : 0n;
   const stakedAlphaRao = input.source === "staked" ? amountRao : 0n;
-  const value = taoAmount + feeWithBuffer(input.exactNetworkFeeWei);
+  const value = taoAmount + taoTopUp + feeWithBuffer(input.exactNetworkFeeWei);
   assertNonNegativeAmount(value, "Transaction value");
   steps.push(
     transactionStep(
       "transaction",
-      `Bridge ${input.source} TAO from Subtensor to ${evm.name}`,
+      `Bridge ${input.source} ${asset.label} from Subtensor to ${evm.name}`,
       subtensor.chainId,
       sender,
       subtensor.contracts.gateway,
-      alphaInterface.encodeFunctionData("bridgeOut", [
+      encodeHubBridge(
         evm.ccipSelector,
-        subtensor.contracts.wrappedTao,
+        asset.subtensorToken,
         recipient,
         taoAmount,
         stakedAlphaRao,
-        input.amountWei
-      ]),
+        input.amountWei,
+        partnerFee
+      ),
       value,
       input.estimatedBridgeGas === void 0 ? void 0 : gasLimitWithBuffer(input.estimatedBridgeGas)
     )
   );
   return createTransactionPlan({
     action: evm.key === "base" ? "bridge.subtensor-to-base" : "bridge.subtensor-to-robinhood",
-    summary: `Bridge ${input.amountWei} wei of ${input.source} TAO from Subtensor to ${recipient} on ${evm.name}.`,
+    summary: `Bridge ${input.amountWei} wei of ${input.source} ${asset.label} from Subtensor to ${recipient} on ${evm.name}.${partnerFeeSummary(
+      input.source === "liquid" ? taoTopUp : alphaTopUpRao * EVM_WEI_PER_RAO,
+      input.source === "liquid" ? "TAO" : `staked ${asset.label}`,
+      partnerFee
+    )}`,
     steps
   });
 }
@@ -669,7 +927,9 @@ function buildSubtensorToBasePlan(input) {
 }
 async function prepareEvmToSubtensor(provider, input) {
   const sender = normalizeEvmAddress(input.sender);
+  const asset = bridgeAsset(input.evmChain, input.asset);
   assertDelivery(input.delivery);
+  assertAssetMode(input.asset, input.delivery);
   assertBaseToSubtensorAmount(input.amountWei, input.delivery);
   const destination = normalizeSS58(input.destination);
   const evm = getForeverMoneyEvmDeployment(input.evmChain);
@@ -679,29 +939,42 @@ async function prepareEvmToSubtensor(provider, input) {
     wantLiquid: input.delivery === "liquid",
     minTaoOut: input.amountWei
   };
-  const token = new Contract(evm.contracts.wrappedTao, ERC20_ABI, provider);
-  const gateway = new Contract(
-    evm.contracts.gateway,
-    SPOKE_GATEWAY_ABI,
-    provider
+  const partnerFee = resolvePartnerFee(
+    input.partnerFee,
+    evm.contracts.gateway
   );
+  const cut = partnerFeeCut(input.amountWei, partnerFee.bps);
   const [allowanceWei, exactNetworkFeeWei] = await Promise.all([
-    token.getFunction("allowance")(
-      sender,
-      evm.contracts.gateway
-    ),
-    gateway.getFunction(
-      "quoteBridgeToFinney(address,uint256,(bytes32,address,bool,uint256))"
-    )(evm.contracts.wrappedTao, input.amountWei, exit)
+    provider.readContract({
+      address: asset.evmToken,
+      abi: erc20Abi,
+      functionName: "allowance",
+      args: [sender, evm.contracts.gateway]
+    }),
+    partnerFee.bps === 0 ? provider.readContract({
+      address: evm.contracts.gateway,
+      abi: spokeAbi,
+      functionName: "quoteBridgeToFinney",
+      args: [asset.evmToken, input.amountWei, exit]
+    }) : quoteSpokeWithFee(
+      provider,
+      evm.contracts.gateway,
+      asset.evmToken,
+      input.amountWei,
+      exit,
+      partnerFee
+    )
   ]);
   let estimatedBridgeGas;
-  if (allowanceWei >= input.amountWei) {
-    const data = spokeInterface.encodeFunctionData(
-      "bridgeToFinney(address,uint256,(bytes32,address,bool,uint256))",
-      [evm.contracts.wrappedTao, input.amountWei, exit]
+  if (allowanceWei >= input.amountWei + cut) {
+    const data = encodeSpokeBridge(
+      asset.evmToken,
+      input.amountWei,
+      exit,
+      partnerFee
     );
     estimatedBridgeGas = await provider.estimateGas({
-      from: sender,
+      account: sender,
       to: evm.contracts.gateway,
       data,
       value: feeWithBuffer(exactNetworkFeeWei)
@@ -716,6 +989,7 @@ async function prepareEvmToSubtensor(provider, input) {
   return Object.freeze({
     exactNetworkFeeWei,
     transactionValueWei: feeWithBuffer(exactNetworkFeeWei),
+    partnerFeeWei: cut,
     plan
   });
 }
@@ -725,58 +999,67 @@ function prepareBaseToSubtensor(provider, input) {
 async function prepareSubtensorToEvm(provider, input) {
   const sender = normalizeEvmAddress(input.sender);
   const recipient = normalizeEvmAddress(input.recipient);
+  const asset = bridgeAsset(input.evmChain, input.asset);
   assertSource(input.source);
-  assertWholeRao(input.amountWei);
+  assertAssetMode(input.asset, input.source);
+  const netuid = sourceNetuid(input);
+  assertSubtensorToEvmAmount(input.amountWei, input.source);
   const { subtensor } = foreverMoneyDeployment;
   const evm = getForeverMoneyEvmDeployment(input.evmChain);
-  const gateway = new Contract(
-    subtensor.contracts.gateway,
-    ALPHA_GATEWAY_ABI,
-    provider
+  const partnerFee = resolvePartnerFee(
+    input.partnerFee,
+    subtensor.contracts.gateway
   );
-  const exactNetworkFeeWei = await gateway.getFunction("quoteBridgeOut")(
+  const taoAmount = input.source === "liquid" ? input.amountWei : 0n;
+  const stakedAlphaRao = input.source === "staked" ? input.amountWei / EVM_WEI_PER_RAO : 0n;
+  const exactNetworkFeeWei = partnerFee.bps === 0 ? await provider.readContract({
+    address: subtensor.contracts.gateway,
+    abi: alphaAbi,
+    functionName: "quoteBridgeOut",
+    args: [
+      evm.ccipSelector,
+      asset.subtensorToken,
+      recipient,
+      input.amountWei
+    ]
+  }) : (await quoteHubWithFee(
+    provider,
+    subtensor.contracts.gateway,
     evm.ccipSelector,
-    subtensor.contracts.wrappedTao,
+    asset.subtensorToken,
     recipient,
-    input.amountWei
-  );
+    input.amountWei,
+    taoAmount,
+    stakedAlphaRao,
+    partnerFee
+  )).networkFee;
   let stakingAllowanceRao;
   if (input.source === "staked") {
-    if (input.netuid === void 0) {
-      throw new ForeverMoneyError(
-        "INVALID_TRANSACTION_PLAN",
-        "A netuid is required when bridging staked TAO."
-      );
-    }
-    assertNonNegativeAmount(input.netuid, "netuid");
-    const staking = new Contract(
-      subtensor.contracts.stakingPrecompile,
-      STAKING_ABI,
-      provider
-    );
-    stakingAllowanceRao = await staking.getFunction("allowance")(
-      sender,
-      subtensor.contracts.gateway,
-      input.netuid
-    );
+    stakingAllowanceRao = await provider.readContract({
+      address: subtensor.contracts.stakingPrecompile,
+      abi: stakingAbi,
+      functionName: "allowance",
+      args: [sender, subtensor.contracts.gateway, netuid]
+    });
   }
-  const taoAmount = input.source === "liquid" ? input.amountWei : 0n;
-  const stakedAlphaRao = input.source === "staked" ? input.amountWei / EVM_WEI_PER_RAO : 0n;
-  const value = taoAmount + feeWithBuffer(exactNetworkFeeWei);
+  const alphaTopUpRao = partnerFeeCut(stakedAlphaRao, partnerFee.bps);
+  const taoTopUp = partnerFeeTaoTopUp(taoAmount, partnerFee.bps);
+  const value = taoAmount + taoTopUp + feeWithBuffer(exactNetworkFeeWei);
   assertNonNegativeAmount(value, "Transaction value");
   let estimatedBridgeGas;
-  if (input.source === "liquid" || stakingAllowanceRao !== void 0 && stakingAllowanceRao >= stakedAlphaRao) {
+  if (input.source === "liquid" || stakingAllowanceRao !== void 0 && stakingAllowanceRao >= stakedAlphaRao + alphaTopUpRao) {
     estimatedBridgeGas = await provider.estimateGas({
-      from: sender,
+      account: sender,
       to: subtensor.contracts.gateway,
-      data: alphaInterface.encodeFunctionData("bridgeOut", [
+      data: encodeHubBridge(
         evm.ccipSelector,
-        subtensor.contracts.wrappedTao,
+        asset.subtensorToken,
         recipient,
         taoAmount,
         stakedAlphaRao,
-        input.amountWei
-      ]),
+        input.amountWei,
+        partnerFee
+      ),
       value
     });
   }
@@ -789,6 +1072,7 @@ async function prepareSubtensorToEvm(provider, input) {
   return Object.freeze({
     exactNetworkFeeWei,
     transactionValueWei: value,
+    partnerFeeWei: input.source === "liquid" ? taoTopUp : alphaTopUpRao * EVM_WEI_PER_RAO,
     plan
   });
 }
@@ -797,7 +1081,7 @@ function prepareSubtensorToBase(provider, input) {
 }
 
 // src/core/transport.ts
-import { BrowserProvider } from "ethers";
+import { createPublicClient, custom } from "viem";
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -916,10 +1200,42 @@ function providerFromTransport(transport) {
       "An EIP-1193-compatible RPC transport is required."
     );
   }
-  return new BrowserProvider(transport);
+  return createPublicClient({
+    transport: custom(transport, { retryCount: 0 }),
+    cacheTime: 0,
+    batch: { multicall: false }
+  });
+}
+function trackingClient(provider) {
+  if (provider && "getChainId" in provider && typeof provider.getChainId === "function")
+    return provider;
+  if (provider && "send" in provider && typeof provider.send === "function") {
+    return providerFromTransport({
+      request: ({ method, params }) => {
+        if (params !== void 0 && !Array.isArray(params))
+          throw new ForeverMoneyError(
+            "RPC_ERROR",
+            "Tracking RPC params must be an array."
+          );
+        return provider.send(
+          method,
+          params === void 0 ? [] : [...params]
+        );
+      }
+    });
+  }
+  throw new ForeverMoneyError(
+    "MISSING_TRANSPORT",
+    "A viem public client or JSON-RPC provider is required."
+  );
 }
 
 // src/core/provider-errors.ts
+import {
+  BaseError,
+  ContractFunctionRevertedError,
+  ExecutionRevertedError
+} from "viem";
 function stringProperty(value, property) {
   if (typeof value !== "object" || value === null || !(property in value)) {
     return void 0;
@@ -932,9 +1248,13 @@ async function providerOperation(operation, action) {
     return await action();
   } catch (error) {
     if (error instanceof ForeverMoneyError) throw error;
-    const causeCode = stringProperty(error, "code");
-    const reason = stringProperty(error, "reason");
-    const reverted = causeCode === "CALL_EXCEPTION";
+    const revert = error instanceof BaseError ? error.walk(
+      (cause) => cause instanceof ContractFunctionRevertedError || cause instanceof ExecutionRevertedError
+    ) : void 0;
+    const viemRevert = revert instanceof ContractFunctionRevertedError || revert instanceof ExecutionRevertedError;
+    const causeCode = viemRevert ? revert.name : stringProperty(error, "code");
+    const reason = viemRevert ? revert instanceof ContractFunctionRevertedError ? revert.data?.errorName ?? revert.reason : void 0 : stringProperty(error, "reason");
+    const reverted = viemRevert || causeCode === "CALL_EXCEPTION";
     throw new ForeverMoneyError(
       reverted ? "SIMULATION_REVERTED" : "RPC_ERROR",
       reverted ? `${operation} reverted.` : `${operation} failed.`,
@@ -947,10 +1267,14 @@ async function providerOperation(operation, action) {
 }
 
 // src/vaults/plans.ts
-import { Contract as Contract2, Interface as Interface2, ZeroAddress as ZeroAddress2 } from "ethers";
-var erc20Interface2 = new Interface2(ERC20_ABI);
-var factoryInterface = new Interface2(VAULT_FACTORY_ABI);
-var managerInterface = new Interface2(VAULT_MANAGER_ABI);
+import {
+  encodeFunctionData as encodeFunctionData2,
+  parseAbi as parseAbi2,
+  zeroAddress as zeroAddress2
+} from "viem";
+var erc20Abi2 = parseAbi2(ERC20_ABI);
+var factoryAbi = parseAbi2(VAULT_FACTORY_ABI);
+var managerAbi = parseAbi2(VAULT_MANAGER_ABI);
 function step(kind, label, from, to, data, value = 0n) {
   return {
     kind,
@@ -1067,10 +1391,11 @@ function buildCreateVaultPlan(input) {
           `Approve ${stash.token} for the vault factory`,
           owner,
           stash.token,
-          erc20Interface2.encodeFunctionData("approve", [
-            base.contracts.vaultFactory,
-            stash.amount
-          ])
+          encodeFunctionData2({
+            abi: erc20Abi2,
+            functionName: "approve",
+            args: [base.contracts.vaultFactory, stash.amount]
+          })
         )
       );
     }
@@ -1081,15 +1406,19 @@ function buildCreateVaultPlan(input) {
       "Create ForeverMoney vault",
       owner,
       base.contracts.vaultFactory,
-      factoryInterface.encodeFunctionData("create", [
-        owner,
-        associatedMiner,
-        akAddress,
-        poolManager,
-        poolAddress,
-        positionManagerImplementation,
-        stashTokens
-      ]),
+      encodeFunctionData2({
+        abi: factoryAbi,
+        functionName: "create",
+        args: [
+          owner,
+          associatedMiner,
+          akAddress,
+          poolManager,
+          poolAddress,
+          positionManagerImplementation,
+          stashTokens
+        ]
+      }),
       value
     )
   );
@@ -1108,14 +1437,15 @@ async function prepareCreateVault(provider, input) {
   const allowances = await Promise.all(
     erc20Stash.map(async ({ token }) => ({
       token,
-      allowance: await new Contract2(
-        token,
-        ERC20_ABI,
-        provider
-      ).getFunction("allowance")(
-        owner,
-        foreverMoneyDeployment.base.contracts.vaultFactory
-      )
+      allowance: await provider.readContract({
+        address: token,
+        abi: erc20Abi2,
+        functionName: "allowance",
+        args: [
+          owner,
+          foreverMoneyDeployment.base.contracts.vaultFactory
+        ]
+      })
     }))
   );
   return buildCreateVaultPlan({ ...input, allowances });
@@ -1142,11 +1472,11 @@ function buildDepositVaultPlan(input) {
           "Deposit native ETH into the vault as WETH",
           owner,
           manager,
-          managerInterface.encodeFunctionData("topUpAk", [
-            akAddress,
-            ZeroAddress2,
-            deposit.amount
-          ]),
+          encodeFunctionData2({
+            abi: managerAbi,
+            functionName: "topUpAk",
+            args: [akAddress, zeroAddress2, deposit.amount]
+          }),
           deposit.amount
         )
       );
@@ -1166,10 +1496,11 @@ function buildDepositVaultPlan(input) {
           `Approve ${deposit.token} for the vault manager`,
           owner,
           deposit.token,
-          erc20Interface2.encodeFunctionData("approve", [
-            manager,
-            deposit.amount
-          ])
+          encodeFunctionData2({
+            abi: erc20Abi2,
+            functionName: "approve",
+            args: [manager, deposit.amount]
+          })
         )
       );
     }
@@ -1179,11 +1510,11 @@ function buildDepositVaultPlan(input) {
         `Deposit ${deposit.token} into the vault`,
         owner,
         manager,
-        managerInterface.encodeFunctionData("topUpAk", [
-          akAddress,
-          deposit.token,
-          deposit.amount
-        ])
+        encodeFunctionData2({
+          abi: managerAbi,
+          functionName: "topUpAk",
+          args: [akAddress, deposit.token, deposit.amount]
+        })
       )
     );
   }
@@ -1203,11 +1534,12 @@ async function prepareDepositVault(provider, input) {
   const allowances = await Promise.all(
     erc20Deposits.map(async ({ token }) => ({
       token,
-      allowance: await new Contract2(
-        token,
-        ERC20_ABI,
-        provider
-      ).getFunction("allowance")(owner, manager)
+      allowance: await provider.readContract({
+        address: token,
+        abi: erc20Abi2,
+        functionName: "allowance",
+        args: [owner, manager]
+      })
     }))
   );
   return buildDepositVaultPlan({ ...input, allowances });
@@ -1238,16 +1570,17 @@ function buildWithdrawVaultPlan(input) {
         "Withdraw assets from the vault",
         owner,
         manager,
-        managerInterface.encodeFunctionData(
-          "withdrawFromAkAndPositions",
-          [
+        encodeFunctionData2({
+          abi: managerAbi,
+          functionName: "withdrawFromAkAndPositions",
+          args: [
             akAddress,
             input.amount0,
             input.amount1,
             input.decreaseTokenIds,
             input.unwrapWeth
           ]
-        )
+        })
       )
     ]
   });
@@ -1265,9 +1598,11 @@ function buildClaimVaultFeesPlan(input) {
         "Claim vault fees",
         owner,
         manager,
-        managerInterface.encodeFunctionData("claimFees(address)", [
-          akAddress
-        ])
+        encodeFunctionData2({
+          abi: managerAbi,
+          functionName: "claimFees",
+          args: [akAddress]
+        })
       )
     ]
   });
@@ -1287,20 +1622,25 @@ function buildSetVaultStakingPlan(input) {
         `${input.staking ? "Stake" : "Unstake"} the vault position`,
         owner,
         manager,
-        managerInterface.encodeFunctionData(
-          `${action}(address,bytes)`,
-          [akAddress, "0x"]
-        )
+        encodeFunctionData2({
+          abi: managerAbi,
+          functionName: action,
+          args: [akAddress, "0x"]
+        })
       )
     ]
   });
 }
 
 // src/bridge/tracking.ts
-import { Interface as Interface4, toBeHex } from "ethers";
+import {
+  decodeEventLog as decodeEventLog2,
+  parseAbi as parseAbi4,
+  TransactionReceiptNotFoundError
+} from "viem";
 
 // src/bridge/receipts.ts
-import { Interface as Interface3, isHexString as isHexString2 } from "ethers";
+import { decodeEventLog, isHex as isHex2, parseAbi as parseAbi3 } from "viem";
 
 // src/core/receipts.ts
 function isLogFrom(log, address) {
@@ -1308,8 +1648,8 @@ function isLogFrom(log, address) {
 }
 
 // src/bridge/receipts.ts
-var alphaGatewayInterface = new Interface3(ALPHA_GATEWAY_ABI);
-var spokeGatewayInterface = new Interface3(SPOKE_GATEWAY_ABI);
+var alphaGatewayAbi = parseAbi3(ALPHA_GATEWAY_ABI);
+var spokeGatewayAbi = parseAbi3(SPOKE_GATEWAY_ABI);
 function assertBridgeDirection(value) {
   if (value !== "base-to-subtensor" && value !== "robinhood-to-subtensor" && value !== "subtensor-to-base" && value !== "subtensor-to-robinhood") {
     throw new ForeverMoneyError(
@@ -1332,20 +1672,28 @@ function bridgeMessageIdFromReceipt(direction, receipt) {
     evmChainFromBridgeDirection(direction)
   );
   const evmToSubtensor = isEvmToSubtensorDirection(direction);
-  const [address, contractInterface, eventName] = evmToSubtensor ? [evm.contracts.gateway, spokeGatewayInterface, "BridgedToFinney"] : [
-    foreverMoneyDeployment.subtensor.contracts.gateway,
-    alphaGatewayInterface,
+  const [addresses, contractAbi, eventName] = evmToSubtensor ? [
+    [evm.contracts.legacyGateway, evm.contracts.gateway],
+    spokeGatewayAbi,
+    "BridgedToFinney"
+  ] : [
+    [
+      foreverMoneyDeployment.subtensor.contracts.legacyGateway,
+      foreverMoneyDeployment.subtensor.contracts.gateway
+    ],
+    alphaGatewayAbi,
     "BridgedOut"
   ];
   for (const log of receipt.logs) {
-    if (!isLogFrom(log, address)) continue;
+    if (!addresses.some((address) => isLogFrom(log, address))) continue;
     try {
-      const parsed = contractInterface.parseLog({
+      const parsed = decodeEventLog({
+        abi: contractAbi,
         data: log.data,
         topics: [...log.topics]
       });
-      const messageId = parsed?.args.messageId;
-      if (parsed?.name === eventName && typeof messageId === "string" && isHexString2(messageId, 32) && (evmToSubtensor || parsed.args.destChainSelector === evm.ccipSelector)) {
+      const messageId = "messageId" in parsed.args ? parsed.args.messageId : void 0;
+      if (parsed.eventName === eventName && typeof messageId === "string" && isHex2(messageId, { strict: true }) && messageId.length === 66 && (evmToSubtensor || "destChainSelector" in parsed.args && parsed.args.destChainSelector === evm.ccipSelector)) {
         return messageId.toLowerCase();
       }
     } catch {
@@ -1355,8 +1703,8 @@ function bridgeMessageIdFromReceipt(direction, receipt) {
 }
 
 // src/bridge/tracking.ts
-var ccipExecutionInterface = new Interface4(CCIP_EXECUTION_ABI);
-var alphaGatewayInterface2 = new Interface4(ALPHA_GATEWAY_ABI);
+var ccipExecutionAbi = parseAbi4(CCIP_EXECUTION_ABI);
+var alphaGatewayAbi2 = parseAbi4(ALPHA_GATEWAY_ABI);
 function destinationChainId(direction) {
   assertBridgeDirection(direction);
   const evm = getForeverMoneyEvmDeployment(
@@ -1372,14 +1720,14 @@ function sourceChainId(direction) {
   return isEvmToSubtensorDirection(direction) ? evm.chainId : foreverMoneyDeployment.subtensor.chainId;
 }
 async function assertProviderChain(provider, expectedChainId, label) {
-  const network = await provider.getNetwork();
-  if (network.chainId !== BigInt(expectedChainId)) {
+  const chainId = await provider.getChainId();
+  if (chainId !== expectedChainId) {
     throw new ForeverMoneyError(
       "CHAIN_MISMATCH",
-      `${label} transport reported chain ID ${network.chainId}; expected ${expectedChainId}.`,
+      `${label} transport reported chain ID ${chainId}; expected ${expectedChainId}.`,
       {
         expectedChainId,
-        actualChainId: network.chainId.toString()
+        actualChainId: chainId.toString()
       }
     );
   }
@@ -1390,13 +1738,14 @@ async function assertDestinationProvider(provider, direction) {
   return expectedChainId;
 }
 async function getBridgeSourceStatus(provider, input) {
+  const client = trackingClient(provider);
   const expectedChainId = sourceChainId(input.direction);
   const transactionHash = normalizeBytes32(
     input.transactionHash,
     "Transaction hash"
   );
-  await assertProviderChain(provider, expectedChainId, "Bridge source");
-  const receipt = await provider.getTransactionReceipt(transactionHash);
+  await assertProviderChain(client, expectedChainId, "Bridge source");
+  const receipt = await receiptOrNull(client, transactionHash);
   if (receipt === null) {
     return Object.freeze({
       direction: input.direction,
@@ -1406,7 +1755,7 @@ async function getBridgeSourceStatus(provider, input) {
       messageId: null
     });
   }
-  if (receipt.status === 0) {
+  if (receipt.status === "reverted") {
     return Object.freeze({
       direction: input.direction,
       sourceChainId: expectedChainId,
@@ -1415,7 +1764,7 @@ async function getBridgeSourceStatus(provider, input) {
       messageId: null
     });
   }
-  if (receipt.status !== 1) {
+  if (receipt.status !== "success") {
     throw new ForeverMoneyError(
       "INVALID_PROVIDER_RESPONSE",
       "The bridge source receipt has an invalid status."
@@ -1437,8 +1786,10 @@ async function getBridgeSourceStatus(provider, input) {
   });
 }
 async function getCcipDeliveryCheckpoint(provider, direction) {
-  const expectedChainId = await assertDestinationProvider(provider, direction);
-  const fromBlock = await provider.getBlockNumber();
+  const client = trackingClient(provider);
+  const expectedChainId = await assertDestinationProvider(client, direction);
+  const blockNumber = await client.getBlockNumber({ cacheTime: 0 });
+  const fromBlock = Number(blockNumber);
   if (!Number.isSafeInteger(fromBlock) || fromBlock < 0) {
     throw new ForeverMoneyError(
       "INVALID_PROVIDER_RESPONSE",
@@ -1452,6 +1803,7 @@ async function getCcipDeliveryCheckpoint(provider, direction) {
   });
 }
 async function getCcipDeliveryStatus(provider, input) {
+  const client = trackingClient(provider);
   const expectedChainId = destinationChainId(input.direction);
   const messageId = normalizeBytes32(input.messageId, "CCIP message ID");
   if (!Number.isSafeInteger(input.fromBlock) || input.fromBlock < 0) {
@@ -1460,42 +1812,50 @@ async function getCcipDeliveryStatus(provider, input) {
       "CCIP fromBlock must be a non-negative safe integer."
     );
   }
-  await assertProviderChain(provider, expectedChainId, "Bridge destination");
-  const event = ccipExecutionInterface.getEvent("ExecutionStateChanged");
-  if (event === null) {
-    throw new Error("CCIP execution event is missing from the SDK ABI.");
-  }
+  await assertProviderChain(client, expectedChainId, "Bridge destination");
   const evmChain = evmChainFromBridgeDirection(input.direction);
   const evm = getForeverMoneyEvmDeployment(evmChain);
   const evmToSubtensor = isEvmToSubtensorDirection(input.direction);
   const sourceSelector = evmToSubtensor ? evm.ccipSelector : foreverMoneyDeployment.subtensor.ccipSelector;
   const offRamp = evmToSubtensor ? evmChain === "base" ? foreverMoneyDeployment.subtensor.contracts.ccipOffRampFromBase : foreverMoneyDeployment.subtensor.contracts.ccipOffRampFromRobinhood : evm.contracts.ccipOffRampFromSubtensor;
-  const logs = await provider.getLogs({
+  const logs = await client.getLogs({
     address: offRamp,
-    fromBlock: input.fromBlock,
+    fromBlock: BigInt(input.fromBlock),
     toBlock: "latest",
-    topics: [event.topicHash, toBeHex(sourceSelector, 32), null, messageId]
+    event: ccipExecutionAbi[0],
+    args: { sourceChainSelector: sourceSelector, messageId },
+    strict: true
   });
   const latest = logs.at(-1);
   if (latest === void 0) return "waiting";
-  const parsed = ccipExecutionInterface.parseLog(latest);
-  const state = Number(parsed?.args.state);
+  const state = latest.args.state;
   if (state === 3) return "failure";
   if (state !== 2) return "waiting";
   if (!evmToSubtensor) return "success";
-  const receipt = await provider.getTransactionReceipt(latest.transactionHash);
+  const receipt = await receiptOrNull(client, latest.transactionHash);
   if (receipt === null) {
     throw new ForeverMoneyError(
       "INVALID_PROVIDER_RESPONSE",
       "The CCIP execution receipt is unavailable."
     );
   }
+  const subtensorGateways = [
+    foreverMoneyDeployment.subtensor.contracts.legacyGateway,
+    foreverMoneyDeployment.subtensor.contracts.gateway
+  ];
   for (const log of receipt.logs) {
-    if (log.address.toLowerCase() !== foreverMoneyDeployment.subtensor.contracts.gateway.toLowerCase()) {
+    if (!subtensorGateways.some(
+      (gateway) => log.address.toLowerCase() === gateway.toLowerCase()
+    )) {
       continue;
     }
     try {
-      if (alphaGatewayInterface2.parseLog(log)?.name === "Claimable") {
+      const { eventName } = decodeEventLog2({
+        abi: alphaGatewayAbi2,
+        data: log.data,
+        topics: log.topics
+      });
+      if (eventName === "Claimable" || eventName === "NotDelivered") {
         return "recovery";
       }
     } catch {
@@ -1503,20 +1863,28 @@ async function getCcipDeliveryStatus(provider, input) {
   }
   return "success";
 }
+async function receiptOrNull(provider, hash) {
+  try {
+    return await provider.getTransactionReceipt({ hash });
+  } catch (error) {
+    if (error instanceof TransactionReceiptNotFoundError) return null;
+    throw error;
+  }
+}
 
 // src/client.ts
 async function assertProviderChain2(provider, expectedChainId, name) {
-  const network = await providerOperation(
+  const chainId = await providerOperation(
     `Reading the ${name} chain ID`,
-    () => provider.getNetwork()
+    () => provider.getChainId()
   );
-  if (network.chainId !== BigInt(expectedChainId)) {
+  if (chainId !== expectedChainId) {
     throw new ForeverMoneyError(
       "CHAIN_MISMATCH",
-      `${name} transport reported chain ID ${network.chainId}; expected ${expectedChainId}.`,
+      `${name} transport reported chain ID ${chainId}; expected ${expectedChainId}.`,
       {
         expectedChainId,
-        actualChainId: network.chainId.toString()
+        actualChainId: chainId.toString()
       }
     );
   }
@@ -1648,19 +2016,20 @@ function createForeverMoneyClient(options) {
 }
 
 // src/vaults/receipts.ts
-import { Interface as Interface5 } from "ethers";
-var vaultFactoryInterface = new Interface5(VAULT_FACTORY_ABI);
+import { decodeEventLog as decodeEventLog3, parseAbi as parseAbi5 } from "viem";
+var vaultFactoryAbi = parseAbi5(VAULT_FACTORY_ABI);
 function vaultManagerFromCreationReceipt(receipt) {
   for (const log of receipt.logs) {
     if (!isLogFrom(log, foreverMoneyDeployment.base.contracts.vaultFactory)) {
       continue;
     }
     try {
-      const parsed = vaultFactoryInterface.parseLog({
+      const parsed = decodeEventLog3({
+        abi: vaultFactoryAbi,
         data: log.data,
         topics: [...log.topics]
       });
-      if (parsed?.name === "SnLiquidityManagerCreated") {
+      if (parsed.eventName === "SnLiquidityManagerCreated") {
         return normalizeEvmAddress(String(parsed.args.manager));
       }
     } catch {
@@ -1670,7 +2039,10 @@ function vaultManagerFromCreationReceipt(receipt) {
 }
 
 // src/core/transactions.ts
-import { MaxUint256 as MaxUint2563 } from "ethers";
+import {
+  defineChain,
+  maxUint256 as maxUint2563
+} from "viem";
 function decimalQuantity(value, label) {
   if (!/^(0|[1-9][0-9]*)$/.test(value)) {
     throw new ForeverMoneyError(
@@ -1679,7 +2051,7 @@ function decimalQuantity(value, label) {
     );
   }
   const quantity = BigInt(value);
-  if (quantity > MaxUint2563) {
+  if (quantity > maxUint2563) {
     throw new ForeverMoneyError(
       "INVALID_TRANSACTION_PLAN",
       `${label} exceeds uint256.`
@@ -1715,6 +2087,52 @@ function toEthersTransaction(transaction) {
     }
   });
 }
+var transactionChains = new Map(
+  [
+    [BASE_CHAIN_ID, "Base", "Ether", "ETH"],
+    [ROBINHOOD_CHAIN_ID, "Robinhood", "Ether", "ETH"],
+    [SUBTENSOR_CHAIN_ID, "Subtensor", "TAO", "TAO"]
+  ].map(([id, name, currency, symbol]) => [
+    id,
+    Object.freeze(
+      defineChain({
+        id,
+        name,
+        nativeCurrency: Object.freeze({
+          name: currency,
+          symbol,
+          decimals: 18
+        }),
+        // Chain identity only. The caller retains ownership of the wallet transport.
+        rpcUrls: Object.freeze({
+          default: Object.freeze({ http: Object.freeze([]) })
+        })
+      })
+    )
+  ])
+);
+function toViemTransaction(transaction) {
+  const chain = transactionChains.get(transaction.chainId);
+  if (!chain)
+    throw new ForeverMoneyError(
+      "INVALID_TRANSACTION_PLAN",
+      "Unsupported transaction chain."
+    );
+  return Object.freeze({
+    chain,
+    account: transaction.from,
+    chainId: transaction.chainId,
+    to: transaction.to,
+    data: transaction.data,
+    value: decimalQuantity(transaction.value, "Transaction value"),
+    ...transaction.gasLimit === void 0 ? {} : {
+      gas: decimalQuantity(
+        transaction.gasLimit,
+        "Transaction gas limit"
+      )
+    }
+  });
+}
 export {
   BASE_CCIP_SELECTOR,
   BASE_CHAIN_ID,
@@ -1723,12 +2141,15 @@ export {
   FOREVERMONEY_DEPLOYMENT_VERSION,
   ForeverMoneyError,
   GAS_LIMIT_BUFFER_BPS,
+  MAX_PARTNER_FEE_BPS,
   MIN_LIQUID_BASE_TO_SUBTENSOR_WEI,
   MIN_LIQUID_EVM_TO_SUBTENSOR_WEI,
+  MIN_LIQUID_SUBTENSOR_TO_EVM_WEI,
   NETWORK_FEE_BUFFER_BPS,
   RAO_PER_TAO,
   ROBINHOOD_CCIP_SELECTOR,
   ROBINHOOD_CHAIN_ID,
+  SN80_NETUID,
   SUBTENSOR_CCIP_SELECTOR,
   SUBTENSOR_CHAIN_ID,
   assertWholeRao,
@@ -1761,10 +2182,13 @@ export {
   normalizeEvmAddress,
   normalizeSS58,
   parseTaoAmount,
+  partnerFeeCut,
+  partnerFeeTaoTopUp,
   sourceChainId,
   ss58ToPublicKey,
   toEip1193Transaction,
   toEthersTransaction,
+  toViemTransaction,
   vaultManagerFromCreationReceipt
 };
 //# sourceMappingURL=index.js.map