From 9f2a83582ee2c015f192164346c9e169344e5204 Mon Sep 17 00:00:00 2001 From: Grigoriy Simonov Date: Wed, 23 Oct 2024 17:47:06 +0000 Subject: [PATCH] revert dependencies version bump --- Cargo.lock | 168 ++++++------------ Cargo.toml | 8 +- .../frame/revive/src/evm/api/signature.rs | 4 +- substrate/frame/revive/src/wasm/runtime.rs | 32 +++- 4 files changed, 86 insertions(+), 126 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a42f5baa4765..d5155b5d42cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -902,7 +902,7 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-runtime-common", - "primitive-types 0.13.1", + "primitive-types", "rococo-runtime-constants", "scale-info", "serde_json", @@ -1036,7 +1036,7 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-runtime-common", - "primitive-types 0.13.1", + "primitive-types", "scale-info", "serde_json", "snowbridge-router-primitives", @@ -5784,9 +5784,9 @@ dependencies = [ [[package]] name = "ethabi-decode" -version = "1.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9af52ec57c5147716872863c2567c886e7d62f539465b94352dbc0108fe5293" +checksum = "09d398648d65820a727d6a81e58b962f874473396a047e4c30bafe3240953417" dependencies = [ "ethereum-types", "tiny-keccak", @@ -5794,33 +5794,33 @@ dependencies = [ [[package]] name = "ethbloom" -version = "0.14.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c321610643004cf908ec0f5f2aa0d8f1f8e14b540562a2887a1111ff1ecbf7b" +checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" dependencies = [ "crunchy", "fixed-hash", - "impl-codec 0.7.0", + "impl-codec", "impl-rlp", - "impl-serde 0.5.0", + "impl-serde 0.4.0", "scale-info", "tiny-keccak", ] [[package]] name = "ethereum-types" -version = "0.15.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab15ed80916029f878e0267c3a9f92b67df55e79af370bf66199059ae2b4ee3" +checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" dependencies = [ "ethbloom", "fixed-hash", - "impl-codec 0.7.0", + "impl-codec", "impl-rlp", - "impl-serde 0.5.0", - "primitive-types 0.13.1", + "impl-serde 0.4.0", + "primitive-types", "scale-info", - "uint 0.10.0", + "uint", ] [[package]] @@ -7677,15 +7677,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-codec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67aa010c1e3da95bf151bd8b4c059b2ed7e75387cdb969b4f8f2723a43f9941" -dependencies = [ - "parity-scale-codec", -] - [[package]] name = "impl-num-traits" version = "0.1.2" @@ -7694,27 +7685,16 @@ checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", "num-traits", - "uint 0.9.5", -] - -[[package]] -name = "impl-num-traits" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803d15461ab0dcc56706adf266158acbc44ccf719bf7d0af30705f58b90a4b8c" -dependencies = [ - "integer-sqrt", - "num-traits", - "uint 0.10.0", + "uint", ] [[package]] name = "impl-rlp" -version = "0.4.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ed8ad1f3877f7e775b8cbf30ed1bd3209a95401817f19a0eb4402d13f8cf90" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" dependencies = [ - "rlp 0.6.1", + "rlp", ] [[package]] @@ -8457,7 +8437,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c" dependencies = [ - "primitive-types 0.12.2", + "primitive-types", "tiny-keccak", ] @@ -8488,7 +8468,7 @@ dependencies = [ "pallet-example-tasks", "parity-scale-codec", "polkadot-sdk", - "primitive-types 0.13.1", + "primitive-types", "scale-info", "serde_json", "sp-debug-derive 14.0.0", @@ -8902,7 +8882,7 @@ dependencies = [ "sha2 0.10.8", "smallvec", "thiserror", - "uint 0.9.5", + "uint", "unsigned-varint 0.7.2", "void", ] @@ -9365,7 +9345,7 @@ dependencies = [ "tokio-tungstenite", "tokio-util", "tracing", - "uint 0.9.5", + "uint", "unsigned-varint 0.8.0", "url", "x25519-dalek", @@ -10743,7 +10723,7 @@ dependencies = [ "pallet-assets", "pallet-balances", "parity-scale-codec", - "primitive-types 0.13.1", + "primitive-types", "scale-info", "sp-api 26.0.0", "sp-arithmetic 23.0.0", @@ -10764,7 +10744,7 @@ dependencies = [ "pallet-assets", "pallet-balances", "parity-scale-codec", - "primitive-types 0.13.1", + "primitive-types", "scale-info", "sp-arithmetic 23.0.0", "sp-core 28.0.0", @@ -12449,7 +12429,7 @@ dependencies = [ "polkavm 0.13.0", "polkavm-common 0.13.0", "pretty_assertions", - "rlp 0.6.1", + "rlp", "scale-info", "secp256k1", "serde", @@ -13298,7 +13278,7 @@ checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ "bitcoin_hashes 0.13.0", "rand", - "rand_core 0.6.4", + "rand_core 0.5.1", "serde", "unicode-normalization", ] @@ -13528,7 +13508,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", - "primitive-types 0.12.2", + "primitive-types", "scale-info", "smallvec", "sp-api 26.0.0", @@ -16576,26 +16556,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec 0.6.0", - "impl-num-traits 0.1.2", - "impl-serde 0.4.0", - "scale-info", - "uint 0.9.5", -] - -[[package]] -name = "primitive-types" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" -dependencies = [ - "fixed-hash", - "impl-codec 0.7.0", - "impl-num-traits 0.2.0", + "impl-codec", + "impl-num-traits", "impl-rlp", - "impl-serde 0.5.0", + "impl-serde 0.4.0", "scale-info", - "uint 0.10.0", + "uint", ] [[package]] @@ -16835,8 +16801,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302" dependencies = [ "bytes", - "heck 0.4.1", - "itertools 0.10.5", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", @@ -16869,7 +16835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.82", @@ -16882,7 +16848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.82", @@ -17686,16 +17652,6 @@ dependencies = [ "rustc-hex", ] -[[package]] -name = "rlp" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24e92bb2a83198bb76d661a71df9f7076b8c420b8696e4d3d97d50d94479e3" -dependencies = [ - "bytes", - "rustc-hex", -] - [[package]] name = "rocksdb" version = "0.21.0" @@ -18007,10 +17963,10 @@ dependencies = [ "num-bigint", "num-traits", "parity-scale-codec", - "primitive-types 0.12.2", + "primitive-types", "proptest", "rand", - "rlp 0.5.2", + "rlp", "ruint-macro", "serde", "valuable", @@ -19945,7 +19901,7 @@ checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" dependencies = [ "derive_more", "parity-scale-codec", - "primitive-types 0.12.2", + "primitive-types", "scale-bits", "scale-decode-derive", "scale-type-resolver", @@ -19972,7 +19928,7 @@ checksum = "4ba0b9c48dc0eb20c60b083c29447c0c4617cb7c4a4c9fef72aa5c5bc539e15e" dependencies = [ "derive_more", "parity-scale-codec", - "primitive-types 0.12.2", + "primitive-types", "scale-bits", "scale-encode-derive", "scale-type-resolver", @@ -20693,9 +20649,9 @@ dependencies = [ [[package]] name = "smol" -version = "2.0.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f" +checksum = "aad24f41392790e6ac67f4f4cd871da61f7d758e07b5622431e491e897d9c8a7" dependencies = [ "async-channel 2.3.0", "async-executor", @@ -20893,7 +20849,7 @@ dependencies = [ "serde_json", "siphasher 1.0.1", "slab", - "smol 2.0.2", + "smol 2.0.1", "smoldot 0.16.0", "zeroize", ] @@ -20940,7 +20896,7 @@ dependencies = [ "hex", "hex-literal", "parity-scale-codec", - "rlp 0.6.1", + "rlp", "scale-info", "serde", "snowbridge-ethereum", @@ -20988,7 +20944,7 @@ dependencies = [ "parity-bytes", "parity-scale-codec", "rand", - "rlp 0.6.1", + "rlp", "scale-info", "serde", "serde-big-array", @@ -21546,7 +21502,7 @@ dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", - "primitive-types 0.13.1", + "primitive-types", "rand", "scale-info", "serde", @@ -21796,7 +21752,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "paste", - "primitive-types 0.13.1", + "primitive-types", "rand", "regex", "scale-info", @@ -21845,7 +21801,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "paste", - "primitive-types 0.12.2", + "primitive-types", "rand", "scale-info", "schnorrkel 0.11.4", @@ -21892,7 +21848,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "paste", - "primitive-types 0.12.2", + "primitive-types", "rand", "scale-info", "schnorrkel 0.11.4", @@ -21939,7 +21895,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "paste", - "primitive-types 0.12.2", + "primitive-types", "rand", "scale-info", "schnorrkel 0.11.4", @@ -22585,7 +22541,7 @@ dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "primitive-types 0.12.2", + "primitive-types", "sp-externalities 0.19.0", "sp-runtime-interface-proc-macro 11.0.0", "sp-std 8.0.0", @@ -22603,7 +22559,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "polkavm-derive 0.9.1", - "primitive-types 0.13.1", + "primitive-types", "rustversion", "sp-core 28.0.0", "sp-externalities 0.25.0", @@ -22629,7 +22585,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "polkavm-derive 0.8.0", - "primitive-types 0.12.2", + "primitive-types", "sp-externalities 0.27.0", "sp-runtime-interface-proc-macro 18.0.0", "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -22649,7 +22605,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "polkavm-derive 0.9.1", - "primitive-types 0.12.2", + "primitive-types", "sp-externalities 0.28.0", "sp-runtime-interface-proc-macro 18.0.0", "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -23484,7 +23440,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-parachains", "polkadot-test-runtime", - "primitive-types 0.13.1", + "primitive-types", "scale-info", "sp-arithmetic 23.0.0", "sp-core 28.0.0", @@ -24114,7 +24070,7 @@ dependencies = [ "instant", "jsonrpsee 0.22.5", "parity-scale-codec", - "primitive-types 0.12.2", + "primitive-types", "reconnecting-jsonrpsee-ws-client", "scale-bits", "scale-decode", @@ -24169,7 +24125,7 @@ dependencies = [ "hex", "impl-serde 0.4.0", "parity-scale-codec", - "primitive-types 0.12.2", + "primitive-types", "scale-bits", "scale-decode", "scale-encode", @@ -25522,18 +25478,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "uint" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" -dependencies = [ - "byteorder", - "crunchy", - "hex", - "static_assertions", -] - [[package]] name = "unarray" version = "0.1.4" diff --git a/Cargo.toml b/Cargo.toml index 049de32b54cf..782a426e23cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -745,8 +745,8 @@ env_logger = { version = "0.11.2" } environmental = { version = "1.1.4", default-features = false } equivocation-detector = { path = "bridges/relays/equivocation" } ethabi = { version = "1.0.0", default-features = false, package = "ethabi-decode" } -ethbloom = { version = "0.14.1", default-features = false } -ethereum-types = { version = "0.15.1", default-features = false } +ethbloom = { version = "0.13.0", default-features = false } +ethereum-types = { version = "0.14.1", default-features = false } exit-future = { version = "0.2.0" } expander = { version = "2.0.0" } fatality = { version = "0.1.1" } @@ -1083,7 +1083,7 @@ polkavm-derive = "0.9.1" polkavm-linker = "0.9.2" portpicker = { version = "0.1.1" } pretty_assertions = { version = "1.3.0" } -primitive-types = { version = "0.13.1", default-features = false, features = ["num-traits"] } +primitive-types = { version = "0.12.1", default-features = false } proc-macro-crate = { version = "3.0.0" } proc-macro-warning = { version = "1.0.0", default-features = false } proc-macro2 = { version = "1.0.86" } @@ -1111,7 +1111,7 @@ relay-substrate-client = { path = "bridges/relays/client-substrate" } relay-utils = { path = "bridges/relays/utils" } remote-externalities = { path = "substrate/utils/frame/remote-externalities", default-features = false, package = "frame-remote-externalities" } reqwest = { version = "0.11", default-features = false } -rlp = { version = "0.6.1", default-features = false } +rlp = { version = "0.5.2", default-features = false } rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/relays/rococo" } rococo-parachain-runtime = { path = "cumulus/parachains/runtimes/testing/rococo-parachain" } rococo-runtime = { path = "polkadot/runtime/rococo" } diff --git a/substrate/frame/revive/src/evm/api/signature.rs b/substrate/frame/revive/src/evm/api/signature.rs index 957d50c8e324..0eb896a08c42 100644 --- a/substrate/frame/revive/src/evm/api/signature.rs +++ b/substrate/frame/revive/src/evm/api/signature.rs @@ -52,8 +52,8 @@ impl TransactionLegacySigned { /// Get the raw 65 bytes signature from the signed transaction. pub fn raw_signature(&self) -> Result<[u8; 65], ()> { let mut s = [0u8; 65]; - self.r.write_as_big_endian(s[0..32].as_mut()); - self.s.write_as_big_endian(s[32..64].as_mut()); + self.r.to_big_endian(s[0..32].as_mut()); + self.s.to_big_endian(s[32..64].as_mut()); s[64] = self.extract_recovery_id().ok_or(())?; Ok(s) } diff --git a/substrate/frame/revive/src/wasm/runtime.rs b/substrate/frame/revive/src/wasm/runtime.rs index 00be26aeaf8b..29c171277258 100644 --- a/substrate/frame/revive/src/wasm/runtime.rs +++ b/substrate/frame/revive/src/wasm/runtime.rs @@ -1536,11 +1536,13 @@ pub mod env { /// See [`pallet_revive_uapi::HostFn::balance`]. #[api_version(0)] fn balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> { + let mut bytes = [0u8; 32]; + &self.ext.balance().to_little_endian(&mut bytes); self.charge_gas(RuntimeCosts::Balance)?; Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &self.ext.balance().to_little_endian(), + &bytes, false, already_charged, )?) @@ -1558,10 +1560,12 @@ pub mod env { self.charge_gas(RuntimeCosts::BalanceOf)?; let mut address = H160::zero(); memory.read_into_buf(addr_ptr, address.as_bytes_mut())?; + let mut bytes = [0u8; 32]; + &self.ext.balance_of(&address).to_little_endian(&mut bytes); Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &self.ext.balance_of(&address).to_little_endian(), + &bytes, false, already_charged, )?) @@ -1571,10 +1575,12 @@ pub mod env { /// See [`pallet_revive_uapi::HostFn::chain_id`]. #[api_version(0)] fn chain_id(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> { + let mut bytes = [0u8; 32]; + &U256::from(::ChainId::get()).to_little_endian(&mut bytes); Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &U256::from(::ChainId::get()).to_little_endian(), + &bytes, false, |_| Some(RuntimeCosts::CopyToContract(32)), )?) @@ -1585,10 +1591,12 @@ pub mod env { #[api_version(0)] fn value_transferred(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> { self.charge_gas(RuntimeCosts::ValueTransferred)?; + let mut bytes = [0u8; 32]; + &self.ext.value_transferred().to_little_endian(&mut bytes); Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &self.ext.value_transferred().to_little_endian(), + &bytes, false, already_charged, )?) @@ -1599,10 +1607,12 @@ pub mod env { #[api_version(0)] fn now(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> { self.charge_gas(RuntimeCosts::Now)?; + let mut bytes = [0u8; 32]; + &self.ext.now().to_little_endian(&mut bytes); Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &self.ext.now().to_little_endian(), + &bytes, false, already_charged, )?) @@ -1613,10 +1623,12 @@ pub mod env { #[api_version(0)] fn minimum_balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> { self.charge_gas(RuntimeCosts::MinimumBalance)?; + let mut bytes = [0u8; 32]; + &self.ext.minimum_balance().to_little_endian(&mut bytes); Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &self.ext.minimum_balance().to_little_endian(), + &bytes, false, already_charged, )?) @@ -1667,10 +1679,12 @@ pub mod env { #[api_version(0)] fn block_number(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> { self.charge_gas(RuntimeCosts::BlockNumber)?; + let mut bytes = [0u8; 32]; + &self.ext.block_number().to_little_endian(&mut bytes); Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &self.ext.block_number().to_little_endian(), + &bytes, false, already_charged, )?) @@ -2025,10 +2039,12 @@ pub mod env { /// See [`pallet_revive_uapi::HostFn::return_data_size`]. #[api_version(0)] fn return_data_size(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> { + let mut bytes = [0u8; 32]; + U256::from(self.ext.last_frame_output().data.len()).to_little_endian(&mut bytes); Ok(self.write_fixed_sandbox_output( memory, out_ptr, - &U256::from(self.ext.last_frame_output().data.len()).to_little_endian(), + &bytes, false, |len| Some(RuntimeCosts::CopyToContract(len)), )?)