fix: fixing GMP (#298)

fix GMP implementation
sygmaprotocol · Sep 19, 2023 · 41ea37a · 41ea37a
1 parent 43e9d05
commit 41ea37a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/packages/sdk/src/chains/EVM/__test__/depositFns.test.ts b/packages/sdk/src/chains/EVM/__test__/depositFns.test.ts
@@ -139,7 +139,7 @@ describe('deposit functions', () => {
         'resourceId',
         'depositData',
         'feeData',
-        { gasLimit: EVM.ASSET_TRANSFER_GAS_LIMIT },
+        { gasLimit: EVM.ASSET_TRANSFER_GAS_LIMIT, value: BigNumber.from(100) },
       );
     });
 

diff --git a/packages/sdk/src/chains/EVM/__test__/dynamicFee.test.ts b/packages/sdk/src/chains/EVM/__test__/dynamicFee.test.ts
@@ -14,7 +14,7 @@ jest.mock(
   () =>
     ({
       ...jest.requireActual('@buildwithsygma/sygma-contracts'),
-      DynamicERC20FeeHandlerEVM__factory: {
+      FeeHandlerRouter__factory: {
         connect: () => {
           return {
             calculateFee: jest.fn(() =>

diff --git a/packages/sdk/src/chains/EVM/fee/dynamicFee.ts b/packages/sdk/src/chains/EVM/fee/dynamicFee.ts
@@ -1,4 +1,4 @@
-import { DynamicERC20FeeHandlerEVM__factory } from '@buildwithsygma/sygma-contracts';
+import { FeeHandlerRouter__factory } from '@buildwithsygma/sygma-contracts';
 import { ethers } from 'ethers';
 import fetch from 'cross-fetch';
 
@@ -19,7 +19,7 @@ type OracleResponse = {
  * @param {string} amount - Amount in string format.
  * @returns {string} - Returns the oracleMessage, signature and amount.
  */
-export const createOracleFeeData = (oracleResponse: OracleResource, amount?: string): string => {
+export const createOracleFeeData = (oracleResponse: OracleResource, amount: string): string => {
   /*
         feeData structure:
             ber*10^18:    uint256
@@ -57,11 +57,8 @@ export const createOracleFeeData = (oracleResponse: OracleResource, amount?: str
   );
 
   const signature = oracleResponse.signature;
-  if (amount) {
-    return oracleMessage + signature + toHex(amount, 32).substring(2);
-  } else {
-    return oracleMessage + signature;
-  }
+
+  return oracleMessage + signature + toHex(amount, 32).substring(2);
 };
 
 /**
@@ -115,6 +112,7 @@ export const calculateDynamicFee = async ({
   feeHandlerAddress,
   depositData,
   tokenAmount,
+  maxFee,
 }: {
   provider: ethers.providers.Provider;
   sender: string;
@@ -124,16 +122,18 @@ export const calculateDynamicFee = async ({
   feeOracleBaseUrl: string;
   feeHandlerAddress: string;
   depositData: string;
-  tokenAmount?: string;
+  tokenAmount: string;
+  maxFee?: string;
 }): Promise<EvmFee> => {
   const oracleResponse = await requestFeeFromFeeOracle({
     feeOracleBaseUrl,
     fromDomainID,
     toDomainID,
     resourceID,
+    msgGasLimit: maxFee,
   });
   const feeData = createOracleFeeData(oracleResponse, tokenAmount);
-  const FeeHandlerWithOracleInstance = DynamicERC20FeeHandlerEVM__factory.connect(
+  const FeeHandlerWithOracleInstance = FeeHandlerRouter__factory.connect(
     feeHandlerAddress,
     provider,
   );
@@ -172,16 +172,16 @@ export const requestFeeFromFeeOracle = async ({
   fromDomainID,
   toDomainID,
   resourceID,
-  msgGasLimit = 0,
+  msgGasLimit = '0',
 }: {
   feeOracleBaseUrl: string;
   fromDomainID: number;
   toDomainID: number;
   resourceID: string;
-  msgGasLimit?: number;
+  msgGasLimit?: string;
 }): Promise<OracleResource> => {
   const response = await fetch(
-    `${feeOracleBaseUrl}/v1/rate/from/${fromDomainID}/to/${toDomainID}/resourceid/${resourceID}?gasLimit=${msgGasLimit}`,
+    `${feeOracleBaseUrl}/v1/rate/from/${fromDomainID}/to/${toDomainID}/resourceid/${resourceID}?msgGasLimit=${msgGasLimit}`,
     {
       headers: {
         'Cache-Control': 'no-cache',

diff --git a/packages/sdk/src/chains/EVM/genericMessage.ts b/packages/sdk/src/chains/EVM/genericMessage.ts
@@ -83,6 +83,8 @@ export class EVMGenericMessageTransfer {
             transfer.sender,
             genericTransfer.details.executionData,
           ),
+          tokenAmount: genericTransfer.details.tokenAmount,
+          maxFee: genericTransfer.details.maxFee,
         });
       }
       default:
@@ -147,6 +149,7 @@ export class EVMGenericMessageTransfer {
     destinationFunctionSignature: string,
     executionData: string,
     maxFee: string,
+    tokenAmount?: string,
   ): Transfer<GenericMessage> {
     const { sourceDomain, destinationDomain, resource } = this.config.getBaseTransferParams(
       destinationChainId,
@@ -160,6 +163,7 @@ export class EVMGenericMessageTransfer {
         destinationFunctionSignature: destinationFunctionSignature,
         executionData: executionData,
         maxFee: maxFee,
+        tokenAmount: tokenAmount || '0',
       },
       from: sourceDomain,
       to: destinationDomain,

diff --git a/packages/sdk/src/chains/EVM/utils/depositFns.ts b/packages/sdk/src/chains/EVM/utils/depositFns.ts
@@ -2,7 +2,6 @@ import { BigNumber, ContractReceipt, PopulatedTransaction, ethers } from 'ethers
 import { Bridge } from '@buildwithsygma/sygma-contracts';
 import { DepositEvent } from '@buildwithsygma/sygma-contracts/dist/ethers/Bridge.js';
 
-import { FeeHandlerType } from '../../../types/index.js';
 import { createERCDepositData, createPermissionlessGenericDepositData } from '../helpers.js';
 import { Erc20TransferParamsType, Erc721TransferParamsType, EvmFee } from '../types/index.js';
 
@@ -134,7 +133,7 @@ export const executeDeposit = async (
   overrides?: ethers.PayableOverrides,
 ): Promise<PopulatedTransaction> => {
   const transactionSettings = {
-    value: feeData.type === FeeHandlerType.BASIC ? feeData.fee : undefined,
+    value: feeData.fee,
     gasLimit: ASSET_TRANSFER_GAS_LIMIT,
   };
 

diff --git a/packages/sdk/src/types/types.ts b/packages/sdk/src/types/types.ts
@@ -67,6 +67,7 @@ export type GenericMessage = {
   destinationFunctionSignature: string;
   executionData: string;
   maxFee: string;
+  tokenAmount: string;
 };
 
 export type TransferType = Fungible | NonFungible | GenericMessage;