updates

smartcontractkit · Oct 19, 2023 · 12b8812 · 12b8812
1 parent 1c5684b
commit 12b8812
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 3 deletions.
diff --git a/integration-tests/ccip-tests/Makefile b/integration-tests/ccip-tests/Makefile
@@ -7,6 +7,19 @@ test_load_ccip_simulated_k8:
     ENV_JOB_IMAGE=$(testimage)  \
 	go test -timeout 24h -count=1 -v -run ^TestLoadCCIPStableRequestTriggeringWithNetworkChaos$$ ./load
 
+
+# example usage: make test_load_ccip_simulated_k8 image=chainlink-ccip tag=latest testimage=chainlink-ccip-tests:latest
+.PHONY: test_load_ccip_testnet_k8
+test_load_ccip_testnet_k8:
+	source ./load-test.env && \
+	SELECTED_NETWORKS="SIMULATED,SEPOLIA,OPTIMISM_GOERLI,ARBITRUM_GOERLI,AVALANCHE_FUJI,BSC_TESTNET,MUMBAI,BASE_GOERLI"  \
+	CCIP_NO_OF_NETWORKS=7  \
+	CCIP_CHAINLINK_NODE_FUNDING=10  \
+    CHAINLINK_IMAGE=$(image)  \
+    CHAINLINK_VERSION=$(tag)  \
+    ENV_JOB_IMAGE=$(testimage)  \
+	go test -timeout 24h -count=1 -v -run ^TestLoadCCIPStableRPS$$ ./load
+
 # example usage: make test_smoke_ccip_simulated_local image=chainlink-ccip tag=latest testname=TestSmokeCCIPForBidirectionalLane
 .PHONY: test_smoke_ccip_simulated_local
 test_smoke_ccip_simulated_local:

diff --git a/integration-tests/ccip-tests/contracts/laneconfig/contracts.json b/integration-tests/ccip-tests/contracts/laneconfig/contracts.json
@@ -725,6 +725,30 @@
         }
       }
     },
+    "Arbitrum Goerli-3": {
+      "is_mock_arm": true,
+      "fee_token": "0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28",
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0x8DBe3f909D4dD20dC38a53c71785F13F582Df36F",
+      "router": "",
+      "price_registry": "0x22bC3FDf88f14a2bc19ea5e94Ebb7Fb5ca87d86C",
+      "wrapped_native": "0x32d5D5978905d9c6c2D4C417F0E06Fe768a4FB5a",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
+    "Arbitrum Goerli-4": {
+      "is_mock_arm": true,
+      "fee_token": "0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28",
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0x8DBe3f909D4dD20dC38a53c71785F13F582Df36F",
+      "router": "",
+      "price_registry": "0x22bC3FDf88f14a2bc19ea5e94Ebb7Fb5ca87d86C",
+      "wrapped_native": "0x32d5D5978905d9c6c2D4C417F0E06Fe768a4FB5a",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
     "Avalanche Fuji-1": {
       "is_mock_arm": true,
       "fee_token": "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846",
@@ -861,6 +885,30 @@
         }
       }
     },
+    "Avalanche Fuji-3": {
+      "is_mock_arm": true,
+      "fee_token": "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846",
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0xFee98E43a2ED492Bb7f0EBE29ccBcdBd4b99E906",
+      "router": "",
+      "price_registry": "0xb014099621f4d7996BDaAa381545aE6A3F146526",
+      "wrapped_native": "0xd00ae08403B9bbb9124bB305C09058E32C39A48c",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
+    "Avalanche Fuji-4": {
+      "is_mock_arm": true,
+      "fee_token": "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846",
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0xFee98E43a2ED492Bb7f0EBE29ccBcdBd4b99E906",
+      "router": "",
+      "price_registry": "0xb014099621f4d7996BDaAa381545aE6A3F146526",
+      "wrapped_native": "0xd00ae08403B9bbb9124bB305C09058E32C39A48c",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
     "BSC Testnet-1": {
       "is_mock_arm": true,
       "fee_token": "0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06",
@@ -997,6 +1045,30 @@
         }
       }
     },
+    "BSC Testnet-3": {
+      "is_mock_arm": true,
+      "fee_token": "0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06",
+      "bridge_tokens": [],
+      "bridge_tokens_pools": [],
+      "arm": "0x092047b6f7db7C0Ea8AE58075f7869DC5c1C0f3f",
+      "router": "",
+      "price_registry": "0x1b424319E6DA0FFaAD1Df89A3FD49E90014c3e66",
+      "wrapped_native": "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
+    "BSC Testnet-4": {
+      "is_mock_arm": true,
+      "fee_token": "0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06",
+      "bridge_tokens": [],
+      "bridge_tokens_pools": [],
+      "arm": "0x092047b6f7db7C0Ea8AE58075f7869DC5c1C0f3f",
+      "router": "",
+      "price_registry": "0x1b424319E6DA0FFaAD1Df89A3FD49E90014c3e66",
+      "wrapped_native": "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
     "Base Goerli-1": {
       "is_mock_arm": true,
       "fee_token": "0xD886E2286Fd1073df82462ea1822119600Af80b6",
@@ -1135,6 +1207,32 @@
         }
       }
     },
+    "Base Goerli-3": {
+      "is_mock_arm": true,
+      "fee_token": "0xD886E2286Fd1073df82462ea1822119600Af80b6",
+      "is_native_fee_token": true,
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0xC110044180409bdF033B25e5962C415c5C5C2A99",
+      "router": "",
+      "price_registry": "0x3011Df7E7d34Ae72070Bb9C5A9DEfCc8489269C5",
+      "wrapped_native": "0x4200000000000000000000000000000000000006",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
+    "Base Goerli-4": {
+      "is_mock_arm": true,
+      "fee_token": "0xD886E2286Fd1073df82462ea1822119600Af80b6",
+      "is_native_fee_token": true,
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0xC110044180409bdF033B25e5962C415c5C5C2A99",
+      "router": "",
+      "price_registry": "0x3011Df7E7d34Ae72070Bb9C5A9DEfCc8489269C5",
+      "wrapped_native": "0x4200000000000000000000000000000000000006",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
     "Optimism Goerli-1": {
       "is_mock_arm": true,
       "fee_token": "0xdc2CC710e42857672E7907CF474a69B63B93089f",
@@ -1271,6 +1369,30 @@
         }
       }
     },
+    "Optimism Goerli-3": {
+      "is_mock_arm": true,
+      "fee_token": "0xdc2CC710e42857672E7907CF474a69B63B93089f",
+      "bridge_tokens": [],
+      "bridge_tokens_pools": [],
+      "arm": "0xb2BDC15AF974EdD65813C5d508F60E625fDDC7F6",
+      "router": "",
+      "price_registry": "0x121F2CBDa72d73502d7a896CA10b2650e45dd83D",
+      "wrapped_native": "0x4200000000000000000000000000000000000006",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
+    "Optimism Goerli-4": {
+      "is_mock_arm": true,
+      "fee_token": "0xdc2CC710e42857672E7907CF474a69B63B93089f",
+      "bridge_tokens": [],
+      "bridge_tokens_pools": [],
+      "arm": "0xb2BDC15AF974EdD65813C5d508F60E625fDDC7F6",
+      "router": "",
+      "price_registry": "0x121F2CBDa72d73502d7a896CA10b2650e45dd83D",
+      "wrapped_native": "0x4200000000000000000000000000000000000006",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
     "Polygon Mumbai-1": {
       "is_mock_arm": true,
       "fee_token": "0x326C977E6efc84E512bB9C30f76E30c160eD06FB",
@@ -1407,6 +1529,30 @@
         }
       }
     },
+    "Polygon Mumbai-3": {
+      "is_mock_arm": true,
+      "fee_token": "0x326C977E6efc84E512bB9C30f76E30c160eD06FB",
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0xDC88BcE99f0C1A997010953e83BC9380ec9aDa8F",
+      "router": "",
+      "price_registry": "0x569CaE44B4C2B94dB796032119440e85e229DDbF",
+      "wrapped_native": "0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
+    "Polygon Mumbai-4": {
+      "is_mock_arm": true,
+      "fee_token": "0x326C977E6efc84E512bB9C30f76E30c160eD06FB",
+      "bridge_tokens": null,
+      "bridge_tokens_pools": null,
+      "arm": "0xDC88BcE99f0C1A997010953e83BC9380ec9aDa8F",
+      "router": "",
+      "price_registry": "0x569CaE44B4C2B94dB796032119440e85e229DDbF",
+      "wrapped_native": "0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
     "Sepolia Testnet-1": {
       "is_mock_arm": true,
       "fee_token": "0x779877A7B0D9E8603169DdbD7836e478b4624789",
@@ -1542,6 +1688,30 @@
           "receiver_dapp": "0x2078C5fc33ccC02dafFf18e9C6Cbf09fcc43D66c"
         }
       }
+    },
+    "Sepolia Testnet-3": {
+      "is_mock_arm": true,
+      "fee_token": "0x779877A7B0D9E8603169DdbD7836e478b4624789",
+      "bridge_tokens": [],
+      "bridge_tokens_pools": [],
+      "arm": "0x996C84211D7D2E80a0c27857dD38BFBb87700075",
+      "router": "",
+      "price_registry": "0x27D25dE4E6d2C876bE139908acA8a3783a53dACf",
+      "wrapped_native": "0x097D90c9d3E0B50Ca60e1ae45F6A81010f9FB534",
+      "src_contracts": {},
+      "dest_contracts": {}
+    },
+    "Sepolia Testnet-4": {
+      "is_mock_arm": true,
+      "fee_token": "0x779877A7B0D9E8603169DdbD7836e478b4624789",
+      "bridge_tokens": [],
+      "bridge_tokens_pools": [],
+      "arm": "0x996C84211D7D2E80a0c27857dD38BFBb87700075",
+      "router": "",
+      "price_registry": "0x27D25dE4E6d2C876bE139908acA8a3783a53dACf",
+      "wrapped_native": "0x097D90c9d3E0B50Ca60e1ae45F6A81010f9FB534",
+      "src_contracts": {},
+      "dest_contracts": {}
     }
   }
 }
diff --git a/integration-tests/ccip-tests/load-test.env b/integration-tests/ccip-tests/load-test.env
@@ -12,8 +12,8 @@ export CCIP_TESTS_ON_EXISTING_DEPLOYMENT=False
 # the test will use simulated networks
 export SELECTED_NETWORKS="SIMULATED,SIMULATED_1,SIMULATED_2"
 export CCIP_NETWORK_PAIRS=""
-# th
-export CCIP_NO_OF_NETWORKS=10
+
+export CCIP_NO_OF_NETWORKS=18
 export CCIP_NO_OF_LANES_PER_PAIR=2
 
 # The load will be triggered as <CCIP_LOAD_TEST_RATE> per <CCIP_LOAD_TEST_RATEUNIT>
@@ -26,14 +26,16 @@ export CCIP_TEST_DURATION=1h
 export CCIP_KEEP_ENV_ALIVE=True
 
 # if CCIP_CHAINLINK_NODE_FUNDING is set, chainlink nodes will be funded with the mentioned amount in native.
-export CCIP_CHAINLINK_NODE_FUNDING=1000
+export CCIP_CHAINLINK_NODE_FUNDING=10
 
 # if CCIP_KEEP_ENV_TTL is set, the env will be destroyed after the mentioned duration.
 export CCIP_KEEP_ENV_TTL=24h
 
 # Msg type to use for the load test. Default value is WithToken unless specified.
 # Values to choose from WithToken,WithoutToken
 export CCIP_MSG_TYPE=WithoutToken
+export CCIP_NO_OF_TOKENS=35
+export CCIP_TRANSFER_AMOUNT_PER_TOKEN=1
 
 # remote runner resource requirements
 export RR_MEM=16Gi

diff --git a/integration-tests/ccip-tests/testsetups/ccip.go b/integration-tests/ccip-tests/testsetups/ccip.go
@@ -509,6 +509,13 @@ func NewCCIPTestConfig(t *testing.T, lggr zerolog.Logger, tType string) *CCIPTes
 				p.NoOfTokens = n
 			}
 		}
+		// if the number of tokens is more than 5, increase the gas limit
+		if p.NoOfTokens > 5 {
+			for _, pair := range p.NetworkPairs {
+				pair.NetworkA.DefaultGasLimit = 10000000
+				pair.NetworkB.DefaultGasLimit = 10000000
+			}
+		}
 
 		tokenAmountStr, _ := utils.GetEnv("CCIP_TRANSFER_AMOUNT_PER_TOKEN")
 		if tokenAmountStr != "" {