Merge pull request #10927 from simlecode/opt/add_PendingOwnerAddress

opt: MinerInfo adds the PendingOwnerAddress field
This commit is contained in:
Łukasz Magiera 2023-05-30 16:55:50 +02:00 committed by GitHub
commit 8be9e5345b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 8 deletions

View File

@ -86,6 +86,7 @@ func init() {
} }
ExampleValues[reflect.TypeOf(addr)] = addr ExampleValues[reflect.TypeOf(addr)] = addr
ExampleValues[reflect.TypeOf(&addr)] = &addr
pid, err := peer.Decode("12D3KooWGzxzKZYveHXtpG6AsrUJBcWxHBFS2HsEoGTxrMLvKXtf") pid, err := peer.Decode("12D3KooWGzxzKZYveHXtpG6AsrUJBcWxHBFS2HsEoGTxrMLvKXtf")
if err != nil { if err != nil {

View File

@ -299,6 +299,7 @@ type MinerInfo struct {
SectorSize abi.SectorSize SectorSize abi.SectorSize
WindowPoStPartitionSectors uint64 WindowPoStPartitionSectors uint64
ConsensusFaultElapsed abi.ChainEpoch ConsensusFaultElapsed abi.ChainEpoch
PendingOwnerAddress *address.Address
Beneficiary address.Address Beneficiary address.Address
BeneficiaryTerm *miner.BeneficiaryTerm BeneficiaryTerm *miner.BeneficiaryTerm
PendingBeneficiaryTerm *miner.PendingBeneficiaryChange PendingBeneficiaryTerm *miner.PendingBeneficiaryChange

Binary file not shown.

Binary file not shown.

View File

@ -4202,7 +4202,7 @@ Inputs:
Response: Response:
```json ```json
{ {
"Channel": "\u003cempty\u003e", "Channel": "f01234",
"From": "f01234", "From": "f01234",
"To": "f01234", "To": "f01234",
"ConfirmedAmt": "0", "ConfirmedAmt": "0",
@ -4233,7 +4233,7 @@ Inputs:
Response: Response:
```json ```json
{ {
"Channel": "\u003cempty\u003e", "Channel": "f01234",
"From": "f01234", "From": "f01234",
"To": "f01234", "To": "f01234",
"ConfirmedAmt": "0", "ConfirmedAmt": "0",
@ -4953,7 +4953,7 @@ Response:
}, },
"Nonce": 42, "Nonce": 42,
"Balance": "0", "Balance": "0",
"Address": "\u003cempty\u003e" "Address": "f01234"
} }
} }
``` ```
@ -5242,7 +5242,7 @@ Response:
}, },
"Nonce": 42, "Nonce": 42,
"Balance": "0", "Balance": "0",
"Address": "\u003cempty\u003e" "Address": "f01234"
} }
``` ```
@ -5985,6 +5985,7 @@ Response:
"SectorSize": 34359738368, "SectorSize": 34359738368,
"WindowPoStPartitionSectors": 42, "WindowPoStPartitionSectors": 42,
"ConsensusFaultElapsed": 10101, "ConsensusFaultElapsed": 10101,
"PendingOwnerAddress": "f01234",
"Beneficiary": "f01234", "Beneficiary": "f01234",
"BeneficiaryTerm": { "BeneficiaryTerm": {
"Quota": "0", "Quota": "0",

View File

@ -5576,7 +5576,7 @@ Inputs:
Response: Response:
```json ```json
{ {
"Channel": "\u003cempty\u003e", "Channel": "f01234",
"From": "f01234", "From": "f01234",
"To": "f01234", "To": "f01234",
"ConfirmedAmt": "0", "ConfirmedAmt": "0",
@ -5607,7 +5607,7 @@ Inputs:
Response: Response:
```json ```json
{ {
"Channel": "\u003cempty\u003e", "Channel": "f01234",
"From": "f01234", "From": "f01234",
"To": "f01234", "To": "f01234",
"ConfirmedAmt": "0", "ConfirmedAmt": "0",
@ -6390,7 +6390,7 @@ Response:
}, },
"Nonce": 42, "Nonce": 42,
"Balance": "0", "Balance": "0",
"Address": "\u003cempty\u003e" "Address": "f01234"
} }
} }
``` ```
@ -6730,7 +6730,7 @@ Response:
}, },
"Nonce": 42, "Nonce": 42,
"Balance": "0", "Balance": "0",
"Address": "\u003cempty\u003e" "Address": "f01234"
} }
``` ```
@ -7505,6 +7505,7 @@ Response:
"SectorSize": 34359738368, "SectorSize": 34359738368,
"WindowPoStPartitionSectors": 42, "WindowPoStPartitionSectors": 42,
"ConsensusFaultElapsed": 10101, "ConsensusFaultElapsed": 10101,
"PendingOwnerAddress": "f01234",
"Beneficiary": "f01234", "Beneficiary": "f01234",
"BeneficiaryTerm": { "BeneficiaryTerm": {
"Quota": "0", "Quota": "0",

View File

@ -180,6 +180,7 @@ func (m *StateModule) StateMinerInfo(ctx context.Context, actor address.Address,
SectorSize: info.SectorSize, SectorSize: info.SectorSize,
WindowPoStPartitionSectors: info.WindowPoStPartitionSectors, WindowPoStPartitionSectors: info.WindowPoStPartitionSectors,
ConsensusFaultElapsed: info.ConsensusFaultElapsed, ConsensusFaultElapsed: info.ConsensusFaultElapsed,
PendingOwnerAddress: info.PendingOwnerAddress,
Beneficiary: info.Beneficiary, Beneficiary: info.Beneficiary,
BeneficiaryTerm: &info.BeneficiaryTerm, BeneficiaryTerm: &info.BeneficiaryTerm,
PendingBeneficiaryTerm: info.PendingBeneficiaryTerm, PendingBeneficiaryTerm: info.PendingBeneficiaryTerm,