fix withdraw

zeta-chain · Nov 7, 2024 · c127300 · c127300
1 parent 0529500
commit c127300
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/packages/localnet/src/createToken.ts b/packages/localnet/src/createToken.ts
@@ -109,6 +109,14 @@ export const createToken = async (
     deployOpts
   );
 
+  await (zrc20 as any)
+    .connect(deployer)
+    .transfer(
+      fungibleModuleSigner.getAddress(),
+      ethers.parseUnits("100", await (zrc20 as any).decimals()),
+      deployOpts
+    );
+
   await (wzeta as any)
     .connect(deployer)
     .deposit({ value: ethers.parseEther("1000"), ...deployOpts });

diff --git a/packages/localnet/src/handleOnRevertZEVM.ts b/packages/localnet/src/handleOnRevertZEVM.ts
@@ -41,6 +41,13 @@ export const handleOnRevertZEVM = async ({
   if (callOnRevert) {
     log("ZetaChain", "Gateway: calling executeRevert");
     try {
+      const assetContract = new ethers.Contract(
+        asset,
+        ["function transfer(address to, uint256 amount) public returns (bool)"],
+        fungibleModuleSigner
+      );
+      const transferTx = await assetContract.transfer(revertAddress, amount);
+      await transferTx.wait();
       tss.reset();
       const tx = await gatewayZEVM
         .connect(fungibleModuleSigner)

diff --git a/packages/localnet/src/handleOnZEVMWithdrawnAndCalled.ts b/packages/localnet/src/handleOnZEVMWithdrawnAndCalled.ts
@@ -57,7 +57,6 @@ export const handleOnZEVMWithdrawnAndCalled = async ({
     const coinType = await zrc20Contract.COIN_TYPE();
     const isGasToken = coinType === 1n;
     const isERC20orZETA = coinType === 2n;
-    // The message is not empty, so this is a withdrawAndCall operation
     log(chainID, `Calling ${receiver} with message ${message}`);
     if (isGasToken) {
       const executeTx = await evmContracts[chainID].gatewayEVM
@@ -95,7 +94,7 @@ export const handleOnZEVMWithdrawnAndCalled = async ({
       err,
       provider,
       tss,
-      asset: getERC20ByZRC20(zrc20),
+      asset: zrc20,
       amount,
       log,
       fungibleModuleSigner,