initial approach

return the <.gitignore> change

Revert "initial approach"

This reverts commit f5f4b66.

the second approach

impacting a cached/deterministic/derandomized test

align with the review comments

replace `TestRunner` with some proper invocations

replacing more `TestRunner`

couple of strategies on `ChunkDictionary`

`TransactionKernel` strategies

`prop_compose!` `Utxo`

add `Seed` and ditch `rng` invocations from block faking helpers

it isn't meaningful to fuzz randomness

`tests::shared` doesn't generate it's own randomness anymore

last place of randomness in `tests::shared` ditched

semantically finished

ready for review

ditch #proofs_presaved_compat

Update src/models/state/wallet/secret_key_material.rs

Co-authored-by: aszepieniec <[email protected]>

the comment on the `prop_assume` for seeds

an import unmerge

ditch a temp binding

propose solution for `Hash`-based collections in `proptest`

expand the proposal to the place where the discussion is

changes are moved into #554

finilize `catch_inconsistent_shares`

remove few commented out lines

consistent naming

Author: skaunov

Cargo.toml

@@ -63,7 +63,7 @@ tokio-console = ["dep:console-subscriber"]
 aead = { version = "0.5", features = ["std"] }
 aes-gcm = "0.10"
 anyhow = { version = "1.0", features = ["backtrace"] }
-arbitrary = { version = "1.3", features = ["derive"], optional = true }
+arbitrary = { version = "1.4.1", features = ["derive"], optional = true }
 arraystring = { version = "0.3.0", features = ["serde-traits"] }
 bech32 = "0.9"
 bincode = "1.3"
@@ -137,7 +137,7 @@ deranged = "=0.4.0"
 # because they are optional deps but required for unit tests.
 # please ensure versions match in both sections.
 
-arbitrary = { version = "1.3", features = ["derive"] }
+arbitrary = { version = "1.4.1", features = ["derive"] }
 assert2 = "0.3"
 blake3 = "1.5.4"
 clienter = "0.1.1"

proptest-regressions/models/blockchain/type_scripts/native_currency_amount.txt

@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 3f3ee95b494c869c3181f96fd00474e6ba18527614a5ed78ea1971ce87755583 # shrinks to a = 182, b = 23598722

proptest-regressions/models/state/wallet/secret_key_material.txt

@@ -0,0 +1,9 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 277a15bc6084663c6a6ca5ccb79ff247ac2ceb1c9df9190e297a5407d9790cdb # shrinks to input = _CatchInconsistentSharesArgs { n: 3, t: 2, s: XFieldElement { coefficients: [BFieldElement(0), BFieldElement(0), BFieldElement(0)] }, seed_a: [0, 0, 244, 79, 87, 114, 45, 179, 177, 244, 48, 86, 13, 124, 232, 44, 114, 56, 37, 104, 131, 49, 17, 176, 238, 9, 36, 2, 255, 172, 170, 164], seed_b: [105, 12, 160, 18, 138, 166, 133, 34, 94, 44, 149, 193, 199, 222, 211, 45, 27, 217, 192, 16, 2, 208, 146, 151, 249, 142, 227, 112, 135, 211, 186, 210], indices: {0: false, 1: false} }
+cc 13273dd6ad615cc44297e5514ef8109f23b9e2b39f4cc7055e0bd6970b8f9a7c # shrinks to input = _CatchTooFewSharesToRecombineArgs { n: 5, t: 2, fromindices_remove_num: 1, s: XFieldElement { coefficients: [BFieldElement(15230334930374689589), BFieldElement(13245717797154725729), BFieldElement(16740857572578077618)] }, seed: [130, 153, 93, 131, 38, 88, 103, 106, 175, 19, 242, 51, 163, 35, 186, 36, 186, 163, 207, 131, 104, 241, 159, 14, 87, 231, 150, 32, 77, 98, 183, 235] }
+cc 4adcbb9c7a069d655d530e7e2be1501814339a40f70302335c3bc3bc02f5bfbf # shrinks to input = _CatchTooFewSharesToRecombineArgs { n: 13, t: 4, fromindices_take: 3, s: XFieldElement { coefficients: [BFieldElement(2157574511224767603), BFieldElement(3141929367015615680), BFieldElement(12387067636899090808)] }, seed: [158, 233, 166, 68, 118, 192, 184, 5, 160, 160, 32, 2, 49, 118, 161, 53, 13, 117, 40, 21, 10, 226, 142, 231, 56, 29, 166, 205, 41, 60, 14, 209] }

proptest-regressions/models/state/wallet/wallet_state.txt

@@ -0,0 +1,8 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 9a1b149fba15483e9f31a7852760ce8d5df51e9d38b2126f1ddaec0825d1384d # shrinks to input = _PublicAnnouncementsInBlockTestArgs { tx_block1: TransactionKernel { inputs: [], outputs: [AdditionRecord { canonical_commitment: Digest([BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0)]) }, AdditionRecord { canonical_commitment: Digest([BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0)]) }], public_announcements: [PublicAnnouncement { message: [] }, PublicAnnouncement { message: [] }, PublicAnnouncement { message: [] }, PublicAnnouncement { message: [] }, PublicAnnouncement { message: [] }, PublicAnnouncement { message: [BFieldElement(67425554709697360)] }, PublicAnnouncement { message: [] }], fee: NativeCurrencyAmount(-70685956793913118433183217491150354), coinbase: Some(NativeCurrencyAmount(-7927620070728119810108028777943770)), timestamp: Timestamp(BFieldElement(4891014318722709738)), mutator_set_hash: Digest([BFieldElement(11934671718491951346), BFieldElement(11281373832596201266), BFieldElement(11355207949940880926), BFieldElement(3448036920268554380), BFieldElement(18323932419006503564)]), merge_bit: false, mast_sequences: OnceLock(<uninit>) } }
+cc a41693db527e06e59a7f2be3b95304c4cef3e750a99a405319ee6554c48d297b # shrinks to input = _PublicAnnouncementsInBlockTestArgs { tx_block1: TransactionKernel { inputs: [], outputs: [AdditionRecord { canonical_commitment: Digest([BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0)]) }, AdditionRecord { canonical_commitment: Digest([BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0), BFieldElement(0)]) }], public_announcements: [PublicAnnouncement { message: [BFieldElement(0), BFieldElement(9321591543486476998), BFieldElement(14573288706066622957), BFieldElement(9270886323901199519), BFieldElement(6734302117330064099), BFieldElement(16315627936601254197), BFieldElement(1178352053662224171), BFieldElement(8562213646120173239), BFieldElement(14793640925920860846), BFieldElement(7689510137104745238)] }, PublicAnnouncement { message: [BFieldElement(5850826884696472421), BFieldElement(10698350416477277912), BFieldElement(13415571233392094868), BFieldElement(9369934884966037034), BFieldElement(1662925058444927082), BFieldElement(7719516251173924890), BFieldElement(5373964820120010726), BFieldElement(10610712547096075267), BFieldElement(11399396361836030022), BFieldElement(13510348934276136326), BFieldElement(9085767833742476303), BFieldElement(5723913007932892529), BFieldElement(14231465034676843008), BFieldElement(6743161496293035502), BFieldElement(2749227069055044627), BFieldElement(18036348259610191480), BFieldElement(5492289514897661826), BFieldElement(1816896152465294170), BFieldElement(11544661119781190865), BFieldElement(12871712508422676972), BFieldElement(5126909686560286199), BFieldElement(4106022111572319076), BFieldElement(4065245845049566976), BFieldElement(8435945931257478577), BFieldElement(581043917489909685), BFieldElement(15460116745659416903), BFieldElement(11595981507090494167), BFieldElement(10449461704944053966), BFieldElement(2348631313570448087), BFieldElement(9927913115758177289), BFieldElement(2633819268146899658), BFieldElement(10669540681299957084), BFieldElement(5013673220773961496), BFieldElement(3948526355233602916), BFieldElement(998937149810993859), BFieldElement(3130813340322589295), BFieldElement(16942730675331240903), BFieldElement(6739880786431782644), BFieldElement(1658810169485282839), BFieldElement(4680543269938070822), BFieldElement(4635403039071193656), BFieldElement(9284534826280127145), BFieldElement(9668509141778854314), BFieldElement(18154100913628760140), BFieldElement(6790729872447145021), BFieldElement(11405845389050366412), BFieldElement(2148834898663828983), BFieldElement(10394265723755212783), BFieldElement(6493915292875594243), BFieldElement(12365884486086245291), BFieldElement(17067169933775367752), BFieldElement(5940587059403139278), BFieldElement(5126795535245805706), BFieldElement(968779048322462424), BFieldElement(16406133146074705194), BFieldElement(12848833384879852395), BFieldElement(17404328651326943881)] }, PublicAnnouncement { message: [BFieldElement(7594660911295056224), BFieldElement(9005093803197862104), BFieldElement(15025730599736576353), BFieldElement(7914242664642492317), BFieldElement(12018369970623897564), BFieldElement(9872731862978059190), BFieldElement(13894353222482954917), BFieldElement(5477190326445056532), BFieldElement(15805830104178530499), BFieldElement(18290222969886878371), BFieldElement(5809929793795126022), BFieldElement(14375298667674961713), BFieldElement(4708049240228224037), BFieldElement(7418504464344747364), BFieldElement(3933733290989638003), BFieldElement(481998146018717127), BFieldElement(12284253152957971365), BFieldElement(15386012654265221971), BFieldElement(13095150001978380178), BFieldElement(295382796281590133), BFieldElement(8620366749541598725), BFieldElement(1304791959912836792), BFieldElement(15032448768365563164), BFieldElement(5739589016008141687), BFieldElement(13327138790541052286), BFieldElement(15815768633216926923), BFieldElement(6870536856369804543), BFieldElement(13847281322079990768), BFieldElement(17867324372895401144), BFieldElement(7460365984828993082), BFieldElement(12571143625909199848), BFieldElement(3658343088136045555), BFieldElement(8268888862926619393), BFieldElement(14224805658164422154), BFieldElement(16285394648147870757)] }, PublicAnnouncement { message: [BFieldElement(7439523716026445599), BFieldElement(16506073198336684448), BFieldElement(8705287737056517607), BFieldElement(8231651265310199470), BFieldElement(8882080563348816394), BFieldElement(10981566394564037466), BFieldElement(9944193038408968910), BFieldElement(2673945369351400012), BFieldElement(18410912251055652393), BFieldElement(13529496378182984936), BFieldElement(17507505312805448836), BFieldElement(17093662154025067297), BFieldElement(13577695661611463010), BFieldElement(14027539052546300427), BFieldElement(14320401750441668324), BFieldElement(4642063197896523367), BFieldElement(11435512758271904425), BFieldElement(3594000353401027283), BFieldElement(12948518030387709580), BFieldElement(13872249565484404042), BFieldElement(13711630440439798972), BFieldElement(3055460397186942638), BFieldElement(4471839359132047087), BFieldElement(7252155648573431983), BFieldElement(15488590433812695552), BFieldElement(3073337756105039874), BFieldElement(17524778332946899191), BFieldElement(2992524196386455437), BFieldElement(2680138085677036979), BFieldElement(4833235556042958219), BFieldElement(12699725177376044034), BFieldElement(10023777893194050836), BFieldElement(15269608515504270087), BFieldElement(1068170828386830562), BFieldElement(4028999331936546181), BFieldElement(5058503403519597591), BFieldElement(18155019592594960458), BFieldElement(4673416853673096741), BFieldElement(18193416338625244637), BFieldElement(15033419402450607093), BFieldElement(2820245543402743989), BFieldElement(1287191723978980010), BFieldElement(3163286325826709282), BFieldElement(12820804990350095894), BFieldElement(5974568893285562216), BFieldElement(5229511236206493934), BFieldElement(7531764728822743164), BFieldElement(13540153938888160563), BFieldElement(16591155923905484307), BFieldElement(15548338335182666774), BFieldElement(2907711232935622352), BFieldElement(13364481892358474264), BFieldElement(3324677873674596074), BFieldElement(7924880984895465917), BFieldElement(15828564237640882969)] }, PublicAnnouncement { message: [BFieldElement(3165922451199185807), BFieldElement(9189718261240953031), BFieldElement(17776659556933552908), BFieldElement(1311034704645877024), BFieldElement(5202296038206071929), BFieldElement(7411088882245642516), BFieldElement(14558620641619267447), BFieldElement(10675027321315435128), BFieldElement(598665310789595969), BFieldElement(7819087183872051628), BFieldElement(12056578678418623332), BFieldElement(6486259572712224753), BFieldElement(826095746329047719)] }, PublicAnnouncement { message: [BFieldElement(10724539382916705974), BFieldElement(1303220643318753185), BFieldElement(9473115488117201169), BFieldElement(18414856417842107025), BFieldElement(13025091628248206563), BFieldElement(17528284268534257198), BFieldElement(5429883350585155873), BFieldElement(556130114172974692), BFieldElement(961897794049784841), BFieldElement(8967399253274453237), BFieldElement(8717640694119776425), BFieldElement(3407239960751345411), BFieldElement(11910891741869293262), BFieldElement(3089303601062184614), BFieldElement(6412325466307238772), BFieldElement(13520523155363096809), BFieldElement(13210311521673699752), BFieldElement(14313262878921039267), BFieldElement(16375763654579367188), BFieldElement(10723868226945010993), BFieldElement(17899760067805144176), BFieldElement(6796570027146899127), BFieldElement(9843358327620200645), BFieldElement(10878971082324431167), BFieldElement(17633750723062498615), BFieldElement(5423225153423790055)] }, PublicAnnouncement { message: [BFieldElement(15063874826012908280), BFieldElement(11794845301655914544), BFieldElement(68103292217826961), BFieldElement(7664254457830799794), BFieldElement(9752717190870353867), BFieldElement(7707108688065508978), BFieldElement(11616340567884692049), BFieldElement(8311508965875839190), BFieldElement(4761161030291574899), BFieldElement(1008348757178514264), BFieldElement(9372206087471090780), BFieldElement(2077983553569022931), BFieldElement(7138630344912605983), BFieldElement(8851221038629380645), BFieldElement(13851104793546852152), BFieldElement(12508746294651885015), BFieldElement(3522013474798245655), BFieldElement(12931322237949325250), BFieldElement(10615197952485630066), BFieldElement(14073208853836752003), BFieldElement(17723075682634902071), BFieldElement(5864566181164094734)] }], fee: NativeCurrencyAmount(-80189601208177427720452833441052689), coinbase: None, timestamp: Timestamp(BFieldElement(81953083721190621)), mutator_set_hash: Digest([BFieldElement(1209579961828006965), BFieldElement(17845347245891483320), BFieldElement(8689404300665274380), BFieldElement(12557353202409237661), BFieldElement(10895426204171946523)]), merge_bit: true, mast_sequences: OnceLock(<uninit>) } }

proptest-regressions/rpc_server.txt

@@ -0,0 +1,9 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc beb87393cd159b94e90456b0d4ed98d512823341049f1e2470baf26dc6444b05 # shrinks to input = _RemovalRecordMissingChunkElementIsInvalidPbtArgs { initial_additions: 33, index_to_drop: 14, to_remove_rand: 94615430264692362 }
+cc 188cbdc2fcf5f21fdde330e2184199074a1488a21447491a0a2a6659913eda64 # shrinks to input = _RemovalRecordMissingChunkElementIsInvalidPbtArgs { initial_additions: 38, index_to_drop: 2, to_remove_rand: 792244780276861568 }
+cc 43e028e16e3a6e23838fdb9ab81b37b5e6b06979332cd7661363e7f42bfa4e00 # shrinks to input = _RemovalRecordMissingChunkElementIsInvalidPbtArgs { initial_additions: 68, index_to_drop: 4, to_remove_rand: 22 }

proptest-regressions/util_types/mutator_set/removal_record.txt

@@ -1143,7 +1143,8 @@ mod test {
             tx_proving_capability: Some(TxProvingCapability::SingleProof),
             ..Default::default()
         };
-        let mut alice = state_with_premine_and_self_mined_blocks(cli_args, &mut rng, 1).await;
+        let mut alice =
+            state_with_premine_and_self_mined_blocks(cli_args, rng.random::<[Digest; 1]>()).await;
 
         let mut transactions = vec![];
         for _ in 0..=1 {
@@ -1186,9 +1187,9 @@ mod test {
         let block2 = fake_block_successor_with_merged_tx(
             &block1,
             now,
-            rng.random(),
             false,
             vec![mined_tx.into()],
+            rng.random(),
             network,
         )
         .await;

src/main_loop/proof_upgrader.rs

@@ -998,6 +998,7 @@ pub(crate) async fn mine(
 pub(crate) mod mine_loop_tests {
     use std::hint::black_box;
 
+    use arbitrary::Arbitrary;
     use block_appendix::BlockAppendix;
     use block_body::BlockBody;
     use block_header::block_header_tests::random_block_header;
@@ -1008,6 +1009,7 @@ pub(crate) mod mine_loop_tests {
     use num_traits::One;
     use num_traits::Pow;
     use num_traits::Zero;
+    use rand::RngCore;
     use tracing_test::traced_test;
 
     use super::*;
@@ -1016,6 +1018,7 @@ pub(crate) mod mine_loop_tests {
     use crate::config_models::network::Network;
     use crate::job_queue::triton_vm::TritonVmJobQueue;
     use crate::models::blockchain::block::validity::block_primitive_witness::test::deterministic_block_primitive_witness;
+    use crate::models::blockchain::transaction::transaction_kernel::TransactionKernelProxy;
     use crate::models::blockchain::transaction::validity::single_proof::SingleProof;
     use crate::models::blockchain::type_scripts::native_currency_amount::NativeCurrencyAmount;
     use crate::models::proof_abstractions::mast_hash::MastHash;
@@ -1030,7 +1033,6 @@ pub(crate) mod mine_loop_tests {
     use crate::tests::shared::invalid_empty_block;
     use crate::tests::shared::make_mock_transaction_with_mutator_set_hash;
     use crate::tests::shared::mock_genesis_global_state;
-    use crate::tests::shared::random_transaction_kernel;
     use crate::tests::shared_tokio_runtime;
     use crate::util_types::test_shared::mutator_set::pseudorandom_addition_record;
     use crate::util_types::test_shared::mutator_set::random_mmra;
@@ -1074,8 +1076,7 @@ pub(crate) mod mine_loop_tests {
     /// Does *not* update the timestamp of the block and therefore also does not
     /// update the difficulty field, as this applies to the next block and only
     /// changes as a result of the timestamp of this block.
-    pub(crate) fn mine_iteration_for_tests(block: &mut Block, rng: &mut StdRng) {
-        let nonce = rng.random();
+    pub(crate) fn mine_iteration_for_tests(block: &mut Block, nonce: Digest) {
         block.set_header_nonce(nonce);
     }
 
@@ -1907,10 +1908,17 @@ pub(crate) mod mine_loop_tests {
         let cofactor = (1.0 - (1.0 / f64::from(difficulty))).log10();
         let k = (-4.0 / cofactor).ceil() as usize;
 
+        let mut rng = rand::rng();
+        let mut unstructured_source = vec![0u8; TransactionKernelProxy::size_hint(2).0];
+        rng.fill_bytes(&mut unstructured_source);
+        let mut unstructured = arbitrary::Unstructured::new(&unstructured_source);
+
         let mut predecessor_header = random_block_header();
         predecessor_header.difficulty = Difficulty::from(difficulty);
         let predecessor_body = BlockBody::new(
-            random_transaction_kernel(),
+            TransactionKernelProxy::arbitrary(&mut unstructured)
+                .unwrap()
+                .into_kernel(),
             random_mutator_set_accumulator(),
             random_mmra(),
             random_mmra(),
@@ -1927,13 +1935,14 @@ pub(crate) mod mine_loop_tests {
         successor_header.prev_block_digest = predecessor_block.hash();
         // note that successor's difficulty is random
         let successor_body = BlockBody::new(
-            random_transaction_kernel(),
+            TransactionKernelProxy::arbitrary(&mut unstructured)
+                .unwrap()
+                .into_kernel(),
             random_mutator_set_accumulator(),
             random_mmra(),
             random_mmra(),
         );
 
-        let mut rng = rand::rng();
         let mut counter = 0;
         let mut successor_block = Block::new(
             successor_header,

src/mine_loop.rs

@@ -291,12 +291,14 @@ pub(crate) mod block_header_tests {
             guesser_digest: rng.random(),
         }
     }
-    #[test]
-    pub fn test_block_header_decode() {
-        let block_header = random_block_header();
-        let encoded = block_header.encode();
-        let decoded = *BlockHeader::decode(&encoded).unwrap();
-        assert_eq!(block_header, decoded);
+
+    proptest::proptest! {
+        #[test]
+        fn test_block_header_decode(block_header in proptest_arbitrary_interop::arb::<BlockHeader>()) {
+            let encoded = block_header.encode();
+            let decoded = *BlockHeader::decode(&encoded).unwrap();
+            assert_eq!(block_header, decoded);
+        }
     }
 
     #[test]