Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@mateusz-sekara
mateusz-sekara committed Nov 29, 2024
1 parent 7f3fb4f commit b870f35
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 68 deletions.
23 changes: 13 additions & 10 deletions deployment/ccip/changeset/test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,23 +1023,23 @@ func MintAndAllow(
owners map[uint64]*bind.TransactOpts,
tkMap map[uint64][]*burn_mint_erc677.BurnMintERC677,
) {
for chain, tokens := range tkMap {
for _, token := range tokens {
twoCoins := new(big.Int).Mul(big.NewInt(1e18), big.NewInt(2))
tenCoins := new(big.Int).Mul(big.NewInt(1e18), big.NewInt(10))

owner, ok := owners[chain]
require.True(t, ok)
for chain, tokens := range tkMap {
owner, ok := owners[chain]
require.True(t, ok)

for _, token := range tokens {
tx, err := token.Mint(
owner,
e.Chains[chain].DeployerKey.From,
new(big.Int).Mul(twoCoins, big.NewInt(10)),
new(big.Int).Mul(tenCoins, big.NewInt(10)),
)
require.NoError(t, err)
_, err = e.Chains[chain].Confirm(tx)
require.NoError(t, err)

tx, err = token.Approve(e.Chains[chain].DeployerKey, state.Chains[chain].Router.Address(), twoCoins)
tx, err = token.Approve(e.Chains[chain].DeployerKey, state.Chains[chain].Router.Address(), tenCoins)
require.NoError(t, err)
_, err = e.Chains[chain].Confirm(tx)
require.NoError(t, err)
Expand All @@ -1049,6 +1049,7 @@ func MintAndAllow(

// TransferAndWaitForSuccess sends a message from sourceChain to destChain and waits for it to be executed
func TransferAndWaitForSuccess(
ctx context.Context,
t *testing.T,
env deployment.Environment,
state CCIPOnChainState,
Expand All @@ -1067,7 +1068,7 @@ func TransferAndWaitForSuccess(
expectedSeqNum := make(map[SourceDestPair]uint64)
expectedSeqNumExec := make(map[SourceDestPair][]uint64)

latesthdr, err := env.Chains[destChain].Client.HeaderByNumber(testcontext.Get(t), nil)
latesthdr, err := env.Chains[destChain].Client.HeaderByNumber(ctx, nil)
require.NoError(t, err)
block := latesthdr.Number.Uint64()
startBlocks[destChain] = &block
Expand All @@ -1091,6 +1092,7 @@ func TransferAndWaitForSuccess(
}

func WaitForTheTokenBalance(
ctx context.Context,
t *testing.T,
token common.Address,
receiver common.Address,
Expand All @@ -1101,7 +1103,7 @@ func WaitForTheTokenBalance(
require.NoError(t, err)

require.Eventually(t, func() bool {
actualBalance, err := tokenContract.BalanceOf(&bind.CallOpts{Context: tests.Context(t)}, receiver)
actualBalance, err := tokenContract.BalanceOf(&bind.CallOpts{Context: ctx}, receiver)
require.NoError(t, err)

t.Log("Waiting for the token balance",
Expand All @@ -1116,6 +1118,7 @@ func WaitForTheTokenBalance(
}

func GetTokenBalance(
ctx context.Context,
t *testing.T,
token common.Address,
receiver common.Address,
Expand All @@ -1124,7 +1127,7 @@ func GetTokenBalance(
tokenContract, err := burn_mint_erc677.NewBurnMintERC677(token, chain.Client)
require.NoError(t, err)

balance, err := tokenContract.BalanceOf(&bind.CallOpts{Context: tests.Context(t)}, receiver)
balance, err := tokenContract.BalanceOf(&bind.CallOpts{Context: ctx}, receiver)
require.NoError(t, err)

t.Log("Getting token balance",
Expand Down
88 changes: 33 additions & 55 deletions integration-tests/smoke/ccip/ccip_token_transfer_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package smoke

import (
"context"
"math/big"
"testing"

Expand All @@ -26,6 +27,7 @@ import (

func TestTokenTransfer(t *testing.T) {
lggr := logger.TestLogger(t)
ctx := tests.Context(t)
config := &changeset.TestConfigs{}
tenv, _, _ := testsetups.NewLocalDevEnvironmentWithDefaultPrice(t, lggr, config)
inMemoryEnv := false
Expand All @@ -38,15 +40,17 @@ func TestTokenTransfer(t *testing.T) {
state, err := changeset.LoadOnchainState(e)
require.NoError(t, err)

// Chain and account setup
allChainSelectors := maps.Keys(e.Chains)
sourceChain, destChain := allChainSelectors[0], allChainSelectors[1]
ownerSourceChain := e.Chains[sourceChain].DeployerKey
ownerDestChain := e.Chains[destChain].DeployerKey

oneE18 := new(big.Int).SetUint64(1e18)
funds := new(big.Int).Mul(oneE18, new(big.Int).SetUint64(10))

// Deploy and fund self-serve actors
selfServeSrcTokenPoolDeployer := createAndFundSelfServeActor(t, ownerSourceChain, e.Chains[sourceChain], big.NewInt(1e18), inMemoryEnv)
selfServeDestTokenPoolDeployer := createAndFundSelfServeActor(t, ownerDestChain, e.Chains[destChain], big.NewInt(1e18), inMemoryEnv)
selfServeSrcTokenPoolDeployer := createAndFundSelfServeActor(ctx, t, ownerSourceChain, e.Chains[sourceChain], funds, inMemoryEnv)
selfServeDestTokenPoolDeployer := createAndFundSelfServeActor(ctx, t, ownerDestChain, e.Chains[destChain], funds, inMemoryEnv)

// Deploy tokens and pool by CCIP Owner
srcToken, _, destToken, _, err := changeset.DeployTransferableToken(
Expand Down Expand Up @@ -75,11 +79,8 @@ func TestTokenTransfer(t *testing.T) {
"SELF_SERVE_TOKEN",
)
require.NoError(t, err)

// Add all lanes.
require.NoError(t, changeset.AddLanesForAll(e, state))

// Mint and allow tokens for the router
changeset.MintAndAllow(t, e, state, map[uint64]*bind.TransactOpts{
sourceChain: ownerSourceChain,
destChain: ownerDestChain,
Expand All @@ -95,10 +96,7 @@ func TestTokenTransfer(t *testing.T) {
destChain: {selfServeDestToken},
})

tinyOneCoin := new(big.Int).SetUint64(1)

// Test scenarios are defined here
scenarios := []struct {
tcs := []struct {
name string
srcChain uint64
dstChain uint64
Expand All @@ -115,12 +113,12 @@ func TestTokenTransfer(t *testing.T) {
tokenAmounts: []router.ClientEVMTokenAmount{
{
Token: srcToken.Address(),
Amount: tinyOneCoin,
Amount: oneE18,
},
},
receiver: utils.RandomAddress(),
expectedTokenBalances: map[common.Address]*big.Int{
destToken.Address(): tinyOneCoin,
destToken.Address(): oneE18,
},
expectedExecutionState: changeset.EXECUTION_STATE_SUCCESS,
},
Expand All @@ -131,33 +129,12 @@ func TestTokenTransfer(t *testing.T) {
tokenAmounts: []router.ClientEVMTokenAmount{
{
Token: srcToken.Address(),
Amount: tinyOneCoin,
Amount: oneE18,
},
},
receiver: state.Chains[destChain].Receiver.Address(),
expectedTokenBalances: map[common.Address]*big.Int{
destToken.Address(): tinyOneCoin,
},
expectedExecutionState: changeset.EXECUTION_STATE_SUCCESS,
},
{
name: "Send 2 tokens to receiver",
srcChain: destChain,
dstChain: sourceChain,
tokenAmounts: []router.ClientEVMTokenAmount{
{
Token: destToken.Address(),
Amount: tinyOneCoin,
},
{
Token: selfServeDestToken.Address(),
Amount: tinyOneCoin,
},
},
receiver: e.Chains[sourceChain].DeployerKey.From,
expectedTokenBalances: map[common.Address]*big.Int{
srcToken.Address(): tinyOneCoin,
selfServeSrcToken.Address(): tinyOneCoin,
destToken.Address(): oneE18,
},
expectedExecutionState: changeset.EXECUTION_STATE_SUCCESS,
},
Expand All @@ -168,55 +145,56 @@ func TestTokenTransfer(t *testing.T) {
tokenAmounts: []router.ClientEVMTokenAmount{
{
Token: selfServeDestToken.Address(),
Amount: tinyOneCoin,
Amount: oneE18,
},
{
Token: destToken.Address(),
Amount: tinyOneCoin,
Amount: oneE18,
},
{
Token: selfServeDestToken.Address(),
Amount: tinyOneCoin,
Amount: oneE18,
},
},
receiver: state.Chains[sourceChain].Receiver.Address(),
expectedTokenBalances: map[common.Address]*big.Int{
selfServeSrcToken.Address(): new(big.Int).SetUint64(2),
srcToken.Address(): tinyOneCoin,
selfServeSrcToken.Address(): new(big.Int).Add(oneE18, oneE18),
srcToken.Address(): oneE18,
},
expectedExecutionState: changeset.EXECUTION_STATE_SUCCESS,
},
}

for _, scenario := range scenarios {
t.Run(scenario.name, func(t *testing.T) {
for _, tt := range tcs {
t.Run(tt.name, func(t *testing.T) {
initialBalances := map[common.Address]*big.Int{}
for token := range scenario.expectedTokenBalances {
initialBalance := changeset.GetTokenBalance(t, token, scenario.receiver, e.Chains[scenario.dstChain])
for token := range tt.expectedTokenBalances {
initialBalance := changeset.GetTokenBalance(ctx, t, token, tt.receiver, e.Chains[tt.dstChain])
initialBalances[token] = initialBalance
}

changeset.TransferAndWaitForSuccess(
t,
e,
state,
scenario.srcChain,
scenario.dstChain,
scenario.tokenAmounts,
scenario.receiver,
scenario.data,
scenario.expectedExecutionState,
tt.srcChain,
tt.dstChain,
tt.tokenAmounts,
tt.receiver,
tt.data,
tt.expectedExecutionState,
)

for token, balance := range scenario.expectedTokenBalances {
for token, balance := range tt.expectedTokenBalances {
expected := new(big.Int).Add(initialBalances[token], balance)
changeset.WaitForTheTokenBalance(t, token, scenario.receiver, e.Chains[scenario.dstChain], expected)
changeset.WaitForTheTokenBalance(ctx, t, token, tt.receiver, e.Chains[tt.dstChain], expected)
}
})
}
}

func createAndFundSelfServeActor(
ctx context.Context,
t *testing.T,
deployer *bind.TransactOpts,
chain deployment.Chain,
Expand All @@ -238,10 +216,10 @@ func createAndFundSelfServeActor(
actor, err := bind.NewKeyedTransactorWithChainID(key, chainID)
require.NoError(t, err)

nonce, err := chain.Client.PendingNonceAt(tests.Context(t), deployer.From)
nonce, err := chain.Client.PendingNonceAt(ctx, deployer.From)
require.NoError(t, err)

gasPrice, err := chain.Client.SuggestGasPrice(tests.Context(t))
gasPrice, err := chain.Client.SuggestGasPrice(ctx)
require.NoError(t, err)

tx := types.NewTx(&types.LegacyTx{
Expand All @@ -256,7 +234,7 @@ func createAndFundSelfServeActor(
signedTx, err := deployer.Signer(deployer.From, tx)
require.NoError(t, err)

err = chain.Client.SendTransaction(tests.Context(t), signedTx)
err = chain.Client.SendTransaction(ctx, signedTx)
require.NoError(t, err)

_, err = chain.Confirm(signedTx)
Expand Down
8 changes: 5 additions & 3 deletions integration-tests/smoke/ccip/ccip_usdc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/exp/maps"

"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
testsetups "github.com/smartcontractkit/chainlink/integration-tests/testsetups/ccip"
Expand All @@ -29,6 +30,7 @@ import (
*/
func TestUSDCTokenTransfer(t *testing.T) {
lggr := logger.TestLogger(t)
ctx := tests.Context(t)
config := &changeset.TestConfigs{
IsUSDC: true,
}
Expand Down Expand Up @@ -185,7 +187,7 @@ func TestUSDCTokenTransfer(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
initialBalances := map[common.Address]*big.Int{}
for token := range tt.expectedTokenBalances {
initialBalance := changeset.GetTokenBalance(t, token, tt.receiver, e.Chains[tt.destChain])
initialBalance := changeset.GetTokenBalance(ctx, t, token, tt.receiver, e.Chains[tt.destChain])
initialBalances[token] = initialBalance
}

Expand All @@ -203,7 +205,7 @@ func TestUSDCTokenTransfer(t *testing.T) {

for token, balance := range tt.expectedTokenBalances {
expected := new(big.Int).Add(initialBalances[token], balance)
changeset.WaitForTheTokenBalance(t, token, tt.receiver, e.Chains[tt.destChain], expected)
changeset.WaitForTheTokenBalance(ctx, t, token, tt.receiver, e.Chains[tt.destChain], expected)
}
})
}
Expand Down Expand Up @@ -251,6 +253,6 @@ func TestUSDCTokenTransfer(t *testing.T) {
// We sent 1 coin from each source chain, so we should have 2 coins on the destination chain
// Receiver is randomly generated so we don't need to get the initial balance first
expectedBalance := new(big.Int).Add(tinyOneCoin, tinyOneCoin)
changeset.WaitForTheTokenBalance(t, cChainUSDC.Address(), receiver, e.Chains[chainC], expectedBalance)
changeset.WaitForTheTokenBalance(ctx, t, cChainUSDC.Address(), receiver, e.Chains[chainC], expectedBalance)
})
}

0 comments on commit b870f35

Please sign in to comment.