Merge pull request #12929 from filecoin-project/deploy/butterfly

Kubuxu · web-flow · commit 00c1c596b582 · 2025-03-03T17:28:16.000+01:00
feat(f3): add F3ParamsAddress to buildconstants, wire it in, specify Butterfly
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -110,5 +110,8 @@ func NewConfig(nn dtypes.NetworkName) *Config {
 			buildconstants.F3InitialPowerTableCID,
 		)
 	}
+	if buildconstants.F3ParamsAddress != "" {
+		c.ContractAddress = buildconstants.F3ParamsAddress
+	}
 	return c
 }

Original file line number	Diff line number	Diff line change
`@@ -109,3 +109,4 @@ var F3ManifestServerID = MustParseID("12D3KooWJr9jy4ngtJNR7JC1xgLFra3DjEtyxskRYW`
`109`	`109`	`var F3InitialPowerTableCID cid.Cid = cid.Undef`
`110`	`110`
`111`	`111`	`const F3BootstrapEpoch abi.ChainEpoch = -1`
	`112`	`+const F3ParamsAddress = "0x9fd3B2D38EE4C920c9954DA752eDF810887501c1"`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ var (`
`128`	`128`	`F3ManifestServerID peer.ID = ""`
`129`	`129`	`F3BootstrapEpoch abi.ChainEpoch = -1`
`130`	`130`	`F3InitialPowerTableCID = cid.Undef`
	`131`	`+ F3ParamsAddress = ""`
`131`	`132`	`)`
`132`	`133`
`133`	`134`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -110,5 +110,8 @@ func NewConfig(nn dtypes.NetworkName) *Config {`
`110`	`110`	`buildconstants.F3InitialPowerTableCID,`
`111`	`111`	`)`
`112`	`112`	`}`
	`113`	`+ if buildconstants.F3ParamsAddress != "" {`
	`114`	`+ c.ContractAddress = buildconstants.F3ParamsAddress`
	`115`	`+ }`
`113`	`116`	`return c`
`114`	`117`	`}`