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

difftreelog

CORE-346 Remove evm_collection namespace

Trubnikov Sergey2022-05-27parent: #79ed02e.patch.diff
in: master

6 files changed

modifiedMakefilediffbeforeafterboth
15CONTRACT_HELPERS_STUBS=./pallets/evm-contract-helpers/src/stubs/15CONTRACT_HELPERS_STUBS=./pallets/evm-contract-helpers/src/stubs/
16CONTRACT_HELPERS_ABI=./tests/src/eth/util/contractHelpersAbi.json16CONTRACT_HELPERS_ABI=./tests/src/eth/util/contractHelpersAbi.json
1717
18COLLECTION_HELPER_STUBS=$(COLLECTION_STUBS)18COLLECTION_HELPER_STUBS=./pallets/unique/src/eth/stubs/
19COLLECTION_HELPER_ABI=./tests/src/eth/collectionHelperAbi.json19COLLECTION_HELPER_ABI=./tests/src/eth/collectionHelperAbi.json
2020
21TESTS_API=./tests/src/eth/api/21TESTS_API=./tests/src/eth/api/
36	PACKAGE=pallet-evm-contract-helpers NAME=eth::contract_helpers_impl OUTPUT=$(CONTRACT_HELPERS_STUBS)/$@ ./.maintain/scripts/generate_sol.sh36	PACKAGE=pallet-evm-contract-helpers NAME=eth::contract_helpers_impl OUTPUT=$(CONTRACT_HELPERS_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
3737
38CollectionHelper.sol:38CollectionHelper.sol:
39	PACKAGE=pallet-unique NAME=eth::evm_collection::collection_helper_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh39	PACKAGE=pallet-unique NAME=eth::collection_helper_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
40	PACKAGE=pallet-unique NAME=eth::evm_collection::collection_helper_impl OUTPUT=$(COLLECTION_HELPER_STUBS)/$@ ./.maintain/scripts/generate_sol.sh40	PACKAGE=pallet-unique NAME=eth::collection_helper_impl OUTPUT=$(COLLECTION_HELPER_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
4141
42UniqueFungible: UniqueFungible.sol42UniqueFungible: UniqueFungible.sol
43	INPUT=$(FUNGIBLE_EVM_STUBS)/$< OUTPUT=$(FUNGIBLE_EVM_STUBS)/UniqueFungible.raw ./.maintain/scripts/compile_stub.sh43	INPUT=$(FUNGIBLE_EVM_STUBS)/$< OUTPUT=$(FUNGIBLE_EVM_STUBS)/UniqueFungible.raw ./.maintain/scripts/compile_stub.sh
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17pub mod evm_collection {
18	use core::marker::PhantomData;17use core::marker::PhantomData;
19	use evm_coder::{execution::*, generate_stubgen, solidity_interface, types::*, ToLog};18use evm_coder::{execution::*, generate_stubgen, solidity_interface, types::*, ToLog};
20	use ethereum as _;19use ethereum as _;
171	fn error_feild_too_long(feild: &str, bound: u32) -> Error {170fn error_feild_too_long(feild: &str, bound: u32) -> Error {
172		Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))171	Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))
173	}172}
174}
175173
modifiedpallets/unique/src/eth/stubs/CollectionHelper.rawdiffbeforeafterboth

binary blob — no preview

modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
80};80};
81use smallvec::smallvec;81use smallvec::smallvec;
82use codec::{Encode, Decode};82use codec::{Encode, Decode};
83use pallet_unique::eth::evm_collection;
84use fp_rpc::TransactionStatus;83use fp_rpc::TransactionStatus;
85use sp_runtime::{84use sp_runtime::{
86	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},85	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},
307		pallet_evm_migration::OnMethodCall<Self>,306		pallet_evm_migration::OnMethodCall<Self>,
308		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,307		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
309		CollectionDispatchT<Self>,308		CollectionDispatchT<Self>,
310		evm_collection::CollectionHelperOnMethodCall<Self>,309		pallet_unique::eth::CollectionHelperOnMethodCall<Self>,
311	);310	);
312	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;311	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
313	type ChainId = ChainId;312	type ChainId = ChainId;
988	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;987	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
989}988}
990989
991impl evm_collection::Config for Runtime {990impl pallet_unique::eth::Config for Runtime {
992	type ContractAddress = EvmCollectionHelperAddress;991	type ContractAddress = EvmCollectionHelperAddress;
993}992}
994993
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
78};78};
79use smallvec::smallvec;79use smallvec::smallvec;
80use codec::{Encode, Decode};80use codec::{Encode, Decode};
81use pallet_unique::eth::evm_collection;
82use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping};81use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping};
83use fp_rpc::TransactionStatus;82use fp_rpc::TransactionStatus;
84use sp_runtime::{83use sp_runtime::{
286		pallet_evm_migration::OnMethodCall<Self>,285		pallet_evm_migration::OnMethodCall<Self>,
287		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,286		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
288		CollectionDispatchT<Self>,287		CollectionDispatchT<Self>,
289		evm_collection::CollectionHelperOnMethodCall<Self>,288		pallet_unique::eth::CollectionHelperOnMethodCall<Self>,
290	);289	);
291	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;290	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
292	type ChainId = ChainId;291	type ChainId = ChainId;
973	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;972	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
974}973}
975974
976impl evm_collection::Config for Runtime {975impl pallet_unique::eth::Config for Runtime {
977	type ContractAddress = EvmCollectionHelperAddress;976	type ContractAddress = EvmCollectionHelperAddress;
978}977}
979978
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
85};85};
86use smallvec::smallvec;86use smallvec::smallvec;
87use codec::{Encode, Decode};87use codec::{Encode, Decode};
88use pallet_unique::eth::evm_collection;
89use fp_rpc::TransactionStatus;88use fp_rpc::TransactionStatus;
90use sp_runtime::{89use sp_runtime::{
91	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},90	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},
291		pallet_evm_migration::OnMethodCall<Self>,290		pallet_evm_migration::OnMethodCall<Self>,
292		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,291		pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
293		CollectionDispatchT<Self>,292		CollectionDispatchT<Self>,
294		evm_collection::CollectionHelperOnMethodCall<Self>,293		pallet_unique::eth::CollectionHelperOnMethodCall<Self>,
295	);294	);
296	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;295	type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
297	type ChainId = ChainId;296	type ChainId = ChainId;
978	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;977	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
979}978}
980979
981impl evm_collection::Config for Runtime {980impl pallet_unique::eth::Config for Runtime {
982	type ContractAddress = EvmCollectionHelperAddress;981	type ContractAddress = EvmCollectionHelperAddress;
983}982}
984983