Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blsSignature in camelCase & add anotherContributionInProgress response #39

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+27 −16
Open

blsSignature in camelCase & add anotherContributionInProgress response #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fd8d86
try_contribute(fix): add anotherContributionInProgress response
NicoSerranoP Oct 25, 2022
9563f84
docs(fix): include bls attr in initial contribution
NicoSerranoP Nov 3, 2022
de0b4b7
docs(fix): bls signature in camel case
NicoSerranoP Nov 3, 2022
1919b3a
Merge branch 'ethereum:master' into master
NicoSerranoP Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions apiSpec/contributionSchema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"potPubkey": {
"type": "string"
},
"bls_signature": {
"blsSignature": {
"anyOf": [
{"$ref": "#/$defs/G1Point"},
{"$ref": "#/$defs/emptyString"}
Expand Down Expand Up @@ -125,7 +125,7 @@
"potPubkey": {
"type": "string"
},
"bls_signature": {
"blsSignature": {
"anyOf": [
{"$ref": "#/$defs/G1Point"},
{"$ref": "#/$defs/emptyString"}
Expand Down Expand Up @@ -175,12 +175,11 @@
"G1Powers",
"G2Powers"
]
}
,
},
"potPubkey": {
"type": "string"
},
"bls_signature": {
"blsSignature": {
"anyOf": [
{"$ref": "#/$defs/G1Point"},
{"$ref": "#/$defs/emptyString"}
Expand Down Expand Up @@ -230,12 +229,11 @@
"G1Powers",
"G2Powers"
]
}
,
},
"potPubkey": {
"type": "string"
},
"bls_signature": {
"blsSignature": {
"anyOf": [
{"$ref": "#/$defs/G1Point"},
{"$ref": "#/$defs/emptyString"}
Expand Down
21 changes: 17 additions & 4 deletions apiSpec/sequencerApi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ paths:
/contribution/abort:
post:
tags:
- Contribution
- Contribution
summary: Cancel contribution attempt
description: |
description: |
Indicates an error while contributing (e.g. an error when performing
crypto calculations). Clients should use this endpoint
crypto calculations). Clients should use this endpoint
in the event of an unrecoverable error after
contribution has started to allow other users to participate sooner.
responses:
Expand Down Expand Up @@ -114,14 +114,27 @@ paths:
schema:
oneOf:
- $ref: '#/components/schemas/BatchContribution'
description:
description:
User was selected for contribution. Use the returned contribution file to calculate participant's points and then post results to /contribute
See contributionSchema.json for more detailed schema definition.
- type: object
properties:
error:
type: string
enum: ["another contribution in progress"]
200:
description: another contribution in progress
content:
application/json:
schema:
type: object
properties:
code:
type: string
enum: ["TryContributeError::AnotherContributionInProgress"]
message:
type: string
enum: ["another contribution in progress"]
400:
description: rate limited
content:
Expand Down
8 changes: 4 additions & 4 deletions initialContribution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4168,7 +4168,7 @@
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"

]
},
"potPubkey": "0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"
Expand Down Expand Up @@ -12437,7 +12437,7 @@
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"

]
},
"potPubkey": "0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"
Expand Down Expand Up @@ -28899,7 +28899,7 @@
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"

]
},
"potPubkey": "0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"
Expand Down Expand Up @@ -61746,7 +61746,7 @@
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8",
"0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"

]
},
"potPubkey": "0x93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"
Expand Down