git.delta.rocks / unique-network / refs/commits / 1e3b7029ba27

difftreelog

refactor drop unused pallet

Yaroslav Bolyukin2021-11-18parent: #51e104f.patch.diff
in: master

5 files changed

deletedpallets/nft-transaction-payment/Cargo.tomldiffbeforeafterboth
--- a/pallets/nft-transaction-payment/Cargo.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[package]
-authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
-description = 'Unqiue pallet nft specific transaction payment'
-edition = '2018'
-homepage = 'https://substrate.io'
-license = 'Unlicense'
-name = 'pallet-nft-transaction-payment'
-repository = 'https://github.com/usetech-llc/nft_private/'
-version = '3.0.0'
-
-[package.metadata.docs.rs]
-targets = ['x86_64-unknown-linux-gnu']
-
-# alias "parity-scale-code" to "codec"
-[dependencies.codec]
-default-features = false
-features = ['derive']
-package = 'parity-scale-codec'
-version = '2.3.0'
-
-[dependencies]
-scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.130", default-features = false }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-pallet-transaction-payment = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
-
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } 
-
-[features]
-default = ['std']
-std = [
-    'codec/std',
-    'serde/std',
-    'frame-support/std',
-    'frame-system/std',
-    'sp-core/std',
-    'sp-io/std',
-    'pallet-transaction-payment/std',
-    'sp-std/std',
-    'sp-runtime/std',
-    'frame-benchmarking/std',
-
-    'up-sponsorship/std',
-]
-runtime-benchmarks = ["frame-benchmarking"]
deletedpallets/nft-transaction-payment/README.mddiffbeforeafterboth
--- a/pallets/nft-transaction-payment/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Nft Transaction Payment
-
-## Overview
-
-A module containing the sponsoring logic for paying for sponsored collections
-
-**NOTE:** The scheduled calls will be dispatched with the default filter
-for the origin: namely `frame_system::Config::BaseCallFilter` for all origin
-except root which will get no filter. And not the filter contained in origin
-use to call `fn schedule`.
-
-If a call is scheduled using proxy or whatever mecanism which adds filter,
-then those filter will not be used when dispatching the schedule call.
deletedpallets/nft-transaction-payment/src/lib.rsdiffbeforeafterboth
--- a/pallets/nft-transaction-payment/src/lib.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// This file is subject to the terms and conditions defined in
-// file 'LICENSE', which is part of this source code package.
-//
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-#[cfg(feature = "std")]
-pub use std::*;
-
-#[cfg(feature = "std")]
-pub use serde::*;
-
-use frame_support::{decl_module, decl_storage};
-use sp_std::prelude::*;
-use up_sponsorship::SponsorshipHandler;
-
-pub trait Config: frame_system::Config + pallet_transaction_payment::Config {
-	type SponsorshipHandler: SponsorshipHandler<Self::AccountId, Self::Call>;
-}
-
-decl_storage! {
-	trait Store for Module<T: Config> as NftTransactionPayment{
-	}
-}
-
-decl_module! {
-	pub struct Module<T: Config> for enum Call
-	where
-		origin: T::Origin,
-	{
-	}
-}
-
-impl<T: Config> Module<T> {
-	pub fn withdraw_type(who: &T::AccountId, call: &T::Call) -> Option<T::AccountId> {
-		T::SponsorshipHandler::get_sponsor(who, call)
-	}
-}
modifiedruntime/Cargo.tomldiffbeforeafterboth
before · runtime/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Substrate node nft'8edition = '2018'9homepage = 'https://unique.network'10license = 'All Rights Reserved'11name = 'nft-runtime'12repository = 'https://github.com/usetech-llc/nft_private/'13version = '0.9.12'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21    'hex-literal',22    'frame-benchmarking',23    'frame-support/runtime-benchmarks',24    'frame-system-benchmarking',25    'frame-system/runtime-benchmarks',26    'pallet-evm-migration/runtime-benchmarks',27    'pallet-balances/runtime-benchmarks',28    'pallet-timestamp/runtime-benchmarks',29    'pallet-common/runtime-benchmarks',30    'pallet-fungible/runtime-benchmarks',31    'pallet-refungible/runtime-benchmarks',32    'pallet-nonfungible/runtime-benchmarks',33    'pallet-nft/runtime-benchmarks',34    'pallet-inflation/runtime-benchmarks',35    'pallet-xcm/runtime-benchmarks',36    'sp-runtime/runtime-benchmarks',37    'xcm-builder/runtime-benchmarks',38]39std = [40    'codec/std',41    'cumulus-pallet-aura-ext/std',42    'cumulus-pallet-parachain-system/std',43    'cumulus-pallet-xcm/std',44    'cumulus-pallet-xcmp-queue/std',45    'cumulus-primitives-core/std',46    'cumulus-primitives-utility/std',47    'frame-executive/std',48    'frame-support/std',49    'frame-system/std',50    'frame-system-rpc-runtime-api/std',51    'pallet-aura/std',52    'pallet-balances/std',53    # 'pallet-contracts/std',54    # 'pallet-contracts-primitives/std',55    # 'pallet-contracts-rpc-runtime-api/std',56    # 'pallet-contract-helpers/std',57    'pallet-randomness-collective-flip/std',58    'pallet-sudo/std',59    'pallet-timestamp/std',60    'pallet-transaction-payment/std',61    'pallet-transaction-payment-rpc-runtime-api/std',62    'pallet-treasury/std',63    # 'pallet-vesting/std',64    'pallet-evm/std',65    'pallet-evm-migration/std',66    'pallet-evm-contract-helpers/std',67    'pallet-evm-transaction-payment/std',68    'pallet-evm-coder-substrate/std',69    'pallet-ethereum/std',70    'fp-rpc/std',71    'up-rpc/std',72    'fp-self-contained/std',73    'parachain-info/std',74    'serde',75    'pallet-inflation/std',76    'pallet-common/std',77    'pallet-fungible/std',78    'pallet-refungible/std',79    'pallet-nonfungible/std',80    'pallet-nft/std',81    'pallet-unq-scheduler/std',82    'pallet-nft-charge-transaction/std',83    'pallet-nft-transaction-payment/std',84    'nft-data-structs/std',85    'sp-api/std',86    'sp-block-builder/std',87    "sp-consensus-aura/std",88    'sp-core/std',89    'sp-inherents/std',90    'sp-io/std',91    'sp-offchain/std',92    'sp-runtime/std',93    'sp-session/std',94    'sp-std/std',95    'sp-transaction-pool/std',96    'sp-version/std',97    'xcm/std',98    'xcm-builder/std',99    'xcm-executor/std',100101    "orml-vesting/std",102]103limit-testing = ['pallet-nft/limit-testing', 'nft-data-structs/limit-testing']104105################################################################################106# Substrate Dependencies107108[dependencies.codec]109default-features = false110features = ['derive']111package = 'parity-scale-codec'112version = '2.3.0'113114[dependencies.frame-benchmarking]115default-features = false116git = 'https://github.com/paritytech/substrate.git'117optional = true118branch = 'polkadot-v0.9.12'119120[dependencies.frame-executive]121default-features = false122git = 'https://github.com/paritytech/substrate.git'123branch = 'polkadot-v0.9.12'124125[dependencies.frame-support]126default-features = false127git = 'https://github.com/paritytech/substrate.git'128branch = 'polkadot-v0.9.12'129130[dependencies.frame-system]131default-features = false132git = 'https://github.com/paritytech/substrate.git'133branch = 'polkadot-v0.9.12'134135[dependencies.frame-system-benchmarking]136default-features = false137git = 'https://github.com/paritytech/substrate.git'138optional = true139branch = 'polkadot-v0.9.12'140141[dependencies.frame-system-rpc-runtime-api]142default-features = false143git = 'https://github.com/paritytech/substrate.git'144branch = 'polkadot-v0.9.12'145146[dependencies.hex-literal]147optional = true148version = '0.3.3'149150[dependencies.serde]151default-features = false152features = ['derive']153optional = true154version = '1.0.130'155156[dependencies.pallet-aura]157default-features = false158git = 'https://github.com/paritytech/substrate.git'159branch = 'polkadot-v0.9.12'160161[dependencies.pallet-balances]162default-features = false163git = 'https://github.com/paritytech/substrate.git'164branch = 'polkadot-v0.9.12'165166# Contracts specific packages167# [dependencies.pallet-contracts]168# git = 'https://github.com/paritytech/substrate.git'169# default-features = false170# branch = 'polkadot-v0.9.12'171# version = '4.0.0-dev'172173# [dependencies.pallet-contracts-primitives]174# git = 'https://github.com/paritytech/substrate.git'175# default-features = false176# branch = 'polkadot-v0.9.12'177# version = '4.0.0-dev'178179# [dependencies.pallet-contracts-rpc-runtime-api]180# git = 'https://github.com/paritytech/substrate.git'181# default-features = false182# branch = 'polkadot-v0.9.12'183# version = '4.0.0-dev'184185[dependencies.pallet-randomness-collective-flip]186default-features = false187git = 'https://github.com/paritytech/substrate.git'188branch = 'polkadot-v0.9.12'189190[dependencies.pallet-sudo]191default-features = false192git = 'https://github.com/paritytech/substrate.git'193branch = 'polkadot-v0.9.12'194195[dependencies.pallet-timestamp]196default-features = false197git = 'https://github.com/paritytech/substrate.git'198branch = 'polkadot-v0.9.12'199200[dependencies.pallet-transaction-payment]201default-features = false202git = 'https://github.com/paritytech/substrate.git'203branch = 'polkadot-v0.9.12'204205[dependencies.pallet-transaction-payment-rpc-runtime-api]206default-features = false207git = 'https://github.com/paritytech/substrate.git'208branch = 'polkadot-v0.9.12'209210[dependencies.pallet-treasury]211default-features = false212git = 'https://github.com/paritytech/substrate.git'213branch = 'polkadot-v0.9.12'214215# [dependencies.pallet-vesting]216# default-features = false217# git = 'https://github.com/paritytech/substrate.git'218# branch = 'polkadot-v0.9.12'219220[dependencies.sp-arithmetic]221default-features = false222git = 'https://github.com/paritytech/substrate.git'223branch = 'polkadot-v0.9.12'224225[dependencies.sp-api]226default-features = false227git = 'https://github.com/paritytech/substrate.git'228branch = 'polkadot-v0.9.12'229230[dependencies.sp-block-builder]231default-features = false232git = 'https://github.com/paritytech/substrate.git'233branch = 'polkadot-v0.9.12'234235[dependencies.sp-core]236default-features = false237git = 'https://github.com/paritytech/substrate.git'238branch = 'polkadot-v0.9.12'239240[dependencies.sp-consensus-aura]241default-features = false242git = 'https://github.com/paritytech/substrate.git'243branch = 'polkadot-v0.9.12'244245[dependencies.sp-inherents]246default-features = false247git = 'https://github.com/paritytech/substrate.git'248branch = 'polkadot-v0.9.12'249250[dependencies.sp-io]251default-features = false252git = 'https://github.com/paritytech/substrate.git'253branch = 'polkadot-v0.9.12'254255[dependencies.sp-offchain]256default-features = false257git = 'https://github.com/paritytech/substrate.git'258branch = 'polkadot-v0.9.12'259260[dependencies.sp-runtime]261default-features = false262git = 'https://github.com/paritytech/substrate.git'263branch = 'polkadot-v0.9.12'264265[dependencies.sp-session]266default-features = false267git = 'https://github.com/paritytech/substrate.git'268branch = 'polkadot-v0.9.12'269270[dependencies.sp-std]271default-features = false272git = 'https://github.com/paritytech/substrate.git'273branch = 'polkadot-v0.9.12'274275[dependencies.sp-transaction-pool]276default-features = false277git = 'https://github.com/paritytech/substrate.git'278branch = 'polkadot-v0.9.12'279280[dependencies.sp-version]281default-features = false282git = 'https://github.com/paritytech/substrate.git'283branch = 'polkadot-v0.9.12'284285[dependencies.smallvec]286version = '1.6.1'287288################################################################################289# Cumulus dependencies290291[dependencies.parachain-info]292default-features = false293git = 'https://github.com/paritytech/cumulus.git'294branch = 'polkadot-v0.9.12'295296[dependencies.cumulus-pallet-aura-ext]297git = 'https://github.com/paritytech/cumulus.git'298branch = 'polkadot-v0.9.12'299default-features = false300301[dependencies.cumulus-pallet-parachain-system]302git = 'https://github.com/paritytech/cumulus.git'303branch = 'polkadot-v0.9.12'304default-features = false305306[dependencies.cumulus-primitives-core]307git = 'https://github.com/paritytech/cumulus.git'308branch = 'polkadot-v0.9.12'309default-features = false310311[dependencies.cumulus-pallet-xcm]312git = 'https://github.com/paritytech/cumulus.git'313branch = 'polkadot-v0.9.12'314default-features = false315316[dependencies.cumulus-pallet-dmp-queue]317git = 'https://github.com/paritytech/cumulus.git'318branch = 'polkadot-v0.9.12'319default-features = false320321[dependencies.cumulus-pallet-xcmp-queue]322git = 'https://github.com/paritytech/cumulus.git'323branch = 'polkadot-v0.9.12'324default-features = false325326[dependencies.cumulus-primitives-utility]327git = 'https://github.com/paritytech/cumulus.git'328branch = 'polkadot-v0.9.12'329default-features = false330331[dependencies.cumulus-primitives-timestamp]332git = 'https://github.com/paritytech/cumulus.git'333branch = 'polkadot-v0.9.12'334default-features = false335336################################################################################337# Polkadot dependencies338339[dependencies.polkadot-parachain]340git = 'https://github.com/paritytech/polkadot'341branch = 'release-v0.9.12'342default-features = false343344[dependencies.xcm]345git = 'https://github.com/paritytech/polkadot'346branch = 'release-v0.9.12'347default-features = false348349[dependencies.xcm-builder]350git = 'https://github.com/paritytech/polkadot'351branch = 'release-v0.9.12'352default-features = false353354[dependencies.xcm-executor]355git = 'https://github.com/paritytech/polkadot'356branch = 'release-v0.9.12'357default-features = false358359[dependencies.pallet-xcm]360git = 'https://github.com/paritytech/polkadot'361branch = 'release-v0.9.12'362default-features = false363364[dependencies.orml-vesting]365git = "https://github.com/open-web3-stack/open-runtime-module-library"366version = "0.4.1-dev" 367default-features = false368369################################################################################370# local dependencies371372[dependencies]373scale-info = { version = "1.0.0", default-features = false, features = [374    "derive",375] }376derivative = "2.2.0"377pallet-nft = { path = '../pallets/nft', default-features = false, version = '3.0.0' }378up-rpc = { path = "../primitives/rpc", default-features = false }379pallet-inflation = { path = '../pallets/inflation', default-features = false, version = '3.0.0' }380nft-data-structs = { path = '../primitives/nft', default-features = false, version = '0.9.0' }381pallet-common = { default-features = false, path = "../pallets/common" }382pallet-fungible = { default-features = false, path = "../pallets/fungible" }383pallet-refungible = { default-features = false, path = "../pallets/refungible" }384pallet-nonfungible = { default-features = false, path = "../pallets/nonfungible" }385pallet-unq-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }386# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }387pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }388pallet-nft-charge-transaction = {git = "https://github.com/UniqueNetwork/pallet-sponsoring", package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }389pallet-evm-migration = { path = '../pallets/evm-migration', default-features = false }390pallet-evm-contract-helpers = { path = '../pallets/evm-contract-helpers', default-features = false }391pallet-evm-transaction-payment = { path = '../pallets/evm-transaction-payment', default-features = false }392pallet-evm-coder-substrate = { default-features = false, path = "../pallets/evm-coder-substrate" }393394pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }395pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }396fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }397fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }398399################################################################################400# Build Dependencies401402[build-dependencies.substrate-wasm-builder]403git = 'https://github.com/paritytech/substrate.git'404branch = 'polkadot-v0.9.12'
modifiedruntime/src/lib.rsdiffbeforeafterboth
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -805,10 +805,6 @@
 	type WeightInfo = ();
 }
 
-impl pallet_nft_transaction_payment::Config for Runtime {
-	type SponsorshipHandler = SponsorshipHandler;
-}
-
 impl pallet_evm_transaction_payment::Config for Runtime {
 	type SponsorshipHandler = (
 		pallet_nft::NftEthSponsorshipHandler<Self>,
@@ -870,7 +866,7 @@
 		Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
 		Nft: pallet_nft::{Pallet, Call, Storage} = 61,
 		Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
-		NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage} = 63,
+		// free = 63
 		Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage } = 64,
 		// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,
 		Common: pallet_common::{Pallet, Storage, Event<T>} = 66,