From b67088782776f925d0111ee2dd9b9d315da4186e Mon Sep 17 00:00:00 2001
From: Igor Kozyrev <igor@kozyrev.dev>
Date: Fri, 03 Jun 2022 13:33:46 +0000
Subject: [PATCH] merge develop


---
--- a/crates/evm-coder-macros/src/solidity_interface.rs
+++ b/crates/evm-coder-macros/src/solidity_interface.rs
@@ -801,6 +801,7 @@
 		let generics = self.generics;
 		let gen_ref = generics_reference(&generics);
 		let gen_data = generics_data(&generics);
+		let gen_where = &generics.where_clause;
 
 		let call_sub = self
 			.info
@@ -956,7 +957,9 @@
 					return Ok(None);
 				}
 			}
-			impl #generics ::evm_coder::Weighted for #call_name #gen_ref {
+			impl #generics ::evm_coder::Weighted for #call_name #gen_ref
+			#gen_where
+			{
 				#[allow(unused_variables)]
 				fn weight(&self) -> ::evm_coder::execution::DispatchInfo {
 					match self {
@@ -971,7 +974,9 @@
 					}
 				}
 			}
-			impl #generics ::evm_coder::Callable<#call_name #gen_ref> for #name {
+			impl #generics ::evm_coder::Callable<#call_name #gen_ref> for #name
+			#gen_where
+			{
 				#[allow(unreachable_code)] // In case of no inner calls
 				fn call(&mut self, c: Msg<#call_name #gen_ref>) -> ::evm_coder::execution::ResultWithPostInfo<::evm_coder::abi::AbiWriter> {
 					use ::evm_coder::abi::AbiWrite;
--- a/crates/evm-coder/tests/generics.rs
+++ b/crates/evm-coder/tests/generics.rs
@@ -34,3 +34,15 @@
 }
 
 generate_stubgen!(gen_iface, GenericCall<()>, false);
+
+#[solidity_interface(name = "GenericWhere")]
+impl<T> Generic<T>
+where
+	T: core::fmt::Debug,
+{
+	fn test_3(&self) -> Result<uint256> {
+		todo!()
+	}
+}
+
+generate_stubgen!(gen_where_iface, GenericWhereCall<()>, false);
--- a/launch-config.json
+++ b/launch-config.json
@@ -10,7 +10,10 @@
                 "port": 30444,
                 "flags": [
                     "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace"
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
                 ]
             },
             {
@@ -20,7 +23,10 @@
                 "port": 30555,
                 "flags": [
                     "-lparachain::candidate_validation=debug",
-                    "-lxcm=trace"
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
                 ]
             },
             {
@@ -29,7 +35,11 @@
                 "rpcPort": 9865,
                 "port": 30666,
                 "flags": [
-                    "-lparachain::candidate_validation=debug"
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
                 ]
             },
             {
@@ -38,7 +48,11 @@
                 "rpcPort": 9876,
                 "port": 30777,
                 "flags": [
-                    "-lparachain::candidate_validation=debug"
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
                 ]
             },
             {
@@ -47,7 +61,11 @@
                 "rpcPort": 9887,
                 "port": 30888,
                 "flags": [
-                    "-lparachain::candidate_validation=debug"
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
                 ]
             }
         ],
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -178,7 +178,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 921000,
+	spec_version: 921080,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -163,7 +163,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 921000,
+	spec_version: 921080,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -168,7 +168,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 921000,
+	spec_version: 921080,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

-- 
gitstuff