Skip to content

Commit 9d9e4af

Browse files
volhovmvolhovm
authored
Merge pull request #16413 from MinaProtocol/dw/merge-develop-20241212
Merge compatible into develop [20241212]
2 parents 4b1c61e + b68d52f commit 9d9e4af

File tree

115 files changed

+1744
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+1744
-424
lines changed

‎buildkite/scripts/build-artifact.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@ dune build "--profile=${DUNE_PROFILE}" $INSTRUMENTED_PARAM \
4949
src/app/disk_caching_stats/disk_caching_stats.exe \
5050
src/app/heap_usage/heap_usage.exe \
5151
src/app/zkapp_limits/zkapp_limits.exe \
52+
src/lib/snark_worker/standalone/run_snark_worker.exe \
5253
src/test/command_line_tests/command_line_tests.exe \
5354
src/test/archive/patch_archive_test/patch_archive_test.exe

‎graphql_schema.json

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@
9595
"enumValues": null,
9696
"possibleTypes": null
9797
},
98+
{
99+
"kind": "SCALAR",
100+
"name": "ProofBundleInput",
101+
"description": "Proof bundle for a given spec in json format",
102+
"fields": null,
103+
"inputFields": null,
104+
"interfaces": null,
105+
"enumValues": null,
106+
"possibleTypes": null
107+
},
98108
{
99109
"kind": "SCALAR",
100110
"name": "RosettaTransaction",
@@ -5490,6 +5500,38 @@
54905500
},
54915501
"isDeprecated": false,
54925502
"deprecationReason": null
5503+
},
5504+
{
5505+
"name": "sendProofBundle",
5506+
"description": "Transaction SNARKs for a given spec",
5507+
"args": [
5508+
{
5509+
"name": "input",
5510+
"description":
5511+
"Proof bundle for a given spec in json format including fees and prover public key",
5512+
"type": {
5513+
"kind": "NON_NULL",
5514+
"name": null,
5515+
"ofType": {
5516+
"kind": "SCALAR",
5517+
"name": "ProofBundleInput",
5518+
"ofType": null
5519+
}
5520+
},
5521+
"defaultValue": null
5522+
}
5523+
],
5524+
"type": {
5525+
"kind": "NON_NULL",
5526+
"name": null,
5527+
"ofType": {
5528+
"kind": "SCALAR",
5529+
"name": "String",
5530+
"ofType": null
5531+
}
5532+
},
5533+
"isDeprecated": false,
5534+
"deprecationReason": null
54935535
}
54945536
],
54955537
"inputFields": null,
@@ -6660,6 +6702,107 @@
66606702
"enumValues": null,
66616703
"possibleTypes": null
66626704
},
6705+
{
6706+
"kind": "OBJECT",
6707+
"name": "WorkBundleSpec",
6708+
"description":
6709+
"Witnesses and statements for snark work bundles. Includes optional fees and prover public keys for ones that have proofs in the snark pool",
6710+
"fields": [
6711+
{
6712+
"name": "spec",
6713+
"description": "Snark work specification in json format",
6714+
"args": [],
6715+
"type": {
6716+
"kind": "NON_NULL",
6717+
"name": null,
6718+
"ofType": {
6719+
"kind": "SCALAR",
6720+
"name": "String",
6721+
"ofType": null
6722+
}
6723+
},
6724+
"isDeprecated": false,
6725+
"deprecationReason": null
6726+
},
6727+
{
6728+
"name": "snarkFee",
6729+
"description": "Fee if proof for the spec exists in snark pool",
6730+
"args": [],
6731+
"type": { "kind": "SCALAR", "name": "Fee", "ofType": null },
6732+
"isDeprecated": false,
6733+
"deprecationReason": null
6734+
},
6735+
{
6736+
"name": "snarkProverKey",
6737+
"description":
6738+
"Prover public key if proof for the spec exists in snark pool",
6739+
"args": [],
6740+
"type": {
6741+
"kind": "SCALAR",
6742+
"name": "PublicKey",
6743+
"ofType": null
6744+
},
6745+
"isDeprecated": false,
6746+
"deprecationReason": null
6747+
},
6748+
{
6749+
"name": "workIds",
6750+
"description": "Unique identifier for a snark work",
6751+
"args": [],
6752+
"type": {
6753+
"kind": "NON_NULL",
6754+
"name": null,
6755+
"ofType": {
6756+
"kind": "LIST",
6757+
"name": null,
6758+
"ofType": {
6759+
"kind": "NON_NULL",
6760+
"name": null,
6761+
"ofType": {
6762+
"kind": "SCALAR",
6763+
"name": "Int",
6764+
"ofType": null
6765+
}
6766+
}
6767+
}
6768+
},
6769+
"isDeprecated": false,
6770+
"deprecationReason": null
6771+
}
6772+
],
6773+
"inputFields": null,
6774+
"interfaces": [],
6775+
"enumValues": null,
6776+
"possibleTypes": null
6777+
},
6778+
{
6779+
"kind": "OBJECT",
6780+
"name": "PendingSnarkWorkSpec",
6781+
"description":
6782+
"Snark work witnesses and statements that are yet to be proven or included in blocks",
6783+
"fields": [
6784+
{
6785+
"name": "workBundleSpec",
6786+
"description": "Work bundle spec with one or two snark work",
6787+
"args": [],
6788+
"type": {
6789+
"kind": "NON_NULL",
6790+
"name": null,
6791+
"ofType": {
6792+
"kind": "OBJECT",
6793+
"name": "WorkBundleSpec",
6794+
"ofType": null
6795+
}
6796+
},
6797+
"isDeprecated": false,
6798+
"deprecationReason": null
6799+
}
6800+
],
6801+
"inputFields": null,
6802+
"interfaces": [],
6803+
"enumValues": null,
6804+
"possibleTypes": null
6805+
},
66636806
{
66646807
"kind": "OBJECT",
66656808
"name": "WorkDescription",
@@ -15282,6 +15425,58 @@
1528215425
"isDeprecated": false,
1528315426
"deprecationReason": null
1528415427
},
15428+
{
15429+
"name": "snarkWorkRange",
15430+
"description":
15431+
"Find any sequence of snark work between two indexes in all available snark work. Returns both completed and uncompleted work.",
15432+
"args": [
15433+
{
15434+
"name": "endingIndex",
15435+
"description":
15436+
"The last index to be taken from all available snark work (exclusive). If not specified or greater than the available snark work list,all elements from index [startingIndex] will be returned. An empty list will be returned if startingIndex is not a valid index or if startingIndex >= endingIndex.",
15437+
"type": {
15438+
"kind": "SCALAR",
15439+
"name": "UInt32",
15440+
"ofType": null
15441+
},
15442+
"defaultValue": null
15443+
},
15444+
{
15445+
"name": "startingIndex",
15446+
"description":
15447+
"The first index to be taken from all available snark work",
15448+
"type": {
15449+
"kind": "NON_NULL",
15450+
"name": null,
15451+
"ofType": {
15452+
"kind": "SCALAR",
15453+
"name": "UInt32",
15454+
"ofType": null
15455+
}
15456+
},
15457+
"defaultValue": null
15458+
}
15459+
],
15460+
"type": {
15461+
"kind": "NON_NULL",
15462+
"name": null,
15463+
"ofType": {
15464+
"kind": "LIST",
15465+
"name": null,
15466+
"ofType": {
15467+
"kind": "NON_NULL",
15468+
"name": null,
15469+
"ofType": {
15470+
"kind": "OBJECT",
15471+
"name": "PendingSnarkWorkSpec",
15472+
"ofType": null
15473+
}
15474+
}
15475+
}
15476+
},
15477+
"isDeprecated": false,
15478+
"deprecationReason": null
15479+
},
1528515480
{
1528615481
"name": "snarkedLedgerAccountMembership",
1528715482
"description":

‎scripts/debian/builder-helpers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ copy_common_daemon_configs() {
146146
cp ./default/src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe "${BUILDDIR}/usr/local/bin/mina-create-genesis"
147147
cp ./default/src/app/generate_keypair/generate_keypair.exe "${BUILDDIR}/usr/local/bin/mina-generate-keypair"
148148
cp ./default/src/app/validate_keypair/validate_keypair.exe "${BUILDDIR}/usr/local/bin/mina-validate-keypair"
149-
149+
cp ./default/src/lib/snark_worker/standalone/run_snark_worker.exe "${BUILDDIR}/usr/local/bin/mina-standalone-snark-worker"
150150
# Copy signature-based Binaries (based on signature type $2 passed into the function)
151151
cp ./default/src/app/cli/src/mina_"${2}"_signatures.exe "${BUILDDIR}/usr/local/bin/mina"
152152

0 commit comments

Comments
 (0)