diff --git a/apps/extension/src/background/ledger/service.ts b/apps/extension/src/background/ledger/service.ts index 92cbc10c5d..d5f02ae240 100644 --- a/apps/extension/src/background/ledger/service.ts +++ b/apps/extension/src/background/ledger/service.ts @@ -80,12 +80,11 @@ export class LedgerService { throw new Error(`Transaction ${msgId} not found!`); } - const { headerSignature, codeSignature, dataSignature } = signatures; + const { headerSignature, dataSignature } = signatures; const signedTransfer = await this.sdk.sign_tx( fromBase64(bytes), toHex(dataSignature.signature), - toHex(codeSignature.signature), toHex(headerSignature.signature) ); diff --git a/packages/shared/lib/Cargo.lock b/packages/shared/lib/Cargo.lock index 4d8855f63f..77c6ef73dd 100644 --- a/packages/shared/lib/Cargo.lock +++ b/packages/shared/lib/Cargo.lock @@ -178,12 +178,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.2" @@ -338,34 +332,18 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" -[[package]] -name = "bellman" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43473b34abc4b0b405efa0a250bac87eea888182b21687ee5c8115d279b0fda5" -dependencies = [ - "bitvec 0.22.3", - "blake2s_simd 0.5.11", - "byteorder", - "ff 0.11.1", - "group 0.11.0", - "pairing 0.21.0", - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "bellman" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4dd656ef4fdf7debb6d87d4dd92642fcbcdb78cbf6600c13e25c87e4d1a3807" dependencies = [ - "bitvec 1.0.1", - "blake2s_simd 1.0.1", + "bitvec", + "blake2s_simd", "byteorder", - "ff 0.12.1", - "group 0.12.1", - "pairing 0.22.0", + "ff", + "group", + "pairing", "rand_core 0.6.4", "subtle 2.4.1", ] @@ -408,28 +386,16 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitvec" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" -dependencies = [ - "funty 1.2.0", - "radium 0.6.2", - "tap", - "wyz 0.4.0", -] - [[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.1", + "wyz", ] [[package]] @@ -448,19 +414,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.2.5", -] - -[[package]] -name = "blake2s_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq 0.1.5", + "arrayvec", + "constant_time_eq", ] [[package]] @@ -470,8 +425,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.2.5", + "arrayvec", + "constant_time_eq", ] [[package]] @@ -544,36 +499,24 @@ dependencies = [ "log", ] -[[package]] -name = "bls12_381" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a829c821999c06be34de314eaeb7dd1b42be38661178bc26ad47a4eacebdb0f9" -dependencies = [ - "ff 0.11.1", - "group 0.11.0", - "pairing 0.21.0", - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "bls12_381" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3c196a77437e7cc2fb515ce413a6401291578b5afc8ecb29a3c7ab957f05941" dependencies = [ - "ff 0.12.1", - "group 0.12.1", - "pairing 0.22.0", + "ff", + "group", + "pairing", "rand_core 0.6.4", "subtle 2.4.1", ] [[package]] name = "borsh" -version = "0.9.4" -source = "git+https://github.com/heliaxdev/borsh-rs.git?rev=cd5223e5103c4f139e0c54cf8259b7ec5ec4073a#cd5223e5103c4f139e0c54cf8259b7ec5ec4073a" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ "borsh-derive", "hashbrown 0.11.2", @@ -581,8 +524,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.9.4" -source = "git+https://github.com/heliaxdev/borsh-rs.git?rev=cd5223e5103c4f139e0c54cf8259b7ec5ec4073a#cd5223e5103c4f139e0c54cf8259b7ec5ec4073a" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", @@ -593,8 +537,9 @@ dependencies = [ [[package]] name = "borsh-derive-internal" -version = "0.9.4" -source = "git+https://github.com/heliaxdev/borsh-rs.git?rev=cd5223e5103c4f139e0c54cf8259b7ec5ec4073a#cd5223e5103c4f139e0c54cf8259b7ec5ec4073a" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ "proc-macro2", "quote", @@ -603,8 +548,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.9.4" -source = "git+https://github.com/heliaxdev/borsh-rs.git?rev=cd5223e5103c4f139e0c54cf8259b7ec5ec4073a#cd5223e5103c4f139e0c54cf8259b7ec5ec4073a" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ "proc-macro2", "quote", @@ -614,7 +560,8 @@ dependencies = [ [[package]] name = "bumpalo" version = "3.13.0" -source = "git+https://github.com/fitzgen/bumpalo#fd3dd5767658ad634581d0bc8267c3ed00ec9ec5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-tools" @@ -749,12 +696,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.2.5" @@ -1165,24 +1106,13 @@ dependencies = [ "serde_bytes", ] -[[package]] -name = "ff" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" -dependencies = [ - "bitvec 0.22.3", - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "ff" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ - "bitvec 1.0.1", + "bitvec", "rand_core 0.6.4", "subtle 2.4.1", ] @@ -1235,11 +1165,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "funty" -version = "1.2.0" -source = "git+https://github.com/ferrilab/funty.git?rev=7ef0d890fbcd8b3def1635ac1a877fc298488446#7ef0d890fbcd8b3def1635ac1a877fc298488446" - [[package]] name = "funty" version = "2.0.0" @@ -1392,25 +1317,13 @@ dependencies = [ "web-sys", ] -[[package]] -name = "group" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" -dependencies = [ - "byteorder", - "ff 0.11.1", - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "group" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff 0.12.1", + "ff", "memuse", "rand_core 0.6.4", "subtle 2.4.1", @@ -1566,7 +1479,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.36.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs.git?rev=2d7edc16412b60cabf78163fe24a6264e11f77a9#2d7edc16412b60cabf78163fe24a6264e11f77a9" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs.git?rev=e71bc2cc79f8c2b32e970d95312f251398c93d9e#e71bc2cc79f8c2b32e970d95312f251398c93d9e" dependencies = [ "bytes", "derive_more", @@ -1595,7 +1508,7 @@ dependencies = [ [[package]] name = "ibc-proto" version = "0.26.0" -source = "git+https://github.com/heliaxdev/ibc-proto-rs.git?rev=7e527b5b8c95d83351e93ceafc14ac853224283f#7e527b5b8c95d83351e93ceafc14ac853224283f" +source = "git+https://github.com/heliaxdev/ibc-proto-rs.git?rev=6f4038fcf4981f1ed70771d1cd89931267f917af#6f4038fcf4981f1ed70771d1cd89931267f917af" dependencies = [ "base64", "bytes", @@ -1756,10 +1669,10 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a575df5f985fe1cd5b2b05664ff6accfc46559032b954529fd225a2168d27b0f" dependencies = [ - "bitvec 1.0.1", - "bls12_381 0.7.1", - "ff 0.12.1", - "group 0.12.1", + "bitvec", + "bls12_381", + "ff", + "group", "rand_core 0.6.4", "subtle 2.4.1", ] @@ -1896,15 +1809,15 @@ source = "git+https://github.com/anoma/masp?rev=9320c6b69b5d2e97134866871e960f0a dependencies = [ "aes", "bip0039", - "bitvec 1.0.1", + "bitvec", "blake2b_simd", - "blake2s_simd 1.0.1", - "bls12_381 0.7.1", + "blake2s_simd", + "bls12_381", "borsh", "byteorder", - "ff 0.12.1", + "ff", "fpe", - "group 0.12.1", + "group", "hex", "incrementalmerkletree", "jubjub", @@ -1924,16 +1837,17 @@ name = "masp_proofs" version = "0.9.0" source = "git+https://github.com/anoma/masp?rev=9320c6b69b5d2e97134866871e960f0a31703813#9320c6b69b5d2e97134866871e960f0a31703813" dependencies = [ - "bellman 0.13.1", + "bellman", "blake2b_simd", - "bls12_381 0.7.1", + "bls12_381", "directories", "getrandom 0.2.9", - "group 0.12.1", + "group", "itertools", "jubjub", "lazy_static", "masp_primitives", + "minreq", "rand_core 0.6.4", "redjubjub", "tracing", @@ -1988,6 +1902,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "minreq" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3de406eeb24aba36ed3829532fa01649129677186b44a49debec0ec574ca7da7" +dependencies = [ + "log", + "once_cell", + "rustls", + "webpki", + "webpki-roots", +] + [[package]] name = "miracl_core" version = "2.3.0" @@ -2002,22 +1929,18 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "namada" -version = "0.18.0" -source = "git+https://github.com/anoma/namada#c2779df63b226036c345f4ad645664933cd412d0" +version = "0.18.1" +source = "git+https://github.com/anoma/namada#fe693cbf573d27f55af5d16c8a14a83d7e1c6d1d" dependencies = [ "async-std", "async-trait", - "bellman 0.11.2", "bimap", - "bls12_381 0.6.1", "borsh", "circular-queue", "clru", "data-encoding", "derivation-path", "derivative", - "ibc", - "ibc-proto", "itertools", "masp_primitives", "masp_proofs", @@ -2033,8 +1956,6 @@ dependencies = [ "serde_json", "sha2 0.9.9", "slip10_ed25519", - "tendermint", - "tendermint-proto", "tendermint-rpc", "thiserror", "tiny-bip39 0.8.2 (git+https://github.com/anoma/tiny-bip39.git?rev=bf0f6d8713589b83af7a917366ec31f5275c0e57)", @@ -2048,14 +1969,13 @@ dependencies = [ [[package]] name = "namada_core" -version = "0.18.0" -source = "git+https://github.com/anoma/namada#c2779df63b226036c345f4ad645664933cd412d0" +version = "0.18.1" +source = "git+https://github.com/anoma/namada#fe693cbf573d27f55af5d16c8a14a83d7e1c6d1d" dependencies = [ "ark-bls12-381", "ark-ec", "ark-serialize", "bech32", - "bellman 0.11.2", "borsh", "chrono", "data-encoding", @@ -2094,8 +2014,8 @@ dependencies = [ [[package]] name = "namada_macros" -version = "0.18.0" -source = "git+https://github.com/anoma/namada#c2779df63b226036c345f4ad645664933cd412d0" +version = "0.18.1" +source = "git+https://github.com/anoma/namada#fe693cbf573d27f55af5d16c8a14a83d7e1c6d1d" dependencies = [ "proc-macro2", "quote", @@ -2104,13 +2024,12 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" -version = "0.18.0" -source = "git+https://github.com/anoma/namada#c2779df63b226036c345f4ad645664933cd412d0" +version = "0.18.1" +source = "git+https://github.com/anoma/namada#fe693cbf573d27f55af5d16c8a14a83d7e1c6d1d" dependencies = [ "borsh", "data-encoding", "derivative", - "hex", "namada_core", "once_cell", "thiserror", @@ -2250,22 +2169,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "pairing" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e415e349a3006dd7d9482cdab1c980a845bed1377777d768cb693a44540b42" -dependencies = [ - "group 0.11.0", -] - [[package]] name = "pairing" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" dependencies = [ - "group 0.12.1", + "group", ] [[package]] @@ -2563,12 +2473,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -2730,6 +2634,21 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -2768,6 +2687,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + [[package]] name = "ryu" version = "1.0.13" @@ -2842,6 +2773,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "semver" version = "0.11.0" @@ -3036,6 +2977,12 @@ dependencies = [ "sha2 0.9.9", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3126,7 +3073,7 @@ dependencies = [ [[package]] name = "tendermint" version = "0.23.6" -source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=4db3c5ea09fae4057008d22bf9e96bf541b55b35#4db3c5ea09fae4057008d22bf9e96bf541b55b35" +source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=02b256829e80f8cfecf3fa0d625c2a76c79cd043#02b256829e80f8cfecf3fa0d625c2a76c79cd043" dependencies = [ "async-trait", "bytes", @@ -3154,7 +3101,7 @@ dependencies = [ [[package]] name = "tendermint-config" version = "0.23.6" -source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=4db3c5ea09fae4057008d22bf9e96bf541b55b35#4db3c5ea09fae4057008d22bf9e96bf541b55b35" +source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=02b256829e80f8cfecf3fa0d625c2a76c79cd043#02b256829e80f8cfecf3fa0d625c2a76c79cd043" dependencies = [ "flex-error", "serde", @@ -3167,7 +3114,7 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" version = "0.23.6" -source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=4db3c5ea09fae4057008d22bf9e96bf541b55b35#4db3c5ea09fae4057008d22bf9e96bf541b55b35" +source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=02b256829e80f8cfecf3fa0d625c2a76c79cd043#02b256829e80f8cfecf3fa0d625c2a76c79cd043" dependencies = [ "derive_more", "flex-error", @@ -3179,7 +3126,7 @@ dependencies = [ [[package]] name = "tendermint-proto" version = "0.23.6" -source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=4db3c5ea09fae4057008d22bf9e96bf541b55b35#4db3c5ea09fae4057008d22bf9e96bf541b55b35" +source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=02b256829e80f8cfecf3fa0d625c2a76c79cd043#02b256829e80f8cfecf3fa0d625c2a76c79cd043" dependencies = [ "bytes", "flex-error", @@ -3196,7 +3143,7 @@ dependencies = [ [[package]] name = "tendermint-rpc" version = "0.23.6" -source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=4db3c5ea09fae4057008d22bf9e96bf541b55b35#4db3c5ea09fae4057008d22bf9e96bf541b55b35" +source = "git+https://github.com/heliaxdev/tendermint-rs.git?rev=02b256829e80f8cfecf3fa0d625c2a76c79cd043#02b256829e80f8cfecf3fa0d625c2a76c79cd043" dependencies = [ "async-trait", "bytes", @@ -3481,6 +3428,12 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.3.1" @@ -3658,6 +3611,25 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + [[package]] name = "which" version = "4.4.0" @@ -3841,15 +3813,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -[[package]] -name = "wyz" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" -dependencies = [ - "tap", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/packages/shared/lib/Cargo.toml b/packages/shared/lib/Cargo.toml index 0d8017b7e2..57b1dcce02 100644 --- a/packages/shared/lib/Cargo.toml +++ b/packages/shared/lib/Cargo.toml @@ -23,8 +23,7 @@ gloo-utils = { version = "0.1.5", features = ["serde"] } js-sys = "0.3.60" masp_primitives = { git = "https://github.com/anoma/masp", rev = "9320c6b69b5d2e97134866871e960f0a31703813" } masp_proofs = { git = "https://github.com/anoma/masp", rev = "9320c6b69b5d2e97134866871e960f0a31703813", default-features = false, features = ["local-prover"] } -# namada = { git = "https://github.com/anoma/namada", version = "0.18.0", default-features = false, features = ["abciplus", "namada-sdk"] } -namada = { git = "https://github.com/anoma/namada", branch = "draft", default-features = false, features = ["abciplus", "namada-sdk"] } +namada = { git = "https://github.com/anoma/namada", version = "0.18.1", default-features = false, features = ["abciplus", "namada-sdk"] } prost = "0.9.0" prost-types = "0.9.0" rand = "0.8.5" diff --git a/packages/shared/lib/src/sdk/mod.rs b/packages/shared/lib/src/sdk/mod.rs index c39df5bb97..e1ee893674 100644 --- a/packages/shared/lib/src/sdk/mod.rs +++ b/packages/shared/lib/src/sdk/mod.rs @@ -172,27 +172,23 @@ impl Sdk { &self, tx_bytes: &[u8], data_key: String, - code_key: String, header_key: String, ) -> Result { let mut tx: Tx = Tx::try_from(tx_bytes).map_err(JsError::from)?; let data_secret = SecretKey::from_str(&data_key).map_err(JsError::from)?; - let code_secret = SecretKey::from_str(&code_key).map_err(JsError::from)?; let header_secret = SecretKey::from_str(&header_key).map_err(JsError::from)?; // Sign over the transaction data tx.add_section(Section::Signature(Signature::new( - tx.data_sechash(), + vec![*tx.data_sechash(), *tx.code_sechash()], &SK::Ed25519(data_secret), ))); - // Sign over the transaction code - tx.add_section(Section::Signature(Signature::new( - tx.code_sechash(), - &SK::Ed25519(code_secret), - ))); + + tx.protocol_filter(); + // Then sign over the bound wrapper tx.add_section(Section::Signature(Signature::new( - &tx.header_hash(), + tx.sechashes(), &SK::Ed25519(header_secret), )));