Substrate ibc 0.9.43

examples/cross-vm-communication/README.md

@@ -122,14 +122,12 @@ and click `At Address`.
 
   ![The image shows successfully added precompiled contract with prefilled data](images/evm-contract.png)
 
-  * context: `0x1f0700e87648170284d71700`. The value is data encoded using `parity-scale-codec`, which is derived as follows:
-    * `1f` is an ID of the WASM VM
-    * `0700e8764817` - is 100000000000 ref time (weight system v2) in the context of gas
-    * `0284d717` - is 100000000 proof time (weight system v2) in the context of gas
-    * `00` is None for the environment
+  * vm_id: `0x1F`. The value means call Wasm vm.
   * to: the address of the Flipper contract from the above. Don't forget about leading `00`. In our case, it would be `0x00b5438f6d98dc2e11c6f9686ff48h5777f4778e86debdaea812a822165985eade`
   * input: we should put here a method selector from ink. The selector is an index for the method in the contract.
   In our case, it is `0xDEADBEEF` for the flip method. You can see it in the evm-to-wasm/flipper/lib.rs:40
+  * value: `0`. the amount of native token to transfer, used for payable calls.
+  * storage_deposit_limit: `11`. The maximum amount of storage space that can be used, in bytes. If the transaction requires more, it will fail.
   * Click transact and modify the gas price in the Metamask to at least 0.01 GGX
   (Currently, estimation of the gas price between VM is not implemented). The transaction should be successful.
 

examples/cross-vm-communication/evm-to-wasm/xvm.sol

@@ -6,13 +6,17 @@ pragma solidity ^0.8.0;
 interface XVM {
     /**
      * @dev Execute external VM call
-     * @param context - execution context
+     * @param vm_id - vm id, select the Evm or Wasm
      * @param to - call recepient
      * @param input - SCALE-encoded call arguments
+     * @param value - the amount of native token to transfer, used for payable calls
+     * @param storage_deposit_limit - The maximum amount of storage space that can be used
      */
     function xvm_call(
-        bytes calldata context,
+        uint8 vm_id,
         bytes calldata to,
-        bytes calldata input
-    ) external;
+        bytes calldata input,
+        uint256 value,
+        uint256 storage_deposit_limit
+    ) external payable returns (bool success, bytes memory data);
 }

examples/cross-vm-communication/wasm-to-evm/flipper/lib.rs

@@ -36,6 +36,7 @@ mod flipper_wrapper {
 					0x0F,
 					Vec::from(flipper_address.as_ref()),
 					FLIP_SELECTOR.to_vec(),
+					0
 				)
 				.is_ok()
 		}

examples/cross-vm-communication/wasm-to-evm/flipper/xvm_environment.rs

@@ -14,7 +14,7 @@ pub trait XvmExtension {
 	type ErrorCode = XvmError;
 
 	#[ink(extension = 0x00010001)]
-	fn xvm_call(vm_id: u8, target: Vec<u8>, input: Vec<u8>) -> Result<()>;
+	fn xvm_call(vm_id: u8, target: Vec<u8>, input: Vec<u8>, value: u128) -> Result<()>;
 }
 
 /// XVM chain extension errors.

flake.nix

@@ -87,7 +87,9 @@
               LD_LIBRARY_PATH = pkgs.lib.strings.makeLibraryPath [
                 pkgs.stdenv.cc.cc.lib
                 pkgs.llvmPackages.libclang.lib
+                (pkgs.lib.makeLibraryPath [pkgs.openssl])
               ];
+              OPENSSL_DIR = "${pkgs.openssl.dev}";
               LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
               PROTOC = "${pkgs.protobuf}/bin/protoc";
               ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";

node/src/chain_spec.rs

@@ -60,7 +60,7 @@ pub fn development_config() -> Result<ChainSpec, String> {
 				],
 				// Initial PoA authorities
 				vec![ValidatorIdentity::from_seed("Alice")],
-				888888,
+				8886,
 				true,
 			)
 		},
@@ -109,7 +109,7 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
 					ValidatorIdentity::from_seed("Alice"),
 					ValidatorIdentity::from_seed("Bob"),
 				],
-				888888,
+				8886,
 				true,
 			)
 		},

node/src/command.rs

@@ -18,7 +18,7 @@
 use clap::Parser;
 // Substrate
 #[cfg(feature = "brooklyn")]
-use fc_db::frontier_database_dir;
+use fc_db::kv::frontier_database_dir;
 use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli};
 use sc_service::PartialComponents;
 
@@ -136,7 +136,7 @@ pub fn run() -> sc_cli::Result<()> {
 				#[cfg(feature = "brooklyn")]
 				{
 					use fc_db::DatabaseSource;
-					use service::testnet::db_config_dir;
+					use service::brooklyn::db_config_dir;
 					// Remove Frontier offchain db
 					let db_config_dir = db_config_dir(&config);
 					let frontier_database_config = match config.database {

node/src/rpc.rs

@@ -14,9 +14,9 @@ pub struct FullDeps<C, P, A: sc_transaction_pool::ChainApi> {
 	pub deny_unsafe: DenyUnsafe,
 
 	#[cfg(not(feature = "brooklyn"))]
-	pub mainnet: crate::service::mainnet::MainNetParams<A>,
+	pub mainnet: crate::service::sydney::MainNetParams<A>,
 	#[cfg(feature = "brooklyn")]
-	pub testnet: crate::service::testnet::TestNetParams<A>,
+	pub testnet: crate::service::brooklyn::TestNetParams<A>,
 	/// Manual seal command sink
 	#[cfg(feature = "manual-seal")]
 	pub command_sink:

node/src/runtime/mainnet.rs

@@ -109,7 +109,6 @@ pub fn testnet_genesis(
 						let nominations = initial_authorities
 							.as_slice()
 							.choose_multiple(&mut rng, count)
-							.into_iter()
 							.map(|choice| choice.id.clone())
 							.collect::<Vec<_>>();
 						StakerStatus::Nominator(nominations)
@@ -149,7 +148,6 @@ pub fn testnet_genesis(
 						},
 					)
 				})
-				.into_iter()
 				.collect(),
 		},
 		ethereum: Default::default(),

node/src/runtime/testnet.rs

@@ -116,7 +116,6 @@ pub fn testnet_genesis(
 						let nominations = initial_authorities
 							.as_slice()
 							.choose_multiple(&mut rng, count)
-							.into_iter()
 							.map(|choice| choice.id.clone())
 							.collect::<Vec<_>>();
 						StakerStatus::Nominator(nominations)