git.delta.rocks / unique-network / refs/commits / e2ead47ea043

difftreelog

Merge pull request #706 from UniqueNetwork/fix/evm-stubs

Yaroslav Bolyukin2022-11-08parents: #c0afeb6 #c633ab6.patch.diff
in: master
fix evm-stubs:

4 files changed

modifiedcrates/evm-coder/CHANGELOG.mddiffbeforeafterboth
--- a/crates/evm-coder/CHANGELOG.md
+++ b/crates/evm-coder/CHANGELOG.md
@@ -3,25 +3,28 @@
 All notable changes to this project will be documented in this file.
 
 <!-- bureaucrate goes here -->
+
 ## [v0.1.4] - 2022-11-02
+
 ### Added
- - Named structures support.
 
+- Named structures support.
+
 ## [v0.1.3] - 2022-08-29
 
 ### Fixed
 
- - Parsing simple values.
+- Parsing simple values.
 
 ## [v0.1.2] 2022-08-19
 
 ### Added
 
- - Implementation `AbiWrite` for tuples.
+- Implementation `AbiWrite` for tuples.
 
- ### Fixes
+### Fixes
 
- - Tuple generation for solidity.
+- Tuple generation for solidity.
 
 ## [v0.1.1] 2022-08-16
modifiedcrates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth
--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -928,10 +928,13 @@
 			.chain(self.info.inline_is.0.iter())
 			.map(|is| Is::expand_generator(is, &gen_ref));
 		let solidity_event_generators = self.info.events.0.iter().map(Is::expand_event_generator);
-
+		let solidity_events_idents = self.info.events.0.iter().map(|is| is.name.clone());
 		let docs = &self.docs;
 
 		quote! {
+			#(
+				const _: ::core::marker::PhantomData<#solidity_events_idents> = ::core::marker::PhantomData;
+			)*
 			#[derive(Debug)]
 			#(#[doc = #docs])*
 			pub enum #call_name #gen_ref {
modifiedpallets/unique/Cargo.tomldiffbeforeafterboth
before · pallets/unique/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6description = 'Unique Pallet'7edition = '2021'8homepage = 'https://unique.network'9license = 'GPLv3'10name = 'pallet-unique'11repository = 'https://github.com/UniqueNetwork/unique-chain'12version = "0.2.1"1314[package.metadata.docs.rs]15targets = ['x86_64-unknown-linux-gnu']1617[features]18default = ['std']19runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks']20std = [21    'codec/std',22    'serde/std',23    'frame-support/std',24    'frame-system/std',25    'pallet-evm/std',26    'pallet-common/std',27    'up-data-structs/std',28    'sp-std/std',29    'sp-runtime/std',30    'frame-benchmarking/std',31    'evm-coder/std',32    'pallet-evm-coder-substrate/std',33    'pallet-nonfungible/std',34]35try-runtime = ["frame-support/try-runtime"]36limit-testing = ["up-data-structs/limit-testing"]3738################################################################################39# Standart Dependencies4041[dependencies.serde]42default-features = false43features = ['derive']44version = '1.0.130'4546[dependencies.ethereum]47version = "0.12.0"48default-features = false4950################################################################################51# Substrate Dependencies5253[dependencies.codec]54default-features = false55features = ['derive']56package = 'parity-scale-codec'57version = '3.1.2'5859[dependencies.frame-benchmarking]60default-features = false61optional = true62git = "https://github.com/paritytech/substrate"63branch = "polkadot-v0.9.30"6465[dependencies.frame-support]66default-features = false67git = "https://github.com/paritytech/substrate"68branch = "polkadot-v0.9.30"6970[dependencies.frame-system]71default-features = false72git = "https://github.com/paritytech/substrate"73branch = "polkadot-v0.9.30"7475[dependencies.sp-std]76default-features = false77git = "https://github.com/paritytech/substrate"78branch = "polkadot-v0.9.30"7980[dependencies.sp-runtime]81default-features = false82git = "https://github.com/paritytech/substrate"83branch = "polkadot-v0.9.30"8485[dependencies.sp-core]86default-features = false87git = "https://github.com/paritytech/substrate"88branch = "polkadot-v0.9.30"8990[dependencies.sp-io]91default-features = false92git = "https://github.com/paritytech/substrate"93branch = "polkadot-v0.9.30"9495################################################################################96# Local Dependencies97[dependencies]98up-data-structs = { default-features = false, path = "../../primitives/data-structs" }99scale-info = { version = "2.0.1", default-features = false, features = [100    "derive",101] }102pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.30" }103pallet-common = { default-features = false, path = "../common" }104evm-coder = { default-features = false, path = '../../crates/evm-coder' }105pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }106pallet-nonfungible = { default-features = false, path = '../../pallets/nonfungible' }107pallet-refungible = { default-features = false, path = '../../pallets/refungible' }
after · pallets/unique/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6description = 'Unique Pallet'7edition = '2021'8homepage = 'https://unique.network'9license = 'GPLv3'10name = 'pallet-unique'11repository = 'https://github.com/UniqueNetwork/unique-chain'12version = "0.2.1"1314[package.metadata.docs.rs]15targets = ['x86_64-unknown-linux-gnu']1617[features]18default = ['std']19runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks']20std = [21    'codec/std',22    'serde/std',23    'frame-support/std',24    'frame-system/std',25    'pallet-evm/std',26    'pallet-common/std',27    'up-data-structs/std',28    'sp-std/std',29    'sp-runtime/std',30    'frame-benchmarking/std',31    'evm-coder/std',32    'pallet-evm-coder-substrate/std',33    'pallet-nonfungible/std',34]35try-runtime = ["frame-support/try-runtime"]36limit-testing = ["up-data-structs/limit-testing"]37stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]38################################################################################39# Standart Dependencies4041[dependencies.serde]42default-features = false43features = ['derive']44version = '1.0.130'4546[dependencies.ethereum]47version = "0.12.0"48default-features = false4950################################################################################51# Substrate Dependencies5253[dependencies.codec]54default-features = false55features = ['derive']56package = 'parity-scale-codec'57version = '3.1.2'5859[dependencies.frame-benchmarking]60default-features = false61optional = true62git = "https://github.com/paritytech/substrate"63branch = "polkadot-v0.9.30"6465[dependencies.frame-support]66default-features = false67git = "https://github.com/paritytech/substrate"68branch = "polkadot-v0.9.30"6970[dependencies.frame-system]71default-features = false72git = "https://github.com/paritytech/substrate"73branch = "polkadot-v0.9.30"7475[dependencies.sp-std]76default-features = false77git = "https://github.com/paritytech/substrate"78branch = "polkadot-v0.9.30"7980[dependencies.sp-runtime]81default-features = false82git = "https://github.com/paritytech/substrate"83branch = "polkadot-v0.9.30"8485[dependencies.sp-core]86default-features = false87git = "https://github.com/paritytech/substrate"88branch = "polkadot-v0.9.30"8990[dependencies.sp-io]91default-features = false92git = "https://github.com/paritytech/substrate"93branch = "polkadot-v0.9.30"9495################################################################################96# Local Dependencies97[dependencies]98up-data-structs = { default-features = false, path = "../../primitives/data-structs" }99scale-info = { version = "2.0.1", default-features = false, features = [100    "derive",101] }102pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.30" }103pallet-common = { default-features = false, path = "../common" }104evm-coder = { default-features = false, path = '../../crates/evm-coder' }105pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }106pallet-nonfungible = { default-features = false, path = '../../pallets/nonfungible' }107pallet-refungible = { default-features = false, path = '../../pallets/refungible' }
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -23,7 +23,10 @@
 use crate::Pallet;
 
 use pallet_common::{
-	CollectionById, dispatch::CollectionDispatch, erc::static_property::key, Pallet as PalletCommon,
+	CollectionById,
+	dispatch::CollectionDispatch,
+	erc::{static_property::key, CollectionHelpersEvents},
+	Pallet as PalletCommon,
 };
 use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
 use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};