Merge pull request #10927 from simlecode/opt/add_PendingOwnerAddress

opt: MinerInfo adds the PendingOwnerAddress field
2023-05-30 16:55:50 +02:00 · 2023-05-30 16:55:50 +02:00 · 8be9e5345b
commit 8be9e5345b
parent 047898f64d 3bed440d2d
7 changed files with 13 additions and 8 deletions
--- a/api/docgen/docgen.go
+++ b/api/docgen/docgen.go
@ -86,6 +86,7 @@ func init() {
 	}

 	ExampleValues[reflect.TypeOf(addr)] = addr
+	ExampleValues[reflect.TypeOf(&addr)] = &addr

 	pid, err := peer.Decode("12D3KooWGzxzKZYveHXtpG6AsrUJBcWxHBFS2HsEoGTxrMLvKXtf")
 	if err != nil {
--- a/api/types.go
+++ b/api/types.go
@ -299,6 +299,7 @@ type MinerInfo struct {
 	SectorSize                 abi.SectorSize
 	WindowPoStPartitionSectors uint64
 	ConsensusFaultElapsed      abi.ChainEpoch
+	PendingOwnerAddress        *address.Address
 	Beneficiary                address.Address
 	BeneficiaryTerm            *miner.BeneficiaryTerm
 	PendingBeneficiaryTerm     *miner.PendingBeneficiaryChange
--- a/build/openrpc/full.json.gz
+++ b/build/openrpc/full.json.gz
--- a/build/openrpc/gateway.json.gz
+++ b/build/openrpc/gateway.json.gz
--- a/documentation/en/api-v0-methods.md
+++ b/documentation/en/api-v0-methods.md
@ -4202,7 +4202,7 @@ Inputs:
 Response:
 ```json
 {
-  "Channel": "\u003cempty\u003e",
+  "Channel": "f01234",
  "From": "f01234",
  "To": "f01234",
  "ConfirmedAmt": "0",
@ -4233,7 +4233,7 @@ Inputs:
 Response:
 ```json
 {
-  "Channel": "\u003cempty\u003e",
+  "Channel": "f01234",
  "From": "f01234",
  "To": "f01234",
  "ConfirmedAmt": "0",
@ -4953,7 +4953,7 @@ Response:
    },
    "Nonce": 42,
    "Balance": "0",
-    "Address": "\u003cempty\u003e"
+    "Address": "f01234"
  }
 }
 ```
@ -5242,7 +5242,7 @@ Response:
  },
  "Nonce": 42,
  "Balance": "0",
-  "Address": "\u003cempty\u003e"
+  "Address": "f01234"
 }
 ```

@ -5985,6 +5985,7 @@ Response:
  "SectorSize": 34359738368,
  "WindowPoStPartitionSectors": 42,
  "ConsensusFaultElapsed": 10101,
+  "PendingOwnerAddress": "f01234",
  "Beneficiary": "f01234",
  "BeneficiaryTerm": {
    "Quota": "0",
--- a/documentation/en/api-v1-unstable-methods.md
+++ b/documentation/en/api-v1-unstable-methods.md
@ -5576,7 +5576,7 @@ Inputs:
 Response:
 ```json
 {
-  "Channel": "\u003cempty\u003e",
+  "Channel": "f01234",
  "From": "f01234",
  "To": "f01234",
  "ConfirmedAmt": "0",
@ -5607,7 +5607,7 @@ Inputs:
 Response:
 ```json
 {
-  "Channel": "\u003cempty\u003e",
+  "Channel": "f01234",
  "From": "f01234",
  "To": "f01234",
  "ConfirmedAmt": "0",
@ -6390,7 +6390,7 @@ Response:
    },
    "Nonce": 42,
    "Balance": "0",
-    "Address": "\u003cempty\u003e"
+    "Address": "f01234"
  }
 }
 ```
@ -6730,7 +6730,7 @@ Response:
  },
  "Nonce": 42,
  "Balance": "0",
-  "Address": "\u003cempty\u003e"
+  "Address": "f01234"
 }
 ```

@ -7505,6 +7505,7 @@ Response:
  "SectorSize": 34359738368,
  "WindowPoStPartitionSectors": 42,
  "ConsensusFaultElapsed": 10101,
+  "PendingOwnerAddress": "f01234",
  "Beneficiary": "f01234",
  "BeneficiaryTerm": {
    "Quota": "0",
--- a/node/impl/full/state.go
+++ b/node/impl/full/state.go
@ -180,6 +180,7 @@ func (m *StateModule) StateMinerInfo(ctx context.Context, actor address.Address,
 		SectorSize:                 info.SectorSize,
 		WindowPoStPartitionSectors: info.WindowPoStPartitionSectors,
 		ConsensusFaultElapsed:      info.ConsensusFaultElapsed,
+		PendingOwnerAddress:        info.PendingOwnerAddress,
 		Beneficiary:                info.Beneficiary,
 		BeneficiaryTerm:            &info.BeneficiaryTerm,
 		PendingBeneficiaryTerm:     info.PendingBeneficiaryTerm,