mirror of
https://github.com/filecoin-project/lotus.git
synced 2025-05-20 00:28:32 +08:00
feat(miner): adjust SectorOnChainInfo for FIP-0098 (new nullables)
This commit is contained in:
@ -7,9 +7,7 @@ import (
|
|||||||
"github.com/filecoin-project/go-bitfield"
|
"github.com/filecoin-project/go-bitfield"
|
||||||
rle "github.com/filecoin-project/go-bitfield/rle"
|
rle "github.com/filecoin-project/go-bitfield/rle"
|
||||||
"github.com/filecoin-project/go-state-types/abi"
|
"github.com/filecoin-project/go-state-types/abi"
|
||||||
{{- if (le .v 15)}}
|
|
||||||
"github.com/filecoin-project/go-state-types/big"
|
"github.com/filecoin-project/go-state-types/big"
|
||||||
{{- end}}
|
|
||||||
"github.com/filecoin-project/go-state-types/dline"
|
"github.com/filecoin-project/go-state-types/dline"
|
||||||
"github.com/ipfs/go-cid"
|
"github.com/ipfs/go-cid"
|
||||||
cbg "github.com/whyrusleeping/cbor-gen"
|
cbg "github.com/whyrusleeping/cbor-gen"
|
||||||
@ -594,14 +592,14 @@ func fromV{{.v}}SectorOnChainInfo(v{{.v}} miner{{.v}}.SectorOnChainInfo) SectorO
|
|||||||
DealWeight: v{{.v}}.DealWeight,
|
DealWeight: v{{.v}}.DealWeight,
|
||||||
VerifiedDealWeight: v{{.v}}.VerifiedDealWeight,
|
VerifiedDealWeight: v{{.v}}.VerifiedDealWeight,
|
||||||
InitialPledge: v{{.v}}.InitialPledge,
|
InitialPledge: v{{.v}}.InitialPledge,
|
||||||
ExpectedDayReward: v{{.v}}.ExpectedDayReward,
|
ExpectedDayReward: {{ if (lt .v 16)}}&{{end}}v{{.v}}.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v{{.v}}.ExpectedStoragePledge,
|
ExpectedStoragePledge: {{ if (lt .v 16)}}&{{end}}v{{.v}}.ExpectedStoragePledge,
|
||||||
{{- if (ge .v 7)}}
|
{{- if (ge .v 7)}}
|
||||||
SectorKeyCID: v{{.v}}.SectorKeyCID,
|
SectorKeyCID: v{{.v}}.SectorKeyCID,
|
||||||
{{- end}}
|
{{- end}}
|
||||||
{{- if (ge .v 12)}}
|
{{- if (ge .v 12)}}
|
||||||
PowerBaseEpoch: v{{.v}}.PowerBaseEpoch,
|
PowerBaseEpoch: v{{.v}}.PowerBaseEpoch,
|
||||||
ReplacedDayReward: v{{.v}}.ReplacedDayReward,
|
ReplacedDayReward: {{ if (lt .v 16)}}&{{end}}v{{.v}}.ReplacedDayReward,
|
||||||
Flags: SectorOnChainInfoFlags(v{{.v}}.Flags),
|
Flags: SectorOnChainInfoFlags(v{{.v}}.Flags),
|
||||||
{{- end}}
|
{{- end}}
|
||||||
{{- if (ge .v 16)}}
|
{{- if (ge .v 16)}}
|
||||||
|
4
chain/actors/builtin/miner/v0.go
generated
4
chain/actors/builtin/miner/v0.go
generated
@ -511,8 +511,8 @@ func fromV0SectorOnChainInfo(v0 miner0.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v0.DealWeight,
|
DealWeight: v0.DealWeight,
|
||||||
VerifiedDealWeight: v0.VerifiedDealWeight,
|
VerifiedDealWeight: v0.VerifiedDealWeight,
|
||||||
InitialPledge: v0.InitialPledge,
|
InitialPledge: v0.InitialPledge,
|
||||||
ExpectedDayReward: v0.ExpectedDayReward,
|
ExpectedDayReward: &v0.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v0.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v0.ExpectedStoragePledge,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
return info
|
return info
|
||||||
|
4
chain/actors/builtin/miner/v10.go
generated
4
chain/actors/builtin/miner/v10.go
generated
@ -546,8 +546,8 @@ func fromV10SectorOnChainInfo(v10 miner10.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v10.DealWeight,
|
DealWeight: v10.DealWeight,
|
||||||
VerifiedDealWeight: v10.VerifiedDealWeight,
|
VerifiedDealWeight: v10.VerifiedDealWeight,
|
||||||
InitialPledge: v10.InitialPledge,
|
InitialPledge: v10.InitialPledge,
|
||||||
ExpectedDayReward: v10.ExpectedDayReward,
|
ExpectedDayReward: &v10.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v10.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v10.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v10.SectorKeyCID,
|
SectorKeyCID: v10.SectorKeyCID,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
4
chain/actors/builtin/miner/v11.go
generated
4
chain/actors/builtin/miner/v11.go
generated
@ -546,8 +546,8 @@ func fromV11SectorOnChainInfo(v11 miner11.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v11.DealWeight,
|
DealWeight: v11.DealWeight,
|
||||||
VerifiedDealWeight: v11.VerifiedDealWeight,
|
VerifiedDealWeight: v11.VerifiedDealWeight,
|
||||||
InitialPledge: v11.InitialPledge,
|
InitialPledge: v11.InitialPledge,
|
||||||
ExpectedDayReward: v11.ExpectedDayReward,
|
ExpectedDayReward: &v11.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v11.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v11.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v11.SectorKeyCID,
|
SectorKeyCID: v11.SectorKeyCID,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
6
chain/actors/builtin/miner/v12.go
generated
6
chain/actors/builtin/miner/v12.go
generated
@ -546,11 +546,11 @@ func fromV12SectorOnChainInfo(v12 miner12.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v12.DealWeight,
|
DealWeight: v12.DealWeight,
|
||||||
VerifiedDealWeight: v12.VerifiedDealWeight,
|
VerifiedDealWeight: v12.VerifiedDealWeight,
|
||||||
InitialPledge: v12.InitialPledge,
|
InitialPledge: v12.InitialPledge,
|
||||||
ExpectedDayReward: v12.ExpectedDayReward,
|
ExpectedDayReward: &v12.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v12.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v12.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v12.SectorKeyCID,
|
SectorKeyCID: v12.SectorKeyCID,
|
||||||
PowerBaseEpoch: v12.PowerBaseEpoch,
|
PowerBaseEpoch: v12.PowerBaseEpoch,
|
||||||
ReplacedDayReward: v12.ReplacedDayReward,
|
ReplacedDayReward: &v12.ReplacedDayReward,
|
||||||
Flags: SectorOnChainInfoFlags(v12.Flags),
|
Flags: SectorOnChainInfoFlags(v12.Flags),
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
6
chain/actors/builtin/miner/v13.go
generated
6
chain/actors/builtin/miner/v13.go
generated
@ -546,11 +546,11 @@ func fromV13SectorOnChainInfo(v13 miner13.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v13.DealWeight,
|
DealWeight: v13.DealWeight,
|
||||||
VerifiedDealWeight: v13.VerifiedDealWeight,
|
VerifiedDealWeight: v13.VerifiedDealWeight,
|
||||||
InitialPledge: v13.InitialPledge,
|
InitialPledge: v13.InitialPledge,
|
||||||
ExpectedDayReward: v13.ExpectedDayReward,
|
ExpectedDayReward: &v13.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v13.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v13.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v13.SectorKeyCID,
|
SectorKeyCID: v13.SectorKeyCID,
|
||||||
PowerBaseEpoch: v13.PowerBaseEpoch,
|
PowerBaseEpoch: v13.PowerBaseEpoch,
|
||||||
ReplacedDayReward: v13.ReplacedDayReward,
|
ReplacedDayReward: &v13.ReplacedDayReward,
|
||||||
Flags: SectorOnChainInfoFlags(v13.Flags),
|
Flags: SectorOnChainInfoFlags(v13.Flags),
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
6
chain/actors/builtin/miner/v14.go
generated
6
chain/actors/builtin/miner/v14.go
generated
@ -546,11 +546,11 @@ func fromV14SectorOnChainInfo(v14 miner14.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v14.DealWeight,
|
DealWeight: v14.DealWeight,
|
||||||
VerifiedDealWeight: v14.VerifiedDealWeight,
|
VerifiedDealWeight: v14.VerifiedDealWeight,
|
||||||
InitialPledge: v14.InitialPledge,
|
InitialPledge: v14.InitialPledge,
|
||||||
ExpectedDayReward: v14.ExpectedDayReward,
|
ExpectedDayReward: &v14.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v14.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v14.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v14.SectorKeyCID,
|
SectorKeyCID: v14.SectorKeyCID,
|
||||||
PowerBaseEpoch: v14.PowerBaseEpoch,
|
PowerBaseEpoch: v14.PowerBaseEpoch,
|
||||||
ReplacedDayReward: v14.ReplacedDayReward,
|
ReplacedDayReward: &v14.ReplacedDayReward,
|
||||||
Flags: SectorOnChainInfoFlags(v14.Flags),
|
Flags: SectorOnChainInfoFlags(v14.Flags),
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
6
chain/actors/builtin/miner/v15.go
generated
6
chain/actors/builtin/miner/v15.go
generated
@ -546,11 +546,11 @@ func fromV15SectorOnChainInfo(v15 miner15.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v15.DealWeight,
|
DealWeight: v15.DealWeight,
|
||||||
VerifiedDealWeight: v15.VerifiedDealWeight,
|
VerifiedDealWeight: v15.VerifiedDealWeight,
|
||||||
InitialPledge: v15.InitialPledge,
|
InitialPledge: v15.InitialPledge,
|
||||||
ExpectedDayReward: v15.ExpectedDayReward,
|
ExpectedDayReward: &v15.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v15.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v15.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v15.SectorKeyCID,
|
SectorKeyCID: v15.SectorKeyCID,
|
||||||
PowerBaseEpoch: v15.PowerBaseEpoch,
|
PowerBaseEpoch: v15.PowerBaseEpoch,
|
||||||
ReplacedDayReward: v15.ReplacedDayReward,
|
ReplacedDayReward: &v15.ReplacedDayReward,
|
||||||
Flags: SectorOnChainInfoFlags(v15.Flags),
|
Flags: SectorOnChainInfoFlags(v15.Flags),
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
4
chain/actors/builtin/miner/v2.go
generated
4
chain/actors/builtin/miner/v2.go
generated
@ -543,8 +543,8 @@ func fromV2SectorOnChainInfo(v2 miner2.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v2.DealWeight,
|
DealWeight: v2.DealWeight,
|
||||||
VerifiedDealWeight: v2.VerifiedDealWeight,
|
VerifiedDealWeight: v2.VerifiedDealWeight,
|
||||||
InitialPledge: v2.InitialPledge,
|
InitialPledge: v2.InitialPledge,
|
||||||
ExpectedDayReward: v2.ExpectedDayReward,
|
ExpectedDayReward: &v2.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v2.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v2.ExpectedStoragePledge,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
return info
|
return info
|
||||||
|
4
chain/actors/builtin/miner/v3.go
generated
4
chain/actors/builtin/miner/v3.go
generated
@ -543,8 +543,8 @@ func fromV3SectorOnChainInfo(v3 miner3.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v3.DealWeight,
|
DealWeight: v3.DealWeight,
|
||||||
VerifiedDealWeight: v3.VerifiedDealWeight,
|
VerifiedDealWeight: v3.VerifiedDealWeight,
|
||||||
InitialPledge: v3.InitialPledge,
|
InitialPledge: v3.InitialPledge,
|
||||||
ExpectedDayReward: v3.ExpectedDayReward,
|
ExpectedDayReward: &v3.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v3.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v3.ExpectedStoragePledge,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
return info
|
return info
|
||||||
|
4
chain/actors/builtin/miner/v4.go
generated
4
chain/actors/builtin/miner/v4.go
generated
@ -543,8 +543,8 @@ func fromV4SectorOnChainInfo(v4 miner4.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v4.DealWeight,
|
DealWeight: v4.DealWeight,
|
||||||
VerifiedDealWeight: v4.VerifiedDealWeight,
|
VerifiedDealWeight: v4.VerifiedDealWeight,
|
||||||
InitialPledge: v4.InitialPledge,
|
InitialPledge: v4.InitialPledge,
|
||||||
ExpectedDayReward: v4.ExpectedDayReward,
|
ExpectedDayReward: &v4.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v4.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v4.ExpectedStoragePledge,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
return info
|
return info
|
||||||
|
4
chain/actors/builtin/miner/v5.go
generated
4
chain/actors/builtin/miner/v5.go
generated
@ -543,8 +543,8 @@ func fromV5SectorOnChainInfo(v5 miner5.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v5.DealWeight,
|
DealWeight: v5.DealWeight,
|
||||||
VerifiedDealWeight: v5.VerifiedDealWeight,
|
VerifiedDealWeight: v5.VerifiedDealWeight,
|
||||||
InitialPledge: v5.InitialPledge,
|
InitialPledge: v5.InitialPledge,
|
||||||
ExpectedDayReward: v5.ExpectedDayReward,
|
ExpectedDayReward: &v5.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v5.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v5.ExpectedStoragePledge,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
return info
|
return info
|
||||||
|
4
chain/actors/builtin/miner/v6.go
generated
4
chain/actors/builtin/miner/v6.go
generated
@ -543,8 +543,8 @@ func fromV6SectorOnChainInfo(v6 miner6.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v6.DealWeight,
|
DealWeight: v6.DealWeight,
|
||||||
VerifiedDealWeight: v6.VerifiedDealWeight,
|
VerifiedDealWeight: v6.VerifiedDealWeight,
|
||||||
InitialPledge: v6.InitialPledge,
|
InitialPledge: v6.InitialPledge,
|
||||||
ExpectedDayReward: v6.ExpectedDayReward,
|
ExpectedDayReward: &v6.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v6.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v6.ExpectedStoragePledge,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
return info
|
return info
|
||||||
|
4
chain/actors/builtin/miner/v7.go
generated
4
chain/actors/builtin/miner/v7.go
generated
@ -542,8 +542,8 @@ func fromV7SectorOnChainInfo(v7 miner7.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v7.DealWeight,
|
DealWeight: v7.DealWeight,
|
||||||
VerifiedDealWeight: v7.VerifiedDealWeight,
|
VerifiedDealWeight: v7.VerifiedDealWeight,
|
||||||
InitialPledge: v7.InitialPledge,
|
InitialPledge: v7.InitialPledge,
|
||||||
ExpectedDayReward: v7.ExpectedDayReward,
|
ExpectedDayReward: &v7.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v7.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v7.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v7.SectorKeyCID,
|
SectorKeyCID: v7.SectorKeyCID,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
4
chain/actors/builtin/miner/v8.go
generated
4
chain/actors/builtin/miner/v8.go
generated
@ -542,8 +542,8 @@ func fromV8SectorOnChainInfo(v8 miner8.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v8.DealWeight,
|
DealWeight: v8.DealWeight,
|
||||||
VerifiedDealWeight: v8.VerifiedDealWeight,
|
VerifiedDealWeight: v8.VerifiedDealWeight,
|
||||||
InitialPledge: v8.InitialPledge,
|
InitialPledge: v8.InitialPledge,
|
||||||
ExpectedDayReward: v8.ExpectedDayReward,
|
ExpectedDayReward: &v8.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v8.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v8.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v8.SectorKeyCID,
|
SectorKeyCID: v8.SectorKeyCID,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
4
chain/actors/builtin/miner/v9.go
generated
4
chain/actors/builtin/miner/v9.go
generated
@ -546,8 +546,8 @@ func fromV9SectorOnChainInfo(v9 miner9.SectorOnChainInfo) SectorOnChainInfo {
|
|||||||
DealWeight: v9.DealWeight,
|
DealWeight: v9.DealWeight,
|
||||||
VerifiedDealWeight: v9.VerifiedDealWeight,
|
VerifiedDealWeight: v9.VerifiedDealWeight,
|
||||||
InitialPledge: v9.InitialPledge,
|
InitialPledge: v9.InitialPledge,
|
||||||
ExpectedDayReward: v9.ExpectedDayReward,
|
ExpectedDayReward: &v9.ExpectedDayReward,
|
||||||
ExpectedStoragePledge: v9.ExpectedStoragePledge,
|
ExpectedStoragePledge: &v9.ExpectedStoragePledge,
|
||||||
SectorKeyCID: v9.SectorKeyCID,
|
SectorKeyCID: v9.SectorKeyCID,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
|
@ -512,6 +512,14 @@ func createEmptyMinerState(ctx context.Context, t *testing.T, store adt2.Store,
|
|||||||
func createSectorsAMT(ctx context.Context, t *testing.T, store adt2.Store, sectors []miner.SectorOnChainInfo) cid.Cid {
|
func createSectorsAMT(ctx context.Context, t *testing.T, store adt2.Store, sectors []miner.SectorOnChainInfo) cid.Cid {
|
||||||
root := adt2.MakeEmptyArray(store)
|
root := adt2.MakeEmptyArray(store)
|
||||||
for _, sector := range sectors {
|
for _, sector := range sectors {
|
||||||
|
edr := big.Zero()
|
||||||
|
esp := big.Zero()
|
||||||
|
if sector.ExpectedDayReward != nil {
|
||||||
|
edr = *sector.ExpectedDayReward
|
||||||
|
}
|
||||||
|
if sector.ExpectedStoragePledge != nil {
|
||||||
|
esp = *sector.ExpectedStoragePledge
|
||||||
|
}
|
||||||
sector := miner2.SectorOnChainInfo{
|
sector := miner2.SectorOnChainInfo{
|
||||||
SectorNumber: sector.SectorNumber,
|
SectorNumber: sector.SectorNumber,
|
||||||
SealProof: sector.SealProof,
|
SealProof: sector.SealProof,
|
||||||
@ -522,8 +530,8 @@ func createSectorsAMT(ctx context.Context, t *testing.T, store adt2.Store, secto
|
|||||||
DealWeight: sector.DealWeight,
|
DealWeight: sector.DealWeight,
|
||||||
VerifiedDealWeight: sector.VerifiedDealWeight,
|
VerifiedDealWeight: sector.VerifiedDealWeight,
|
||||||
InitialPledge: sector.InitialPledge,
|
InitialPledge: sector.InitialPledge,
|
||||||
ExpectedDayReward: sector.ExpectedDayReward,
|
ExpectedDayReward: edr,
|
||||||
ExpectedStoragePledge: sector.ExpectedStoragePledge,
|
ExpectedStoragePledge: esp,
|
||||||
ReplacedSectorAge: 0,
|
ReplacedSectorAge: 0,
|
||||||
ReplacedDayReward: big.NewInt(0),
|
ReplacedDayReward: big.NewInt(0),
|
||||||
}
|
}
|
||||||
@ -538,6 +546,7 @@ func createSectorsAMT(ctx context.Context, t *testing.T, store adt2.Store, secto
|
|||||||
// returns a unique SectorOnChainInfo with each invocation with SectorNumber set to `sectorNo`.
|
// returns a unique SectorOnChainInfo with each invocation with SectorNumber set to `sectorNo`.
|
||||||
func newSectorOnChainInfo(sectorNo abi.SectorNumber, sealed cid.Cid, weight big.Int, activation, expiration abi.ChainEpoch) miner.SectorOnChainInfo {
|
func newSectorOnChainInfo(sectorNo abi.SectorNumber, sealed cid.Cid, weight big.Int, activation, expiration abi.ChainEpoch) miner.SectorOnChainInfo {
|
||||||
info := newSectorPreCommitInfo(sectorNo, sealed, expiration)
|
info := newSectorPreCommitInfo(sectorNo, sealed, expiration)
|
||||||
|
bz := big.Zero()
|
||||||
return miner.SectorOnChainInfo{
|
return miner.SectorOnChainInfo{
|
||||||
SectorNumber: info.SectorNumber,
|
SectorNumber: info.SectorNumber,
|
||||||
SealProof: info.SealProof,
|
SealProof: info.SealProof,
|
||||||
@ -549,8 +558,8 @@ func newSectorOnChainInfo(sectorNo abi.SectorNumber, sealed cid.Cid, weight big.
|
|||||||
DealWeight: weight,
|
DealWeight: weight,
|
||||||
VerifiedDealWeight: weight,
|
VerifiedDealWeight: weight,
|
||||||
InitialPledge: big.Zero(),
|
InitialPledge: big.Zero(),
|
||||||
ExpectedDayReward: big.Zero(),
|
ExpectedDayReward: &bz,
|
||||||
ExpectedStoragePledge: big.Zero(),
|
ExpectedStoragePledge: &bz,
|
||||||
DailyFee: big.Zero(),
|
DailyFee: big.Zero(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
12
cli/state.go
12
cli/state.go
@ -1513,8 +1513,16 @@ var StateSectorCmd = &cli.Command{
|
|||||||
fmt.Println("DealWeight: ", si.DealWeight)
|
fmt.Println("DealWeight: ", si.DealWeight)
|
||||||
fmt.Println("VerifiedDealWeight: ", si.VerifiedDealWeight)
|
fmt.Println("VerifiedDealWeight: ", si.VerifiedDealWeight)
|
||||||
fmt.Println("InitialPledge: ", types.FIL(si.InitialPledge))
|
fmt.Println("InitialPledge: ", types.FIL(si.InitialPledge))
|
||||||
fmt.Println("ExpectedDayReward: ", types.FIL(si.ExpectedDayReward))
|
edr := big.Zero()
|
||||||
fmt.Println("ExpectedStoragePledge: ", types.FIL(si.ExpectedStoragePledge))
|
if si.ExpectedDayReward != nil {
|
||||||
|
edr = *si.ExpectedDayReward
|
||||||
|
}
|
||||||
|
fmt.Println("ExpectedDayReward: ", types.FIL(edr))
|
||||||
|
esp := big.Zero()
|
||||||
|
if si.ExpectedStoragePledge != nil {
|
||||||
|
esp = *si.ExpectedStoragePledge
|
||||||
|
}
|
||||||
|
fmt.Println("ExpectedStoragePledge: ", types.FIL(esp))
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
sp, err := api.StateSectorPartition(ctx, maddr, abi.SectorNumber(sid), ts.Key())
|
sp, err := api.StateSectorPartition(ctx, maddr, abi.SectorNumber(sid), ts.Key())
|
||||||
|
2
go.mod
2
go.mod
@ -51,7 +51,7 @@ require (
|
|||||||
github.com/filecoin-project/go-jsonrpc v0.7.0
|
github.com/filecoin-project/go-jsonrpc v0.7.0
|
||||||
github.com/filecoin-project/go-padreader v0.0.1
|
github.com/filecoin-project/go-padreader v0.0.1
|
||||||
github.com/filecoin-project/go-paramfetch v0.0.4
|
github.com/filecoin-project/go-paramfetch v0.0.4
|
||||||
github.com/filecoin-project/go-state-types v0.16.0-rc3.0.20250310021754-3344f6f74996 // dependency-check-ignore: unknown
|
github.com/filecoin-project/go-state-types v0.16.0-rc5.0.20250317052821-201bdd7d4067 // dependency-check-ignore: unknown
|
||||||
github.com/filecoin-project/go-statemachine v1.0.3
|
github.com/filecoin-project/go-statemachine v1.0.3
|
||||||
github.com/filecoin-project/go-statestore v0.2.0
|
github.com/filecoin-project/go-statestore v0.2.0
|
||||||
github.com/filecoin-project/go-storedcounter v0.1.0
|
github.com/filecoin-project/go-storedcounter v0.1.0
|
||||||
|
4
go.sum
4
go.sum
@ -305,8 +305,8 @@ github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go
|
|||||||
github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
|
github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
|
||||||
github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
|
github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
|
||||||
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
|
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
|
||||||
github.com/filecoin-project/go-state-types v0.16.0-rc3.0.20250310021754-3344f6f74996 h1:vQO1gGOVyFItftBe0vHAxgEYFyZV19qp1CRhSpItmUM=
|
github.com/filecoin-project/go-state-types v0.16.0-rc5.0.20250317052821-201bdd7d4067 h1:5mQqR1lEPthCRzTne+kqRIX8krrIg+x23GqSCLO1bBU=
|
||||||
github.com/filecoin-project/go-state-types v0.16.0-rc3.0.20250310021754-3344f6f74996/go.mod h1:ANNGWlo4VPvOkHb+lF8RPMgZoEaaJVQqoBVJcTSxbew=
|
github.com/filecoin-project/go-state-types v0.16.0-rc5.0.20250317052821-201bdd7d4067/go.mod h1:YCESyrqnyu17y0MazbV6Uwma5+BrMvEKEQp5QWeIf9g=
|
||||||
github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
|
github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
|
||||||
github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
|
github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
|
||||||
github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI=
|
github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI=
|
||||||
|
Reference in New Issue
Block a user