Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SHIP-2816] Add scroll sepolia network config #14126

Merged
merged 4 commits into from
Aug 15, 2024
Merged

[SHIP-2816] Add scroll sepolia network config #14126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4b5d86
Add scroll sepolia network config
joaoluisam Aug 14, 2024
af3eb42
disable reorg protection on v2_3 scroll, zkevm
anirudhwarrier Aug 15, 2024
f91a18d
fix node funding
anirudhwarrier Aug 15, 2024
649cf45
fix reorg protection logic
anirudhwarrier Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions integration-tests/benchmark/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@ var networkConfig = map[string]NetworkConfig{
blockTime: time.Second,
deltaStage: 20 * time.Second,
},
networks.ScrollSepolia.Name: {
upkeepSLA: int64(120),
blockTime: 3 * time.Second,
deltaStage: 20 * time.Second,
},
}

func SetupAutomationBenchmarkEnv(t *testing.T, keeperTestConfig types.KeeperBenchmarkTestConfig) (*environment.Environment, blockchain.EVMNetwork) {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/contracts/ethereum_contracts_automation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ type EthereumKeeperRegistry struct {
func (v *EthereumKeeperRegistry) ReorgProtectionEnabled() bool {
chainId := v.client.ChainID
// reorg protection is disabled in polygon zkEVM and Scroll bc currently there is no way to get the block hash onchain
return v.version != ethereum.RegistryVersion_2_2 || (chainId != 1101 && chainId != 1442 && chainId != 2442 && chainId != 534352 && chainId != 534351)
return v.version < ethereum.RegistryVersion_2_2 || (chainId != 1101 && chainId != 1442 && chainId != 2442 && chainId != 534352 && chainId != 534351)
}

func (v *EthereumKeeperRegistry) ChainModuleAddress() common.Address {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/testsetups/keeper_benchmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func (k *KeeperBenchmarkTest) Setup(env *environment.Environment, config tt.Keep
for index := range keysToFund {
// Fund chainlink nodes
nodesToFund := k.chainlinkNodes
if inputs.RegistryVersions[index] == ethereum.RegistryVersion_2_0 || inputs.RegistryVersions[index] == ethereum.RegistryVersion_2_1 || inputs.RegistryVersions[index] == ethereum.RegistryVersion_2_2 {
if inputs.RegistryVersions[index] >= ethereum.RegistryVersion_2_0 {
nodesToFund = k.chainlinkNodes[1:]
}
err = actions.FundChainlinkNodesAtKeyIndexFromRootAddress(k.log, k.chainClient, contracts.ChainlinkK8sClientToChainlinkNodeWithKeysAndAddress(nodesToFund), k.Inputs.ChainlinkNodeFunding, index)
Expand Down
Loading