diff --git a/Cargo.lock b/Cargo.lock index 45bd944..cf39eb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -320,6 +320,16 @@ name = "bls12_381" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "bls12_381" +version = "0.8.0" +source = "git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838#d3ebe9dd6488fac1923db120a7498079e55dd838" dependencies = [ "ff", "group", @@ -717,6 +727,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enable_ibc" +version = "0.1.0" +dependencies = [ + "getrandom", + "namada_ibc", + "namada_tx_prelude", + "rlsf", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1024,7 +1044,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-apps", "ibc-clients", @@ -1037,7 +1057,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -1047,7 +1067,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "base64 0.22.1", "borsh", @@ -1068,7 +1088,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1078,7 +1098,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1096,7 +1116,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -1105,7 +1125,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1122,7 +1142,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1139,7 +1159,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "base64 0.22.1", "displaydoc", @@ -1153,7 +1173,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1162,7 +1182,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1178,7 +1198,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1193,7 +1213,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1216,7 +1236,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1229,7 +1249,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "derive_more", "displaydoc", @@ -1245,7 +1265,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1265,11 +1285,12 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", "displaydoc", + "ibc-core-host-types", "ibc-primitives", "ibc-proto", "ics23", @@ -1283,7 +1304,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -1297,7 +1318,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1318,7 +1339,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1333,7 +1354,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1357,7 +1378,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "derive_more", "displaydoc", @@ -1375,7 +1396,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "derive_more", "displaydoc", @@ -1398,7 +1419,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1413,7 +1434,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "derive_more", "displaydoc", @@ -1427,7 +1448,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1446,7 +1467,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.7.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "proc-macro2", "quote", @@ -1456,7 +1477,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b#7ff41b3804cda649e0d7f7c21389b8d65f8d9b4b" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" dependencies = [ "borsh", "derive_more", @@ -1673,7 +1694,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8499f7a74008aafbecb2a2e608a3e13e4dd3e84df198b604451efe93f2de6e61" dependencies = [ "bitvec", - "bls12_381", + "bls12_381 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff", + "group", + "rand_core", + "subtle", +] + +[[package]] +name = "jubjub" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c#a373686962f4e9d0edb3b4716f86ff6bbd9aa86c" +dependencies = [ + "bitvec", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "ff", "group", "rand_core", @@ -1766,7 +1800,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "masp_note_encryption" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=8d83b172698098fba393006016072bc201ed9ab7#8d83b172698098fba393006016072bc201ed9ab7" +source = "git+https://github.com/anoma/masp?rev=12ed8b060b295c06502a2ff8468e4a941cb7cca4#12ed8b060b295c06502a2ff8468e4a941cb7cca4" dependencies = [ "borsh", "chacha20", @@ -1779,14 +1813,14 @@ dependencies = [ [[package]] name = "masp_primitives" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=8d83b172698098fba393006016072bc201ed9ab7#8d83b172698098fba393006016072bc201ed9ab7" +source = "git+https://github.com/anoma/masp?rev=12ed8b060b295c06502a2ff8468e4a941cb7cca4#12ed8b060b295c06502a2ff8468e4a941cb7cca4" dependencies = [ "aes", "bip0039", "bitvec", "blake2b_simd", "blake2s_simd", - "bls12_381", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "borsh", "byteorder", "ff", @@ -1794,7 +1828,7 @@ dependencies = [ "group", "hex", "incrementalmerkletree", - "jubjub", + "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_note_encryption", "memuse", @@ -1810,16 +1844,16 @@ dependencies = [ [[package]] name = "masp_proofs" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=8d83b172698098fba393006016072bc201ed9ab7#8d83b172698098fba393006016072bc201ed9ab7" +source = "git+https://github.com/anoma/masp?rev=12ed8b060b295c06502a2ff8468e4a941cb7cca4#12ed8b060b295c06502a2ff8468e4a941cb7cca4" dependencies = [ "bellman", "blake2b_simd", - "bls12_381", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "directories", "getrandom", "group", "itertools 0.11.0", - "jubjub", + "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_primitives", "rand_core", @@ -1853,8 +1887,8 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "namada_account" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "namada_core", @@ -1865,8 +1899,8 @@ dependencies = [ [[package]] name = "namada_controller" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "namada_core", "smooth-operator", @@ -1875,8 +1909,8 @@ dependencies = [ [[package]] name = "namada_core" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "bech32", "borsh", @@ -1919,8 +1953,8 @@ dependencies = [ [[package]] name = "namada_events" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "namada_core", @@ -1933,8 +1967,8 @@ dependencies = [ [[package]] name = "namada_gas" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "namada_core", @@ -1946,18 +1980,20 @@ dependencies = [ [[package]] name = "namada_governance" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "itertools 0.12.1", "konst", + "namada_account", "namada_core", "namada_events", "namada_macros", - "namada_parameters", - "namada_storage", - "namada_trans_token", + "namada_state", + "namada_systems", + "namada_tx", + "namada_vp", "serde", "serde_json", "smooth-operator", @@ -1967,8 +2003,8 @@ dependencies = [ [[package]] name = "namada_ibc" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "data-encoding", @@ -1979,12 +2015,13 @@ dependencies = [ "masp_primitives", "namada_core", "namada_events", - "namada_governance", + "namada_gas", "namada_macros", - "namada_parameters", "namada_state", "namada_storage", - "namada_token", + "namada_systems", + "namada_tx", + "namada_vp", "primitive-types", "prost", "serde", @@ -1997,8 +2034,8 @@ dependencies = [ [[package]] name = "namada_macros" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "data-encoding", "proc-macro2", @@ -2009,8 +2046,8 @@ dependencies = [ [[package]] name = "namada_merkle_tree" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "eyre", @@ -2024,32 +2061,38 @@ dependencies = [ [[package]] name = "namada_parameters" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "namada_core", "namada_macros", + "namada_state", "namada_storage", + "namada_systems", + "namada_tx", + "namada_vp", "smooth-operator", "thiserror", ] [[package]] name = "namada_proof_of_stake" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", + "itertools 0.12.1", "konst", "namada_account", "namada_controller", "namada_core", "namada_events", - "namada_governance", "namada_macros", - "namada_parameters", + "namada_state", "namada_storage", - "namada_trans_token", + "namada_systems", + "namada_tx", + "namada_vp", "once_cell", "serde", "smooth-operator", @@ -2059,37 +2102,43 @@ dependencies = [ [[package]] name = "namada_replay_protection" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "namada_core", ] [[package]] name = "namada_shielded_token" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "lazy_static", "masp_primitives", "masp_proofs", + "namada_account", "namada_controller", "namada_core", "namada_gas", - "namada_parameters", + "namada_state", "namada_storage", - "namada_trans_token", + "namada_systems", + "namada_tx", + "namada_vp", "rand_core", + "ripemd", "serde", + "sha2 0.9.9", "smooth-operator", + "thiserror", "tracing", ] [[package]] name = "namada_state" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "clru", @@ -2099,9 +2148,9 @@ dependencies = [ "namada_gas", "namada_macros", "namada_merkle_tree", - "namada_parameters", "namada_replay_protection", "namada_storage", + "namada_systems", "namada_tx", "patricia_tree", "smooth-operator", @@ -2111,8 +2160,8 @@ dependencies = [ [[package]] name = "namada_storage" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "itertools 0.12.1", @@ -2127,10 +2176,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "namada_systems" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" +dependencies = [ + "namada_core", + "namada_storage", +] + [[package]] name = "namada_token" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "namada_core", @@ -2138,25 +2196,32 @@ dependencies = [ "namada_macros", "namada_shielded_token", "namada_storage", + "namada_systems", "namada_trans_token", "serde", ] [[package]] name = "namada_trans_token" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "konst", "namada_core", "namada_events", + "namada_state", "namada_storage", + "namada_systems", + "namada_tx", + "namada_vp", + "thiserror", + "tracing", ] [[package]] name = "namada_tx" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "ark-bls12-381", "bitflags", @@ -2183,8 +2248,8 @@ dependencies = [ [[package]] name = "namada_tx_env" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "namada_core", "namada_events", @@ -2193,14 +2258,15 @@ dependencies = [ [[package]] name = "namada_tx_prelude" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "masp_primitives", "namada_account", "namada_core", "namada_events", + "namada_gas", "namada_governance", "namada_ibc", "namada_macros", @@ -2215,14 +2281,44 @@ dependencies = [ [[package]] name = "namada_vm_env" -version = "0.41.0" -source = "git+https://github.com/anoma/namada?tag=v0.41.0#6b0fd295519aa25d22b73301dfd1ac05cdec634a" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" dependencies = [ "borsh", "masp_primitives", "namada_core", ] +[[package]] +name = "namada_vp" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" +dependencies = [ + "namada_core", + "namada_events", + "namada_gas", + "namada_state", + "namada_tx", + "namada_vp_env", + "smooth-operator", + "thiserror", + "tracing", +] + +[[package]] +name = "namada_vp_env" +version = "0.43.0" +source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12" +dependencies = [ + "derivative", + "masp_primitives", + "namada_core", + "namada_events", + "namada_storage", + "namada_tx", + "smooth-operator", +] + [[package]] name = "nonempty" version = "0.7.0" @@ -2707,7 +2803,7 @@ dependencies = [ "byteorder", "group", "hex", - "jubjub", + "jubjub 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "pasta_curves", "rand_core", "serde", diff --git a/Cargo.toml b/Cargo.toml index 76c0d2e..56de2e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,13 +6,7 @@ members = [ "staking_party", "shielding_party", "shielding_reward_party", -] - -default-members = [ - "block_party", - "staking_party", - "shielding_party", - "shielding_reward_party", + "enable_ibc" ] [workspace.package] @@ -22,8 +16,9 @@ license = "GPL-3.0" version = "0.1.0" [workspace.dependencies] -namada_tx_prelude = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } -namada_proof_of_stake = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +namada_tx_prelude = { git = "https://github.com/anoma/namada", tag = "v0.43.0" } +namada_proof_of_stake = { git = "https://github.com/anoma/namada", tag = "v0.43.0" } +namada_ibc = { git = "https://github.com/anoma/namada", tag = "v0.43.0" } rlsf = "0.2.1" getrandom = { version = "0.2", features = ["custom"] } lazy_static = "1.4.0" diff --git a/Earthfile b/Earthfile index 51b9684..3398ab3 100644 --- a/Earthfile +++ b/Earthfile @@ -18,7 +18,7 @@ source: COPY --keep-ts Cargo.toml Cargo.lock ./ COPY --keep-ts --chmod 755 docker/run-wasmopt.sh ./run-wasmopt.sh COPY --keep-ts --chmod 755 docker/download-wasmopt.sh ./download-wasmopt.sh - COPY --keep-ts --dir block_party shielding_party staking_party shielding_reward_party ./ + COPY --keep-ts --dir block_party shielding_party staking_party shielding_reward_party enable_ibc ./ # lint runs cargo clippy on the source code lint: diff --git a/block_party/src/lib.rs b/block_party/src/lib.rs index 3e94d13..5c558a5 100644 --- a/block_party/src/lib.rs +++ b/block_party/src/lib.rs @@ -8,7 +8,7 @@ use namada_proof_of_stake::storage::{read_pos_params, write_pos_params}; #[transaction] fn apply_tx(ctx: &mut Ctx, _tx_data: BatchedTx) -> TxResult { // PoS inflation - let mut pos_params = read_pos_params(ctx)?.owned; + let mut pos_params = read_pos_params::<_, governance::Store<_>>(ctx)?.owned; pos_params.max_inflation_rate = Dec::from_str("0.1").unwrap(); pos_params.target_staked_ratio = Dec::from_str("0.666667").unwrap(); pos_params.rewards_gain_p = Dec::from_str("2.5").unwrap(); diff --git a/enable_ibc/Cargo.toml b/enable_ibc/Cargo.toml new file mode 100644 index 0000000..08cbc6a --- /dev/null +++ b/enable_ibc/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "enable_ibc" +description = "WASM transaction to enable IBC on any IBC tokens." +authors.workspace = true +edition.workspace = true +license.workspace = true +version.workspace = true + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +namada_tx_prelude.workspace = true +namada_ibc.workspace = true +rlsf.workspace = true +getrandom.workspace = true + +[lib] +crate-type = ["cdylib"] diff --git a/enable_ibc/src/lib.rs b/enable_ibc/src/lib.rs new file mode 100644 index 0000000..c821765 --- /dev/null +++ b/enable_ibc/src/lib.rs @@ -0,0 +1,15 @@ +use namada_ibc::parameters::IbcParameters; +use namada_tx_prelude::*; + +#[transaction] +fn apply_tx(ctx: &mut Ctx, _tx_data: BatchedTx) -> TxResult { + let ibc_parameters = IbcParameters { + default_mint_limit: token::Amount::native_whole(10000000), + default_per_epoch_throughput_limit: token::Amount::native_whole(10000000), + }; + + let ibc_parameters_key = namada_ibc::storage::params_key(); + ctx.write(&ibc_parameters_key, ibc_parameters)?; + + Ok(()) +} diff --git a/shielding_party/src/lib.rs b/shielding_party/src/lib.rs index a196321..9526289 100644 --- a/shielding_party/src/lib.rs +++ b/shielding_party/src/lib.rs @@ -73,22 +73,13 @@ fn apply_tx(ctx: &mut Ctx, _tx_data: BatchedTx) -> TxResult { &shielded_native_token_last_locked_amount_key, token::Amount::zero(), )?; - ctx.write( - &shielded_native_token_max_rewards_key, - Dec::zero(), - )?; + ctx.write(&shielded_native_token_max_rewards_key, Dec::zero())?; ctx.write( &shielded_native_token_target_locked_amount_key, token::Amount::from_uint(0, 6).unwrap(), )?; - ctx.write( - &shielded_native_token_kp_gain_key, - Dec::zero(), - )?; - ctx.write( - &shielded_native_token_kd_gain_key, - Dec::zero(), - )?; + ctx.write(&shielded_native_token_kp_gain_key, Dec::zero())?; + ctx.write(&shielded_native_token_kd_gain_key, Dec::zero())?; // Enable shielded set rewards for ibc tokens for (denomination, channel_id, base_token, max_reward, target_locked_amount, kp, kd) in diff --git a/shielding_reward_party/src/lib.rs b/shielding_reward_party/src/lib.rs index bd38ef9..d733820 100644 --- a/shielding_reward_party/src/lib.rs +++ b/shielding_reward_party/src/lib.rs @@ -11,7 +11,7 @@ pub const KD_GAIN: &str = "120000"; #[transaction] fn apply_tx(ctx: &mut Ctx, _tx_data: BatchedTx) -> TxResult { let nam_address = ctx.get_native_token()?; - + // Enable NAM transfers let native_token_transferable_key = parameters_storage::get_native_token_transferable_key(); ctx.write(&native_token_transferable_key, true)?;