fix offchain tests

smartcontractkit · Nov 28, 2024 · 9214ff3 · 9214ff3
1 parent c204696
commit 9214ff3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/core/scripts/ccip/liquiditymanager/util.go b/core/scripts/ccip/liquiditymanager/util.go
@@ -243,6 +243,7 @@ func deployTokenPoolAndRebalancer(
 		transactor,
 		client,
 		tokenAddress,
+		18,
 		[]common.Address{},
 		armProxyAddress,
 		true,

diff --git a/core/services/ocr2/plugins/ccip/testhelpers/ccip_contracts.go b/core/services/ocr2/plugins/ccip/testhelpers/ccip_contracts.go
@@ -73,6 +73,8 @@ var (
 	SourceChainSelector = uint64(11787463284727550157)
 	DestChainID         = uint64(1337)
 	DestChainSelector   = uint64(3379446385462418246)
+
+	TokenDecimals = uint8(18)
 )
 
 // Backwards compat, in principle these statuses are version dependent
@@ -785,6 +787,7 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 		sourceUser,
 		sourceChain,
 		sourceLinkTokenAddress,
+		TokenDecimals,
 		[]common.Address{},
 		armProxySourceAddress,
 		true,
@@ -801,6 +804,7 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 		sourceUser,
 		sourceChain,
 		sourceWeth9addr,
+		TokenDecimals,
 		[]common.Address{},
 		armProxySourceAddress,
 		true,
@@ -819,6 +823,7 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 		destUser,
 		destChain,
 		destLinkTokenAddress,
+		TokenDecimals,
 		[]common.Address{},
 		armProxyDestAddress,
 		true,
@@ -848,6 +853,7 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 		destUser,
 		destChain,
 		destWeth9addr,
+		TokenDecimals,
 		[]common.Address{},
 		armProxyDestAddress,
 		true,
@@ -882,11 +888,11 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 	require.NoError(t, err)
 	_, err = sourceLinkPool.ApplyChainUpdates(
 		sourceUser,
+		[]uint64{},
 		[]lock_release_token_pool.TokenPoolChainUpdate{{
 			RemoteChainSelector: DestChainSelector,
-			RemotePoolAddress:   abiEncodedDestLinkPool,
+			RemotePoolAddresses: [][]byte{abiEncodedDestLinkPool},
 			RemoteTokenAddress:  abiEncodedDestLinkTokenAddress,
-			Allowed:             true,
 			OutboundRateLimiterConfig: lock_release_token_pool.RateLimiterConfig{
 				IsEnabled: true,
 				Capacity:  HundredLink,
@@ -907,11 +913,11 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 	require.NoError(t, err)
 	_, err = sourceWeth9Pool.ApplyChainUpdates(
 		sourceUser,
+		[]uint64{},
 		[]lock_release_token_pool.TokenPoolChainUpdate{{
 			RemoteChainSelector: DestChainSelector,
-			RemotePoolAddress:   abiEncodedDestWrappedPool,
+			RemotePoolAddresses: [][]byte{abiEncodedDestWrappedPool},
 			RemoteTokenAddress:  abiEncodedDestWrappedTokenAddr,
-			Allowed:             true,
 			OutboundRateLimiterConfig: lock_release_token_pool.RateLimiterConfig{
 				IsEnabled: true,
 				Capacity:  HundredLink,
@@ -933,11 +939,11 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 	require.NoError(t, err)
 	_, err = destLinkPool.ApplyChainUpdates(
 		destUser,
+		[]uint64{},
 		[]lock_release_token_pool.TokenPoolChainUpdate{{
 			RemoteChainSelector: SourceChainSelector,
-			RemotePoolAddress:   abiEncodedSourceLinkPool,
+			RemotePoolAddresses: [][]byte{abiEncodedSourceLinkPool},
 			RemoteTokenAddress:  abiEncodedSourceLinkTokenAddr,
-			Allowed:             true,
 			OutboundRateLimiterConfig: lock_release_token_pool.RateLimiterConfig{
 				IsEnabled: true,
 				Capacity:  HundredLink,
@@ -958,11 +964,11 @@ func SetupCCIPContracts(t *testing.T, sourceChainID, sourceChainSelector, destCh
 	require.NoError(t, err)
 	_, err = destWrappedPool.ApplyChainUpdates(
 		destUser,
+		[]uint64{},
 		[]lock_release_token_pool.TokenPoolChainUpdate{{
 			RemoteChainSelector: SourceChainSelector,
-			RemotePoolAddress:   abiEncodedSourceWrappedPool,
+			RemotePoolAddresses: [][]byte{abiEncodedSourceWrappedPool},
 			RemoteTokenAddress:  abiEncodedSourceWrappedTokenAddr,
-			Allowed:             true,
 			OutboundRateLimiterConfig: lock_release_token_pool.RateLimiterConfig{
 				IsEnabled: true,
 				Capacity:  HundredLink,

diff --git a/core/services/ocr2/plugins/liquiditymanager/internal/integration_test.go b/core/services/ocr2/plugins/liquiditymanager/internal/integration_test.go
@@ -657,7 +657,7 @@ func deployContracts(
 
 		// deploy lock/release pool targeting the weth9 contract
 		lockReleasePoolAddress, _, _, err := lock_release_token_pool.DeployLockReleaseTokenPool(
-			owner, backend, wethAddress, []common.Address{}, armProxyAddress, true, routerAddress)
+			owner, backend, wethAddress, 18, []common.Address{}, armProxyAddress, true, routerAddress)
 		require.NoError(t, err, "failed to deploy LockReleaseTokenPool contract")
 		backend.Commit()
 		lockReleasePool, err := lock_release_token_pool.NewLockReleaseTokenPool(lockReleasePoolAddress, backend)

diff --git a/integration-tests/ccip-tests/contracts/contract_deployer.go b/integration-tests/ccip-tests/contracts/contract_deployer.go
@@ -505,6 +505,7 @@ func (e *CCIPContractsDeployer) DeployLockReleaseTokenPoolContract(tokenAddr str
 				auth,
 				wrappers.MustNewWrappedContractBackend(e.evmClient, nil),
 				token,
+				testhelpers.TokenDecimals,
 				[]common.Address{},
 				rmnProxy,
 				true,

diff --git a/integration-tests/ccip-tests/contracts/contract_models.go b/integration-tests/ccip-tests/contracts/contract_models.go
@@ -478,14 +478,14 @@ func (w TokenPoolWrapper) IsSupportedChain(opts *bind.CallOpts, remoteChainSelec
 
 func (w TokenPoolWrapper) ApplyChainUpdates(opts *bind.TransactOpts, update []token_pool.TokenPoolChainUpdate) (*types.Transaction, error) {
 	if w.Latest != nil && w.Latest.PoolInterface != nil {
-		return w.Latest.PoolInterface.ApplyChainUpdates(opts, update)
+		return w.Latest.PoolInterface.ApplyChainUpdates(opts, []uint64{}, update)
 	}
 	if w.V1_4_0 != nil && w.V1_4_0.PoolInterface != nil {
 		V1_4_0Updates := make([]token_pool_1_4_0.TokenPoolChainUpdate, len(update))
 		for i, u := range update {
 			V1_4_0Updates[i] = token_pool_1_4_0.TokenPoolChainUpdate{
 				RemoteChainSelector: u.RemoteChainSelector,
-				Allowed:             u.Allowed,
+				Allowed:             true,
 				InboundRateLimiterConfig: token_pool_1_4_0.RateLimiterConfig{
 					IsEnabled: u.InboundRateLimiterConfig.IsEnabled,
 					Capacity:  u.InboundRateLimiterConfig.Capacity,
@@ -828,9 +828,8 @@ func (pool *TokenPool) SetRemoteChainOnPool(remoteChainSelector uint64, remotePo
 
 	selectorsToUpdate = append(selectorsToUpdate, token_pool.TokenPoolChainUpdate{
 		RemoteChainSelector: remoteChainSelector,
-		RemotePoolAddress:   encodedPoolAddress,
+		RemotePoolAddresses: [][]byte{encodedPoolAddress},
 		RemoteTokenAddress:  encodedTokenAddress,
-		Allowed:             true,
 		InboundRateLimiterConfig: token_pool.RateLimiterConfig{
 			IsEnabled: true,
 			Capacity:  new(big.Int).Mul(big.NewInt(1e18), big.NewInt(1e9)),