diff --git a/.gitignore b/.gitignore index a18a31a..d14cebc 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,6 @@ # program outputs # Remove if you want to save them to your github programs/**/output/* -!programs/**/output/README.md \ No newline at end of file +!programs/**/output/README.md + +*scratch* diff --git a/Cargo.lock b/Cargo.lock index 91c30e9..32b56f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.15", + "getrandom", "once_cell", "version_check", ] @@ -37,7 +37,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -56,6 +56,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] +<<<<<<< HEAD name = "alloy-primitives" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -98,7 +99,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -110,11 +111,11 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.7.1", + "indexmap 2.9.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "syn-solidity", "tiny-keccak 2.0.2", ] @@ -130,7 +131,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "syn-solidity", ] @@ -147,6 +148,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -213,9 +216,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" [[package]] name = "ark-bls12-381" @@ -224,9 +227,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" dependencies = [ "ark-ec", +<<<<<<< HEAD "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", +======= + "ark-ff", + "ark-serialize", + "ark-std", +>>>>>>> template/main ] [[package]] @@ -235,10 +244,17 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ +<<<<<<< HEAD "ark-ff 0.4.2", "ark-poly", "ark-serialize 0.4.2", "ark-std 0.4.0", +======= + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", +>>>>>>> template/main "derivative", "hashbrown 0.13.2", "itertools 0.10.5", @@ -249,6 +265,7 @@ dependencies = [ [[package]] name = "ark-ff" +<<<<<<< HEAD version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" @@ -267,14 +284,23 @@ dependencies = [ [[package]] name = "ark-ff" +======= +>>>>>>> template/main version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ +<<<<<<< HEAD "ark-ff-asm 0.4.2", "ark-ff-macros 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", +======= + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", +>>>>>>> template/main "derivative", "digest 0.10.7", "itertools 0.10.5", @@ -282,12 +308,17 @@ dependencies = [ "num-traits", "paste", "rayon", +<<<<<<< HEAD "rustc_version 0.4.1", +======= + "rustc_version", +>>>>>>> template/main "zeroize", ] [[package]] name = "ark-ff-asm" +<<<<<<< HEAD version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" @@ -298,6 +329,8 @@ dependencies = [ [[package]] name = "ark-ff-asm" +======= +>>>>>>> template/main version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" @@ -308,6 +341,7 @@ dependencies = [ [[package]] name = "ark-ff-macros" +<<<<<<< HEAD version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" @@ -320,6 +354,8 @@ dependencies = [ [[package]] name = "ark-ff-macros" +======= +>>>>>>> template/main version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" @@ -337,15 +373,22 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ +<<<<<<< HEAD "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", +======= + "ark-ff", + "ark-serialize", + "ark-std", +>>>>>>> template/main "derivative", "hashbrown 0.13.2", ] [[package]] name = "ark-serialize" +<<<<<<< HEAD version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" @@ -356,12 +399,18 @@ dependencies = [ [[package]] name = "ark-serialize" +======= +>>>>>>> template/main version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-serialize-derive", +<<<<<<< HEAD "ark-std 0.4.0", +======= + "ark-std", +>>>>>>> template/main "digest 0.10.7", "num-bigint", ] @@ -379,6 +428,7 @@ dependencies = [ [[package]] name = "ark-std" +<<<<<<< HEAD version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" @@ -389,6 +439,8 @@ dependencies = [ [[package]] name = "ark-std" +======= +>>>>>>> template/main version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" @@ -405,6 +457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] +<<<<<<< HEAD name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -450,6 +503,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "async-stream" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -468,21 +523,22 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "async-trait" -version = "0.1.86" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] +<<<<<<< HEAD name = "auto_impl" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -490,10 +546,12 @@ checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] +======= +>>>>>>> template/main name = "autocfg" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -579,9 +637,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "bech32" @@ -626,6 +684,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "bit-set" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -641,6 +700,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] +======= +>>>>>>> template/main name = "bitcoin-internals" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -664,14 +725,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" dependencies = [ "serde", ] [[package]] +<<<<<<< HEAD name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -684,6 +746,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -729,12 +793,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] +<<<<<<< HEAD name = "byte-slice-cast" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" +checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" [[package]] +======= +>>>>>>> template/main name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -742,18 +809,24 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" dependencies = [ "serde", ] [[package]] name = "cc" +<<<<<<< HEAD +version = "1.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" +======= version = "1.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" +>>>>>>> template/main dependencies = [ "shlex", ] @@ -780,9 +853,15 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.31" +<<<<<<< HEAD +version = "4.5.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" +======= +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" +>>>>>>> template/main dependencies = [ "clap_builder", "clap_derive", @@ -790,9 +869,15 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.31" +<<<<<<< HEAD +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" +======= +version = "4.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" +>>>>>>> template/main dependencies = [ "anstream", "anstyle", @@ -802,14 +887,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -850,7 +935,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -866,7 +951,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" dependencies = [ "async-trait", +<<<<<<< HEAD "convert_case 0.6.0", +======= + "convert_case", +>>>>>>> template/main "json5", "nom", "pathdiff", @@ -880,12 +969,16 @@ dependencies = [ [[package]] name = "config" -version = "0.15.8" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf9dc8d4ef88e27a8cb23e85cb116403dedd57f7971964dc4b18ccead548901" +checksum = "595aae20e65c3be792d05818e8c63025294ac3cb7e200f11459063a352a6ef80" dependencies = [ "async-trait", +<<<<<<< HEAD "convert_case 0.6.0", +======= + "convert_case", +>>>>>>> template/main "json5", "pathdiff", "ron", @@ -894,7 +987,8 @@ dependencies = [ "serde_json", "toml", "winnow", - "yaml-rust2 0.9.0", +<<<<<<< HEAD + "yaml-rust2 0.10.1", ] [[package]] @@ -908,6 +1002,9 @@ dependencies = [ "hex", "proptest", "serde", +======= + "yaml-rust2 0.10.0", +>>>>>>> template/main ] [[package]] @@ -931,12 +1028,17 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ +<<<<<<< HEAD "getrandom 0.2.15", +======= + "getrandom", +>>>>>>> template/main "once_cell", "tiny-keccak 2.0.2", ] [[package]] +<<<<<<< HEAD name = "const_format" version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -963,6 +1065,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] +======= +>>>>>>> template/main name = "convert_case" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -988,8 +1092,8 @@ dependencies = [ "bip39", "cosmos-sdk-proto 0.21.1", "cosmrs", - "cosmwasm-schema 1.5.10", - "cosmwasm-std 1.5.10", + "cosmwasm-schema 1.5.11", + "cosmwasm-std 1.5.11", "enum-repr", "injective-protobuf", "prost 0.12.6", @@ -1048,15 +1152,15 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de32156e4fd80c59be39ed6f4ebb596d59b0a4eaf01d6f146e27628ec7e8f8c1" +checksum = "35b6dc17e7fd89d0a0a58f12ef33f0bbdf09a6a14c3dfb383eae665e5889250e" [[package]] name = "cosmwasm-crypto" -version = "1.5.10" +version = "1.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d656dc081e2fcfe70e35e2b82a67c95019f4b68713d65dfafa884a756ba71ebf" +checksum = "a9c82e56962f0f18c9a292aa59940e03a82ce15ef79b93679d5838bb8143f0df" dependencies = [ "digest 0.10.7", "ed25519-zebra 3.1.0", @@ -1067,14 +1171,19 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fe1e6107ae3c9ba5e1f14178dd8bd52210535030d07f0609cf0d754c1f7de2" +checksum = "aa2f53285517db3e33d825b3e46301efe845135778527e1295154413b2f0469e" dependencies = [ "ark-bls12-381", "ark-ec", +<<<<<<< HEAD "ark-ff 0.4.2", "ark-serialize 0.4.2", +======= + "ark-ff", + "ark-serialize", +>>>>>>> template/main "cosmwasm-core", "curve25519-dalek 4.1.3", "digest 0.10.7", @@ -1091,31 +1200,31 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.5.10" +version = "1.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343f5ce9f8f83dc2b3c03cb51ac2d39315ac4defd200d544e5a190726e01d2d5" +checksum = "d9b804ff15a0e059c88f85ae0e868cf8c7aba9d61221e46f1ad7250f270628c7" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-derive" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "484926c9dc8b90c59a717946c86bb272182003cbaabb378560086648d4056656" +checksum = "a782b93fae93e57ca8ad3e9e994e784583f5933aeaaa5c80a545c4b437be2047" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "cosmwasm-schema" -version = "1.5.10" +version = "1.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d538047f2bab028d3242ff974e64985565cd29faa09af7410d4278bb66e3c99" +checksum = "5526ea839acb47bbf8fff031ed9aad86e74d43f77b089255417328c3664367d5" dependencies = [ - "cosmwasm-schema-derive 1.5.10", + "cosmwasm-schema-derive 1.5.11", "schemars", "serde", "serde_json", @@ -1124,11 +1233,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a25988c48703d1450a5ac5e7cd3ad82ec8a7552f3dde8f9b8927e682bd02c7" +checksum = "6984ab21b47a096e17ae4c73cea2123a704d4b6686c39421247ad67020d76f95" dependencies = [ - "cosmwasm-schema-derive 2.2.1", + "cosmwasm-schema-derive 2.2.2", "schemars", "serde", "serde_json", @@ -1137,9 +1246,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.5.10" +version = "1.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a098a0ba9dee2e998e2c7e6a842b517de338d39553802cf70493b2473ac55aa2" +checksum = "10f41b99f41f840765d02ae858956bb52af910755976312082e90493c67db512" dependencies = [ "proc-macro2", "quote", @@ -1148,26 +1257,26 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd08fac60d30e341d9365033f519c0a36fdf38bde6ec196179e653d2723aebd" +checksum = "e01c9214319017f6ebd8e299036e1f717fa9bb6724e758f7d6fb2477599d1a29" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "cosmwasm-std" -version = "1.5.10" +version = "1.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf7297ace2435a5d200eb0f402e91d4739e33a4565287f433ceded34ff7ad153" +checksum = "763340055b84e5482ed90fec8194ff7d59112267a09bbf5819c9e3edca8c052e" dependencies = [ "base64 0.21.7", "bech32 0.9.1", "bnum 0.10.0", - "cosmwasm-crypto 1.5.10", - "cosmwasm-derive 1.5.10", + "cosmwasm-crypto 1.5.11", + "cosmwasm-derive 1.5.11", "derivative", "forward_ref", "hex", @@ -1181,17 +1290,21 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92be4747d9abe3a96a5a78af34d29947992b3f67f602987ff8a87142ce9c413" +checksum = "bf82335c14bd94eeb4d3c461b7aa419ecd7ea13c2efe24b97cd972bdb8044e7d" dependencies = [ "base64 0.22.1", "bech32 0.11.0", "bnum 0.11.0", "cosmwasm-core", - "cosmwasm-crypto 2.2.1", - "cosmwasm-derive 2.2.1", + "cosmwasm-crypto 2.2.2", + "cosmwasm-derive 2.2.2", +<<<<<<< HEAD "derive_more 1.0.0", +======= + "derive_more", +>>>>>>> template/main "hex", "rand_core 0.6.4", "rmp-serde", @@ -1238,6 +1351,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] +<<<<<<< HEAD +name = "crosschain_astroport_lper" +version = "0.1.0" +dependencies = [ + "clap", + "deployer-lib", + "serde_json", + "tokio", + "valence-account-utils", + "valence-astroport-lper", + "valence-astroport-utils", + "valence-astroport-withdrawer", + "valence-authorization", + "valence-authorization-utils", + "valence-base-account", + "valence-drop-liquid-staker", + "valence-encoder-broker", + "valence-forwarder-library", + "valence-generic-ibc-transfer-library", + "valence-ibc-utils", + "valence-library-base", + "valence-library-utils", + "valence-macros", + "valence-neutron-ibc-transfer-library", + "valence-neutron-ic-querier", + "valence-osmosis-cl-lper", + "valence-osmosis-cl-withdrawer", + "valence-osmosis-gamm-lper", + "valence-osmosis-gamm-withdrawer", + "valence-osmosis-utils", + "valence-processor", + "valence-processor-utils", + "valence-program-manager", + "valence-program-registry", + "valence-reverse-splitter-library", + "valence-splitter-library", + "valence-storage-account", +] + +[[package]] +======= +>>>>>>> template/main name = "crunchy" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1289,7 +1444,11 @@ dependencies = [ "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", +<<<<<<< HEAD "rustc_version 0.4.1", +======= + "rustc_version", +>>>>>>> template/main "subtle", "zeroize", ] @@ -1302,7 +1461,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1324,7 +1483,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73553ee4dad5b1678977ff603e72c3fdd41518ca2b0bd9b245b21e4c72eafa9e" dependencies = [ - "cosmwasm-std 2.2.1", + "cosmwasm-std 2.2.2", ] [[package]] @@ -1332,8 +1491,8 @@ name = "cw-denom" version = "2.4.2" source = "git+https://github.com/DA0-DA0/dao-contracts?branch=cw-std-2#48ce9249ebd28c9092de0bf2368c78458726c9e9" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw20", "thiserror 1.0.69", ] @@ -1344,12 +1503,17 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2f8ee96ac5342c795a0610410998fc075a95af8c796b6d16479cdffd2471f1" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-address-like", "cw-ownable-derive", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "thiserror 1.0.69", ] @@ -1366,49 +1530,55 @@ dependencies = [ [[package]] name = "cw-storage-plus" +<<<<<<< HEAD version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b6f91c0b94481a3e9ef1ceb183c37d00764f8751e39b45fc09f4d9b970d469" dependencies = [ - "cosmwasm-std 1.5.10", + "cosmwasm-std 1.5.11", "schemars", "serde", ] [[package]] name = "cw-storage-plus" +======= +>>>>>>> template/main version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f13360e9007f51998d42b1bc6b7fa0141f74feae61ed5fd1e5b0a89eec7b5de1" dependencies = [ - "cosmwasm-std 2.2.1", + "cosmwasm-std 2.2.2", "schemars", "serde", ] [[package]] name = "cw-utils" +<<<<<<< HEAD version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6a84c6c1c0acc3616398eba50783934bd6c964bad6974241eaee3460c8f5b26" dependencies = [ - "cosmwasm-schema 1.5.10", - "cosmwasm-std 1.5.10", + "cosmwasm-schema 1.5.11", + "cosmwasm-std 1.5.11", "cw2 0.16.0", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "thiserror 1.0.69", ] [[package]] name = "cw-utils" +======= +>>>>>>> template/main version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07dfee7f12f802431a856984a32bce1cb7da1e6c006b5409e3981035ce562dec" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "schemars", "serde", "thiserror 1.0.69", @@ -1416,12 +1586,13 @@ dependencies = [ [[package]] name = "cw2" +<<<<<<< HEAD version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91398113b806f4d2a8d5f8d05684704a20ffd5968bf87e3473e1973710b884ad" dependencies = [ - "cosmwasm-schema 1.5.10", - "cosmwasm-std 1.5.10", + "cosmwasm-schema 1.5.11", + "cosmwasm-std 1.5.11", "cw-storage-plus 0.16.0", "schemars", "serde", @@ -1429,15 +1600,23 @@ dependencies = [ [[package]] name = "cw2" +======= +>>>>>>> template/main version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b04852cd38f044c0751259d5f78255d07590d136b8a86d4e09efdd7666bd6d27" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "schemars", - "semver 1.0.25", + "semver 1.0.26", +======= + "cw-storage-plus", + "schemars", + "semver", +>>>>>>> template/main "serde", "thiserror 1.0.69", ] @@ -1448,20 +1627,25 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a42212b6bf29bbdda693743697c621894723f35d3db0d5df930be22903d0e27c" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", +<<<<<<< HEAD "cw-utils 2.0.0", +======= + "cw-utils", +>>>>>>> template/main "schemars", "serde", ] [[package]] +<<<<<<< HEAD name = "cw721" version = "0.16.0" source = "git+https://github.com/CosmWasm/cw-nfts?tag=v0.16.0#2cad1d3e15e0a34d466a0b51e02c58b82ebe5ecd" dependencies = [ - "cosmwasm-schema 1.5.10", - "cosmwasm-std 1.5.10", + "cosmwasm-schema 1.5.11", + "cosmwasm-std 1.5.11", "cw-utils 0.16.0", "schemars", "serde", @@ -1472,8 +1656,8 @@ name = "cw721" version = "0.20.0" source = "git+https://github.com/public-awesome/cw-nfts?rev=99dbf7e#99dbf7ee89fd1e13f72380e92ff95a456183b35d" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw-storage-plus 2.0.0", "cw-utils 2.0.0", @@ -1490,8 +1674,8 @@ name = "cw721-base" version = "0.20.0" source = "git+https://github.com/public-awesome/cw-nfts?rev=99dbf7e#99dbf7ee89fd1e13f72380e92ff95a456183b35d" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw2 2.0.0", "cw721 0.20.0", @@ -1499,6 +1683,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "dashmap" version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1519,10 +1705,18 @@ dependencies = [ "chrono", "clap", "cmd_lib", - "config 0.15.8", + "config 0.15.11", "dotenvy", +<<<<<<< HEAD "glob", "serde_json", +======= + "env_logger 0.11.7", + "glob", + "log", + "serde_json", + "valence-library-utils", +>>>>>>> template/main "valence-program-manager", ] @@ -1538,9 +1732,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] @@ -1558,6 +1752,7 @@ dependencies = [ [[package]] name = "derive_more" +<<<<<<< HEAD version = "0.99.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f" @@ -1566,11 +1761,13 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "derive_more" +======= +>>>>>>> template/main version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" @@ -1586,7 +1783,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "unicode-xid", ] @@ -1628,6 +1825,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "displaydoc" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1635,10 +1833,12 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] +======= +>>>>>>> template/main name = "dlv-list" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1654,16 +1854,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] +<<<<<<< HEAD name = "dunce" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] +======= +>>>>>>> template/main name = "dyn-clone" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35" +checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" [[package]] name = "ecdsa" @@ -1734,9 +1937,9 @@ dependencies = [ [[package]] name = "either" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "elliptic-curve" @@ -1802,14 +2005,20 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.6" +<<<<<<< HEAD +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +======= +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" +>>>>>>> template/main dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] @@ -1820,23 +2029,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] +<<<<<<< HEAD name = "errno" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", "windows-sys 0.59.0", ] [[package]] +======= +>>>>>>> template/main name = "ethbloom" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3932e82d64d347a045208924002930dc105a138995ccdc1479d0f05f0359f17c" dependencies = [ "crunchy", +<<<<<<< HEAD "fixed-hash 0.3.2", +======= + "fixed-hash", +>>>>>>> template/main "impl-rlp", "impl-serde", "tiny-keccak 1.5.0", @@ -1851,9 +2067,15 @@ dependencies = [ "crunchy", "ethbloom", "ethereum-types-serialize", +<<<<<<< HEAD "fixed-hash 0.3.2", "serde", "uint 0.5.0", +======= + "fixed-hash", + "serde", + "uint", +>>>>>>> template/main ] [[package]] @@ -1887,6 +2109,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "fastrand" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1915,10 +2138,12 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "ff" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ "rand_core 0.6.4", "subtle", @@ -1944,6 +2169,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "fixed-hash" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1956,6 +2182,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "flex-error" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1971,6 +2199,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +<<<<<<< HEAD name = "form_urlencoded" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1980,6 +2215,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "forward_ref" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1992,12 +2229,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] +<<<<<<< HEAD name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] +======= +>>>>>>> template/main name = "futures" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2053,7 +2293,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2105,19 +2345,23 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", +<<<<<<< HEAD "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", "libc", - "wasi 0.13.3+wasi-0.2.2", - "windows-targets", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +======= + "wasi", +>>>>>>> template/main ] [[package]] @@ -2129,7 +2373,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2167,7 +2411,11 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.7.1", +<<<<<<< HEAD + "indexmap 2.9.0", +======= + "indexmap 2.8.0", +>>>>>>> template/main "slab", "tokio", "tokio-util", @@ -2207,6 +2455,9 @@ name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", +] [[package]] name = "hashlink" @@ -2217,6 +2468,15 @@ dependencies = [ "hashbrown 0.14.5", ] +[[package]] +name = "hashlink" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +dependencies = [ + "hashbrown 0.15.2", +] + [[package]] name = "heapsize" version = "0.4.2" @@ -2240,9 +2500,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" +checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" [[package]] name = "hex" @@ -2257,12 +2517,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" [[package]] +<<<<<<< HEAD name = "hex-literal" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] +======= +>>>>>>> template/main name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2295,9 +2558,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" @@ -2307,9 +2570,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" [[package]] name = "hyper" @@ -2349,14 +2612,24 @@ dependencies = [ [[package]] name = "iana-time-zone" +<<<<<<< HEAD +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +======= version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +>>>>>>> template/main dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", +<<<<<<< HEAD + "log", +======= +>>>>>>> template/main "wasm-bindgen", "windows-core", ] @@ -2371,6 +2644,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "icu_collections" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2411,9 +2685,9 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" [[package]] name = "icu_normalizer" @@ -2435,9 +2709,9 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" [[package]] name = "icu_properties" @@ -2456,9 +2730,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" [[package]] name = "icu_provider" @@ -2485,7 +2759,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2519,12 +2793,18 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "impl-rlp" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5" dependencies = [ +<<<<<<< HEAD "rlp 0.4.6", +======= + "rlp", +>>>>>>> template/main ] [[package]] @@ -2537,6 +2817,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "impl-trait-for-tuples" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2544,10 +2825,12 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] +======= +>>>>>>> template/main name = "indenter" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2565,9 +2848,15 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.1" +<<<<<<< HEAD +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +======= +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" +>>>>>>> template/main dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -2579,7 +2868,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a52219a08aba8c17846fd23d472d1d69c817fe5b427d135273e4c7311edd6972" dependencies = [ - "cosmwasm-std 1.5.10", + "cosmwasm-std 1.5.11", "ethereum-types", "num", "protobuf 2.28.0", @@ -2591,9 +2880,9 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", @@ -2644,9 +2933,45 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jiff" +<<<<<<< HEAD +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488" +======= +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e" +>>>>>>> template/main +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +<<<<<<< HEAD +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19" +======= +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9" +>>>>>>> template/main +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] [[package]] name = "js-sys" @@ -2693,6 +3018,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "keccak-asm" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2703,6 +3029,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2710,11 +3038,12 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.170" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] +<<<<<<< HEAD name = "libm" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2722,9 +3051,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" [[package]] name = "litemap" @@ -2733,6 +3062,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" [[package]] +======= +>>>>>>> template/main name = "lock_api" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2744,9 +3075,15 @@ dependencies = [ [[package]] name = "log" +<<<<<<< HEAD +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +======= version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +>>>>>>> template/main [[package]] name = "matchit" @@ -2774,9 +3111,15 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" +<<<<<<< HEAD +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430" +======= version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +>>>>>>> template/main dependencies = [ "adler2", ] @@ -2794,23 +3137,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", +<<<<<<< HEAD "wasi 0.11.0+wasi-snapshot-preview1", +======= + "wasi", +>>>>>>> template/main "windows-sys 0.52.0", ] [[package]] name = "neutron-sdk" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcd104aa99d8078ee0ece835c3ee919f9972dc5295c741c08f4dd77093f9df8" +checksum = "f633fb24dfb3c339f248930d618fdd0c868a0dd129ce1afd8369ddcc558f558a" dependencies = [ "bech32 0.9.1", "cosmos-sdk-proto 0.20.0", - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "prost 0.12.6", "prost-types 0.12.6", - "protobuf 3.3.0", + "protobuf 3.7.2", "schemars", "serde", "serde-json-wasm 1.0.1", @@ -2898,7 +3245,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2939,7 +3286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", +<<<<<<< HEAD "libm", +======= +>>>>>>> template/main ] [[package]] @@ -2953,9 +3303,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +<<<<<<< HEAD +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +======= +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" +>>>>>>> template/main [[package]] name = "opaque-debug" @@ -2990,7 +3346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd621cc2f26474c6fb689ccc114dc0d8b53369a322f1fa5f24802f3de3d3def3" dependencies = [ "chrono", - "cosmwasm-std 2.2.1", + "cosmwasm-std 2.2.2", "osmosis-std-derive", "prost 0.13.5", "prost-types 0.13.5", @@ -3031,6 +3387,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "parity-scale-codec" version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3055,10 +3412,12 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] +======= +>>>>>>> template/main name = "parking_lot" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3111,20 +3470,32 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" +<<<<<<< HEAD +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" +======= version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +>>>>>>> template/main dependencies = [ "memchr", - "thiserror 2.0.11", + "thiserror 2.0.12", "ucd-trie", ] [[package]] name = "pest_derive" +<<<<<<< HEAD +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" +======= version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" +>>>>>>> template/main dependencies = [ "pest", "pest_generator", @@ -3132,22 +3503,34 @@ dependencies = [ [[package]] name = "pest_generator" +<<<<<<< HEAD +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" +======= version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" +>>>>>>> template/main dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "pest_meta" +<<<<<<< HEAD +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" +======= version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" +>>>>>>> template/main dependencies = [ "once_cell", "pest", @@ -3156,22 +3539,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3196,6 +3579,21 @@ dependencies = [ "spki", ] +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3204,11 +3602,15 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy", +<<<<<<< HEAD + "zerocopy 0.8.24", +======= + "zerocopy 0.8.23", +>>>>>>> template/main ] [[package]] @@ -3221,6 +3623,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "primitive-types" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3233,9 +3636,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ "toml_edit", ] @@ -3265,6 +3668,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "proc-macro-error-attr2" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3283,14 +3688,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] @@ -3300,6 +3705,12 @@ name = "program-template" version = "0.1.0" dependencies = [ "clap", +<<<<<<< HEAD +======= + "cosmwasm-std 2.2.2", + "cw-denom", + "cw-utils", +>>>>>>> template/main "deployer-lib", "serde_json", "tokio", @@ -3310,8 +3721,11 @@ dependencies = [ "valence-authorization", "valence-authorization-utils", "valence-base-account", +<<<<<<< HEAD "valence-drop-liquid-staker", "valence-encoder-broker", +======= +>>>>>>> template/main "valence-forwarder-library", "valence-generic-ibc-transfer-library", "valence-ibc-utils", @@ -3319,7 +3733,10 @@ dependencies = [ "valence-library-utils", "valence-macros", "valence-neutron-ibc-transfer-library", +<<<<<<< HEAD "valence-neutron-ic-querier", +======= +>>>>>>> template/main "valence-osmosis-cl-lper", "valence-osmosis-cl-withdrawer", "valence-osmosis-gamm-lper", @@ -3331,6 +3748,7 @@ dependencies = [ "valence-program-registry", "valence-reverse-splitter-library", "valence-splitter-library", +<<<<<<< HEAD "valence-storage-account", ] @@ -3342,16 +3760,18 @@ checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.8.0", + "bitflags 2.9.0", "lazy_static", "num-traits", "rand 0.8.5", - "rand_chacha", + "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax", "rusty-fork", "tempfile", "unarray", +======= +>>>>>>> template/main ] [[package]] @@ -3407,7 +3827,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3420,7 +3840,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3461,9 +3881,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.3.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" +checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4" dependencies = [ "once_cell", "protobuf-support", @@ -3491,28 +3911,38 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.3.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" +checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6" dependencies = [ "thiserror 1.0.69", ] [[package]] +<<<<<<< HEAD name = "quick-error" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] +======= +>>>>>>> template/main name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +<<<<<<< HEAD +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "radium" version = "0.7.0" @@ -3520,6 +3950,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] +======= +>>>>>>> template/main name = "rand" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3539,11 +3971,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", +<<<<<<< HEAD + "rand_chacha 0.3.1", +======= "rand_chacha", +>>>>>>> template/main "rand_core 0.6.4", ] [[package]] +<<<<<<< HEAD +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", + "zerocopy 0.8.24", +] + +[[package]] +======= +>>>>>>> template/main name = "rand_chacha" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3554,6 +4004,19 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + +[[package]] +======= +>>>>>>> template/main name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3580,9 +4043,19 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ +<<<<<<< HEAD "getrandom 0.2.15", ] +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.2", +] + [[package]] name = "rand_xorshift" version = "0.3.0" @@ -3590,6 +4063,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ "rand_core 0.6.4", +======= + "getrandom", +>>>>>>> template/main ] [[package]] @@ -3614,11 +4090,17 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.9" +<<<<<<< HEAD +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +======= +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" +>>>>>>> template/main dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", ] [[package]] @@ -3679,6 +4161,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "rlp" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3689,6 +4172,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "rmp" version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3717,16 +4202,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.8.0", + "bitflags 2.9.0", "serde", "serde_derive", ] [[package]] +<<<<<<< HEAD name = "ruint" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825df406ec217a8116bd7b06897c6cc8f65ffefc15d030ae2c9540acc9ed50b6" +checksum = "78a46eb779843b2c4f21fac5773e25d6d5b7c8f0922876c91541790d2ca27eef" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", @@ -3741,6 +4227,7 @@ dependencies = [ "primitive-types", "proptest", "rand 0.8.5", + "rand 0.9.0", "rlp 0.5.2", "ruint-macro", "serde", @@ -3755,6 +4242,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] +======= +>>>>>>> template/main name = "rust-ini" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3795,6 +4284,7 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" +<<<<<<< HEAD version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" @@ -3804,33 +4294,40 @@ dependencies = [ [[package]] name = "rustc_version" +======= +>>>>>>> template/main version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.25", +<<<<<<< HEAD + "semver 1.0.26", ] [[package]] name = "rustix" -version = "0.38.44" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.59.0", +======= + "semver", +>>>>>>> template/main ] [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] +<<<<<<< HEAD name = "rusty-fork" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3843,10 +4340,12 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "ryu" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "schemars" @@ -3869,7 +4368,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3912,6 +4411,7 @@ dependencies = [ [[package]] name = "semver" +<<<<<<< HEAD version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" @@ -3921,11 +4421,14 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.25" +======= +>>>>>>> template/main +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] +<<<<<<< HEAD name = "semver-parser" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3935,10 +4438,12 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -3972,22 +4477,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.15" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3998,14 +4503,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "serde_json" -version = "1.0.139" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -4025,13 +4530,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4078,6 +4583,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "sha3-asm" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4088,6 +4594,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "sharded-slab" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4132,6 +4640,17 @@ dependencies = [ [[package]] name = "smallvec" +<<<<<<< HEAD +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" + +[[package]] +name = "socket2" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +======= version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" @@ -4141,6 +4660,7 @@ name = "socket2" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +>>>>>>> template/main dependencies = [ "libc", "windows-sys 0.52.0", @@ -4167,12 +4687,15 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] +======= +>>>>>>> template/main name = "static_assertions" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4218,7 +4741,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4231,7 +4754,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4268,9 +4791,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.98" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -4278,6 +4801,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "syn-solidity" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4286,16 +4810,19 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] +======= +>>>>>>> template/main name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +<<<<<<< HEAD name = "synstructure" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4303,7 +4830,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4314,19 +4841,20 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.17.1" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", "fastrand", - "getrandom 0.3.1", + "getrandom 0.3.2", "once_cell", "rustix", "windows-sys 0.59.0", ] [[package]] +======= +>>>>>>> template/main name = "tendermint" version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4413,11 +4941,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.12", ] [[package]] @@ -4428,18 +4956,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4460,9 +4988,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +<<<<<<< HEAD +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +======= +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618" +>>>>>>> template/main dependencies = [ "deranged", "num-conv", @@ -4474,15 +5008,21 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.19" +<<<<<<< HEAD +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +======= +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04" +>>>>>>> template/main dependencies = [ "num-conv", "time-core", @@ -4507,6 +5047,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "tinystr" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4517,10 +5058,12 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "tinyvec" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" dependencies = [ "tinyvec_macros", ] @@ -4533,9 +5076,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.43.0" +<<<<<<< HEAD +version = "1.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +======= +version = "1.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" +>>>>>>> template/main dependencies = [ "backtrace", "bytes", @@ -4567,7 +5116,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4583,9 +5132,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" dependencies = [ "bytes", "futures-core", @@ -4621,7 +5170,11 @@ version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ - "indexmap 2.7.1", +<<<<<<< HEAD + "indexmap 2.9.0", +======= + "indexmap 2.8.0", +>>>>>>> template/main "serde", "serde_spanned", "toml_datetime", @@ -4706,7 +5259,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4781,6 +5334,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "uint" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4799,10 +5353,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] +======= +>>>>>>> template/main name = "unicode-ident" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-normalization" @@ -4826,6 +5382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] +<<<<<<< HEAD name = "url" version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4849,6 +5406,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] +======= +>>>>>>> template/main name = "utf8parse" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4856,13 +5415,22 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valence-account-utils" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-utils 2.0.0", +======= + "cw-utils", +>>>>>>> template/main "serde", "serde_json", "thiserror 1.0.69", @@ -4871,11 +5439,16 @@ dependencies = [ [[package]] name = "valence-astroport-lper" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "valence-astroport-utils", "valence-library-base", @@ -4885,21 +5458,31 @@ dependencies = [ [[package]] name = "valence-astroport-utils" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "valence-library-utils", ] [[package]] name = "valence-astroport-withdrawer" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw20", "valence-astroport-utils", @@ -4910,50 +5493,87 @@ dependencies = [ [[package]] name = "valence-authorization" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ "cosmos-sdk-proto 0.20.0", - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", "cw2 2.0.0", +======= + "cw-storage-plus", + "cw-utils", + "cw2", +>>>>>>> template/main "neutron-sdk", "serde_json", "thiserror 1.0.69", "valence-authorization-utils", +<<<<<<< HEAD "valence-encoder-broker", "valence-encoder-utils", "valence-gmp-utils", +======= + "valence-polytone-utils", +>>>>>>> template/main "valence-processor-utils", ] [[package]] name = "valence-authorization-utils" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-utils 2.0.0", "serde_json", "valence-gmp-utils", "valence-library-utils", +======= + "cw-utils", + "serde_json", + "valence-library-utils", + "valence-polytone-utils", +>>>>>>> template/main ] [[package]] name = "valence-base-account" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw2 2.0.0", +======= + "cw-storage-plus", + "cw2", +>>>>>>> template/main "schemars", "serde", "thiserror 1.0.69", @@ -4961,12 +5581,13 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "valence-drop-liquid-staker" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw-storage-plus 2.0.0", "schemars", @@ -4981,10 +5602,10 @@ dependencies = [ [[package]] name = "valence-drop-liquid-unstaker" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw-storage-plus 2.0.0", "cw721 0.20.0", @@ -5001,10 +5622,10 @@ dependencies = [ [[package]] name = "valence-encoder-broker" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw-storage-plus 2.0.0", "cw2 2.0.0", @@ -5015,24 +5636,34 @@ dependencies = [ [[package]] name = "valence-encoder-utils" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ "alloy-sol-types", - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "valence-authorization-utils", ] [[package]] name = "valence-forwarder-library" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +name = "valence-forwarder-library" +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "getset", "schemars", "serde", @@ -5044,14 +5675,24 @@ dependencies = [ [[package]] name = "valence-generic-ibc-transfer-library" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "getset", "schemars", "serde", @@ -5063,38 +5704,58 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "valence-gmp-utils" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", ] [[package]] name = "valence-ibc-utils" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +name = "valence-ibc-utils" +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ "cosmos-sdk-proto 0.20.0", - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-denom", +<<<<<<< HEAD "cw-storage-plus 2.0.0", +======= + "cw-storage-plus", +>>>>>>> template/main "neutron-sdk", "serde", ] [[package]] name = "valence-library-base" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw2 2.0.0", +======= + "cw-storage-plus", + "cw2", +>>>>>>> template/main "schemars", "serde", "thiserror 1.0.69", @@ -5104,15 +5765,25 @@ dependencies = [ [[package]] name = "valence-library-utils" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-denom", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "serde", "serde_json", "thiserror 1.0.69", @@ -5121,40 +5792,47 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "valence-liquid-staking-utils" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", ] [[package]] name = "valence-macros" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +name = "valence-macros" +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] +<<<<<<< HEAD name = "valence-middleware-broker" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw-storage-plus 2.0.0", "cw2 2.0.0", "neutron-sdk", "prost 0.13.5", "prost-types 0.13.5", - "semver 1.0.25", + "semver 1.0.26", "serde-json-wasm 1.0.1", "serde_json", "thiserror 1.0.69", @@ -5164,26 +5842,36 @@ dependencies = [ [[package]] name = "valence-middleware-utils" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "neutron-sdk", "prost 0.13.5", - "semver 1.0.25", + "semver 1.0.26", "thiserror 1.0.69", ] [[package]] name = "valence-neutron-ibc-transfer-library" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +name = "valence-neutron-ibc-transfer-library" +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "getset", "neutron-sdk", "schemars", @@ -5197,12 +5885,13 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "valence-neutron-ic-querier" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw-storage-plus 2.0.0", "cw-utils 2.0.0", @@ -5219,13 +5908,23 @@ dependencies = [ [[package]] name = "valence-osmosis-cl-lper" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +name = "valence-osmosis-cl-lper" +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "osmosis-std", "osmosis-std-derive", "schemars", @@ -5240,14 +5939,24 @@ dependencies = [ [[package]] name = "valence-osmosis-cl-withdrawer" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "osmosis-std", "osmosis-std-derive", "schemars", @@ -5262,11 +5971,16 @@ dependencies = [ [[package]] name = "valence-osmosis-gamm-lper" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "osmosis-std", "valence-account-utils", @@ -5278,11 +5992,16 @@ dependencies = [ [[package]] name = "valence-osmosis-gamm-withdrawer" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "osmosis-std", "valence-account-utils", @@ -5294,23 +6013,29 @@ dependencies = [ [[package]] name = "valence-osmosis-utils" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "osmosis-std", "valence-account-utils", "valence-library-utils", ] [[package]] +<<<<<<< HEAD name = "valence-processor" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-storage-plus 2.0.0", "cw-utils 2.0.0", "cw2 2.0.0", @@ -5318,28 +6043,71 @@ dependencies = [ "thiserror 1.0.69", "valence-authorization-utils", "valence-gmp-utils", +======= +name = "valence-polytone-utils" +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +dependencies = [ + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", +] + +[[package]] +name = "valence-processor" +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +dependencies = [ + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", + "cw-storage-plus", + "cw-utils", + "cw2", + "serde_json", + "thiserror 1.0.69", + "valence-authorization-utils", + "valence-polytone-utils", +>>>>>>> template/main "valence-processor-utils", ] [[package]] name = "valence-processor-utils" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-storage-plus 2.0.0", "cw-utils 2.0.0", "serde", "serde_json", "valence-authorization-utils", "valence-gmp-utils", +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +dependencies = [ + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", + "cw-storage-plus", + "cw-utils", + "serde", + "serde_json", + "valence-authorization-utils", + "valence-polytone-utils", +>>>>>>> template/main ] [[package]] name = "valence-program-manager" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ "aho-corasick", "anyhow", @@ -5347,13 +6115,17 @@ dependencies = [ "bech32 0.11.0", "config 0.14.1", "cosmos-grpc-client", - "cosmwasm-crypto 2.2.1", - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-crypto 2.2.2", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "dashmap", "dhat", - "env_logger 0.11.6", +<<<<<<< HEAD + "env_logger 0.11.8", +======= + "env_logger 0.11.7", +>>>>>>> template/main "futures", "glob", "hex", @@ -5375,8 +6147,11 @@ dependencies = [ "valence-astroport-withdrawer", "valence-authorization", "valence-authorization-utils", +<<<<<<< HEAD "valence-drop-liquid-staker", "valence-drop-liquid-unstaker", +======= +>>>>>>> template/main "valence-forwarder-library", "valence-generic-ibc-transfer-library", "valence-library-base", @@ -5397,14 +6172,24 @@ dependencies = [ [[package]] name = "valence-program-registry" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw2 2.0.0", +======= + "cw-storage-plus", + "cw2", +>>>>>>> template/main "schemars", "serde", "thiserror 1.0.69", @@ -5413,25 +6198,40 @@ dependencies = [ [[package]] name = "valence-program-registry-utils" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "serde", "serde_json", ] [[package]] name = "valence-reverse-splitter-library" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "getset", "schemars", "serde", @@ -5443,14 +6243,24 @@ dependencies = [ [[package]] name = "valence-splitter-library" +<<<<<<< HEAD version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" +======= +version = "0.1.0" +source = "git+https://github.com/timewave-computer/valence-protocol?tag=v0.1.2#16e604bcdeb54d9b458809487166b8e9c3371299" +>>>>>>> template/main dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", +<<<<<<< HEAD "cw-storage-plus 2.0.0", "cw-utils 2.0.0", +======= + "cw-storage-plus", + "cw-utils", +>>>>>>> template/main "getset", "itertools 0.13.0", "schemars", @@ -5462,12 +6272,13 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "valence-storage-account" version = "0.2.0" -source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#ea55e8c8a7cf9132d81ff8b74aa2d0b1473cd279" +source = "git+https://github.com/timewave-computer/valence-protocol?branch=art3mix%2Fmanager-env-admin#cb45980bdb74ee8a400c1b1085951e7978e1774e" dependencies = [ - "cosmwasm-schema 2.2.1", - "cosmwasm-std 2.2.1", + "cosmwasm-schema 2.2.2", + "cosmwasm-std 2.2.2", "cw-ownable", "cw-storage-plus 2.0.0", "cw2 2.0.0", @@ -5479,6 +6290,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "valuable" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5491,6 +6304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] +<<<<<<< HEAD name = "wait-timeout" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5500,6 +6314,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "want" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5515,15 +6331,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +<<<<<<< HEAD name = "wasi" -version = "0.13.3+wasi-0.2.2" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" dependencies = [ "wit-bindgen-rt", ] [[package]] +======= +>>>>>>> template/main name = "wasm-bindgen" version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5545,7 +6364,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "wasm-bindgen-shared", ] @@ -5567,7 +6386,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5614,20 +6433,75 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" +<<<<<<< HEAD +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +======= version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ "windows-targets", +>>>>>>> template/main ] [[package]] name = "windows-link" -version = "0.1.0" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +<<<<<<< HEAD +name = "windows-result" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] [[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", +] + +[[package]] +======= +>>>>>>> template/main name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5711,20 +6585,27 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.3" +<<<<<<< HEAD +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +======= +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" +>>>>>>> template/main dependencies = [ "memchr", ] [[package]] +<<<<<<< HEAD name = "wit-bindgen-rt" -version = "0.33.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", ] [[package]] @@ -5749,6 +6630,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> template/main name = "yaml-rust2" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5756,21 +6639,28 @@ checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ "arraydeque", "encoding_rs", - "hashlink", + "hashlink 0.8.4", ] [[package]] name = "yaml-rust2" -version = "0.9.0" +<<<<<<< HEAD +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "818913695e83ece1f8d2a1c52d54484b7b46d0f9c06beeb2649b9da50d9b512d" +======= +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" +checksum = "232bdb534d65520716bef0bbb205ff8f2db72d807b19c0bc3020853b92a0cd4b" +>>>>>>> template/main dependencies = [ "arraydeque", "encoding_rs", - "hashlink", + "hashlink 0.10.0", ] [[package]] +<<<<<<< HEAD name = "yoke" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5790,18 +6680,36 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "synstructure", ] [[package]] +======= +>>>>>>> template/main name = "zerocopy" version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +<<<<<<< HEAD +version = "0.8.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" +dependencies = [ + "zerocopy-derive 0.8.24", +======= +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" +dependencies = [ + "zerocopy-derive 0.8.23", +>>>>>>> template/main ] [[package]] @@ -5812,10 +6720,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", +] + +[[package]] +name = "zerocopy-derive" +<<<<<<< HEAD +version = "0.8.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +======= +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" +>>>>>>> template/main +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", ] [[package]] +<<<<<<< HEAD name = "zerofrom" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5832,11 +6758,13 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "synstructure", ] [[package]] +======= +>>>>>>> template/main name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5853,8 +6781,9 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] +<<<<<<< HEAD [[package]] name = "zerovec" @@ -5875,5 +6804,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] +======= +>>>>>>> template/main diff --git a/Cargo.toml b/Cargo.toml index d953631..30645fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ incremental = false overflow-checks = true [workspace.dependencies] -valence-program-manager = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-program-manager", branch = "art3mix/manager-env-admin" } +valence-program-manager = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-program-manager", tag = "v0.1.2" } deployer-lib = { path = "lib" } serde_json = "1.0.125" clap = { version = "4.5.13", features = ["derive"] } @@ -35,35 +35,38 @@ tokio = "1.40.0" chrono = "0.4.40" dotenvy = "0.15.7" cmd_lib = "1.3.0" +env_logger = "0.11.5" +log = "0.4.22" + +# CW +cosmwasm-std = { version = "2.1.3" } +cw-utils = "2.0.0" +cw-denom = { package = "cw-denom", git = "https://github.com/DA0-DA0/dao-contracts", branch = "cw-std-2" } # Libraries -valence-authorization = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-authorization", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-base-account = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-base-account", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-storage-account = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-storage-account", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-processor = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-processor", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-splitter-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-splitter-library", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-astroport-lper = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-astroport-lper", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-forwarder-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-forwarder-library", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-astroport-withdrawer = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-astroport-withdrawer", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-generic-ibc-transfer-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-generic-ibc-transfer-library", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-neutron-ibc-transfer-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-neutron-ibc-transfer-library", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-reverse-splitter-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-reverse-splitter-library", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-osmosis-gamm-lper = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-gamm-lper", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-osmosis-gamm-withdrawer = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-gamm-withdrawer", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-osmosis-cl-lper = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-cl-lper", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-osmosis-cl-withdrawer = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-cl-withdrawer", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-encoder-broker = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-encoder-broker", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-neutron-ic-querier = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-neutron-ic-querier", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-drop-liquid-staker = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-drop-liquid-staker", features = ["library"], branch = "art3mix/manager-env-admin" } -valence-program-registry = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-program-registry", features = ["library"], branch = "art3mix/manager-env-admin" } +valence-authorization = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-authorization", features = ["library"], tag = "v0.1.2" } +valence-base-account = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-base-account", features = ["library"], tag = "v0.1.2" } +valence-processor = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-processor", features = ["library"], tag = "v0.1.2" } +valence-splitter-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-splitter-library", features = ["library"], tag = "v0.1.2" } +valence-astroport-lper = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-astroport-lper", features = ["library"], tag = "v0.1.2" } +valence-forwarder-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-forwarder-library", features = ["library"], tag = "v0.1.2" } +valence-astroport-withdrawer = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-astroport-withdrawer", features = ["library"], tag = "v0.1.2" } +valence-generic-ibc-transfer-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-generic-ibc-transfer-library", features = ["library"], tag = "v0.1.2" } +valence-neutron-ibc-transfer-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-neutron-ibc-transfer-library", features = ["library"], tag = "v0.1.2" } +valence-reverse-splitter-library = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-reverse-splitter-library", features = ["library"], tag = "v0.1.2" } +valence-osmosis-gamm-lper = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-gamm-lper", features = ["library"], tag = "v0.1.2" } +valence-osmosis-gamm-withdrawer = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-gamm-withdrawer", features = ["library"], tag = "v0.1.2" } +valence-osmosis-cl-lper = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-cl-lper", features = ["library"], tag = "v0.1.2" } +valence-osmosis-cl-withdrawer = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-cl-withdrawer", features = ["library"], tag = "v0.1.2" } +valence-program-registry = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-program-registry", features = ["library"], tag = "v0.1.2" } # utils -valence-account-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-account-utils", branch = "art3mix/manager-env-admin" } -valence-astroport-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-astroport-utils", branch = "art3mix/manager-env-admin" } -valence-osmosis-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-utils", branch = "art3mix/manager-env-admin" } -valence-authorization-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-authorization-utils", branch = "art3mix/manager-env-admin" } -valence-ibc-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-ibc-utils", branch = "art3mix/manager-env-admin" } -valence-macros = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-macros", branch = "art3mix/manager-env-admin" } -valence-processor-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-processor-utils", branch = "art3mix/manager-env-admin" } -valence-library-base = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-library-base", branch = "art3mix/manager-env-admin" } -valence-library-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-library-utils", branch = "art3mix/manager-env-admin" } +valence-account-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-account-utils", tag = "v0.1.2" } +valence-astroport-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-astroport-utils", tag = "v0.1.2" } +valence-osmosis-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-osmosis-utils", tag = "v0.1.2" } +valence-authorization-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-authorization-utils", tag = "v0.1.2" } +valence-ibc-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-ibc-utils", tag = "v0.1.2" } +valence-macros = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-macros", tag = "v0.1.2" } +valence-processor-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-processor-utils", tag = "v0.1.2" } +valence-library-base = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-library-base", tag = "v0.1.2" } +valence-library-utils = { git = "https://github.com/timewave-computer/valence-protocol", package = "valence-library-utils", tag = "v0.1.2" } diff --git a/README.md b/README.md index f9d1ccc..e521dbc 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Examples of Valence Programs being deployed This repository contains simple example programs and tooling to demonstrate how to build and deploy programs using Valence's suite of tools. @@ -7,6 +8,28 @@ This repository contains simple example programs and tooling to demonstrate how 1. **[Astroport Liquidity Deployer](programs/astroport_lper)**: Demonstrates a simple program to provide liquidity to and withdraw liquidity from a pool on Astroport. # How to build and deploy a Program +======= +# Program deployer + +This is a CLI tool to deploy programs using the manager on different environments + +It will allow you to use rust to build your program config for deployment, but also allow you to provide a program config in json format. + +# Structure + +- **Root** - The root folder, all scripts should be ran from here + - **lib** - Core functionality of the deployer + - **manager_configs** - Holds different environment manager configs + - **programs** - Holds all different programs you want to deploy + - **program_template** - Specific program folder + - **output** - Holds all past deployments of the program + - **program_params** - Holds program parameters toml files per environment + - **src** + - **main.rs** - Entry point to the script + - **program_builder.rs** - Holds your core program specific core using a rust builder pattern + +# How to +>>>>>>> template/main ## .env @@ -14,6 +37,8 @@ You must include `.env` file in the root of the project with the following varia ```env # The mnemonic that will be used by the manager to deploy the program on chains +# The manager is a tool that instantiate the program on all chains and then transfers ownership to the owner +# This should NOT be the owner MNEMONIC, but address that holds enough funds to instantiate the program on all chains. MANAGER_MNEMONIC="" ``` @@ -21,7 +46,7 @@ MANAGER_MNEMONIC="" A template is provided to help you get started, you can clone it and modify it to deploy your program. -Don't forget to rename the new program directory and the `Cargo.toml` file. +* Don't forget to rename the new program directory and the program name in `Cargo.toml` file. ## Program builder @@ -37,13 +62,17 @@ Any parameter that is included there will be available in the program builder fu ## Run the script +<<<<<<< HEAD You can deploy your program using the following command: +======= +You can run your program using the following command: +>>>>>>> template/main ```bash cargo run -p *PROGRAM_NAME* ``` -Use the name you gave your pgoram in `Cargo.toml` file. +Use the name you gave your program in `Cargo.toml` file. ## Output @@ -52,6 +81,7 @@ After running the script, you will find the output in the `output/` directory. Each deployed program will have its own directory with the date and time of the deployment, inside each directory you will find: - `instantiated-program-config.json` - The instantiated program config which includes all the addresses of the contracts of the deployed program +- `debug-program-config.json`- If deployment failed, this file will include the updated program config up to the failed point, this is helpful for debugging failed deployments. - `raw-program-config.json` - The generated raw program config before instantiation. By default each deployed program directory is ignored in git, you can remove the ignore rule in the `.gitignore` file if you want to keep the output in your cloned repository. diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 6affd35..b163274 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -15,3 +15,7 @@ glob = { workspace = true } chrono = { workspace = true } dotenvy = { workspace = true } cmd_lib = { workspace = true } +env_logger = { workspace = true } +log = { workspace = true } + +valence-library-utils = { workspace = true } diff --git a/lib/src/helpers.rs b/lib/src/helpers.rs index a5623b5..59afab6 100644 --- a/lib/src/helpers.rs +++ b/lib/src/helpers.rs @@ -1,4 +1,8 @@ use std::{error::Error, path::PathBuf}; +use valence_library_utils::LibraryAccountType; + +/// empty vec that implements GetId trait for links +pub const EMPTY_VEC: Vec<&LibraryAccountType> = vec![]; // Verify the program path exists and everything was called from the right place pub(crate) fn verify_path(path: PathBuf) -> Result<(), Box> { diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 156d3b2..5db27da 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -3,17 +3,22 @@ mod manager_config; mod program_config; mod program_params; -use std::{ error::Error, io::Write, path::PathBuf}; +use std::{error::Error, fmt::Display, io::Write, path::PathBuf}; use chrono::Utc; use clap::{command, Parser}; use dotenvy::dotenv; use helpers::verify_path; +<<<<<<< HEAD +======= +use log::info; +>>>>>>> template/main use manager_config::set_manager_config; use program_config::read_program_config_from_json; use program_params::get_program_params; use valence_program_manager::program_config::ProgramConfig; +<<<<<<< HEAD // Reexport params to programs pub use program_params::ProgramParams; @@ -23,6 +28,28 @@ pub use program_params::ProgramParams; // |X| - call the program builder with the parameters // deploy the program using the manager // save program json files (Raw and instantiated) +======= +// Re-export params to programs +pub use helpers::EMPTY_VEC; +pub use program_params::ProgramParams; + +#[derive(Debug, PartialEq)] +enum Status { + Process, + Success, + Fail, +} + +impl Display for Status { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Status::Process => write!(f, "process"), + Status::Success => write!(f, "success"), + Status::Fail => write!(f, "fail"), + } + } +} +>>>>>>> template/main #[derive(Parser, Debug)] #[command(version, about, long_about = None)] @@ -39,7 +66,17 @@ pub async fn main(program_path: &str, builder: F) -> Result<(), Box ProgramConfig, { +<<<<<<< HEAD + // Load .env file environment variables +======= + // Enable logs + env_logger::init(); + + println!("Starting program deployment..."); + // Load .env file environment variables + info!("Loading environment variables from .env file"); +>>>>>>> template/main dotenv().expect(".env file not found"); let args = Args::parse(); @@ -55,6 +92,7 @@ where .unwrap(), ); +<<<<<<< HEAD verify_path(program_path.clone())?; // Set manager config for the chosen environment @@ -65,12 +103,33 @@ where read_program_config_from_json(&program_config_path) } else { // Else build the program config from the builder +======= + info!("Verifying program path"); + verify_path(program_path.clone())?; + + let output_path = program_path + .join("output") + .join(format!("{}-{}", args.target_env, timestamp)); + + // Set manager config for the chosen environment + info!("Setting manager config for the chosen environment"); + set_manager_config(&args.target_env).await?; + + // If a path to program_config.json was passed, use it + let mut program_config = if let Some(program_config_path) = args.program_config_path { + info!("Reading program config from file"); + read_program_config_from_json(&program_config_path) + } else { + // Else build the program config from the builder + info!("Building program config from builder"); +>>>>>>> template/main let program_params = get_program_params(&program_path, &args.target_env)?; builder(program_params) }; // Write the raw program config to file +<<<<<<< HEAD write_to_output(program_config.clone(), &program_path, ×tamp, "raw")?; // Use program manager to deploy the program @@ -78,11 +137,37 @@ where // Write instantiated program to file write_to_output(program_config, &program_path, ×tamp, "instantiated")?; +======= + info!("Writing raw program config to file"); + write_to_output(&program_config, output_path.clone(), Status::Process, "raw")?; + + // Use program manager to deploy the program + println!("Instantiating program..."); + match valence_program_manager::init_program(&mut program_config).await { + Ok(_) => (), + Err(e) => { + write_to_output(&program_config, output_path.clone(), Status::Fail, "debug")?; + + return Err(Box::new(e)); + } + }; + + // Write instantiated program to file + write_to_output( + &program_config, + output_path, + Status::Success, + "instantiated", + )?; + + print_success_msg(&program_config).await; +>>>>>>> template/main Ok(()) } fn write_to_output( +<<<<<<< HEAD program_config: ProgramConfig, program_path: &PathBuf, time: &str, @@ -92,6 +177,19 @@ fn write_to_output( if !path.exists() { std::fs::create_dir_all(path.clone())?; +======= + program_config: &ProgramConfig, + mut path: PathBuf, + status: Status, + prefix: &str, +) -> Result<(), Box> { + if !path.exists() { + std::fs::create_dir_all(path.clone())?; + } else if status != Status::Process { + let new_path = PathBuf::from(format!("{}-{}", path.to_str().unwrap(), status)); + std::fs::rename(path, new_path.clone())?; + path = new_path; +>>>>>>> template/main } // Construct the full file path @@ -102,9 +200,31 @@ fn write_to_output( let mut file = std::fs::File::create(file_path.clone())?; // Serialize the data to a string +<<<<<<< HEAD let content = serde_json::to_string(&program_config)?; +======= + let content = serde_json::to_string(program_config)?; +>>>>>>> template/main file.write_all(content.as_bytes())?; Ok(()) } +<<<<<<< HEAD +======= + +async fn print_success_msg(program_config: &ProgramConfig) { + let gc = valence_program_manager::config::GLOBAL_CONFIG.lock().await; + let ui_link_main = format!("https://app.valence.zone/programs/{}", program_config.id); + let ui_link = format!("{}?queryConfig={{\"main\":{{\"registryAddress\":\"{}\",\"name\":\"neutron\",\"chainId\":\"neutron-1\",\"rpcUrl\":\"{}\"}},\"external\":[]}}", ui_link_main, gc.general.registry_addr, gc.chains.get("neutron").unwrap().rpc); + + let success_msg = format!( + "Program deployed successfully! +Program id: {} +View program on Valence UI: {}", + program_config.id, ui_link + ); + + println!("{success_msg}"); +} +>>>>>>> template/main diff --git a/lib/src/manager_config.rs b/lib/src/manager_config.rs index 11e836e..1faa17e 100644 --- a/lib/src/manager_config.rs +++ b/lib/src/manager_config.rs @@ -1,7 +1,8 @@ use config::Config as ConfigHelper; -use std::{error::Error, path::PathBuf}; +use std::{error::Error, path::Path}; -const MANAGER_CONFIGS_REPO_URL: &str = "https://github.com/timewave-computer/valence-program-manager-config.git"; +const MANAGER_CONFIGS_REPO_URL: &str = + "https://github.com/timewave-computer/valence-program-manager-config.git"; pub fn get_manager_config( path: &str, @@ -15,19 +16,16 @@ pub fn get_manager_config( if !config_path.exists() { clone_config_from_repo(path, &config_path)?; - return Err(format!("Manager config for {} environment does not exist", path).into()); } - // Try to parse to manager config from a single config.json file (for local) - match ConfigHelper::builder() + if let Ok(cfg) = ConfigHelper::builder() .add_source(config::File::with_name(&format!( "{}/config.json", config_path_str ))) .build() { - Ok(cfg) => return cfg.try_deserialize().map_err(|e| e.into()), - Err(_) => (), + return cfg.try_deserialize().map_err(|e| e.into()); }; ConfigHelper::builder() @@ -64,7 +62,7 @@ pub fn get_manager_config( // .map_err(|_| "Failed to parse config".into()) } -pub(crate) async fn set_manager_config(path: &str) -> Result<(), Box>{ +pub(crate) async fn set_manager_config(path: &str) -> Result<(), Box> { // Read the config let config = get_manager_config(path)?; @@ -74,7 +72,7 @@ pub(crate) async fn set_manager_config(path: &str) -> Result<(), Box> Ok(()) } -fn clone_config_from_repo(env_path: &str, config_path: &PathBuf) -> Result<(), Box> { +fn clone_config_from_repo(env_path: &str, config_path: &Path) -> Result<(), Box> { // DO NOT CHANGE THIS let tmp_dir = std::env::current_dir()?.join("tmp"); @@ -98,4 +96,4 @@ fn clone_config_from_repo(env_path: &str, config_path: &PathBuf) -> Result<(), B )?; Ok(()) -} \ No newline at end of file +} diff --git a/lib/src/program_config.rs b/lib/src/program_config.rs index d26790c..da59ea1 100644 --- a/lib/src/program_config.rs +++ b/lib/src/program_config.rs @@ -3,4 +3,4 @@ use valence_program_manager::program_config::ProgramConfig; pub(crate) fn read_program_config_from_json(path: &str) -> ProgramConfig { let content = std::fs::read_to_string(path).expect("Unable to open program config file"); serde_json::from_str::(&content).expect("Failed to parse into ProgramConfig") -} \ No newline at end of file +} diff --git a/lib/src/program_params.rs b/lib/src/program_params.rs index f1f3f07..e137bfd 100644 --- a/lib/src/program_params.rs +++ b/lib/src/program_params.rs @@ -1,5 +1,5 @@ use config::Config as ConfigHelper; -use std::{collections::HashMap, error::Error, path::PathBuf}; +use std::{error::Error, path::PathBuf}; pub fn get_program_params( program_path: &PathBuf, @@ -11,31 +11,44 @@ pub fn get_program_params( let params_path_str = params_path .to_str() .expect("Params path should be a string"); + let params_env_path = params_path.join(format!("{}.toml", env)); - let params = match ConfigHelper::builder() + if !params_env_path.exists() { + return Err(format!("Program params file not found: {}.toml", env).into()); + } + + let params = ConfigHelper::builder() .add_source(config::File::with_name(&format!( "{}/{}.toml", params_path_str, env ))) - .build() - { - Ok(cfg) => cfg - .try_deserialize::>() - .map_err(|e| format!("Failed to parse program params : {}", e)), - Err(_) => Err("Failed to parse program params".to_string()), - }?; - - Ok(ProgramParams(params)) + .build()?; + + Ok(ProgramParams::new(params)) } #[derive(Debug)] -pub struct ProgramParams(HashMap); +pub struct ProgramParams { + cfg: ConfigHelper, +} impl ProgramParams { + pub fn new(cfg: ConfigHelper) -> Self { + ProgramParams { cfg } + } + pub fn get(&self, key: &str) -> String { - self.0 - .get(key) - .expect(format!("Key {} not found", key).as_str()) - .to_string() + self.cfg + .get::(key) + .unwrap_or_else(|_| panic!("Key {} not found", key)) + } + + pub fn get_array(&self, key: &str) -> Vec { + self.cfg + .get_array(key) + .unwrap_or_else(|_| panic!("Key {} not found", key)) + .iter() + .map(|v| v.to_string()) + .collect() } } diff --git a/manager_configs/mainnet/bridges/neutron_gaia.toml b/manager_configs/mainnet/bridges/neutron_gaia.toml deleted file mode 100644 index bad6ad4..0000000 --- a/manager_configs/mainnet/bridges/neutron_gaia.toml +++ /dev/null @@ -1,12 +0,0 @@ -# [bridges.neutron.gaia.polytone.neutron] -# voice_addr = "neutron1vq2z7zgj7v4yj7z2zgj7v4yj7z2zgj7z2zgj7v" -# note_addr = "neutron1vq2z7zgj7v4yj7z2zgj7v4yj7z2zgj7z2zgj7v" -# other_note_port = "wasm.cosmos1vq2z7zgj7v4yj7z2zgj7v4yj7z2zgj7z2zgj7v" -# connection_id = "connection-0" -# channel_id = "channel-0" -# [bridges.neutron.gaia.polytone.gaia] -# voice_addr = "cosmos1vq2z7zgj7v4yj7z2zgj7v4yj7z2zgj7z2zgj7v" -# note_addr = "cosmos1vq2z7zgj7v4yj7z2zgj7v4yj7z2zgj7z2zgj7v" -# other_note_port = "wasm.neutron1vq2z7zgj7v4yj7z2zgj7v4yj7z2zgj7z2zgj7v" -# connection_id = "connection-0" -# channel_id = "channel-0" diff --git a/manager_configs/mainnet/bridges/neutron_juno.toml b/manager_configs/mainnet/bridges/neutron_juno.toml new file mode 100644 index 0000000..d077f3c --- /dev/null +++ b/manager_configs/mainnet/bridges/neutron_juno.toml @@ -0,0 +1,12 @@ +[bridges.neutron.juno.polytone.neutron] +voice_addr = "neutron15c0d3k8nf5t82zzkl8l7he3smx033hsr9dvzjeeuj7e8n46rqy5se0pn3e" +note_addr = "neutron174ne8p7zh539sht8sfjsa9r6uwe3pzlvqedr0yquml9crfzsfnlshvlse8" +other_note_port = "wasm.juno1yt5kcplze0sark8f55fklk70uay3863t5q3j3a8kgvs3rlmjya9qys0d2y" +connection_id = "connection-95" +channel_id = "channel-4721" +[bridges.neutron.juno.polytone.juno] +voice_addr = "juno1c9hx3q7sd2d0xgknc52ft6qsqxemkuxh3nt8d4rmdtdua25x5h0sdd2zm5" +note_addr = "juno1yt5kcplze0sark8f55fklk70uay3863t5q3j3a8kgvs3rlmjya9qys0d2y" +other_note_port = "wasm.neutron174ne8p7zh539sht8sfjsa9r6uwe3pzlvqedr0yquml9crfzsfnlshvlse8" +connection_id = "connection-530" +channel_id = "channel-620" diff --git a/manager_configs/mainnet/bridges/neutron_terra.toml b/manager_configs/mainnet/bridges/neutron_terra.toml new file mode 100644 index 0000000..a408174 --- /dev/null +++ b/manager_configs/mainnet/bridges/neutron_terra.toml @@ -0,0 +1,12 @@ +[bridges.neutron.terra.polytone.neutron] +voice_addr = "neutron1dsxy6h7cfnrguqe09ym599wk09a9zpyzw6r6yttrkquqffp06l6sfptpfp" +note_addr = "neutron143aydj5zcgh7fudhsjq7878z7v8dmj0ckn9un2hsrxgnslvgymfsln0tkw" +other_note_port = "wasm.terra1eumwktcszm8p5p3apuxq4mrk008rx8sakntq68a5x6l6my33jl2qfvsfge" +connection_id = "connection-9" +channel_id = "channel-53" +[bridges.neutron.terra.polytone.terra] +voice_addr = "terra1669p39l9gg4ajjwyta5psf5g4aen05d392mzp9efpa06vnaa7j6s3czzd3" +note_addr = "terra1eumwktcszm8p5p3apuxq4mrk008rx8sakntq68a5x6l6my33jl2qfvsfge" +other_note_port = "wasm.neutron143aydj5zcgh7fudhsjq7878z7v8dmj0ckn9un2hsrxgnslvgymfsln0tkw" +connection_id = "connection-192" +channel_id = "channel-388" diff --git a/manager_configs/mainnet/chains.toml b/manager_configs/mainnet/chains.toml index 407f9d8..b58ce63 100644 --- a/manager_configs/mainnet/chains.toml +++ b/manager_configs/mainnet/chains.toml @@ -1,6 +1,7 @@ [chains] [chains.neutron] +chain_id = "neutron-1" name = "neutron" rpc = "https://rpc-voidara.neutron-1.neutron.org" grpc = "https://grpc-kralum.neutron-1.neutron.org:80" @@ -8,3 +9,23 @@ prefix = "neutron" gas_price = "0.0053" gas_denom = "untrn" coin_type = "118" + +[chains.juno] +chain_id = "juno-1" +name = "juno" +rpc = "https://juno-rpc.polkachu.com" +grpc = "https://juno-grpc.polkachu.com:12690" +prefix = "juno" +gas_price = "0.075" +gas_denom = "ujuno" +coin_type = "118" + +[chains.terra] +chain_id = "phoenix-1" +name = "terra" +rpc = "https://terra-rpc.polkachu.com" +grpc = "https://terra-grpc.polkachu.com:11790" +prefix = "terra" +gas_price = "0.015" +gas_denom = "uluna" +coin_type = "330" diff --git a/manager_configs/mainnet/contracts-data/neutron.yaml b/manager_configs/mainnet/contracts-data/neutron.yaml new file mode 100644 index 0000000..51125bd --- /dev/null +++ b/manager_configs/mainnet/contracts-data/neutron.yaml @@ -0,0 +1,52 @@ +valence_astroport_lper: + code_id: '3297' + hash: 6881cf68070e98053882b1e5ac3f6d39be77eb9acf26a526d3cee13399c4386d + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_astroport_withdrawer: + code_id: '3298' + hash: c9678657c18bc58543faa0bb82942a6f3b7dd902e6a6439a5e0ceb696c3e69c3 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_authorization: + code_id: '3299' + hash: aae7c5b4058d6027146860097a29e07b8c36a833dbf56a7425748b16efa22aab + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_base_account: + code_id: '3300' + hash: cfa668dee6d785928d9f9097c1091a0aabb260f74a3fd723893ab0d3862513c6 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_forwarder_library: + code_id: '3301' + hash: 74f86ed59b7d274a407404b87af985a24c5909162e3d9e0969ac73367bae671f + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_processor: + code_id: '3302' + hash: 634de9a2c0a05baec9894991ca0d1333a3a7e67086d402421edfb6632c869791 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_program_registry: + code_id: '3303' + hash: 82d8593dede5c67db801ad19f213ab049a14e4efc29dfa09bcad729453e80741 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_reverse_splitter_library: + code_id: '3304' + hash: 6b7949414f114ca64f441bce70223ab9890b665fa18390c88f600fb224313881 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_splitter_library: + code_id: '3305' + hash: 0e414e92b46131d69133a8134927223240ffaffa4499517c40697c56a57e0de9 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_generic_ibc_transfer_library: + code_id: '3306' + hash: 4ec97203fadaac7eb338bbbad91b004d8a1860d2306ec572dd6147cb2dd7cd77 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_neutron_ibc_transfer_library: + code_id: '3307' + hash: e3324cb9c01727866a53afe1ad690dd7e32905af70251a0c3f6726d8bd29eb15 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_drop_liquid_staker: + code_id: '3310' + hash: 0effb769091ad197f2ec3dd6292f962b5d52f17af8e371087f673543aa5713e0 + source: e24c96566714c6d047f9e8f1e15527dca88314c0 +valence_drop_liquid_unstaker: + code_id: '3311' + hash: 2b2c3365b51f7d9a0b4d5c2e58733196ca18228386dc292eae70d88e5968048a + source: e24c96566714c6d047f9e8f1e15527dca88314c0 diff --git a/manager_configs/mainnet/contracts.toml b/manager_configs/mainnet/contracts.toml index 89bba02..c481093 100644 --- a/manager_configs/mainnet/contracts.toml +++ b/manager_configs/mainnet/contracts.toml @@ -2,14 +2,37 @@ [contracts.code_ids.neutron] # Registry is not used and only needed on neutron -valence_program_registry = 3234 -valence_authorization = 3225 -valence_processor = 3226 -valence_base_account = 3227 -valence_forwarder_library = 3228 -valence_splitter_library = 3229 -valence_reverse_splitter_library = 3230 -valence_drop_liquid_staker = 3231 -valence_astroport_lper = 3232 -valence_astroport_withdrawer = 3233 -valence_drop_liquid_unstaker = 3255 +polytone_proxy = 231 +valence_astroport_lper = 3297 +valence_astroport_withdrawer = 3298 +valence_authorization = 3299 +valence_base_account = 3300 +valence_drop_liquid_staker = 3310 +valence_drop_liquid_unstaker = 3311 +valence_forwarder_library = 3301 +valence_generic_ibc_transfer_library = 3306 +valence_neutron_ibc_transfer_library = 3307 +valence_processor = 3302 +valence_program_registry = 3303 +valence_reverse_splitter_library = 3304 +valence_splitter_library = 3305 + +[contracts.code_ids.juno] +polytone_proxy = 3321 +valence_processor = 4780 +valence_base_account = 4781 +valence_forwarder_library = 4782 +valence_splitter_library = 4783 +valence_reverse_splitter_library = 4784 +valence_generic_ibc_transfer_library = 4785 + +[contracts.code_ids.terra] +polytone_proxy = 2372 +valence_processor = 3552 +valence_base_account = 3554 +valence_forwarder_library = 3555 +valence_splitter_library = 3556 +valence_reverse_splitter_library = 3557 +valence_generic_ibc_transfer_library = 3558 +valence_astroport_lper = 3560 +valence_astroport_withdrawer = 3561 diff --git a/manager_configs/testnet/bridges/general.toml b/manager_configs/testnet/bridges/general.toml new file mode 100644 index 0000000..f3076a6 --- /dev/null +++ b/manager_configs/testnet/bridges/general.toml @@ -0,0 +1 @@ +[bridges] \ No newline at end of file diff --git a/manager_configs/testnet/bridges/neutron_juno.toml b/manager_configs/testnet/bridges/neutron_juno.toml new file mode 100644 index 0000000..242e04e --- /dev/null +++ b/manager_configs/testnet/bridges/neutron_juno.toml @@ -0,0 +1,12 @@ +# [bridges.neutron.juno.polytone.neutron] +# voice_addr = "neutron15c0d3k8nf5t82zzkl8l7he3smx033hsr9dvzjeeuj7e8n46rqy5se0pn3e" +# note_addr = "neutron174ne8p7zh539sht8sfjsa9r6uwe3pzlvqedr0yquml9crfzsfnlshvlse8" +# other_note_port = "wasm.juno1yt5kcplze0sark8f55fklk70uay3863t5q3j3a8kgvs3rlmjya9qys0d2y" +# connection_id = "connection-95" +# channel_id = "channel-4721" +# [bridges.neutron.juno.polytone.juno] +# voice_addr = "juno1c9hx3q7sd2d0xgknc52ft6qsqxemkuxh3nt8d4rmdtdua25x5h0sdd2zm5" +# note_addr = "juno1yt5kcplze0sark8f55fklk70uay3863t5q3j3a8kgvs3rlmjya9qys0d2y" +# other_note_port = "wasm.neutron174ne8p7zh539sht8sfjsa9r6uwe3pzlvqedr0yquml9crfzsfnlshvlse8" +# connection_id = "connection-530" +# channel_id = "channel-620" \ No newline at end of file diff --git a/manager_configs/testnet/chains.toml b/manager_configs/testnet/chains.toml new file mode 100644 index 0000000..e43f865 --- /dev/null +++ b/manager_configs/testnet/chains.toml @@ -0,0 +1,11 @@ +[chains] + +[chains.neutron] +chain_id = "pion-1" +name = "neutron" +rpc = "https://rpc-falcron.pion-1.ntrn.tech" +grpc = "https://grpc-falcron.pion-1.ntrn.tech:80" +prefix = "neutron" +gas_price = "0.0053" +gas_denom = "untrn" +coin_type = "118" \ No newline at end of file diff --git a/manager_configs/testnet/contracts-data/neutron.yaml b/manager_configs/testnet/contracts-data/neutron.yaml new file mode 100644 index 0000000..7b4b63e --- /dev/null +++ b/manager_configs/testnet/contracts-data/neutron.yaml @@ -0,0 +1,52 @@ +valence_astroport_lper: + code_id: '11378' + hash: 6881cf68070e98053882b1e5ac3f6d39be77eb9acf26a526d3cee13399c4386d + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_astroport_withdrawer: + code_id: '11379' + hash: c9678657c18bc58543faa0bb82942a6f3b7dd902e6a6439a5e0ceb696c3e69c3 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_authorization: + code_id: '11380' + hash: aae7c5b4058d6027146860097a29e07b8c36a833dbf56a7425748b16efa22aab + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_base_account: + code_id: '11381' + hash: cfa668dee6d785928d9f9097c1091a0aabb260f74a3fd723893ab0d3862513c6 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_drop_liquid_staker: + code_id: '11382' + hash: 0effb769091ad197f2ec3dd6292f962b5d52f17af8e371087f673543aa5713e0 + source: e24c96566714c6d047f9e8f1e15527dca88314c0 +valence_drop_liquid_unstaker: + code_id: '11383' + hash: 2b2c3365b51f7d9a0b4d5c2e58733196ca18228386dc292eae70d88e5968048a + source: e24c96566714c6d047f9e8f1e15527dca88314c0 +valence_forwarder_library: + code_id: '11384' + hash: 74f86ed59b7d274a407404b87af985a24c5909162e3d9e0969ac73367bae671f + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_generic_ibc_transfer_library: + code_id: '11385' + hash: 4ec97203fadaac7eb338bbbad91b004d8a1860d2306ec572dd6147cb2dd7cd77 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_neutron_ibc_transfer_library: + code_id: '11386' + hash: e3324cb9c01727866a53afe1ad690dd7e32905af70251a0c3f6726d8bd29eb15 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_processor: + code_id: '11387' + hash: 634de9a2c0a05baec9894991ca0d1333a3a7e67086d402421edfb6632c869791 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_program_registry: + code_id: '11388' + hash: 82d8593dede5c67db801ad19f213ab049a14e4efc29dfa09bcad729453e80741 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_reverse_splitter_library: + code_id: '11389' + hash: 6b7949414f114ca64f441bce70223ab9890b665fa18390c88f600fb224313881 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 +valence_splitter_library: + code_id: '11390' + hash: 0e414e92b46131d69133a8134927223240ffaffa4499517c40697c56a57e0de9 + source: 85ecf4974c62bcb6443ac16b9dd7d178eed07841 \ No newline at end of file diff --git a/manager_configs/testnet/contracts.toml b/manager_configs/testnet/contracts.toml new file mode 100644 index 0000000..66c9cb0 --- /dev/null +++ b/manager_configs/testnet/contracts.toml @@ -0,0 +1,17 @@ +[contracts] + +[contracts.code_ids.neutron] +# Registry is not used and only needed on neutron +valence_program_registry = 11388 +valence_astroport_lper = 11378 +valence_astroport_withdrawer = 11379 +valence_authorization = 11380 +valence_base_account = 11381 +valence_drop_liquid_staker = 11382 +valence_drop_liquid_unstaker = 11383 +valence_forwarder_library = 11384 +valence_generic_ibc_transfer_library = 11385 +valence_neutron_ibc_transfer_library = 11386 +valence_processor = 11387 +valence_reverse_splitter_library = 11389 +valence_splitter_library = 11390 \ No newline at end of file diff --git a/manager_configs/testnet/general.toml b/manager_configs/testnet/general.toml new file mode 100644 index 0000000..1ac07b1 --- /dev/null +++ b/manager_configs/testnet/general.toml @@ -0,0 +1,2 @@ +[general] +registry_addr = "neutron1kty0yl9cvh9ml5z9t280kyxxnwszq6krhyk3evp83athzg44aafs2lp258" \ No newline at end of file diff --git a/programs/crosschain_astroport_lper/Cargo.toml b/programs/crosschain_astroport_lper/Cargo.toml new file mode 100644 index 0000000..b3fbed7 --- /dev/null +++ b/programs/crosschain_astroport_lper/Cargo.toml @@ -0,0 +1,46 @@ +[package] +name = "crosschain_astroport_lper" +authors = ["Timewave Labs"] +edition = "2021" +license = "Apache-2.0" +version = "0.1.0" +repository = "https://github.com/timewave-computer/program_deployer" + +[dependencies] +deployer-lib = { workspace = true } +valence-program-manager = { workspace = true } +serde_json = { workspace = true } +clap = { workspace = true } +tokio = { workspace = true } + +# Libraries +valence-authorization = { workspace = true } +valence-base-account = { workspace = true } +valence-storage-account = { workspace = true } +valence-processor = { workspace = true } +valence-splitter-library = { workspace = true } +valence-astroport-lper = { workspace = true } +valence-forwarder-library = { workspace = true } +valence-astroport-withdrawer = { workspace = true } +valence-generic-ibc-transfer-library = { workspace = true } +valence-neutron-ibc-transfer-library = { workspace = true } +valence-reverse-splitter-library = { workspace = true } +valence-osmosis-gamm-lper = { workspace = true } +valence-osmosis-gamm-withdrawer = { workspace = true } +valence-osmosis-cl-lper = { workspace = true } +valence-osmosis-cl-withdrawer = { workspace = true } +valence-encoder-broker = { workspace = true } +valence-neutron-ic-querier = { workspace = true } +valence-drop-liquid-staker = { workspace = true } +valence-program-registry = { workspace = true } + +# utils +valence-account-utils = { workspace = true } +valence-astroport-utils = { workspace = true } +valence-osmosis-utils = { workspace = true } +valence-authorization-utils = { workspace = true } +valence-ibc-utils = { workspace = true } +valence-macros = { workspace = true } +valence-processor-utils = { workspace = true } +valence-library-base = { workspace = true } +valence-library-utils = { workspace = true } diff --git a/programs/crosschain_astroport_lper/README.md b/programs/crosschain_astroport_lper/README.md new file mode 100644 index 0000000..f2fe502 --- /dev/null +++ b/programs/crosschain_astroport_lper/README.md @@ -0,0 +1,9 @@ +# Program builder + +This is a single program builder, structure: + +- `output/` - Output directory for deployed program +- `src/` - Program source code +- `src/main.rs` - entry point to the script +- `src/program.rs` - Program builder code, this is rust helper that allows you to build the program config, this is the only file that should be modified to deploy a program. +- `program_params/` - Program parameters that will injected into the program builder function, each environment will have its own program parameters toml file, name with the environment name, Example: `program_params/local.toml` or `program_params/mainnet.toml` diff --git a/programs/crosschain_astroport_lper/output/README.md b/programs/crosschain_astroport_lper/output/README.md new file mode 100644 index 0000000..38138ff --- /dev/null +++ b/programs/crosschain_astroport_lper/output/README.md @@ -0,0 +1,6 @@ +# Output + +This directory will hold all the output files of programs, running the script will generate a directory per run with the date and time of the run, inside each directory you will find: + +- instantiated-program-config.json - The instantiated program config which includes all the addresses of the contracts +- raw-program-config.json - The generated raw program config before instantiation diff --git a/programs/crosschain_astroport_lper/program_params/mainnet.toml b/programs/crosschain_astroport_lper/program_params/mainnet.toml new file mode 100644 index 0000000..b40bb8d --- /dev/null +++ b/programs/crosschain_astroport_lper/program_params/mainnet.toml @@ -0,0 +1,8 @@ +owner="neutron1tqmf4x0xewrjgdalp59aw6lvzz3k5tx7pk59y6" +permissioned_withdrawer="neutron1tqmf4x0xewrjgdalp59aw6lvzz3k5tx7pk59y6" +atom_on_terra="ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2" +atom_on_neutron="ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9" +ntrn_on_neutron="untrn" +ntrn_atom_pool_addr="neutron145z3nj7yqft2vpugr5a5p7jsnagvms90tvtej45g4s0xkqalhy7sj20vgz" +terra_cosmoshub_ibc_channel_id="channel-0" +cosmoshub_neutron_ibc_channel_id="channel-569" \ No newline at end of file diff --git a/programs/crosschain_astroport_lper/src/main.rs b/programs/crosschain_astroport_lper/src/main.rs new file mode 100644 index 0000000..c5044d1 --- /dev/null +++ b/programs/crosschain_astroport_lper/src/main.rs @@ -0,0 +1,10 @@ +mod program_builder; + +use std::error::Error; + +use program_builder::program_builder; + +#[tokio::main] +async fn main() -> Result<(), Box> { + deployer_lib::main(file!(), program_builder).await +} diff --git a/programs/crosschain_astroport_lper/src/program_builder.rs b/programs/crosschain_astroport_lper/src/program_builder.rs new file mode 100644 index 0000000..303cc75 --- /dev/null +++ b/programs/crosschain_astroport_lper/src/program_builder.rs @@ -0,0 +1,232 @@ +use std::collections::BTreeMap; + +use valence_authorization_utils::{ + authorization::{ AuthorizationModeInfo, PermissionTypeInfo }, + authorization_message::{ Message, MessageDetails, MessageType, ParamRestriction }, + builders::{ AtomicFunctionBuilder, AtomicSubroutineBuilder, AuthorizationBuilder }, domain::Domain, +}; +use valence_generic_ibc_transfer_library::msg::{IbcTransferAmount, RemoteChainInfo}; +use valence_ibc_utils::types::PacketForwardMiddlewareConfig; +use valence_program_manager::{ + account::{ AccountInfo, AccountType }, + library::{ LibraryConfig, LibraryInfo }, + program_config::ProgramConfig, + program_config_builder::ProgramConfigBuilder, +}; +use valence_astroport_utils::PoolType; +use valence_astroport_lper::msg::LiquidityProviderConfig; +use valence_astroport_withdrawer::msg::LiquidityWithdrawerConfig; +use valence_library_utils::liquidity_utils::AssetData; + +/// Write your program using the program builder +pub fn program_builder(params: deployer_lib::ProgramParams) -> ProgramConfig { + + // Permissioned addresses + let owner = params.get("owner"); + let permissioned_withdrawer = params.get("permissioned_withdrawer"); + + // Denoms + let atom_on_terra = params.get("atom_on_terra"); + let atom_on_neutron = params.get("atom_on_neutron"); + let ntrn_on_neutron = params.get("ntrn_on_neutron"); + + // Astroport pool + let ntrn_atom_pool_addr = params.get("ntrn_atom_pool_addr"); + + // IBC transfer inputs + let terra_cosmoshub_ibc_channel_id = params.get("terra_cosmoshub_ibc_channel_id"); + let cosmoshub_neutron_ibc_channel_id = params.get("cosmoshub_neutron_ibc_channel_id"); + + // Initialize builder + let mut builder = ProgramConfigBuilder::new(owner); + + // Domains + let neutron_domain = valence_program_manager::domain::Domain::CosmosCosmwasm( + "neutron".to_string() + ); + let terra_domain = valence_program_manager::domain::Domain::CosmosCosmwasm( + "terra".to_string() + ); + + // Accounts + let terra_input_account = builder.add_account( + AccountInfo::new("terra_input_account".to_string(), &terra_domain, AccountType::default()) + ); + let neutron_input_account = builder.add_account( + AccountInfo::new("neutron_input_account".to_string(), &neutron_domain, AccountType::default()) + ); + let liquidity_position_account = builder.add_account( + AccountInfo::new("liquidity_position_account".to_string(), &neutron_domain, AccountType::default()) + ); + let withdraw_output_account = builder.add_account( + AccountInfo::new("withdraw_output_account".to_string(), &neutron_domain, AccountType::default()) + ); + + let mut terra_to_neutron_pfm_map:BTreeMap = BTreeMap::new(); + terra_to_neutron_pfm_map.insert(atom_on_terra.clone(),PacketForwardMiddlewareConfig { + local_to_hop_chain_channel_id: terra_cosmoshub_ibc_channel_id.to_string(), + hop_to_destination_chain_channel_id: cosmoshub_neutron_ibc_channel_id.to_string(), + hop_chain_receiver_address: "invalid-pfm".to_string(), // necessary so entire transaction is reverted + }); + + // Libraries + let terra_ibc_transfer_library = builder.add_library( + LibraryInfo::new( + "terra_ibc_transfer".to_string(), + &terra_domain, + LibraryConfig::ValenceGenericIbcTransferLibrary({ + valence_generic_ibc_transfer_library::msg::LibraryConfig { + input_addr: terra_input_account.clone(), + output_addr: neutron_input_account.clone(), + denom: valence_library_utils::denoms::UncheckedDenom::Native(atom_on_terra.to_string()), + amount: IbcTransferAmount::FullAmount, + remote_chain_info: RemoteChainInfo { + channel_id: terra_cosmoshub_ibc_channel_id.to_string(), + ibc_transfer_timeout: Some(600u64.into()), // 10 mins + }, + denom_to_pfm_map: terra_to_neutron_pfm_map, + memo: "".to_owned(), + } + }) + ) + ); + + let pool_type = PoolType::NativeLpToken( + valence_astroport_utils::astroport_native_lp_token::PairType::Custom("concentrated".to_string()) + ); + + let astroport_lper_library = builder.add_library(LibraryInfo::new( + "astroport_lper".to_string(), + &neutron_domain, + LibraryConfig::ValenceAstroportLper( + valence_astroport_lper::msg::LibraryConfig { + input_addr: neutron_input_account.clone(), + output_addr: liquidity_position_account.clone(), + pool_addr: ntrn_atom_pool_addr.to_string(), + lp_config:LiquidityProviderConfig { + pool_type: pool_type.clone(), + asset_data: AssetData { + asset1: atom_on_neutron.clone(), + asset2: ntrn_on_neutron.clone(), + }, + max_spread: None, + } + } + ) + )); + + let astroport_withdrawer_library = builder.add_library( LibraryInfo::new( + "astroport_withdrawer".to_string(), + &neutron_domain, + LibraryConfig::ValenceAstroportWithdrawer( + valence_astroport_withdrawer::msg::LibraryConfig { + input_addr: liquidity_position_account.clone(), + output_addr: withdraw_output_account.clone(), + pool_addr: ntrn_atom_pool_addr.to_string(), + withdrawer_config: LiquidityWithdrawerConfig { + pool_type: pool_type.clone(), + asset_data: AssetData { + asset1: atom_on_neutron.clone(), + asset2: ntrn_on_neutron.clone() + }, + }, + } + ) + )); + + // links + builder.add_link(&terra_ibc_transfer_library, vec![&terra_input_account], vec![&neutron_input_account]); + builder.add_link(&astroport_lper_library, vec![&neutron_input_account], vec![&liquidity_position_account]); + builder.add_link(&astroport_withdrawer_library, vec![&liquidity_position_account], vec![&withdraw_output_account]); + + + // authorizations + let ibc_transfer_subroutine = AtomicSubroutineBuilder::new() + .with_function(AtomicFunctionBuilder::new() + // NOTE: for crosschain domains, this must be added + .with_domain(Domain::External("terra".to_string())) + .with_contract_address(terra_ibc_transfer_library.clone()) + .with_message_details(MessageDetails { + message_type: MessageType::CosmwasmExecuteMsg, + message: Message { + name: "process_function".to_string(), + params_restrictions: Some( + vec![ + ParamRestriction::MustBeIncluded( + vec!["process_function".to_string(), "ibc_transfer".to_string()] + ) + ] + ) + } + }).build()); + builder.add_authorization( + AuthorizationBuilder::new() + .with_label("transfer_usdc_terra_to_neutron") + .with_subroutine( + ibc_transfer_subroutine.build() + ) + .build() + ); + + let provide_liquidity_subroutine= AtomicSubroutineBuilder::new().with_function(AtomicFunctionBuilder::new() + .with_contract_address(astroport_withdrawer_library.clone()) + .with_message_details(MessageDetails { + message_type: MessageType::CosmwasmExecuteMsg, + message: Message { + name: "process_function".to_string(), + params_restrictions: Some( + vec![ + ParamRestriction::MustBeIncluded( + vec![ + "process_function".to_string(), + "provide_double_sided_liquidity".to_string() + ] + ) + ] + ), + }, + }) + .build()); + + builder.add_authorization( + AuthorizationBuilder::new() + .with_label("provide_liquidity") + .with_subroutine( + provide_liquidity_subroutine.build() + ) + .build() + ); + + let withdraw_liquidity_subroutine = AtomicSubroutineBuilder::new().with_function(AtomicFunctionBuilder::new() + .with_contract_address(astroport_withdrawer_library.clone()) + .with_message_details(MessageDetails { + message_type: MessageType::CosmwasmExecuteMsg, + message: Message { + name: "process_function".to_string(), + params_restrictions: Some( + vec![ + ParamRestriction::MustBeIncluded( + vec!["process_function".to_string(), "withdraw_liquidity".to_string()] + ) + ] + ), + }, + }) + .build()); + + builder.add_authorization( + AuthorizationBuilder::new() + .with_mode( + AuthorizationModeInfo::Permissioned( + PermissionTypeInfo::WithoutCallLimit(vec![permissioned_withdrawer]) + ) + ) + .with_label("withdraw_liquidity") + .with_subroutine( + withdraw_liquidity_subroutine.build() + ) + .build() + ); + + builder.build() +} \ No newline at end of file diff --git a/programs/program_template/Cargo.toml b/programs/program_template/Cargo.toml index d371b68..734f13f 100644 --- a/programs/program_template/Cargo.toml +++ b/programs/program_template/Cargo.toml @@ -13,10 +13,21 @@ serde_json = { workspace = true } clap = { workspace = true } tokio = { workspace = true } +<<<<<<< HEAD # Libraries valence-authorization = { workspace = true } valence-base-account = { workspace = true } valence-storage-account = { workspace = true } +======= +# CW +cosmwasm-std = { workspace = true } +cw-utils = { workspace = true } +cw-denom = { workspace = true } + +# Libraries +valence-authorization = { workspace = true } +valence-base-account = { workspace = true } +>>>>>>> template/main valence-processor = { workspace = true } valence-splitter-library = { workspace = true } valence-astroport-lper = { workspace = true } @@ -29,9 +40,12 @@ valence-osmosis-gamm-lper = { workspace = true } valence-osmosis-gamm-withdrawer = { workspace = true } valence-osmosis-cl-lper = { workspace = true } valence-osmosis-cl-withdrawer = { workspace = true } +<<<<<<< HEAD valence-encoder-broker = { workspace = true } valence-neutron-ic-querier = { workspace = true } valence-drop-liquid-staker = { workspace = true } +======= +>>>>>>> template/main valence-program-registry = { workspace = true } # utils diff --git a/programs/program_template/README.md b/programs/program_template/README.md index f2fe502..f9c139b 100644 --- a/programs/program_template/README.md +++ b/programs/program_template/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Program builder This is a single program builder, structure: @@ -7,3 +8,38 @@ This is a single program builder, structure: - `src/main.rs` - entry point to the script - `src/program.rs` - Program builder code, this is rust helper that allows you to build the program config, this is the only file that should be modified to deploy a program. - `program_params/` - Program parameters that will injected into the program builder function, each environment will have its own program parameters toml file, name with the environment name, Example: `program_params/local.toml` or `program_params/mainnet.toml` +======= +# Program example + +This is an example program that transfer funds from one account to another account and vise versa, and allows authorized address to update the config of both forwarders. + +## Program parameters + +- owner - The address that is the owner of the program +- denom - The denom we are using in our transfers +- max_first_forward_amount - Maximum amount allowed to be transfered in a single message on first forwarder +- max_second_forward_amount - Maximum amount allowed to be transfered in a single message on second forwarder +- authorized_addr - Authorized address that can change config of the forwaders + +## Accounts + +We have 2 accounts that funds can be transfered between them: +- First account +- Second account + +## Libraries + +We have 2 forwarder libraries that enable transferring funds from first account to the second account: + +- First forwarder +- Second forwarder + +## Authorizations + +We have 4 authorizations: + +- Forward from first to second - Forward funds from first account to second account +- Forward from second to first - Forward funds from second account to first account +- Secure update first forwarder config - Authorized update config for the first forwarder +- Secure uodate second forwarder config - Authorized update config for the second forwarder +>>>>>>> template/main diff --git a/programs/program_template/program_params/mainnet.toml b/programs/program_template/program_params/mainnet.toml index 897af6e..3838a5e 100644 --- a/programs/program_template/program_params/mainnet.toml +++ b/programs/program_template/program_params/mainnet.toml @@ -1 +1,9 @@ -owner = "neutron1phx0sz708k3t6xdnyc98hgkyhra4tp44et5s68" \ No newline at end of file +<<<<<<< HEAD +owner = "neutron1phx0sz708k3t6xdnyc98hgkyhra4tp44et5s68" +======= +owner = "neutron1phx0sz708k3t6xdnyc98hgkyhra4tp44et5s68" +denom = "untrn" +max_first_forward_amount = "1000" +max_second_forward_amount = "1000" +authorized_addr = "neutron1phx0sz708k3t6xdnyc98hgkyhra4tp44et5s68" +>>>>>>> template/main diff --git a/programs/program_template/program_params/testnet.toml b/programs/program_template/program_params/testnet.toml new file mode 100644 index 0000000..12be134 --- /dev/null +++ b/programs/program_template/program_params/testnet.toml @@ -0,0 +1 @@ +owner = "neutron1tqmf4x0xewrjgdalp59aw6lvzz3k5tx7pk59y6" \ No newline at end of file diff --git a/programs/program_template/src/program_builder.rs b/programs/program_template/src/program_builder.rs index 18a8b4f..d85fd24 100644 --- a/programs/program_template/src/program_builder.rs +++ b/programs/program_template/src/program_builder.rs @@ -1,7 +1,17 @@ +<<<<<<< HEAD +======= +use std::str::FromStr; + +use cosmwasm_std::Uint128; +>>>>>>> template/main use valence_authorization_utils::{ authorization_message::{Message, MessageDetails, MessageType, ParamRestriction}, builders::{AtomicFunctionBuilder, AtomicSubroutineBuilder, AuthorizationBuilder}, }; +<<<<<<< HEAD +======= +use valence_forwarder_library::msg::ForwardingConstraints; +>>>>>>> template/main use valence_library_utils::denoms::UncheckedDenom; use valence_program_manager::{ account::{AccountInfo, AccountType}, @@ -9,6 +19,7 @@ use valence_program_manager::{ program_config::ProgramConfig, program_config_builder::ProgramConfigBuilder, }; +<<<<<<< HEAD use valence_splitter_library::msg::{UncheckedSplitAmount, UncheckedSplitConfig}; /// Write your program using the program builder @@ -56,13 +67,99 @@ pub fn program_builder(params: deployer_lib::ProgramParams) -> ProgramConfig { let function = AtomicFunctionBuilder::new() .with_contract_address(library_1.clone()) +======= + +/// Write your program using the program builder +pub fn program_builder(params: deployer_lib::ProgramParams) -> ProgramConfig { + //---- program params ----// + // Owner of the program + let owner = params.get("owner"); + // Denom to use for forwarding + let denom = params.get("denom"); + // Max amount to forward from first account to second account + let max_first_forward_amount = params.get("max_first_forward_amount"); + // Max amount to forward from second account to first account + let max_second_forward_amount = params.get("max_second_forward_amount"); + // Authorized address that can change the forwarders config + let authorized_addr = params.get("authorized_addr"); + + //---- Set builder ----// + let mut builder = ProgramConfigBuilder::new("example-program", owner.as_str()); + + //---- Domains ----// + // Neutron domain + let neutron_domain = + valence_program_manager::domain::Domain::CosmosCosmwasm("neutron".to_string()); + + //---- Accounts ----// + // First account + let acc_first = builder.add_account(AccountInfo::new( + "first_account".to_string(), + &neutron_domain, + AccountType::default(), + )); + // Second account + let acc_second = builder.add_account(AccountInfo::new( + "second_account".to_string(), + &neutron_domain, + AccountType::default(), + )); + + //---- Libraries ----// + // Forward funds from first account to second account + let first_forwarder_config = valence_forwarder_library::msg::LibraryConfig { + input_addr: acc_first.clone(), + output_addr: acc_second.clone(), + forwarding_configs: vec![valence_forwarder_library::msg::UncheckedForwardingConfig { + denom: UncheckedDenom::Native(denom.clone()), + max_amount: Uint128::from_str(max_first_forward_amount.as_str()).unwrap(), + }], + forwarding_constraints: ForwardingConstraints::new(None), + }; + + let lib_first_forwarder = builder.add_library(LibraryInfo::new( + "first_forwarder".to_string(), + &neutron_domain, + LibraryConfig::ValenceForwarderLibrary(first_forwarder_config), + )); + + builder.add_link(&lib_first_forwarder, vec![&acc_first], vec![&acc_second]); + + // Forward funds from second account to first account + let second_forwarder_config = valence_forwarder_library::msg::LibraryConfig { + input_addr: acc_second.clone(), + output_addr: acc_first.clone(), + forwarding_configs: vec![valence_forwarder_library::msg::UncheckedForwardingConfig { + denom: UncheckedDenom::Native(denom), + max_amount: Uint128::from_str(max_second_forward_amount.as_str()).unwrap(), + }], + forwarding_constraints: ForwardingConstraints::new(None), + }; + + let lib_second_forwarder = builder.add_library(LibraryInfo::new( + "second_forwarder".to_string(), + &neutron_domain, + LibraryConfig::ValenceForwarderLibrary(second_forwarder_config), + )); + + builder.add_link(&lib_second_forwarder, vec![&acc_second], vec![&acc_first]); + + //---- Authorizations ----// + // First authorization to forward funds from the first account to the second account + let function = AtomicFunctionBuilder::new() + .with_contract_address(lib_first_forwarder.clone()) +>>>>>>> template/main .with_message_details(MessageDetails { message_type: MessageType::CosmwasmExecuteMsg, message: Message { name: "process_function".to_string(), params_restrictions: Some(vec![ParamRestriction::MustBeIncluded(vec![ "process_function".to_string(), +<<<<<<< HEAD "split".to_string(), +======= + "forward".to_string(), +>>>>>>> template/main ])]), }, }) @@ -72,11 +169,108 @@ pub fn program_builder(params: deployer_lib::ProgramParams) -> ProgramConfig { .with_function(function) .build(); let authorization = AuthorizationBuilder::new() +<<<<<<< HEAD .with_label(action_label) +======= + .with_label("Forward_from_first_to_second") +>>>>>>> template/main .with_subroutine(subroutine) .build(); builder.add_authorization(authorization); +<<<<<<< HEAD +======= + // Second authorization to forward funds from the second account to the first account + let function = AtomicFunctionBuilder::new() + .with_contract_address(lib_second_forwarder.clone()) + .with_message_details(MessageDetails { + message_type: MessageType::CosmwasmExecuteMsg, + message: Message { + name: "process_function".to_string(), + params_restrictions: Some(vec![ParamRestriction::MustBeIncluded(vec![ + "process_function".to_string(), + "forward".to_string(), + ])]), + }, + }) + .build(); + + let subroutine = AtomicSubroutineBuilder::new() + .with_function(function) + .build(); + let authorization = AuthorizationBuilder::new() + .with_label("Forward_from second_to_first") + .with_subroutine(subroutine) + .build(); + + builder.add_authorization(authorization); + + // Update first forwarder to change the amount that can be sent + let update_first_forward_config_function = AtomicFunctionBuilder::new() + .with_contract_address(lib_first_forwarder.clone()) + .with_message_details(MessageDetails { + message_type: MessageType::CosmwasmExecuteMsg, + message: Message { + name: "update_config".to_string(), + params_restrictions: Some(vec![ParamRestriction::MustBeIncluded(vec![ + "update_config".to_string(), + "new_config".to_string(), + ])]), + }, + }) + .build(); + + let subroutine = AtomicSubroutineBuilder::new() + .with_function(update_first_forward_config_function) + .build(); + let authorization = AuthorizationBuilder::new() + .with_label("Secure_update_first_forwarder_config") + .with_mode( + valence_authorization_utils::authorization::AuthorizationModeInfo::Permissioned( + valence_authorization_utils::authorization::PermissionTypeInfo::WithoutCallLimit( + vec![authorized_addr.clone()], + ), + ), + ) + .with_subroutine(subroutine) + .build(); + + builder.add_authorization(authorization); + + // Update second forwarder to change the amount that can be sent + let update_second_forward_config_function = AtomicFunctionBuilder::new() + .with_contract_address(lib_second_forwarder.clone()) + .with_message_details(MessageDetails { + message_type: MessageType::CosmwasmExecuteMsg, + message: Message { + name: "update_config".to_string(), + params_restrictions: Some(vec![ParamRestriction::MustBeIncluded(vec![ + "update_config".to_string(), + "new_config".to_string(), + ])]), + }, + }) + .build(); + + let subroutine = AtomicSubroutineBuilder::new() + .with_function(update_second_forward_config_function) + .build(); + let authorization = AuthorizationBuilder::new() + .with_label("Secure_update_second_forwarder_config") + .with_mode( + valence_authorization_utils::authorization::AuthorizationModeInfo::Permissioned( + valence_authorization_utils::authorization::PermissionTypeInfo::WithoutCallLimit( + vec![authorized_addr.clone()], + ), + ), + ) + .with_subroutine(subroutine) + .build(); + + builder.add_authorization(authorization); + + // Build program config +>>>>>>> template/main builder.build() }