fix: user address in buildMessagePayload

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

Hide file tree

Showing 10 changed files with 100 additions and 26 deletions.
diff --git a/src/chains/evm/common/utils/chain.ts b/src/chains/evm/common/utils/chain.ts
@@ -3,12 +3,12 @@ import { EVM_FOLKS_CHAIN_ID } from "../constants/chain.js";
 import type { EvmChainId } from "../types/chain.js";
 import type { Account, Address, WalletClient } from "viem";
 
-export function getSignerAddress(signer: WalletClient): Address {
+export function getEvmSignerAddress(signer: WalletClient): Address {
   if (signer.account?.address) return signer.account.address;
   throw new Error("EVM Signer address is not set");
 }
 
-export function getSignerAccount(signer: WalletClient): Account {
+export function getEvmSignerAccount(signer: WalletClient): Account {
   if (signer.account) return signer.account;
   throw new Error("EVM Signer account is not set");
 }

diff --git a/src/chains/evm/common/utils/contract.ts b/src/chains/evm/common/utils/contract.ts
@@ -5,7 +5,7 @@ import { convertFromGenericAddress } from "../../../../common/utils/address.js";
 import { ERC20Abi } from "../constants/abi/erc-20-abi.js";
 import { WormholeDataAdapterAbi } from "../constants/abi/wormhole-data-adapter-abi.js";
 
-import { getSignerAccount, getSignerAddress } from "./chain.js";
+import { getEvmSignerAccount, getEvmSignerAddress } from "./chain.js";
 
 import type { GenericAddress } from "../../../../common/types/chain.js";
 import type { GetReadContractReturnType } from "../types/contract.js";
@@ -32,14 +32,14 @@ export async function sendERC20Approve(
 ) {
   const erc20 = getERC20Contract(provider, address, signer);
   const allowance = await erc20.read.allowance([
-    getSignerAddress(signer),
+    getEvmSignerAddress(signer),
     receiver,
   ]);
 
   // approve if not enough
   if (allowance < amount)
     return await erc20.write.approve([receiver, BigInt(amount)], {
-      account: getSignerAccount(signer),
+      account: getEvmSignerAccount(signer),
       chain: signer.chain,
     });
 }

diff --git a/src/chains/evm/common/utils/message.ts b/src/chains/evm/common/utils/message.ts
@@ -396,7 +396,7 @@ export async function estimateEVMWormholeDataGasLimit(
         buildMessagePayload(
           messageBuilderParams.action,
           messageBuilderParams.accountId,
-          getRandomGenericAddress(),
+          messageBuilderParams.userAddress,
           buildEvmMessageData(messageBuilderParams),
         ),
       ),

diff --git a/src/chains/evm/spoke/modules/folks-evm-account.ts b/src/chains/evm/spoke/modules/folks-evm-account.ts
@@ -1,4 +1,4 @@
-import { getSignerAccount } from "../../common/utils/chain.js";
+import { getEvmSignerAccount } from "../../common/utils/chain.js";
 import {
   getBridgeRouterSpokeContract,
   getSpokeCommonContract,
@@ -233,7 +233,7 @@ export const write = {
     };
 
     return await spokeCommon.write.createAccount([params, accountId], {
-      account: getSignerAccount(signer),
+      account: getEvmSignerAccount(signer),
       chain: signer.chain,
       gas: gasLimit,
       value: adapterFee,
@@ -274,7 +274,7 @@ export const write = {
     return await spokeCommon.write.inviteAddress(
       [params, accountId, folksChainIdToInvite, addressToInvite],
       {
-        account: getSignerAccount(signer),
+        account: getEvmSignerAccount(signer),
         chain: signer.chain,
         gasLimit: gasLimit,
         value: adapterFee,
@@ -312,7 +312,7 @@ export const write = {
     };
 
     return await spokeCommon.write.acceptInviteAddress([params, accountId], {
-      account: getSignerAccount(signer),
+      account: getEvmSignerAccount(signer),
       chain: signer.chain,
       gasLimit: gasLimit,
       value: adapterFee,
@@ -352,7 +352,7 @@ export const write = {
     return await spokeCommon.write.unregisterAddress(
       [params, accountId, folksChainIdToUnregister],
       {
-        account: getSignerAccount(signer),
+        account: getEvmSignerAccount(signer),
         chain: signer.chain,
         gasLimit: gasLimit,
         value: adapterFee,

diff --git a/src/chains/evm/spoke/modules/folks-evm-loan.ts b/src/chains/evm/spoke/modules/folks-evm-loan.ts
@@ -1,5 +1,5 @@
 import { TokenType } from "../../../../common/types/token.js";
-import { getSignerAccount } from "../../common/utils/chain.js";
+import { getEvmSignerAccount } from "../../common/utils/chain.js";
 import { sendERC20Approve } from "../../common/utils/contract.js";
 import { getHubTokenData } from "../../hub/utils/chain.js";
 import {
@@ -266,7 +266,7 @@ export const write = {
     return await spokeCommon.write.createLoan(
       [params, accountId, loanId, loanTypeId],
       {
-        account: getSignerAccount(signer),
+        account: getEvmSignerAccount(signer),
         chain: signer.chain,
         gasLimit: gasLimit,
         value: adapterFee,
@@ -305,7 +305,7 @@ export const write = {
     };
 
     return await spokeCommon.write.deleteLoan([params, accountId, loanId], {
-      account: getSignerAccount(signer),
+      account: getEvmSignerAccount(signer),
       chain: signer.chain,
       gasLimit: gasLimit,
       value: adapterFee,
@@ -354,7 +354,7 @@ export const write = {
     };
 
     return await spokeToken.write.deposit([params, accountId, loanId, amount], {
-      account: getSignerAccount(signer),
+      account: getEvmSignerAccount(signer),
       chain: signer.chain,
       gasLimit: gasLimit,
       value: adapterFee,
@@ -397,7 +397,7 @@ export const write = {
     return await spokeCommon.write.withdraw(
       [params, accountId, loanId, poolId, receiverChainId, amount, isFAmount],
       {
-        account: getSignerAccount(signer),
+        account: getEvmSignerAccount(signer),
         chain: signer.chain,
         gasLimit: gasLimit,
         value: adapterFee,

diff --git a/src/common/types/core.ts b/src/common/types/core.ts
@@ -22,3 +22,10 @@ export type FolksCoreConfig = {
   network: NetworkType;
   provider: FolksCoreProvider;
 };
+
+export type FolksEvmSigner = {
+  signer: EVMSigner;
+  chainType: ChainType.EVM;
+};
+
+export type FolksChainSigner = FolksEvmSigner;
diff --git a/src/common/types/message.ts b/src/common/types/message.ts
@@ -176,6 +176,7 @@ export type MessageDataParams =
   | WithdrawMessageDataParams;
 
 export type MessageBuilderParams = {
+  userAddress: GenericAddress;
   accountId: Hex;
   adapters: MessageAdapters;
   sender: GenericAddress;

diff --git a/src/common/utils/chain.ts b/src/common/utils/chain.ts
@@ -1,8 +1,11 @@
+import { getEvmSignerAddress } from "../../chains/evm/common/utils/chain.js";
 import {
   getHubChainAdapterAddress,
   isHubChain,
 } from "../../chains/evm/hub/utils/chain.js";
+import { exhaustiveCheck } from "../../utils/exhaustive-check.js";
 import { FOLKS_CHAIN, SPOKE_CHAIN } from "../constants/chain.js";
+import { ChainType } from "../types/chain.js";
 
 import type {
   FolksChainId,
@@ -11,6 +14,7 @@ import type {
   SpokeChain,
   GenericAddress,
 } from "../types/chain.js";
+import type { FolksChainSigner } from "../types/core.js";
 import type { AdapterType } from "../types/message.js";
 import type { FolksTokenId, SpokeTokenData } from "../types/token.js";
 
@@ -136,3 +140,15 @@ export function getAdapterAddress(
     return getHubChainAdapterAddress(network, adapterType);
   return getSpokeChainAdapterAddress(folksChainId, network, adapterType);
 }
+
+export function getSignerGenericAddress(
+  folksChainSigner: FolksChainSigner,
+): GenericAddress {
+  const chainType = folksChainSigner.chainType;
+  switch (chainType) {
+    case ChainType.EVM:
+      return getEvmSignerAddress(folksChainSigner.signer);
+    default:
+      return exhaustiveCheck(chainType);
+  }
+}
diff --git a/src/xchain/modules/folks-account.ts b/src/xchain/modules/folks-account.ts
@@ -1,12 +1,13 @@
-import { getSignerAddress } from "../../chains/evm/common/utils/chain.js";
 import { FolksHubAccount } from "../../chains/evm/hub/modules/index.js";
 import { getHubChain } 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";
 import { assertAdapterSupportsDataMessage } from "../../common/utils/adapter.js";
+import { convertFromGenericAddress } from "../../common/utils/address.js";
 import {
   assertSpokeChainSupported,
+  getSignerGenericAddress,
   getSpokeChain,
 } from "../../common/utils/chain.js";
 import {
@@ -47,7 +48,13 @@ export const prepare = {
     );
     const hubChain = getHubChain(folksChain.network);
 
+    const userAddress = getSignerGenericAddress({
+      signer: FolksCore.getFolksSigner().signer,
+      chainType: folksChain.chainType,
+    });
+
     const messageBuilderParams: MessageBuilderParams = {
+      userAddress,
       accountId,
       adapters,
       action: Action.CreateAccount,
@@ -78,7 +85,7 @@ export const prepare = {
       case ChainType.EVM:
         return await FolksEvmAccount.prepare.createAccount(
           FolksCore.getProvider<ChainType.EVM>(folksChain.folksChainId),
-          getSignerAddress(FolksCore.getSigner<ChainType.EVM>()),
+          convertFromGenericAddress(userAddress, folksChain.chainType),
           messageToSend,
           accountId,
           adapters,
@@ -108,11 +115,17 @@ export const prepare = {
     );
     const hubChain = getHubChain(folksChain.network);
 
+    const userAddress = getSignerGenericAddress({
+      signer: FolksCore.getFolksSigner().signer,
+      chainType: folksChain.chainType,
+    });
+
     const data: InviteAddressMessageData = {
       folksChainIdToInvite,
       addressToInvite,
     };
     const messageToSend = buildMessageToSend(folksChain.chainType, {
+      userAddress,
       accountId,
       adapters,
       action: Action.InviteAddress,
@@ -127,7 +140,7 @@ export const prepare = {
       case ChainType.EVM:
         return await FolksEvmAccount.prepare.inviteAddress(
           FolksCore.getProvider<ChainType.EVM>(folksChain.folksChainId),
-          getSignerAddress(FolksCore.getSigner<ChainType.EVM>()),
+          convertFromGenericAddress(userAddress, folksChain.chainType),
           messageToSend,
           accountId,
           folksChainIdToInvite,
@@ -154,7 +167,13 @@ export const prepare = {
     );
     const hubChain = getHubChain(folksChain.network);
 
+    const userAddress = getSignerGenericAddress({
+      signer: FolksCore.getFolksSigner().signer,
+      chainType: folksChain.chainType,
+    });
+
     const messageToSend = buildMessageToSend(folksChain.chainType, {
+      userAddress,
       accountId,
       adapters,
       action: Action.AcceptInviteAddress,
@@ -169,7 +188,7 @@ export const prepare = {
       case ChainType.EVM:
         return await FolksEvmAccount.prepare.acceptInvite(
           FolksCore.getProvider<ChainType.EVM>(folksChain.folksChainId),
-          getSignerAddress(FolksCore.getSigner<ChainType.EVM>()),
+          convertFromGenericAddress(userAddress, folksChain.chainType),
           messageToSend,
           accountId,
           adapters,
@@ -198,10 +217,16 @@ export const prepare = {
     );
     const hubChain = getHubChain(folksChain.network);
 
+    const userAddress = getSignerGenericAddress({
+      signer: FolksCore.getFolksSigner().signer,
+      chainType: folksChain.chainType,
+    });
+
     const data: UnregisterAddressMessageData = {
       folksChainIdToUnregister,
     };
     const messageToSend = buildMessageToSend(folksChain.chainType, {
+      userAddress,
       accountId,
       adapters,
       action: Action.UnregisterAddress,
@@ -216,7 +241,7 @@ export const prepare = {
       case ChainType.EVM:
         return await FolksEvmAccount.prepare.unregisterAddress(
           FolksCore.getProvider<ChainType.EVM>(folksChain.folksChainId),
-          getSignerAddress(FolksCore.getSigner<ChainType.EVM>()),
+          convertFromGenericAddress(userAddress, folksChain.chainType),
           messageToSend,
           accountId,
           folksChainIdToUnregister,