@across-protocol/sdk 4.2.6-alpha.3 → 4.2.6

package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FillUtils.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/FillUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;GAGG;AACH,KAAK,wBAAwB,GAAG,IAAI,GAAG;IAAE,aAAa,EAAE,OAAO,CAAA;CAAE,CAAC;AAElE;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,wBAAwB,EACnC,aAAa,EAAE,aAAa,EAC5B,wBAAwB,EAAE,MAAM,GAC/B;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB,CA2BA;AACD;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,wBAAwB,EAAE,SAAS,CAAC,QAAQ,EAC5C,cAAc,EAAE,gBAAgB,EAChC,aAAa,EAAE,aAAa,EAC5B,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAsDpC"}
+{"version":3,"file":"FillUtils.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/FillUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;;GAGG;AACH,KAAK,wBAAwB,GAAG,IAAI,GAAG;IAAE,aAAa,EAAE,OAAO,CAAA;CAAE,CAAC;AAElE;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,wBAAwB,EACnC,aAAa,EAAE,aAAa,EAC5B,wBAAwB,EAAE,MAAM,GAC/B;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB,CA2BA;AACD;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,wBAAwB,EAAE,SAAS,CAAC,QAAQ,GAAG,WAAW,EAC1D,cAAc,EAAE,gBAAgB,EAChC,aAAa,EAAE,aAAa,EAC5B,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAiEpC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.2.6-alpha.3",
+  "version": "4.2.6",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [

package/src/arch/svm/utils.ts

@@ -7,6 +7,7 @@ import {
   getAddressEncoder,
   getProgramDerivedAddress,
   getU64Encoder,
+  getU32Encoder,
   isAddress,
   type TransactionSigner,
 } from "@solana/kit";
@@ -215,6 +216,50 @@ export async function getRoutePda(originToken: Address, seed: bigint, routeChain
   return pda;
 }
 
+/**
+ * Returns the PDA for the SVM Spoke's transfer liability account.
+ * @param programId the address of the spoke pool.
+ * @param originToken the address of the corresponding token.
+ */
+export async function getTransferLiabilityPda(programId: Address, originToken: Address): Promise<Address> {
+  const addressEncoder = getAddressEncoder();
+  const [pda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["transfer_liability", addressEncoder.encode(originToken)],
+  });
+  return pda;
+}
+
+/**
+ * Returns the PDA for the SVM Spoke's root bundle account.
+ * @param programId the address of the spoke pool.
+ * @param statePda the spoke pool's state pda.
+ * @param rootBundleId the associated root bundle ID.
+ */
+export async function getRootBundlePda(programId: Address, state: Address, rootBundleId: number): Promise<Address> {
+  const intEncoder = getU32Encoder();
+  const addressEncoder = getAddressEncoder();
+  const [pda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["root_bundle", addressEncoder.encode(state), intEncoder.encode(rootBundleId)],
+  });
+  return pda;
+}
+
+/**
+ * Returns the PDA for the SVM Spoke's instruction params account.
+ * @param programId the address of the spoke pool.
+ * @param signer the signer of the authenticated call.
+ */
+export async function getInstructionParamsPda(programId: Address, signer: Address): Promise<Address> {
+  const addressEncoder = getAddressEncoder();
+  const [pda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["instruction_params", addressEncoder.encode(signer)],
+  });
+  return pda;
+}
+
 /**
  * Returns the PDA for the Event Authority.
  * @returns The PDA for the Event Authority.

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -94,10 +94,9 @@ function updateBundleFillsV3(
   repaymentAddress: string
 ): void {
   // We shouldn't pass any unrepayable fills into this function, so we perform an extra safety check.
-  assert(
-    chainIsEvm(repaymentChainId) && isValidEvmAddress(fill.relayer),
-    "validatedBundleV3Fills dictionary should only contain fills with valid repayment information"
-  );
+  if (chainIsEvm(repaymentChainId) && !isValidEvmAddress(fill.relayer)) {
+    return;
+  }
   if (!dict?.[repaymentChainId]?.[repaymentToken]) {
     assign(dict, [repaymentChainId, repaymentToken], {
       fills: [],
@@ -460,13 +459,15 @@ export class BundleDataClient {
         assert(isDefined(matchingDeposit), "Deposit not found for fill.");
 
         const spokeClient = this.spokePoolClients[_fill.destinationChainId];
-        if (!isEVMSpokePoolClient(spokeClient)) {
-          // FIXME: Handle non-EVM chains.
-          throw new Error("Destination chain is not an EVM chain.");
+        let provider;
+        if (isEVMSpokePoolClient(spokeClient)) {
+          provider = spokeClient.spokePool.provider;
+        } else if (isSVMSpokePoolClient(spokeClient)) {
+          provider = spokeClient.svmEventsClient.getRpc();
         }
         const fill = await verifyFillRepayment(
           _fill,
-          spokeClient.spokePool.provider,
+          provider!,
           matchingDeposit,
           this.clients.hubPoolClient,
           bundleEndBlockForMainnet
@@ -971,17 +972,20 @@ export class BundleDataClient {
                 assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
                 v3RelayHashes[relayDataHash].fill = fill;
                 if (fill.blockNumber >= destinationChainBlockRange[0]) {
-                  if (!isEVMSpokePoolClient(destinationClient)) {
-                    // FIXME: Handle non-EVM chains.
-                    throw new Error("Destination chain is not an EVM chain.");
+                  let provider;
+                  if (isEVMSpokePoolClient(destinationClient)) {
+                    provider = destinationClient.spokePool.provider;
+                  } else if (isSVMSpokePoolClient(destinationClient)) {
+                    provider = destinationClient.svmEventsClient.getRpc();
                   }
                   const fillToRefund = await verifyFillRepayment(
                     fill,
-                    destinationClient.spokePool.provider,
+                    provider!,
                     deposits[0],
                     this.clients.hubPoolClient,
                     bundleEndBlockForMainnet
                   );
+
                   if (!isDefined(fillToRefund)) {
                     bundleUnrepayableFillsV3.push(fill);
                     // We don't return here yet because we still need to mark unexecutable slow fill leaves
@@ -1075,14 +1079,16 @@ export class BundleDataClient {
                 }
                 v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
 
-                if (!isEVMSpokePoolClient(destinationClient)) {
-                  // FIXME: Handle non-EVM chains.
-                  throw new Error("Destination chain is not an EVM chain.");
+                let provider;
+                if (isEVMSpokePoolClient(destinationClient)) {
+                  provider = destinationClient.spokePool.provider;
+                } else if (isSVMSpokePoolClient(destinationClient)) {
+                  provider = destinationClient.svmEventsClient.getRpc();
                 }
 
                 const fillToRefund = await verifyFillRepayment(
                   fill,
-                  destinationClient.spokePool.provider,
+                  provider!,
                   matchedDeposit,
                   this.clients.hubPoolClient,
                   bundleEndBlockForMainnet
@@ -1257,13 +1263,15 @@ export class BundleDataClient {
           // include this pre fill if the fill is in an older bundle.
           if (fill) {
             if (fill.blockNumber < destinationChainBlockRange[0]) {
-              if (!isEVMSpokePoolClient(destinationClient)) {
-                // FIXME: Handle non-EVM chains.
-                throw new Error("Destination chain is not an EVM chain.");
+              let provider;
+              if (isEVMSpokePoolClient(destinationClient)) {
+                provider = destinationClient.spokePool.provider;
+              } else if (isSVMSpokePoolClient(destinationClient)) {
+                provider = destinationClient.svmEventsClient.getRpc();
               }
               const fillToRefund = await verifyFillRepayment(
                 fill,
-                destinationClient.spokePool.provider,
+                provider!,
                 deposits[0],
                 this.clients.hubPoolClient,
                 bundleEndBlockForMainnet
@@ -1314,13 +1322,15 @@ export class BundleDataClient {
             const prefill = await this.findMatchingFillEvent(deposit, destinationClient);
             assert(isDefined(prefill), `findFillEvent# Cannot find prefill: ${relayDataHash}`);
             assert(getRelayEventKey(prefill) === relayDataHash, "Relay hashes should match.");
-            if (!isEVMSpokePoolClient(destinationClient)) {
-              // FIXME: Handle non-EVM chains.
-              throw new Error("Destination chain is not an EVM chain.");
+            let provider;
+            if (isEVMSpokePoolClient(destinationClient)) {
+              provider = destinationClient.spokePool.provider;
+            } else if (isSVMSpokePoolClient(destinationClient)) {
+              provider = destinationClient.svmEventsClient.getRpc();
             }
             const verifiedFill = await verifyFillRepayment(
               prefill,
-              destinationClient.spokePool.provider,
+              provider!,
               deposit,
               this.clients.hubPoolClient,
               bundleEndBlockForMainnet

package/src/clients/BundleDataClient/utils/FillUtils.ts

@@ -4,6 +4,7 @@ import { providers } from "ethers";
 import { DepositWithBlock, Fill, FillWithBlock } from "../../../interfaces";
 import { isSlowFill, isValidEvmAddress, isDefined, chainIsEvm } from "../../../utils";
 import { HubPoolClient } from "../../HubPoolClient";
+import { SVMProvider } from "../../../arch/svm";
 
 /**
  * @notice FillRepaymentInformation is a fill with additional properties required to determine where it can
@@ -65,7 +66,7 @@ export function getRefundInformationFromFill(
  */
 export async function verifyFillRepayment(
   _fill: FillWithBlock,
-  destinationChainProvider: providers.Provider,
+  destinationChainProvider: providers.Provider | SVMProvider,
   matchedDeposit: DepositWithBlock,
   hubPoolClient: HubPoolClient,
   bundleEndBlockForMainnet: number
@@ -91,32 +92,43 @@ export async function verifyFillRepayment(
   if (_repaymentAddressNeedsToBeOverwritten(fill)) {
     // TODO: Handle case where fill was sent on non-EVM chain, in which case the following call would fail
     // or return something unexpected. We'd want to return undefined here.
-    const fillTransaction = await destinationChainProvider.getTransaction(fill.txnRef);
-    const destinationRelayer = fillTransaction?.from;
-    // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
-    if (!isDefined(destinationRelayer) || !isValidEvmAddress(destinationRelayer)) {
-      return undefined;
-    }
-    // If we can switch the repayment chain to the destination chain, then do so. We should only switch if the
-    // destination chain has a valid repayment token that is equivalent to the deposited input token. This would
-    // also be the same mapping as the repayment token on the repayment chain.
-    if (
-      !matchedDeposit.fromLiteChain &&
-      hubPoolClient.areTokensEquivalent(fill.inputToken, fill.originChainId, fill.outputToken, fill.destinationChainId)
-    ) {
-      repaymentChainId = fill.destinationChainId;
-    }
-    // If we can't switch the chain, then we need to verify that the msg.sender is a valid address on the repayment chain.
-    // Because we already checked that the `destinationRelayer` was a valid EVM address above, we only need to check
-    // that the repayment chain is an EVM chain.
-    else {
-      if (!chainIsEvm(repaymentChainId)) {
+    if (chainIsEvm(fill.destinationChainId)) {
+      assert(
+        destinationChainProvider instanceof providers.Provider,
+        `BundleDataClient#verifyFillRepayment: unexpected destination chain provider for chain ID ${fill.destinationChainId}`
+      );
+      const fillTransaction = await destinationChainProvider.getTransaction(fill.txnRef);
+      const destinationRelayer = fillTransaction?.from;
+      // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
+      if (!isDefined(destinationRelayer) || !isValidEvmAddress(destinationRelayer)) {
         return undefined;
       }
+      // If we can switch the repayment chain to the destination chain, then do so. We should only switch if the
+      // destination chain has a valid repayment token that is equivalent to the deposited input token. This would
+      // also be the same mapping as the repayment token on the repayment chain.
+      if (
+        !matchedDeposit.fromLiteChain &&
+        hubPoolClient.areTokensEquivalent(
+          fill.inputToken,
+          fill.originChainId,
+          fill.outputToken,
+          fill.destinationChainId
+        )
+      ) {
+        repaymentChainId = fill.destinationChainId;
+      }
+      // If we can't switch the chain, then we need to verify that the msg.sender is a valid address on the repayment chain.
+      // Because we already checked that the `destinationRelayer` was a valid EVM address above, we only need to check
+      // that the repayment chain is an EVM chain.
+      else {
+        if (!chainIsEvm(repaymentChainId)) {
+          return undefined;
+        }
+      }
+      fill.relayer = destinationRelayer;
+    } else {
+      return undefined;
     }
-    fill.relayer = destinationRelayer;
-
-    // @todo: If chainIsSvm:
   }
 
   // Repayment address is now valid and repayment chain is either origin chain for lite chain or the destination