diff --git a/.zkp/merger_wrapper.bin b/.zkp/merger_wrapper.bin deleted file mode 100644 index fd19091a81..0000000000 Binary files a/.zkp/merger_wrapper.bin and /dev/null differ diff --git a/.zkp/verifying_keys/merger_wrapper.bin b/.zkp/verifying_keys/merger_wrapper.bin index cf1b79b7f6..fd19091a81 100644 Binary files a/.zkp/verifying_keys/merger_wrapper.bin and b/.zkp/verifying_keys/merger_wrapper.bin differ diff --git a/.zkp_testnet/merger_wrapper.bin b/.zkp_testnet/merger_wrapper.bin deleted file mode 100644 index 3a71b2b684..0000000000 Binary files a/.zkp_testnet/merger_wrapper.bin and /dev/null differ diff --git a/.zkp_testnet/verifying_keys/merger_wrapper.bin b/.zkp_testnet/verifying_keys/merger_wrapper.bin index c3d30eee23..3a71b2b684 100644 Binary files a/.zkp_testnet/verifying_keys/merger_wrapper.bin and b/.zkp_testnet/verifying_keys/merger_wrapper.bin differ diff --git a/.zkp_tests/merger_wrapper.bin b/.zkp_tests/merger_wrapper.bin deleted file mode 100644 index 23d1b99532..0000000000 Binary files a/.zkp_tests/merger_wrapper.bin and /dev/null differ diff --git a/.zkp_tests/toxic_waste.bin b/.zkp_tests/toxic_waste.bin index 01ece87a90..fb0e6783b5 100644 Binary files a/.zkp_tests/toxic_waste.bin and b/.zkp_tests/toxic_waste.bin differ diff --git a/.zkp_tests/verifying_keys/merger_wrapper.bin b/.zkp_tests/verifying_keys/merger_wrapper.bin index 11a72d7337..23d1b99532 100644 Binary files a/.zkp_tests/verifying_keys/merger_wrapper.bin and b/.zkp_tests/verifying_keys/merger_wrapper.bin differ diff --git a/blockchain/src/blockchain/zkp_sync.rs b/blockchain/src/blockchain/zkp_sync.rs index 4be80256de..40184b922d 100644 --- a/blockchain/src/blockchain/zkp_sync.rs +++ b/blockchain/src/blockchain/zkp_sync.rs @@ -332,7 +332,7 @@ impl Blockchain { debug!( block = %this.state.main_chain.head, num_transactions, - kind = "zkp_extend", + kind = "push_macro", "Accepted block", ); diff --git a/lib/src/config/config.rs b/lib/src/config/config.rs index d000b1efac..4d72220f5e 100644 --- a/lib/src/config/config.rs +++ b/lib/src/config/config.rs @@ -571,10 +571,6 @@ pub struct ClientConfig { #[builder(default)] pub consensus: ConsensusConfig, - /// ZKP propagation - #[builder(default)] - pub zkp_propagation: bool, - /// The Nimiq network the client should connect to. Usually this should be either `Test` or /// `Main` for the Nimiq 1.0 networks. For Albatross there is currently only `TestAlbatross` /// and `DevAlbatross` available. Since Albatross is still in development at time of writing,