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

difftreelog

Merge branch 'develop' into feature/split-collection-pallets

Igor Kozyrev2021-11-08parents: #82fab32 #6cd8e0c.patch.diff
in: master

15 files changed

modifiedCargo.lockdiffbeforeafterboth
49404940
4941[[package]]4941[[package]]
4942name = "nft"4942name = "nft"
4943version = "3.0.0"4943version = "0.9.12"
4944dependencies = [4944dependencies = [
4945 "cumulus-client-cli",4945 "cumulus-client-cli",
4946 "cumulus-client-collator",4946 "cumulus-client-collator",
50765076
5077[[package]]5077[[package]]
5078name = "nft-runtime"5078name = "nft-runtime"
5079version = "3.0.0"5079version = "0.9.12"
5080dependencies = [5080dependencies = [
5081 "cumulus-pallet-aura-ext",5081 "cumulus-pallet-aura-ext",
5082 "cumulus-pallet-dmp-queue",5082 "cumulus-pallet-dmp-queue",
5109 "pallet-fungible",5109 "pallet-fungible",
5110 "pallet-inflation",5110 "pallet-inflation",
5111 "pallet-nft",5111 "pallet-nft",
5112 "pallet-nft-charge-transaction",
5113 "pallet-nft-transaction-payment",5112 "pallet-nft-transaction-payment",
5114 "pallet-nonfungible",5113 "pallet-nonfungible",
5115 "pallet-randomness-collective-flip",5114 "pallet-randomness-collective-flip",
5116 "pallet-refungible",5115 "pallet-refungible",
5117 "pallet-sudo",5116 "pallet-sudo",
5117 "pallet-template-charge-transaction",
5118 "pallet-timestamp",5118 "pallet-timestamp",
5119 "pallet-transaction-payment",5119 "pallet-transaction-payment",
5120 "pallet-transaction-payment-rpc-runtime-api",5120 "pallet-transaction-payment-rpc-runtime-api",
6075 "up-sponsorship",6075 "up-sponsorship",
6076]6076]
6077
6078[[package]]
6079name = "pallet-nft-charge-transaction"
6080version = "3.0.0"
6081dependencies = [
6082 "frame-benchmarking",
6083 "frame-support",
6084 "frame-system",
6085 "pallet-balances",
6086 "pallet-nft-transaction-payment",
6087 "pallet-transaction-payment",
6088 "parity-scale-codec",
6089 "scale-info",
6090 "serde",
6091 "sp-core",
6092 "sp-io",
6093 "sp-runtime",
6094 "sp-std",
6095]
60966077
6097[[package]]6078[[package]]
6098name = "pallet-nft-transaction-payment"6079name = "pallet-nft-transaction-payment"
6368 "sp-std",6349 "sp-std",
6369]6350]
6351
6352[[package]]
6353name = "pallet-template-charge-transaction"
6354version = "3.0.0"
6355source = "git+https://github.com/UniqueNetwork/pallet-sponsoring#e5d3354ab68face1b2ef709dc7f629803f56598d"
6356dependencies = [
6357 "frame-benchmarking",
6358 "frame-support",
6359 "frame-system",
6360 "pallet-balances",
6361 "pallet-transaction-payment",
6362 "parity-scale-codec",
6363 "scale-info",
6364 "serde",
6365 "sp-core",
6366 "sp-io",
6367 "sp-runtime",
6368 "sp-std",
6369 "up-sponsorship",
6370]
63706371
6371[[package]]6372[[package]]
6372name = "pallet-timestamp"6373name = "pallet-timestamp"
11695source = "registry+https://github.com/rust-lang/crates.io-index"11696source = "registry+https://github.com/rust-lang/crates.io-index"
11696checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e"11697checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e"
11697dependencies = [11698dependencies = [
11698 "cfg-if 1.0.0",11699 "cfg-if 0.1.10",
11699 "rand 0.8.4",11700 "rand 0.8.4",
11700 "static_assertions",11701 "static_assertions",
11701]11702]
11846[[package]]11847[[package]]
11847name = "up-sponsorship"11848name = "up-sponsorship"
11848version = "0.1.0"11849version = "0.1.0"
11850source = "git+https://github.com/UniqueNetwork/pallet-sponsoring#e5d3354ab68face1b2ef709dc7f629803f56598d"
11849dependencies = [11851dependencies = [
11850 "impl-trait-for-tuples 0.2.1",11852 "impl-trait-for-tuples 0.2.1",
11851]11853]
modifieddocker-compose-tests-parachain.ymldiffbeforeafterboth
22
3services:3services:
4 blockchain_nodes:4 blockchain_nodes:
5 image: blockchain_nodes
6 container_name: blockchain_nodes
7 ports:
8 - 9944:9944
9 - 9844:9844
10 - 9933:9933
11 build:5 build:
12 context: ./6 context: ./
13 dockerfile: Dockerfile-parachain7 dockerfile: Dockerfile-parachain
17 - POLKA_VERSION=${POLKA_VERSION:?err}11 - POLKA_VERSION=${POLKA_VERSION:?err}
18 - NFT_BRANCH=${NFT_BRANCH:?err}12 - NFT_BRANCH=${NFT_BRANCH:?err}
19 volumes:13 volumes:
20# - ./chain-data:/chain-data
21 - ./launch-config.json:/polkadot-launch/launch-config.json14 - ./launch-config.json:/polkadot-launch/launch-config.json
22 env_file:15 env_file:
23 - ./.env16 - ./.env
24 networks:
25 - node_test_network
26 #command: bash -c "yarn --cwd polkadot-launch start"
27 #command: bash -c 'while true; do sleep 60; df -h; done'
2817
29 integration_tests:18 integration_tests:
30 container_name: integration_tests
31 image: integration_tests
32 build:19 build:
33 context: tests/20 context: tests/
34 dockerfile: Dockerfile-tests21 dockerfile: Dockerfile-tests
37 volumes:24 volumes:
38 - ./tests/src/config_docker.ts:/nft_parachain/src/config.ts25 - ./tests/src/config_docker.ts:/nft_parachain/src/config.ts
39 - /home/ubuntu/mochawesome-report:/nft_parachain/mochawesome-report26 - /home/ubuntu/mochawesome-report:/nft_parachain/mochawesome-report
40# command: bash -c 'while true; do sleep 20; df -h; done'
41 networks:
42 - node_test_network
43 depends_on:27 depends_on:
44 - blockchain_nodes28 - blockchain_nodes
45
46# unit_tests:
47# container_name: unit_test
48# image: nft_unit_test
49# build:
50# context: ./
51# dockerfile: Dockerfile-unit
52# container_name: unit_test
53# networks:
54# - node_test_network
55 # command: bash -c 'while true; do sleep 20; df -h; done'
56# command: bash -c 'cargo test'
57
58networks:
59 node_test_network:
60 name: node_test_network
61 driver: bridge
6229
modifiednode/cli/Cargo.tomldiffbeforeafterboth
233233
234[dependencies.nft-runtime]234[dependencies.nft-runtime]
235path = '../../runtime'235path = '../../runtime'
236version = '3.0.0'236version = '0.9.12'
237237
238[dependencies.nft-data-structs]238[dependencies.nft-data-structs]
239path = "../../primitives/nft"239path = "../../primitives/nft"
251license = 'All Rights Reserved'251license = 'All Rights Reserved'
252name = 'nft'252name = 'nft'
253repository = 'https://github.com/usetech-llc/nft_private/'253repository = 'https://github.com/usetech-llc/nft_private/'
254version = '3.0.0'254version = '0.9.12'
255255
256[[bin]]256[[bin]]
257name = 'nft'257name = 'nft'
modifiedpallets/contract-helpers/Cargo.tomldiffbeforeafterboth
9package = 'parity-scale-codec'9package = 'parity-scale-codec'
10version = '2.3.0'10version = '2.3.0'
11
12[dependencies.up-sponsorship]
13default-features = false
14path = '../../primitives/sponsorship'
15version = '0.1.0'
1611
17[dependencies]12[dependencies]
18scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }13scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
21pallet-contracts = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }16pallet-contracts = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
22sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }17sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
23sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }18sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
19up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" }
2420
25[features]21[features]
26default = ["std"]22default = ["std"]
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
13evm-coder = { default-features = false, path = '../../crates/evm-coder' }13evm-coder = { default-features = false, path = '../../crates/evm-coder' }
14pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }14pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
15pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }15pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }
16up-sponsorship = { default-features = false, path = '../../primitives/sponsorship' }16up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" }
17log = "0.4.14"17log = "0.4.14"
1818
19[dependencies.codec]19[dependencies.codec]
modifiedpallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth
14pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }14pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }
15fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }15fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }
16pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }16pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }
17up-sponsorship = { default-features = false, path = '../../primitives/sponsorship' }17up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" }
1818
19[dependencies.codec]19[dependencies.codec]
20default-features = false20default-features = false
deletedpallets/nft-charge-transaction/Cargo.tomldiffbeforeafterboth

no changes

deletedpallets/nft-charge-transaction/src/lib.rsdiffbeforeafterboth

no changes

modifiedpallets/nft-transaction-payment/Cargo.tomldiffbeforeafterboth
30sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }30sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
31sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }31sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
3232
33up-sponsorship = { default-features = false, path = "../../primitives/sponsorship", version = "0.1.0" }33up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" }
3434
35[features]35[features]
36default = ['std']36default = ['std']
modifiedpallets/nft/Cargo.tomldiffbeforeafterboth
126path = '../../primitives/nft'126path = '../../primitives/nft'
127version = '0.9.0'127version = '0.9.0'
128
129[dependencies.up-sponsorship]
130default-features = false
131path = '../../primitives/sponsorship'
132version = '0.1.0'
133
134128
135[dependencies]129[dependencies]
140rlp = { default-features = false, version = "0.5.0" }134rlp = { default-features = false, version = "0.5.0" }
141sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12" }135sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12" }
136
137up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" }
142138
143evm-coder = { default-features = false, path = "../../crates/evm-coder" }139evm-coder = { default-features = false, path = "../../crates/evm-coder" }
144pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }140pallet-evm-coder-substrate = { default-features = false, path = "../../pallets/evm-coder-substrate" }
modifiedpallets/scheduler/Cargo.tomldiffbeforeafterboth
20sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }20sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
21frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }21frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.12' }
2222
23up-sponsorship = { default-features = false, path = "../../primitives/sponsorship", version = "0.1.0" }23up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" }
24log = { version = "0.4.14", default-features = false }24log = { version = "0.4.14", default-features = false }
2525
26[dev-dependencies]26[dev-dependencies]
deletedprimitives/sponsorship/Cargo.tomldiffbeforeafterboth

no changes

deletedprimitives/sponsorship/src/lib.rsdiffbeforeafterboth

no changes

modifiedruntime/Cargo.tomldiffbeforeafterboth
10license = 'All Rights Reserved'10license = 'All Rights Reserved'
11name = 'nft-runtime'11name = 'nft-runtime'
12repository = 'https://github.com/usetech-llc/nft_private/'12repository = 'https://github.com/usetech-llc/nft_private/'
13version = '3.0.0'13version = '0.9.12'
1414
15[package.metadata.docs.rs]15[package.metadata.docs.rs]
16targets = ['x86_64-unknown-linux-gnu']16targets = ['x86_64-unknown-linux-gnu']
379pallet-unq-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }379pallet-unq-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }
380# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }380# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
381pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }381pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }
382pallet-nft-charge-transaction = { path = '../pallets/nft-charge-transaction', default-features = false, version = '3.0.0' }382pallet-nft-charge-transaction = {git = "https://github.com/UniqueNetwork/pallet-sponsoring", package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }
383pallet-evm-migration = { path = '../pallets/evm-migration', default-features = false }383pallet-evm-migration = { path = '../pallets/evm-migration', default-features = false }
384pallet-evm-contract-helpers = { path = '../pallets/evm-contract-helpers', default-features = false }384pallet-evm-contract-helpers = { path = '../pallets/evm-contract-helpers', default-features = false }
385pallet-evm-transaction-payment = { path = '../pallets/evm-transaction-payment', default-features = false }385pallet-evm-transaction-payment = { path = '../pallets/evm-transaction-payment', default-features = false }
modifiedruntime/src/lib.rsdiffbeforeafterboth
147 spec_name: create_runtime_str!("opal"),147 spec_name: create_runtime_str!("opal"),
148 impl_name: create_runtime_str!("opal"),148 impl_name: create_runtime_str!("opal"),
149 authoring_version: 1,149 authoring_version: 1,
150 spec_version: 912200,150 spec_version: 912202,
151 impl_version: 1,151 impl_version: 1,
152 apis: RUNTIME_API_VERSIONS,152 apis: RUNTIME_API_VERSIONS,
153 transaction_version: 1,153 transaction_version: 1,
803}803}
804804
805impl pallet_nft_charge_transaction::Config for Runtime {}805impl pallet_nft_charge_transaction::Config for Runtime {
806 type SponsorshipHandler = pallet_nft::NftSponsorshipHandler<Runtime>;
807}
806808
807// impl pallet_contract_helpers::Config for Runtime {809// impl pallet_contract_helpers::Config for Runtime {