difftreelog
Merge branch 'master' into dev
in: master
5 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3085,10 +3085,12 @@
dependencies = [
"frame-support",
"frame-system",
+ "pallet-transaction-payment",
"parity-scale-codec",
"sp-core",
"sp-io",
"sp-runtime",
+ "sp-std",
]
[[package]]
doc/application_development.mddiffbeforeafterboth--- a/doc/application_development.md
+++ b/doc/application_development.md
@@ -16,6 +16,54 @@
+## Custom Types for JS API
+
+```
+{
+ "Schedule": {
+ "version": "u32",
+ "put_code_per_byte_cost": "Gas",
+ "grow_mem_cost": "Gas",
+ "regular_op_cost": "Gas",
+ "return_data_per_byte_cost": "Gas",
+ "event_data_per_byte_cost": "Gas",
+ "event_per_topic_cost": "Gas",
+ "event_base_cost": "Gas",
+ "call_base_cost": "Gas",
+ "instantiate_base_cost": "Gas",
+ "dispatch_base_cost": "Gas",
+ "sandbox_data_read_cost": "Gas",
+ "sandbox_data_write_cost": "Gas",
+ "transfer_cost": "Gas",
+ "instantiate_cost": "Gas",
+ "max_event_topics": "u32",
+ "max_stack_height": "u32",
+ "max_memory_pages": "u32",
+ "max_table_size": "u32",
+ "enable_println": "bool",
+ "max_subject_len": "u32"
+ },
+ "NftItemType": {
+ "Collection": "u64",
+ "Owner": "AccountId",
+ "Data": "Vec<u8>"
+ },
+ "CollectionType": {
+ "Owner": "AccountId",
+ "NextItemId": "u64",
+ "Name": "Vec<u16>",
+ "Description": "Vec<u16>",
+ "TokenPrefix": "Vec<u8>",
+ "CustomDataSize": "u32",
+ "Sponsor": "AccountId",
+ "UnconfirmedSponsor": "AccountId"
+ },
+ "Address": "AccountId",
+ "LookupSource": "AccountId",
+ "Weight": "u64"
+}
+```
+
## NFT Palette Methods
### Collection Management
pallets/nft/Cargo.tomldiffbeforeafterboth--- a/pallets/nft/Cargo.toml
+++ b/pallets/nft/Cargo.toml
@@ -33,6 +33,19 @@
branch = 'rc4_ext_dispatch_reenabled'
version = '2.0.0-rc4'
+[dependencies.sp-std]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
+
+[dependencies.transaction-payment]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+package = 'pallet-transaction-payment'
+branch = 'rc4_ext_dispatch_reenabled'
+version = '2.0.0-rc4'
+
[package]
authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
description = 'FRAME pallet nft'
@@ -52,4 +65,5 @@
'frame-support/std',
'frame-system/std',
'sp-runtime/std',
+ 'sp-std/std',
]
pallets/nft/src/lib.rsdiffbeforeafterboth4/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs4/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs556use codec::{Decode, Encode};6use codec::{Decode, Encode};7use frame_support::{decl_event, decl_module, decl_storage, dispatch::DispatchResult, ensure};7pub use frame_support::{8 decl_event, decl_module, decl_storage,9 construct_runtime, parameter_types,10 traits::{Currency, Get, ExistenceRequirement, KeyOwnerProofSystem, OnUnbalanced, Randomness, WithdrawReason, Imbalance},11 weights::{12 DispatchInfo, PostDispatchInfo, constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},13 IdentityFee, Weight, WeightToFeePolynomial, GetDispatchInfo, Pays,14 },15 StorageValue,16 dispatch::DispatchResult, 17 IsSubType,18 ensure19};208use frame_system::{self as system, ensure_signed};21use frame_system::{self as system, ensure_signed};9use sp_runtime::sp_std::prelude::Vec;22use sp_runtime::sp_std::prelude::Vec;23use sp_std::prelude::*;24use sp_runtime::{25 FixedU128, FixedPointOperand, 26 transaction_validity::{27 TransactionPriority, ValidTransaction, InvalidTransaction, TransactionValidityError, TransactionValidity28 },29 traits::{30 Saturating, Dispatchable, DispatchInfoOf, PostDispatchInfoOf, SignedExtension, Zero, SaturatedConversion,31 },32};103311#[cfg(test)]34#[cfg(test)]12mod mock;35mod mock;49 pub description: Vec<u16>, // 256 include null escape char72 pub description: Vec<u16>, // 256 include null escape char50 pub token_prefix: Vec<u8>, // 16 include null escape char73 pub token_prefix: Vec<u8>, // 16 include null escape char51 pub custom_data_size: u32,74 pub custom_data_size: u32,75 pub sponsor: AccountId, // Who pays fees. If set to default address, the fees are applied to the transaction sender76 pub unconfirmed_sponsor: AccountId, // Sponsor address that has not yet confirmed sponsorship52}77}537854#[derive(Encode, Decode, Default, Clone, PartialEq)]79#[derive(Encode, Decode, Default, Clone, PartialEq)]195 decimal_points: decimal_points,221 decimal_points: decimal_points,196 token_prefix: prefix,222 token_prefix: prefix,197 next_item_id: next_id,223 next_item_id: next_id,198 custom_data_size: custom_data_size,224 custom_data_size: custom_data_sz,225 sponsor: T::AccountId::default(),226 unconfirmed_sponsor: T::AccountId::default(),199 };227 };200228201 // Add new collection to map229 // Add new collection to map271 }299 }272300273 #[weight = 0]301 #[weight = 0]302 pub fn set_collection_sponsor(origin, collection_id: u64, new_sponsor: T::AccountId) -> DispatchResult {303304 let sender = ensure_signed(origin)?;305 ensure!(<Collection<T>>::contains_key(collection_id), "This collection does not exist");306307 let mut target_collection = <Collection<T>>::get(collection_id);308 ensure!(sender == target_collection.owner, "You do not own this collection");309310 target_collection.unconfirmed_sponsor = new_sponsor;311 <Collection<T>>::insert(collection_id, target_collection);312313 Ok(())314 }315316 #[weight = 0]317 pub fn confirm_sponsorship(origin, collection_id: u64) -> DispatchResult {318319 let sender = ensure_signed(origin)?;320 ensure!(<Collection<T>>::contains_key(collection_id), "This collection does not exist");321322 let mut target_collection = <Collection<T>>::get(collection_id);323 ensure!(sender == target_collection.unconfirmed_sponsor, "This address is not set as sponsor, use setCollectionSponsor first");324325 target_collection.sponsor = target_collection.unconfirmed_sponsor;326 target_collection.unconfirmed_sponsor = T::AccountId::default();327 <Collection<T>>::insert(collection_id, target_collection);328329 Ok(())330 }331332 #[weight = 0]333 pub fn remove_collection_sponsor(origin, collection_id: u64) -> DispatchResult {334335 let sender = ensure_signed(origin)?;336 ensure!(<Collection<T>>::contains_key(collection_id), "This collection does not exist");337338 let mut target_collection = <Collection<T>>::get(collection_id);339 ensure!(sender == target_collection.owner, "You do not own this collection");340341 target_collection.sponsor = T::AccountId::default();342 <Collection<T>>::insert(collection_id, target_collection);343344 Ok(())345 }346 347348349 #[weight = 0]274 pub fn create_item(origin, collection_id: u64, properties: Vec<u8>, owner: T::AccountId) -> DispatchResult {350 pub fn create_item(origin, collection_id: u64, properties: Vec<u8>) -> DispatchResult {275351276 let sender = ensure_signed(origin)?;352 let sender = ensure_signed(origin)?;277353590}666}667668669////////////////////////////////////////////////////////////////////////////////////////////////////670// Economic models671672/// Fee multiplier.673pub type Multiplier = FixedU128;674675type BalanceOf<T> =676 <<T as transaction_payment::Trait>::Currency as Currency<<T as system::Trait>::AccountId>>::Balance;677type NegativeImbalanceOf<T> = <<T as transaction_payment::Trait>::Currency as Currency<678 <T as system::Trait>::AccountId,>>::NegativeImbalance;679680681682/// Require the transactor pay for themselves and maybe include a tip to gain additional priority683/// in the queue.684#[derive(Encode, Decode, Clone, Eq, PartialEq)]685pub struct ChargeTransactionPayment<T: transaction_payment::Trait + Send + Sync>(#[codec(compact)] BalanceOf<T>);686687impl<T:Trait + transaction_payment::Trait + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {688 #[cfg(feature = "std")]689 fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {690 write!(f, "ChargeTransactionPayment<{:?}>", self.0)691 }692 #[cfg(not(feature = "std"))]693 fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {694 Ok(())695 }696}697698impl<T:Trait + transaction_payment::Trait + Send + Sync> ChargeTransactionPayment<T> where699 T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo> + IsSubType<Module<T>, T>,700 BalanceOf<T>: Send + Sync + FixedPointOperand,701{702 /// utility constructor. Used only in client/factory code.703 pub fn from(fee: BalanceOf<T>) -> Self {704 Self(fee)705 }706707 pub fn traditional_fee(708 len: usize,709 info: &DispatchInfoOf<T::Call>,710 tip: BalanceOf<T>,711 ) -> BalanceOf<T> where712 T::Call: Dispatchable<Info=DispatchInfo>,713 {714 <transaction_payment::Module<T>>::compute_fee(len as u32, info, tip)715 }716717 fn withdraw_fee(718 &self,719 who: &T::AccountId,720 call: &T::Call,721 info: &DispatchInfoOf<T::Call>,722 len: usize,723 ) -> Result<(BalanceOf<T>, Option<NegativeImbalanceOf<T>>), TransactionValidityError> {724 let tip = self.0;725726 // Set fee based on call type. Creating collection costs 1 Unique.727 // All other transactions have traditional fees so far728 let fee = match call.is_sub_type() {729 Some(Call::create_collection(..)) => <BalanceOf<T>>::from(1_000_000_000),730 _ => Self::traditional_fee(len, info, tip)731732 // Flat fee model, use only for testing purposes733 // _ => <BalanceOf<T>>::from(100)734 };735736 // Determine who is paying transaction fee based on ecnomic model737 // Parse call to extract collection ID and access collection sponsor738 let sponsor: T::AccountId = match call.is_sub_type() {739 Some(Call::create_item(collection_id, _properties)) => {740 <Collection<T>>::get(collection_id).sponsor741 },742 Some(Call::transfer(collection_id, _item_id, _new_owner)) => {743 <Collection<T>>::get(collection_id).sponsor744 },745746 _ => T::AccountId::default()747 };748749 let mut who_pays_fee: T::AccountId = sponsor.clone();750 if sponsor == T::AccountId::default() {751 who_pays_fee = who.clone();752 }753754 // Only mess with balances if fee is not zero.755 if fee.is_zero() {756 return Ok((fee, None));757 }758759 match <T as transaction_payment::Trait>::Currency::withdraw(760 &who_pays_fee,761 fee,762 if tip.is_zero() {763 WithdrawReason::TransactionPayment.into()764 } else {765 WithdrawReason::TransactionPayment | WithdrawReason::Tip766 },767 ExistenceRequirement::KeepAlive,768 ) {769 Ok(imbalance) => Ok((fee, Some(imbalance))),770 Err(_) => Err(InvalidTransaction::Payment.into()),771 }772 }773}774775impl<T:Trait + transaction_payment::Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> where776 BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,777 T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo> + IsSubType<Module<T>, T>,778{779 const IDENTIFIER: &'static str = "ChargeTransactionPayment";780 type AccountId = T::AccountId;781 type Call = T::Call;782 type AdditionalSigned = ();783 type Pre = (BalanceOf<T>, Self::AccountId, Option<NegativeImbalanceOf<T>>, BalanceOf<T>);784 fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }785786 fn validate(787 &self,788 who: &Self::AccountId,789 call: &Self::Call,790 info: &DispatchInfoOf<Self::Call>,791 len: usize,792 ) -> TransactionValidity {793 let (fee, _) = self.withdraw_fee(who, call, info, len)?;794795 let mut r = ValidTransaction::default();796 // NOTE: we probably want to maximize the _fee (of any type) per weight unit_ here, which797 // will be a bit more than setting the priority to tip. For now, this is enough.798 r.priority = fee.saturated_into::<TransactionPriority>();799 Ok(r)800 }801802 fn pre_dispatch(803 self,804 who: &Self::AccountId,805 call: &Self::Call,806 info: &DispatchInfoOf<Self::Call>,807 len: usize808 ) -> Result<Self::Pre, TransactionValidityError> {809 let (fee, imbalance) = self.withdraw_fee(who, call, info, len)?;810 Ok((self.0, who.clone(), imbalance, fee))811 }812813 fn post_dispatch(814 pre: Self::Pre,815 info: &DispatchInfoOf<Self::Call>,816 post_info: &PostDispatchInfoOf<Self::Call>,817 len: usize,818 _result: &DispatchResult,819 ) -> Result<(), TransactionValidityError> {820 let (tip, who, imbalance, fee) = pre;821 if let Some(payed) = imbalance {822 let actual_fee = <transaction_payment::Module<T>>::compute_actual_fee(823 len as u32,824 info,825 post_info,826 tip,827 );828 let refund = fee.saturating_sub(actual_fee);829 let actual_payment = match <T as transaction_payment::Trait>::Currency::deposit_into_existing(&who, refund) {830 Ok(refund_imbalance) => {831 // The refund cannot be larger than the up front payed max weight.832 // `PostDispatchInfo::calc_unspent` guards against such a case.833 match payed.offset(refund_imbalance) {834 Ok(actual_payment) => actual_payment,835 Err(_) => return Err(InvalidTransaction::Payment.into()),836 }837 }838 // We do not recreate the account using the refund. The up front payment839 // is gone in that case.840 Err(_) => payed,841 };842 let imbalances = actual_payment.split(tip);843 <T as transaction_payment::Trait>::OnTransactionPayment::on_unbalanceds(Some(imbalances.0).into_iter()844 .chain(Some(imbalances.1)));845 }846 Ok(())847 }848}591849runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -14,13 +14,13 @@
use sp_api::impl_runtime_apis;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
-use sp_runtime::traits::{
- BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, NumberFor, Saturating, Verify,
-};
use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
transaction_validity::{TransactionSource, TransactionValidity},
ApplyExtrinsicResult, MultiSignature,
+ traits::{
+ BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, NumberFor, Saturating, Verify,
+ },
};
use sp_std::prelude::*;
#[cfg(feature = "std")]
@@ -32,16 +32,22 @@
pub use contracts::Schedule as ContractsSchedule;
pub use frame_support::{
construct_runtime, parameter_types,
- traits::{KeyOwnerProofSystem, Randomness},
+ traits::{Currency, Get, ExistenceRequirement, KeyOwnerProofSystem, OnUnbalanced, Randomness, WithdrawReason},
weights::{
- constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
- IdentityFee, Weight,
+ DispatchInfo, PostDispatchInfo, constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
+ IdentityFee, Weight, WeightToFeePolynomial, GetDispatchInfo, Pays,
},
StorageValue,
+ dispatch::DispatchResult,
};
+use system::{self as system};
#[cfg(any(feature = "std", test))]
pub use sp_runtime::BuildStorage;
-pub use sp_runtime::{Perbill, Permill};
+use sp_runtime::{
+ Perbill,
+};
+
+
pub use timestamp::Call as TimestampCall;
/// Importing a nft pallet
@@ -228,7 +234,8 @@
}
parameter_types! {
- pub const ExistentialDeposit: u128 = 500;
+ // pub const ExistentialDeposit: u128 = 500;
+ pub const ExistentialDeposit: u128 = 0;
}
impl balances::Trait for Runtime {
@@ -331,7 +338,7 @@
system::CheckEra<Runtime>,
system::CheckNonce<Runtime>,
system::CheckWeight<Runtime>,
- transaction_payment::ChargeTransactionPayment<Runtime>,
+ nft::ChargeTransactionPayment<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
@@ -486,3 +493,4 @@
}
}
}
+