From a101f030b0df4db9176d7ffb39c4b0b4d9515a5a Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Mon, 3 Mar 2025 16:32:20 +0100 Subject: [PATCH] Add F3ParamsAddress to buildconstants, wire it in, specify Butterfly Signed-off-by: Jakub Sztandera --- build/buildconstants/params_2k.go | 2 ++ build/buildconstants/params_butterfly.go | 1 + build/buildconstants/params_calibnet.go | 2 ++ build/buildconstants/params_interop.go | 2 ++ build/buildconstants/params_mainnet.go | 2 ++ build/buildconstants/params_testground.go | 1 + chain/lf3/config.go | 3 +++ 7 files changed, 13 insertions(+) diff --git a/build/buildconstants/params_2k.go b/build/buildconstants/params_2k.go index bb2b40aeeed..8679aada4ca 100644 --- a/build/buildconstants/params_2k.go +++ b/build/buildconstants/params_2k.go @@ -209,3 +209,5 @@ var F3ManifestServerID = MustParseID("12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyY var F3InitialPowerTableCID cid.Cid = cid.Undef var F3BootstrapEpoch abi.ChainEpoch = 1000 + +var F3ParamsAddress = "" diff --git a/build/buildconstants/params_butterfly.go b/build/buildconstants/params_butterfly.go index 5ce11751149..7d26b28faca 100644 --- a/build/buildconstants/params_butterfly.go +++ b/build/buildconstants/params_butterfly.go @@ -109,3 +109,4 @@ var F3ManifestServerID = MustParseID("12D3KooWJr9jy4ngtJNR7JC1xgLFra3DjEtyxskRYW var F3InitialPowerTableCID cid.Cid = cid.Undef const F3BootstrapEpoch abi.ChainEpoch = -1 +const F3ParamsAddress = "0x9fd3B2D38EE4C920c9954DA752eDF810887501c1" diff --git a/build/buildconstants/params_calibnet.go b/build/buildconstants/params_calibnet.go index c9b5159bec3..e3516f569f9 100644 --- a/build/buildconstants/params_calibnet.go +++ b/build/buildconstants/params_calibnet.go @@ -163,3 +163,5 @@ var F3InitialPowerTableCID cid.Cid = cid.MustParse("bafy2bzaceab236vmmb3n4q4tkvu // Calibnet F3 activation epoch is 2024-10-24T13:30:00Z - Epoch 2081674 const F3BootstrapEpoch abi.ChainEpoch = UpgradeTuktukHeight + 2880 + +var F3ParamsAddress = "" diff --git a/build/buildconstants/params_interop.go b/build/buildconstants/params_interop.go index e73db11ae39..1f00426535a 100644 --- a/build/buildconstants/params_interop.go +++ b/build/buildconstants/params_interop.go @@ -147,3 +147,5 @@ var F3ManifestServerID = MustParseID("12D3KooWQJ2rdVnG4okDUB6yHQhAjNutGNemcM7Xzq var F3InitialPowerTableCID cid.Cid = cid.Undef const F3BootstrapEpoch abi.ChainEpoch = 1000 + +var F3ParamsAddress = "" diff --git a/build/buildconstants/params_mainnet.go b/build/buildconstants/params_mainnet.go index a8f80ef8b1f..5dba1cdffa7 100644 --- a/build/buildconstants/params_mainnet.go +++ b/build/buildconstants/params_mainnet.go @@ -189,3 +189,5 @@ var F3InitialPowerTableCID = cid.Undef const F3Enabled = true const F3BootstrapEpoch abi.ChainEpoch = -1 + +var F3ParamsAddress = "" diff --git a/build/buildconstants/params_testground.go b/build/buildconstants/params_testground.go index b7e6a8dcfaf..e7dab38f444 100644 --- a/build/buildconstants/params_testground.go +++ b/build/buildconstants/params_testground.go @@ -128,6 +128,7 @@ var ( F3ManifestServerID peer.ID = "" F3BootstrapEpoch abi.ChainEpoch = -1 F3InitialPowerTableCID = cid.Undef + F3ParamsAddress = "" ) func init() { diff --git a/chain/lf3/config.go b/chain/lf3/config.go index 20689847262..aad5b39ecfd 100644 --- a/chain/lf3/config.go +++ b/chain/lf3/config.go @@ -110,5 +110,8 @@ func NewConfig(nn dtypes.NetworkName) *Config { buildconstants.F3InitialPowerTableCID, ) } + if buildconstants.F3ParamsAddress != "" { + c.ContractAddress = buildconstants.F3ParamsAddress + } return c }