diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index 004ced4a..37f4aed9 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -9,8 +9,8 @@ publish = false [dependencies] np-runtime = { workspace = true } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/frame/babel/Cargo.toml b/frame/babel/Cargo.toml index b424b463..e405e2cf 100644 --- a/frame/babel/Cargo.toml +++ b/frame/babel/Cargo.toml @@ -14,39 +14,39 @@ cosmwasm-std = { workspace = true, default-features = false, optional = true } cosmwasm-vm = { workspace = true, default-features = false, optional = true } cosmwasm-vm-wasmi = { workspace = true, default-features = false, optional = true } ethereum = { version = "0.15.0", default-features = false, optional = true } -fp-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +fp-evm = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } hex-literal = "0.4" np-babel = { workspace = true, default-features = false } np-cosmos = { workspace = true, optional = true } np-ethereum = { workspace = true, optional = true } num_enum = { version = "0.7", default-features = false, optional = true } -pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false, optional = true } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false, optional = true } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } pallet-cosmos = { workspace = true, default-features = false, optional = true } pallet-cosmos-types = { workspace = true, default-features = false, optional = true } pallet-cosmos-x-auth-signing = { workspace = true, default-features = false, optional = true } pallet-cosmos-x-bank = { workspace = true, default-features = false, optional = true } pallet-cosmos-x-wasm = { workspace = true, default-features = false, optional = true } pallet-cosmwasm = { workspace = true, default-features = false, optional = true } -pallet-ethereum = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } -pallet-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } +pallet-ethereum = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } +pallet-evm = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } pallet-evm-precompileset-assets-erc20 = { workspace = true, optional = true } pallet-evm-precompile-balances-erc20 = { workspace = true, optional = true } -pallet-evm-precompile-blake2 = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } -pallet-evm-precompile-bn128 = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } -pallet-evm-precompile-modexp = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } -pallet-evm-precompile-simple = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } +pallet-evm-precompile-blake2 = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } +pallet-evm-precompile-bn128 = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } +pallet-evm-precompile-modexp = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } +pallet-evm-precompile-simple = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } pallet-multimap = { workspace = true, default-features = false } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] } -precompile-utils = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, optional = true } +precompile-utils = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, optional = true } scale-info = { version = "2.11", default-features = false, features = ["derive"] } serde = { version = "1.0.210", default-features = false, features = ["derive"], optional = true } serde-json-wasm = { version = "1.0.1", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [dev-dependencies] hex = "0.4.3" diff --git a/frame/babel/src/ethereum/precompile.rs b/frame/babel/src/ethereum/precompile.rs index 600abb34..154bc97c 100644 --- a/frame/babel/src/ethereum/precompile.rs +++ b/frame/babel/src/ethereum/precompile.rs @@ -23,7 +23,7 @@ use frame_support::{ dispatch::{DispatchClass, GetDispatchInfo, Pays, PostDispatchInfo}, StorageHasher, Twox128, }; -use pallet_evm::{AddressMapping, GasWeightMapping}; +use pallet_evm::{AddressMapping, FrameSystemAccountProvider, GasWeightMapping}; use pallet_evm_precompile_balances_erc20::Erc20Metadata; use pallet_evm_precompileset_assets_erc20::AddressToAssetId; use parity_scale_codec::{Decode, DecodeLimit, Encode}; @@ -33,7 +33,7 @@ use sp_runtime::traits::{Dispatchable, Get}; pub trait Config: pallet_assets::Config + pallet_balances::Config - + pallet_evm::Config + + pallet_evm::Config> + Erc20Metadata + AddressToAssetId { diff --git a/frame/babel/src/lib.rs b/frame/babel/src/lib.rs index 5c51c6ae..8f4512b5 100644 --- a/frame/babel/src/lib.rs +++ b/frame/babel/src/lib.rs @@ -54,7 +54,7 @@ pub mod pallet { }; use pallet_cosmos_types::address::acc_address_from_bech32; use pallet_cosmos_x_auth_signing::sign_verifiable_tx::traits::SigVerifiableTx; - use pallet_evm::AddressMapping as _; + use pallet_evm::{AddressMapping as _, FrameSystemAccountProvider}; use pallet_multimap::traits::{UniqueMap, UniqueMultimap}; use sp_core::ecdsa; use sp_runtime::{ @@ -72,7 +72,7 @@ pub mod pallet { + pallet_balances::Config + pallet_cosmos::Config::AssetId> + pallet_ethereum::Config - + pallet_evm::Config + + pallet_evm::Config> { type AddressMap: UniqueMultimap; type AssetMap: UniqueMap, DenomOf>; diff --git a/frame/cosmos/Cargo.toml b/frame/cosmos/Cargo.toml index 4b55de46..f28a9227 100644 --- a/frame/cosmos/Cargo.toml +++ b/frame/cosmos/Cargo.toml @@ -9,16 +9,16 @@ publish = false [dependencies] cosmos-sdk-proto = { version = "0.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } pallet-cosmos-x-auth-signing = { workspace = true, default-features = false } pallet-cosmos-types = { workspace = true, default-features = false } pallet-multimap = { workspace = true, default-features = false } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] } np-cosmos = { workspace = true, default-features = false } scale-info = { version = "2.11", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/frame/cosmos/rpc/Cargo.toml b/frame/cosmos/rpc/Cargo.toml index 69d3e798..b159b61d 100644 --- a/frame/cosmos/rpc/Cargo.toml +++ b/frame/cosmos/rpc/Cargo.toml @@ -11,9 +11,9 @@ publish = false cosmos-runtime-api = { workspace = true, features = ["std"] } futures = "0.3" hex = "0.4.3" -jsonrpsee = { version = "0.23", features = ["client", "server", "macros"] } -sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } +jsonrpsee = { version = "0.24", features = ["client", "server", "macros"] } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } diff --git a/frame/cosmos/runtime-api/Cargo.toml b/frame/cosmos/runtime-api/Cargo.toml index 9ea81da2..b4909488 100644 --- a/frame/cosmos/runtime-api/Cargo.toml +++ b/frame/cosmos/runtime-api/Cargo.toml @@ -12,8 +12,8 @@ pallet-cosmos-types = { workspace = true, default-features = false } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } serde = { version = "1.0.210", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/frame/cosmos/types/Cargo.toml b/frame/cosmos/types/Cargo.toml index 04f7b691..8a69bccb 100644 --- a/frame/cosmos/types/Cargo.toml +++ b/frame/cosmos/types/Cargo.toml @@ -10,12 +10,12 @@ publish = false [dependencies] bech32 = { version = "0.11", default-features = false, features = ["alloc"] } cosmos-sdk-proto = { version = "0.24", default-features = false, features = ["cosmwasm"] } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } impl-trait-for-tuples = { version = "0.2.2" } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } serde = { version = "1.0.210", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [dev-dependencies] hex = "0.4" diff --git a/frame/cosmos/x/auth/Cargo.toml b/frame/cosmos/x/auth/Cargo.toml index 07efe37e..1f1741ff 100644 --- a/frame/cosmos/x/auth/Cargo.toml +++ b/frame/cosmos/x/auth/Cargo.toml @@ -9,16 +9,16 @@ publish = false [dependencies] cosmos-sdk-proto = { version = "0.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } np-cosmos = { workspace = true, default-features = false } pallet-cosmos = { workspace = true, default-features = false } pallet-cosmos-types = { workspace = true, default-features = false } pallet-cosmos-x-auth-signing = { workspace = true, default-features = false } ripemd = { version = "0.1.3", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [dev-dependencies] hex = "0.4" diff --git a/frame/cosmos/x/auth/signing/Cargo.toml b/frame/cosmos/x/auth/signing/Cargo.toml index 3d994727..1b46d6e7 100644 --- a/frame/cosmos/x/auth/signing/Cargo.toml +++ b/frame/cosmos/x/auth/signing/Cargo.toml @@ -20,7 +20,7 @@ serde_json = { version = "1.0.127", default-features = false } [dev-dependencies] base64ct = { version = "1.6.0", default-features = false } hex = { version = "0.4.3", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/frame/cosmos/x/bank/Cargo.toml b/frame/cosmos/x/bank/Cargo.toml index 3d8f098a..0cbf8fe5 100644 --- a/frame/cosmos/x/bank/Cargo.toml +++ b/frame/cosmos/x/bank/Cargo.toml @@ -9,13 +9,13 @@ publish = false [dependencies] cosmos-sdk-proto = { version = "0.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } pallet-cosmos = { workspace = true, default-features = false } pallet-cosmos-types = { workspace = true, default-features = false } pallet-cosmos-x-bank-types = { workspace = true, default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/frame/cosmos/x/wasm/Cargo.toml b/frame/cosmos/x/wasm/Cargo.toml index 7b692be5..5db35235 100644 --- a/frame/cosmos/x/wasm/Cargo.toml +++ b/frame/cosmos/x/wasm/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] core2 = { version = "0.4.0", default-features = false, features = ["alloc"] } cosmos-sdk-proto = { version = "0.24", default-features = false, features = ["cosmwasm"] } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } hex = { version = "0.4.3", default-features = false } libflate = { version = "2.1.0", default-features = false } log = { version = "0.4.21", default-features = false } @@ -18,8 +18,8 @@ pallet-cosmos = { workspace = true, default-features = false } pallet-cosmos-types = { workspace = true, default-features = false } pallet-cosmos-x-wasm-types = { workspace = true, default-features = false } pallet-cosmwasm = { workspace = true, default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/frame/multimap/Cargo.toml b/frame/multimap/Cargo.toml index 4c8af3ae..9004e83f 100644 --- a/frame/multimap/Cargo.toml +++ b/frame/multimap/Cargo.toml @@ -8,13 +8,13 @@ repository = "https://github.com/noirhq/noir.git" publish = false [dependencies] -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } parity-scale-codec = { version = "3.6", default-features = false } scale-info = { version = "2.11", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } [features] default = ["std"] diff --git a/primitives/babel/Cargo.toml b/primitives/babel/Cargo.toml index e28d7780..f26232c5 100644 --- a/primitives/babel/Cargo.toml +++ b/primitives/babel/Cargo.toml @@ -13,7 +13,7 @@ np-ethereum = { workspace = true, default-features = false, optional = true } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } serde = { version = "1.0", default-features = false, features = ["derive"], optional = true } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std", "cosmos", "ethereum"] diff --git a/primitives/cosmos/Cargo.toml b/primitives/cosmos/Cargo.toml index e1799b7f..335981bc 100644 --- a/primitives/cosmos/Cargo.toml +++ b/primitives/cosmos/Cargo.toml @@ -14,9 +14,9 @@ parity-scale-codec = { version = "3.6", default-features = false, features = ["d ripemd = { version = "0.1", default-features = false } scale-info = { version = "2.11", default-features = false, features = ["derive"] } serde = { version = "1.0", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [dev-dependencies] const-hex = "1.12.0" diff --git a/primitives/ethereum/Cargo.toml b/primitives/ethereum/Cargo.toml index 22397db9..beb4794d 100644 --- a/primitives/ethereum/Cargo.toml +++ b/primitives/ethereum/Cargo.toml @@ -14,9 +14,9 @@ k256 = { version = "0.13", default-features = false } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } serde = { version = "1.0", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml index b857b575..03e2d113 100644 --- a/primitives/runtime/Cargo.toml +++ b/primitives/runtime/Cargo.toml @@ -10,14 +10,14 @@ publish = false [dependencies] buidl = { version = "0.1.1", default-features = false, features = ["derive"] } const-hex = { version = "1.12", default-features = false } -fp-self-contained = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +fp-self-contained = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } serde = { version = "1.0", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 88a2db97..4a20145a 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -8,10 +8,10 @@ repository = "https://github.com/noirhq/noir.git" publish = false [dependencies] -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } noir-core-primitives = { workspace = true } -pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } static_assertions = "1.1" [features] diff --git a/vendor/composable/composable-support/Cargo.toml b/vendor/composable/composable-support/Cargo.toml index 60c496c3..6c18450a 100644 --- a/vendor/composable/composable-support/Cargo.toml +++ b/vendor/composable/composable-support/Cargo.toml @@ -15,9 +15,9 @@ codec = { version = "3.6.0", package = "parity-scale-codec", default-features = ] } num-traits = { version = "0.2.14", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/vendor/composable/cosmwasm/Cargo.toml b/vendor/composable/cosmwasm/Cargo.toml index 4afcf404..4368f0b9 100644 --- a/vendor/composable/cosmwasm/Cargo.toml +++ b/vendor/composable/cosmwasm/Cargo.toml @@ -31,14 +31,14 @@ wasmi = { version = "0.30.0", default-features = false } wasm-instrument = { version = "0.4.0", default-features = false } wasmi-validation = { version = "0.5.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } composable-support = { workspace = true, default-features = false } cosmwasm-std = { workspace = true, default-features = false, features = [ diff --git a/vendor/composable/cosmwasm/rpc/Cargo.toml b/vendor/composable/cosmwasm/rpc/Cargo.toml index 5b1cf942..6ccf25f2 100644 --- a/vendor/composable/cosmwasm/rpc/Cargo.toml +++ b/vendor/composable/cosmwasm/rpc/Cargo.toml @@ -11,10 +11,10 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # substrate primitives -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } # local cosmwasm-runtime-api = { workspace = true } @@ -25,4 +25,4 @@ codec = { package = "parity-scale-codec", version = "3.6", default-features = fa ] } # rpc -jsonrpsee = { version = "0.23", features = ["client", "server", "macros"] } +jsonrpsee = { version = "0.24", features = ["client", "server", "macros"] } diff --git a/vendor/composable/cosmwasm/runtime-api/Cargo.toml b/vendor/composable/cosmwasm/runtime-api/Cargo.toml index fe87c0a4..0b230c97 100644 --- a/vendor/composable/cosmwasm/runtime-api/Cargo.toml +++ b/vendor/composable/cosmwasm/runtime-api/Cargo.toml @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3.6", default-features = false, features = [ "derive", ] } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } [features] default = ["std"] diff --git a/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml b/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml index 60a55249..2c259bb4 100644 --- a/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml +++ b/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml @@ -11,21 +11,21 @@ num_enum = { version = "0.7", default-features = false } paste = "1.0" # Substrate -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } parity-scale-codec = { version = "3.6", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } # Frontier -fp-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false } -pallet-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, features = ["forbid-evm-reentrancy"] } -precompile-utils = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false } +fp-evm = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false } +pallet-evm = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, features = ["forbid-evm-reentrancy"] } +precompile-utils = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false } # Moonkit #moonkit-xcm-primitives = { workspace = true } @@ -37,7 +37,7 @@ serde = "1.0" sha3 = "0.10" # Moonbeam -precompile-utils = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", features = ["testing"] } +precompile-utils = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", features = ["testing"] } [features] default = ["std"] diff --git a/vendor/moonbeam/precompiles/assets-erc20/src/eip2612.rs b/vendor/moonbeam/precompiles/assets-erc20/src/eip2612.rs index efecfe91..30dd7d5f 100644 --- a/vendor/moonbeam/precompiles/assets-erc20/src/eip2612.rs +++ b/vendor/moonbeam/precompiles/assets-erc20/src/eip2612.rs @@ -25,6 +25,7 @@ use pallet_assets::pallet::{ Instance1, Instance10, Instance11, Instance12, Instance13, Instance14, Instance15, Instance16, Instance2, Instance3, Instance4, Instance5, Instance6, Instance7, Instance8, Instance9, }; +use pallet_evm::FrameSystemAccountProvider; use scale_info::prelude::string::ToString; use sp_core::H256; use sp_io::hashing::keccak_256; @@ -114,15 +115,17 @@ pub struct Eip2612(PhantomData<(Runtime, Instan impl Eip2612 where Instance: InstanceToPrefix + 'static, - Runtime: pallet_assets::Config + pallet_evm::Config + frame_system::Config, + Runtime: pallet_assets::Config + + pallet_evm::Config> + + frame_system::Config, Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, Runtime::RuntimeCall: From>, - ::RuntimeOrigin: From>, + ::RuntimeOrigin: From>>, BalanceOf: TryFrom + Into + solidity::Codec, Runtime: AddressToAssetId>, <::RuntimeCall as Dispatchable>::RuntimeOrigin: OriginTrait, AssetIdOf: Display, - Runtime::AccountId: Into, + AccountIdOf: Into, { fn compute_domain_separator(address: H160, asset_id: AssetIdOf) -> [u8; 32] { let asset_name = pallet_assets::Pallet::::name(asset_id.clone()); diff --git a/vendor/moonbeam/precompiles/assets-erc20/src/lib.rs b/vendor/moonbeam/precompiles/assets-erc20/src/lib.rs index e7b6bacc..37c9536e 100644 --- a/vendor/moonbeam/precompiles/assets-erc20/src/lib.rs +++ b/vendor/moonbeam/precompiles/assets-erc20/src/lib.rs @@ -33,7 +33,7 @@ use frame_support::{ }, }; //use moonkit_xcm_primitives::AccountIdAssetIdConversion; -use pallet_evm::AddressMapping; +use pallet_evm::{AddressMapping, FrameSystemAccountProvider}; use precompile_utils::prelude::*; #[cfg(not(test))] use sp_runtime::traits::Zero; @@ -55,6 +55,8 @@ pub const SELECTOR_LOG_TRANSFER: [u8; 32] = keccak256!("Transfer(address,address /// Solidity selector of the Approval log, which is the Keccak of the Log signature. pub const SELECTOR_LOG_APPROVAL: [u8; 32] = keccak256!("Approval(address,address,uint256)"); +pub type AccountIdOf = ::AccountId; + /// Alias for the Balance type for the provided Runtime and Instance. pub type BalanceOf = >::Balance; @@ -113,15 +115,17 @@ impl Erc20AssetsPrecompileSet { impl Erc20AssetsPrecompileSet where Instance: eip2612::InstanceToPrefix + 'static, - Runtime: pallet_assets::Config + pallet_evm::Config + frame_system::Config, + Runtime: pallet_assets::Config + + pallet_evm::Config> + + frame_system::Config, Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, Runtime::RuntimeCall: From>, - ::RuntimeOrigin: From>, + ::RuntimeOrigin: From>>, BalanceOf: TryFrom + Into + solidity::Codec, Runtime: AddressToAssetId>, <::RuntimeCall as Dispatchable>::RuntimeOrigin: OriginTrait, AssetIdOf: Display, - Runtime::AccountId: Into, + AccountIdOf: Into, { /// PrecompileSet discriminant. Allows to knows if the address maps to an asset id, /// and if this is the case which one. @@ -176,7 +180,7 @@ where // Fetch info. let amount: U256 = { - let who: Runtime::AccountId = Runtime::AddressMapping::into_account_id(who); + let who: AccountIdOf = Runtime::AddressMapping::into_account_id(who); pallet_assets::Pallet::::balance(asset_id, &who).into() }; @@ -201,8 +205,8 @@ where // Fetch info. let amount: U256 = { - let owner: Runtime::AccountId = Runtime::AddressMapping::into_account_id(owner); - let spender: Runtime::AccountId = Runtime::AddressMapping::into_account_id(spender); + let owner: AccountIdOf = Runtime::AddressMapping::into_account_id(owner); + let spender: AccountIdOf = Runtime::AddressMapping::into_account_id(spender); // Fetch info. pallet_assets::Pallet::::allowance(asset_id, &owner, &spender).into() @@ -246,7 +250,7 @@ where value: U256, ) -> EvmResult { let owner = Runtime::AddressMapping::into_account_id(owner); - let spender: Runtime::AccountId = Runtime::AddressMapping::into_account_id(spender); + let spender: AccountIdOf = Runtime::AddressMapping::into_account_id(spender); // XXX: Need a general way to handle non-unified account #[cfg(not(test))] if frame_system::Account::::get(&spender).nonce.is_zero() { @@ -348,10 +352,10 @@ where let value = Self::u256_to_amount(value).in_field("value")?; { - let caller: Runtime::AccountId = + let caller: AccountIdOf = Runtime::AddressMapping::into_account_id(handle.context().caller); - let from: Runtime::AccountId = Runtime::AddressMapping::into_account_id(from.clone()); - let to: Runtime::AccountId = Runtime::AddressMapping::into_account_id(to); + let from: AccountIdOf = Runtime::AddressMapping::into_account_id(from.clone()); + let to: AccountIdOf = Runtime::AddressMapping::into_account_id(to); // If caller is "from", it can spend as much as it wants from its own balance. if caller != from { diff --git a/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml b/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml index 209c75cc..8cc78098 100644 --- a/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml +++ b/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml @@ -12,19 +12,19 @@ paste = "1.0" slices = "0.2" # Substrate -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } parity-scale-codec = { version = "3.6", default-features = false, features = ["max-encoded-len"] } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } # Frontier -fp-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false } -pallet-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false, features = ["forbid-evm-reentrancy"] } -precompile-utils = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", default-features = false } +fp-evm = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false } +pallet-evm = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false, features = ["forbid-evm-reentrancy"] } +precompile-utils = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", default-features = false } [dev-dependencies] hex-literal = "0.4" @@ -33,7 +33,7 @@ serde = "1.0" sha3 = "0.10" # Moonbeam -precompile-utils = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2407", features = ["testing"] } +precompile-utils = { git = "https://github.com/polkadot-evm/frontier", rev = "aacf5a4e", features = ["testing"] } scale-info = { version = "2.11", features = ["derive"] } diff --git a/vendor/moonbeam/precompiles/balances-erc20/src/eip2612.rs b/vendor/moonbeam/precompiles/balances-erc20/src/eip2612.rs index 4cc64b07..474ad777 100644 --- a/vendor/moonbeam/precompiles/balances-erc20/src/eip2612.rs +++ b/vendor/moonbeam/precompiles/balances-erc20/src/eip2612.rs @@ -20,6 +20,7 @@ use frame_support::{ ensure, traits::{Get, Time}, }; +use pallet_evm::FrameSystemAccountProvider; use sp_core::H256; use sp_io::hashing::keccak_256; use sp_runtime::traits::UniqueSaturatedInto; @@ -38,10 +39,11 @@ pub struct Eip2612(PhantomData<(Runtime, Instance)>); impl Eip2612 where - Runtime: pallet_balances::Config + pallet_evm::Config, + Runtime: pallet_balances::Config + + pallet_evm::Config>, Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, Runtime::RuntimeCall: From>, - ::RuntimeOrigin: From>, + ::RuntimeOrigin: From>>, BalanceOf: TryFrom + Into, Runtime: Erc20Metadata, Instance: InstanceToPrefix + 'static, @@ -136,8 +138,8 @@ where let amount = Erc20BalancesPrecompile::::u256_to_amount(value) .unwrap_or_else(|_| Bounded::max_value()); - let owner: Runtime::AccountId = Runtime::AddressMapping::into_account_id(owner); - let spender: Runtime::AccountId = Runtime::AddressMapping::into_account_id(spender); + let owner: AccountIdOf = Runtime::AddressMapping::into_account_id(owner); + let spender: AccountIdOf = Runtime::AddressMapping::into_account_id(spender); ApprovesStorage::::insert(owner, spender, amount); } diff --git a/vendor/moonbeam/precompiles/balances-erc20/src/lib.rs b/vendor/moonbeam/precompiles/balances-erc20/src/lib.rs index b0c09638..c5c3bccd 100644 --- a/vendor/moonbeam/precompiles/balances-erc20/src/lib.rs +++ b/vendor/moonbeam/precompiles/balances-erc20/src/lib.rs @@ -33,7 +33,7 @@ use pallet_balances::pallet::{ Instance1, Instance10, Instance11, Instance12, Instance13, Instance14, Instance15, Instance16, Instance2, Instance3, Instance4, Instance5, Instance6, Instance7, Instance8, Instance9, }; -use pallet_evm::AddressMapping; +use pallet_evm::{AddressMapping, FrameSystemAccountProvider}; use precompile_utils::prelude::*; use sp_core::{H160, H256, U256}; @@ -126,6 +126,8 @@ impl_prefix!(Instance14, "Erc20Instance14Balances"); impl_prefix!(Instance15, "Erc20Instance15Balances"); impl_prefix!(Instance16, "Erc20Instance16Balances"); +pub type AccountIdOf = ::AccountId; + /// Alias for the Balance type for the provided Runtime and Instance. pub type BalanceOf = >::Balance; @@ -179,10 +181,11 @@ pub struct Erc20BalancesPrecompile( #[precompile_utils::precompile] impl Erc20BalancesPrecompile where - Runtime: pallet_balances::Config + pallet_evm::Config, + Runtime: pallet_balances::Config + + pallet_evm::Config>, Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, Runtime::RuntimeCall: From>, - ::RuntimeOrigin: From>, + ::RuntimeOrigin: From>>, BalanceOf: TryFrom + Into, Instance: InstanceToPrefix + 'static, Runtime: Erc20Metadata, @@ -204,7 +207,7 @@ where handle.record_db_read::(128)?; let owner: H160 = owner.into(); - let owner: Runtime::AccountId = Runtime::AddressMapping::into_account_id(owner); + let owner: AccountIdOf = Runtime::AddressMapping::into_account_id(owner); Ok(pallet_balances::Pallet::::usable_balance(&owner).into()) } @@ -223,8 +226,8 @@ where let owner: H160 = owner.into(); let spender: H160 = spender.into(); - let owner: Runtime::AccountId = Runtime::AddressMapping::into_account_id(owner); - let spender: Runtime::AccountId = Runtime::AddressMapping::into_account_id(spender); + let owner: AccountIdOf = Runtime::AddressMapping::into_account_id(owner); + let spender: AccountIdOf = Runtime::AddressMapping::into_account_id(spender); Ok(ApprovesStorage::::get(owner, spender) .unwrap_or_default() @@ -244,9 +247,9 @@ where // Write into storage. { - let caller: Runtime::AccountId = + let caller: AccountIdOf = Runtime::AddressMapping::into_account_id(handle.context().caller); - let spender: Runtime::AccountId = Runtime::AddressMapping::into_account_id(spender); + let spender: AccountIdOf = Runtime::AddressMapping::into_account_id(spender); // Amount saturate if too high. let value = Self::u256_to_amount(value).unwrap_or_else(|_| Bounded::max_value()); @@ -318,10 +321,10 @@ where let to: H160 = to.into(); { - let caller: Runtime::AccountId = + let caller: AccountIdOf = Runtime::AddressMapping::into_account_id(handle.context().caller); - let from: Runtime::AccountId = Runtime::AddressMapping::into_account_id(from); - let to: Runtime::AccountId = Runtime::AddressMapping::into_account_id(to); + let from: AccountIdOf = Runtime::AddressMapping::into_account_id(from); + let to: AccountIdOf = Runtime::AddressMapping::into_account_id(to); let value = Self::u256_to_amount(value).in_field("value")?; // If caller is "from", it can spend as much as it wants. @@ -393,7 +396,7 @@ where return Err(RevertReason::UnknownSelector.into()); } - let caller: Runtime::AccountId = + let caller: AccountIdOf = Runtime::AddressMapping::into_account_id(handle.context().caller); let precompile = Runtime::AddressMapping::into_account_id(handle.context().address); let amount = Self::u256_to_amount(handle.context().apparent_value)?; @@ -435,7 +438,7 @@ where handle.record_log_costs_manual(2, 32)?; let account_amount: U256 = { - let owner: Runtime::AccountId = + let owner: AccountIdOf = Runtime::AddressMapping::into_account_id(handle.context().caller); pallet_balances::Pallet::::usable_balance(&owner).into() };