diff --git a/Cargo.lock b/Cargo.lock index 9ac9a691..8ef097d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "autocfg" @@ -100,26 +100,15 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" -[[package]] -name = "cosmos-sdk-proto" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b42021d8488665b1a0d9748f1f81df7235362d194f44481e2e61bf376b77b4" -dependencies = [ - "prost 0.11.3", - "prost-types", - "tendermint-proto 0.23.9", -] - [[package]] name = "cosmos-sdk-proto" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4776e787b24d9568dd61d3237eeb4eb321d622fb881b858c7b82806420e87d4" dependencies = [ - "prost 0.11.3", + "prost 0.11.6", "prost-types", - "tendermint-proto 0.27.0", + "tendermint-proto", ] [[package]] @@ -392,17 +381,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw-storage-plus" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b6f91c0b94481a3e9ef1ceb183c37d00764f8751e39b45fc09f4d9b970d469" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", -] - [[package]] name = "cw-storage-plus" version = "1.0.1" @@ -563,7 +541,7 @@ dependencies = [ "cw721", "cwd-interface", "cwd-macros", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "schemars", "serde", "thiserror", @@ -642,7 +620,7 @@ dependencies = [ "cwd-proposal-hooks", "cwd-proposal-single", "cwd-voting", - "neutron-sdk", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", "schemars", "serde", ] @@ -666,7 +644,7 @@ dependencies = [ "cwd-proposal-hooks", "cwd-proposal-single", "cwd-voting", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "schemars", "serde", ] @@ -710,7 +688,7 @@ dependencies = [ "cwd-proposal-hooks", "cwd-vote-hooks", "cwd-voting", - "neutron-sdk", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", "schemars", "serde", "thiserror", @@ -745,7 +723,7 @@ dependencies = [ "cwd-proposal-hooks", "cwd-vote-hooks", "cwd-voting", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "schemars", "serde", "thiserror", @@ -769,7 +747,7 @@ dependencies = [ "cwd-interface", "cwd-macros", "exec-control", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "schemars", "serde", "thiserror", @@ -795,7 +773,7 @@ dependencies = [ "cwd-subdao-core", "cwd-subdao-proposal-single", "cwd-voting", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "neutron-timelock", "schemars", "serde", @@ -829,7 +807,7 @@ dependencies = [ "cwd-subdao-pre-propose-single", "cwd-vote-hooks", "cwd-voting", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "schemars", "serde", "thiserror", @@ -852,7 +830,7 @@ dependencies = [ "cwd-interface", "cwd-macros", "cwd-pre-propose-base", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "neutron-timelock", "schemars", "serde", @@ -882,7 +860,7 @@ dependencies = [ "cwd-core", "cwd-interface", "cwd-macros", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "schemars", "serde", "thiserror", @@ -931,9 +909,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" @@ -1102,9 +1080,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "k256" @@ -1120,9 +1098,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "neutron-distribution" @@ -1155,14 +1133,35 @@ dependencies = [ [[package]] name = "neutron-sdk" version = "0.1.0" -source = "git+https://github.com/neutron-org/neutron-contracts.git#3ad81939da78954ff032a26e54d792cc16a4d9f3" +source = "git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469#c19b40c024eeaa8733af9ddee94a52798d78f469" dependencies = [ - "base64 0.13.1", + "base64 0.20.0", + "bech32", + "cosmos-sdk-proto", + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus 1.0.1", + "prost 0.11.6", + "protobuf", + "schemars", + "serde", + "serde-json-wasm", + "serde_json", + "thiserror", +] + +[[package]] +name = "neutron-sdk" +version = "0.1.0" +source = "git+https://github.com/neutron-org/neutron-contracts.git#c19b40c024eeaa8733af9ddee94a52798d78f469" +dependencies = [ + "base64 0.20.0", "bech32", - "cosmos-sdk-proto 0.14.0", + "cosmos-sdk-proto", + "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", - "prost 0.11.3", + "cw-storage-plus 1.0.1", + "prost 0.11.6", "protobuf", "schemars", "serde", @@ -1178,11 +1177,11 @@ source = "git+https://github.com/neutron-org/neutron-sdk.git#c19b40c024eeaa8733a dependencies = [ "base64 0.20.0", "bech32", - "cosmos-sdk-proto 0.16.0", + "cosmos-sdk-proto", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 1.0.1", - "prost 0.11.3", + "prost 0.11.6", "protobuf", "schemars", "serde", @@ -1196,7 +1195,7 @@ name = "neutron-timelock" version = "0.1.0" dependencies = [ "cosmwasm-std", - "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git)", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=c19b40c024eeaa8733af9ddee94a52798d78f469)", "schemars", "serde", ] @@ -1279,20 +1278,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -1302,9 +1292,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pkcs8" @@ -1318,9 +1308,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -1348,12 +1338,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", - "prost-derive 0.11.2", + "prost-derive 0.11.6", ] [[package]] @@ -1371,9 +1361,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -1384,12 +1374,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", - "prost 0.11.3", + "prost 0.11.6", ] [[package]] @@ -1415,9 +1405,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -1450,9 +1440,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "schemars" @@ -1494,9 +1484,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -1512,18 +1502,18 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -1543,9 +1533,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -1619,33 +1609,15 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "tendermint-proto" -version = "0.23.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ce80bf536476db81ecc9ebab834dc329c9c1509a694f211a73858814bfe023" -dependencies = [ - "bytes", - "flex-error", - "num-derive", - "num-traits", - "prost 0.11.3", - "prost-types", - "serde", - "serde_bytes", - "subtle-encoding", - "time", -] - [[package]] name = "tendermint-proto" version = "0.27.0" @@ -1656,7 +1628,7 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.11.3", + "prost 0.11.6", "prost-types", "serde", "serde_bytes", @@ -1666,18 +1638,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1686,20 +1658,28 @@ dependencies = [ [[package]] name = "time" -version = "0.3.11" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "libc", - "num_threads", + "time-core", "time-macros", ] +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] [[package]] name = "typenum" @@ -1721,9 +1701,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "version_check" diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt index 58035fc8..4b63c4a1 100644 --- a/artifacts/checksums.txt +++ b/artifacts/checksums.txt @@ -1,15 +1,15 @@ c5a2673b74cda51bd2628804856117291ed555867daf66f543e084dccc694576 cw4_voting.wasm -376d1b53afddeda6e57a0907dbd790e71822c7dfbecd185354652eddafa56896 cwd_core.wasm -16eb377716df5f8981d1da000b5fd106e46a1fa1edec543d5e657356528eadbf cwd_pre_propose_multiple.wasm -c33b583b61ec1890fcd00cc7b5ece08de2c30d93e39038680e480f4fa3de58ce cwd_pre_propose_single.wasm -c003fce6e22e0fcb8698ce333f154ea89c1d9a61b5a9cc7a0b5294459b39cfe7 cwd_proposal_multiple.wasm -01bf6a347ec95b6c501ade61d6128d0fbd0b2d34639ae97d893cefe1cec71f36 cwd_proposal_single.wasm -7cffc8002d45dc861eaa08eef6960d8aafe12c95182551d386548317e842dc03 cwd_subdao_core.wasm -6e3ebc6a45823e7261b057e3df5bfc263285351254b4a58e8d67b241121593e9 cwd_subdao_pre_propose_single.wasm -acba35a90a5b81256eda8055512e0e9117586b5869687986ebf8f0bf14a6d605 cwd_subdao_proposal_single.wasm -341fce8e9437a4f3475d331e54acd12ef092450a39bff804543f9ee4c87e6556 cwd_subdao_timelock_single.wasm -de33de7ae51e0d0f64534dac4562f339cad66966f8b4d5762060b850f5f2f114 neutron_distribution.wasm -1982982b78b417fd87108c731f91a2226704b00fe722d0ad6985c45e5e444c89 neutron_reserve.wasm -fb003c04917dad5e51c8bcbc5c172705f8c86c1ce88c5a139b828f5b88b18de2 neutron_treasury.wasm -dc5542363aba30fb46f32d2cf0e883cc8122736bc149a11ce3d3cfeb4ef9830c neutron_vault.wasm -7516c30b8868f52596306c1f54a6daf83da53f8e585cd1fe6210990cb2747051 neutron_voting_registry.wasm +462cebbe6344aa27b168d6e5bb351df49352036c8df5aba97c69a356a9de7592 cwd_core.wasm +16842544dd0c41a4b3e87d6a672abc17e8cd77bef5f06e323a44a81a16d028eb cwd_pre_propose_multiple.wasm +35be8f8ebecfd8893eded5d63148fd1f68733a525f8f7a42f8b70c11bbaf60fb cwd_pre_propose_single.wasm +f0c8b7a5f594bc388652f2ff2cad7052873acdbad2be26b5f095186e7a2afb6d cwd_proposal_multiple.wasm +a220a9945a2e355ede5f044cbae1440121ca7d0ee67b4e3668a1f21a3f7a74a0 cwd_proposal_single.wasm +63f7f617094036a69abea7508682abb6fa0ae0ea39a764558c30a4c08e2cf472 cwd_subdao_core.wasm +33805b807071e9d084892775e584241f860457b8e30a109594933b1069f3d95e cwd_subdao_pre_propose_single.wasm +eff90a4a9cde67715d4fa3ca22fe59f55ec6935bc3de56adf075e6603eceaa98 cwd_subdao_proposal_single.wasm +c50e469dfc98b49856bfdb24640153c1c0841c9cbc43f1f7de154751b726824f cwd_subdao_timelock_single.wasm +9bbd1d908adc2e3d50ae3f3d74073a4d39c437c6b389fed2163eff3bf238ee28 neutron_distribution.wasm +64d84d688717d74d641a672e19ab8d26a01fae2c10e5f9d27644471723e824ef neutron_reserve.wasm +ea67e11d7581821e5d4938b8fcaf474d566eaa68c92f7bc9c8bd57dcde673890 neutron_treasury.wasm +43fedf32c8af193417b3be37d69a88eeb6c9b2c1ec45cdc0cf24ce91a0b5b60e neutron_vault.wasm +dcba10f524ca82a7dd777d56ed1a058d825b313cf650a77141745c70214fd92b neutron_voting_registry.wasm diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt old mode 100644 new mode 100755 index cb0608c0..4765bd27 --- a/artifacts/checksums_intermediate.txt +++ b/artifacts/checksums_intermediate.txt @@ -1,14 +1,14 @@ -d125e4bffb0973e8ea8ba4f0cd765aa77d190ddd08b8395d900c717462580c0d target/wasm32-unknown-unknown/release/cwd_core.wasm -2c9cafdd3fcb12b1cfaa2022437c99d64cd2a136d98905833d6c46bf7a3e343a target/wasm32-unknown-unknown/release/cwd_pre_propose_single.wasm -1b66ee6db36f84efebb6a93c384721d369da348ed485aee7bc486dface362280 target/wasm32-unknown-unknown/release/cwd_proposal_single.wasm -e766ea0c069acc605b924d5e8ecbc0376026347c275501ad67c391d978ddeaef target/wasm32-unknown-unknown/release/cwd_subdao_pre_propose_single.wasm -73aaf0fa117ca17398d16ad525c3afc8528706a77b9a0993a8543024760cc2ba target/wasm32-unknown-unknown/release/neutron_vault.wasm -ddd6b29b9c1cf9ae6c90ab731dd7b3ea4a2c360b656835e93cd0dd3c080e406a target/wasm32-unknown-unknown/release/neutron_voting_registry.wasm -a0e3d77f1ee7df1758125de9c18fbab1c310bfed3c5389e1533e0588df4c450f target/wasm32-unknown-unknown/release/cwd_pre_propose_multiple.wasm -5aeed529c1b848aa12192a14242c7ca7d7486f3f08cdfd3336db7886781f73ed target/wasm32-unknown-unknown/release/cwd_proposal_multiple.wasm -e27881309f58faeebada41e462a1210a068f6194db4834faa5f6fb24a6c4d295 target/wasm32-unknown-unknown/release/cwd_subdao_core.wasm -6b38b0e39f28062dd852cac043aaa8e76b80232641adb60322849c58b0447cfa target/wasm32-unknown-unknown/release/cwd_subdao_proposal_single.wasm -f9affa3dbdd7632bfd2c9b90de9e959cf441f94fdbb5b47068781de94fa4fcce target/wasm32-unknown-unknown/release/cwd_subdao_timelock_single.wasm -21bfa6eb92d9b98c4fe73567471b09cb849614d0ff8a739e6bfe3d28c24e0094 target/wasm32-unknown-unknown/release/neutron_distribution.wasm -143a562b387797caff1e6c51ab80a4ce678419e00b2986b362b7aff378b762e5 target/wasm32-unknown-unknown/release/neutron_reserve.wasm -766ae9b870511352aa835e53b88bee081b565c31af69ddacc9d5bbc32f41c3fc target/wasm32-unknown-unknown/release/neutron_treasury.wasm +71ac27b0d480967ff0f109c8b2404a24e2c7c4851b045ca12cb34022465c942a target/wasm32-unknown-unknown/release/cwd_core.wasm +40b8de1694f88a6698cc6857363b737e50930b00e05b2ec2f5c7091f514acbc3 target/wasm32-unknown-unknown/release/cwd_pre_propose_multiple.wasm +9045a14917b5fe2aae20e8778bdb315ddee88dcd3f38e6d86fd2e1e820e585d0 target/wasm32-unknown-unknown/release/cwd_pre_propose_single.wasm +0f4af56973f3dfa8746e35891aa5ddac689f74fd12af5699aafdb5b198d3a858 target/wasm32-unknown-unknown/release/cwd_proposal_multiple.wasm +faed6ff04d3bd3f55b4f424e3f87941c9aaa33639637dc59209c2a9c506cbf96 target/wasm32-unknown-unknown/release/cwd_proposal_single.wasm +8110d6dcb5aab44249ac86c6fa89028b55429aa3a3be11dd23ff96476e836cee target/wasm32-unknown-unknown/release/cwd_subdao_core.wasm +4d8b319ff0ebbab6c9f0d8f1fd7c2999d696a80874de7f2f180fad3212f0d1fc target/wasm32-unknown-unknown/release/cwd_subdao_pre_propose_single.wasm +8677c71dff461eaea23a8922de4d17d5cc969761f903cf42e0d3a21d7cb794a6 target/wasm32-unknown-unknown/release/cwd_subdao_proposal_single.wasm +42919294dcd1a335fbb37c646bbb621139d34d066f211a574ba4e4c1a35d745f target/wasm32-unknown-unknown/release/cwd_subdao_timelock_single.wasm +91be9e3bbb44c0abfafc1602887348ac67c41511c6f2cbbca26e945e7125b159 target/wasm32-unknown-unknown/release/neutron_distribution.wasm +63f1b33e90f8a9b170142fc290419057f8e1a9102c60287c75fb4cb4ad339f81 target/wasm32-unknown-unknown/release/neutron_reserve.wasm +24bcf5b1fee12609278e4edb17e8d8d83251603c4b2f6999ee0c1a216ae31e89 target/wasm32-unknown-unknown/release/neutron_treasury.wasm +ade2226054502a38f2ecd37a039e5775a6350632238d502364142c2a32716c30 target/wasm32-unknown-unknown/release/neutron_vault.wasm +b0ec185bb41233b43f1e38459b2397c4d15af2d814d2630f597d943dd1c86c01 target/wasm32-unknown-unknown/release/neutron_voting_registry.wasm diff --git a/artifacts/cwd_core.wasm b/artifacts/cwd_core.wasm index 757b1374..5537502b 100644 Binary files a/artifacts/cwd_core.wasm and b/artifacts/cwd_core.wasm differ diff --git a/artifacts/cwd_pre_propose_multiple.wasm b/artifacts/cwd_pre_propose_multiple.wasm index 6395c0c6..0cb34bf8 100644 Binary files a/artifacts/cwd_pre_propose_multiple.wasm and b/artifacts/cwd_pre_propose_multiple.wasm differ diff --git a/artifacts/cwd_pre_propose_single.wasm b/artifacts/cwd_pre_propose_single.wasm index 707a1e26..c2a0cbf5 100644 Binary files a/artifacts/cwd_pre_propose_single.wasm and b/artifacts/cwd_pre_propose_single.wasm differ diff --git a/artifacts/cwd_proposal_multiple.wasm b/artifacts/cwd_proposal_multiple.wasm index edee4f0d..a0320cc4 100644 Binary files a/artifacts/cwd_proposal_multiple.wasm and b/artifacts/cwd_proposal_multiple.wasm differ diff --git a/artifacts/cwd_proposal_single.wasm b/artifacts/cwd_proposal_single.wasm index 2d1f1051..cf9f19e4 100644 Binary files a/artifacts/cwd_proposal_single.wasm and b/artifacts/cwd_proposal_single.wasm differ diff --git a/artifacts/cwd_subdao_core.wasm b/artifacts/cwd_subdao_core.wasm index 3deda1b7..1218f104 100644 Binary files a/artifacts/cwd_subdao_core.wasm and b/artifacts/cwd_subdao_core.wasm differ diff --git a/artifacts/cwd_subdao_pre_propose_single.wasm b/artifacts/cwd_subdao_pre_propose_single.wasm index a52bd165..97cd58b9 100644 Binary files a/artifacts/cwd_subdao_pre_propose_single.wasm and b/artifacts/cwd_subdao_pre_propose_single.wasm differ diff --git a/artifacts/cwd_subdao_proposal_single.wasm b/artifacts/cwd_subdao_proposal_single.wasm index aee06ffa..3dc18778 100644 Binary files a/artifacts/cwd_subdao_proposal_single.wasm and b/artifacts/cwd_subdao_proposal_single.wasm differ diff --git a/artifacts/cwd_subdao_timelock_single.wasm b/artifacts/cwd_subdao_timelock_single.wasm index e59192c2..e200dcc2 100644 Binary files a/artifacts/cwd_subdao_timelock_single.wasm and b/artifacts/cwd_subdao_timelock_single.wasm differ diff --git a/artifacts/neutron_distribution.wasm b/artifacts/neutron_distribution.wasm index 3eb5d93c..fa6237a1 100644 Binary files a/artifacts/neutron_distribution.wasm and b/artifacts/neutron_distribution.wasm differ diff --git a/artifacts/neutron_reserve.wasm b/artifacts/neutron_reserve.wasm index c61266ce..705eceb1 100644 Binary files a/artifacts/neutron_reserve.wasm and b/artifacts/neutron_reserve.wasm differ diff --git a/artifacts/neutron_treasury.wasm b/artifacts/neutron_treasury.wasm index d370fe49..4703b3f1 100644 Binary files a/artifacts/neutron_treasury.wasm and b/artifacts/neutron_treasury.wasm differ diff --git a/artifacts/neutron_vault.wasm b/artifacts/neutron_vault.wasm index 296efb0e..9cb330a4 100644 Binary files a/artifacts/neutron_vault.wasm and b/artifacts/neutron_vault.wasm differ diff --git a/artifacts/neutron_voting_registry.wasm b/artifacts/neutron_voting_registry.wasm index f1400494..5606d833 100644 Binary files a/artifacts/neutron_voting_registry.wasm and b/artifacts/neutron_voting_registry.wasm differ diff --git a/contracts/dao/cwd-core/.cargo/schema/execute_msg.json b/contracts/dao/cwd-core/.cargo/schema/execute_msg.json index be8ebdde..8385c0f4 100644 --- a/contracts/dao/cwd-core/.cargo/schema/execute_msg.json +++ b/contracts/dao/cwd-core/.cargo/schema/execute_msg.json @@ -242,6 +242,17 @@ "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", "type": "object", "properties": { + "cancel_software_upgrade_proposal": { + "description": "*cancel_software_upgrade_proposal** is a cancel software upgrade proposal field.", + "anyOf": [ + { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + }, + { + "type": "null" + } + ] + }, "param_change_proposal": { "description": "*param_change_proposal** is a parameter change proposal field.", "anyOf": [ @@ -252,6 +263,17 @@ "type": "null" } ] + }, + "software_upgrade_proposal": { + "description": "*software_upgrade_proposal** is a software upgrade proposal field.", + "anyOf": [ + { + "$ref": "#/definitions/SoftwareUpgradeProposal" + }, + { + "type": "null" + } + ] } } }, @@ -316,6 +338,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -781,7 +821,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1140,7 +1180,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1156,6 +1196,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProtobufAny": { "description": "Type for wrapping any protobuf message", "type": "object", @@ -1199,6 +1263,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/cwd-core/Cargo.toml b/contracts/dao/cwd-core/Cargo.toml index 6de9ed0e..c8dac1d0 100644 --- a/contracts/dao/cwd-core/Cargo.toml +++ b/contracts/dao/cwd-core/Cargo.toml @@ -16,7 +16,7 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -neutron_bindings = { package = "neutron-sdk", version = "0.1.0", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } cosmwasm-std = { version = "1.0.0", features = ["ibc3"] } cosmwasm-storage = { version = "1.0.0" } cw-storage-plus = "0.13" diff --git a/contracts/dao/cwd-core/schema/execute_msg.json b/contracts/dao/cwd-core/schema/execute_msg.json index be8ebdde..d1ab3447 100644 --- a/contracts/dao/cwd-core/schema/execute_msg.json +++ b/contracts/dao/cwd-core/schema/execute_msg.json @@ -239,21 +239,48 @@ ] }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -316,6 +343,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -781,7 +826,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1140,7 +1185,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1156,6 +1201,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProtobufAny": { "description": "Type for wrapping any protobuf message", "type": "object", @@ -1199,6 +1268,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/pre-propose/cwd-pre-propose-multiple/schema/execute_msg_for__propose_message.json b/contracts/dao/pre-propose/cwd-pre-propose-multiple/schema/execute_msg_for__propose_message.json index cfe15110..00e5aed8 100644 --- a/contracts/dao/pre-propose/cwd-pre-propose-multiple/schema/execute_msg_for__propose_message.json +++ b/contracts/dao/pre-propose/cwd-pre-propose-multiple/schema/execute_msg_for__propose_message.json @@ -137,21 +137,48 @@ ], "definitions": { "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -214,6 +241,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -684,7 +729,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1039,7 +1084,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1055,6 +1100,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposeMessage": { "oneOf": [ { @@ -1131,6 +1200,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single/.cargo/schema/execute_msg_for__propose_message.json b/contracts/dao/pre-propose/cwd-pre-propose-single/.cargo/schema/execute_msg_for__propose_message.json index 3c757f92..e2f93dac 100644 --- a/contracts/dao/pre-propose/cwd-pre-propose-single/.cargo/schema/execute_msg_for__propose_message.json +++ b/contracts/dao/pre-propose/cwd-pre-propose-single/.cargo/schema/execute_msg_for__propose_message.json @@ -140,6 +140,17 @@ "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", "type": "object", "properties": { + "cancel_software_upgrade_proposal": { + "description": "*cancel_software_upgrade_proposal** is a cancel software upgrade proposal field.", + "anyOf": [ + { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + }, + { + "type": "null" + } + ] + }, "param_change_proposal": { "description": "*param_change_proposal** is a parameter change proposal field.", "anyOf": [ @@ -150,6 +161,17 @@ "type": "null" } ] + }, + "software_upgrade_proposal": { + "description": "*software_upgrade_proposal** is a software upgrade proposal field.", + "anyOf": [ + { + "$ref": "#/definitions/SoftwareUpgradeProposal" + }, + { + "type": "null" + } + ] } } }, @@ -214,6 +236,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -684,7 +724,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1003,7 +1043,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1019,6 +1059,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposeMessage": { "oneOf": [ { @@ -1097,6 +1161,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single/Cargo.toml b/contracts/dao/pre-propose/cwd-pre-propose-single/Cargo.toml index 03c4e178..542435a1 100644 --- a/contracts/dao/pre-propose/cwd-pre-propose-single/Cargo.toml +++ b/contracts/dao/pre-propose/cwd-pre-propose-single/Cargo.toml @@ -20,7 +20,7 @@ cosmwasm-std = "1.0.0" cw2 = "0.13.2" serde = { version = "1.0.147", default-features = false, features = ["derive"] } cwd-pre-propose-base = { version = "*", path = "../../../../packages/cwd-pre-propose-base" } -neutron_bindings = { package = "neutron-sdk", version = "0.1.0", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } schemars = "0.8.8" [dev-dependencies] diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single/schema/execute_msg_for__propose_message.json b/contracts/dao/pre-propose/cwd-pre-propose-single/schema/execute_msg_for__propose_message.json index 3c757f92..17c29664 100644 --- a/contracts/dao/pre-propose/cwd-pre-propose-single/schema/execute_msg_for__propose_message.json +++ b/contracts/dao/pre-propose/cwd-pre-propose-single/schema/execute_msg_for__propose_message.json @@ -137,21 +137,48 @@ ], "definitions": { "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -214,6 +241,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -684,7 +729,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1003,7 +1048,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1019,6 +1064,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposeMessage": { "oneOf": [ { @@ -1097,6 +1166,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/execute_msg.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/execute_msg.json index 53e404ba..0ec5eac1 100644 --- a/contracts/dao/proposal/cwd-proposal-multiple/schema/execute_msg.json +++ b/contracts/dao/proposal/cwd-proposal-multiple/schema/execute_msg.json @@ -345,21 +345,48 @@ ] }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -422,6 +449,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -866,7 +911,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1275,7 +1320,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1322,6 +1367,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "PreProposeInfo": { "oneOf": [ { @@ -1403,6 +1472,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/list_proposals_response.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/list_proposals_response.json index 535e8760..9aa7fb51 100644 --- a/contracts/dao/proposal/cwd-proposal-multiple/schema/list_proposals_response.json +++ b/contracts/dao/proposal/cwd-proposal-multiple/schema/list_proposals_response.json @@ -20,21 +20,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -97,6 +124,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "CheckedMultipleChoiceOption": { "description": "A verified option that has all fields needed for voting.", "type": "object", @@ -588,7 +633,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1040,7 +1085,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1087,6 +1132,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposalResponse": { "description": "Information about a proposal returned by proposal queries.", "type": "object", @@ -1149,6 +1218,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/proposal_response.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/proposal_response.json index dffcae38..6f18673d 100644 --- a/contracts/dao/proposal/cwd-proposal-multiple/schema/proposal_response.json +++ b/contracts/dao/proposal/cwd-proposal-multiple/schema/proposal_response.json @@ -24,21 +24,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -101,6 +128,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "CheckedMultipleChoiceOption": { "description": "A verified option that has all fields needed for voting.", "type": "object", @@ -592,7 +637,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1044,7 +1089,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1091,6 +1136,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProtobufAny": { "description": "Type for wrapping any protobuf message", "type": "object", @@ -1134,6 +1203,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/reverse_proposals_response.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/reverse_proposals_response.json index 6c23918a..05fe7e73 100644 --- a/contracts/dao/proposal/cwd-proposal-multiple/schema/reverse_proposals_response.json +++ b/contracts/dao/proposal/cwd-proposal-multiple/schema/reverse_proposals_response.json @@ -20,21 +20,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -97,6 +124,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "CheckedMultipleChoiceOption": { "description": "A verified option that has all fields needed for voting.", "type": "object", @@ -588,7 +633,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1040,7 +1085,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1087,6 +1132,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposalResponse": { "description": "Information about a proposal returned by proposal queries.", "type": "object", @@ -1149,6 +1218,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-single/Cargo.toml b/contracts/dao/proposal/cwd-proposal-single/Cargo.toml index 92790992..6a66464a 100644 --- a/contracts/dao/proposal/cwd-proposal-single/Cargo.toml +++ b/contracts/dao/proposal/cwd-proposal-single/Cargo.toml @@ -16,7 +16,7 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } cosmwasm-std = { version = "1.0.0", features = ["ibc3"] } cosmwasm-storage = { version = "1.0.0" } cw-storage-plus = "0.13" diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/execute_msg.json b/contracts/dao/proposal/cwd-proposal-single/schema/execute_msg.json index 23945fbb..07ed4358 100644 --- a/contracts/dao/proposal/cwd-proposal-single/schema/execute_msg.json +++ b/contracts/dao/proposal/cwd-proposal-single/schema/execute_msg.json @@ -333,21 +333,48 @@ ] }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -410,6 +437,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -854,7 +899,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1213,7 +1258,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1260,6 +1305,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "PreProposeInfo": { "oneOf": [ { @@ -1341,6 +1410,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/list_proposals_response.json b/contracts/dao/proposal/cwd-proposal-single/schema/list_proposals_response.json index d36e2b5d..0985f61f 100644 --- a/contracts/dao/proposal/cwd-proposal-single/schema/list_proposals_response.json +++ b/contracts/dao/proposal/cwd-proposal-single/schema/list_proposals_response.json @@ -20,21 +20,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -97,6 +124,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -553,7 +598,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -872,7 +917,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -919,6 +964,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposalResponse": { "description": "Information about a proposal returned by proposal queries.", "type": "object", @@ -1070,6 +1139,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/proposal_response.json b/contracts/dao/proposal/cwd-proposal-single/schema/proposal_response.json index 27848219..58ebc6ad 100644 --- a/contracts/dao/proposal/cwd-proposal-single/schema/proposal_response.json +++ b/contracts/dao/proposal/cwd-proposal-single/schema/proposal_response.json @@ -24,21 +24,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -101,6 +128,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -557,7 +602,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -876,7 +921,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -923,6 +968,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProtobufAny": { "description": "Type for wrapping any protobuf message", "type": "object", @@ -1055,6 +1124,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/reverse_proposals_response.json b/contracts/dao/proposal/cwd-proposal-single/schema/reverse_proposals_response.json index 8f6871c3..cd3dcecb 100644 --- a/contracts/dao/proposal/cwd-proposal-single/schema/reverse_proposals_response.json +++ b/contracts/dao/proposal/cwd-proposal-single/schema/reverse_proposals_response.json @@ -20,21 +20,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -97,6 +124,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -553,7 +598,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -872,7 +917,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -919,6 +964,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposalResponse": { "description": "Information about a proposal returned by proposal queries.", "type": "object", @@ -1070,6 +1139,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/cwd-subdao-core/Cargo.toml b/contracts/subdaos/cwd-subdao-core/Cargo.toml index 2345880c..f64592c3 100644 --- a/contracts/subdaos/cwd-subdao-core/Cargo.toml +++ b/contracts/subdaos/cwd-subdao-core/Cargo.toml @@ -16,7 +16,7 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -neutron_bindings = { package = "neutron-sdk", version = "0.1.0", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } cosmwasm-std = { version = "1.0.0", features = ["ibc3"] } cosmwasm-storage = { version = "1.0.0" } cw-storage-plus = "0.13" diff --git a/contracts/subdaos/cwd-subdao-core/schema/execute_msg.json b/contracts/subdaos/cwd-subdao-core/schema/execute_msg.json index f680c2bb..981dd351 100644 --- a/contracts/subdaos/cwd-subdao-core/schema/execute_msg.json +++ b/contracts/subdaos/cwd-subdao-core/schema/execute_msg.json @@ -264,21 +264,48 @@ ] }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -341,6 +368,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -747,7 +792,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1106,7 +1151,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1122,6 +1167,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProtobufAny": { "description": "Type for wrapping any protobuf message", "type": "object", @@ -1165,6 +1234,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/cwd-subdao-timelock-single/Cargo.toml b/contracts/subdaos/cwd-subdao-timelock-single/Cargo.toml index 1ca3497f..54ad5c53 100644 --- a/contracts/subdaos/cwd-subdao-timelock-single/Cargo.toml +++ b/contracts/subdaos/cwd-subdao-timelock-single/Cargo.toml @@ -16,7 +16,7 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } cosmwasm-std = { version = "1.0.0" } cosmwasm-storage = { version = "1.0.0" } cw-storage-plus = "0.13" diff --git a/contracts/subdaos/cwd-subdao-timelock-single/schema/execute_msg.json b/contracts/subdaos/cwd-subdao-timelock-single/schema/execute_msg.json index 82909e5d..d0c75f3b 100644 --- a/contracts/subdaos/cwd-subdao-timelock-single/schema/execute_msg.json +++ b/contracts/subdaos/cwd-subdao-timelock-single/schema/execute_msg.json @@ -106,21 +106,48 @@ ], "definitions": { "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -183,6 +210,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -589,7 +634,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -908,7 +953,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -924,6 +969,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProtobufAny": { "description": "Type for wrapping any protobuf message", "type": "object", @@ -967,6 +1036,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/cwd-subdao-timelock-single/schema/proposal_list_response.json b/contracts/subdaos/cwd-subdao-timelock-single/schema/proposal_list_response.json index c7fc40d1..34faa3d6 100644 --- a/contracts/subdaos/cwd-subdao-timelock-single/schema/proposal_list_response.json +++ b/contracts/subdaos/cwd-subdao-timelock-single/schema/proposal_list_response.json @@ -16,21 +16,48 @@ }, "definitions": { "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -93,6 +120,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -499,7 +544,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -818,7 +863,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -834,6 +879,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposalStatus": { "oneOf": [ { @@ -944,6 +1013,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/Cargo.toml b/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/Cargo.toml index 2ffd7fca..ce08cd87 100644 --- a/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/Cargo.toml +++ b/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/Cargo.toml @@ -23,7 +23,7 @@ cw-utils = "0.13" serde = { version = "1.0.147", default-features = false, features = ["derive"] } cwd-pre-propose-base = { version = "*", path = "../../../../packages/cwd-pre-propose-base" } cwd-voting = { path = "../../../../packages/cwd-voting" } -neutron_bindings = { package = "neutron-sdk", version = "0.1.0", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } neutron-timelock = { path = "../../../../packages/neutron-timelock" } schemars = "0.8.8" cwd-interface = { path = "../../../../packages/cwd-interface" } diff --git a/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/schema/execute_msg_for__propose_message.json b/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/schema/execute_msg_for__propose_message.json index 3c757f92..17c29664 100644 --- a/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/schema/execute_msg_for__propose_message.json +++ b/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/schema/execute_msg_for__propose_message.json @@ -137,21 +137,48 @@ ], "definitions": { "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -214,6 +241,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -684,7 +729,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1003,7 +1048,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1019,6 +1064,30 @@ } } }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposeMessage": { "oneOf": [ { @@ -1097,6 +1166,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/proposal/cwd-subdao-proposal-single/Cargo.toml b/contracts/subdaos/proposal/cwd-subdao-proposal-single/Cargo.toml index c2097aef..864a2e02 100644 --- a/contracts/subdaos/proposal/cwd-subdao-proposal-single/Cargo.toml +++ b/contracts/subdaos/proposal/cwd-subdao-proposal-single/Cargo.toml @@ -16,7 +16,7 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } cosmwasm-std = { version = "1.0.0", features = ["ibc3"] } cosmwasm-storage = { version = "1.0.0" } cw-storage-plus = "0.13" diff --git a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/execute_msg.json b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/execute_msg.json index c4e62171..f0f691fc 100644 --- a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/execute_msg.json +++ b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/execute_msg.json @@ -333,21 +333,48 @@ ] }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -410,6 +437,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -854,7 +899,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -1213,7 +1258,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -1260,6 +1305,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "PreProposeInfo": { "oneOf": [ { @@ -1341,6 +1410,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/list_proposals_response.json b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/list_proposals_response.json index d36e2b5d..0985f61f 100644 --- a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/list_proposals_response.json +++ b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/list_proposals_response.json @@ -20,21 +20,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -97,6 +124,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -553,7 +598,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -872,7 +917,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -919,6 +964,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposalResponse": { "description": "Information about a proposal returned by proposal queries.", "type": "object", @@ -1070,6 +1139,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/proposal_response.json b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/proposal_response.json index 27848219..58ebc6ad 100644 --- a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/proposal_response.json +++ b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/proposal_response.json @@ -24,21 +24,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -101,6 +128,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -557,7 +602,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -876,7 +921,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -923,6 +968,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProtobufAny": { "description": "Type for wrapping any protobuf message", "type": "object", @@ -1055,6 +1124,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/reverse_proposals_response.json b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/reverse_proposals_response.json index 8f6871c3..cd3dcecb 100644 --- a/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/reverse_proposals_response.json +++ b/contracts/subdaos/proposal/cwd-subdao-proposal-single/schema/reverse_proposals_response.json @@ -20,21 +20,48 @@ "type": "string" }, "AdminProposal": { - "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. Currently only parameter change proposals are implemented, new types of admin proposals may be implemented in future.", - "type": "object", - "properties": { - "param_change_proposal": { - "description": "*param_change_proposal** is a parameter change proposal field.", - "anyOf": [ - { + "description": "AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept.", + "oneOf": [ + { + "description": "*ParamChangeProposal** is a parameter change proposal field.", + "type": "object", + "required": [ + "param_change_proposal" + ], + "properties": { + "param_change_proposal": { "$ref": "#/definitions/ParamChangeProposal" - }, - { - "type": "null" } - ] + }, + "additionalProperties": false + }, + { + "description": "*SoftwareUpgradeProposal** is a software upgrade proposal field.", + "type": "object", + "required": [ + "software_upgrade_proposal" + ], + "properties": { + "software_upgrade_proposal": { + "$ref": "#/definitions/SoftwareUpgradeProposal" + } + }, + "additionalProperties": false + }, + { + "description": "*CancelSoftwareUpgradeProposal** is a cancel software upgrade proposal field.", + "type": "object", + "required": [ + "cancel_software_upgrade_proposal" + ], + "properties": { + "cancel_software_upgrade_proposal": { + "$ref": "#/definitions/CancelSoftwareUpgradeProposal" + } + }, + "additionalProperties": false } - } + ] }, "BankMsg": { "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto", @@ -97,6 +124,24 @@ "description": "Binary is a wrapper around Vec to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec. See also .", "type": "string" }, + "CancelSoftwareUpgradeProposal": { + "description": "CancelSoftwareUpgradeProposal defines the struct for cancel software upgrade proposal.", + "type": "object", + "required": [ + "description", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "Coin": { "type": "object", "required": [ @@ -553,7 +598,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } @@ -872,7 +917,7 @@ ], "properties": { "description": { - "description": "*descriptionr** is a text description of proposal. Non unique.", + "description": "*description** is a text description of proposal. Non unique.", "type": "string" }, "param_changes": { @@ -919,6 +964,30 @@ } ] }, + "Plan": { + "description": "Plan defines the struct for planned upgrade.", + "type": "object", + "required": [ + "height", + "info", + "name" + ], + "properties": { + "height": { + "description": "*height** is a height at which the upgrade must be performed", + "type": "integer", + "format": "int64" + }, + "info": { + "description": "*info** is any application specific upgrade info to be included on-chain", + "type": "string" + }, + "name": { + "description": "*name** is a name for the upgrade", + "type": "string" + } + } + }, "ProposalResponse": { "description": "Information about a proposal returned by proposal queries.", "type": "object", @@ -1070,6 +1139,33 @@ } } }, + "SoftwareUpgradeProposal": { + "description": "SoftwareUpgradeProposal defines the struct for software upgrade proposal.", + "type": "object", + "required": [ + "description", + "plan", + "title" + ], + "properties": { + "description": { + "description": "*description** is a text description of proposal. Non unique.", + "type": "string" + }, + "plan": { + "description": "*plan** is a plan of upgrade.", + "allOf": [ + { + "$ref": "#/definitions/Plan" + } + ] + }, + "title": { + "description": "*title** is a text title of proposal. Non unique.", + "type": "string" + } + } + }, "StakingMsg": { "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto", "oneOf": [ diff --git a/packages/cwd-voting/Cargo.toml b/packages/cwd-voting/Cargo.toml index ea85978f..f98e0a6d 100644 --- a/packages/cwd-voting/Cargo.toml +++ b/packages/cwd-voting/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/DA0-DA0/dao-contracts" description = "Types and methods for CosmWasm DAO voting." [dependencies] -neutron_bindings = { package = "neutron-sdk", version = "0.1.0", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } cosmwasm-std = { version = "1.0.0" } schemars = "0.8" serde = { version = "1.0.147", default-features = false, features = ["derive"] } diff --git a/packages/neutron-timelock/Cargo.toml b/packages/neutron-timelock/Cargo.toml index eef99d89..9a0a88f3 100644 --- a/packages/neutron-timelock/Cargo.toml +++ b/packages/neutron-timelock/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-contracts.git" } +neutron_bindings = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", rev = "c19b40c024eeaa8733af9ddee94a52798d78f469" } cosmwasm-std = { version = "1.0.0" } schemars = "0.8" serde = { version = "1.0.147", default-features = false, features = ["derive"] } \ No newline at end of file diff --git a/test_proposal.sh b/test_proposal.sh index 0698f488..c3d33eeb 100755 --- a/test_proposal.sh +++ b/test_proposal.sh @@ -204,6 +204,57 @@ echo $RES +# PROPOSAL 4: try submit and execute SoftwareUpgradeProposal (should pass) + +PROP="{\"propose\": { \"msg\": { \"propose\": {\"title\": \"TEST\", \"description\": \"BOTTOMTTEXT\", \"msgs\":[{\"custom\":{\"submit_admin_proposal\":{\"admin_proposal\":{\"software_upgrade_proposal\":{\"title\":\"title\",\"description\":\"description\",\"plan\":{\"name\":\"planname#1\",\"height\":10000,\"info\":\"asdfasdfasdf\"}}}}}}]}}}}" +# PROPOSAL 4 (to pass) (other type) +#propose proposal we're going to pass +RES=$(${BIN} tx wasm execute $PRE_PROPOSE_ADDRESS "$PROP" --amount 1000stake --from ${USERNAME_1} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +propose proposal to be passed: +" +echo $RES + +#### vote YES from wallet 1 +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"vote\": {\"proposal_id\": 4, \"vote\": \"yes\"}}" --from ${USERNAME_1} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +vote YES from wallet1: +" +echo $RES + +#### vote NO from wallet 2 +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"vote\": {\"proposal_id\": 4, \"vote\": \"no\"}}" --from ${USERNAME_2} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +vote NO from wallet 2: +" +echo $RES + +#### vote YES from wallet 3 +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"vote\": {\"proposal_id\": 4, \"vote\": \"yes\"}}" --from ${USERNAME_3} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +vote YES from wallet 3: +" +echo $RES + +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"execute\": {\"proposal_id\": 4}}" --from ${USERNAME_1} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +execute proposal 4: +" +echo $RES + + + +# Total voting power and check statuses RES=$(${BIN} q wasm contract-state smart $CORE_ADDRESS "{\"total_power_at_height\": {}}" --chain-id ${CHAIN_ID_1} --output json --home ${HOME_1} --node tcp://127.0.0.1:16657) echo " @@ -227,9 +278,68 @@ RES=$(${BIN} q wasm contract-state smart $PROPOSE_ADDRESS "{\"proposal\": {\"pr echo " should be status:executed" echo $RES + +RES=$(${BIN} q wasm contract-state smart $PROPOSE_ADDRESS "{\"proposal\": {\"proposal_id\": 4}}" --chain-id ${CHAIN_ID_1} --output json --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " +should be status:executed" +echo $RES sleep 5 echo " -list archived adminmodule proposals (should be one param change proposal)" +list archived adminmodule proposals (should be one param change proposal and one software upgrade proposal)" +RES=$(${BIN} q adminmodule archivedproposals --chain-id ${CHAIN_ID_1} --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo $RES + + +# PROPOSAL 5: try submit and execute CancelSoftwareUpgradeProposal (should pass) + +PROP="{\"propose\": { \"msg\": { \"propose\": {\"title\": \"TEST\", \"description\": \"BOTTOMTTEXT\", \"msgs\":[{\"custom\":{\"submit_admin_proposal\":{\"admin_proposal\":{\"cancel_software_upgrade_proposal\":{\"title\":\"title\",\"description\":\"description\"}}}}}]}}}}" +# PROPOSAL 5 (to pass) (other type) +#propose proposal we're going to pass +RES=$(${BIN} tx wasm execute $PRE_PROPOSE_ADDRESS "$PROP" --amount 1000stake --from ${USERNAME_1} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +propose proposal to be passed: +" +echo $RES + +#### vote YES from wallet 1 +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"vote\": {\"proposal_id\": 5, \"vote\": \"yes\"}}" --from ${USERNAME_1} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +vote YES from wallet1: +" +echo $RES + +#### vote NO from wallet 2 +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"vote\": {\"proposal_id\": 5, \"vote\": \"no\"}}" --from ${USERNAME_2} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +vote NO from wallet 2: +" +echo $RES + +#### vote YES from wallet 3 +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"vote\": {\"proposal_id\": 5, \"vote\": \"yes\"}}" --from ${USERNAME_3} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +vote YES from wallet 3: +" +echo $RES + +RES=$(${BIN} tx wasm execute $PROPOSE_ADDRESS "{\"execute\": {\"proposal_id\": 5}}" --from ${USERNAME_1} -y --chain-id ${CHAIN_ID_1} --output json --broadcast-mode=block --gas-prices 0.0025stake --gas 1000000 --keyring-backend test --home ${HOME_1} --node tcp://127.0.0.1:16657) +echo " + + +execute proposal: +" +echo $RES + +echo " +list archived adminmodule proposals (should be one param change proposal and one software upgrade proposal and one cancel software upgrade proposal)" RES=$(${BIN} q adminmodule archivedproposals --chain-id ${CHAIN_ID_1} --home ${HOME_1} --node tcp://127.0.0.1:16657) echo $RES