-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(
crosschain): general improvements for gas payments and revert …
…txs (#1064) * pay gas on revert * fix gas limit * update smoke test * make generate * add revert gas limit note * fix out amount from gas payment calculation * add queryWithdrawalFee method * implement pay gas native * fix non-existing module account * add conditional burning of the fees * fix smoke test btc amount * use Zeta coin for CLI integration tests * add protocol gas fee and gas limit queries * use gas limit and gas price in PayGasNative * uncomment smoke tests * fix unpack * experiment integration tests fix * fix no error check * set addresses back * fix erorr undefined * fix mocks * change error messages * comments * improve crosschain testkeeper * fix gas price native, remove burning * add test for pay gas native * goimports * test for PayGasInZetaAndUpdateCctx * change test message * refactor file naming * improve system contract naming * add make mocks * fix gas payment tests * get zrc20 from asset * implement CallUniswapV2RouterSwapExactTokenForETH * Implement PayGasInERC20AndUpdateCctx * use cosmoserror * add approve * goimports * add success test * improve error messaging * implement test error cases * refund amount * goimports * use specific error for no liquidity pool * use input amount * smoke test commented * goimport * fix unit test * complete smoke test * add sender to erc20 cctx * use pool path * update mocks * update post tx gas limit * fix evm panic call * add back all smoke test * goimports * fix undefined error * fix coin 2 --------- Co-authored-by: brewmaster012 <[email protected]>
- Loading branch information
1 parent
8e9c672
commit bc0e26d
Showing
45 changed files
with
2,874 additions
and
441 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
200 changes: 200 additions & 0 deletions
200
contrib/localnet/orchestrator/smoketest/test_erc20_refund.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,200 @@ | ||
| //go:build PRIVNET | ||
| // +build PRIVNET | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "math/big" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/accounts/abi/bind" | ||
| ethcommon "github.com/ethereum/go-ethereum/common" | ||
|
|
||
| "github.com/zeta-chain/zetacore/x/crosschain/types" | ||
| ) | ||
|
|
||
| func (sm *SmokeTest) TestERC20DepositAndCallRefund() { | ||
| startTime := time.Now() | ||
| defer func() { | ||
| fmt.Printf("test finishes in %s\n", time.Since(startTime)) | ||
| }() | ||
| LoudPrintf("Deposit a non-gas ZRC20 into ZEVM and call a contract that reverts; should refund on ZetaChain if no liquidity pool, should refund on origin if liquidity pool\n") | ||
|
|
||
| // Get the initial balance of the deployer | ||
| initialBal, err := sm.USDTZRC20.BalanceOf(&bind.CallOpts{}, DeployerAddress) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| fmt.Println("Sending a deposit that should revert without a liquidity pool makes the cctx aborted") | ||
|
|
||
| amount := big.NewInt(1e4) | ||
|
|
||
| // send the deposit | ||
| inTxHash, err := sm.sendInvalidUSDTDeposit(amount) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| // There is no liquidity pool, therefore the cctx should abort | ||
| cctx := WaitCctxMinedByInTxHash(inTxHash, sm.cctxClient) | ||
| if cctx.CctxStatus.Status != types.CctxStatus_Aborted { | ||
| panic(fmt.Sprintf("expected cctx status to be Aborted; got %s", cctx.CctxStatus.Status)) | ||
| } | ||
|
|
||
| // Check that the erc20 in the aborted cctx was refunded on ZetaChain | ||
| newBalance, err := sm.USDTZRC20.BalanceOf(&bind.CallOpts{}, DeployerAddress) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| expectedBalance := initialBal.Add(initialBal, amount) | ||
| if newBalance.Cmp(expectedBalance) != 0 { | ||
| panic(fmt.Sprintf("expected balance to be %s after refund; got %s", expectedBalance.String(), newBalance.String())) | ||
| } | ||
| fmt.Println("CCTX has been aborted and the erc20 has been refunded on ZetaChain") | ||
|
|
||
| amount = big.NewInt(1e7) | ||
| goerliBalance, err := sm.USDTERC20.BalanceOf(&bind.CallOpts{}, DeployerAddress) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| fmt.Println("Sending a deposit that should revert with a liquidity pool") | ||
|
|
||
| fmt.Println("Creating the liquidity pool USTD/ZETA") | ||
| err = sm.createZetaERC20LiquidityPool() | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| fmt.Println("Liquidity pool created") | ||
|
|
||
| // send the deposit | ||
| inTxHash, err = sm.sendInvalidUSDTDeposit(amount) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| // there is a liquidity pool, therefore the cctx should revert | ||
| cctx = WaitCctxMinedByInTxHash(inTxHash, sm.cctxClient) | ||
|
|
||
| // the revert tx creation will fail because the sender, used as the recipient, is not defined in the cctx | ||
| if cctx.CctxStatus.Status != types.CctxStatus_Reverted { | ||
| panic(fmt.Sprintf("expected cctx status to be PendingRevert; got %s", cctx.CctxStatus.Status)) | ||
| } | ||
|
|
||
| // get revert tx | ||
| revertTxHash := cctx.GetCurrentOutTxParam().OutboundTxHash | ||
| _, _, err = sm.goerliClient.TransactionByHash(context.Background(), ethcommon.HexToHash(revertTxHash)) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| receipt, err := sm.goerliClient.TransactionReceipt(context.Background(), ethcommon.HexToHash(revertTxHash)) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| if receipt.Status == 0 { | ||
| panic("expected the revert tx receipt to have status 1; got 0") | ||
| } | ||
|
|
||
| // check that the erc20 in the reverted cctx was refunded on Goerli | ||
| newGoerliBalance, err := sm.USDTERC20.BalanceOf(&bind.CallOpts{}, DeployerAddress) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| // the new balance must be higher than the previous one because of the revert refund | ||
| if goerliBalance.Cmp(newGoerliBalance) != -1 { | ||
| panic(fmt.Sprintf("expected balance to be higher than %s after refund; got %s", goerliBalance.String(), newGoerliBalance.String())) | ||
| } | ||
| // it must also be lower than the previous balance + the amount because of the gas fee for the revert tx | ||
| balancePlusAmount := goerliBalance.Add(goerliBalance, amount) | ||
| if newGoerliBalance.Cmp(balancePlusAmount) != -1 { | ||
| panic(fmt.Sprintf("expected balance to be lower than %s after refund; got %s", balancePlusAmount.String(), newGoerliBalance.String())) | ||
| } | ||
|
|
||
| fmt.Println("ERC20 CCTX successfully reverted") | ||
| fmt.Println("\tbalance before refund: ", goerliBalance.String()) | ||
| fmt.Println("\tamount: ", amount.String()) | ||
| fmt.Println("\tbalance after refund: ", newGoerliBalance.String()) | ||
| } | ||
|
|
||
| func (sm *SmokeTest) createZetaERC20LiquidityPool() error { | ||
| amount := big.NewInt(1e10) | ||
| txHash := sm.DepositERC20(amount, []byte{}) | ||
| WaitCctxMinedByInTxHash(txHash.Hex(), sm.cctxClient) | ||
|
|
||
| tx, err := sm.USDTZRC20.Approve(sm.zevmAuth, sm.UniswapV2RouterAddr, big.NewInt(1e10)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| receipt := MustWaitForTxReceipt(sm.zevmClient, tx) | ||
| if receipt.Status == 0 { | ||
| return errors.New("approve failed") | ||
| } | ||
|
|
||
| previousValue := sm.zevmAuth.Value | ||
| sm.zevmAuth.Value = big.NewInt(1e10) | ||
| tx, err = sm.UniswapV2Router.AddLiquidityETH( | ||
| sm.zevmAuth, | ||
| sm.USDTZRC20Addr, | ||
| amount, | ||
| BigZero, | ||
| BigZero, | ||
| DeployerAddress, | ||
| big.NewInt(time.Now().Add(10*time.Minute).Unix()), | ||
| ) | ||
| sm.zevmAuth.Value = previousValue | ||
| if err != nil { | ||
| return err | ||
| } | ||
| receipt = MustWaitForTxReceipt(sm.zevmClient, tx) | ||
| if receipt.Status == 0 { | ||
| return errors.New("add liquidity failed") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (sm *SmokeTest) sendInvalidUSDTDeposit(amount *big.Int) (string, error) { | ||
| // send the tx | ||
| USDT := sm.USDTERC20 | ||
| tx, err := USDT.Mint(sm.goerliAuth, amount) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| receipt := MustWaitForTxReceipt(sm.goerliClient, tx) | ||
| fmt.Printf("Mint receipt tx hash: %s\n", tx.Hash().Hex()) | ||
|
|
||
| tx, err = USDT.Approve(sm.goerliAuth, sm.ERC20CustodyAddr, amount) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| receipt = MustWaitForTxReceipt(sm.goerliClient, tx) | ||
| fmt.Printf("USDT Approve receipt tx hash: %s\n", tx.Hash().Hex()) | ||
|
|
||
| tx, err = sm.ERC20Custody.Deposit( | ||
| sm.goerliAuth, | ||
| DeployerAddress.Bytes(), | ||
| sm.USDTERC20Addr, | ||
| amount, | ||
| []byte("this is an invalid msg that will cause the contract to revert"), | ||
| ) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| fmt.Printf("GOERLI tx sent: %s; to %s, nonce %d\n", tx.Hash().String(), tx.To().Hex(), tx.Nonce()) | ||
| receipt = MustWaitForTxReceipt(sm.goerliClient, tx) | ||
| if receipt.Status == 0 { | ||
| return "", errors.New("expected the tx receipt to have status 1; got 0") | ||
| } | ||
| fmt.Printf("GOERLI tx receipt: %d\n", receipt.Status) | ||
| fmt.Printf(" tx hash: %s\n", receipt.TxHash.String()) | ||
| fmt.Printf(" to: %s\n", tx.To().String()) | ||
| fmt.Printf(" value: %d\n", tx.Value()) | ||
| fmt.Printf(" block num: %d\n", receipt.BlockNumber) | ||
|
|
||
| return tx.Hash().Hex(), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.