difftreelog
merge develop
in: master
6 files changed
crates/evm-coder-macros/src/solidity_interface.rsdiffbeforeafterboth--- 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;
crates/evm-coder/tests/generics.rsdiffbeforeafterboth--- 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);
launch-config.jsondiffbeforeafterboth1{2 "relaychain": {3 "bin": "../polkadot/target/release/polkadot",4 "chain": "westend-local",5 "nodes": [6 {7 "name": "alice",8 "wsPort": 9844,9 "rpcPort": 9843,10 "port": 30444,11 "flags": [12 "-lparachain::candidate_validation=debug",13 "-lxcm=trace"14 ]15 },16 {17 "name": "bob",18 "wsPort": 9855,19 "rpcPort": 9854,20 "port": 30555,21 "flags": [22 "-lparachain::candidate_validation=debug",23 "-lxcm=trace"24 ]25 },26 {27 "name": "charlie",28 "wsPort": 9866,29 "rpcPort": 9865,30 "port": 30666,31 "flags": [32 "-lparachain::candidate_validation=debug"33 ]34 },35 {36 "name": "dave",37 "wsPort": 9877,38 "rpcPort": 9876,39 "port": 30777,40 "flags": [41 "-lparachain::candidate_validation=debug"42 ]43 },44 {45 "name": "eve",46 "wsPort": 9888,47 "rpcPort": 9887,48 "port": 30888,49 "flags": [50 "-lparachain::candidate_validation=debug"51 ]52 }53 ],54 "genesis": {55 "runtime": {56 "runtime_genesis_config": {57 "parachainsConfiguration": {58 "config": {59 "validation_upgrade_frequency": 1,60 "validation_upgrade_delay": 161 }62 }63 }64 }65 }66 },67 "parachains": [68 {69 "bin": "../unique-chain/target/release/unique-collator",70 "id": "1000",71 "balance": "1000000000000000000000000",72 "nodes": [73 {74 "port": 31200,75 "wsPort": 9944,76 "rpcPort": 9933,77 "name": "alice",78 "flags": [79 "--rpc-cors=all",80 "--unsafe-rpc-external",81 "--unsafe-ws-external",82 "-lxcm=trace"83 ]84 },85 {86 "port": 31201,87 "wsPort": 9945,88 "rpcPort": 9934,89 "name": "bob",90 "flags": [91 "--rpc-cors=all",92 "--unsafe-rpc-external",93 "--unsafe-ws-external",94 "-lxcm=trace"95 ]96 }97 ]98 }99 ],100 "simpleParachains": [],101 "hrmpChannels": [],102 "finalization": false103}1{2 "relaychain": {3 "bin": "../polkadot/target/release/polkadot",4 "chain": "westend-local",5 "nodes": [6 {7 "name": "alice",8 "wsPort": 9844,9 "rpcPort": 9843,10 "port": 30444,11 "flags": [12 "-lparachain::candidate_validation=debug",13 "-lxcm=trace",14 "--rpc-cors=all",15 "--unsafe-rpc-external",16 "--unsafe-ws-external"17 ]18 },19 {20 "name": "bob",21 "wsPort": 9855,22 "rpcPort": 9854,23 "port": 30555,24 "flags": [25 "-lparachain::candidate_validation=debug",26 "-lxcm=trace",27 "--rpc-cors=all",28 "--unsafe-rpc-external",29 "--unsafe-ws-external"30 ]31 },32 {33 "name": "charlie",34 "wsPort": 9866,35 "rpcPort": 9865,36 "port": 30666,37 "flags": [38 "-lparachain::candidate_validation=debug",39 "-lxcm=trace",40 "--rpc-cors=all",41 "--unsafe-rpc-external",42 "--unsafe-ws-external"43 ]44 },45 {46 "name": "dave",47 "wsPort": 9877,48 "rpcPort": 9876,49 "port": 30777,50 "flags": [51 "-lparachain::candidate_validation=debug",52 "-lxcm=trace",53 "--rpc-cors=all",54 "--unsafe-rpc-external",55 "--unsafe-ws-external"56 ]57 },58 {59 "name": "eve",60 "wsPort": 9888,61 "rpcPort": 9887,62 "port": 30888,63 "flags": [64 "-lparachain::candidate_validation=debug",65 "-lxcm=trace",66 "--rpc-cors=all",67 "--unsafe-rpc-external",68 "--unsafe-ws-external"69 ]70 }71 ],72 "genesis": {73 "runtime": {74 "runtime_genesis_config": {75 "parachainsConfiguration": {76 "config": {77 "validation_upgrade_frequency": 1,78 "validation_upgrade_delay": 179 }80 }81 }82 }83 }84 },85 "parachains": [86 {87 "bin": "../unique-chain/target/release/unique-collator",88 "id": "1000",89 "balance": "1000000000000000000000000",90 "nodes": [91 {92 "port": 31200,93 "wsPort": 9944,94 "rpcPort": 9933,95 "name": "alice",96 "flags": [97 "--rpc-cors=all",98 "--unsafe-rpc-external",99 "--unsafe-ws-external",100 "-lxcm=trace"101 ]102 },103 {104 "port": 31201,105 "wsPort": 9945,106 "rpcPort": 9934,107 "name": "bob",108 "flags": [109 "--rpc-cors=all",110 "--unsafe-rpc-external",111 "--unsafe-ws-external",112 "-lxcm=trace"113 ]114 }115 ]116 }117 ],118 "simpleParachains": [],119 "hrmpChannels": [],120 "finalization": false121}runtime/opal/src/lib.rsdiffbeforeafterboth--- 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,
runtime/quartz/src/lib.rsdiffbeforeafterboth--- 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,
runtime/unique/src/lib.rsdiffbeforeafterboth--- 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,