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

difftreelog

Field name changed

str-mv2020-07-03parent: #af2b662.patch.diff
in: master

4 files changed

modifiedCargo.lockdiffbeforeafterboth
2804 "pallet-grandpa",2804 "pallet-grandpa",
2805 "pallet-nft",2805 "pallet-nft",
2806 "pallet-randomness-collective-flip",2806 "pallet-randomness-collective-flip",
2807 "pallet-staking",
2807 "pallet-sudo",2808 "pallet-sudo",
2808 "pallet-timestamp",2809 "pallet-timestamp",
2809 "pallet-transaction-payment",2810 "pallet-transaction-payment",
3004 "sp-timestamp",3005 "sp-timestamp",
3005]3006]
3007
3008[[package]]
3009name = "pallet-authorship"
3010version = "2.0.0-rc4"
3011source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4"
3012dependencies = [
3013 "frame-support",
3014 "frame-system",
3015 "impl-trait-for-tuples",
3016 "parity-scale-codec",
3017 "sp-authorship",
3018 "sp-inherents",
3019 "sp-runtime",
3020 "sp-std",
3021]
30063022
3007[[package]]3023[[package]]
3008name = "pallet-balances"3024name = "pallet-balances"
3160 "sp-trie",3176 "sp-trie",
3161]3177]
3178
3179[[package]]
3180name = "pallet-staking"
3181version = "2.0.0-rc4"
3182source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4"
3183dependencies = [
3184 "frame-support",
3185 "frame-system",
3186 "pallet-authorship",
3187 "pallet-session",
3188 "parity-scale-codec",
3189 "serde",
3190 "sp-application-crypto",
3191 "sp-io",
3192 "sp-npos-elections",
3193 "sp-runtime",
3194 "sp-staking",
3195 "sp-std",
3196 "static_assertions",
3197]
31623198
3163[[package]]3199[[package]]
3164name = "pallet-sudo"3200name = "pallet-sudo"
5359 "sp-std",5395 "sp-std",
5360]5396]
5397
5398[[package]]
5399name = "sp-authorship"
5400version = "2.0.0-rc4"
5401source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4"
5402dependencies = [
5403 "parity-scale-codec",
5404 "sp-inherents",
5405 "sp-runtime",
5406 "sp-std",
5407]
53615408
5362[[package]]5409[[package]]
5363name = "sp-block-builder"5410name = "sp-block-builder"
5576 "strum",5623 "strum",
5577]5624]
5625
5626[[package]]
5627name = "sp-npos-elections"
5628version = "2.0.0-rc4"
5629source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4"
5630dependencies = [
5631 "parity-scale-codec",
5632 "serde",
5633 "sp-arithmetic",
5634 "sp-npos-elections-compact",
5635 "sp-std",
5636]
5637
5638[[package]]
5639name = "sp-npos-elections-compact"
5640version = "2.0.0-rc4"
5641source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4"
5642dependencies = [
5643 "proc-macro-crate",
5644 "proc-macro2",
5645 "quote 1.0.7",
5646 "syn 1.0.31",
5647]
55785648
5579[[package]]5649[[package]]
5580name = "sp-offchain"5650name = "sp-offchain"
modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
26 pub next_item_id: u64,26 pub next_item_id: u64,
27 pub name: Vec<u16>, // 64 include null escape char27 pub name: Vec<u16>, // 64 include null escape char
28 pub description: Vec<u16>, // 256 include null escape char28 pub description: Vec<u16>, // 256 include null escape char
29 pub token_trefix: Vec<u8>, // 16 include null escape char29 pub token_prefix: Vec<u8>, // 16 include null escape char
30 pub custom_data_size: u32,30 pub custom_data_size: u32,
31}31}
3232
125 description.push(0);125 description.push(0);
126 ensure!(name.len() <= 256, "Collection description can not be longer than 255 char");126 ensure!(name.len() <= 256, "Collection description can not be longer than 255 char");
127127
128 let mut token_trefix = token_prefix.to_vec();128 let mut prefix = token_prefix.to_vec();
129 token_trefix.push(0);129 prefix.push(0);
130 ensure!(token_trefix.len() <= 16, "Token prefix can not be longer than 15 char");130 ensure!(prefix.len() <= 16, "Token prefix can not be longer than 15 char");
131131
132 // Generate next collection ID132 // Generate next collection ID
133 let next_id = NextCollectionID::get();133 let next_id = NextCollectionID::get();
139 owner: who.clone(),139 owner: who.clone(),
140 name: name,140 name: name,
141 description: description,141 description: description,
142 token_trefix: token_trefix,142 token_prefix: prefix,
143 next_item_id: next_id,143 next_item_id: next_id,
144 custom_data_size: custom_data_sz,144 custom_data_size: custom_data_sz,
145 };145 };
modifiedruntime/Cargo.tomldiffbeforeafterboth
27 'sudo/std',27 'sudo/std',
28 'system/std',28 'system/std',
29 'timestamp/std',29 'timestamp/std',
30 'staking/std',
30 'transaction-payment/std',31 'transaction-payment/std',
31 'nft/std',32 'nft/std',
32]33]
202version = '2.0.0-rc4'203version = '2.0.0-rc4'
204
205
206[dependencies.staking]
207default-features = false
208git = 'https://github.com/paritytech/substrate.git'
209package = 'pallet-staking'
210tag = 'v2.0.0-rc4'
211version = '2.0.0-rc4'
203212
204[dependencies.transaction-payment]213[dependencies.transaction-payment]
205default-features = false214default-features = false
modifiedruntime/src/lib.rsdiffbeforeafterboth
30#[cfg(any(feature = "std", test))]30#[cfg(any(feature = "std", test))]
31pub use sp_runtime::BuildStorage;31pub use sp_runtime::BuildStorage;
32pub use timestamp::Call as TimestampCall;32pub use timestamp::Call as TimestampCall;
33pub use staking::Call as StakingCall;
33pub use balances::Call as BalancesCall;34pub use balances::Call as BalancesCall;
34pub use sp_runtime::{Permill, Perbill};35pub use sp_runtime::{Permill, Perbill};
35pub use contracts::Schedule as ContractsSchedule;36pub use contracts::Schedule as ContractsSchedule;
230}231}
232
233
234parameter_types! {
235 pub const TombstoneDeposit: Balance = 16 * MILLICENTS;
236 pub const RentByteFee: Balance = 4 * MILLICENTS;
237 pub const RentDepositOffset: Balance = 1000 * MILLICENTS;
238 pub const SurchargeReward: Balance = 150 * MILLICENTS;
239}
240
241impl contracts::Trait for Runtime {
242 type Time = Timestamp;
243 type Randomness = RandomnessCollectiveFlip;
244 type Currency = Balances;
245 type Event = Event;
246 type DetermineContractAddress = contracts::SimpleAddressDeterminer<Runtime>;
247 type TrieIdGenerator = contracts::TrieIdFromParentCounter<Runtime>;
248 type RentPayment = ();
249 type SignedClaimHandicap = contracts::DefaultSignedClaimHandicap;
250 type TombstoneDeposit = TombstoneDeposit;
251 type StorageSizeOffset = contracts::DefaultStorageSizeOffset;
252 type RentByteFee = RentByteFee;
253 type RentDepositOffset = RentDepositOffset;
254 type SurchargeReward = SurchargeReward;
255 type MaxDepth = contracts::DefaultMaxDepth;
256 type MaxValueSize = contracts::DefaultMaxValueSize;
257 type WeightPrice = transaction_payment::Module<Self>;
258}
231259
232parameter_types! {260parameter_types! {
233 pub const ExistentialDeposit: u128 = 500;261 pub const ExistentialDeposit: u128 = 500;
260 type Call = Call;288 type Call = Call;
261}289}
262
263parameter_types! {
264 pub const TombstoneDeposit: Balance = 16 * MILLICENTS;
265 pub const RentByteFee: Balance = 4 * MILLICENTS;
266 pub const RentDepositOffset: Balance = 1000 * MILLICENTS;
267 pub const SurchargeReward: Balance = 150 * MILLICENTS;
268}
269
270impl contracts::Trait for Runtime {
271 type Time = Timestamp;
272 type Randomness = RandomnessCollectiveFlip;
273 type Currency = Balances;
274 type Event = Event;
275 type DetermineContractAddress = contracts::SimpleAddressDeterminer<Runtime>;
276 type TrieIdGenerator = contracts::TrieIdFromParentCounter<Runtime>;
277 type RentPayment = ();
278 type SignedClaimHandicap = contracts::DefaultSignedClaimHandicap;
279 type TombstoneDeposit = TombstoneDeposit;
280 type StorageSizeOffset = contracts::DefaultStorageSizeOffset;
281 type RentByteFee = RentByteFee;
282 type RentDepositOffset = RentDepositOffset;
283 type SurchargeReward = SurchargeReward;
284 type MaxDepth = contracts::DefaultMaxDepth;
285 type MaxValueSize = contracts::DefaultMaxValueSize;
286 type WeightPrice = transaction_payment::Module<Self>;
287}
288290
289/// Used for the module template in `./template.rs`291/// Used for the module template in `./template.rs`
290impl nft::Trait for Runtime {292impl nft::Trait for Runtime {
306 Balances: balances::{Module, Call, Storage, Config<T>, Event<T>},308 Balances: balances::{Module, Call, Storage, Config<T>, Event<T>},
307 TransactionPayment: transaction_payment::{Module, Storage},309 TransactionPayment: transaction_payment::{Module, Storage},
308 Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},310 Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},
311 // Staking: staking::{Module, Call, Config<T>, Storage, Event<T>},
309 // Used for the module template in `./template.rs`312 // Used for the module template in `./template.rs`
310 Nft: nft::{Module, Call, Storage, Event<T>},313 Nft: nft::{Module, Call, Storage, Event<T>},
311 }314 }