difftreelog
Merge branch 'develop' into feature/fix_unit_tests
in: master
4 files changed
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -285,7 +285,11 @@
spender: &T::CrossAccountId,
amount: u128,
) {
- <Allowance<T>>::insert((collection.id, owner, spender), amount);
+ if amount == 0 {
+ <Allowance<T>>::remove((collection.id, owner, spender));
+ } else {
+ <Allowance<T>>::insert((collection.id, owner, spender), amount);
+ }
collection.log_infallible(ERC20Events::Approval {
owner: *owner.as_eth(),
pallets/nonfungible/src/lib.rsdiffbeforeafterboth177 .checked_add(1)177 .checked_add(1)178 .ok_or(ArithmeticError::Overflow)?;178 .ok_or(ArithmeticError::Overflow)?;179179180 let balance = <AccountBalance<T>>::get((collection.id, sender))181 .checked_sub(1)182 .ok_or(ArithmeticError::Overflow)?;183184 if balance == 0 {185 <AccountBalance<T>>::remove((collection.id, sender));186 } else {187 <AccountBalance<T>>::insert((collection.id, sender), balance);188 }180 // =========189 // =========181190182 <Owned<T>>::remove((collection.id, &token_data.owner, token));191 <Owned<T>>::remove((collection.id, &token_data.owner, token));pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -175,6 +175,8 @@
<TotalSupply<T>>::remove_prefix((id,), None);
<Balance<T>>::remove_prefix((id,), None);
<Allowance<T>>::remove_prefix((id,), None);
+ <Owned<T>>::remove_prefix((id,), None);
+ <AccountBalance<T>>::remove_prefix((id,), None);
Ok(())
}
@@ -465,7 +467,11 @@
token: TokenId,
amount: u128,
) {
- <Allowance<T>>::insert((collection.id, token, sender, spender), amount);
+ if amount == 0 {
+ <Allowance<T>>::remove((collection.id, token, sender, spender));
+ } else {
+ <Allowance<T>>::insert((collection.id, token, sender, spender), amount);
+ }
// TODO: ERC20 approval event
<PalletCommon<T>>::deposit_event(CommonEvent::Approved(
collection.id,
runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -146,7 +146,7 @@
spec_name: create_runtime_str!("opal"),
impl_name: create_runtime_str!("opal"),
authoring_version: 1,
- spec_version: 912202,
+ spec_version: 912204,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,