Merge pull request #5999 from filecoin-project/opt/add-PendingOwnerAd…

…dress opt: MinerInfo adds the PendingOwnerAddress field
filecoin-project · Jun 2, 2023 · 1e7b022 · 1e7b022
2 parents 0a3ca90 + c440722
commit 1e7b022
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/app/submodule/chain/miner_api.go b/app/submodule/chain/miner_api.go
@@ -136,6 +136,7 @@ func (msa *minerStateAPI) StateMinerInfo(ctx context.Context, maddr address.Addr
 		SectorSize:                 minfo.SectorSize,
 		WindowPoStPartitionSectors: minfo.WindowPoStPartitionSectors,
 		ConsensusFaultElapsed:      minfo.ConsensusFaultElapsed,
+		PendingOwnerAddress:        minfo.PendingOwnerAddress,
 		Beneficiary:                minfo.Beneficiary,
 		BeneficiaryTerm:            &minfo.BeneficiaryTerm,
 		PendingBeneficiaryTerm:     minfo.PendingBeneficiaryTerm,

diff --git a/venus-shared/api/chain/v0/method.md b/venus-shared/api/chain/v0/method.md
@@ -3632,6 +3632,7 @@ Response:
   "SectorSize": 34359738368,
   "WindowPoStPartitionSectors": 42,
   "ConsensusFaultElapsed": 10101,
+  "PendingOwnerAddress": "f01234",
   "Beneficiary": "f01234",
   "BeneficiaryTerm": {
     "Quota": "0",

diff --git a/venus-shared/api/chain/v1/method.md b/venus-shared/api/chain/v1/method.md
@@ -4891,6 +4891,7 @@ Response:
   "SectorSize": 34359738368,
   "WindowPoStPartitionSectors": 42,
   "ConsensusFaultElapsed": 10101,
+  "PendingOwnerAddress": "f01234",
   "Beneficiary": "f01234",
   "BeneficiaryTerm": {
     "Quota": "0",

diff --git a/venus-shared/compatible-checks/api-diff.txt b/venus-shared/compatible-checks/api-diff.txt
@@ -97,6 +97,7 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v0.FullNode <> github.c
 	- StateGetRandomnessFromBeacon
 	- StateGetRandomnessFromTickets
 	- StateListMessages
+	> StateMinerInfo {[func(context.Context, address.Address, types.TipSetKey) (types.MinerInfo, error) <> func(context.Context, address.Address, types.TipSetKey) (api.MinerInfo, error)] base=func out type: #0 input; nested={[types.MinerInfo <> api.MinerInfo] base=struct field; nested={[types.MinerInfo <> api.MinerInfo] base=exported fields count: 15 != 14; nested=nil}}}
 	+ StateMinerSectorSize
 	+ StateMinerWorkerAddress
 	- StateReadState
@@ -223,6 +224,7 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v1.FullNode <> github.c
 	+ SetPassword
 	- Shutdown
 	> StateGetNetworkParams {[func(context.Context) (*types.NetworkParams, error) <> func(context.Context) (*api.NetworkParams, error)] base=func out type: #0 input; nested={[*types.NetworkParams <> *api.NetworkParams] base=pointed type; nested={[types.NetworkParams <> api.NetworkParams] base=struct field; nested={[types.NetworkParams <> api.NetworkParams] base=exported fields count: 7 != 6; nested=nil}}}}
+	> StateMinerInfo {[func(context.Context, address.Address, types.TipSetKey) (types.MinerInfo, error) <> func(context.Context, address.Address, types.TipSetKey) (api.MinerInfo, error)] base=func out type: #0 input; nested={[types.MinerInfo <> api.MinerInfo] base=struct field; nested={[types.MinerInfo <> api.MinerInfo] base=exported fields count: 15 != 14; nested=nil}}}
 	+ StateMinerSectorSize
 	+ StateMinerWorkerAddress
 	- SyncCheckBad

diff --git a/venus-shared/types/api_types.go b/venus-shared/types/api_types.go
@@ -385,6 +385,7 @@ type MinerInfo struct {
 	SectorSize                 abi.SectorSize
 	WindowPoStPartitionSectors uint64
 	ConsensusFaultElapsed      abi.ChainEpoch
+	PendingOwnerAddress        *address.Address
 	Beneficiary                address.Address
 	BeneficiaryTerm            *BeneficiaryTerm
 	PendingBeneficiaryTerm     *PendingBeneficiaryChange