difftreelog
Merge pull request #871 from UniqueNetwork/feature/move_TokenChanged_event
in: master
21 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2445,8 +2445,8 @@
[[package]]
name = "evm-coder"
-version = "0.3.0"
-source = "git+https://github.com/uniquenetwork/evm-coder?tag=v0.3.0#c4bfdf39d84fbe74c6178417177f2a7f81d92bdd"
+version = "0.3.1"
+source = "git+https://github.com/uniquenetwork/evm-coder?tag=v0.3.1#21e61c627f71337d6b8a03899fe8de14bfbf67aa"
dependencies = [
"ethereum",
"evm-coder-procedural",
@@ -2457,8 +2457,8 @@
[[package]]
name = "evm-coder-procedural"
-version = "0.3.0"
-source = "git+https://github.com/uniquenetwork/evm-coder?tag=v0.3.0#c4bfdf39d84fbe74c6178417177f2a7f81d92bdd"
+version = "0.3.1"
+source = "git+https://github.com/uniquenetwork/evm-coder?tag=v0.3.1#21e61c627f71337d6b8a03899fe8de14bfbf67aa"
dependencies = [
"Inflector",
"hex",
Cargo.tomldiffbeforeafterboth--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,16 +19,9 @@
[workspace.dependencies]
# Unique
-evm-coder = { git = "https://github.com/uniquenetwork/evm-coder", tag = "v0.3.0", default-features = false }
-struct-versioning = { path = "crates/struct-versioning" }
-precompile-utils-macro = { path = "runtime/common/ethereum/precompiles/utils/macro" }
-up-common = { path = "primitives/common", default-features = false }
-up-data-structs = { path = "primitives/data-structs", default-features = false }
-up-pov-estimate-rpc = { path = "primitives/pov-estimate-rpc", default-features = false }
-up-rpc = { path = "primitives/rpc", default-features = false }
-up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.37" }
-uc-rpc = { path = "client/rpc" }
-unique-rpc = { path = "node/rpc" }
+app-promotion-rpc = { path = "primitives/app_promotion_rpc", default-features = false }
+evm-coder = { git = "https://github.com/uniquenetwork/evm-coder", tag = "v0.3.1", default-features = false }
+pallet-app-promotion = { path = "pallets/app-promotion", default-features = false }
pallet-charge-transaction = { package = "pallet-template-transaction-payment", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.37" }
pallet-collator-selection = { default-features = false, path = "pallets/collator-selection" }
pallet-common = { default-features = false, path = "pallets/common" }
@@ -45,56 +38,59 @@
pallet-nonfungible = { default-features = false, path = "pallets/nonfungible" }
pallet-refungible = { default-features = false, path = "pallets/refungible" }
pallet-structure = { default-features = false, path = "pallets/structure" }
+pallet-test-utils = { default-features = false, path = "test-pallets/utils" }
pallet-unique = { path = "pallets/unique", default-features = false }
pallet-unique-scheduler-v2 = { path = "pallets/scheduler-v2", default-features = false }
-pallet-test-utils = { default-features = false, path = "test-pallets/utils" }
-pallet-app-promotion = { path = "pallets/app-promotion", default-features = false }
-app-promotion-rpc = { path = "primitives/app_promotion_rpc", default-features = false }
+precompile-utils-macro = { path = "runtime/common/ethereum/precompiles/utils/macro" }
+struct-versioning = { path = "crates/struct-versioning" }
+uc-rpc = { path = "client/rpc" }
+unique-rpc = { path = "node/rpc" }
+up-common = { path = "primitives/common", default-features = false }
+up-data-structs = { path = "primitives/data-structs", default-features = false }
+up-pov-estimate-rpc = { path = "primitives/pov-estimate-rpc", default-features = false }
+up-rpc = { path = "primitives/rpc", default-features = false }
+up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.37" }
# Unique: Runtimes
+opal-runtime = { path = "runtime/opal" }
+quartz-runtime = { path = "runtime/quartz" }
unique-runtime = { path = "runtime/unique" }
-quartz-runtime = { path = "runtime/quartz" }
-opal-runtime = { path = "runtime/opal" }
# Frontier (Unique patches over the Parity version)
+fc-consensus = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
+fc-db = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
+fc-mapping-sync = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
+fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
+fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
-fc-db = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
-fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
-fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
fp-storage = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
-fc-consensus = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
-fc-mapping-sync = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
+pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
-pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.37" }
# Parity
codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = "3.2.2" }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
+cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
@@ -107,67 +103,71 @@
pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-staking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-trie = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false }
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false }
# Parity: Build utils
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
# Parity: Benchmarking
+frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
# Parity: Try Runtime
+frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
-frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
# ORML
orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.37", default-features = false }
@@ -176,15 +176,15 @@
orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.37", default-features = false }
# Other
-smallvec = "1.6.1"
derivative = { version = "2.2.0", features = ["use_core"] }
-serde = { default-features = false, features = ['derive'], version = "1.0.136" }
-log = { version = "0.4.16", default-features = false }
-num_enum = { version = "0.5.3", default-features = false }
+ethereum = { version = "0.14.0", default-features = false }
+evm-core = { default-features = false, version = "0.37.0" }
hex-literal = "0.3.4"
impl-trait-for-tuples = "0.2.2"
+jsonrpsee = { version = "0.16.2", features = ["macros", "server"] }
+log = { version = "0.4.16", default-features = false }
logtest = "2.0.0"
-ethereum = { version = "0.14.0", default-features = false }
-evm-core = { default-features = false, version = "0.37.0" }
+num_enum = { version = "0.5.3", default-features = false }
primitive-types = { version = "0.12.1", default-features = false }
-jsonrpsee = { version = "0.16.2", features = ["macros", "server"] }
+serde = { default-features = false, features = ['derive'], version = "1.0.136" }
+smallvec = "1.6.1"
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -26,7 +26,6 @@
};
use pallet_evm_coder_substrate::dispatch_to_evm;
use sp_std::{vec, vec::Vec};
-use sp_core::U256;
use up_data_structs::{
CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property, SponsoringRateLimit,
SponsorshipState,
@@ -62,18 +61,9 @@
},
/// The collection has been changed.
CollectionChanged {
- /// Collection ID.
- #[indexed]
- collection_id: Address,
- },
-
- /// The token has been changed.
- TokenChanged {
/// Collection ID.
#[indexed]
collection_id: Address,
- /// Token ID.
- token_id: U256,
},
}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -86,7 +86,6 @@
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-use crate::erc::CollectionHelpersEvents;
#[cfg(feature = "runtime-benchmarks")]
pub mod benchmarking;
pub mod dispatch;
@@ -1250,6 +1249,7 @@
mut stored_properties: Properties,
is_token_owner: impl Fn() -> Result<bool, DispatchError>,
set_token_properties: impl FnOnce(Properties),
+ log: evm_coder::ethereum::Log,
) -> DispatchResult {
let is_collection_admin = collection.is_owner_or_admin(sender);
let permissions = Self::property_permissions(collection.id);
@@ -1304,13 +1304,7 @@
}
}
- <PalletEvm<T>>::deposit_log(
- CollectionHelpersEvents::TokenChanged {
- collection_id: eth::collection_id_to_address(collection.id),
- token_id: token_id.into(),
- }
- .to_log(T::ContractAddress::get()),
- );
+ <PalletEvm<T>>::deposit_log(log.clone());
}
set_token_properties(stored_properties);
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -50,13 +50,24 @@
TokenProperties, SelfWeightOf, weights::WeightInfo,
};
+/// Nft events.
+#[derive(ToLog)]
+pub enum ERC721TokenEvent {
+ /// The token has been changed.
+ TokenChanged {
+ /// Token ID.
+ #[indexed]
+ token_id: U256,
+ },
+}
+
frontier_contract! {
macro_rules! NonfungibleHandle_result {...}
impl<T: Config> Contract for NonfungibleHandle<T> {...}
}
/// @title A contract that allows to set and delete token properties and change token property permissions.
-#[solidity_interface(name = TokenProperties, enum(derive(PreDispatch)), enum_attr(weight))]
+#[solidity_interface(name = TokenProperties, events(ERC721TokenEvent), enum(derive(PreDispatch)), enum_attr(weight))]
impl<T: Config> NonfungibleHandle<T> {
/// @notice Set permissions for token property.
/// @dev Throws error if `msg.sender` is not admin or owner of the collection.
pallets/nonfungible/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Nonfungible Pallet18//!19//! The Nonfungible pallet provides functionality for handling nonfungible collections and tokens.20//!21//! - [`Config`]22//! - [`NonfungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Nonfungible pallet provides functions for:29//!30//! - NFT collection creation and removal31//! - Minting and burning of NFT tokens32//! - Retrieving account balances33//! - Transfering NFT tokens34//! - Setting and checking allowance for NFT tokens35//! - Setting properties and permissions for NFT collections and tokens36//! - Nesting and unnesting tokens37//!38//! ### Terminology39//!40//! - **NFT token:** Non fungible token.41//!42//! - **NFT Collection:** A collection of NFT tokens. All NFT tokens are part of a collection.43//! Each collection can define it's own properties, properties for it's tokens and set of permissions.44//!45//! - **Balance:** Number of NFT tokens owned by an account46//!47//! - **Allowance:** NFT tokens owned by one account that another account is allowed to make operations on48//!49//! - **Burning:** The process of “deleting” a token from a collection and from50//! an account balance of the owner.51//!52//! - **Nesting:** Setting up parent-child relationship between tokens. Nested tokens are inhereting53//! owner from their parent. There could be multiple levels of nesting. Token couldn't be nested in54//! it's child token i.e. parent-child relationship graph shouldn't have cycles.55//!56//! - **Properties:** Key-Values pairs. Token properties are attached to a token. Collection properties are57//! attached to a collection. Set of permissions could be defined for each property.58//!59//! ### Implementations60//!61//! The Nonfungible pallet provides implementations for the following traits. If these traits provide62//! the functionality that you need, then you can avoid coupling with the Nonfungible pallet.63//!64//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight65//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing66//! with collections67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create NFT collection. NFT collection can be configured to allow or deny access for73//! some accounts.74//! - `destroy_collection` - Destroy exising NFT collection. There should be no tokens in the collection.75//! - `burn` - Burn NFT token owned by account.76//! - `transfer` - Transfer NFT token. Transfers should be enabled for NFT collection.77//! Nests the NFT token if it is sent to another token.78//! - `create_item` - Mint NFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account.80//! - `set_token_property` - Set token property value.81//! - `delete_token_property` - Remove property from the token.82//! - `set_collection_properties` - Set collection properties.83//! - `delete_collection_properties` - Remove properties from the collection.84//! - `set_property_permission` - Set collection property permission.85//! - `set_token_property_permissions` - Set token property permissions.86//!87//! ## Assumptions88//!89//! * To perform operations on tokens sender should be in collection's allow list if collection access mode is `AllowList`.9091#![cfg_attr(not(feature = "std"), no_std)]9293use erc::ERC721Events;94use evm_coder::ToLog;95use frame_support::{96 BoundedVec, ensure, fail, transactional,97 storage::with_transaction,98 pallet_prelude::DispatchResultWithPostInfo,99 pallet_prelude::Weight,100 dispatch::{PostDispatchInfo, Pays},101};102use up_data_structs::{103 AccessMode, CollectionId, CollectionFlags, CustomDataLimit, TokenId, CreateCollectionData,104 CreateNftExData, mapping::TokenAddressMapping, budget::Budget, Property, PropertyKey,105 PropertyValue, PropertyKeyPermission, Properties, PropertyScope, TrySetProperty, TokenChild,106 AuxPropertyValue, PropertiesPermissionMap,107};108use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};109use pallet_common::{110 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,111 eth::collection_id_to_address,112};113use pallet_structure::{Pallet as PalletStructure, Error as StructureError};114use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};115use sp_core::{Get, H160};116use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};117use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};118use core::ops::Deref;119use codec::{Encode, Decode, MaxEncodedLen};120use scale_info::TypeInfo;121122pub use pallet::*;123use weights::WeightInfo;124#[cfg(feature = "runtime-benchmarks")]125pub mod benchmarking;126pub mod common;127pub mod erc;128pub mod weights;129130pub type CreateItemData<T> = CreateNftExData<<T as pallet_evm::Config>::CrossAccountId>;131pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;132133/// Token data, stored independently from other data used to describe it134/// for the convenience of database access. Notably contains the owner account address.135#[struct_versioning::versioned(version = 2, upper)]136#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]137pub struct ItemData<CrossAccountId> {138 #[version(..2)]139 pub const_data: BoundedVec<u8, CustomDataLimit>,140141 #[version(..2)]142 pub variable_data: BoundedVec<u8, CustomDataLimit>,143144 pub owner: CrossAccountId,145}146147#[frame_support::pallet]148pub mod pallet {149 use super::*;150 use frame_support::{151 Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key, traits::StorageVersion,152 };153 use frame_system::pallet_prelude::*;154 use up_data_structs::{CollectionId, TokenId};155 use super::weights::WeightInfo;156157 #[pallet::error]158 pub enum Error<T> {159 /// Not Nonfungible item data used to mint in Nonfungible collection.160 NotNonfungibleDataUsedToMintFungibleCollectionToken,161 /// Used amount > 1 with NFT162 NonfungibleItemsHaveNoAmount,163 /// Unable to burn NFT with children164 CantBurnNftWithChildren,165 }166167 #[pallet::config]168 pub trait Config:169 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config170 {171 type WeightInfo: WeightInfo;172 }173174 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);175176 #[pallet::pallet]177 #[pallet::storage_version(STORAGE_VERSION)]178 #[pallet::generate_store(pub(super) trait Store)]179 pub struct Pallet<T>(_);180181 /// Total amount of minted tokens in a collection.182 #[pallet::storage]183 pub type TokensMinted<T: Config> =184 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;185186 /// Amount of burnt tokens in a collection.187 #[pallet::storage]188 pub type TokensBurnt<T: Config> =189 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;190191 /// Token data, used to partially describe a token.192 #[pallet::storage]193 pub type TokenData<T: Config> = StorageNMap<194 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),195 Value = ItemData<T::CrossAccountId>,196 QueryKind = OptionQuery,197 >;198199 /// Map of key-value pairs, describing the metadata of a token.200 #[pallet::storage]201 #[pallet::getter(fn token_properties)]202 pub type TokenProperties<T: Config> = StorageNMap<203 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),204 Value = Properties,205 QueryKind = ValueQuery,206 OnEmpty = up_data_structs::TokenProperties,207 >;208209 /// Custom data of a token that is serialized to bytes,210 /// primarily reserved for on-chain operations,211 /// normally obscured from the external users.212 ///213 /// Auxiliary properties are slightly different from214 /// usual [`TokenProperties`] due to an unlimited number215 /// and separately stored and written-to key-value pairs.216 ///217 /// Currently unused.218 #[pallet::storage]219 #[pallet::getter(fn token_aux_property)]220 pub type TokenAuxProperties<T: Config> = StorageNMap<221 Key = (222 Key<Twox64Concat, CollectionId>,223 Key<Twox64Concat, TokenId>,224 Key<Twox64Concat, PropertyScope>,225 Key<Twox64Concat, PropertyKey>,226 ),227 Value = AuxPropertyValue,228 QueryKind = OptionQuery,229 >;230231 /// Used to enumerate tokens owned by account.232 #[pallet::storage]233 pub type Owned<T: Config> = StorageNMap<234 Key = (235 Key<Twox64Concat, CollectionId>,236 Key<Blake2_128Concat, T::CrossAccountId>,237 Key<Twox64Concat, TokenId>,238 ),239 Value = bool,240 QueryKind = ValueQuery,241 >;242243 /// Used to enumerate token's children.244 #[pallet::storage]245 #[pallet::getter(fn token_children)]246 pub type TokenChildren<T: Config> = StorageNMap<247 Key = (248 Key<Twox64Concat, CollectionId>,249 Key<Twox64Concat, TokenId>,250 Key<Twox64Concat, (CollectionId, TokenId)>,251 ),252 Value = bool,253 QueryKind = ValueQuery,254 >;255256 /// Amount of tokens owned by an account in a collection.257 #[pallet::storage]258 pub type AccountBalance<T: Config> = StorageNMap<259 Key = (260 Key<Twox64Concat, CollectionId>,261 Key<Blake2_128Concat, T::CrossAccountId>,262 ),263 Value = u32,264 QueryKind = ValueQuery,265 >;266267 /// Allowance set by a token owner for another user to perform one of certain transactions on a token.268 #[pallet::storage]269 pub type Allowance<T: Config> = StorageNMap<270 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),271 Value = T::CrossAccountId,272 QueryKind = OptionQuery,273 >;274275 /// Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.276 #[pallet::storage]277 pub type CollectionAllowance<T: Config> = StorageNMap<278 Key = (279 Key<Twox64Concat, CollectionId>,280 Key<Blake2_128Concat, T::CrossAccountId>,281 Key<Blake2_128Concat, T::CrossAccountId>,282 ),283 Value = bool,284 QueryKind = ValueQuery,285 >;286287 /// Upgrade from the old schema to properties.288 #[pallet::hooks]289 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {290 fn on_runtime_upgrade() -> Weight {291 StorageVersion::new(1).put::<Pallet<T>>();292293 Weight::zero()294 }295 }296}297298pub struct NonfungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);299impl<T: Config> NonfungibleHandle<T> {300 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {301 Self(inner)302 }303 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {304 self.0305 }306 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {307 &mut self.0308 }309}310311impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {312 fn recorder(&self) -> &SubstrateRecorder<T> {313 self.0.recorder()314 }315 fn into_recorder(self) -> SubstrateRecorder<T> {316 self.0.into_recorder()317 }318}319impl<T: Config> Deref for NonfungibleHandle<T> {320 type Target = pallet_common::CollectionHandle<T>;321322 fn deref(&self) -> &Self::Target {323 &self.0324 }325}326327impl<T: Config> Pallet<T> {328 /// Get number of NFT tokens in collection.329 pub fn total_supply(collection: &NonfungibleHandle<T>) -> u32 {330 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)331 }332333 /// Check that NFT token exists.334 ///335 /// - `token`: Token ID.336 pub fn token_exists(collection: &NonfungibleHandle<T>, token: TokenId) -> bool {337 <TokenData<T>>::contains_key((collection.id, token))338 }339340 /// Set the token property with the scope.341 ///342 /// - `property`: Contains key-value pair.343 pub fn set_scoped_token_property(344 collection_id: CollectionId,345 token_id: TokenId,346 scope: PropertyScope,347 property: Property,348 ) -> DispatchResult {349 TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {350 properties.try_scoped_set(scope, property.key, property.value)351 })352 .map_err(<CommonError<T>>::from)?;353354 Ok(())355 }356357 /// Batch operation to set multiple properties with the same scope.358 pub fn set_scoped_token_properties(359 collection_id: CollectionId,360 token_id: TokenId,361 scope: PropertyScope,362 properties: impl Iterator<Item = Property>,363 ) -> DispatchResult {364 TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {365 stored_properties.try_scoped_set_from_iter(scope, properties)366 })367 .map_err(<CommonError<T>>::from)?;368369 Ok(())370 }371372 /// Add or edit auxiliary data for the property.373 ///374 /// - `f`: function that adds or edits auxiliary data.375 pub fn try_mutate_token_aux_property<R, E>(376 collection_id: CollectionId,377 token_id: TokenId,378 scope: PropertyScope,379 key: PropertyKey,380 f: impl FnOnce(&mut Option<AuxPropertyValue>) -> Result<R, E>,381 ) -> Result<R, E> {382 <TokenAuxProperties<T>>::try_mutate((collection_id, token_id, scope, key), f)383 }384385 /// Remove auxiliary data for the property.386 pub fn remove_token_aux_property(387 collection_id: CollectionId,388 token_id: TokenId,389 scope: PropertyScope,390 key: PropertyKey,391 ) {392 <TokenAuxProperties<T>>::remove((collection_id, token_id, scope, key));393 }394395 /// Get all auxiliary data in a given scope.396 ///397 /// Returns iterator over Property Key - Data pairs.398 pub fn iterate_token_aux_properties(399 collection_id: CollectionId,400 token_id: TokenId,401 scope: PropertyScope,402 ) -> impl Iterator<Item = (PropertyKey, AuxPropertyValue)> {403 <TokenAuxProperties<T>>::iter_prefix((collection_id, token_id, scope))404 }405406 /// Get ID of the last minted token407 pub fn current_token_id(collection_id: CollectionId) -> TokenId {408 TokenId(<TokensMinted<T>>::get(collection_id))409 }410}411412// unchecked calls skips any permission checks413impl<T: Config> Pallet<T> {414 /// Create NFT collection415 ///416 /// `init_collection` will take non-refundable deposit for collection creation.417 ///418 /// - `data`: Contains settings for collection limits and permissions.419 pub fn init_collection(420 owner: T::CrossAccountId,421 payer: T::CrossAccountId,422 data: CreateCollectionData<T::AccountId>,423 flags: CollectionFlags,424 ) -> Result<CollectionId, DispatchError> {425 <PalletCommon<T>>::init_collection(owner, payer, data, flags)426 }427428 /// Destroy NFT collection429 ///430 /// `destroy_collection` will throw error if collection contains any tokens.431 /// Only owner can destroy collection.432 pub fn destroy_collection(433 collection: NonfungibleHandle<T>,434 sender: &T::CrossAccountId,435 ) -> DispatchResult {436 let id = collection.id;437438 if Self::collection_has_tokens(id) {439 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());440 }441442 // =========443444 PalletCommon::destroy_collection(collection.0, sender)?;445446 let _ = <TokenData<T>>::clear_prefix((id,), u32::MAX, None);447 let _ = <TokenChildren<T>>::clear_prefix((id,), u32::MAX, None);448 let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);449 <TokensMinted<T>>::remove(id);450 <TokensBurnt<T>>::remove(id);451 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);452 let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);453 let _ = <CollectionAllowance<T>>::clear_prefix((id,), u32::MAX, None);454 Ok(())455 }456457 /// Burn NFT token458 ///459 /// `burn` removes `token` from the `collection`, from it's owner and from the parent token460 /// if the token is nested.461 /// Only the owner can `burn` the token. The `token` shouldn't have any nested tokens.462 /// Also removes all corresponding properties and auxiliary properties.463 ///464 /// - `token`: Token that should be burned465 /// - `collection`: Collection that contains the token466 pub fn burn(467 collection: &NonfungibleHandle<T>,468 sender: &T::CrossAccountId,469 token: TokenId,470 ) -> DispatchResult {471 let token_data =472 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;473 ensure!(&token_data.owner == sender, <CommonError<T>>::NoPermission);474475 if collection.permissions.access() == AccessMode::AllowList {476 collection.check_allowlist(sender)?;477 }478479 if Self::token_has_children(collection.id, token) {480 return Err(<Error<T>>::CantBurnNftWithChildren.into());481 }482483 let burnt = <TokensBurnt<T>>::get(collection.id)484 .checked_add(1)485 .ok_or(ArithmeticError::Overflow)?;486487 let balance = <AccountBalance<T>>::get((collection.id, token_data.owner.clone()))488 .checked_sub(1)489 .ok_or(ArithmeticError::Overflow)?;490491 // =========492493 if balance == 0 {494 <AccountBalance<T>>::remove((collection.id, token_data.owner.clone()));495 } else {496 <AccountBalance<T>>::insert((collection.id, token_data.owner.clone()), balance);497 }498499 <PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);500501 <Owned<T>>::remove((collection.id, &token_data.owner, token));502 <TokensBurnt<T>>::insert(collection.id, burnt);503 <TokenData<T>>::remove((collection.id, token));504 <TokenProperties<T>>::remove((collection.id, token));505 let _ = <TokenAuxProperties<T>>::clear_prefix((collection.id, token), u32::MAX, None);506 let old_spender = <Allowance<T>>::take((collection.id, token));507508 if let Some(old_spender) = old_spender {509 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(510 collection.id,511 token,512 token_data.owner.clone(),513 old_spender,514 0,515 ));516 }517518 <PalletEvm<T>>::deposit_log(519 ERC721Events::Transfer {520 from: *token_data.owner.as_eth(),521 to: H160::default(),522 token_id: token.into(),523 }524 .to_log(collection_id_to_address(collection.id)),525 );526 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(527 collection.id,528 token,529 token_data.owner,530 1,531 ));532 Ok(())533 }534535 /// Same as [`burn`] but burns all the tokens that are nested in the token first536 ///537 /// - `self_budget`: Limit for searching children in depth.538 /// - `breadth_budget`: Limit of breadth of searching children.539 ///540 /// [`burn`]: struct.Pallet.html#method.burn541 #[transactional]542 pub fn burn_recursively(543 collection: &NonfungibleHandle<T>,544 sender: &T::CrossAccountId,545 token: TokenId,546 self_budget: &dyn Budget,547 breadth_budget: &dyn Budget,548 ) -> DispatchResultWithPostInfo {549 ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);550551 let current_token_account =552 T::CrossTokenAddressMapping::token_to_address(collection.id, token);553554 let mut weight = Weight::zero();555556 // This method is transactional, if user in fact doesn't have permissions to remove token -557 // tokens removed here will be restored after rejected transaction558 for ((collection, token), _) in <TokenChildren<T>>::iter_prefix((collection.id, token)) {559 ensure!(breadth_budget.consume(), <StructureError<T>>::BreadthLimit,);560 let PostDispatchInfo { actual_weight, .. } =561 <PalletStructure<T>>::burn_item_recursively(562 current_token_account.clone(),563 collection,564 token,565 self_budget,566 breadth_budget,567 )?;568 if let Some(actual_weight) = actual_weight {569 weight = weight.saturating_add(actual_weight);570 }571 }572573 Self::burn(collection, sender, token)?;574 DispatchResultWithPostInfo::Ok(PostDispatchInfo {575 actual_weight: Some(weight + <SelfWeightOf<T>>::burn_item()),576 pays_fee: Pays::Yes,577 })578 }579580 /// A batch operation to add, edit or remove properties for a token.581 ///582 /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.583 /// - `is_token_create`: Indicates that method is called during token initialization.584 /// Allows to bypass ownership check.585 ///586 /// All affected properties should have `mutable` permission587 /// to be **deleted** or to be **set more than once**,588 /// and the sender should have permission to edit those properties.589 ///590 /// This function fires an event for each property change.591 /// In case of an error, all the changes (including the events) will be reverted592 /// since the function is transactional.593 #[transactional]594 fn modify_token_properties(595 collection: &NonfungibleHandle<T>,596 sender: &T::CrossAccountId,597 token_id: TokenId,598 properties_updates: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,599 is_token_create: bool,600 nesting_budget: &dyn Budget,601 ) -> DispatchResult {602 let is_token_owner = || {603 let is_owned = <PalletStructure<T>>::check_indirectly_owned(604 sender.clone(),605 collection.id,606 token_id,607 None,608 nesting_budget,609 )?;610611 Ok(is_owned)612 };613614 let stored_properties = <TokenProperties<T>>::get((collection.id, token_id));615616 <PalletCommon<T>>::modify_token_properties(617 collection,618 sender,619 token_id,620 properties_updates,621 is_token_create,622 stored_properties,623 is_token_owner,624 |properties| <TokenProperties<T>>::set((collection.id, token_id), properties),625 erc::ERC721TokenEvent::TokenChanged {626 token_id: token_id.into(),627 }628 .to_log(T::ContractAddress::get()),629 )630 }631632 /// Batch operation to add or edit properties for the token633 ///634 /// Same as [`modify_token_properties`] but doesn't allow to remove properties635 ///636 /// [`modify_token_properties`]: struct.Pallet.html#method.modify_token_properties637 pub fn set_token_properties(638 collection: &NonfungibleHandle<T>,639 sender: &T::CrossAccountId,640 token_id: TokenId,641 properties: impl Iterator<Item = Property>,642 is_token_create: bool,643 nesting_budget: &dyn Budget,644 ) -> DispatchResult {645 Self::modify_token_properties(646 collection,647 sender,648 token_id,649 properties.map(|p| (p.key, Some(p.value))),650 is_token_create,651 nesting_budget,652 )653 }654655 /// Add or edit single property for the token656 ///657 /// Calls [`set_token_properties`] internally658 ///659 /// [`set_token_properties`]: struct.Pallet.html#method.set_token_properties660 pub fn set_token_property(661 collection: &NonfungibleHandle<T>,662 sender: &T::CrossAccountId,663 token_id: TokenId,664 property: Property,665 nesting_budget: &dyn Budget,666 ) -> DispatchResult {667 let is_token_create = false;668669 Self::set_token_properties(670 collection,671 sender,672 token_id,673 [property].into_iter(),674 is_token_create,675 nesting_budget,676 )677 }678679 /// Batch operation to remove properties from the token680 ///681 /// Same as [`modify_token_properties`] but doesn't allow to add or edit properties682 ///683 /// [`modify_token_properties`]: struct.Pallet.html#method.modify_token_properties684 pub fn delete_token_properties(685 collection: &NonfungibleHandle<T>,686 sender: &T::CrossAccountId,687 token_id: TokenId,688 property_keys: impl Iterator<Item = PropertyKey>,689 nesting_budget: &dyn Budget,690 ) -> DispatchResult {691 let is_token_create = false;692693 Self::modify_token_properties(694 collection,695 sender,696 token_id,697 property_keys.into_iter().map(|key| (key, None)),698 is_token_create,699 nesting_budget,700 )701 }702703 /// Remove single property from the token704 ///705 /// Calls [`delete_token_properties`] internally706 ///707 /// [`delete_token_properties`]: struct.Pallet.html#method.delete_token_properties708 pub fn delete_token_property(709 collection: &NonfungibleHandle<T>,710 sender: &T::CrossAccountId,711 token_id: TokenId,712 property_key: PropertyKey,713 nesting_budget: &dyn Budget,714 ) -> DispatchResult {715 Self::delete_token_properties(716 collection,717 sender,718 token_id,719 [property_key].into_iter(),720 nesting_budget,721 )722 }723724 /// Add or edit properties for the collection725 pub fn set_collection_properties(726 collection: &NonfungibleHandle<T>,727 sender: &T::CrossAccountId,728 properties: Vec<Property>,729 ) -> DispatchResult {730 <PalletCommon<T>>::set_collection_properties(collection, sender, properties.into_iter())731 }732733 /// Remove properties from the collection734 pub fn delete_collection_properties(735 collection: &CollectionHandle<T>,736 sender: &T::CrossAccountId,737 property_keys: Vec<PropertyKey>,738 ) -> DispatchResult {739 <PalletCommon<T>>::delete_collection_properties(740 collection,741 sender,742 property_keys.into_iter(),743 )744 }745746 /// Set property permissions for the token.747 ///748 /// Sender should be the owner or admin of token's collection.749 pub fn set_token_property_permissions(750 collection: &CollectionHandle<T>,751 sender: &T::CrossAccountId,752 property_permissions: Vec<PropertyKeyPermission>,753 ) -> DispatchResult {754 <PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)755 }756757 /// Set property permissions for the token with scope.758 ///759 /// Sender should be the owner or admin of token's collection.760 pub fn set_scoped_token_property_permissions(761 collection: &CollectionHandle<T>,762 sender: &T::CrossAccountId,763 scope: PropertyScope,764 property_permissions: Vec<PropertyKeyPermission>,765 ) -> DispatchResult {766 <PalletCommon<T>>::set_scoped_token_property_permissions(767 collection,768 sender,769 scope,770 property_permissions,771 )772 }773774 pub fn token_property_permission(collection_id: CollectionId) -> PropertiesPermissionMap {775 <PalletCommon<T>>::property_permissions(collection_id)776 }777778 pub fn check_token_immediate_ownership(779 collection: &NonfungibleHandle<T>,780 token: TokenId,781 possible_owner: &T::CrossAccountId,782 ) -> DispatchResult {783 let token_data =784 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;785 ensure!(786 &token_data.owner == possible_owner,787 <CommonError<T>>::NoPermission788 );789 Ok(())790 }791792 /// Transfer NFT token from one account to another.793 ///794 /// `from` account stops being the owner and `to` account becomes the owner of the token.795 /// If `to` is token than `to` becomes owner of the token and the token become nested.796 /// Unnests token from previous parent if it was nested before.797 /// Removes allowance for the token if there was any.798 /// Throws if transfers aren't allowed for collection or if receiver reached token ownership limit.799 ///800 /// - `nesting_budget`: Limit for token nesting depth801 pub fn transfer(802 collection: &NonfungibleHandle<T>,803 from: &T::CrossAccountId,804 to: &T::CrossAccountId,805 token: TokenId,806 nesting_budget: &dyn Budget,807 ) -> DispatchResult {808 ensure!(809 collection.limits.transfers_enabled(),810 <CommonError<T>>::TransferNotAllowed811 );812813 let token_data =814 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;815 ensure!(&token_data.owner == from, <CommonError<T>>::NoPermission);816817 if collection.permissions.access() == AccessMode::AllowList {818 collection.check_allowlist(from)?;819 collection.check_allowlist(to)?;820 }821 <PalletCommon<T>>::ensure_correct_receiver(to)?;822823 let balance_from = <AccountBalance<T>>::get((collection.id, from))824 .checked_sub(1)825 .ok_or(<CommonError<T>>::TokenValueTooLow)?;826 let balance_to = if from != to {827 let balance_to = <AccountBalance<T>>::get((collection.id, to))828 .checked_add(1)829 .ok_or(ArithmeticError::Overflow)?;830831 ensure!(832 balance_to < collection.limits.account_token_ownership_limit(),833 <CommonError<T>>::AccountTokenLimitExceeded,834 );835836 Some(balance_to)837 } else {838 None839 };840841 <PalletStructure<T>>::nest_if_sent_to_token(842 from.clone(),843 to,844 collection.id,845 token,846 nesting_budget,847 )?;848849 // =========850851 <PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);852853 <TokenData<T>>::insert(854 (collection.id, token),855 ItemData {856 owner: to.clone(),857 ..token_data858 },859 );860861 if let Some(balance_to) = balance_to {862 // from != to863 if balance_from == 0 {864 <AccountBalance<T>>::remove((collection.id, from));865 } else {866 <AccountBalance<T>>::insert((collection.id, from), balance_from);867 }868 <AccountBalance<T>>::insert((collection.id, to), balance_to);869 <Owned<T>>::remove((collection.id, from, token));870 <Owned<T>>::insert((collection.id, to, token), true);871 }872 Self::set_allowance_unchecked(collection, from, token, None, true);873874 <PalletEvm<T>>::deposit_log(875 ERC721Events::Transfer {876 from: *from.as_eth(),877 to: *to.as_eth(),878 token_id: token.into(),879 }880 .to_log(collection_id_to_address(collection.id)),881 );882 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(883 collection.id,884 token,885 from.clone(),886 to.clone(),887 1,888 ));889 Ok(())890 }891892 /// Batch operation to mint multiple NFT tokens.893 ///894 /// The sender should be the owner/admin of the collection or collection should be configured895 /// to allow public minting.896 /// Throws if amount of tokens reached it's limit for the collection or if caller reached897 /// token ownership limit.898 ///899 /// - `data`: Contains list of token properties and users who will become the owners of the900 /// corresponging tokens.901 /// - `nesting_budget`: Limit for token nesting depth902 pub fn create_multiple_items(903 collection: &NonfungibleHandle<T>,904 sender: &T::CrossAccountId,905 data: Vec<CreateItemData<T>>,906 nesting_budget: &dyn Budget,907 ) -> DispatchResult {908 if !collection.is_owner_or_admin(sender) {909 ensure!(910 collection.permissions.mint_mode(),911 <CommonError<T>>::PublicMintingNotAllowed912 );913 collection.check_allowlist(sender)?;914915 for item in data.iter() {916 collection.check_allowlist(&item.owner)?;917 }918 }919920 for data in data.iter() {921 <PalletCommon<T>>::ensure_correct_receiver(&data.owner)?;922 }923924 let first_token = <TokensMinted<T>>::get(collection.id);925 let tokens_minted = first_token926 .checked_add(data.len() as u32)927 .ok_or(ArithmeticError::Overflow)?;928 ensure!(929 tokens_minted <= collection.limits.token_limit(),930 <CommonError<T>>::CollectionTokenLimitExceeded931 );932933 let mut balances = BTreeMap::new();934 for data in &data {935 let balance = balances936 .entry(&data.owner)937 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, &data.owner)));938 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;939940 ensure!(941 *balance <= collection.limits.account_token_ownership_limit(),942 <CommonError<T>>::AccountTokenLimitExceeded,943 );944 }945946 for (i, data) in data.iter().enumerate() {947 let token = TokenId(first_token + i as u32 + 1);948949 <PalletStructure<T>>::check_nesting(950 sender.clone(),951 &data.owner,952 collection.id,953 token,954 nesting_budget,955 )?;956 }957958 // =========959960 with_transaction(|| {961 for (i, data) in data.iter().enumerate() {962 let token = first_token + i as u32 + 1;963964 <TokenData<T>>::insert(965 (collection.id, token),966 ItemData {967 // const_data: data.const_data.clone(),968 owner: data.owner.clone(),969 },970 );971972 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(973 &data.owner,974 collection.id,975 TokenId(token),976 );977978 if let Err(e) = Self::set_token_properties(979 collection,980 sender,981 TokenId(token),982 data.properties.clone().into_iter(),983 true,984 nesting_budget,985 ) {986 return TransactionOutcome::Rollback(Err(e));987 }988 }989 TransactionOutcome::Commit(Ok(()))990 })?;991992 <TokensMinted<T>>::insert(collection.id, tokens_minted);993 for (account, balance) in balances {994 <AccountBalance<T>>::insert((collection.id, account), balance);995 }996 for (i, data) in data.into_iter().enumerate() {997 let token = first_token + i as u32 + 1;998 <Owned<T>>::insert((collection.id, &data.owner, token), true);9991000 <PalletEvm<T>>::deposit_log(1001 ERC721Events::Transfer {1002 from: H160::default(),1003 to: *data.owner.as_eth(),1004 token_id: token.into(),1005 }1006 .to_log(collection_id_to_address(collection.id)),1007 );1008 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1009 collection.id,1010 TokenId(token),1011 data.owner.clone(),1012 1,1013 ));1014 }1015 Ok(())1016 }10171018 pub fn set_allowance_unchecked(1019 collection: &NonfungibleHandle<T>,1020 sender: &T::CrossAccountId,1021 token: TokenId,1022 spender: Option<&T::CrossAccountId>,1023 assume_implicit_eth: bool,1024 ) {1025 if let Some(spender) = spender {1026 let old_spender = <Allowance<T>>::get((collection.id, token));1027 <Allowance<T>>::insert((collection.id, token), spender);1028 // In ERC721 there is only one possible approved user of token, so we set1029 // approved user to spender1030 <PalletEvm<T>>::deposit_log(1031 ERC721Events::Approval {1032 owner: *sender.as_eth(),1033 approved: *spender.as_eth(),1034 token_id: token.into(),1035 }1036 .to_log(collection_id_to_address(collection.id)),1037 );1038 // In Unique chain, any token can have any amount of approved users, so we need to1039 // set allowance of old owner to 0, and allowance of new owner to 11040 if old_spender.as_ref() != Some(spender) {1041 if let Some(old_owner) = old_spender {1042 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1043 collection.id,1044 token,1045 sender.clone(),1046 old_owner,1047 0,1048 ));1049 }1050 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1051 collection.id,1052 token,1053 sender.clone(),1054 spender.clone(),1055 1,1056 ));1057 }1058 } else {1059 let old_spender = <Allowance<T>>::take((collection.id, token));1060 if !assume_implicit_eth {1061 // In ERC721 there is only one possible approved user of token, so we set1062 // approved user to zero address1063 <PalletEvm<T>>::deposit_log(1064 ERC721Events::Approval {1065 owner: *sender.as_eth(),1066 approved: H160::default(),1067 token_id: token.into(),1068 }1069 .to_log(collection_id_to_address(collection.id)),1070 );1071 }1072 // In Unique chain, any token can have any amount of approved users, so we need to1073 // set allowance of old owner to 01074 if let Some(old_spender) = old_spender {1075 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1076 collection.id,1077 token,1078 sender.clone(),1079 old_spender,1080 0,1081 ));1082 }1083 }1084 }10851086 /// Set allowance for the spender to `transfer` or `burn` sender's token.1087 ///1088 /// - `token`: Token the spender is allowed to `transfer` or `burn`.1089 pub fn set_allowance(1090 collection: &NonfungibleHandle<T>,1091 sender: &T::CrossAccountId,1092 token: TokenId,1093 spender: Option<&T::CrossAccountId>,1094 ) -> DispatchResult {1095 if collection.permissions.access() == AccessMode::AllowList {1096 collection.check_allowlist(sender)?;1097 if let Some(spender) = spender {1098 collection.check_allowlist(spender)?;1099 }1100 }11011102 if let Some(spender) = spender {1103 <PalletCommon<T>>::ensure_correct_receiver(spender)?;1104 }11051106 let token_data =1107 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;1108 if &token_data.owner != sender {1109 ensure!(1110 collection.ignores_owned_amount(sender),1111 <CommonError<T>>::CantApproveMoreThanOwned1112 );1113 }11141115 // =========11161117 Self::set_allowance_unchecked(collection, sender, token, spender, false);1118 Ok(())1119 }11201121 /// Set allowance for the spender to `transfer` or `burn` sender's token from eth mirror.1122 ///1123 /// - `from`: Address of sender's eth mirror.1124 /// - `to`: Adress of spender.1125 /// - `token`: Token the spender is allowed to `transfer` or `burn`.1126 pub fn set_allowance_from(1127 collection: &NonfungibleHandle<T>,1128 sender: &T::CrossAccountId,1129 from: &T::CrossAccountId,1130 token: TokenId,1131 to: Option<&T::CrossAccountId>,1132 ) -> DispatchResult {1133 if collection.permissions.access() == AccessMode::AllowList {1134 collection.check_allowlist(sender)?;1135 collection.check_allowlist(from)?;1136 if let Some(to) = to {1137 collection.check_allowlist(to)?;1138 }1139 }11401141 if let Some(to) = to {1142 <PalletCommon<T>>::ensure_correct_receiver(to)?;1143 }11441145 ensure!(1146 sender.conv_eq(from),1147 <CommonError<T>>::AddressIsNotEthMirror1148 );11491150 let token_data =1151 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;1152 if token_data.owner != *from {1153 ensure!(1154 collection.limits.owner_can_transfer()1155 && (collection.is_owner_or_admin(sender) || collection.is_owner_or_admin(from)),1156 <CommonError<T>>::CantApproveMoreThanOwned1157 );1158 }11591160 // =========11611162 Self::set_allowance_unchecked(collection, from, token, to, false);1163 Ok(())1164 }11651166 /// Checks allowance for the spender to use the token.1167 fn check_allowed(1168 collection: &NonfungibleHandle<T>,1169 spender: &T::CrossAccountId,1170 from: &T::CrossAccountId,1171 token: TokenId,1172 nesting_budget: &dyn Budget,1173 ) -> DispatchResult {1174 if spender.conv_eq(from) {1175 return Ok(());1176 }1177 if collection.permissions.access() == AccessMode::AllowList {1178 // `from`, `to` checked in [`transfer`]1179 collection.check_allowlist(spender)?;1180 }11811182 if collection.ignores_token_restrictions(spender) {1183 return Ok(());1184 }11851186 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1187 ensure!(1188 <PalletStructure<T>>::check_indirectly_owned(1189 spender.clone(),1190 source.0,1191 source.1,1192 None,1193 nesting_budget1194 )?,1195 <CommonError<T>>::ApprovedValueTooLow,1196 );1197 return Ok(());1198 }1199 if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {1200 return Ok(());1201 }1202 if <CollectionAllowance<T>>::get((collection.id, from, spender)) {1203 return Ok(());1204 }12051206 Err(<CommonError<T>>::ApprovedValueTooLow.into())1207 }12081209 /// Transfer NFT token from one account to another.1210 ///1211 /// Same as the [`transfer`] but spender doesn't needs to be the owner of the token.1212 /// The owner should set allowance for the spender to transfer token.1213 ///1214 /// [`transfer`]: struct.Pallet.html#method.transfer1215 pub fn transfer_from(1216 collection: &NonfungibleHandle<T>,1217 spender: &T::CrossAccountId,1218 from: &T::CrossAccountId,1219 to: &T::CrossAccountId,1220 token: TokenId,1221 nesting_budget: &dyn Budget,1222 ) -> DispatchResult {1223 Self::check_allowed(collection, spender, from, token, nesting_budget)?;12241225 // =========12261227 // Allowance is reset in [`transfer`]1228 Self::transfer(collection, from, to, token, nesting_budget)1229 }12301231 /// Burn NFT token for `from` account.1232 ///1233 /// Same as the [`burn`] but spender doesn't need to be an owner of the token. The owner should1234 /// set allowance for the spender to burn token.1235 ///1236 /// [`burn`]: struct.Pallet.html#method.burn1237 pub fn burn_from(1238 collection: &NonfungibleHandle<T>,1239 spender: &T::CrossAccountId,1240 from: &T::CrossAccountId,1241 token: TokenId,1242 nesting_budget: &dyn Budget,1243 ) -> DispatchResult {1244 Self::check_allowed(collection, spender, from, token, nesting_budget)?;12451246 // =========12471248 Self::burn(collection, from, token)1249 }12501251 /// Check that `from` token could be nested in `under` token.1252 ///1253 pub fn check_nesting(1254 handle: &NonfungibleHandle<T>,1255 sender: T::CrossAccountId,1256 from: (CollectionId, TokenId),1257 under: TokenId,1258 nesting_budget: &dyn Budget,1259 ) -> DispatchResult {1260 let nesting = handle.permissions.nesting();12611262 #[cfg(not(feature = "runtime-benchmarks"))]1263 let permissive = false;1264 #[cfg(feature = "runtime-benchmarks")]1265 let permissive = nesting.permissive;12661267 if permissive {1268 ensure!(1269 <TokenData<T>>::contains_key((handle.id, under)),1270 <CommonError<T>>::TokenNotFound1271 );1272 } else if nesting.token_owner1273 && <PalletStructure<T>>::check_indirectly_owned(1274 sender.clone(),1275 handle.id,1276 under,1277 Some(from),1278 nesting_budget,1279 )? {1280 // Pass, token existence and ouroboros checks are done in `check_indirectly_owned`1281 } else if nesting.collection_admin && handle.is_owner_or_admin(&sender) {1282 // token existence and ouroboros checks are done in `get_checked_topmost_owner`1283 let _ = <PalletStructure<T>>::get_checked_topmost_owner(1284 handle.id,1285 under,1286 Some(from),1287 nesting_budget,1288 )?1289 .ok_or(<CommonError<T>>::TokenNotFound)?;1290 } else {1291 fail!(<CommonError<T>>::UserIsNotAllowedToNest);1292 }12931294 if let Some(whitelist) = &nesting.restricted {1295 ensure!(1296 whitelist.contains(&from.0),1297 <CommonError<T>>::SourceCollectionIsNotAllowedToNest1298 );1299 }1300 Ok(())1301 }13021303 fn nest(under: (CollectionId, TokenId), to_nest: (CollectionId, TokenId)) {1304 <TokenChildren<T>>::insert((under.0, under.1, (to_nest.0, to_nest.1)), true);1305 }13061307 fn unnest(under: (CollectionId, TokenId), to_unnest: (CollectionId, TokenId)) {1308 <TokenChildren<T>>::remove((under.0, under.1, to_unnest));1309 }13101311 fn collection_has_tokens(collection_id: CollectionId) -> bool {1312 <TokenData<T>>::iter_prefix((collection_id,))1313 .next()1314 .is_some()1315 }13161317 fn token_has_children(collection_id: CollectionId, token_id: TokenId) -> bool {1318 <TokenChildren<T>>::iter_prefix((collection_id, token_id))1319 .next()1320 .is_some()1321 }13221323 pub fn token_children_ids(collection_id: CollectionId, token_id: TokenId) -> Vec<TokenChild> {1324 <TokenChildren<T>>::iter_prefix((collection_id, token_id))1325 .map(|((child_collection_id, child_id), _)| TokenChild {1326 collection: child_collection_id,1327 token: child_id,1328 })1329 .collect()1330 }13311332 /// Mint single NFT token.1333 ///1334 /// Delegated to [`create_multiple_items`]1335 ///1336 /// [`create_multiple_items`]: struct.Pallet.html#method.create_multiple_items1337 pub fn create_item(1338 collection: &NonfungibleHandle<T>,1339 sender: &T::CrossAccountId,1340 data: CreateItemData<T>,1341 nesting_budget: &dyn Budget,1342 ) -> DispatchResult {1343 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1344 }13451346 /// Sets or unsets the approval of a given operator.1347 ///1348 /// The `operator` is allowed to transfer all token pieces of the `owner` on their behalf.1349 /// - `owner`: Token owner1350 /// - `operator`: Operator1351 /// - `approve`: Should operator status be granted or revoked?1352 pub fn set_allowance_for_all(1353 collection: &NonfungibleHandle<T>,1354 owner: &T::CrossAccountId,1355 operator: &T::CrossAccountId,1356 approve: bool,1357 ) -> DispatchResult {1358 <PalletCommon<T>>::set_allowance_for_all(1359 collection,1360 owner,1361 operator,1362 approve,1363 || <CollectionAllowance<T>>::insert((collection.id, owner, operator), approve),1364 ERC721Events::ApprovalForAll {1365 owner: *owner.as_eth(),1366 operator: *operator.as_eth(),1367 approved: approve,1368 }1369 .to_log(collection_id_to_address(collection.id)),1370 )1371 }13721373 /// Tells whether the given `owner` approves the `operator`.1374 pub fn allowance_for_all(1375 collection: &NonfungibleHandle<T>,1376 owner: &T::CrossAccountId,1377 operator: &T::CrossAccountId,1378 ) -> bool {1379 <CollectionAllowance<T>>::get((collection.id, owner, operator))1380 }13811382 pub fn repair_item(collection: &NonfungibleHandle<T>, token: TokenId) -> DispatchResult {1383 <TokenProperties<T>>::mutate((collection.id, token), |properties| {1384 properties.recompute_consumed_space();1385 });13861387 Ok(())1388 }1389}pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -17,9 +17,14 @@
}
}
+/// @dev inlined interface
+contract ERC721TokenEvent {
+ event TokenChanged(uint256 indexed tokenId);
+}
+
/// @title A contract that allows to set and delete token properties and change token property permissions.
/// @dev the ERC-165 identifier for this interface is 0xde0695c2
-contract TokenProperties is Dummy, ERC165 {
+contract TokenProperties is Dummy, ERC165, ERC721TokenEvent {
// /// @notice Set permissions for token property.
// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.
// /// @param key Property key.
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -59,8 +59,19 @@
pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);
+/// Rft events.
+#[derive(ToLog)]
+pub enum ERC721TokenEvent {
+ /// The token has been changed.
+ TokenChanged {
+ /// Token ID.
+ #[indexed]
+ token_id: U256,
+ },
+}
+
/// @title A contract that allows to set and delete token properties and change token property permissions.
-#[solidity_interface(name = TokenProperties, enum(derive(PreDispatch)), enum_attr(weight))]
+#[solidity_interface(name = TokenProperties, events(ERC721TokenEvent), enum(derive(PreDispatch)), enum_attr(weight))]
impl<T: Config> RefungibleHandle<T> {
/// @notice Set permissions for token property.
/// @dev Throws error if `msg.sender` is not admin or owner of the collection.
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -100,7 +100,7 @@
Event as CommonEvent, Pallet as PalletCommon,
};
use pallet_structure::Pallet as PalletStructure;
-use sp_core::H160;
+use sp_core::{Get, H160};
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
use up_data_structs::{
@@ -571,6 +571,10 @@
stored_properties,
is_token_owner,
|properties| <TokenProperties<T>>::set((collection.id, token_id), properties),
+ erc::ERC721TokenEvent::TokenChanged {
+ token_id: token_id.into(),
+ }
+ .to_log(T::ContractAddress::get()),
)
}
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -17,9 +17,14 @@
}
}
+/// @dev inlined interface
+contract ERC721TokenEvent {
+ event TokenChanged(uint256 indexed tokenId);
+}
+
/// @title A contract that allows to set and delete token properties and change token property permissions.
/// @dev the ERC-165 identifier for this interface is 0xde0695c2
-contract TokenProperties is Dummy, ERC165 {
+contract TokenProperties is Dummy, ERC165, ERC721TokenEvent {
// /// @notice Set permissions for token property.
// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.
// /// @param key Property key.
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -22,7 +22,6 @@
event CollectionCreated(address indexed owner, address indexed collectionId);
event CollectionDestroyed(address indexed collectionId);
event CollectionChanged(address indexed collectionId);
- event TokenChanged(address indexed collectionId, uint256 tokenId);
}
/// @title Contract, which allows users to operate with collections
tests/src/eth/abi/collectionHelpers.jsondiffbeforeafterboth--- a/tests/src/eth/abi/collectionHelpers.json
+++ b/tests/src/eth/abi/collectionHelpers.json
@@ -45,25 +45,6 @@
"type": "event"
},
{
- "anonymous": false,
- "inputs": [
- {
- "indexed": true,
- "internalType": "address",
- "name": "collectionId",
- "type": "address"
- },
- {
- "indexed": false,
- "internalType": "uint256",
- "name": "tokenId",
- "type": "uint256"
- }
- ],
- "name": "TokenChanged",
- "type": "event"
- },
- {
"inputs": [
{ "internalType": "uint32", "name": "collectionId", "type": "uint32" }
],
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -54,6 +54,19 @@
"inputs": [
{
"indexed": true,
+ "internalType": "uint256",
+ "name": "tokenId",
+ "type": "uint256"
+ }
+ ],
+ "name": "TokenChanged",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -54,6 +54,19 @@
"inputs": [
{
"indexed": true,
+ "internalType": "uint256",
+ "name": "tokenId",
+ "type": "uint256"
+ }
+ ],
+ "name": "TokenChanged",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
tests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/CollectionHelpers.sol
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -17,7 +17,6 @@
event CollectionCreated(address indexed owner, address indexed collectionId);
event CollectionDestroyed(address indexed collectionId);
event CollectionChanged(address indexed collectionId);
- event TokenChanged(address indexed collectionId, uint256 tokenId);
}
/// @title Contract, which allows users to operate with collections
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -12,9 +12,14 @@
function supportsInterface(bytes4 interfaceID) external view returns (bool);
}
+/// @dev inlined interface
+interface ERC721TokenEvent {
+ event TokenChanged(uint256 indexed tokenId);
+}
+
/// @title A contract that allows to set and delete token properties and change token property permissions.
/// @dev the ERC-165 identifier for this interface is 0xde0695c2
-interface TokenProperties is Dummy, ERC165 {
+interface TokenProperties is Dummy, ERC165, ERC721TokenEvent {
// /// @notice Set permissions for token property.
// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.
// /// @param key Property key.
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -12,9 +12,14 @@
function supportsInterface(bytes4 interfaceID) external view returns (bool);
}
+/// @dev inlined interface
+interface ERC721TokenEvent {
+ event TokenChanged(uint256 indexed tokenId);
+}
+
/// @title A contract that allows to set and delete token properties and change token property permissions.
/// @dev the ERC-165 identifier for this interface is 0xde0695c2
-interface TokenProperties is Dummy, ERC165 {
+interface TokenProperties is Dummy, ERC165, ERC721TokenEvent {
// /// @notice Set permissions for token property.
// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.
// /// @param key Property key.
tests/src/eth/events.test.tsdiffbeforeafterboth--- a/tests/src/eth/events.test.ts
+++ b/tests/src/eth/events.test.ts
@@ -29,8 +29,10 @@
});
});
-function clearEvents(ethEvents: NormalizedEvent[], subEvents: IEvent[]) {
- ethEvents.splice(0);
+function clearEvents(ethEvents: NormalizedEvent[] | null, subEvents: IEvent[]) {
+ if (ethEvents !== null) {
+ ethEvents.splice(0);
+ }
subEvents.splice(0);
}
@@ -374,7 +376,6 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress} = await helper.eth.createCollection(mode, owner, 'A', 'B', 'C');
const collection = await helper.ethNativeContract.collection(collectionAddress, mode, owner);
- const collectionHelper = await helper.ethNativeContract.collectionHelpers(owner);
const result = await collection.methods.mint(owner).send({from: owner});
const tokenId = result.events.Transfer.returnValues.tokenId;
await collection.methods.setTokenPropertyPermissions([
@@ -384,38 +385,29 @@
[TokenPermissionField.CollectionAdmin, true]],
],
]).send({from: owner});
-
- const ethEvents: any = [];
- collectionHelper.events.allEvents((_: any, event: any) => {
- ethEvents.push(event);
- });
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['TokenPropertySet', 'TokenPropertyDeleted']}]);
{
- await collection.methods.setProperties(tokenId, [{key: 'A', value: [1,2,3]}]).send({from: owner});
+ const result = await collection.methods.setProperties(tokenId, [{key: 'A', value: [1,2,3]}]).send({from: owner});
await helper.wait.newBlocks(1);
- expect(ethEvents).to.containSubset([
- {
- event: 'TokenChanged',
- returnValues: {
- collectionId: collectionAddress,
- },
+ expect(result.events.TokenChanged).to.be.like({
+ event: 'TokenChanged',
+ returnValues: {
+ tokenId: tokenId,
},
- ]);
+ });
expect(subEvents).to.containSubset([{method: 'TokenPropertySet'}]);
- clearEvents(ethEvents, subEvents);
+ clearEvents(null, subEvents);
}
{
- await collection.methods.deleteProperties(tokenId, ['A']).send({from: owner});
+ const result = await collection.methods.deleteProperties(tokenId, ['A']).send({from: owner});
await helper.wait.newBlocks(1);
- expect(ethEvents).to.containSubset([
- {
- event: 'TokenChanged',
- returnValues: {
- collectionId: collectionAddress,
- },
+ expect(result.events.TokenChanged).to.be.like({
+ event: 'TokenChanged',
+ returnValues: {
+ tokenId: tokenId,
},
- ]);
+ });
expect(subEvents).to.containSubset([{method: 'TokenPropertyDeleted'}]);
}
unsubscribe();