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.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -112,7 +112,7 @@
};
use pallet_structure::{Pallet as PalletStructure, Error as StructureError};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
-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 core::ops::Deref;
@@ -622,6 +622,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/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.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8 uint8 dummy;9 string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13 function supportsInterface(bytes4 interfaceID) external view returns (bool) {14 require(false, stub_error);15 interfaceID;16 return true;17 }18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23 // /// @notice Set permissions for token property.24 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25 // /// @param key Property key.26 // /// @param isMutable Permission to mutate property.27 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29 // /// @dev EVM selector for this function is: 0x222d97fa,30 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32 // require(false, stub_error);33 // key;34 // isMutable;35 // collectionAdmin;36 // tokenOwner;37 // dummy = 0;38 // }3940 /// @notice Set permissions for token property.41 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.42 /// @param permissions Permissions for keys.43 /// @dev EVM selector for this function is: 0xbd92983a,44 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45 function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {46 require(false, stub_error);47 permissions;48 dummy = 0;49 }5051 /// @notice Get permissions for token properties.52 /// @dev EVM selector for this function is: 0xf23d7790,53 /// or in textual repr: tokenPropertyPermissions()54 function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {55 require(false, stub_error);56 dummy;57 return new TokenPropertyPermission[](0);58 }5960 // /// @notice Set token property value.61 // /// @dev Throws error if `msg.sender` has no permission to edit the property.62 // /// @param tokenId ID of the token.63 // /// @param key Property key.64 // /// @param value Property value.65 // /// @dev EVM selector for this function is: 0x1752d67b,66 // /// or in textual repr: setProperty(uint256,string,bytes)67 // function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68 // require(false, stub_error);69 // tokenId;70 // key;71 // value;72 // dummy = 0;73 // }7475 /// @notice Set token properties value.76 /// @dev Throws error if `msg.sender` has no permission to edit the property.77 /// @param tokenId ID of the token.78 /// @param properties settable properties79 /// @dev EVM selector for this function is: 0x14ed3a6e,80 /// or in textual repr: setProperties(uint256,(string,bytes)[])81 function setProperties(uint256 tokenId, Property[] memory properties) public {82 require(false, stub_error);83 tokenId;84 properties;85 dummy = 0;86 }8788 // /// @notice Delete token property value.89 // /// @dev Throws error if `msg.sender` has no permission to edit the property.90 // /// @param tokenId ID of the token.91 // /// @param key Property key.92 // /// @dev EVM selector for this function is: 0x066111d1,93 // /// or in textual repr: deleteProperty(uint256,string)94 // function deleteProperty(uint256 tokenId, string memory key) public {95 // require(false, stub_error);96 // tokenId;97 // key;98 // dummy = 0;99 // }100101 /// @notice Delete token properties value.102 /// @dev Throws error if `msg.sender` has no permission to edit the property.103 /// @param tokenId ID of the token.104 /// @param keys Properties key.105 /// @dev EVM selector for this function is: 0xc472d371,106 /// or in textual repr: deleteProperties(uint256,string[])107 function deleteProperties(uint256 tokenId, string[] memory keys) public {108 require(false, stub_error);109 tokenId;110 keys;111 dummy = 0;112 }113114 /// @notice Get token property value.115 /// @dev Throws error if key not found116 /// @param tokenId ID of the token.117 /// @param key Property key.118 /// @return Property value bytes119 /// @dev EVM selector for this function is: 0x7228c327,120 /// or in textual repr: property(uint256,string)121 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122 require(false, stub_error);123 tokenId;124 key;125 dummy;126 return hex"";127 }128}129130/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).131struct Property {132 string key;133 bytes value;134}135136/// Ethereum representation of Token Property Permissions.137struct TokenPropertyPermission {138 /// Token property key.139 string key;140 /// Token property permissions.141 PropertyPermission[] permissions;142}143144/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.145struct PropertyPermission {146 /// TokenPermission field.147 TokenPermissionField code;148 /// TokenPermission value.149 bool value;150}151152/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.153enum TokenPermissionField {154 /// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]155 Mutable,156 /// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]157 TokenOwner,158 /// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]159 CollectionAdmin160}161162/// @title A contract that allows you to work with collections.163/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1164contract Collection is Dummy, ERC165 {165 // /// Set collection property.166 // ///167 // /// @param key Property key.168 // /// @param value Propery value.169 // /// @dev EVM selector for this function is: 0x2f073f66,170 // /// or in textual repr: setCollectionProperty(string,bytes)171 // function setCollectionProperty(string memory key, bytes memory value) public {172 // require(false, stub_error);173 // key;174 // value;175 // dummy = 0;176 // }177178 /// Set collection properties.179 ///180 /// @param properties Vector of properties key/value pair.181 /// @dev EVM selector for this function is: 0x50b26b2a,182 /// or in textual repr: setCollectionProperties((string,bytes)[])183 function setCollectionProperties(Property[] memory properties) public {184 require(false, stub_error);185 properties;186 dummy = 0;187 }188189 // /// Delete collection property.190 // ///191 // /// @param key Property key.192 // /// @dev EVM selector for this function is: 0x7b7debce,193 // /// or in textual repr: deleteCollectionProperty(string)194 // function deleteCollectionProperty(string memory key) public {195 // require(false, stub_error);196 // key;197 // dummy = 0;198 // }199200 /// Delete collection properties.201 ///202 /// @param keys Properties keys.203 /// @dev EVM selector for this function is: 0xee206ee3,204 /// or in textual repr: deleteCollectionProperties(string[])205 function deleteCollectionProperties(string[] memory keys) public {206 require(false, stub_error);207 keys;208 dummy = 0;209 }210211 /// Get collection property.212 ///213 /// @dev Throws error if key not found.214 ///215 /// @param key Property key.216 /// @return bytes The property corresponding to the key.217 /// @dev EVM selector for this function is: 0xcf24fd6d,218 /// or in textual repr: collectionProperty(string)219 function collectionProperty(string memory key) public view returns (bytes memory) {220 require(false, stub_error);221 key;222 dummy;223 return hex"";224 }225226 /// Get collection properties.227 ///228 /// @param keys Properties keys. Empty keys for all propertyes.229 /// @return Vector of properties key/value pairs.230 /// @dev EVM selector for this function is: 0x285fb8e6,231 /// or in textual repr: collectionProperties(string[])232 function collectionProperties(string[] memory keys) public view returns (Property[] memory) {233 require(false, stub_error);234 keys;235 dummy;236 return new Property[](0);237 }238239 // /// Set the sponsor of the collection.240 // ///241 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.242 // ///243 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.244 // /// @dev EVM selector for this function is: 0x7623402e,245 // /// or in textual repr: setCollectionSponsor(address)246 // function setCollectionSponsor(address sponsor) public {247 // require(false, stub_error);248 // sponsor;249 // dummy = 0;250 // }251252 /// Set the sponsor of the collection.253 ///254 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.255 ///256 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.257 /// @dev EVM selector for this function is: 0x84a1d5a8,258 /// or in textual repr: setCollectionSponsorCross((address,uint256))259 function setCollectionSponsorCross(CrossAddress memory sponsor) public {260 require(false, stub_error);261 sponsor;262 dummy = 0;263 }264265 /// Whether there is a pending sponsor.266 /// @dev EVM selector for this function is: 0x058ac185,267 /// or in textual repr: hasCollectionPendingSponsor()268 function hasCollectionPendingSponsor() public view returns (bool) {269 require(false, stub_error);270 dummy;271 return false;272 }273274 /// Collection sponsorship confirmation.275 ///276 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.277 /// @dev EVM selector for this function is: 0x3c50e97a,278 /// or in textual repr: confirmCollectionSponsorship()279 function confirmCollectionSponsorship() public {280 require(false, stub_error);281 dummy = 0;282 }283284 /// Remove collection sponsor.285 /// @dev EVM selector for this function is: 0x6e0326a3,286 /// or in textual repr: removeCollectionSponsor()287 function removeCollectionSponsor() public {288 require(false, stub_error);289 dummy = 0;290 }291292 /// Get current sponsor.293 ///294 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.295 /// @dev EVM selector for this function is: 0x6ec0a9f1,296 /// or in textual repr: collectionSponsor()297 function collectionSponsor() public view returns (CrossAddress memory) {298 require(false, stub_error);299 dummy;300 return CrossAddress(0x0000000000000000000000000000000000000000, 0);301 }302303 /// Get current collection limits.304 ///305 /// @return Array of collection limits306 /// @dev EVM selector for this function is: 0xf63bc572,307 /// or in textual repr: collectionLimits()308 function collectionLimits() public view returns (CollectionLimit[] memory) {309 require(false, stub_error);310 dummy;311 return new CollectionLimit[](0);312 }313314 /// Set limits for the collection.315 /// @dev Throws error if limit not found.316 /// @param limit Some limit.317 /// @dev EVM selector for this function is: 0x2316ee74,318 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))319 function setCollectionLimit(CollectionLimit memory limit) public {320 require(false, stub_error);321 limit;322 dummy = 0;323 }324325 /// Get contract address.326 /// @dev EVM selector for this function is: 0xf6b4dfb4,327 /// or in textual repr: contractAddress()328 function contractAddress() public view returns (address) {329 require(false, stub_error);330 dummy;331 return 0x0000000000000000000000000000000000000000;332 }333334 /// Add collection admin.335 /// @param newAdmin Cross account administrator address.336 /// @dev EVM selector for this function is: 0x859aa7d6,337 /// or in textual repr: addCollectionAdminCross((address,uint256))338 function addCollectionAdminCross(CrossAddress memory newAdmin) public {339 require(false, stub_error);340 newAdmin;341 dummy = 0;342 }343344 /// Remove collection admin.345 /// @param admin Cross account administrator address.346 /// @dev EVM selector for this function is: 0x6c0cd173,347 /// or in textual repr: removeCollectionAdminCross((address,uint256))348 function removeCollectionAdminCross(CrossAddress memory admin) public {349 require(false, stub_error);350 admin;351 dummy = 0;352 }353354 // /// Add collection admin.355 // /// @param newAdmin Address of the added administrator.356 // /// @dev EVM selector for this function is: 0x92e462c7,357 // /// or in textual repr: addCollectionAdmin(address)358 // function addCollectionAdmin(address newAdmin) public {359 // require(false, stub_error);360 // newAdmin;361 // dummy = 0;362 // }363364 // /// Remove collection admin.365 // ///366 // /// @param admin Address of the removed administrator.367 // /// @dev EVM selector for this function is: 0xfafd7b42,368 // /// or in textual repr: removeCollectionAdmin(address)369 // function removeCollectionAdmin(address admin) public {370 // require(false, stub_error);371 // admin;372 // dummy = 0;373 // }374375 /// Toggle accessibility of collection nesting.376 ///377 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'378 /// @dev EVM selector for this function is: 0x112d4586,379 /// or in textual repr: setCollectionNesting(bool)380 function setCollectionNesting(bool enable) public {381 require(false, stub_error);382 enable;383 dummy = 0;384 }385386 /// Toggle accessibility of collection nesting.387 ///388 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'389 /// @param collections Addresses of collections that will be available for nesting.390 /// @dev EVM selector for this function is: 0x64872396,391 /// or in textual repr: setCollectionNesting(bool,address[])392 function setCollectionNesting(bool enable, address[] memory collections) public {393 require(false, stub_error);394 enable;395 collections;396 dummy = 0;397 }398399 /// Returns nesting for a collection400 /// @dev EVM selector for this function is: 0x22d25bfe,401 /// or in textual repr: collectionNestingRestrictedCollectionIds()402 function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {403 require(false, stub_error);404 dummy;405 return CollectionNesting(false, new uint256[](0));406 }407408 /// Returns permissions for a collection409 /// @dev EVM selector for this function is: 0x5b2eaf4b,410 /// or in textual repr: collectionNestingPermissions()411 function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {412 require(false, stub_error);413 dummy;414 return new CollectionNestingPermission[](0);415 }416417 /// Set the collection access method.418 /// @param mode Access mode419 /// @dev EVM selector for this function is: 0x41835d4c,420 /// or in textual repr: setCollectionAccess(uint8)421 function setCollectionAccess(AccessMode mode) public {422 require(false, stub_error);423 mode;424 dummy = 0;425 }426427 /// Checks that user allowed to operate with collection.428 ///429 /// @param user User address to check.430 /// @dev EVM selector for this function is: 0x91b6df49,431 /// or in textual repr: allowlistedCross((address,uint256))432 function allowlistedCross(CrossAddress memory user) public view returns (bool) {433 require(false, stub_error);434 user;435 dummy;436 return false;437 }438439 // /// Add the user to the allowed list.440 // ///441 // /// @param user Address of a trusted user.442 // /// @dev EVM selector for this function is: 0x67844fe6,443 // /// or in textual repr: addToCollectionAllowList(address)444 // function addToCollectionAllowList(address user) public {445 // require(false, stub_error);446 // user;447 // dummy = 0;448 // }449450 /// Add user to allowed list.451 ///452 /// @param user User cross account address.453 /// @dev EVM selector for this function is: 0xa0184a3a,454 /// or in textual repr: addToCollectionAllowListCross((address,uint256))455 function addToCollectionAllowListCross(CrossAddress memory user) public {456 require(false, stub_error);457 user;458 dummy = 0;459 }460461 // /// Remove the user from the allowed list.462 // ///463 // /// @param user Address of a removed user.464 // /// @dev EVM selector for this function is: 0x85c51acb,465 // /// or in textual repr: removeFromCollectionAllowList(address)466 // function removeFromCollectionAllowList(address user) public {467 // require(false, stub_error);468 // user;469 // dummy = 0;470 // }471472 /// Remove user from allowed list.473 ///474 /// @param user User cross account address.475 /// @dev EVM selector for this function is: 0x09ba452a,476 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))477 function removeFromCollectionAllowListCross(CrossAddress memory user) public {478 require(false, stub_error);479 user;480 dummy = 0;481 }482483 /// Switch permission for minting.484 ///485 /// @param mode Enable if "true".486 /// @dev EVM selector for this function is: 0x00018e84,487 /// or in textual repr: setCollectionMintMode(bool)488 function setCollectionMintMode(bool mode) public {489 require(false, stub_error);490 mode;491 dummy = 0;492 }493494 // /// Check that account is the owner or admin of the collection495 // ///496 // /// @param user account to verify497 // /// @return "true" if account is the owner or admin498 // /// @dev EVM selector for this function is: 0x9811b0c7,499 // /// or in textual repr: isOwnerOrAdmin(address)500 // function isOwnerOrAdmin(address user) public view returns (bool) {501 // require(false, stub_error);502 // user;503 // dummy;504 // return false;505 // }506507 /// Check that account is the owner or admin of the collection508 ///509 /// @param user User cross account to verify510 /// @return "true" if account is the owner or admin511 /// @dev EVM selector for this function is: 0x3e75a905,512 /// or in textual repr: isOwnerOrAdminCross((address,uint256))513 function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {514 require(false, stub_error);515 user;516 dummy;517 return false;518 }519520 /// Returns collection type521 ///522 /// @return `Fungible` or `NFT` or `ReFungible`523 /// @dev EVM selector for this function is: 0xd34b55b8,524 /// or in textual repr: uniqueCollectionType()525 function uniqueCollectionType() public view returns (string memory) {526 require(false, stub_error);527 dummy;528 return "";529 }530531 /// Get collection owner.532 ///533 /// @return Tuble with sponsor address and his substrate mirror.534 /// If address is canonical then substrate mirror is zero and vice versa.535 /// @dev EVM selector for this function is: 0xdf727d3b,536 /// or in textual repr: collectionOwner()537 function collectionOwner() public view returns (CrossAddress memory) {538 require(false, stub_error);539 dummy;540 return CrossAddress(0x0000000000000000000000000000000000000000, 0);541 }542543 // /// Changes collection owner to another account544 // ///545 // /// @dev Owner can be changed only by current owner546 // /// @param newOwner new owner account547 // /// @dev EVM selector for this function is: 0x4f53e226,548 // /// or in textual repr: changeCollectionOwner(address)549 // function changeCollectionOwner(address newOwner) public {550 // require(false, stub_error);551 // newOwner;552 // dummy = 0;553 // }554555 /// Get collection administrators556 ///557 /// @return Vector of tuples with admins address and his substrate mirror.558 /// If address is canonical then substrate mirror is zero and vice versa.559 /// @dev EVM selector for this function is: 0x5813216b,560 /// or in textual repr: collectionAdmins()561 function collectionAdmins() public view returns (CrossAddress[] memory) {562 require(false, stub_error);563 dummy;564 return new CrossAddress[](0);565 }566567 /// Changes collection owner to another account568 ///569 /// @dev Owner can be changed only by current owner570 /// @param newOwner new owner cross account571 /// @dev EVM selector for this function is: 0x6496c497,572 /// or in textual repr: changeCollectionOwnerCross((address,uint256))573 function changeCollectionOwnerCross(CrossAddress memory newOwner) public {574 require(false, stub_error);575 newOwner;576 dummy = 0;577 }578}579580/// Cross account struct581struct CrossAddress {582 address eth;583 uint256 sub;584}585586/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).587enum AccessMode {588 /// Access grant for owner and admins. Used as default.589 Normal,590 /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.591 AllowList592}593594/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.595struct CollectionNestingPermission {596 CollectionPermissionField field;597 bool value;598}599600/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.601enum CollectionPermissionField {602 /// Owner of token can nest tokens under it.603 TokenOwner,604 /// Admin of token collection can nest tokens under token.605 CollectionAdmin606}607608/// Nested collections.609struct CollectionNesting {610 bool token_owner;611 uint256[] ids;612}613614/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.615struct CollectionLimit {616 CollectionLimitField field;617 OptionUint256 value;618}619620/// Optional value621struct OptionUint256 {622 /// Shows the status of accessibility of value623 bool status;624 /// Actual value if `status` is true625 uint256 value;626}627628/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.629enum CollectionLimitField {630 /// How many tokens can a user have on one account.631 AccountTokenOwnership,632 /// How many bytes of data are available for sponsorship.633 SponsoredDataSize,634 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]635 SponsoredDataRateLimit,636 /// How many tokens can be mined into this collection.637 TokenLimit,638 /// Timeouts for transfer sponsoring.639 SponsorTransferTimeout,640 /// Timeout for sponsoring an approval in passed blocks.641 SponsorApproveTimeout,642 /// Whether the collection owner of the collection can send tokens (which belong to other users).643 OwnerCanTransfer,644 /// Can the collection owner burn other people's tokens.645 OwnerCanDestroy,646 /// Is it possible to send tokens from this collection between users.647 TransferEnabled648}649650/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension651/// @dev See https://eips.ethereum.org/EIPS/eip-721652/// @dev the ERC-165 identifier for this interface is 0x5b5e139f653contract ERC721Metadata is Dummy, ERC165 {654 // /// @notice A descriptive name for a collection of NFTs in this contract655 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`656 // /// @dev EVM selector for this function is: 0x06fdde03,657 // /// or in textual repr: name()658 // function name() public view returns (string memory) {659 // require(false, stub_error);660 // dummy;661 // return "";662 // }663664 // /// @notice An abbreviated name for NFTs in this contract665 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`666 // /// @dev EVM selector for this function is: 0x95d89b41,667 // /// or in textual repr: symbol()668 // function symbol() public view returns (string memory) {669 // require(false, stub_error);670 // dummy;671 // return "";672 // }673674 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.675 ///676 /// @dev If the token has a `url` property and it is not empty, it is returned.677 /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.678 /// If the collection property `baseURI` is empty or absent, return "" (empty string)679 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix680 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).681 ///682 /// @return token's const_metadata683 /// @dev EVM selector for this function is: 0xc87b56dd,684 /// or in textual repr: tokenURI(uint256)685 function tokenURI(uint256 tokenId) public view returns (string memory) {686 require(false, stub_error);687 tokenId;688 dummy;689 return "";690 }691}692693/// @title ERC721 Token that can be irreversibly burned (destroyed).694/// @dev the ERC-165 identifier for this interface is 0x42966c68695contract ERC721Burnable is Dummy, ERC165 {696 /// @notice Burns a specific ERC721 token.697 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized698 /// operator of the current owner.699 /// @param tokenId The RFT to approve700 /// @dev EVM selector for this function is: 0x42966c68,701 /// or in textual repr: burn(uint256)702 function burn(uint256 tokenId) public {703 require(false, stub_error);704 tokenId;705 dummy = 0;706 }707}708709/// @title ERC721 minting logic.710/// @dev the ERC-165 identifier for this interface is 0x3fd94ea6711contract ERC721UniqueMintable is Dummy, ERC165 {712 /// @notice Function to mint a token.713 /// @param to The new owner714 /// @return uint256 The id of the newly minted token715 /// @dev EVM selector for this function is: 0x6a627842,716 /// or in textual repr: mint(address)717 function mint(address to) public returns (uint256) {718 require(false, stub_error);719 to;720 dummy = 0;721 return 0;722 }723724 // /// @notice Function to mint a token.725 // /// @dev `tokenId` should be obtained with `nextTokenId` method,726 // /// unlike standard, you can't specify it manually727 // /// @param to The new owner728 // /// @param tokenId ID of the minted RFT729 // /// @dev EVM selector for this function is: 0x40c10f19,730 // /// or in textual repr: mint(address,uint256)731 // function mint(address to, uint256 tokenId) public returns (bool) {732 // require(false, stub_error);733 // to;734 // tokenId;735 // dummy = 0;736 // return false;737 // }738739 /// @notice Function to mint token with the given tokenUri.740 /// @param to The new owner741 /// @param tokenUri Token URI that would be stored in the NFT properties742 /// @return uint256 The id of the newly minted token743 /// @dev EVM selector for this function is: 0x45c17782,744 /// or in textual repr: mintWithTokenURI(address,string)745 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {746 require(false, stub_error);747 to;748 tokenUri;749 dummy = 0;750 return 0;751 }752 // /// @notice Function to mint token with the given tokenUri.753 // /// @dev `tokenId` should be obtained with `nextTokenId` method,754 // /// unlike standard, you can't specify it manually755 // /// @param to The new owner756 // /// @param tokenId ID of the minted RFT757 // /// @param tokenUri Token URI that would be stored in the RFT properties758 // /// @dev EVM selector for this function is: 0x50bb4e7f,759 // /// or in textual repr: mintWithTokenURI(address,uint256,string)760 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {761 // require(false, stub_error);762 // to;763 // tokenId;764 // tokenUri;765 // dummy = 0;766 // return false;767 // }768769}770771/// @title Unique extensions for ERC721.772/// @dev the ERC-165 identifier for this interface is 0xb365c124773contract ERC721UniqueExtensions is Dummy, ERC165 {774 /// @notice A descriptive name for a collection of NFTs in this contract775 /// @dev EVM selector for this function is: 0x06fdde03,776 /// or in textual repr: name()777 function name() public view returns (string memory) {778 require(false, stub_error);779 dummy;780 return "";781 }782783 /// @notice An abbreviated name for NFTs in this contract784 /// @dev EVM selector for this function is: 0x95d89b41,785 /// or in textual repr: symbol()786 function symbol() public view returns (string memory) {787 require(false, stub_error);788 dummy;789 return "";790 }791792 /// @notice A description for the collection.793 /// @dev EVM selector for this function is: 0x7284e416,794 /// or in textual repr: description()795 function description() public view returns (string memory) {796 require(false, stub_error);797 dummy;798 return "";799 }800801 /// Returns the owner (in cross format) of the token.802 ///803 /// @param tokenId Id for the token.804 /// @dev EVM selector for this function is: 0x2b29dace,805 /// or in textual repr: crossOwnerOf(uint256)806 function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {807 require(false, stub_error);808 tokenId;809 dummy;810 return CrossAddress(0x0000000000000000000000000000000000000000, 0);811 }812813 /// Returns the token properties.814 ///815 /// @param tokenId Id for the token.816 /// @param keys Properties keys. Empty keys for all propertyes.817 /// @return Vector of properties key/value pairs.818 /// @dev EVM selector for this function is: 0xe07ede7e,819 /// or in textual repr: properties(uint256,string[])820 function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {821 require(false, stub_error);822 tokenId;823 keys;824 dummy;825 return new Property[](0);826 }827828 /// @notice Transfer ownership of an RFT829 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`830 /// is the zero address. Throws if `tokenId` is not a valid RFT.831 /// Throws if RFT pieces have multiple owners.832 /// @param to The new owner833 /// @param tokenId The RFT to transfer834 /// @dev EVM selector for this function is: 0xa9059cbb,835 /// or in textual repr: transfer(address,uint256)836 function transfer(address to, uint256 tokenId) public {837 require(false, stub_error);838 to;839 tokenId;840 dummy = 0;841 }842843 /// @notice Transfer ownership of an RFT844 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`845 /// is the zero address. Throws if `tokenId` is not a valid RFT.846 /// Throws if RFT pieces have multiple owners.847 /// @param to The new owner848 /// @param tokenId The RFT to transfer849 /// @dev EVM selector for this function is: 0x2ada85ff,850 /// or in textual repr: transferCross((address,uint256),uint256)851 function transferCross(CrossAddress memory to, uint256 tokenId) public {852 require(false, stub_error);853 to;854 tokenId;855 dummy = 0;856 }857858 /// @notice Transfer ownership of an RFT859 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`860 /// is the zero address. Throws if `tokenId` is not a valid RFT.861 /// Throws if RFT pieces have multiple owners.862 /// @param to The new owner863 /// @param tokenId The RFT to transfer864 /// @dev EVM selector for this function is: 0xd5cf430b,865 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)866 function transferFromCross(867 CrossAddress memory from,868 CrossAddress memory to,869 uint256 tokenId870 ) public {871 require(false, stub_error);872 from;873 to;874 tokenId;875 dummy = 0;876 }877878 // /// @notice Burns a specific ERC721 token.879 // /// @dev Throws unless `msg.sender` is the current owner or an authorized880 // /// operator for this RFT. Throws if `from` is not the current owner. Throws881 // /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.882 // /// Throws if RFT pieces have multiple owners.883 // /// @param from The current owner of the RFT884 // /// @param tokenId The RFT to transfer885 // /// @dev EVM selector for this function is: 0x79cc6790,886 // /// or in textual repr: burnFrom(address,uint256)887 // function burnFrom(address from, uint256 tokenId) public {888 // require(false, stub_error);889 // from;890 // tokenId;891 // dummy = 0;892 // }893894 /// @notice Burns a specific ERC721 token.895 /// @dev Throws unless `msg.sender` is the current owner or an authorized896 /// operator for this RFT. Throws if `from` is not the current owner. Throws897 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.898 /// Throws if RFT pieces have multiple owners.899 /// @param from The current owner of the RFT900 /// @param tokenId The RFT to transfer901 /// @dev EVM selector for this function is: 0xbb2f5a58,902 /// or in textual repr: burnFromCross((address,uint256),uint256)903 function burnFromCross(CrossAddress memory from, uint256 tokenId) public {904 require(false, stub_error);905 from;906 tokenId;907 dummy = 0;908 }909910 /// @notice Returns next free RFT ID.911 /// @dev EVM selector for this function is: 0x75794a3c,912 /// or in textual repr: nextTokenId()913 function nextTokenId() public view returns (uint256) {914 require(false, stub_error);915 dummy;916 return 0;917 }918919 // /// @notice Function to mint multiple tokens.920 // /// @dev `tokenIds` should be an array of consecutive numbers and first number921 // /// should be obtained with `nextTokenId` method922 // /// @param to The new owner923 // /// @param tokenIds IDs of the minted RFTs924 // /// @dev EVM selector for this function is: 0x44a9945e,925 // /// or in textual repr: mintBulk(address,uint256[])926 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {927 // require(false, stub_error);928 // to;929 // tokenIds;930 // dummy = 0;931 // return false;932 // }933934 // /// @notice Function to mint multiple tokens with the given tokenUris.935 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive936 // /// numbers and first number should be obtained with `nextTokenId` method937 // /// @param to The new owner938 // /// @param tokens array of pairs of token ID and token URI for minted tokens939 // /// @dev EVM selector for this function is: 0x36543006,940 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])941 // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) public returns (bool) {942 // require(false, stub_error);943 // to;944 // tokens;945 // dummy = 0;946 // return false;947 // }948949 /// @notice Function to mint a token.950 /// @param to The new owner crossAccountId951 /// @param properties Properties of minted token952 /// @return uint256 The id of the newly minted token953 /// @dev EVM selector for this function is: 0xb904db03,954 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])955 function mintCross(CrossAddress memory to, Property[] memory properties) public returns (uint256) {956 require(false, stub_error);957 to;958 properties;959 dummy = 0;960 return 0;961 }962963 /// Returns EVM address for refungible token964 ///965 /// @param token ID of the token966 /// @dev EVM selector for this function is: 0xab76fac6,967 /// or in textual repr: tokenContractAddress(uint256)968 function tokenContractAddress(uint256 token) public view returns (address) {969 require(false, stub_error);970 token;971 dummy;972 return 0x0000000000000000000000000000000000000000;973 }974975 /// @notice Returns collection helper contract address976 /// @dev EVM selector for this function is: 0x1896cce6,977 /// or in textual repr: collectionHelperAddress()978 function collectionHelperAddress() public view returns (address) {979 require(false, stub_error);980 dummy;981 return 0x0000000000000000000000000000000000000000;982 }983}984985/// Data for creation token with uri.986struct TokenUri {987 /// Id of new token.988 uint256 id;989 /// Uri of new token.990 string uri;991}992993/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension994/// @dev See https://eips.ethereum.org/EIPS/eip-721995/// @dev the ERC-165 identifier for this interface is 0x780e9d63996contract ERC721Enumerable is Dummy, ERC165 {997 /// @notice Enumerate valid RFTs998 /// @param index A counter less than `totalSupply()`999 /// @return The token identifier for the `index`th NFT,1000 /// (sort order not specified)1001 /// @dev EVM selector for this function is: 0x4f6ccce7,1002 /// or in textual repr: tokenByIndex(uint256)1003 function tokenByIndex(uint256 index) public view returns (uint256) {1004 require(false, stub_error);1005 index;1006 dummy;1007 return 0;1008 }10091010 /// Not implemented1011 /// @dev EVM selector for this function is: 0x2f745c59,1012 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)1013 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1014 require(false, stub_error);1015 owner;1016 index;1017 dummy;1018 return 0;1019 }10201021 /// @notice Count RFTs tracked by this contract1022 /// @return A count of valid RFTs tracked by this contract, where each one of1023 /// them has an assigned and queryable owner not equal to the zero address1024 /// @dev EVM selector for this function is: 0x18160ddd,1025 /// or in textual repr: totalSupply()1026 function totalSupply() public view returns (uint256) {1027 require(false, stub_error);1028 dummy;1029 return 0;1030 }1031}10321033/// @dev inlined interface1034contract ERC721Events {1035 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1036 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1037 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1038}10391040/// @title ERC-721 Non-Fungible Token Standard1041/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1042/// @dev the ERC-165 identifier for this interface is 0x80ac58cd1043contract ERC721 is Dummy, ERC165, ERC721Events {1044 /// @notice Count all RFTs assigned to an owner1045 /// @dev RFTs assigned to the zero address are considered invalid, and this1046 /// function throws for queries about the zero address.1047 /// @param owner An address for whom to query the balance1048 /// @return The number of RFTs owned by `owner`, possibly zero1049 /// @dev EVM selector for this function is: 0x70a08231,1050 /// or in textual repr: balanceOf(address)1051 function balanceOf(address owner) public view returns (uint256) {1052 require(false, stub_error);1053 owner;1054 dummy;1055 return 0;1056 }10571058 /// @notice Find the owner of an RFT1059 /// @dev RFTs assigned to zero address are considered invalid, and queries1060 /// about them do throw.1061 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for1062 /// the tokens that are partially owned.1063 /// @param tokenId The identifier for an RFT1064 /// @return The address of the owner of the RFT1065 /// @dev EVM selector for this function is: 0x6352211e,1066 /// or in textual repr: ownerOf(uint256)1067 function ownerOf(uint256 tokenId) public view returns (address) {1068 require(false, stub_error);1069 tokenId;1070 dummy;1071 return 0x0000000000000000000000000000000000000000;1072 }10731074 /// @dev Not implemented1075 /// @dev EVM selector for this function is: 0xb88d4fde,1076 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)1077 function safeTransferFrom(1078 address from,1079 address to,1080 uint256 tokenId,1081 bytes memory data1082 ) public {1083 require(false, stub_error);1084 from;1085 to;1086 tokenId;1087 data;1088 dummy = 0;1089 }10901091 /// @dev Not implemented1092 /// @dev EVM selector for this function is: 0x42842e0e,1093 /// or in textual repr: safeTransferFrom(address,address,uint256)1094 function safeTransferFrom(1095 address from,1096 address to,1097 uint256 tokenId1098 ) public {1099 require(false, stub_error);1100 from;1101 to;1102 tokenId;1103 dummy = 0;1104 }11051106 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE1107 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1108 /// THEY MAY BE PERMANENTLY LOST1109 /// @dev Throws unless `msg.sender` is the current owner or an authorized1110 /// operator for this RFT. Throws if `from` is not the current owner. Throws1111 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.1112 /// Throws if RFT pieces have multiple owners.1113 /// @param from The current owner of the NFT1114 /// @param to The new owner1115 /// @param tokenId The NFT to transfer1116 /// @dev EVM selector for this function is: 0x23b872dd,1117 /// or in textual repr: transferFrom(address,address,uint256)1118 function transferFrom(1119 address from,1120 address to,1121 uint256 tokenId1122 ) public {1123 require(false, stub_error);1124 from;1125 to;1126 tokenId;1127 dummy = 0;1128 }11291130 /// @dev Not implemented1131 /// @dev EVM selector for this function is: 0x095ea7b3,1132 /// or in textual repr: approve(address,uint256)1133 function approve(address approved, uint256 tokenId) public {1134 require(false, stub_error);1135 approved;1136 tokenId;1137 dummy = 0;1138 }11391140 /// @notice Sets or unsets the approval of a given operator.1141 /// The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.1142 /// @param operator Operator1143 /// @param approved Should operator status be granted or revoked?1144 /// @dev EVM selector for this function is: 0xa22cb465,1145 /// or in textual repr: setApprovalForAll(address,bool)1146 function setApprovalForAll(address operator, bool approved) public {1147 require(false, stub_error);1148 operator;1149 approved;1150 dummy = 0;1151 }11521153 /// @dev Not implemented1154 /// @dev EVM selector for this function is: 0x081812fc,1155 /// or in textual repr: getApproved(uint256)1156 function getApproved(uint256 tokenId) public view returns (address) {1157 require(false, stub_error);1158 tokenId;1159 dummy;1160 return 0x0000000000000000000000000000000000000000;1161 }11621163 /// @notice Tells whether the given `owner` approves the `operator`.1164 /// @dev EVM selector for this function is: 0xe985e9c5,1165 /// or in textual repr: isApprovedForAll(address,address)1166 function isApprovedForAll(address owner, address operator) public view returns (bool) {1167 require(false, stub_error);1168 owner;1169 operator;1170 dummy;1171 return false;1172 }1173}11741175contract UniqueRefungible is1176 Dummy,1177 ERC165,1178 ERC721,1179 ERC721Enumerable,1180 ERC721UniqueExtensions,1181 ERC721UniqueMintable,1182 ERC721Burnable,1183 ERC721Metadata,1184 Collection,1185 TokenProperties1186{}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();