diff --git a/build/params_testground.go b/build/params_testground.go index 77e312ac2..1b30ae2e9 100644 --- a/build/params_testground.go +++ b/build/params_testground.go @@ -80,5 +80,6 @@ var ( 0: DrandMainnet, } - NewestNetworkVersion = network.Version2 + NewestNetworkVersion = network.Version2 + ActorUpgradeNetworkVersion = network.Version3 ) diff --git a/extern/storage-sealing/checks.go b/extern/storage-sealing/checks.go index ae5ce0d33..677cef1e9 100644 --- a/extern/storage-sealing/checks.go +++ b/extern/storage-sealing/checks.go @@ -105,6 +105,7 @@ func checkPrecommit(ctx context.Context, maddr address.Address, si SectorInfo, t msd = v0miner.MaxSealDuration[si.SectorType] } else { // TODO: ActorUpgrade + msd = 0 } if height-(si.TicketEpoch+SealRandomnessLookback) > msd { diff --git a/extern/storage-sealing/precommit_policy.go b/extern/storage-sealing/precommit_policy.go index e36b8251a..76d867144 100644 --- a/extern/storage-sealing/precommit_policy.go +++ b/extern/storage-sealing/precommit_policy.go @@ -90,6 +90,7 @@ func (p *BasicPreCommitPolicy) Expiration(ctx context.Context, ps ...Piece) (abi wpp = v0miner.WPoStProvingPeriod } else { // TODO: ActorUpgrade + wpp = 0 } *end += wpp - (*end % wpp) + p.provingBoundary - 1 diff --git a/extern/storage-sealing/precommit_policy_test.go b/extern/storage-sealing/precommit_policy_test.go index 30b538a88..52814167a 100644 --- a/extern/storage-sealing/precommit_policy_test.go +++ b/extern/storage-sealing/precommit_policy_test.go @@ -2,9 +2,10 @@ package sealing_test import ( "context" + "testing" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/lotus/build" - "testing" "github.com/ipfs/go-cid" "github.com/stretchr/testify/assert" diff --git a/extern/storage-sealing/sealing.go b/extern/storage-sealing/sealing.go index 6d60e7a6e..01551e6d7 100644 --- a/extern/storage-sealing/sealing.go +++ b/extern/storage-sealing/sealing.go @@ -431,9 +431,8 @@ func (m *Sealing) getPreCommitChallengeDelay(ctx context.Context, tok TipSetToke if nv < build.ActorUpgradeNetworkVersion { return v0miner.PreCommitChallengeDelay, nil - } else { - // TODO: ActorUpgrade - return -1, nil } + // TODO: ActorUpgrade + return -1, nil } diff --git a/extern/storage-sealing/states_sealing.go b/extern/storage-sealing/states_sealing.go index f0ff4025d..6ae42a91f 100644 --- a/extern/storage-sealing/states_sealing.go +++ b/extern/storage-sealing/states_sealing.go @@ -195,6 +195,8 @@ func (m *Sealing) handlePreCommitting(ctx statemachine.Context, sector SectorInf mse = v0miner.MinSectorExpiration } else { // TODO: ActorUpgrade + msd = 0 + mse = 0 } if minExpiration := height + msd + mse + 10; expiration < minExpiration { @@ -395,6 +397,7 @@ func (m *Sealing) handleSubmitCommit(ctx statemachine.Context, sector SectorInfo } } else { // TODO: ActorUpgrade + enc = nil } waddr, err := m.api.StateMinerWorkerAddress(ctx.Context(), m.maddr, tok) diff --git a/go.sum b/go.sum index 3d012da92..5ebec6cbf 100644 --- a/go.sum +++ b/go.sum @@ -226,10 +226,6 @@ github.com/filecoin-project/go-data-transfer v0.6.3 h1:7TLwm8nuodHYD/uiwJjKc/PGR github.com/filecoin-project/go-data-transfer v0.6.3/go.mod h1:PmBKVXkhh67/tnEdJXQwDHl5mT+7Tbcwe1NPninqhnM= github.com/filecoin-project/go-fil-commcid v0.0.0-20200716160307-8f644712406f h1:GxJzR3oRIMTPtpZ0b7QF8FKPK6/iPAc7trhlL5k/g+s= github.com/filecoin-project/go-fil-commcid v0.0.0-20200716160307-8f644712406f/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ= -github.com/filecoin-project/go-fil-markets v0.6.1-0.20200911011457-2959ccca6a3c h1:YGoyYmELQ0LHwDj/WcOvY3oYt+3iM0wdrAhqJQUAIy4= -github.com/filecoin-project/go-fil-markets v0.6.1-0.20200911011457-2959ccca6a3c/go.mod h1:PLr9svZxsnHkae1Ky7+66g7fP9AlneVxIVu+oSMq56A= -github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917050751-2af52e9606c6 h1:k97Z2JP3WpDVGU/7Bz3RtnqrYtn9X428Ps8OkoFq61I= -github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917050751-2af52e9606c6/go.mod h1:PLr9svZxsnHkae1Ky7+66g7fP9AlneVxIVu+oSMq56A= github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917052354-ee0af754c6e9 h1:SnCUC9wHDId9TtV8PsQp8q1OOsi+NOLOwitIDnAgUa4= github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917052354-ee0af754c6e9/go.mod h1:PLr9svZxsnHkae1Ky7+66g7fP9AlneVxIVu+oSMq56A= github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3LPEk0OrS/ytIBM= diff --git a/node/impl/full/state.go b/node/impl/full/state.go index 04055043a..729baef2c 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -3,7 +3,6 @@ package full import ( "bytes" "context" - "errors" "strconv" v0market "github.com/filecoin-project/specs-actors/actors/builtin/market" @@ -47,8 +46,6 @@ import ( "github.com/filecoin-project/lotus/node/modules/dtypes" ) -var errBreakForeach = errors.New("break") - type StateAPI struct { fx.In