Skip to content

Commit 4a001a7

Browse files
authored
feat!: Remove old prover stack (#3729)
This PR removes the entire old prover stack. What it means for you: Firstly, if you're using the deprecated witness_vector_generator & prover_fri, the binaries are gone. Secondly, you will need to migrate to circuit_prover (which is faster & comes with extra bells & whistles). This PR does not attempt to refactor the codebase post removal. It's big enough as it is, a follow-up cleanup PR will be needed.
1 parent 378c784 commit 4a001a7

File tree

9 files changed

+59
-185
lines changed

9 files changed

+59
-185
lines changed

zkstack_cli/crates/zkstack/completion/_zkstack.zsh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ _arguments "${_arguments_options[@]}" : \
136136
'--update-submodules=[]:UPDATE_SUBMODULES:(true false)' \
137137
'--validium-type=[Type of the Validium network]:VALIDIUM_TYPE:(no-da avail eigen-da)' \
138138
'--support-l2-legacy-shared-bridge-test=[]' \
139+
'--server-command=[Command to run the server binary]:SERVER_COMMAND:_default' \
139140
'--chain=[Chain to use]:CHAIN:_default' \
140141
'--resume[]' \
141142
'--zksync[]' \
@@ -296,6 +297,7 @@ _arguments "${_arguments_options[@]}" : \
296297
'--l1-rpc-url=[L1 RPC URL]:L1_RPC_URL:_default' \
297298
'--update-submodules=[]:UPDATE_SUBMODULES:(true false)' \
298299
'--validium-type=[Type of the Validium network]:VALIDIUM_TYPE:(no-da avail eigen-da)' \
300+
'--server-command=[Command to run the server binary]:SERVER_COMMAND:_default' \
299301
'--chain=[Chain to use]:CHAIN:_default' \
300302
'--resume[]' \
301303
'--zksync[]' \
@@ -322,6 +324,7 @@ _arguments "${_arguments_options[@]}" : \
322324
_arguments "${_arguments_options[@]}" : \
323325
'--server-db-url=[Server database url without database name]:SERVER_DB_URL:_default' \
324326
'--server-db-name=[Server database name]:SERVER_DB_NAME:_default' \
327+
'--server-command=[Command to run the server binary]:SERVER_COMMAND:_default' \
325328
'--l1-rpc-url=[L1 RPC URL]:L1_RPC_URL:_default' \
326329
'--chain=[Chain to use]:CHAIN:_default' \
327330
'-d[Use default database urls and names]' \
@@ -368,6 +371,7 @@ esac
368371
_arguments "${_arguments_options[@]}" : \
369372
'--server-db-url=[Server database url without database name]:SERVER_DB_URL:_default' \
370373
'--server-db-name=[Server database name]:SERVER_DB_NAME:_default' \
374+
'--server-command=[Command to run the server binary]:SERVER_COMMAND:_default' \
371375
'--chain=[Chain to use]:CHAIN:_default' \
372376
'-d[Use default database urls and names]' \
373377
'--dev[Use default database urls and names]' \
@@ -392,6 +396,7 @@ _arguments "${_arguments_options[@]}" : \
392396
_arguments "${_arguments_options[@]}" : \
393397
'--server-db-url=[Server database url without database name]:SERVER_DB_URL:_default' \
394398
'--server-db-name=[Server database name]:SERVER_DB_NAME:_default' \
399+
'--server-command=[Command to run the server binary]:SERVER_COMMAND:_default' \
395400
'--chain=[Chain to use]:CHAIN:_default' \
396401
'-d[Use default database urls and names]' \
397402
'--dev[Use default database urls and names]' \
@@ -1896,13 +1901,6 @@ _arguments "${_arguments_options[@]}" : \
18961901
'--bucket-name=[]:BUCKET_NAME:_default' \
18971902
'--location=[]:LOCATION:_default' \
18981903
'--project-id=[]:PROJECT_ID:_default' \
1899-
'--shall-save-to-public-bucket=[]:SHALL_SAVE_TO_PUBLIC_BUCKET:(true false)' \
1900-
'--public-store-dir=[]:PUBLIC_STORE_DIR:_default' \
1901-
'--public-bucket-base-url=[]:PUBLIC_BUCKET_BASE_URL:_default' \
1902-
'--public-credentials-file=[]:PUBLIC_CREDENTIALS_FILE:_default' \
1903-
'--public-bucket-name=[]:PUBLIC_BUCKET_NAME:_default' \
1904-
'--public-location=[]:PUBLIC_LOCATION:_default' \
1905-
'--public-project-id=[]:PUBLIC_PROJECT_ID:_default' \
19061904
'(--clone)--bellman-cuda-dir=[]:BELLMAN_CUDA_DIR:_default' \
19071905
'--bellman-cuda=[]' \
19081906
'--setup-compressor-key=[]' \
@@ -1917,7 +1915,6 @@ _arguments "${_arguments_options[@]}" : \
19171915
'--use-default=[Use default database urls and names]:USE_DEFAULT:(true false)' \
19181916
'-d+[]:DONT_DROP:(true false)' \
19191917
'--dont-drop=[]:DONT_DROP:(true false)' \
1920-
'--cloud-type=[]:CLOUD_TYPE:(gcp local)' \
19211918
'--chain=[Chain to use]:CHAIN:_default' \
19221919
'--dev[]' \
19231920
'(--bellman-cuda-dir)--clone[]' \
@@ -2035,6 +2032,7 @@ _arguments "${_arguments_options[@]}" : \
20352032
'*--components=[Components of server to run]:COMPONENTS:_default' \
20362033
'*-a+[Additional arguments that can be passed through the CLI]:ADDITIONAL_ARGS:_default' \
20372034
'*--additional-args=[Additional arguments that can be passed through the CLI]:ADDITIONAL_ARGS:_default' \
2035+
'--server-command=[Command to run the server binary]:SERVER_COMMAND:_default' \
20382036
'--chain=[Chain to use]:CHAIN:_default' \
20392037
'--genesis[Run server in genesis mode]' \
20402038
'--uring[Enables uring support for RocksDB]' \
@@ -2068,6 +2066,7 @@ _arguments "${_arguments_options[@]}" : \
20682066
'*--components=[Components of server to run]:COMPONENTS:_default' \
20692067
'*-a+[Additional arguments that can be passed through the CLI]:ADDITIONAL_ARGS:_default' \
20702068
'*--additional-args=[Additional arguments that can be passed through the CLI]:ADDITIONAL_ARGS:_default' \
2069+
'--server-command=[Command to run the server binary]:SERVER_COMMAND:_default' \
20712070
'--chain=[Chain to use]:CHAIN:_default' \
20722071
'--genesis[Run server in genesis mode]' \
20732072
'--uring[Enables uring support for RocksDB]' \

zkstack_cli/crates/zkstack/completion/zkstack.fish

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ avail\t''
145145
eigen-da\t''"
146146
complete -c zkstack -n "__fish_zkstack_using_subcommand ecosystem; and __fish_seen_subcommand_from init" -l support-l2-legacy-shared-bridge-test -r -f -a "true\t''
147147
false\t''"
148+
complete -c zkstack -n "__fish_zkstack_using_subcommand ecosystem; and __fish_seen_subcommand_from init" -l server-command -d 'Command to run the server binary' -r
148149
complete -c zkstack -n "__fish_zkstack_using_subcommand ecosystem; and __fish_seen_subcommand_from init" -l chain -d 'Chain to use' -r
149150
complete -c zkstack -n "__fish_zkstack_using_subcommand ecosystem; and __fish_seen_subcommand_from init" -l resume
150151
complete -c zkstack -n "__fish_zkstack_using_subcommand ecosystem; and __fish_seen_subcommand_from init" -l zksync
@@ -250,6 +251,7 @@ false\t''"
250251
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from init" -l validium-type -d 'Type of the Validium network' -r -f -a "no-da\t''
251252
avail\t''
252253
eigen-da\t''"
254+
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from init" -l server-command -d 'Command to run the server binary' -r
253255
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from init" -l chain -d 'Chain to use' -r
254256
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from init" -l resume
255257
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from init" -l zksync
@@ -263,6 +265,7 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_s
263265
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from init" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
264266
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from genesis" -l server-db-url -d 'Server database url without database name' -r
265267
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from genesis" -l server-db-name -d 'Server database name' -r
268+
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from genesis" -l server-command -d 'Command to run the server binary' -r
266269
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from genesis" -l chain -d 'Chain to use' -r
267270
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from genesis" -s d -l dev -d 'Use default database urls and names'
268271
complete -c zkstack -n "__fish_zkstack_using_subcommand chain; and __fish_seen_subcommand_from genesis" -s d -l dont-drop
@@ -591,14 +594,6 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_
591594
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l bucket-name -r
592595
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l location -r
593596
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l project-id -r
594-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l shall-save-to-public-bucket -r -f -a "true\t''
595-
false\t''"
596-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-store-dir -r
597-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-bucket-base-url -r
598-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-credentials-file -r
599-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-bucket-name -r
600-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-location -r
601-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-project-id -r
602597
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l bellman-cuda-dir -r
603598
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l bellman-cuda -r -f -a "true\t''
604599
false\t''"
@@ -620,8 +615,6 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_
620615
false\t''"
621616
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -s d -l dont-drop -r -f -a "true\t''
622617
false\t''"
623-
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l cloud-type -r -f -a "gcp\t''
624-
local\t''"
625618
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l chain -d 'Chain to use' -r
626619
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l dev
627620
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l clone
@@ -683,6 +676,7 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_
683676
complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
684677
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l components -d 'Components of server to run' -r
685678
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -s a -l additional-args -d 'Additional arguments that can be passed through the CLI' -r
679+
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l server-command -d 'Command to run the server binary' -r
686680
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l chain -d 'Chain to use' -r
687681
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l genesis -d 'Run server in genesis mode'
688682
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l uring -d 'Enables uring support for RocksDB'
@@ -699,6 +693,7 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_
699693
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from build" -s h -l help -d 'Print help'
700694
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l components -d 'Components of server to run' -r
701695
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -s a -l additional-args -d 'Additional arguments that can be passed through the CLI' -r
696+
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l server-command -d 'Command to run the server binary' -r
702697
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l chain -d 'Chain to use' -r
703698
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l genesis -d 'Run server in genesis mode'
704699
complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l uring -d 'Enables uring support for RocksDB'

0 commit comments

Comments
 (0)