From daa5b6f2c9cd1669a8b166fff211eaea17a0e62e Mon Sep 17 00:00:00 2001 From: Leah McBeth Date: Wed, 30 Oct 2024 15:26:55 -0600 Subject: [PATCH] feat: update clarinet 2.11.2 (#112) Co-authored-by: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> --- Cargo.lock | 333 ++++++++++--------- Cargo.toml | 4 +- examples/new-network.example.json | 2 + src/tests/fixtures/left.txt | 192 +++++++++++ src/tests/fixtures/network-manifest.yaml | 2 + src/tests/fixtures/right.txt | 194 +++++++++++ src/tests/fixtures/stacks-devnet-config.json | 2 + 7 files changed, 568 insertions(+), 161 deletions(-) create mode 100644 src/tests/fixtures/left.txt create mode 100644 src/tests/fixtures/right.txt diff --git a/Cargo.lock b/Cargo.lock index 1e131a1..f52dbed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,11 +13,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.31.0", + "gimli 0.31.1", ] [[package]] @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "arbitrary" @@ -104,9 +104,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -115,13 +115,13 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -132,7 +132,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -169,11 +169,11 @@ version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.24.1", + "addr2line 0.24.2", "cfg-if", "libc", "miniz_oxide", - "object 0.36.4", + "object 0.36.5", "rustc-demangle", "windows-targets 0.52.6", ] @@ -381,15 +381,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cc" -version = "1.1.24" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -402,6 +402,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -419,8 +425,8 @@ dependencies = [ [[package]] name = "clarinet-deployments" -version = "2.11.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49#ad72f15a418b7da3c5b4e39c373f69003abb0b49" +version = "2.11.2" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f#e8907ac178dbb03544afbe5ec01d93797591c01f" dependencies = [ "base58 0.2.0", "base64 0.21.7", @@ -445,8 +451,8 @@ dependencies = [ [[package]] name = "clarinet-files" -version = "2.11.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49#ad72f15a418b7da3c5b4e39c373f69003abb0b49" +version = "2.11.2" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f#e8907ac178dbb03544afbe5ec01d93797591c01f" dependencies = [ "bip39", "bitcoin", @@ -466,7 +472,7 @@ dependencies = [ [[package]] name = "clarinet-utils" version = "1.0.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49#ad72f15a418b7da3c5b4e39c373f69003abb0b49" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f#e8907ac178dbb03544afbe5ec01d93797591c01f" dependencies = [ "hmac 0.12.1", "pbkdf2", @@ -476,7 +482,7 @@ dependencies = [ [[package]] name = "clarity" version = "2.3.0" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat%2Fclarity-wasm-develop#a4925be0779f046b0244e5dd331170b326d48773" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat%2Fclarity-wasm-develop#2dfe72a76cd6cae505e38e2f7ab47583e4e226fd" dependencies = [ "hashbrown 0.14.5", "integer-sqrt", @@ -496,8 +502,8 @@ dependencies = [ [[package]] name = "clarity-repl" -version = "2.11.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49#ad72f15a418b7da3c5b4e39c373f69003abb0b49" +version = "2.11.2" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f#e8907ac178dbb03544afbe5ec01d93797591c01f" dependencies = [ "ansi_term", "atty", @@ -505,7 +511,7 @@ dependencies = [ "clarity", "colored", "getrandom 0.2.15", - "hiro-system-kit 0.1.0 (git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49)", + "hiro-system-kit 0.1.0 (git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f)", "lazy_static", "pox-locking", "prettytable-rs", @@ -662,7 +668,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser", + "wasmparser 0.116.1", "wasmtime-types", ] @@ -804,7 +810,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -1083,7 +1089,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -1188,15 +1194,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 2.5.0", + "indexmap 2.6.0", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "h2" @@ -1210,7 +1216,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1243,6 +1249,12 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hashlink" version = "0.9.1" @@ -1313,7 +1325,7 @@ dependencies = [ [[package]] name = "hiro-system-kit" version = "0.1.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49#ad72f15a418b7da3c5b4e39c373f69003abb0b49" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f#e8907ac178dbb03544afbe5ec01d93797591c01f" dependencies = [ "ansi_term", "atty", @@ -1448,9 +1460,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -1472,9 +1484,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1496,7 +1508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" dependencies = [ "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "linked_hash_set", "once_cell", "openssl", @@ -1515,7 +1527,7 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", "rustls", "rustls-pki-types", @@ -1531,7 +1543,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.30", + "hyper 0.14.31", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -1539,16 +1551,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.0", "pin-project-lite", "socket2", "tokio", @@ -1607,12 +1619,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -1636,9 +1648,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -1697,9 +1709,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1789,7 +1801,7 @@ dependencies = [ "futures", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-openssl", "hyper-timeout", "jsonpath_lib", @@ -1866,9 +1878,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libredox" @@ -2103,27 +2115,24 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "memchr", ] [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -2160,7 +2169,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -2253,29 +2262,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2299,12 +2308,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - [[package]] name = "powerfmt" version = "0.2.0" @@ -2314,7 +2317,7 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "pox-locking" version = "2.4.0" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat%2Fclarity-wasm-develop#a4925be0779f046b0244e5dd331170b326d48773" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat%2Fclarity-wasm-develop#2dfe72a76cd6cae505e38e2f7ab47583e4e226fd" dependencies = [ "clarity", "slog", @@ -2346,9 +2349,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -2399,10 +2402,11 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", @@ -2551,9 +2555,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2580,9 +2584,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -2592,7 +2596,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-rustls", "hyper-util", "ipnet", @@ -2689,9 +2693,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -2702,9 +2706,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" dependencies = [ "once_cell", "ring", @@ -2725,9 +2729,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -2742,9 +2746,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -2816,9 +2820,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -2835,13 +2839,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -2850,7 +2854,7 @@ version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -2897,7 +2901,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -2926,7 +2930,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3147,8 +3151,8 @@ dependencies = [ [[package]] name = "stacks-codec" -version = "2.11.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49#ad72f15a418b7da3c5b4e39c373f69003abb0b49" +version = "2.11.2" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f#e8907ac178dbb03544afbe5ec01d93797591c01f" dependencies = [ "clarity", "serde", @@ -3157,7 +3161,7 @@ dependencies = [ [[package]] name = "stacks-common" version = "0.0.2" -source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat%2Fclarity-wasm-develop#a4925be0779f046b0244e5dd331170b326d48773" +source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat%2Fclarity-wasm-develop#2dfe72a76cd6cae505e38e2f7ab47583e4e226fd" dependencies = [ "chrono", "curve25519-dalek 2.0.0", @@ -3191,7 +3195,7 @@ dependencies = [ "clarinet-files", "futures", "hiro-system-kit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.14.30", + "hyper 0.14.31", "k8s-openapi", "kube", "rand 0.8.5", @@ -3210,8 +3214,8 @@ dependencies = [ [[package]] name = "stacks-rpc-client" -version = "2.11.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=ad72f15a418b7da3c5b4e39c373f69003abb0b49#ad72f15a418b7da3c5b4e39c373f69003abb0b49" +version = "2.11.2" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e8907ac178dbb03544afbe5ec01d93797591c01f#e8907ac178dbb03544afbe5ec01d93797591c01f" dependencies = [ "clarity", "hmac 0.12.1", @@ -3270,9 +3274,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.82" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -3329,7 +3333,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3340,28 +3344,28 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "test-case-core", ] [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3469,7 +3473,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3626,7 +3630,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3652,9 +3656,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -3709,9 +3713,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "vcpkg" @@ -3748,9 +3752,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3759,24 +3763,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3786,9 +3790,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3796,22 +3800,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-encoder" @@ -3824,11 +3828,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.218.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a" +checksum = "29cbbd772edcb8e7d524a82ee8cef8dd046fc14033796a754c3ad246d019fa54" dependencies = [ "leb128", + "wasmparser 0.219.1", ] [[package]] @@ -3837,10 +3842,20 @@ version = "0.116.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "semver", ] +[[package]] +name = "wasmparser" +version = "0.219.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5" +dependencies = [ + "bitflags 2.6.0", + "indexmap 2.6.0", +] + [[package]] name = "wasmtime" version = "15.0.1" @@ -3853,7 +3868,7 @@ dependencies = [ "bumpalo", "cfg-if", "fxprof-processed-profile", - "indexmap 2.5.0", + "indexmap 2.6.0", "libc", "log", "object 0.32.2", @@ -3866,7 +3881,7 @@ dependencies = [ "serde_json", "target-lexicon", "wasm-encoder 0.36.2", - "wasmparser", + "wasmparser 0.116.1", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-cranelift", @@ -3916,7 +3931,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -3947,7 +3962,7 @@ dependencies = [ "object 0.32.2", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.116.1", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -3978,14 +3993,14 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli 0.28.1", - "indexmap 2.5.0", + "indexmap 2.6.0", "log", "object 0.32.2", "serde", "serde_derive", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.116.1", "wasmtime-types", ] @@ -4063,7 +4078,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap 2.5.0", + "indexmap 2.6.0", "libc", "log", "mach", @@ -4093,7 +4108,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "wasmparser", + "wasmparser 0.116.1", ] [[package]] @@ -4104,7 +4119,7 @@ checksum = "f50f51f8d79bfd2aa8e9d9a0ae7c2d02b45fe412e62ff1b87c0c81b07c738231" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -4115,7 +4130,7 @@ checksum = "4b804dfd3d0c0d6d37aa21026fe7772ba1a769c89ee4f5c4f13b82d91d75216f" dependencies = [ "anyhow", "heck", - "indexmap 2.5.0", + "indexmap 2.6.0", "wit-parser", ] @@ -4127,31 +4142,31 @@ checksum = "9b6060bc082cc32d9a45587c7640e29e3c7b89ada82677ac25d87850aaccb368" [[package]] name = "wast" -version = "218.0.0" +version = "219.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a53cd1f0fa505df97557e36a58bddb8296e2fcdcd089529545ebfdb18a1b9d7" +checksum = "4f79a9d9df79986a68689a6b40bcc8d5d40d807487b235bebc2ac69a242b54a1" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.218.0", + "wasm-encoder 0.219.1", ] [[package]] name = "wat" -version = "1.218.0" +version = "1.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f87f8e14e776762e07927c27c2054d2cf678aab9aae2d431a79b3e31e4dd391" +checksum = "8bc3cf014fb336883a411cd662f987abf6a1d2a27f2f0008616a0070bbf6bd0d" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -4383,7 +4398,7 @@ checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" dependencies = [ "anyhow", "id-arena", - "indexmap 2.5.0", + "indexmap 2.6.0", "log", "semver", "serde", @@ -4419,7 +4434,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 92e6277..e030466 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,5 +39,5 @@ serial_test = "2.0.0" k8s_tests = [] [patch.crates-io] -clarinet-files = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "ad72f15a418b7da3c5b4e39c373f69003abb0b49" } -clarinet-deployments = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "ad72f15a418b7da3c5b4e39c373f69003abb0b49" } +clarinet-files = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "e8907ac178dbb03544afbe5ec01d93797591c01f" } +clarinet-deployments = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "e8907ac178dbb03544afbe5ec01d93797591c01f" } diff --git a/examples/new-network.example.json b/examples/new-network.example.json index 49710b2..b27e751 100644 --- a/examples/new-network.example.json +++ b/examples/new-network.example.json @@ -260,6 +260,8 @@ "faucet_btc_address": "mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d", "faucet_mnemonic": "shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform", "faucet_derivation_path": "m/44'/5757'/0'/0/0", + "stacker_mnemonic": "empty lens any direct brother then drop fury rule pole win claim scissors list rescue horn rent inform relief jump sword weekend half legend", + "stacker_derivation_path": "m/44'/5757'/0'/0/0", "working_dir": "/tmp", "postgres_port": 5432, "postgres_username": "postgres", diff --git a/src/tests/fixtures/left.txt b/src/tests/fixtures/left.txt new file mode 100644 index 0000000..48dc5fe --- /dev/null +++ b/src/tests/fixtures/left.txt @@ -0,0 +1,192 @@ +"--- +network: + name: devnet + stacks_node_rpc_address: ~ + bitcoin_node_rpc_address: ~ + deployment_fee_rate: 10 + sats_per_bytes: 10 +accounts: + - label: deployer + mnemonic: twice kind fence tip hidden tilt action fragile skin nothing glory cousin green tomorrow spring wrist shed math olympic multiply hip blue scout claw + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + btc_address: mqVnk6NPRdhntvfm4hh9vvjiRkFDUuSYsH + is_mainnet: false + - label: faucet + mnemonic: shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: STNHKEPYEPJ8ET55ZZ0M5A34J0R3N5FM2CMMMAZ6 + btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d + is_mainnet: false + - label: wallet_1 + mnemonic: crazy vibrant runway diagram beach language above aerobic maze coral this gas mirror output vehicle cover usage ecology unfold room feel file rocket expire + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: STB8E0SMACY4A6DCCH4WE48YGX3P877407QW176V + btc_address: mha4u7F3e93P9Xy1WQgVvGtYtynnJtT22x + is_mainnet: false + - label: wallet_2 + mnemonic: hold excess usual excess ring elephant install account glad dry fragile donkey gaze humble truck breeze nation gasp vacuum limb head keep delay hospital + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2CY5V39NHDPWSXMW9QDT3HC3GD6Q6XX4CFRK9AG + btc_address: muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG + is_mainnet: false + - label: wallet_3 + mnemonic: cycle puppy glare enroll cost improve round trend wrist mushroom scorpion tower claim oppose clever elephant dinosaur eight problem before frozen dune wagon high + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2JHG361ZXG51QTKY2NQCVBPPRRE2KZB1HR05NNC + btc_address: mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7 + is_mainnet: false + - label: wallet_4 + mnemonic: board list obtain sugar hour worth raven scout denial thunder horse logic fury scorpion fold genuine phrase wealth news aim below celery when cabin + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2NEB84ASENDXKYGJPQW86YXQCEFEX2ZQPG87ND + btc_address: mg1C76bNTutiCDV3t9nWhZs3Dc8LzUufj8 + is_mainnet: false + - label: wallet_5 + mnemonic: hurry aunt blame peanut heavy update captain human rice crime juice adult scale device promote vast project quiz unit note reform update climb purchase + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2REHHS5J3CERCRBEPMGH7921Q6PYKAADT7JP2VB + btc_address: mweN5WVqadScHdA81aATSdcVr4B6dNokqx + is_mainnet: false + - label: wallet_6 + mnemonic: area desk dutch sign gold cricket dawn toward giggle vibrant indoor bench warfare wagon number tiny universe sand talk dilemma pottery bone trap buddy + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST3AM1A56AK2C1XAFJ4115ZSV26EB49BVQ10MGCS0 + btc_address: mzxXgV6e4BZSsz8zVHm3TmqbECt7mbuErt + is_mainnet: false + - label: wallet_7 + mnemonic: prevent gallery kind limb income control noise together echo rival record wedding sense uncover school version force bleak nuclear include danger skirt enact arrow + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST3PF13W7Z0RRM42A8VZRVFQ75SV1K26RXEP8YGKJ + btc_address: n37mwmru2oaVosgfuvzBwgV2ysCQRrLko7 + is_mainnet: false + - label: wallet_8 + mnemonic: female adjust gallery certain visit token during great side clown fitness like hurt clip knife warm bench start reunion globe detail dream depend fortune + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST3NBRSFKX28FQ2ZJ1MAKX58HKHSDGNV5N7R21XCP + btc_address: n2v875jbJ4RjBnTjgbfikDfnwsDV5iUByw + is_mainnet: false +devnet_settings: + name: devnet + network_id: ~ + orchestrator_ingestion_port: 20445 + orchestrator_control_port: 20446 + bitcoin_node_p2p_port: 18444 + bitcoin_node_rpc_port: 18443 + bitcoin_node_username: devnet + bitcoin_node_password: devnet + stacks_node_p2p_port: 20444 + stacks_node_rpc_port: 20443 + stacks_node_wait_time_for_microblocks: 50 + stacks_node_first_attempt_time_ms: 500 + stacks_node_events_observers: + - \"host.docker.internal:20455\" + stacks_node_env_vars: [] + stacks_node_next_initiative_delay: 4000 + stacks_api_port: 3999 + stacks_api_events_port: 3700 + stacks_api_env_vars: [] + stacks_signers_keys: + - key: 7287ba251d44a4d3fd9276c88ce34c5c52a038955511cccaf77e61068649c178 + compress_public: true + - key: 530d9f61984c888536871c6573073bdfc0058896dc1adfe9a6a10dfacadc2091 + compress_public: true + stacks_signers_env_vars: [] + stacks_explorer_port: 8000 + stacks_explorer_env_vars: [] + bitcoin_explorer_port: 8001 + bitcoin_controller_block_time: 60000 + bitcoin_controller_automining_disabled: false + miner_stx_address: ST3Q96TFVE6E0Q91XVX6S8RWAJW5R8XTZ8YEBM8RQ + miner_secret_key_hex: 3b68e410cc7f9b8bae76f2f2991b69ecd0627c95da22a904065dfb2a73d0585f01 + miner_btc_address: n3GRiDLKWuKLCw1DZmV75W1mE35qmW2tQm + miner_mnemonic: fragile loan twenty basic net assault jazz absorb diet talk art shock innocent float punch travel gadget embrace caught blossom hockey surround initial reduce + miner_derivation_path: \"m/44'/5757'/0'/0/0\" + miner_coinbase_recipient: ST3Q96TFVE6E0Q91XVX6S8RWAJW5R8XTZ8YEBM8RQ + miner_wallet_name: \"\" + faucet_stx_address: STNHKEPYEPJ8ET55ZZ0M5A34J0R3N5FM2CMMMAZ6 + faucet_secret_key_hex: de433bdfa14ec43aa1098d5be594c8ffb20a31485ff9de2923b2689471c401b801 + faucet_btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d + faucet_mnemonic: shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform + faucet_derivation_path: \"m/44'/5757'/0'/0/0\" + pre_nakamoto_mock_signing: false + working_dir: /Users/micaiahreid/work/stx-px/tmp + postgres_port: 5432 + postgres_username: postgres + postgres_password: postgres + stacks_api_postgres_database: stacks_api + subnet_api_postgres_database: subnet_api + pox_stacking_orders: + - start_at_cycle: 3 + duration: 12 + wallet: wallet_1 + slots: 2 + btc_address: mr1iPkD9N3RJZZxXRk7xF9d36gffa6exNC + auto_extend: ~ + - start_at_cycle: 3 + duration: 12 + wallet: wallet_2 + slots: 1 + btc_address: muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG + auto_extend: ~ + - start_at_cycle: 3 + duration: 12 + wallet: wallet_3 + slots: 1 + btc_address: mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7 + auto_extend: ~ + execute_script: [] + bitcoin_node_image_url: \"quay.io/hirosystems/bitcoind:devnet-v3\" + stacks_node_image_url: \"quay.io/hirosystems/stacks-node:devnet-3.0\" + stacks_signer_image_url: \"quay.io/hirosystems/stacks-node:devnet-3.0\" + stacks_api_image_url: \"hirosystems/stacks-blockchain-api:latest\" + stacks_explorer_image_url: \"hirosystems/explorer:latest\" + postgres_image_url: \"postgres:14\" + bitcoin_explorer_image_url: \"quay.io/hirosystems/bitcoin-explorer:devnet\" + disable_bitcoin_explorer: true + disable_stacks_explorer: true + disable_stacks_api: false + disable_postgres: false + bind_containers_volumes: false + enable_subnet_node: false + subnet_node_image_url: \"hirosystems/stacks-subnets:0.8.1\" + subnet_leader_stx_address: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + subnet_leader_secret_key_hex: 753b7cc01a1a2e86221266a154af739463fce51219d97e4f856cd7200c3bd2a601 + subnet_leader_btc_address: mqVnk6NPRdhntvfm4hh9vvjiRkFDUuSYsH + subnet_leader_mnemonic: twice kind fence tip hidden tilt action fragile skin nothing glory cousin green tomorrow spring wrist shed math olympic multiply hip blue scout claw + subnet_leader_derivation_path: \"m/44'/5757'/0'/0/0\" + subnet_node_p2p_port: 30444 + subnet_node_rpc_port: 30443 + subnet_events_ingestion_port: 30445 + subnet_node_events_observers: [] + subnet_contract_id: ST173JK7NZBA4BS05ZRATQH1K89YJMTGEH1Z5J52E.subnet-v3-0-1 + remapped_subnet_contract_id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.subnet-v3-0-1 + subnet_node_env_vars: [] + subnet_api_image_url: \"hirosystems/stacks-blockchain-api:latest\" + subnet_api_port: 13999 + subnet_api_events_port: 13700 + subnet_api_env_vars: [] + disable_subnet_api: true + docker_host: \"unix:///var/run/docker.sock\" + components_host: 127.0.0.1 + epoch_2_0: 100 + epoch_2_05: 100 + epoch_2_1: 101 + epoch_2_2: 103 + epoch_2_3: 104 + epoch_2_4: 105 + epoch_2_5: 105 + epoch_3_0: 121 + use_docker_gateway_routing: false + docker_platform: linux/amd64 +" diff --git a/src/tests/fixtures/network-manifest.yaml b/src/tests/fixtures/network-manifest.yaml index c1821f3..adf3f3d 100644 --- a/src/tests/fixtures/network-manifest.yaml +++ b/src/tests/fixtures/network-manifest.yaml @@ -119,6 +119,8 @@ devnet_settings: faucet_btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d faucet_mnemonic: shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform faucet_derivation_path: "m/44'/5757'/0'/0/0" + stacker_mnemonic: empty lens any direct brother then drop fury rule pole win claim scissors list rescue horn rent inform relief jump sword weekend half legend + stacker_derivation_path: "m/44'/5757'/0'/0/0" pre_nakamoto_mock_signing: false working_dir: /Users/micaiahreid/work/stx-px/tmp postgres_port: 5432 diff --git a/src/tests/fixtures/right.txt b/src/tests/fixtures/right.txt new file mode 100644 index 0000000..f5f8d51 --- /dev/null +++ b/src/tests/fixtures/right.txt @@ -0,0 +1,194 @@ +"--- +network: + name: devnet + stacks_node_rpc_address: ~ + bitcoin_node_rpc_address: ~ + deployment_fee_rate: 10 + sats_per_bytes: 10 +accounts: + - label: deployer + mnemonic: twice kind fence tip hidden tilt action fragile skin nothing glory cousin green tomorrow spring wrist shed math olympic multiply hip blue scout claw + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + btc_address: mqVnk6NPRdhntvfm4hh9vvjiRkFDUuSYsH + is_mainnet: false + - label: faucet + mnemonic: shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: STNHKEPYEPJ8ET55ZZ0M5A34J0R3N5FM2CMMMAZ6 + btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d + is_mainnet: false + - label: wallet_1 + mnemonic: crazy vibrant runway diagram beach language above aerobic maze coral this gas mirror output vehicle cover usage ecology unfold room feel file rocket expire + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: STB8E0SMACY4A6DCCH4WE48YGX3P877407QW176V + btc_address: mha4u7F3e93P9Xy1WQgVvGtYtynnJtT22x + is_mainnet: false + - label: wallet_2 + mnemonic: hold excess usual excess ring elephant install account glad dry fragile donkey gaze humble truck breeze nation gasp vacuum limb head keep delay hospital + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2CY5V39NHDPWSXMW9QDT3HC3GD6Q6XX4CFRK9AG + btc_address: muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG + is_mainnet: false + - label: wallet_3 + mnemonic: cycle puppy glare enroll cost improve round trend wrist mushroom scorpion tower claim oppose clever elephant dinosaur eight problem before frozen dune wagon high + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2JHG361ZXG51QTKY2NQCVBPPRRE2KZB1HR05NNC + btc_address: mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7 + is_mainnet: false + - label: wallet_4 + mnemonic: board list obtain sugar hour worth raven scout denial thunder horse logic fury scorpion fold genuine phrase wealth news aim below celery when cabin + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2NEB84ASENDXKYGJPQW86YXQCEFEX2ZQPG87ND + btc_address: mg1C76bNTutiCDV3t9nWhZs3Dc8LzUufj8 + is_mainnet: false + - label: wallet_5 + mnemonic: hurry aunt blame peanut heavy update captain human rice crime juice adult scale device promote vast project quiz unit note reform update climb purchase + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST2REHHS5J3CERCRBEPMGH7921Q6PYKAADT7JP2VB + btc_address: mweN5WVqadScHdA81aATSdcVr4B6dNokqx + is_mainnet: false + - label: wallet_6 + mnemonic: area desk dutch sign gold cricket dawn toward giggle vibrant indoor bench warfare wagon number tiny universe sand talk dilemma pottery bone trap buddy + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST3AM1A56AK2C1XAFJ4115ZSV26EB49BVQ10MGCS0 + btc_address: mzxXgV6e4BZSsz8zVHm3TmqbECt7mbuErt + is_mainnet: false + - label: wallet_7 + mnemonic: prevent gallery kind limb income control noise together echo rival record wedding sense uncover school version force bleak nuclear include danger skirt enact arrow + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST3PF13W7Z0RRM42A8VZRVFQ75SV1K26RXEP8YGKJ + btc_address: n37mwmru2oaVosgfuvzBwgV2ysCQRrLko7 + is_mainnet: false + - label: wallet_8 + mnemonic: female adjust gallery certain visit token during great side clown fitness like hurt clip knife warm bench start reunion globe detail dream depend fortune + derivation: \"m/44'/5757'/0'/0/0\" + balance: 100000000000000 + stx_address: ST3NBRSFKX28FQ2ZJ1MAKX58HKHSDGNV5N7R21XCP + btc_address: n2v875jbJ4RjBnTjgbfikDfnwsDV5iUByw + is_mainnet: false +devnet_settings: + name: devnet + network_id: ~ + orchestrator_ingestion_port: 20445 + orchestrator_control_port: 20446 + bitcoin_node_p2p_port: 18444 + bitcoin_node_rpc_port: 18443 + bitcoin_node_username: devnet + bitcoin_node_password: devnet + stacks_node_p2p_port: 20444 + stacks_node_rpc_port: 20443 + stacks_node_wait_time_for_microblocks: 50 + stacks_node_first_attempt_time_ms: 500 + stacks_node_events_observers: + - \"host.docker.internal:20455\" + stacks_node_env_vars: [] + stacks_node_next_initiative_delay: 4000 + stacks_api_port: 3999 + stacks_api_events_port: 3700 + stacks_api_env_vars: [] + stacks_signers_keys: + - key: 7287ba251d44a4d3fd9276c88ce34c5c52a038955511cccaf77e61068649c178 + compress_public: true + - key: 530d9f61984c888536871c6573073bdfc0058896dc1adfe9a6a10dfacadc2091 + compress_public: true + stacks_signers_env_vars: [] + stacks_explorer_port: 8000 + stacks_explorer_env_vars: [] + bitcoin_explorer_port: 8001 + bitcoin_controller_block_time: 60000 + bitcoin_controller_automining_disabled: false + miner_stx_address: ST3Q96TFVE6E0Q91XVX6S8RWAJW5R8XTZ8YEBM8RQ + miner_secret_key_hex: 3b68e410cc7f9b8bae76f2f2991b69ecd0627c95da22a904065dfb2a73d0585f01 + miner_btc_address: n3GRiDLKWuKLCw1DZmV75W1mE35qmW2tQm + miner_mnemonic: fragile loan twenty basic net assault jazz absorb diet talk art shock innocent float punch travel gadget embrace caught blossom hockey surround initial reduce + miner_derivation_path: \"m/44'/5757'/0'/0/0\" + miner_coinbase_recipient: ST3Q96TFVE6E0Q91XVX6S8RWAJW5R8XTZ8YEBM8RQ + miner_wallet_name: \"\" + faucet_stx_address: STNHKEPYEPJ8ET55ZZ0M5A34J0R3N5FM2CMMMAZ6 + faucet_secret_key_hex: de433bdfa14ec43aa1098d5be594c8ffb20a31485ff9de2923b2689471c401b801 + faucet_btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d + faucet_mnemonic: shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform + faucet_derivation_path: \"m/44'/5757'/0'/0/0\" + stacker_mnemonic: empty lens any direct brother then drop fury rule pole win claim scissors list rescue horn rent inform relief jump sword weekend half legend + stacker_derivation_path: \"m/44'/5757'/0'/0/0\" + pre_nakamoto_mock_signing: false + working_dir: /Users/micaiahreid/work/stx-px/tmp + postgres_port: 5432 + postgres_username: postgres + postgres_password: postgres + stacks_api_postgres_database: stacks_api + subnet_api_postgres_database: subnet_api + pox_stacking_orders: + - start_at_cycle: 3 + duration: 12 + wallet: wallet_1 + slots: 2 + btc_address: mr1iPkD9N3RJZZxXRk7xF9d36gffa6exNC + auto_extend: ~ + - start_at_cycle: 3 + duration: 12 + wallet: wallet_2 + slots: 1 + btc_address: muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG + auto_extend: ~ + - start_at_cycle: 3 + duration: 12 + wallet: wallet_3 + slots: 1 + btc_address: mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7 + auto_extend: ~ + execute_script: [] + bitcoin_node_image_url: \"quay.io/hirosystems/bitcoind:devnet-v3\" + stacks_node_image_url: \"quay.io/hirosystems/stacks-node:devnet-3.0\" + stacks_signer_image_url: \"quay.io/hirosystems/stacks-node:devnet-3.0\" + stacks_api_image_url: \"hirosystems/stacks-blockchain-api:latest\" + stacks_explorer_image_url: \"hirosystems/explorer:latest\" + postgres_image_url: \"postgres:14\" + bitcoin_explorer_image_url: \"quay.io/hirosystems/bitcoin-explorer:devnet\" + disable_bitcoin_explorer: true + disable_stacks_explorer: true + disable_stacks_api: false + disable_postgres: false + bind_containers_volumes: false + enable_subnet_node: false + subnet_node_image_url: \"hirosystems/stacks-subnets:0.8.1\" + subnet_leader_stx_address: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + subnet_leader_secret_key_hex: 753b7cc01a1a2e86221266a154af739463fce51219d97e4f856cd7200c3bd2a601 + subnet_leader_btc_address: mqVnk6NPRdhntvfm4hh9vvjiRkFDUuSYsH + subnet_leader_mnemonic: twice kind fence tip hidden tilt action fragile skin nothing glory cousin green tomorrow spring wrist shed math olympic multiply hip blue scout claw + subnet_leader_derivation_path: \"m/44'/5757'/0'/0/0\" + subnet_node_p2p_port: 30444 + subnet_node_rpc_port: 30443 + subnet_events_ingestion_port: 30445 + subnet_node_events_observers: [] + subnet_contract_id: ST173JK7NZBA4BS05ZRATQH1K89YJMTGEH1Z5J52E.subnet-v3-0-1 + remapped_subnet_contract_id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.subnet-v3-0-1 + subnet_node_env_vars: [] + subnet_api_image_url: \"hirosystems/stacks-blockchain-api:latest\" + subnet_api_port: 13999 + subnet_api_events_port: 13700 + subnet_api_env_vars: [] + disable_subnet_api: true + docker_host: \"unix:///var/run/docker.sock\" + components_host: 127.0.0.1 + epoch_2_0: 100 + epoch_2_05: 100 + epoch_2_1: 101 + epoch_2_2: 103 + epoch_2_3: 104 + epoch_2_4: 105 + epoch_2_5: 105 + epoch_3_0: 121 + use_docker_gateway_routing: false + docker_platform: linux/amd64 +" diff --git a/src/tests/fixtures/stacks-devnet-config.json b/src/tests/fixtures/stacks-devnet-config.json index 80af521..733a0f2 100644 --- a/src/tests/fixtures/stacks-devnet-config.json +++ b/src/tests/fixtures/stacks-devnet-config.json @@ -275,6 +275,8 @@ "faucet_btc_address": "mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d", "faucet_mnemonic": "shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform", "faucet_derivation_path": "m/44'/5757'/0'/0/0", + "stacker_mnemonic": "empty lens any direct brother then drop fury rule pole win claim scissors list rescue horn rent inform relief jump sword weekend half legend", + "stacker_derivation_path": "m/44'/5757'/0'/0/0", "pre_nakamoto_mock_signing": false, "working_dir": "/Users/micaiahreid/work/stx-px/tmp", "postgres_port": 5432,