difftreelog
Merge branch 'develop' into feature/split-collection-pallets
in: master
15 files changed
Cargo.lockdiffbeforeafterboth494049404941[[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",507650765077[[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]60776078[[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]609660776097[[package]]6078[[package]]6098name = "pallet-nft-transaction-payment"6079name = "pallet-nft-transaction-payment"6368 "sp-std",6349 "sp-std",6369]6350]63516352[[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]637063716371[[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]docker-compose-tests-parachain.ymldiffbeforeafterboth223services:3services:4 blockchain_nodes:4 blockchain_nodes:5 image: blockchain_nodes6 container_name: blockchain_nodes7 ports:8 - 9944:99449 - 9844:984410 - 9933:993311 build:5 build:12 context: ./6 context: ./13 dockerfile: Dockerfile-parachain7 dockerfile: Dockerfile-parachain17 - 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-data21 - ./launch-config.json:/polkadot-launch/launch-config.json14 - ./launch-config.json:/polkadot-launch/launch-config.json22 env_file:15 env_file:23 - ./.env16 - ./.env24 networks:25 - node_test_network26 #command: bash -c "yarn --cwd polkadot-launch start"27 #command: bash -c 'while true; do sleep 60; df -h; done'281729 integration_tests:18 integration_tests:30 container_name: integration_tests31 image: integration_tests32 build:19 build:33 context: tests/20 context: tests/34 dockerfile: Dockerfile-tests21 dockerfile: Dockerfile-tests37 volumes:24 volumes:38 - ./tests/src/config_docker.ts:/nft_parachain/src/config.ts25 - ./tests/src/config_docker.ts:/nft_parachain/src/config.ts39 - /home/ubuntu/mochawesome-report:/nft_parachain/mochawesome-report26 - /home/ubuntu/mochawesome-report:/nft_parachain/mochawesome-report40# command: bash -c 'while true; do sleep 20; df -h; done'41 networks:42 - node_test_network43 depends_on:27 depends_on:44 - blockchain_nodes28 - blockchain_nodes4546# unit_tests:47# container_name: unit_test48# image: nft_unit_test49# build:50# context: ./51# dockerfile: Dockerfile-unit52# container_name: unit_test53# networks:54# - node_test_network55 # command: bash -c 'while true; do sleep 20; df -h; done'56# command: bash -c 'cargo test'5758networks:59 node_test_network:60 name: node_test_network61 driver: bridge6229node/cli/Cargo.tomldiffbeforeafterboth233233234[dependencies.nft-runtime]234[dependencies.nft-runtime]235path = '../../runtime'235path = '../../runtime'236version = '3.0.0'236version = '0.9.12'237237238[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'255255256[[bin]]256[[bin]]257name = 'nft'257name = 'nft'pallets/contract-helpers/Cargo.tomldiffbeforeafterboth9package = 'parity-scale-codec'9package = 'parity-scale-codec'10version = '2.3.0'10version = '2.3.0'1112[dependencies.up-sponsorship]13default-features = false14path = '../../primitives/sponsorship'15version = '0.1.0'161117[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" } 242025[features]21[features]26default = ["std"]22default = ["std"]pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth13evm-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"181819[dependencies.codec]19[dependencies.codec]pallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth14pallet-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" } 181819[dependencies.codec]19[dependencies.codec]20default-features = false20default-features = falsepallets/nft-charge-transaction/Cargo.tomldiffbeforeafterbothno changes
pallets/nft-charge-transaction/src/lib.rsdiffbeforeafterbothno changes
pallets/nft-transaction-payment/Cargo.tomldiffbeforeafterboth30sp-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' }323233up-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" } 343435[features]35[features]36default = ['std']36default = ['std']pallets/nft/Cargo.tomldiffbeforeafterboth126path = '../../primitives/nft'126path = '../../primitives/nft'127version = '0.9.0'127version = '0.9.0'128129[dependencies.up-sponsorship]130default-features = false131path = '../../primitives/sponsorship'132version = '0.1.0'133134128135[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" }136137up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring" } 142138143evm-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" }pallets/scheduler/Cargo.tomldiffbeforeafterboth20sp-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' }222223up-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 }252526[dev-dependencies]26[dev-dependencies]primitives/sponsorship/Cargo.tomldiffbeforeafterbothno changes
primitives/sponsorship/src/lib.rsdiffbeforeafterbothno changes
runtime/Cargo.tomldiffbeforeafterboth10license = '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'141415[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 }runtime/src/lib.rsdiffbeforeafterboth147 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}804804805impl pallet_nft_charge_transaction::Config for Runtime {}805impl pallet_nft_charge_transaction::Config for Runtime {806 type SponsorshipHandler = pallet_nft::NftSponsorshipHandler<Runtime>;807}806808807// impl pallet_contract_helpers::Config for Runtime {809// impl pallet_contract_helpers::Config for Runtime {