diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go index eac266a1684..cecc79886e0 100644 --- a/api/docgen/docgen.go +++ b/api/docgen/docgen.go @@ -105,6 +105,31 @@ func init() { addExample(f3Lease) addExample(&f3Lease) + f3Cert := certs.FinalityCertificate{ + GPBFTInstance: 0, + ECChain: []gpbft.TipSet{ + { + Epoch: 0, + Key: tsk.Bytes(), + PowerTable: c, + }, + }, + SupplementalData: gpbft.SupplementalData{ + PowerTable: c, + }, + Signers: bitfield.NewFromSet([]uint64{2, 3, 5, 7}), + Signature: []byte("UnDadaSeA"), + PowerTableDelta: []certs.PowerTableDelta{ + { + ParticipantID: 0, + PowerDelta: gpbft.StoragePower{}, + SigningKey: []byte("BaRrelEYe"), + }, + }, + } + addExample(f3Cert) + addExample(&f3Cert) + block := blocks.Block(&blocks.BasicBlock{}) ExampleValues[reflect.TypeOf(&block).Elem()] = block @@ -429,7 +454,6 @@ func init() { FromHeight: epochPtr(1010), ToHeight: epochPtr(1020), }) - addExample(&certs.FinalityCertificate{}) addExample(&manifest.Manifest{}) addExample(gpbft.NetworkName("filecoin")) addExample(gpbft.ActorID(1000)) diff --git a/build/openrpc/full.json b/build/openrpc/full.json index 27feaeb09c0..1dcaf298e85 100644 --- a/build/openrpc/full.json +++ b/build/openrpc/full.json @@ -7084,49 +7084,45 @@ "examples": [ { "GPBFTInstance": 0, - "ECChain": null, + "ECChain": [ + { + "Key": [ + { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + }, + { + "/": "bafy2bzacebp3shtrn43k7g3unredz7fxn4gj533d3o43tqn2p2ipxxhrvchve" + } + ], + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "Epoch": 0, + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } + } + ], "SupplementalData": { - "Commitments": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "PowerTable": null + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } }, "Signers": [ - 0 + 2, + 2, + 1, + 1, + 1, + 1 ], - "Signature": null, - "PowerTableDelta": null + "Signature": "VW5EYWRhU2VB", + "PowerTableDelta": [ + { + "ParticipantID": 0, + "PowerDelta": "0", + "SigningKey": "QmFScmVsRVll" + } + ] } ], "additionalProperties": false, @@ -7417,49 +7413,45 @@ "examples": [ { "GPBFTInstance": 0, - "ECChain": null, + "ECChain": [ + { + "Key": [ + { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + }, + { + "/": "bafy2bzacebp3shtrn43k7g3unredz7fxn4gj533d3o43tqn2p2ipxxhrvchve" + } + ], + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "Epoch": 0, + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } + } + ], "SupplementalData": { - "Commitments": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "PowerTable": null + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } }, "Signers": [ - 0 + 2, + 2, + 1, + 1, + 1, + 1 ], - "Signature": null, - "PowerTableDelta": null + "Signature": "VW5EYWRhU2VB", + "PowerTableDelta": [ + { + "ParticipantID": 0, + "PowerDelta": "0", + "SigningKey": "QmFScmVsRVll" + } + ] } ], "additionalProperties": false, diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index c7561c99375..12077ab5790 100644 --- a/documentation/en/api-v1-unstable-methods.md +++ b/documentation/en/api-v1-unstable-methods.md @@ -2417,49 +2417,45 @@ Response: ```json { "GPBFTInstance": 0, - "ECChain": null, + "ECChain": [ + { + "Key": [ + { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + }, + { + "/": "bafy2bzacebp3shtrn43k7g3unredz7fxn4gj533d3o43tqn2p2ipxxhrvchve" + } + ], + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "Epoch": 0, + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } + } + ], "SupplementalData": { - "Commitments": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "PowerTable": null + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } }, "Signers": [ - 0 + 2, + 2, + 1, + 1, + 1, + 1 ], - "Signature": null, - "PowerTableDelta": null + "Signature": "VW5EYWRhU2VB", + "PowerTableDelta": [ + { + "ParticipantID": 0, + "PowerDelta": "0", + "SigningKey": "QmFScmVsRVll" + } + ] } ``` @@ -2537,49 +2533,45 @@ Response: ```json { "GPBFTInstance": 0, - "ECChain": null, + "ECChain": [ + { + "Key": [ + { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + }, + { + "/": "bafy2bzacebp3shtrn43k7g3unredz7fxn4gj533d3o43tqn2p2ipxxhrvchve" + } + ], + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "Epoch": 0, + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } + } + ], "SupplementalData": { - "Commitments": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "PowerTable": null + "Commitments": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "PowerTable": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + } }, "Signers": [ - 0 + 2, + 2, + 1, + 1, + 1, + 1 ], - "Signature": null, - "PowerTableDelta": null + "Signature": "VW5EYWRhU2VB", + "PowerTableDelta": [ + { + "ParticipantID": 0, + "PowerDelta": "0", + "SigningKey": "QmFScmVsRVll" + } + ] } ``` diff --git a/go.mod b/go.mod index 4af87582813..2a9b9583bd4 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/filecoin-project/go-cbor-util v0.0.1 github.com/filecoin-project/go-commp-utils/v2 v2.1.0 github.com/filecoin-project/go-crypto v0.1.0 - github.com/filecoin-project/go-f3 v0.7.2 + github.com/filecoin-project/go-f3 v0.7.3 github.com/filecoin-project/go-fil-commcid v0.2.0 github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0 github.com/filecoin-project/go-jsonrpc v0.7.0 diff --git a/go.sum b/go.sum index 1b9d0c2345c..f88d579c6b3 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/filecoin-project/go-commp-utils/v2 v2.1.0/go.mod h1:NbxJYlhxtWaNhlVCj github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03/go.mod h1:+viYnvGtUTgJRdy6oaeF4MTFKAfatX071MPDPBL11EQ= github.com/filecoin-project/go-crypto v0.1.0 h1:Pob2MphoipMbe/ksxZOMcQvmBHAd3sI/WEqcbpIsGI0= github.com/filecoin-project/go-crypto v0.1.0/go.mod h1:K9UFXvvoyAVvB+0Le7oGlKiT9mgA5FHOJdYQXEE8IhI= -github.com/filecoin-project/go-f3 v0.7.2 h1:YQgxxSMzCSQniZqwDjyNkIRz3pnzCtOrtaS5ldIaUDA= -github.com/filecoin-project/go-f3 v0.7.2/go.mod h1:QoxuoK4aktNZD1R/unlhNbhV6TnlNTAbA/QODCnAjak= +github.com/filecoin-project/go-f3 v0.7.3 h1:nwRYRKaJs7AV3di/OQyj6tABeixBeL06DkJeoQrr5+0= +github.com/filecoin-project/go-f3 v0.7.3/go.mod h1:wDo5mPi4KXVuA7kvwLpmfVVv2Aw2ZwZk3iqMWr5BOT0= github.com/filecoin-project/go-fil-commcid v0.2.0 h1:B+5UX8XGgdg/XsdUpST4pEBviKkFOw+Fvl2bLhSKGpI= github.com/filecoin-project/go-fil-commcid v0.2.0/go.mod h1:8yigf3JDIil+/WpqR5zoKyP0jBPCOGtEqq/K1CcMy9Q= github.com/filecoin-project/go-fil-commp-hashhash v0.2.0 h1:HYIUugzjq78YvV3vC6rL95+SfC/aSTVSnZSZiDV5pCk=