@forevermoney/sdk 0.5.3 → 0.5.5

package/dist/index.d.cts

@@ -9,9 +9,9 @@ declare const SUBTENSOR_CCIP_SELECTOR = 2135107236357186872n;
 declare const RAO_PER_TAO = 1000000000n;
 declare const EVM_WEI_PER_RAO = 1000000000n;
 declare const SN80_NETUID = 80n;
-declare const FOREVERMONEY_DEPLOYMENT_VERSION: "1.3.0";
+declare const FOREVERMONEY_DEPLOYMENT_VERSION: "1.4.0";
 declare const foreverMoneyDeployment: Readonly<{
-    version: "1.3.0";
+    version: "1.4.0";
     base: Readonly<{
         key: "base";
         name: "Base";
@@ -40,6 +40,7 @@ declare const foreverMoneyDeployment: Readonly<{
             gateway: `0x${string}`;
             legacyGateways: readonly `0x${string}`[];
             wrappedTao: `0x${string}`;
+            wrappedSn80: `0x${string}`;
             ccipRouter: `0x${string}`;
             ccipOffRampFromSubtensor: `0x${string}`;
         }>;
@@ -262,7 +263,7 @@ declare const foreverMoneyAbis: Readonly<{
     alphaGateway: readonly ["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 bridgeOutFromValidators(uint64 destSelector,address token,address recipient,uint256 taoAmount,(bytes32 validator,uint256 alphaRao)[] sources,uint256 minTokenOut) payable returns (bytes32 messageId)", "function bridgeOutFromValidatorsWithFee(uint64 destSelector,address token,address recipient,uint256 taoAmount,(bytes32 validator,uint256 alphaRao)[] sources,uint256 minTokenOut,(address recipient,uint16 bps) integrator) payable returns (bytes32 messageId)", "function MAX_STAKE_SOURCES() view returns (uint256)", "function GATEWAY_COLDKEY() view returns (bytes32)", "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 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)"];
     alphaVault: readonly ["function isPaused() view returns (bool)", "function pausedUntil() view returns (uint256)", "function isListed(address token) view returns (bool)", "function backing(address token) view returns (uint256 stakedAlpha)", "function positionOf(address token) view returns (bytes32 validator,uint256 netuid)"];
     ccipExecution: readonly ["event ExecutionStateChanged(uint64 indexed sourceChainSelector,uint64 indexed sequenceNumber,bytes32 indexed messageId,bytes32 messageHash,uint8 state,bytes returnData,uint256 gasUsed)"];
-    ccipRouter: readonly ["function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)"];
+    ccipRouter: readonly ["function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)", "function getOffRamps() view returns ((uint64 sourceChainSelector,address offRamp)[])"];
     erc20: readonly ["function allowance(address owner,address spender) view returns (uint256)", "function approve(address spender,uint256 amount) returns (bool)", "function balanceOf(address account) view returns (uint256)"];
     spokeGateway: readonly ["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 quoteBridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit,uint256 gasLimit) view returns (uint256 fee)", "function bridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit) payable returns (bytes32 messageId)", "function bridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit,uint256 gasLimit) 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)"];
     staking: readonly ["function allowance(address sourceAddress,address spenderAddress,uint256 netuid) view returns (uint256)", "function approve(address spenderAddress,uint256 netuid,uint256 absoluteAmount)", "function getStake(bytes32 hotkey,bytes32 coldkey,uint256 netuid) view returns (uint256)"];

package/dist/index.d.ts

@@ -9,9 +9,9 @@ declare const SUBTENSOR_CCIP_SELECTOR = 2135107236357186872n;
 declare const RAO_PER_TAO = 1000000000n;
 declare const EVM_WEI_PER_RAO = 1000000000n;
 declare const SN80_NETUID = 80n;
-declare const FOREVERMONEY_DEPLOYMENT_VERSION: "1.3.0";
+declare const FOREVERMONEY_DEPLOYMENT_VERSION: "1.4.0";
 declare const foreverMoneyDeployment: Readonly<{
-    version: "1.3.0";
+    version: "1.4.0";
     base: Readonly<{
         key: "base";
         name: "Base";
@@ -40,6 +40,7 @@ declare const foreverMoneyDeployment: Readonly<{
             gateway: `0x${string}`;
             legacyGateways: readonly `0x${string}`[];
             wrappedTao: `0x${string}`;
+            wrappedSn80: `0x${string}`;
             ccipRouter: `0x${string}`;
             ccipOffRampFromSubtensor: `0x${string}`;
         }>;
@@ -262,7 +263,7 @@ declare const foreverMoneyAbis: Readonly<{
     alphaGateway: readonly ["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 bridgeOutFromValidators(uint64 destSelector,address token,address recipient,uint256 taoAmount,(bytes32 validator,uint256 alphaRao)[] sources,uint256 minTokenOut) payable returns (bytes32 messageId)", "function bridgeOutFromValidatorsWithFee(uint64 destSelector,address token,address recipient,uint256 taoAmount,(bytes32 validator,uint256 alphaRao)[] sources,uint256 minTokenOut,(address recipient,uint16 bps) integrator) payable returns (bytes32 messageId)", "function MAX_STAKE_SOURCES() view returns (uint256)", "function GATEWAY_COLDKEY() view returns (bytes32)", "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 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)"];
     alphaVault: readonly ["function isPaused() view returns (bool)", "function pausedUntil() view returns (uint256)", "function isListed(address token) view returns (bool)", "function backing(address token) view returns (uint256 stakedAlpha)", "function positionOf(address token) view returns (bytes32 validator,uint256 netuid)"];
     ccipExecution: readonly ["event ExecutionStateChanged(uint64 indexed sourceChainSelector,uint64 indexed sequenceNumber,bytes32 indexed messageId,bytes32 messageHash,uint8 state,bytes returnData,uint256 gasUsed)"];
-    ccipRouter: readonly ["function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)"];
+    ccipRouter: readonly ["function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)", "function getOffRamps() view returns ((uint64 sourceChainSelector,address offRamp)[])"];
     erc20: readonly ["function allowance(address owner,address spender) view returns (uint256)", "function approve(address spender,uint256 amount) returns (bool)", "function balanceOf(address account) view returns (uint256)"];
     spokeGateway: readonly ["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 quoteBridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit,uint256 gasLimit) view returns (uint256 fee)", "function bridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit) payable returns (bytes32 messageId)", "function bridgeToFinney(address token,uint256 amount,(bytes32 ss58,address evmFallback,bool wantLiquid,uint256 minTaoOut) exit,uint256 gasLimit) 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)"];
     staking: readonly ["function allowance(address sourceAddress,address spenderAddress,uint256 netuid) view returns (uint256)", "function approve(address spenderAddress,uint256 netuid,uint256 absoluteAmount)", "function getStake(bytes32 hotkey,bytes32 coldkey,uint256 netuid) view returns (uint256)"];

package/dist/index.js

@@ -9,7 +9,7 @@ var SUBTENSOR_CCIP_SELECTOR = 2135107236357186872n;
 var RAO_PER_TAO = 1000000000n;
 var EVM_WEI_PER_RAO = 1000000000n;
 var SN80_NETUID = 80n;
-var FOREVERMONEY_DEPLOYMENT_VERSION = "1.3.0";
+var FOREVERMONEY_DEPLOYMENT_VERSION = "1.4.0";
 var foreverMoneyDeployment = Object.freeze({
   version: FOREVERMONEY_DEPLOYMENT_VERSION,
   base: Object.freeze({
@@ -62,6 +62,9 @@ var foreverMoneyDeployment = Object.freeze({
       wrappedTao: getAddress(
         "0xf3081494B87e8D5fb7960f066E931D1D0e6E3d67"
       ),
+      wrappedSn80: getAddress(
+        "0x6f63d869011f95274498023b4abfc00b30c34378"
+      ),
       ccipRouter: getAddress(
         "0x06fC836cf9839B1cd891C440A0a45242DA6Ae1c9"
       ),
@@ -631,7 +634,8 @@ var CCIP_EXECUTION_ABI = Object.freeze([
   "event ExecutionStateChanged(uint64 indexed sourceChainSelector,uint64 indexed sequenceNumber,bytes32 indexed messageId,bytes32 messageHash,uint8 state,bytes returnData,uint256 gasUsed)"
 ]);
 var CCIP_ROUTER_ABI = Object.freeze([
-  "function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)"
+  "function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)",
+  "function getOffRamps() view returns ((uint64 sourceChainSelector,address offRamp)[])"
 ]);
 var foreverMoneyAbis = Object.freeze({
   alphaGateway: ALPHA_GATEWAY_ABI,
@@ -740,15 +744,9 @@ function bridgeAsset(evmChain, asset = "tao") {
       '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,
+    evmToken: evm.contracts.wrappedSn80,
     subtensorToken: foreverMoneyDeployment.subtensor.contracts.wrappedSn80,
     label: "SN80",
     wrappedLabel: "SN80"
@@ -2013,6 +2011,41 @@ function bridgeMessageIdFromReceipt(direction, receipt) {
 // src/bridge/tracking.ts
 var ccipExecutionAbi = parseAbi4(CCIP_EXECUTION_ABI);
 var alphaGatewayAbi2 = parseAbi4(ALPHA_GATEWAY_ABI);
+var routerAbi = parseAbi4(CCIP_ROUTER_ABI);
+var executionV2Abi = parseAbi4([
+  "event ExecutionStateChanged(uint64 indexed sourceChainSelector,uint64 indexed sequenceNumber,bytes32 indexed messageId,uint8 state,bytes returnData)"
+]);
+var rampCache = /* @__PURE__ */ new WeakMap();
+function deliveryOffRamps(provider, client, router, selector, legacy) {
+  let cache = rampCache.get(provider);
+  if (!cache) {
+    cache = /* @__PURE__ */ new Map();
+    rampCache.set(provider, cache);
+  }
+  const key = `${router}:${selector}:${legacy}`;
+  const cached = cache.get(key);
+  if (cached && cached.expires > Date.now()) return cached.request;
+  const request = client.readContract({
+    address: router,
+    abi: routerAbi,
+    functionName: "getOffRamps"
+  }).then((ramps) => {
+    const addresses = /* @__PURE__ */ new Map([
+      [legacy.toLowerCase(), legacy]
+    ]);
+    for (const ramp of ramps) {
+      if (ramp.sourceChainSelector === selector)
+        addresses.set(ramp.offRamp.toLowerCase(), ramp.offRamp);
+    }
+    return [...addresses.values()];
+  });
+  const entry = { expires: Date.now() + 3e5, request };
+  cache.set(key, entry);
+  void request.catch(() => {
+    if (cache.get(key) === entry) cache.delete(key);
+  });
+  return request;
+}
 function destinationChainId(direction) {
   assertBridgeDirection(direction);
   const evm = getForeverMoneyEvmDeployment(
@@ -2126,13 +2159,29 @@ async function getCcipDeliveryStatus(provider, input) {
   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 client.getLogs({
-    address: offRamp,
-    fromBlock: BigInt(input.fromBlock),
-    toBlock: "latest",
-    event: ccipExecutionAbi[0],
-    args: { sourceChainSelector: sourceSelector, messageId },
-    strict: true
+  const offRamps = await deliveryOffRamps(
+    provider,
+    client,
+    evmToSubtensor ? foreverMoneyDeployment.subtensor.contracts.ccipRouter : evm.contracts.ccipRouter,
+    sourceSelector,
+    offRamp
+  );
+  const batches = await Promise.all(
+    [executionV2Abi[0], ccipExecutionAbi[0]].map(
+      (event) => client.getLogs({
+        address: offRamps.length === 1 ? offRamps[0] : [...offRamps],
+        fromBlock: BigInt(input.fromBlock),
+        toBlock: "latest",
+        event,
+        args: { sourceChainSelector: sourceSelector, messageId },
+        strict: true
+      })
+    )
+  );
+  const logs = batches.flat().sort((a, b) => {
+    const blockA = a.blockNumber ?? 0n;
+    const blockB = b.blockNumber ?? 0n;
+    return blockA === blockB ? (a.logIndex ?? 0) - (b.logIndex ?? 0) : blockA < blockB ? -1 : 1;
   });
   const latest = logs.at(-1);
   if (latest === void 0) return "waiting";