diff --git a/actors/abi/sector.go b/actors/abi/sector.go index eefce307e..85f0b92a8 100644 --- a/actors/abi/sector.go +++ b/actors/abi/sector.go @@ -88,6 +88,11 @@ const ( RegisteredProof_StackedDRG32GiBWinningPoSt = RegisteredProof(15) RegisteredProof_StackedDRG32GiBWindowPoSt = RegisteredProof(16) + + RegisteredProof_StackedDRG64GiBSeal = RegisteredProof(17) + + RegisteredProof_StackedDRG64GiBWinningPoSt = RegisteredProof(18) + RegisteredProof_StackedDRG64GiBWindowPoSt = RegisteredProof(19) ) func (p RegisteredProof) SectorSize() (SectorSize, error) { @@ -97,6 +102,8 @@ func (p RegisteredProof) SectorSize() (SectorSize, error) { return 0, err } switch sp { + case RegisteredProof_StackedDRG64GiBSeal: + return 2 * (32 << 30), nil case RegisteredProof_StackedDRG32GiBSeal: return 32 << 30, nil case RegisteredProof_StackedDRG2KiBSeal: @@ -121,6 +128,8 @@ func (p RegisteredProof) WindowPoStPartitionSectors() (uint64, error) { // These numbers must match those used by the proofs library. // See https://github.com/filecoin-project/rust-fil-proofs/blob/master/filecoin-proofs/src/constants.rs#L85 switch sp { + case RegisteredProof_StackedDRG64GiBSeal: + return 2300, nil case RegisteredProof_StackedDRG32GiBSeal: return 2349, nil case RegisteredProof_StackedDRG2KiBSeal: @@ -138,6 +147,8 @@ func (p RegisteredProof) WindowPoStPartitionSectors() (uint64, error) { // to the receiving RegisteredProof. func (p RegisteredProof) RegisteredWinningPoStProof() (RegisteredProof, error) { switch p { + case RegisteredProof_StackedDRG64GiBSeal, RegisteredProof_StackedDRG64GiBWindowPoSt, RegisteredProof_StackedDRG64GiBWinningPoSt: + return RegisteredProof_StackedDRG64GiBWinningPoSt, nil case RegisteredProof_StackedDRG32GiBSeal, RegisteredProof_StackedDRG32GiBWindowPoSt, RegisteredProof_StackedDRG32GiBWinningPoSt: return RegisteredProof_StackedDRG32GiBWinningPoSt, nil case RegisteredProof_StackedDRG2KiBSeal, RegisteredProof_StackedDRG2KiBWindowPoSt, RegisteredProof_StackedDRG2KiBWinningPoSt: @@ -155,6 +166,8 @@ func (p RegisteredProof) RegisteredWinningPoStProof() (RegisteredProof, error) { // to the receiving RegisteredProof. func (p RegisteredProof) RegisteredWindowPoStProof() (RegisteredProof, error) { switch p { + case RegisteredProof_StackedDRG64GiBSeal, RegisteredProof_StackedDRG64GiBWinningPoSt, RegisteredProof_StackedDRG64GiBWindowPoSt: + return RegisteredProof_StackedDRG64GiBWindowPoSt, nil case RegisteredProof_StackedDRG32GiBSeal, RegisteredProof_StackedDRG32GiBWinningPoSt, RegisteredProof_StackedDRG32GiBWindowPoSt: return RegisteredProof_StackedDRG32GiBWindowPoSt, nil case RegisteredProof_StackedDRG2KiBSeal, RegisteredProof_StackedDRG2KiBWinningPoSt, RegisteredProof_StackedDRG2KiBWindowPoSt: @@ -172,6 +185,8 @@ func (p RegisteredProof) RegisteredWindowPoStProof() (RegisteredProof, error) { // to the receiving RegisteredProof. func (p RegisteredProof) RegisteredSealProof() (RegisteredProof, error) { switch p { + case RegisteredProof_StackedDRG64GiBSeal, RegisteredProof_StackedDRG64GiBWindowPoSt, RegisteredProof_StackedDRG64GiBWinningPoSt: + return RegisteredProof_StackedDRG64GiBSeal, nil case RegisteredProof_StackedDRG32GiBSeal, RegisteredProof_StackedDRG32GiBPoSt, RegisteredProof_StackedDRG32GiBWindowPoSt, RegisteredProof_StackedDRG32GiBWinningPoSt: return RegisteredProof_StackedDRG32GiBSeal, nil case RegisteredProof_StackedDRG2KiBSeal, RegisteredProof_StackedDRG2KiBPoSt, RegisteredProof_StackedDRG2KiBWindowPoSt, RegisteredProof_StackedDRG2KiBWinningPoSt: diff --git a/actors/builtin/miner/policy.go b/actors/builtin/miner/policy.go index 6dc3eb1bb..05904febc 100644 --- a/actors/builtin/miner/policy.go +++ b/actors/builtin/miner/policy.go @@ -4,8 +4,8 @@ import ( "fmt" abi "github.com/filecoin-project/specs-actors/actors/abi" - builtin "github.com/filecoin-project/specs-actors/actors/builtin" big "github.com/filecoin-project/specs-actors/actors/abi/big" + builtin "github.com/filecoin-project/specs-actors/actors/builtin" ) // The period over which all a miner's active sectors will be challenged. @@ -56,6 +56,7 @@ var MaxSealDuration = map[abi.RegisteredProof]abi.ChainEpoch{ abi.RegisteredProof_StackedDRG2KiBSeal: abi.ChainEpoch(10000), abi.RegisteredProof_StackedDRG8MiBSeal: abi.ChainEpoch(10000), abi.RegisteredProof_StackedDRG512MiBSeal: abi.ChainEpoch(10000), + abi.RegisteredProof_StackedDRG64GiBSeal: abi.ChainEpoch(10000), } // Number of epochs between publishing the precommit and when the challenge for interactive PoRep is drawn