fix: adapter address

Folks-Finance · May 29, 2024 · d76124b · d76124b
1 parent f586e90
commit d76124b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/src/common/utils/messages.ts b/src/common/utils/messages.ts
@@ -8,9 +8,13 @@ import { ChainType } from "../types/chain.js";
 import { AdapterType } from "../types/message.js";
 
 import { convertFromGenericAddress } from "./address.js";
-import { getAdapterAddress, getFolksChain } from "./chain.js";
+import { getFolksChain } from "./chain.js";
 
-import type { FolksChainId, NetworkType } from "../types/chain.js";
+import type {
+  FolksChainId,
+  GenericAddress,
+  NetworkType,
+} from "../types/chain.js";
 import type { FolksProvider } from "../types/core.js";
 import type { WormholeData } from "../types/gmp.js";
 import type {
@@ -47,6 +51,8 @@ export async function estimateReceiveGasLimit(
   destFolksChainProvider: FolksProvider,
   network: NetworkType,
   adapters: MessageAdapters,
+  sourceAdapterAddress: GenericAddress,
+  destAdapterAddress: GenericAddress,
   messageBuilderParams: MessageBuilderParams,
   receiverValue = BigInt(0),
   returnGasLimit = BigInt(0),
@@ -62,16 +68,7 @@ export async function estimateReceiveGasLimit(
             getWormholeData(destFolksChainId).wormholeRelayer,
             ChainType.EVM,
           );
-          const wormholeDataAdapterAddress = getAdapterAddress(
-            destFolksChainId,
-            network,
-            adapters.adapterId,
-          );
-          const sourceWormholeDataAdapterAddress = getAdapterAddress(
-            sourceFolksChainId,
-            network,
-            adapters.adapterId,
-          );
+
           return await estimateEVMWormholeDataGasLimit(
             // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
             destFolksChainProvider as EVMProvider,
@@ -80,8 +77,8 @@ export async function estimateReceiveGasLimit(
             returnGasLimit,
             sourceWormholeChainId,
             wormholeRelayer,
-            wormholeDataAdapterAddress,
-            sourceWormholeDataAdapterAddress,
+            destAdapterAddress,
+            sourceAdapterAddress,
           );
         }
         case AdapterType.WORMHOLE_CCTP: {

diff --git a/src/xchain/modules/folks-account.ts b/src/xchain/modules/folks-account.ts
@@ -1,5 +1,8 @@
 import { FolksHubAccount } from "../../chains/evm/hub/modules/index.js";
-import { getHubChain } from "../../chains/evm/hub/utils/chain.js";
+import {
+  getHubChain,
+  getHubChainAdapterAddress,
+} from "../../chains/evm/hub/utils/chain.js";
 import { FolksEvmAccount } from "../../chains/evm/spoke/modules/index.js";
 import { ChainType } from "../../common/types/chain.js";
 import { Action } from "../../common/types/message.js";
@@ -9,6 +12,7 @@ import {
   assertSpokeChainSupported,
   getSignerGenericAddress,
   getSpokeChain,
+  getSpokeChainAdapterAddress,
 } from "../../common/utils/chain.js";
 import {
   buildMessageToSend,
@@ -66,12 +70,24 @@ export const prepare = {
     };
     const feeParams: OptionalMessageParams = {};
 
+    const sourceAdapterAddress = getSpokeChainAdapterAddress(
+      folksChain.folksChainId,
+      folksChain.network,
+      adapters.adapterId,
+    );
+    const destAdapterAddress = getHubChainAdapterAddress(
+      folksChain.network,
+      adapters.adapterId,
+    );
+
     feeParams.gasLimit = await estimateReceiveGasLimit(
       folksChain.folksChainId,
       hubChain.folksChainId,
       FolksCore.getHubProvider(),
       folksChain.network,
       adapters,
+      sourceAdapterAddress,
+      destAdapterAddress,
       messageBuilderParams,
     );