diff --git a/Cargo.lock b/Cargo.lock index fbcef9b..3678a12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1214,9 +1214,9 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "miden-air" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8aa2b3bc95d9eece8b47edbc6621b5742e212b359ff6b82ebb813b3d9b28985" +checksum = "5322d00bef8b19f4cd3415da2533a87c8860c7d9b80043d6cce0f184b40c5fff" dependencies = [ "miden-core", "miden-crypto", @@ -1227,9 +1227,9 @@ dependencies = [ [[package]] name = "miden-assembly" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0204034c9424d52669677eeacd408cd59483d7a87a66489ad9ae716b5bda9a6e" +checksum = "7ece22da0cbf350e4a2939a07eaa3200445e42e47ce1b1ee6538723b6b40a4d4" dependencies = [ "log", "miden-assembly-syntax", @@ -1241,9 +1241,9 @@ dependencies = [ [[package]] name = "miden-assembly-syntax" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a73ed7c463e68374f6eb595b6286f8d5d116a97004eeaee39e89cdc694dd5be1" +checksum = "d84a0e14ce66e76497a6771f3e360eb85557f2417ea22db279d54c1238ffafde" dependencies = [ "aho-corasick", "lalrpop", @@ -1263,9 +1263,9 @@ dependencies = [ [[package]] name = "miden-core" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53957feff616a43cd4ad5be9efeaeb7c3adfb589115e67a19eaf518f5c5e53a" +checksum = "7bf4f5601b0d669aa125cce3bba4b98f2c8df729e2d53e66777429ac5f53e228" dependencies = [ "derive_more", "itertools 0.14.0", @@ -1282,9 +1282,9 @@ dependencies = [ [[package]] name = "miden-crypto" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cfbecd3d91ece4489b78ca2ea67b31a7b635164285c1a828b7386d691c7ec72" +checksum = "0ed0a034a460e27723dcfdf25effffab84331c3b46b13e7a1bd674197cc71bfe" dependencies = [ "blake3", "cc", @@ -1300,26 +1300,21 @@ dependencies = [ "miden-serde-utils", "num", "num-complex", - "p3-air", "p3-blake3", "p3-challenger", - "p3-commit", "p3-dft", - "p3-field", "p3-goldilocks", "p3-keccak", "p3-matrix", "p3-maybe-rayon", - "p3-merkle-tree", - "p3-miden-air", - "p3-miden-fri", - "p3-miden-prover", + "p3-miden-lifted-stark", "p3-symmetric", "p3-util", - "rand", + "rand 0.9.2", "rand_chacha", "rand_core 0.9.5", "rand_hc", + "serde", "sha2", "sha3", "subtle", @@ -1329,9 +1324,9 @@ dependencies = [ [[package]] name = "miden-crypto-derive" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207828f24e358b4e1e0641c37802816b8730816ff92ddb4d271ef3a00f8696bb" +checksum = "e8bf6ebde028e79bcc61a3632d2f375a5cc64caa17d014459f75015238cb1e08" dependencies = [ "quote", "syn 2.0.117", @@ -1370,9 +1365,9 @@ dependencies = [ [[package]] name = "miden-debug-types" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d76def09875650d6d2ea568015ae99c892aa34c3393a0c3ba43891c8c4bd5ba" +checksum = "c9ef08bafef275f0d6a15108108b3f6df6642772e0a1c05e102cb7e96841e888" dependencies = [ "memchr", "miden-crypto", @@ -1388,9 +1383,9 @@ dependencies = [ [[package]] name = "miden-field" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f821a07c16cfa6e500d5a56d05c11523984e3cd562cfc80ef657e4264d708067" +checksum = "38011348f4fb4c9e5ce1f471203d024721c00e3b60a91aa91aaefe6738d8b5ea" dependencies = [ "miden-serde-utils", "num-bigint", @@ -1398,8 +1393,9 @@ dependencies = [ "p3-field", "p3-goldilocks", "paste", - "rand", + "rand 0.10.0", "serde", + "subtle", "thiserror", ] @@ -1414,9 +1410,9 @@ dependencies = [ [[package]] name = "miden-mast-package" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23d0cf5de7df1273c14614fef84cb5fb464f2f0f354018228b0355ecbcb4206" +checksum = "f9b24d09fda64e0751f943ac616643342b05a47d626e2ee0040b902eff3c924e" dependencies = [ "derive_more", "miden-assembly-syntax", @@ -1463,9 +1459,9 @@ dependencies = [ [[package]] name = "miden-processor" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e173de74f1085c66aa269c817f3340c33d5f03221ce9bdf1fff3cf53d910016e" +checksum = "ba53ff06ef0affa0c3fb13e7e2ef5bde99f96eebcec8c360c6658050480ef676" dependencies = [ "itertools 0.14.0", "miden-air", @@ -1482,9 +1478,9 @@ dependencies = [ [[package]] name = "miden-serde-utils" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe74c2e7d8a8b8758e067de10665816928222c1d0561d95c12ac4bcaefc2a2a" +checksum = "ff78082e9b4ca89863e68da01b35f8a4029ee6fd912e39fa41fde4273a7debab" dependencies = [ "p3-field", "p3-goldilocks", @@ -1512,9 +1508,9 @@ dependencies = [ [[package]] name = "miden-utils-core-derive" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c364abe484d43d171afc320e7560db37ece00fe625569068c1053ed186540" +checksum = "477db426fc31f666d7e65b0cc907fe431d36d88d611a0594cf266104eb168b4c" dependencies = [ "proc-macro2", "quote", @@ -1523,9 +1519,9 @@ dependencies = [ [[package]] name = "miden-utils-diagnostics" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d8eafd735ab1e0db7bf6a6a8b5bcf4c31a56c0cd7f80cba1932d4bb984b12" +checksum = "785c1ec4ad9994100b117b8eab8c453dcc35d3d168e4f72ac818efb700abe7b1" dependencies = [ "miden-crypto", "miden-debug-types", @@ -1536,9 +1532,9 @@ dependencies = [ [[package]] name = "miden-utils-indexing" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc42cfa3aef68d21238b3ce4c2db00a1278f8075ef492c23c035ab6c75774790" +checksum = "46cec00c8cf32ec46df7542fb9ea15fbe7a5149920ef97776a4f4bc3a563e8de" dependencies = [ "miden-crypto", "thiserror", @@ -1546,9 +1542,9 @@ dependencies = [ [[package]] name = "miden-utils-sync" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e09bb239449e63e9a81f9b4ca5db1762327f44fb50777527fdba6fdbcab890" +checksum = "9529c1c173506f30d3949f7a54b65f1eb318098e37ed5730a1bb9027eee2fa4b" dependencies = [ "lock_api", "loom", @@ -1558,11 +1554,14 @@ dependencies = [ [[package]] name = "midenc-hir-type" -version = "0.4.3" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4cfab04baffdda3fb9eafa5f873604059b89a1699aa95e4f1057397a69f0b5" +checksum = "2eb29d7c049fb69373c7e775e3d4411e63e4ee608bc43826282ba62c6ec9f891" dependencies = [ "miden-formatting", + "miden-serde-utils", + "serde", + "serde_repr", "smallvec", "thiserror", ] @@ -1746,19 +1745,20 @@ checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d" [[package]] name = "p3-air" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0141a56ed9924ce0265e7e91cd29bbcd230262744b7a7f0c448bfbf212f73182" +checksum = "9ebc58ec27a174420348b3f04dba836fa2e5b5fe8df74601087417352757c643" dependencies = [ "p3-field", "p3-matrix", + "tracing", ] [[package]] name = "p3-blake3" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006330bae15fdda0d460e73e03e7ebf06e8848dfda8355f9d568a7fed7c37719" +checksum = "b3cacb38c29fbee71fe3e5c6c0a1073632e46dc3e93fbdc50ab4e4fac137b525" dependencies = [ "blake3", "p3-symmetric", @@ -1767,9 +1767,9 @@ dependencies = [ [[package]] name = "p3-challenger" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e42ba74a49c08c6e99f74cd9b343bfa31aa5721fea55079b18e3fd65f1dcbc" +checksum = "af9bbcb18fe90271668259aacfc43455e328673c2b5c926cff0663edc8653e4d" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -1781,13 +1781,11 @@ dependencies = [ [[package]] name = "p3-commit" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498211e7b9a0f8366b410b4a9283ae82ff2fc91f473b1c5816aa6e90e74b125d" +checksum = "14d07b50c6f6d3bc89ed7c54ae0c569fb4caaa58263fd389dc02fb1b0a6378fa" dependencies = [ "itertools 0.14.0", - "p3-challenger", - "p3-dft", "p3-field", "p3-matrix", "p3-util", @@ -1796,9 +1794,9 @@ dependencies = [ [[package]] name = "p3-dft" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63fa5eb1bd12a240089e72ae3fe10350944d9c166d00a3bfd2a1794db65cf5c" +checksum = "17e7ba0dc20be075eab3f88f0cb820a0901f86218a1c46134e7c817d41597989" dependencies = [ "itertools 0.14.0", "p3-field", @@ -1811,58 +1809,46 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebfdb6ef992ae64e9e8f449ac46516ffa584f11afbdf9ee244288c2a633cdf4" +checksum = "9b8533e6c2f4d0cc61fd2ae5299bb83316898e535f47291808d37e4d666ba088" dependencies = [ "itertools 0.14.0", "num-bigint", "p3-maybe-rayon", "p3-util", "paste", - "rand", + "rand 0.10.0", "serde", "tracing", ] [[package]] name = "p3-goldilocks" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64716244b5612622d4e78a4f48b74f6d3bb7b4085b7b6b25364b1dfca7198c66" +checksum = "d8102a8c85acee1f896c3764bef5fac908e6026dadfc557c185294970cce0746" dependencies = [ "num-bigint", "p3-challenger", "p3-dft", "p3-field", "p3-mds", + "p3-poseidon1", "p3-poseidon2", "p3-symmetric", "p3-util", "paste", - "rand", + "rand 0.10.0", "serde", ] -[[package]] -name = "p3-interpolation" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d877565a94a527c89459fc8ccb0eb58769d8c86456575d1315a1651bd24616d" -dependencies = [ - "p3-field", - "p3-matrix", - "p3-maybe-rayon", - "p3-util", -] - [[package]] name = "p3-keccak" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d57334537d10316e0f1cda622f0a5b3239f219a5dcd2a95ea87e41e00df6a92" +checksum = "b65d30dd586d2855906a01c3414c155c2d564f6677d1b51f04186dcac080f757" dependencies = [ - "p3-field", "p3-symmetric", "p3-util", "tiny-keccak", @@ -1870,136 +1856,139 @@ dependencies = [ [[package]] name = "p3-matrix" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5542f96504dae8100c91398fb1e3f5ec669eb9c73d9e0b018a93b5fe32bad230" +checksum = "72bb78444459155c2e4711d71abbfef7b04cc2ba1fa83751ccab241b01957095" dependencies = [ "itertools 0.14.0", "p3-field", "p3-maybe-rayon", "p3-util", - "rand", + "rand 0.10.0", "serde", "tracing", - "transpose", ] [[package]] name = "p3-maybe-rayon" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5669ca75645f99cd001e9d0289a4eeff2bc2cd9dc3c6c3aaf22643966e83df" +checksum = "70a0a54345917f500130a9986fa5ff9ecbc26f0c6313080b35b713e26ddc8053" [[package]] name = "p3-mds" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038763af23df9da653065867fd85b38626079031576c86fd537097e5be6a0da0" +checksum = "3cd514bf3e9bf9f1b7db2db96e5bd2972d9963dd62430de1e193d74522ae96a6" dependencies = [ "p3-dft", "p3-field", "p3-symmetric", "p3-util", - "rand", + "rand 0.10.0", ] [[package]] -name = "p3-merkle-tree" -version = "0.4.2" +name = "p3-miden-lifted-air" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d93625a3041effddc72ee2511c919f710b7f91fd0f9931ab8a70aeba586fd6e" +checksum = "c5c31c65fdc88952d7b301546add9670676e5b878aa0066dd929f107c203b006" dependencies = [ - "itertools 0.14.0", - "p3-commit", + "p3-air", "p3-field", "p3-matrix", - "p3-maybe-rayon", - "p3-symmetric", "p3-util", - "rand", - "serde", "thiserror", - "tracing", ] [[package]] -name = "p3-miden-air" -version = "0.4.2" +name = "p3-miden-lifted-fri" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a88e6ee9c92ff6c0b64f1ec0d61eda72fb432bda45337d876c46bd43748508" +checksum = "ab9932f1b0a16609a45cd4ee10a4d35412728bc4b38837c7979d7c85d8dcc9fc" dependencies = [ - "p3-air", + "p3-challenger", + "p3-commit", + "p3-dft", "p3-field", "p3-matrix", + "p3-maybe-rayon", + "p3-miden-lmcs", + "p3-miden-transcript", + "p3-util", + "rand 0.10.0", + "thiserror", + "tracing", ] [[package]] -name = "p3-miden-fri" -version = "0.4.2" +name = "p3-miden-lifted-stark" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e282998bc1d12dceaa0ed8979fa507b8369d663fa377da695d578f5f3a035935" +checksum = "8c3956ab7270c3cdd53ca9796d39ae1821984eb977415b0672110f9666bff5d8" dependencies = [ - "itertools 0.14.0", "p3-challenger", - "p3-commit", "p3-dft", "p3-field", - "p3-interpolation", "p3-matrix", "p3-maybe-rayon", + "p3-miden-lifted-air", + "p3-miden-lifted-fri", + "p3-miden-lmcs", + "p3-miden-stateful-hasher", + "p3-miden-transcript", "p3-util", - "rand", - "serde", + "thiserror", "tracing", ] [[package]] -name = "p3-miden-prover" -version = "0.4.2" +name = "p3-miden-lmcs" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05a61c10cc2d6a73e192ac34a9884e4f26bd877f3eaea441d7b7ebfdffdf6c7" +checksum = "48c46791c983e772136db3d48f102431457451447abb9087deb6c8ce3c1efc86" dependencies = [ - "itertools 0.14.0", - "p3-challenger", "p3-commit", - "p3-dft", "p3-field", - "p3-interpolation", "p3-matrix", "p3-maybe-rayon", - "p3-miden-air", - "p3-miden-uni-stark", + "p3-miden-stateful-hasher", + "p3-miden-transcript", + "p3-symmetric", "p3-util", + "rand 0.10.0", "serde", + "thiserror", "tracing", ] [[package]] -name = "p3-miden-uni-stark" -version = "0.4.2" +name = "p3-miden-stateful-hasher" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a78b6a5b5f6bdc55439d343d2a0a2a8e7cb6544b03296f54d2214a84e91e130" +checksum = "ec47a9d9615eb3d9d2a59b00d19751d9ad85384b55886827913d680d912eac6a" +dependencies = [ + "p3-field", + "p3-symmetric", +] + +[[package]] +name = "p3-miden-transcript" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c565647487e4a949f67e6f115b0391d6cb82ac8e561165789939bab23d0ae7" dependencies = [ - "itertools 0.14.0", - "p3-air", "p3-challenger", - "p3-commit", - "p3-dft", "p3-field", - "p3-matrix", - "p3-maybe-rayon", - "p3-uni-stark", - "p3-util", "serde", "thiserror", - "tracing", ] [[package]] name = "p3-monty-31" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a981d60da3d8cbf8561014e2c186068578405fd69098fa75b43d4afb364a47" +checksum = "0d9340a650f07a6cd42a4e877017ba7b206df87fe50dfc3cf110f01a3c370bd1" dependencies = [ "itertools 0.14.0", "num-bigint", @@ -2008,68 +1997,61 @@ dependencies = [ "p3-matrix", "p3-maybe-rayon", "p3-mds", + "p3-poseidon1", "p3-poseidon2", "p3-symmetric", "p3-util", "paste", - "rand", + "rand 0.10.0", "serde", "spin 0.10.0", "tracing", - "transpose", ] [[package]] -name = "p3-poseidon2" -version = "0.4.2" +name = "p3-poseidon1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903b73e4f9a7781a18561c74dc169cf03333497b57a8dd02aaeb130c0f386599" +checksum = "6dd56ae3a51ded1b77f7b1b21d0b157ae82b9d5ca8f2cba347c0b821fe771a79" dependencies = [ "p3-field", - "p3-mds", "p3-symmetric", - "p3-util", - "rand", + "rand 0.10.0", ] [[package]] -name = "p3-symmetric" -version = "0.4.2" +name = "p3-poseidon2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd788f04e86dd5c35dd87cad29eefdb6371d2fd5f7664451382eeacae3c3ed0" +checksum = "858aa1c33ec983dfbb8cfc553a213de19d8fde96485e54e6e952b9ac5e70bd4e" dependencies = [ - "itertools 0.14.0", "p3-field", - "serde", + "p3-mds", + "p3-symmetric", + "p3-util", + "rand 0.10.0", ] [[package]] -name = "p3-uni-stark" -version = "0.4.2" +name = "p3-symmetric" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d409704a8cbdb6c77f6b83a05c6b16a3c8a2c00d880146fa34181977a0d3ac" +checksum = "1a9a3b20bb8104e52d45219a78d80654c8ac6a4781be0eaa3f3e999f5ae4b9b2" dependencies = [ "itertools 0.14.0", - "p3-air", - "p3-challenger", - "p3-commit", - "p3-dft", "p3-field", - "p3-matrix", - "p3-maybe-rayon", "p3-util", "serde", - "thiserror", - "tracing", ] [[package]] name = "p3-util" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "663b16021930bc600ecada915c6c3965730a3b9d6a6c23434ccf70bfc29d6881" +checksum = "9f24495d9cd64693165a9f1b3da0758395ad6d25d2d44dd740bdb34c2bce0c53" dependencies = [ "serde", + "transpose", ] [[package]] @@ -2212,7 +2194,7 @@ dependencies = [ "bit-vec", "bitflags", "num-traits", - "rand", + "rand 0.9.2", "rand_chacha", "rand_xorshift", "regex-syntax", @@ -2258,6 +2240,15 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +dependencies = [ + "rand_core 0.10.0", +] + [[package]] name = "rand_chacha" version = "0.9.0" @@ -2286,6 +2277,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" + [[package]] name = "rand_hc" version = "0.3.2" @@ -2566,6 +2563,17 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "serde_spanned" version = "0.6.9" @@ -2684,6 +2692,9 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] [[package]] name = "smawk" diff --git a/Cargo.toml b/Cargo.toml index 30e1c30..0e4cf23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,12 +35,12 @@ crossterm = { version = "0.28.1", optional = true, features = ["event-stream"] } env_logger = { version = "0.11", optional = true } log = "0.4" glob = { version = "0.3.1", optional = true } -miden-assembly = { version = "0.21", default-features = false } -miden-assembly-syntax = { version = "0.21", default-features = false } -miden-core = { version = "0.21", default-features = false } -miden-debug-types = { version = "0.21", default-features = false } -miden-mast-package = { version = "0.21", default-features = false } -miden-processor = { version = "0.21", default-features = false } +miden-assembly = { version = "0.22", default-features = false } +miden-assembly-syntax = { version = "0.22", default-features = false } +miden-core = { version = "0.22", default-features = false } +miden-debug-types = { version = "0.22", default-features = false } +miden-mast-package = { version = "0.22", default-features = false } +miden-processor = { version = "0.22", default-features = false } num-traits = "0.2" ratatui = { version = "0.29.0", optional = true } rustc-demangle = { version = "0.1", features = ["std"] } @@ -71,4 +71,3 @@ tokio = { version = "1.39.2", features = ["rt", "time", "macros", "rt-multi-thre tokio-util = "0.7.11" futures = "0.3.30" proptest = { version = "1.4", optional = true } - diff --git a/src/debug/stacktrace.rs b/src/debug/stacktrace.rs index e829cd9..aba7656 100644 --- a/src/debug/stacktrace.rs +++ b/src/debug/stacktrace.rs @@ -77,37 +77,7 @@ impl CallStack { let popped_frame = self.handle_trace_event(event, procedure.as_ref()); let is_frame_end = popped_frame.is_some(); - // These ops we do not record in call frame details - let ignore = matches!( - op, - Operation::Join - | Operation::Split - | Operation::Span - | Operation::Respan - | Operation::End - ); - - // Manage block stack - match op { - Operation::Span => { - if let Some(asmop) = info.asmop { - log::debug!("{asmop:#?}"); - self.block_stack.push(Some(SpanContext { - frame_index: self.frames.len().saturating_sub(1), - location: asmop.location().cloned(), - })); - } else { - self.block_stack.push(None); - } - } - Operation::End => { - self.block_stack.pop(); - } - Operation::Join | Operation::Split => { - self.block_stack.push(None); - } - _ => (), - } + let ignore = false; if ignore || is_frame_end { return popped_frame; diff --git a/src/exec/config.rs b/src/exec/config.rs index f4c0eac..9ca4298 100644 --- a/src/exec/config.rs +++ b/src/exec/config.rs @@ -199,7 +199,7 @@ mod tests { assert!(file.options.enable_tracing()); assert!(file.options.enable_debugging()); assert_eq!(file.options.max_cycles(), ExecutionOptions::MAX_CYCLES); - assert_eq!(file.options.expected_cycles(), 2048); + assert_eq!(file.options.expected_cycles(), ExecutionOptions::default().expected_cycles()); } #[test] @@ -218,7 +218,7 @@ mod tests { assert!(file.options.enable_tracing()); assert!(file.options.enable_debugging()); assert_eq!(file.options.max_cycles(), 100000); - assert_eq!(file.options.expected_cycles(), 2048); + assert_eq!(file.options.expected_cycles(), ExecutionOptions::default().expected_cycles()); } #[test] @@ -240,7 +240,7 @@ mod tests { assert!(file.options.enable_tracing()); assert!(file.options.enable_debugging()); assert_eq!(file.options.max_cycles(), 100000); - assert_eq!(file.options.expected_cycles(), 2048); + assert_eq!(file.options.expected_cycles(), ExecutionOptions::default().expected_cycles()); } #[test] @@ -279,6 +279,6 @@ mod tests { assert!(file.options.enable_tracing()); assert!(file.options.enable_debugging()); assert_eq!(file.options.max_cycles(), 100000); - assert_eq!(file.options.expected_cycles(), 2048); + assert_eq!(file.options.expected_cycles(), ExecutionOptions::default().expected_cycles()); } } diff --git a/src/exec/state.rs b/src/exec/state.rs index bf5c925..f311164 100644 --- a/src/exec/state.rs +++ b/src/exec/state.rs @@ -96,9 +96,7 @@ fn extract_current_op( Continuation::StartNode(node_id) => { return (None, Some(*node_id), None); } - Continuation::FinishBasicBlock(_) => { - return (Some(Operation::End), None, None); - } + Continuation::FinishBasicBlock(_) => return (None, None, None), other if other.increments_clk() => { return (None, None, None); }