Change of default attestors addresses

flare-foundation · Feb 12, 2024 · 18a7aee · 18a7aee
1 parent d6d641d
commit 18a7aee
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/coreth/core/daemon.go b/coreth/core/daemon.go
@@ -99,10 +99,10 @@ func isPrioritisedSubmitterContract(chainID *big.Int, to *common.Address, blockT
 		return false
 	case chainID.Cmp(params.FlareChainID) == 0:
 		return *to == prioritisedSubmitterContractAddressFlare &&
-			blockTime.Cmp(submitterContractActivationTimeFlare) >= 0
+			blockTime.Cmp(submitterContractActivationTimeFlare) > 0
 	case chainID.Cmp(params.CostwoChainID) == 0:
 		return *to == prioritisedSubmitterContractAddressCostwo &&
-			blockTime.Cmp(submitterContractActivationTimeCostwo) >= 0
+			blockTime.Cmp(submitterContractActivationTimeCostwo) > 0
 	case chainID.Cmp(params.LocalFlareChainID) == 0 || chainID.Cmp(params.StagingChainID) == 0:
 		return *to == prioritisedSubmitterContractAddressEnv
 	default:

diff --git a/coreth/core/state_connector.go b/coreth/core/state_connector.go
@@ -115,16 +115,30 @@ func FinaliseRoundSelector(chainID *big.Int, blockTime *big.Int) []byte {
 func GetDefaultAttestors(chainID *big.Int, blockTime *big.Int) []common.Address {
 	switch {
 	case chainID.Cmp(params.FlareChainID) == 0:
-		return []common.Address{
-			common.HexToAddress("0x0988Cf4828F4e4eD0cE7c07467E70e19095Ee152"),
-			common.HexToAddress("0x6BC7DCa62010D418eB72CCdc58561e00C5868Ef1"),
-			common.HexToAddress("0xE34Bb361536610a9DCcEa5292262e36AfF65c06c"),
-			common.HexToAddress("0x8A3D627D86A81F5D21683F4963565C63DB5e1309"),
-			common.HexToAddress("0x2D3e7e4b19bDc920fd9C57BD3072A31F5a59FeC8"),
-			common.HexToAddress("0x6455dC38fdF739b6fE021b30C7D9672C1c6DEb5c"),
-			common.HexToAddress("0x49893c5Dfc035F4eE4E46faC014f6D4bC80F7f92"),
-			common.HexToAddress("0x08e8b2Af4874e920de27723576A13d66008Af523"),
-			common.HexToAddress("0x5D2f75392DdDa69a2818021dd6a64937904c8352"),
+		if blockTime.Cmp(submitterContractActivationTimeFlare) > 0 {
+			return []common.Address{
+				common.HexToAddress("0x0988Cf4828F4e4eD0cE7c07467E70e19095Ee152"),
+				common.HexToAddress("0x6BC7DCa62010D418eB72CCdc58561e00C5868Ef1"),
+				common.HexToAddress("0xE34Bb361536610a9DCcEa5292262e36AfF65c06c"),
+				common.HexToAddress("0x8A3D627D86A81F5D21683F4963565C63DB5e1309"),
+				common.HexToAddress("0x2D3e7e4b19bDc920fd9C57BD3072A31F5a59FeC8"),
+				common.HexToAddress("0x6455dC38fdF739b6fE021b30C7D9672C1c6DEb5c"),
+				common.HexToAddress("0x49893c5Dfc035F4eE4E46faC014f6D4bC80F7f92"),
+				common.HexToAddress("0x08e8b2Af4874e920de27723576A13d66008Af523"),
+				common.HexToAddress("0x5D2f75392DdDa69a2818021dd6a64937904c8352"),
+			}
+		} else {
+			return []common.Address{
+				common.HexToAddress("0x0988Cf4828F4e4eD0cE7c07467E70e19095Ee152"),
+				common.HexToAddress("0x6BC7DCa62010D418eB72CCdc58561e00C5868Ef1"),
+				common.HexToAddress("0xE34Bb361536610a9DCcEa5292262e36AfF65c06c"),
+				common.HexToAddress("0x8A3D627D86A81F5D21683F4963565C63DB5e1309"),
+				common.HexToAddress("0x2D3e7e4b19bDc920fd9C57BD3072A31F5a59FeC8"),
+				common.HexToAddress("0x6455dC38fdF739b6fE021b30C7D9672C1c6DEb5c"),
+				common.HexToAddress("0x49893c5Dfc035F4eE4E46faC014f6D4bC80F7f92"),
+				common.HexToAddress("0x08e8b2Af4874e920de27723576A13d66008Af523"),
+				common.HexToAddress("0x5D2f75392DdDa69a2818021dd6a64937904c8352"),
+			}
 		}
 	case chainID.Cmp(params.SongbirdChainID) == 0:
 		return []common.Address{