From ea5dc96c2907e2cf685c9bd4a15803e15e8be407 Mon Sep 17 00:00:00 2001 From: Aditya Vadhavkar Date: Wed, 10 Jul 2024 14:09:24 -0400 Subject: [PATCH] Addressed PR comments --- .../toml/defaults/Arbitrum_Mainnet.toml | 2 +- .../toml/defaults/Arbitrum_Sepolia.toml | 1 - .../toml/defaults/Ethereum_Mainnet.toml | 2 +- .../toml/defaults/Ethereum_Sepolia.toml | 1 - .../config/toml/defaults/Fantom_Mainnet.toml | 1 - .../config/toml/defaults/Fantom_Testnet.toml | 1 - .../evm/config/toml/defaults/fallback.toml | 2 +- docs/CONFIG.md | 36 +++++++++---------- 8 files changed, 21 insertions(+), 25 deletions(-) diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml index 91116cb9c6b..e19c06240a6 100644 --- a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml @@ -1,7 +1,7 @@ # Arbitrum is an L2 chain. Pending proper L2 support, for now we rely on their sequencer ChainID = '42161' ChainType = 'arbitrum' -FinalityDepth = 10 +FinalityDepth = 4350 LinkContractAddress = "0xf97f4df75117a78c1A5a0DBb814Af92458539FB4" LogPollInterval = '1s' # Arbitrum only emits blocks when a new tx is received, so this method of liveness detection is not useful diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml index 8842231b26a..e6d660a2729 100644 --- a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml @@ -1,6 +1,5 @@ ChainID = '421614' ChainType = 'arbitrum' -FinalityDepth = 10 NoNewHeadsThreshold = '0' OCR.ContractConfirmations = 1 LogPollInterval = '1s' diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml index f6bb717429f..a9a359e6a97 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml @@ -1,6 +1,6 @@ ChainID = '1' LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA' -FinalityDepth = 10 +FinalityDepth = 50 MinContractPayment = '0.1 link' OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A' diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml index fe5ee93b079..1c46d4ca7cf 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml @@ -1,6 +1,5 @@ ChainID = '11155111' LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789' -FinalityDepth = 10 MinContractPayment = '0.1 link' [GasEstimator] diff --git a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml index e634edc6f0a..7e76d94278d 100644 --- a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml @@ -1,6 +1,5 @@ ChainID = '250' LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407' -FinalityDepth = 10 LogPollInterval = '1s' NoNewHeadsThreshold = '30s' RPCBlockQueryDelay = 2 diff --git a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml index 9e274a08c99..5f24a76c2e7 100644 --- a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml @@ -1,6 +1,5 @@ ChainID = '4002' LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F' -FinalityDepth = 10 LogPollInterval = '1s' # Fantom testnet only emits blocks when a new tx is received, so this method of liveness detection is not useful NoNewHeadsThreshold = '0' diff --git a/core/chains/evm/config/toml/defaults/fallback.toml b/core/chains/evm/config/toml/defaults/fallback.toml index 5a16aca091c..96a12e149d6 100644 --- a/core/chains/evm/config/toml/defaults/fallback.toml +++ b/core/chains/evm/config/toml/defaults/fallback.toml @@ -1,7 +1,7 @@ AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LogBackfillBatchSize = 1000 LogPollInterval = '15s' diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 027bf610831..eae86b4856a 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -1761,7 +1761,7 @@ EVM defaults depend on ChainID: AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 10 +FinalityDepth = 50 FinalityTagEnabled = false LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA' LogBackfillBatchSize = 1000 @@ -1852,7 +1852,7 @@ GasLimit = 10500000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x20fE562d797A42Dcb3399062AE9546cd06f63280' LogBackfillBatchSize = 1000 @@ -1942,7 +1942,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x01BE23585060835E02B77ef475b0Cc51aA1e0709' LogBackfillBatchSize = 1000 @@ -2032,7 +2032,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB' LogBackfillBatchSize = 1000 @@ -2213,7 +2213,7 @@ GasLimit = 6500000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x14AdaE34beF7ca957Ce2dDe5ADD97ea050123827' LogBackfillBatchSize = 1000 @@ -2303,7 +2303,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x8bBbd80981FE76d44854D8DF305e8985c19f0e78' LogBackfillBatchSize = 1000 @@ -2393,7 +2393,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0xa36085F69e2889c224210F603D836748e7dC0088' LogBackfillBatchSize = 1000 @@ -2484,7 +2484,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75' LogBackfillBatchSize = 1000 @@ -2574,7 +2574,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LogBackfillBatchSize = 1000 LogPollInterval = '15s' @@ -2663,7 +2663,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LogBackfillBatchSize = 1000 LogPollInterval = '15s' @@ -2752,7 +2752,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06' LogBackfillBatchSize = 1000 @@ -2843,7 +2843,7 @@ AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false ChainType = 'gnosis' -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0xE2e73A1c69ecF83F464EFCE6A5be353a37cA09b2' LogBackfillBatchSize = 1000 @@ -2933,7 +2933,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75' LogBackfillBatchSize = 1000 @@ -5092,7 +5092,7 @@ AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false ChainType = 'arbitrum' -FinalityDepth = 10 +FinalityDepth = 4350 FinalityTagEnabled = false LinkContractAddress = '0xf97f4df75117a78c1A5a0DBb814Af92458539FB4' LogBackfillBatchSize = 1000 @@ -6259,7 +6259,7 @@ AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false ChainType = 'arbitrum' -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x615fBe6372676474d9e6933d310469c9b68e9726' LogBackfillBatchSize = 1000 @@ -6350,7 +6350,7 @@ AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false ChainType = 'arbitrum' -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28' LogBackfillBatchSize = 1000 @@ -6890,7 +6890,7 @@ GasLimit = 6500000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x218532a12a389a4a92fC0C5Fb22901D1c19198aA' LogBackfillBatchSize = 1000 @@ -6980,7 +6980,7 @@ GasLimit = 5400000 AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false -FinalityDepth = 50 +FinalityDepth = 10 FinalityTagEnabled = false LinkContractAddress = '0x8b12Ac23BFe11cAb03a634C1F117D64a7f2cFD3e' LogBackfillBatchSize = 1000