difftreelog
Revert "fix zero transfer"
in: master
This reverts commit 2880b7f76c032798bcf34e0b1b79ca02a267e201.
13 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5901,7 +5901,7 @@
[[package]]
name = "pallet-common"
-version = "0.1.13"
+version = "0.1.12"
dependencies = [
"ethereum",
"evm-coder",
@@ -6191,7 +6191,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.8"
+version = "0.1.7"
dependencies = [
"ethereum",
"evm-coder",
@@ -6446,7 +6446,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.10"
+version = "0.1.9"
dependencies = [
"ethereum",
"evm-coder",
@@ -6568,7 +6568,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.9"
+version = "0.2.8"
dependencies = [
"derivative",
"ethereum",
pallets/common/CHANGELOG.mddiffbeforeafterboth--- a/pallets/common/CHANGELOG.md
+++ b/pallets/common/CHANGELOG.md
@@ -4,12 +4,6 @@
<!-- bureaucrate goes here -->
-## [0.1.13] - 2022-12-05
-
-### Added
-
-- The error `ZeroTransferNotAllowed` to handling transactions with the transfer of a zero amount of tokens.
-
## [0.1.12] - 2022-11-16
### Changed
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-common"
-version = "0.1.13"
+version = "0.1.12"
license = "GPLv3"
edition = "2021"
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -601,9 +601,6 @@
/// Tried to access an internal collection with an external API
CollectionIsInternal,
-
- /// Transfer operation with zero amount
- ZeroTransferNotAllowed,
}
/// Storage of the count of created collections. Essentially contains the last collection ID.
pallets/fungible/CHANGELOG.mddiffbeforeafterboth1# Change Log23All notable changes to this project will be documented in this file.45<!-- bureaucrate goes here -->67## [0.1.9] - 2022-12-0589### Fixed 1011- Transfer with zero tokens.1213## [0.1.8] - 2022-11-181415### Added1617- The function `description` to `ERC20UniqueExtensions` interface.1819## [0.1.7] - 2022-11-142021### Changed2223- Added `transfer_cross` in eth functions.2425### Changed2627- Use named structure `EthCrossAccount` in eth functions.2829## [0.1.6] - 2022-11-023031### Changed3233- Use named structure `EthCrossAccount` in eth functions.3435## [0.1.5] - 2022-08-293637### Added3839- Implementation of `mint` and `mint_bulk` methods for ERC20 API.4041## [v0.1.4] - 2022-08-244243### Change4445- Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.4647## [v0.1.3] 2022-08-164849### Other changes5051- build: Upgrade polkadot to v0.9.27 2c498572636f2b34d53b1c51b7283a761a7dc90a5253- build: Upgrade polkadot to v0.9.26 85515e54c4ca1b82a2630034e55dcc804c643bf85455- refactor: Switch to new prefix removal methods 26734e9567589d75cdd99e404eabf11d5a97d9755657New methods allows to call `remove_prefix` with limit multiple times58in the same block59However, we don't use prefix removal limits, so upgrade is60straightforward6162Upstream-Change: https://github.com/paritytech/substrate/pull/114906364- build: Upgrade polkadot to v0.9.25 cdfb9bdc7b205ff1b5134f034ef9973d769e5e6b6566## [0.1.2] - 2022-08-046768### Fixed6970- Issue with ItemCreated event containing total supply of tokens instead minted amount7172## [0.1.1] - 2022-07-147374### Added7576- Implementation of RPC method `token_owners` returning 10 owners in no particular order.77 This was an internal request to improve the web interface and support fractionalization event.1# Change Log23All notable changes to this project will be documented in this file.45<!-- bureaucrate goes here -->67## [0.1.8] - 2022-11-1889### Added1011- The function `description` to `ERC20UniqueExtensions` interface.1213## [0.1.7] - 2022-11-141415### Changed1617- Added `transfer_cross` in eth functions.1819### Changed2021- Use named structure `EthCrossAccount` in eth functions.2223## [0.1.6] - 2022-11-022425### Changed2627- Use named structure `EthCrossAccount` in eth functions.2829## [0.1.5] - 2022-08-293031### Added3233- Implementation of `mint` and `mint_bulk` methods for ERC20 API.3435## [v0.1.4] - 2022-08-243637### Change3839- Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.4041## [v0.1.3] 2022-08-164243### Other changes4445- build: Upgrade polkadot to v0.9.27 2c498572636f2b34d53b1c51b7283a761a7dc90a4647- build: Upgrade polkadot to v0.9.26 85515e54c4ca1b82a2630034e55dcc804c643bf84849- refactor: Switch to new prefix removal methods 26734e9567589d75cdd99e404eabf11d5a97d9755051New methods allows to call `remove_prefix` with limit multiple times52in the same block53However, we don't use prefix removal limits, so upgrade is54straightforward5556Upstream-Change: https://github.com/paritytech/substrate/pull/114905758- build: Upgrade polkadot to v0.9.25 cdfb9bdc7b205ff1b5134f034ef9973d769e5e6b5960## [0.1.2] - 2022-08-046162### Fixed6364- Issue with ItemCreated event containing total supply of tokens instead minted amount6566## [0.1.1] - 2022-07-146768### Added6970- Implementation of RPC method `token_owners` returning 10 owners in no particular order.71 This was an internal request to improve the web interface and support fractionalization event.pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-fungible"
-version = "0.1.8"
+version = "0.1.7"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -365,8 +365,6 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- ensure!(amount > 0, <CommonError<T>>::ZeroTransferNotAllowed);
-
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed,
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,12 +4,6 @@
<!-- bureaucrate goes here -->
-## [0.1.11] - 2022-12-05
-
-### Fixed
-
-- Transfer with zero tokens.
-
## [0.1.10] - 2022-11-18
### Added
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.10"
+version = "0.1.9"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -23,7 +23,7 @@
};
use pallet_common::{
CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight,
- weights::WeightInfo as _, Error as CommonError,
+ weights::WeightInfo as _,
};
use sp_runtime::DispatchError;
use sp_std::{vec::Vec, vec};
@@ -314,12 +314,14 @@
nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);
- ensure!(amount > 0, <CommonError<T>>::ZeroTransferNotAllowed);
-
- with_weight(
- <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),
- <CommonWeights<T>>::transfer(),
- )
+ if amount == 1 {
+ with_weight(
+ <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),
+ <CommonWeights<T>>::transfer(),
+ )
+ } else {
+ Ok(().into())
+ }
}
fn approve(
@@ -351,12 +353,15 @@
nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);
- ensure!(amount > 0, <CommonError<T>>::ZeroTransferNotAllowed);
- with_weight(
- <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),
- <CommonWeights<T>>::transfer_from(),
- )
+ if amount == 1 {
+ with_weight(
+ <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),
+ <CommonWeights<T>>::transfer_from(),
+ )
+ } else {
+ Ok(().into())
+ }
}
fn burn_from(
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -3,11 +3,6 @@
All notable changes to this project will be documented in this file.
<!-- bureaucrate goes here -->
-## [0.2.10] - 2022-12-05
-
-### Fixed
-
-- Transfer with zero pieces.
## [0.2.9] - 2022-11-18
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-refungible"
-version = "0.2.9"
+version = "0.2.8"
license = "GPLv3"
edition = "2021"
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -727,8 +727,6 @@
amount: u128,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- ensure!(amount > 0, <CommonError<T>>::ZeroTransferNotAllowed);
-
ensure!(
collection.limits.transfers_enabled(),
<CommonError<T>>::TransferNotAllowed