diff --git a/Makefile b/Makefile index f91e74e3356..10645eb72af 100644 --- a/Makefile +++ b/Makefile @@ -362,4 +362,4 @@ print-%: @echo $*=$($*) circleci: - go generate -x ./.circleci \ No newline at end of file + go generate -x ./.circleci diff --git a/build/bootstrap/interopnet.pi b/build/bootstrap/interopnet.pi index 923653d94e3..1134180d8f8 100644 --- a/build/bootstrap/interopnet.pi +++ b/build/bootstrap/interopnet.pi @@ -1,2 +1,2 @@ -/dns4/bootstrap-0.interop.fildev.network/tcp/1347/p2p/12D3KooWLGPq9JL1xwL6gHok7HSNxtK1Q5kyfg4Hk69ifRPghn4i -/dns4/bootstrap-1.interop.fildev.network/tcp/1347/p2p/12D3KooWFYS1f31zafv8mqqYu8U3hEqYvaZ6avWzYU3BmZdpyH3h +/dns4/bootstrap-0.interop.fildev.network/tcp/1347/p2p/12D3KooWPfaWdJjpPTQp5kSqsqvauJaM4cFz5NWja7qyjx7vVfjL +/dns4/bootstrap-1.interop.fildev.network/tcp/1347/p2p/12D3KooWS5tjcL6s4hHZ1HVRTgGKaXpKkiHfbBSJdjbzgejgJpEh diff --git a/build/genesis/interopnet.car b/build/genesis/interopnet.car index 2c7c2a49873..e2e7ef5fdf7 100644 Binary files a/build/genesis/interopnet.car and b/build/genesis/interopnet.car differ diff --git a/build/params_interop.go b/build/params_interop.go index a483e7188d5..4b0f41b6de7 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -13,13 +13,12 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/lotus/chain/actors/policy" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" ) const BootstrappersFile = "interopnet.pi" const GenesisFile = "interopnet.car" -const GenesisNetworkVersion = network.Version13 +const GenesisNetworkVersion = network.Version15 var UpgradeBreezeHeight = abi.ChainEpoch(-1) @@ -54,14 +53,17 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ } func init() { + policy.SetMinVerifiedDealSize(abi.NewStoragePower(256)) + policy.SetPreCommitChallengeDelay(abi.ChainEpoch(10)) + + InsecurePoStValidation = true + + policy.SetConsensusMinerMinPower(abi.NewStoragePower(2 << 30)) policy.SetSupportedProofTypes( - abi.RegisteredSealProof_StackedDrg2KiBV1, - abi.RegisteredSealProof_StackedDrg8MiBV1, abi.RegisteredSealProof_StackedDrg512MiBV1, + abi.RegisteredSealProof_StackedDrg32GiBV1, + abi.RegisteredSealProof_StackedDrg64GiBV1, ) - policy.SetConsensusMinerMinPower(abi.NewStoragePower(2048)) - policy.SetMinVerifiedDealSize(abi.NewStoragePower(256)) - policy.SetPreCommitChallengeDelay(abi.ChainEpoch(10)) getUpgradeHeight := func(ev string, def abi.ChainEpoch) abi.ChainEpoch { hs, found := os.LookupEnv(ev) @@ -93,6 +95,8 @@ func init() { UpgradeNorwegianHeight = getUpgradeHeight("LOTUS_NORWEGIAN_HEIGHT", UpgradeNorwegianHeight) UpgradeTurboHeight = getUpgradeHeight("LOTUS_ACTORSV4_HEIGHT", UpgradeTurboHeight) UpgradeHyperdriveHeight = getUpgradeHeight("LOTUS_HYPERDRIVE_HEIGHT", UpgradeHyperdriveHeight) + UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight) + UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight) BuildType |= BuildInteropnet SetAddressNetwork(address.Testnet) @@ -100,9 +104,9 @@ func init() { } -const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds) +const BlockDelaySecs = uint64(5) -const PropagationDelaySecs = uint64(6) +const PropagationDelaySecs = uint64(1) // BootstrapPeerThreshold is the minimum number peers we need to track for a sync worker to start const BootstrapPeerThreshold = 2 diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi index c2668aa67ec..5216e96fd12 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit c2668aa67ec589a773153022348b9c0ed6ed4d5d +Subproject commit 5216e96fd12e5551a49c01e0d05b9f7626037da4