feat: Merge v4 changes

Cargo.toml

@@ -3,20 +3,68 @@ resolver = "2"
 members = [
 	"core-primitives",
 	"frame/babel",
+	"frame/cosmos",
+	"frame/cosmos/types",
+	"frame/cosmos/rpc",
+	"frame/cosmos/runtime-api",
+	"frame/cosmos/x/auth",
+	"frame/cosmos/x/auth/migrations",
+	"frame/cosmos/x/auth/signing",
+	"frame/cosmos/x/bank",
+	"frame/cosmos/x/bank/types",
+	"frame/cosmos/x/wasm",
+	"frame/cosmos/x/wasm/types",
 	"frame/multimap",
+	"primitives/babel",
 	"primitives/cosmos",
 	"primitives/ethereum",
 	"primitives/runtime",
 	"runtime/common",
+	"vendor/composable/composable-support",
+	"vendor/composable/vm",
+	"vendor/composable/vm-wasmi",
+	"vendor/cosmwasm/std",
+	"vendor/composable/cosmwasm",
+	"vendor/composable/cosmwasm/rpc",
+	"vendor/composable/cosmwasm/runtime-api",
+	"vendor/moonbeam/precompiles/assets-erc20",
+	"vendor/moonbeam/precompiles/balances-erc20",
+]
+default-members = [
+	"core-primitives",
+	"frame/*",
+	"primitives/*",
+	"runtime/*",
 ]
 
 [workspace.dependencies]
+composable-support = { path = "vendor/composable/composable-support", default-features = false }
+cosmos-rpc = { path = "frame/cosmos/rpc", default-features = false }
+cosmos-runtime-api = { path = "frame/cosmos/runtime-api", default-features = false }
+cosmwasm-rpc = { path = "vendor/composable/cosmwasm/rpc" }
+cosmwasm-runtime-api = { path = "vendor/composable/cosmwasm/runtime-api", default-features = false }
+cosmwasm-std = { path = "vendor/cosmwasm/std", default-features = false }
+cosmwasm-vm = { path = "vendor/composable/vm", default-features = false }
+cosmwasm-vm-wasmi = { path = "vendor/composable/vm-wasmi", default-features = false }
 frame-babel = { path = "frame/babel", default-features = false }
 noir-core-primitives = { path = "core-primitives", default-features = false }
 noir-runtime-common = { path = "runtime/common", default-features = false }
+np-babel = { path = "primitives/babel", default-features = false }
 np-cosmos = { path = "primitives/cosmos", default-features = false }
 np-ethereum = { path = "primitives/ethereum", default-features = false }
 np-runtime = { path = "primitives/runtime", default-features = false }
+pallet-cosmos = { path = "frame/cosmos", default-features = false }
+pallet-cosmos-types = { path = "frame/cosmos/types", default-features = false }
+pallet-cosmos-x-auth = { path = "frame/cosmos/x/auth", default-features = false }
+pallet-cosmos-x-auth-migrations = { path = "frame/cosmos/x/auth/migrations", default-features = false }
+pallet-cosmos-x-auth-signing = { path = "frame/cosmos/x/auth/signing", default-features = false }
+pallet-cosmos-x-bank = { path = "frame/cosmos/x/bank", default-features = false }
+pallet-cosmos-x-bank-types = { path = "frame/cosmos/x/bank/types", default-features = false }
+pallet-cosmos-x-wasm = { path = "frame/cosmos/x/wasm", default-features = false }
+pallet-cosmos-x-wasm-types = { path = "frame/cosmos/x/wasm/types", default-features = false }
+pallet-cosmwasm = { path = "vendor/composable/cosmwasm", default-features = false }
+pallet-evm-precompileset-assets-erc20 = { path = "vendor/moonbeam/precompiles/assets-erc20", default-features = false }
+pallet-evm-precompile-balances-erc20 = { path = "vendor/moonbeam/precompiles/balances-erc20", default-features = false }
 pallet-multimap = { path = "frame/multimap", default-features = false }
 
 [profile.release]

frame/babel/Cargo.toml

@@ -8,65 +8,127 @@ repository = "https://github.com/noirhq/noir.git"
 publish = false
 
 [dependencies]
+bech32 = { version = "0.11", default-features = false, features = ["alloc"], optional = true }
+cosmos-sdk-proto = { version = "0.24", default-features = false, optional = true }
+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 }
+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-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-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-sha3fips = { 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-multimap = { workspace = 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 }
 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 }
 
+[dev-dependencies]
+hex = "0.4.3"
+
 [features]
-default = [
-	"std",
-	"cosmos",
-	"ethereum",
-]
+default = ["std", "pallet"]
 std = [
+	"bech32?/std",
+	"cosmos-sdk-proto?/std",
+	"cosmwasm-std?/std",
+	"cosmwasm-vm?/std",
+	"cosmwasm-vm-wasmi?/std",
 	"ethereum?/std",
+	"fp-evm?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"np-babel/std",
 	"np-cosmos?/std",
 	"np-ethereum?/std",
+	"num_enum?/std",
+	"pallet-assets?/std",
 	"pallet-balances/std",
+	"pallet-cosmos?/std",
+	"pallet-cosmos-types?/std",
+	"pallet-cosmos-x-auth-signing?/std",
+	"pallet-cosmos-x-bank?/std",
+	"pallet-cosmos-x-wasm?/std",
+	"pallet-cosmwasm?/std",
 	"pallet-ethereum?/std",
 	"pallet-evm?/std",
+	"pallet-evm-precompileset-assets-erc20?/std",
+	"pallet-evm-precompile-balances-erc20?/std",
 	"pallet-evm-precompile-blake2?/std",
 	"pallet-evm-precompile-bn128?/std",
 	"pallet-evm-precompile-modexp?/std",
-	"pallet-evm-precompile-sha3fips?/std",
 	"pallet-evm-precompile-simple?/std",
 	"pallet-multimap/std",
 	"parity-scale-codec/std",
+	"precompile-utils?/std",
 	"scale-info/std",
+	"serde?/std",
+	"serde-json-wasm?/std",
 	"sp-core/std",
 	"sp-runtime/std",
 ]
 cosmos = [
+	"bech32",
+	"cosmos-sdk-proto",
+	"cosmwasm-std",
+	"cosmwasm-vm",
+	"cosmwasm-vm-wasmi",
+	"np-babel/cosmos",
 	"np-cosmos",
+	"pallet-assets",
+	"pallet-cosmos",
+	"pallet-cosmos-types",
+	"pallet-cosmos-x-auth-signing",
+	"pallet-cosmos-x-bank",
+	"pallet-cosmos-x-wasm",
+	"pallet-cosmwasm",
+	"serde",
+	"serde-json-wasm",
 ]
 ethereum = [
 	"dep:ethereum",
-	"np-ethereum",
+	"fp-evm",
+	"np-babel/ethereum",
+	"num_enum",
 	"pallet-ethereum",
 	"pallet-evm",
+	"pallet-evm-precompileset-assets-erc20",
+	"pallet-evm-precompile-balances-erc20",
 	"pallet-evm-precompile-blake2",
 	"pallet-evm-precompile-bn128",
 	"pallet-evm-precompile-modexp",
-	"pallet-evm-precompile-sha3fips",
 	"pallet-evm-precompile-simple",
+	"precompile-utils",
+]
+pallet = [
+	"cosmos",
+	"ethereum",
+	"np-babel/serde",
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",

frame/babel/src/cosmos/address.rs

@@ -0,0 +1,86 @@
+// This file is part of Noir.
+
+// Copyright (c) Haderech Pte. Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::{extensions::unify_account, VarAddress};
+use alloc::{string::String, vec::Vec};
+use bech32::{Bech32, Hrp};
+use core::marker::PhantomData;
+use np_babel::cosmos::{traits::ChainInfo, Address as CosmosAddress};
+use pallet_cosmos_types::address::acc_address_from_bech32;
+use pallet_cosmwasm::types::AccountIdOf;
+use pallet_multimap::traits::UniqueMultimap;
+use sp_core::{H160, H256};
+use sp_runtime::traits::{AccountIdConversion, Convert};
+
+pub struct AddressMapping<T>(PhantomData<T>);
+impl<T> pallet_cosmos::AddressMapping<T::AccountId> for AddressMapping<T>
+where
+	T: unify_account::Config,
+{
+	fn into_account_id(who: H160) -> T::AccountId {
+		let address = CosmosAddress::from(who);
+		T::AddressMap::find_key(VarAddress::Cosmos(address.clone()))
+			.unwrap_or_else(|| address.into_account_truncating())
+	}
+}
+
+pub struct AccountToAddr<T>(PhantomData<T>);
+impl<T> Convert<AccountIdOf<T>, String> for AccountToAddr<T>
+where
+	T: pallet_cosmwasm::Config + unify_account::Config,
+{
+	fn convert(account: AccountIdOf<T>) -> String {
+		let addresses = T::AddressMap::get(account.clone());
+		let address: Option<&CosmosAddress> = addresses.iter().find_map(|address| match address {
+			VarAddress::Cosmos(address) => Some(address),
+			_ => None,
+		});
+		let address_raw = match address {
+			Some(address) => address.as_ref(),
+			None => account.as_ref(),
+		};
+		let hrp = Hrp::parse(T::ChainInfo::bech32_prefix()).unwrap();
+		bech32::encode::<Bech32>(hrp, address_raw).unwrap()
+	}
+}
+
+impl<T> Convert<String, Result<AccountIdOf<T>, ()>> for AccountToAddr<T>
+where
+	T: pallet_cosmwasm::Config + unify_account::Config,
+{
+	fn convert(address: String) -> Result<AccountIdOf<T>, ()> {
+		let (_hrp, address_raw) = acc_address_from_bech32(&address).map_err(|_| ())?;
+		Self::convert(address_raw)
+	}
+}
+
+impl<T> Convert<Vec<u8>, Result<AccountIdOf<T>, ()>> for AccountToAddr<T>
+where
+	T: pallet_cosmwasm::Config + unify_account::Config,
+{
+	fn convert(address: Vec<u8>) -> Result<AccountIdOf<T>, ()> {
+		match address.len() {
+			20 => {
+				let address = CosmosAddress::from(H160::from_slice(&address));
+				T::AddressMap::find_key(VarAddress::Cosmos(address)).ok_or(())
+			},
+			32 => Ok(H256::from_slice(&address).into()),
+			_ => Err(()),
+		}
+	}
+}

frame/babel/src/cosmos/mod.rs

@@ -0,0 +1,21 @@
+// This file is part of Noir.
+
+// Copyright (c) Haderech Pte. Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+pub mod address;
+pub mod msg;
+pub mod precompile;

frame/babel/src/cosmos/msg.rs

@@ -0,0 +1,55 @@
+// This file is part of Noir.
+
+// Copyright (c) Haderech Pte. Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use alloc::boxed::Box;
+use core::marker::PhantomData;
+use cosmos_sdk_proto::{
+	cosmos::bank::v1beta1::MsgSend,
+	cosmwasm::wasm::v1::{
+		MsgExecuteContract, MsgInstantiateContract2, MsgMigrateContract, MsgStoreCode,
+		MsgUpdateAdmin,
+	},
+	Any,
+};
+use pallet_cosmos_types::{any_match, context, msgservice};
+use pallet_cosmos_x_bank::MsgSendHandler;
+use pallet_cosmos_x_wasm::msgs::{
+	MsgExecuteContractHandler, MsgInstantiateContract2Handler, MsgMigrateContractHandler,
+	MsgStoreCodeHandler, MsgUpdateAdminHandler,
+};
+
+pub struct MsgServiceRouter<T>(PhantomData<T>);
+impl<T, Context> msgservice::traits::MsgServiceRouter<Context> for MsgServiceRouter<T>
+where
+	T: frame_system::Config + pallet_cosmos::Config + pallet_cosmwasm::Config,
+	Context: context::traits::Context,
+{
+	fn route(msg: &Any) -> Option<Box<dyn msgservice::traits::MsgHandler<Context>>> {
+		any_match!(
+			msg, {
+				MsgSend => Some(Box::<MsgSendHandler<T>>::default()),
+				MsgStoreCode => Some(Box::<MsgStoreCodeHandler<T>>::default()),
+				MsgInstantiateContract2 => Some(Box::<MsgInstantiateContract2Handler<T>>::default()),
+				MsgExecuteContract => Some(Box::<MsgExecuteContractHandler<T>>::default()),
+				MsgMigrateContract => Some(Box::<MsgMigrateContractHandler<T>>::default()),
+				MsgUpdateAdmin => Some(Box::<MsgUpdateAdminHandler<T>>::default()),
+			},
+			None
+		)
+	}
+}