diff --git a/Cargo.lock b/Cargo.lock index d19919482..37cd58ebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -207,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -219,7 +219,7 @@ dependencies = [ "num-bigint", "num-traits", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -314,7 +314,7 @@ checksum = "8dd4e5f0bf8285d5ed538d27fab7411f3e297908fd93c62195de8bee3f199e82" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -460,13 +460,13 @@ checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" [[package]] name = "async-trait" -version = "0.1.66" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.11", ] [[package]] @@ -506,7 +506,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -518,7 +518,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -529,9 +529,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.7" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" dependencies = [ "async-trait", "axum-core", @@ -558,7 +558,6 @@ dependencies = [ "tokio 1.26.0", "tokio-tungstenite 0.18.0", "tower", - "tower-http", "tower-layer", "tower-service", ] @@ -867,7 +866,7 @@ dependencies = [ "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", - "syn", + "syn 1.0.109", ] [[package]] @@ -878,7 +877,7 @@ checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -889,7 +888,7 @@ checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1124,7 +1123,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1238,7 +1237,7 @@ version = "0.2.0" source = "git+https://github.com/webb-tools/lighthouse.git?branch=develop#913b28fb46ad651d3b6ca1efbfc85b68c3d314e3" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1365,7 +1364,7 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1895f6d7a191bb044e3c555190d1da555c2571a3af41f849f60c855580e392f" dependencies = [ - "syn", + "syn 1.0.109", ] [[package]] @@ -1574,7 +1573,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.109", ] [[package]] @@ -1591,7 +1590,7 @@ checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1625,7 +1624,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -1639,7 +1638,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -1650,7 +1649,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1661,7 +1660,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1682,7 +1681,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1695,7 +1694,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -1818,7 +1817,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2050,7 +2049,7 @@ dependencies = [ "tokio 1.26.0", "toml", "tree_hash 0.4.1 (git+https://github.com/webb-tools/pallet-eth2-light-client)", - "webb 0.5.19 (registry+https://github.com/rust-lang/crates.io-index)", + "webb 0.5.21", "webb-proposals", "webb-relayer-types 0.1.0 (git+https://github.com/webb-tools/relayer.git)", "webb-relayer-utils 0.1.0 (git+https://github.com/webb-tools/relayer.git)", @@ -2143,7 +2142,7 @@ dependencies = [ "darling 0.13.4", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2197,7 +2196,7 @@ dependencies = [ "tree_hash 0.4.1 (git+https://github.com/webb-tools/pallet-eth2-light-client)", "types", "warp", - "webb 0.5.19 (registry+https://github.com/rust-lang/crates.io-index)", + "webb 0.5.21", "webb-proposals", "webb-relayer-utils 0.1.0 (git+https://github.com/webb-tools/relayer.git)", ] @@ -2424,7 +2423,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "syn", + "syn 1.0.109", "toml", "url", "walkdir", @@ -2451,7 +2450,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "syn", + "syn 1.0.109", "tokio 1.26.0", "toml", "url", @@ -2470,7 +2469,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn", + "syn 1.0.109", ] [[package]] @@ -2486,7 +2485,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn", + "syn 1.0.109", ] [[package]] @@ -2514,7 +2513,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn", + "syn 1.0.109", "thiserror", "tiny-keccak", "unicode-xid", @@ -2547,7 +2546,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn", + "syn 1.0.109", "tempfile", "thiserror", "tiny-keccak", @@ -3044,7 +3043,7 @@ checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3606,7 +3605,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4425,7 +4424,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4495,7 +4494,7 @@ dependencies = [ "bytes 1.4.0", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4521,7 +4520,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4589,7 +4588,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4693,7 +4692,7 @@ checksum = "0f35583365be5d148e959284f42526841917b7bfa09e2d1a7ad5dde2cf0eaa39" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4791,7 +4790,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4835,7 +4834,7 @@ checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4846,7 +4845,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4902,7 +4901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebcd279d20a4a0a2404a33056388e950504d891c855c7975b9a8fef75f3bf04" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", ] [[package]] @@ -4960,7 +4959,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -4983,9 +4982,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] @@ -5058,9 +5057,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -5216,7 +5215,7 @@ checksum = "9c501201393982e275433bc55de7d6ae6f00e7699cd5572c5b57581cd69c881b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5346,7 +5345,7 @@ checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5539,7 +5538,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5589,7 +5588,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 1.0.109", ] [[package]] @@ -5794,7 +5793,7 @@ checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5805,7 +5804,7 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5871,7 +5870,7 @@ dependencies = [ "darling 0.13.4", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6183,7 +6182,7 @@ checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6316,7 +6315,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6518,7 +6517,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6540,7 +6539,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -6612,7 +6611,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata", - "syn", + "syn 1.0.109", "tokio 1.26.0", ] @@ -6625,7 +6624,7 @@ dependencies = [ "darling 0.14.4", "proc-macro-error", "subxt-codegen", - "syn", + "syn 1.0.109", ] [[package]] @@ -6651,7 +6650,7 @@ dependencies = [ "proc-macro2", "quote", "smallvec", - "syn", + "syn 1.0.109", ] [[package]] @@ -6705,6 +6704,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -6719,7 +6729,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -6784,7 +6794,7 @@ version = "0.2.0" source = "git+https://github.com/webb-tools/lighthouse.git?branch=develop#913b28fb46ad651d3b6ca1efbfc85b68c3d314e3" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6819,7 +6829,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6962,7 +6972,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -7123,7 +7133,6 @@ dependencies = [ "http-body 0.4.5", "http-range-header", "pin-project-lite 0.2.9", - "tower", "tower-layer", "tower-service", "tracing", @@ -7162,7 +7171,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -7270,7 +7279,7 @@ checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" dependencies = [ "lazy_static", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -7300,7 +7309,7 @@ source = "git+https://github.com/webb-tools/lighthouse.git?branch=develop#913b28 dependencies = [ "darling 0.13.4", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -7310,7 +7319,7 @@ source = "git+https://github.com/webb-tools/pallet-eth2-light-client#85a6561d61e dependencies = [ "darling 0.13.4", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -7429,7 +7438,7 @@ checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -7440,7 +7449,7 @@ checksum = "6179333b981641242a768f30f371c9baccbfcc03749627000c500ab88bf4528b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -7712,7 +7721,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -7746,7 +7755,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7957,25 +7966,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webb" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9977dbdc7747b3976e4a201e3f933d9ead9c7793d341b5bbceb8641ff17c9bc8" -dependencies = [ - "async-trait", - "ethers 2.0.0", - "hex", - "parity-scale-codec", - "rand 0.8.5", - "scale-info", - "serde", - "serde_json", - "subxt", - "tempfile", - "thiserror", -] - [[package]] name = "webb" version = "0.5.19" @@ -7993,8 +7983,9 @@ dependencies = [ [[package]] name = "webb" -version = "0.5.20" -source = "git+https://github.com/webb-tools/webb-rs.git?rev=2bbe7b6a4f9#2bbe7b6a4f92e18de39572b3b1f2a8e3e6ee57f4" +version = "0.5.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426649fd51964143b49326891ba1d5a10f166645f7b5a16794a0045e8361ad27" dependencies = [ "async-trait", "ethers 2.0.0", @@ -8024,7 +8015,7 @@ dependencies = [ "tempfile", "tokio 1.26.0", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-relayer", "webb-relayer-config", "webb-relayer-context", @@ -8045,7 +8036,7 @@ dependencies = [ "sp-core", "tokio 1.26.0", "typed-builder 0.12.0", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", "webb-relayer-config", "webb-relayer-utils 0.1.0", @@ -8063,7 +8054,7 @@ dependencies = [ "tokio 1.26.0", "tracing", "tracing-test", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", "webb-relayer-config", "webb-relayer-context", @@ -8082,7 +8073,7 @@ dependencies = [ "sled", "tokio 1.26.0", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-event-watcher-traits", "webb-proposals", "webb-relayer-config", @@ -8109,7 +8100,7 @@ dependencies = [ "sled", "tokio 1.26.0", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-bridge-registry-backends", "webb-event-watcher-traits", "webb-proposal-signing-backends", @@ -8131,7 +8122,7 @@ dependencies = [ "sp-core", "tokio 1.26.0", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-event-watcher-traits", "webb-proposal-signing-backends", "webb-proposals", @@ -8164,7 +8155,7 @@ dependencies = [ "thiserror", "tokio 1.26.0", "tracing", - "webb 0.5.19 (git+https://github.com/webb-tools/webb-rs)", + "webb 0.5.19", "webb-proposal-signing-backends", "webb-proposals", "webb-relayer", @@ -8193,7 +8184,7 @@ dependencies = [ "tokio 1.26.0", "tracing", "typed-builder 0.12.0", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", "webb-relayer-store", "webb-relayer-types 0.1.0", @@ -8234,7 +8225,7 @@ dependencies = [ "tower-http", "tracing", "url", - "webb 0.5.20", + "webb 0.5.21", "webb-bridge-registry-backends", "webb-event-watcher-traits", "webb-ew-dkg", @@ -8270,7 +8261,7 @@ dependencies = [ "tracing", "tracing-subscriber 0.3.16", "url", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", "webb-relayer-store", "webb-relayer-types 0.1.0", @@ -8286,7 +8277,7 @@ dependencies = [ "native-tls", "sp-core", "tokio 1.26.0", - "webb 0.5.20", + "webb 0.5.21", "webb-relayer-config", "webb-relayer-store", "webb-relayer-utils 0.1.0", @@ -8299,7 +8290,7 @@ dependencies = [ "native-tls", "serde", "tokio 1.26.0", - "webb 0.5.20", + "webb 0.5.21", "webb-relayer-tx-relay-utils", ] @@ -8318,7 +8309,7 @@ dependencies = [ "tokio 1.26.0", "tokio-stream", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", "webb-relayer-config", "webb-relayer-context", @@ -8340,7 +8331,7 @@ dependencies = [ "sled", "tempfile", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", "webb-relayer-utils 0.1.0", ] @@ -8359,7 +8350,7 @@ dependencies = [ "sp-runtime", "tokio 1.26.0", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-relayer-context", "webb-relayer-store", "webb-relayer-types 0.1.0", @@ -8378,7 +8369,7 @@ dependencies = [ "serde", "tokio 1.26.0", "tracing", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", "webb-relayer-config", "webb-relayer-context", @@ -8405,7 +8396,7 @@ dependencies = [ "tiny-bip39", "tracing", "url", - "webb 0.5.20", + "webb 0.5.21", ] [[package]] @@ -8420,7 +8411,7 @@ dependencies = [ "tiny-bip39", "tracing", "url", - "webb 0.5.19 (registry+https://github.com/rust-lang/crates.io-index)", + "webb 0.5.21", ] [[package]] @@ -8444,7 +8435,7 @@ dependencies = [ "sled", "thiserror", "url", - "webb 0.5.20", + "webb 0.5.21", "webb-proposals", ] @@ -8469,7 +8460,7 @@ dependencies = [ "sled", "thiserror", "url", - "webb 0.5.19 (registry+https://github.com/rust-lang/crates.io-index)", + "webb 0.5.21", "webb-proposals", ] @@ -8721,7 +8712,7 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index f34187ccc..97d69ed5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ tokio = { version = "^1", features = ["full"] } config = { version = "0.13", default-features = false, features = ["toml", "json"] } serde_json = { version = "^1", default-features = false } paw = { version = "^1.0" } -webb = { git = "https://github.com/webb-tools/webb-rs.git", rev = "2bbe7b6a4f9", default-features = false } +webb = { version="0.5.21", default-features = false } sp-core = { version = "16.0.0", default-features = false } sp-runtime = { version = "18.0.0", default-features = false } # Used by ethers (but we need it to be vendored with the lib). @@ -47,7 +47,7 @@ native-tls = { version = "^0.2", features = ["vendored"] } webb-proposals = { version = "0.5.4", default-features = false, features = ["scale"] } ethereum-types = "0.14.1" dotenv = "0.15.0" -axum = { version = "0.6.4", features = ["ws"] } +axum = { version = "0.6.12", features = ["ws"] } tempfile = "^3.3" async-trait = "^0.1" futures = { version = "^0.3", default-features = false } diff --git a/config/development/evm-local-tangle/main.toml b/config/development/evm-local-tangle/main.toml index 4fc8de9aa..9c623072b 100644 --- a/config/development/evm-local-tangle/main.toml +++ b/config/development/evm-local-tangle/main.toml @@ -3,7 +3,7 @@ port = 9955 [experimental] smart-anchor-updates = false smart-anchor-updates-retries = 3 - +# etherscan api key [evm-etherscan.mainnet] chain-id = 5001 api-key = "$ETHERSCAN_API_KEY" \ No newline at end of file diff --git a/crates/bridge-registry-backends/tests/submit_anchor_update_proposal.rs b/crates/bridge-registry-backends/tests/submit_anchor_update_proposal.rs index 320ba20ce..782c58c1e 100644 --- a/crates/bridge-registry-backends/tests/submit_anchor_update_proposal.rs +++ b/crates/bridge-registry-backends/tests/submit_anchor_update_proposal.rs @@ -5,6 +5,7 @@ use webb::substrate::dkg_runtime::api as RuntimeApi; use webb::substrate::dkg_runtime::api::runtime_types::webb_proposals::header::ResourceId as DkgResourceId; use webb::substrate::dkg_runtime::api::runtime_types::webb_proposals::header::TypedChainId as DkgTypedChainId; use webb::substrate::dkg_runtime::api::runtime_types::webb_proposals::nonce::Nonce as DkgNonce; +use webb::substrate::dkg_runtime::api::runtime_types::sp_core::bounded::bounded_vec::BoundedVec; use webb::substrate::subxt::tx::{PairSigner, TxProgress, TxStatus}; use webb::substrate::subxt::{OnlineClient, PolkadotConfig}; use webb_bridge_registry_backends::dkg::DkgBridgeRegistryBackend; @@ -68,7 +69,7 @@ async fn submit_anchor_update_proposal() { DkgNonce(account_nonce), DkgTypedChainId::Evm(5001), DkgResourceId(resource_id.into_bytes()), - anchor_update_proposal.to_vec(), + BoundedVec(anchor_update_proposal.to_vec()), ); let mut progress = api diff --git a/crates/proposal-signing-backends/src/dkg.rs b/crates/proposal-signing-backends/src/dkg.rs index 752f94b3c..b763d767d 100644 --- a/crates/proposal-signing-backends/src/dkg.rs +++ b/crates/proposal-signing-backends/src/dkg.rs @@ -2,6 +2,7 @@ use std::sync::Arc; use futures::StreamExt; use tokio::sync::Mutex; use webb::substrate::dkg_runtime::api::runtime_types::webb_proposals::header::{TypedChainId, ResourceId}; +use webb::substrate::dkg_runtime::api::runtime_types::sp_core::bounded::bounded_vec::BoundedVec; use webb::substrate::dkg_runtime::api::runtime_types::webb_proposals::nonce::Nonce; use webb::substrate::subxt::{OnlineClient, PolkadotConfig}; use sp_core::sr25519::Pair as Sr25519Pair; @@ -103,7 +104,7 @@ impl super::ProposalSigningBackend for DkgProposalSigningBackend { nonce, src_chain_id, ResourceId(resource_id.into_bytes()), - proposal.to_vec(), + BoundedVec(proposal.to_vec()), ); // TODO: here we should have a substrate based tx queue in the background diff --git a/crates/relayer-utils/src/lib.rs b/crates/relayer-utils/src/lib.rs index 00931b481..cdac3ffdc 100644 --- a/crates/relayer-utils/src/lib.rs +++ b/crates/relayer-utils/src/lib.rs @@ -103,6 +103,9 @@ pub enum Error { /// Etherscan API error #[error(transparent)] Etherscan(#[from] ethers::etherscan::errors::EtherscanError), + /// Ether wallet errors. + #[error(transparent)] + EtherWalletError(#[from] ethers::signers::WalletError), /// Ethers currency conversion error #[error(transparent)] Conversion(#[from] ethers::utils::ConversionError),