deduct gas costs on revert for gas assets

zeta-chain · Oct 17, 2024 · 3fbd3c0 · 3fbd3c0
1 parent 54caf43
commit 3fbd3c0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/packages/localnet/src/handleOnEVMDeposited.ts b/packages/localnet/src/handleOnEVMDeposited.ts
@@ -2,6 +2,7 @@ import { ethers, NonceManager } from "ethers";
 import { handleOnRevertEVM } from "./handleOnRevertEVM";
 import { log, logErr } from "./log";
 import { deployOpts } from "./deployOpts";
+import * as ZRC20 from "@zetachain/protocol-contracts/abi/ZRC20.sol/ZRC20.json";
 
 // event Deposited(address indexed sender, address indexed receiver, uint256 amount, address asset, bytes payload, RevertOptions revertOptions);
 export const handleOnEVMDeposited = async ({
@@ -28,21 +29,20 @@ export const handleOnEVMDeposited = async ({
   const amount = args[2];
   const asset = args[3];
   const message = args[4];
-  try {
-    let foreignCoin;
-    if (asset === ethers.ZeroAddress) {
-      foreignCoin = foreignCoins.find((coin) => coin.coin_type === "Gas");
-    } else {
-      foreignCoin = foreignCoins.find((coin) => coin.asset === asset);
-    }
-
-    if (!foreignCoin) {
-      logErr("ZetaChain", `Foreign coin not found for asset: ${asset}`);
-      return;
-    }
+  let foreignCoin;
+  if (asset === ethers.ZeroAddress) {
+    foreignCoin = foreignCoins.find((coin) => coin.coin_type === "Gas");
+  } else {
+    foreignCoin = foreignCoins.find((coin) => coin.asset === asset);
+  }
 
-    const zrc20 = foreignCoin.zrc20_contract_address;
+  if (!foreignCoin) {
+    logErr("ZetaChain", `Foreign coin not found for asset: ${asset}`);
+    return;
+  }
 
+  const zrc20 = foreignCoin.zrc20_contract_address;
+  try {
     const context = {
       origin: protocolContracts.gatewayZEVM.target,
       sender: await fungibleModuleSigner.getAddress(),
@@ -84,10 +84,15 @@ export const handleOnEVMDeposited = async ({
   } catch (err) {
     logErr("ZetaChain", `Error depositing: ${err}`);
     const revertOptions = args[5];
+    const zrc20Contract = new ethers.Contract(zrc20, ZRC20.abi, deployer);
+    const [gasZRC20, gasFee] = await zrc20Contract.withdrawGasFeeWithGasLimit(
+      revertOptions[4]
+    );
+    const amountReverted = amount - gasFee;
     return await handleOnRevertEVM({
       revertOptions,
       asset,
-      amount,
+      amount: amountReverted,
       err,
       tss,
       provider,

diff --git a/packages/localnet/src/handleOnRevertEVM.ts b/packages/localnet/src/handleOnRevertEVM.ts
@@ -26,7 +26,7 @@ export const handleOnRevertEVM = async ({
   const revertMessage = revertOptions[3];
   const revertContext = {
     asset,
-    amount, // this should deduct the gas costs
+    amount,
     revertMessage,
   };
   if (callOnRevert) {