-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into dht-removal
- Loading branch information
Showing
50 changed files
with
859 additions
and
361 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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package e2etests | ||
|
|
||
| import ( | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/zeta-chain/node/e2e/runner" | ||
| "github.com/zeta-chain/node/e2e/utils" | ||
| testcontract "github.com/zeta-chain/node/testutil/contracts" | ||
| cctypes "github.com/zeta-chain/node/x/crosschain/types" | ||
| ) | ||
|
|
||
| func TestTONDepositAndCallRefund(r *runner.E2ERunner, args []string) { | ||
| require.Len(r, args, 1) | ||
|
|
||
| // Given amount and arbitrary call data | ||
| var ( | ||
| amount = parseUint(r, args[0]) | ||
| data = []byte("hello reverter") | ||
| ) | ||
|
|
||
| // Given deployer mock revert contract | ||
| // deploy a reverter contract in ZEVM | ||
| reverterAddr, _, _, err := testcontract.DeployReverter(r.ZEVMAuth, r.ZEVMClient) | ||
| require.NoError(r, err) | ||
| r.Logger.Info("Reverter contract deployed at: %s", reverterAddr.String()) | ||
|
|
||
| // ACT | ||
| // Send a deposit and call transaction from the deployer (faucet) | ||
| // to the reverter contract | ||
| cctx, err := r.TONDepositAndCall( | ||
| &r.TONDeployer.Wallet, | ||
| amount, | ||
| reverterAddr, | ||
| data, | ||
| runner.TONExpectStatus(cctypes.CctxStatus_Reverted), | ||
| ) | ||
|
|
||
| // ASSERT | ||
| require.NoError(r, err) | ||
| r.Logger.CCTX(*cctx, "ton_deposit_and_refund") | ||
|
|
||
| // Check the error carries the revert executed. | ||
| // tolerate the error in both the ErrorMessage field and the StatusMessage field | ||
| if cctx.CctxStatus.ErrorMessage != "" { | ||
| require.Contains(r, cctx.CctxStatus.ErrorMessage, "revert executed") | ||
| return | ||
| } | ||
|
|
||
| require.Contains(r, cctx.CctxStatus.StatusMessage, utils.ErrHashRevertFoo) | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package e2etests | ||
|
|
||
| import ( | ||
| "math/rand" | ||
| "sync" | ||
|
|
||
| "cosmossdk.io/math" | ||
| ethtypes "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/tonkeeper/tongo/ton" | ||
|
|
||
| "github.com/zeta-chain/node/e2e/runner" | ||
| "github.com/zeta-chain/node/e2e/utils" | ||
| toncontracts "github.com/zeta-chain/node/pkg/contracts/ton" | ||
| "github.com/zeta-chain/node/testutil/sample" | ||
| cc "github.com/zeta-chain/node/x/crosschain/types" | ||
| ) | ||
|
|
||
| // TestTONWithdrawConcurrent makes sure that multiple concurrent | ||
| // withdrawals will be eventually processed by sequentially increasing Gateway nonce | ||
| // and that zetaclient tolerates "invalid nonce" error from RPC. | ||
| func TestTONWithdrawConcurrent(r *runner.E2ERunner, _ []string) { | ||
| // ARRANGE | ||
| // Given a deployer | ||
| _, deployer := r.Ctx, r.TONDeployer | ||
|
|
||
| const recipientsCount = 10 | ||
|
|
||
| // Fire withdrawals. Note that zevm sender is r.ZEVMAuth | ||
| var wg sync.WaitGroup | ||
| for i := 0; i < recipientsCount; i++ { | ||
| // ARRANGE | ||
| // Given multiple recipients WITHOUT deployed wallet-contracts | ||
| // and withdrawal amounts between 1 and 5 TON | ||
| var ( | ||
| // #nosec G404: it's a test | ||
| amountCoins = 1 + rand.Intn(5) | ||
| // #nosec G115 test - always in range | ||
| amount = toncontracts.Coins(uint64(amountCoins)) | ||
| recipient = sample.GenerateTONAccountID() | ||
| ) | ||
|
|
||
| // ACT | ||
| r.Logger.Info( | ||
| "Withdrawal #%d: sending %s to %s", | ||
| i+1, | ||
| toncontracts.FormatCoins(amount), | ||
| recipient.ToRaw(), | ||
| ) | ||
|
|
||
| approvedAmount := amount.Add(toncontracts.Coins(1)) | ||
| tx := r.SendWithdrawTONZRC20(recipient, amount.BigInt(), approvedAmount.BigInt()) | ||
|
|
||
| wg.Add(1) | ||
|
|
||
| go func(number int, recipient ton.AccountID, amount math.Uint, tx *ethtypes.Transaction) { | ||
| defer wg.Done() | ||
|
|
||
| // wait for the cctx to be mined | ||
| cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout) | ||
|
|
||
| // ASSERT | ||
| utils.RequireCCTXStatus(r, cctx, cc.CctxStatus_OutboundMined) | ||
| r.Logger.Info("Withdrawal #%d complete! cctx index: %s", number, cctx.Index) | ||
|
|
||
| // Check recipient's balance ON TON | ||
| balance, err := deployer.GetBalanceOf(r.Ctx, recipient, false) | ||
| require.NoError(r, err, "failed to get balance of %s", recipient.ToRaw()) | ||
| require.Equal(r, amount.Uint64(), balance.Uint64()) | ||
| }(i+1, recipient, amount, tx) | ||
| } | ||
|
|
||
| wg.Wait() | ||
| } |
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.