difftreelog
feat balanceOfCross for RFT token
in: master
7 files changed
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -283,6 +283,16 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
+
+ /// @notice Balance of account
+ /// @param owner An cross address for whom to query the balance
+ /// @return The number of fingibles owned by `owner`, possibly zero
+ fn balance_of_cross(&self, owner: CrossAddress) -> Result<U256> {
+ self.consume_store_reads(1)?;
+ let balance = <Balance<T>>::get((self.id, self.1, owner.into_sub_cross_account::<T>()?));
+ Ok(balance.into())
+ }
+
/// @dev Function that changes total amount of the tokens.
/// Throws if `msg.sender` doesn't owns all of the tokens.
/// @param amount New total amount of the tokens.
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -36,7 +36,7 @@
}
}
-/// @dev the ERC-165 identifier for this interface is 0x01d536fc
+/// @dev the ERC-165 identifier for this interface is 0xedd3a564
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @dev Function to check the amount of tokens that an owner allowed to a spender.
/// @param owner crossAddress The address which owns the funds.
@@ -97,6 +97,18 @@
return false;
}
+ /// @notice Balance of account
+ /// @param owner An cross address for whom to query the balance
+ /// @return The number of fingibles owned by `owner`, possibly zero
+ /// @dev EVM selector for this function is: 0xec069398,
+ /// or in textual repr: balanceOfCross((address,uint256))
+ function balanceOfCross(CrossAddress memory owner) public view returns (uint256) {
+ require(false, stub_error);
+ owner;
+ dummy;
+ return 0;
+ }
+
/// @dev Function that changes total amount of the tokens.
/// Throws if `msg.sender` doesn't owns all of the tokens.
/// @param amount New total amount of the tokens.
runtime/common/ethereum/sponsoring/refungible.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//! Implements EVM sponsoring logic via TransactionValidityHack1819use core::convert::TryInto;20use pallet_common::CollectionHandle;21use pallet_evm::account::CrossAccountId;22use pallet_fungible::Config as FungibleConfig;23use pallet_refungible::Config as RefungibleConfig;24use pallet_nonfungible::Config as NonfungibleConfig;25use pallet_unique::Config as UniqueConfig;26use up_data_structs::{CreateItemData, CreateNftData, TokenId};2728use super::common;29use crate::runtime_common::sponsoring::*;3031use pallet_refungible::{32 erc::{33 ERC721BurnableCall, ERC721Call, ERC721EnumerableCall, ERC721MetadataCall,34 ERC721UniqueExtensionsCall, ERC721UniqueMintableCall, TokenPropertiesCall,35 UniqueRefungibleCall,36 },37 erc_token::{38 ERC1633Call, ERC20Call, ERC20UniqueExtensionsCall, RefungibleTokenHandle,39 UniqueRefungibleTokenCall,40 },41};4243pub fn call_sponsor<T>(44 call: UniqueRefungibleCall<T>,45 collection: CollectionHandle<T>,46 who: &T::CrossAccountId,47) -> Option<()>48where49 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,50{51 use UniqueRefungibleCall::*;5253 match call {54 // Readonly55 ERC165Call(_, _) => None,5657 ERC721Enumerable(call) => erc721::enumerable_call_sponsor(call, collection, who),58 ERC721Burnable(call) => erc721::burnable_call_sponsor(call, collection, who),59 ERC721Metadata(call) => erc721::metadata_call_sponsor(call, collection, who),60 Collection(call) => common::collection_call_sponsor(call, collection, who),61 ERC721(call) => erc721::call_sponsor(call, collection, who),62 ERC721UniqueExtensions(call) => {63 erc721::unique_extensions_call_sponsor(call, collection, who)64 }65 ERC721UniqueMintable(call) => erc721::unique_mintable_call_sponsor(call, collection, who),66 TokenProperties(call) => token_properties_call_sponsor(call, collection, who),67 }68}6970pub fn token_properties_call_sponsor<T>(71 call: TokenPropertiesCall<T>,72 collection: CollectionHandle<T>,73 who: &T::CrossAccountId,74) -> Option<()>75where76 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,77{78 use TokenPropertiesCall::*;7980 match call {81 // Readonly82 ERC165Call(_, _) | Property { .. } | TokenPropertyPermissions => None,8384 // Not sponsored85 SetTokenPropertyPermission { .. }86 | SetTokenPropertyPermissions { .. }87 | SetProperties { .. }88 | DeleteProperty { .. }89 | DeleteProperties { .. } => None,9091 SetProperty {92 token_id,93 key,94 value,95 ..96 } => {97 let token_id = TokenId::try_from(token_id).ok()?;98 withdraw_set_token_property::<T>(&collection, &who, &token_id, key.len() + value.len())99 }100 }101}102103pub fn token_call_sponsor<T>(104 call: UniqueRefungibleTokenCall<T>,105 token: RefungibleTokenHandle<T>,106 who: &T::CrossAccountId,107) -> Option<()>108where109 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,110{111 use UniqueRefungibleTokenCall::*;112113 match call {114 // Readonly115 ERC165Call(_, _) => None,116117 ERC20(call) => erc20::call_sponsor(call, token, who),118 ERC20UniqueExtensions(call) => erc20::unique_extensions_call_sponsor(call, token, who),119 ERC1633(call) => erc1633::call_sponsor(call, token, who),120 }121}122123mod erc721 {124 use super::*;125126 pub fn call_sponsor<T>(127 call: ERC721Call<T>,128 collection: CollectionHandle<T>,129 _who: &T::CrossAccountId,130 ) -> Option<()>131 where132 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,133 {134 use ERC721Call::*;135136 match call {137 // Readonly138 ERC165Call(_, _)139 | BalanceOf { .. }140 | OwnerOf { .. }141 | GetApproved { .. }142 | IsApprovedForAll { .. } => None,143144 // Not sponsored145 SafeTransferFromWithData { .. }146 | SafeTransferFrom { .. }147 | SetApprovalForAll { .. } => None,148149 TransferFrom { token_id, from, .. } => {150 let token_id = TokenId::try_from(token_id).ok()?;151 let from = T::CrossAccountId::from_eth(from);152 withdraw_transfer::<T>(&collection, &from, &token_id)153 }154155 // Not supported156 Approve { .. } => None,157 }158 }159160 pub fn enumerable_call_sponsor<T>(161 call: ERC721EnumerableCall<T>,162 _collection: CollectionHandle<T>,163 _who: &T::CrossAccountId,164 ) -> Option<()>165 where166 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,167 {168 use ERC721EnumerableCall::*;169170 match call {171 // Readonly172 ERC165Call(_, _) | TokenByIndex { .. } | TokenOfOwnerByIndex { .. } | TotalSupply => {173 None174 }175 }176 }177178 pub fn burnable_call_sponsor<T>(179 call: ERC721BurnableCall<T>,180 _collection: CollectionHandle<T>,181 _who: &T::CrossAccountId,182 ) -> Option<()>183 where184 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,185 {186 use ERC721BurnableCall::*;187188 match call {189 // Readonly190 ERC165Call(_, _) => None,191192 // Not sponsored193 Burn { .. } => None,194 }195 }196197 pub fn metadata_call_sponsor<T>(198 call: ERC721MetadataCall<T>,199 _collection: CollectionHandle<T>,200 _who: &T::CrossAccountId,201 ) -> Option<()>202 where203 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,204 {205 use ERC721MetadataCall::*;206207 match call {208 // Readonly209 ERC165Call(_, _) | NameProxy | SymbolProxy | TokenUri { .. } => None,210 }211 }212213 pub fn unique_extensions_call_sponsor<T>(214 call: ERC721UniqueExtensionsCall<T>,215 collection: CollectionHandle<T>,216 who: &T::CrossAccountId,217 ) -> Option<()>218 where219 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,220 {221 use ERC721UniqueExtensionsCall::*;222223 match call {224 // Readonly225 ERC165Call(_, _)226 | Name227 | Symbol228 | Description229 | CrossOwnerOf { .. }230 | OwnerOfCross { .. }231 | BalanceOfCross { .. }232 | Properties { .. }233 | NextTokenId234 | TokenContractAddress { .. }235 | CollectionHelperAddress => None,236237 // Not sponsored238 BurnFrom { .. }239 | BurnFromCross { .. }240 | MintBulk { .. }241 | MintBulkWithTokenUri { .. } => None,242243 MintCross { .. } => withdraw_create_item::<T>(244 &collection,245 &who,246 &CreateItemData::NFT(CreateNftData::default()),247 ),248249 TransferCross { token_id, .. }250 | TransferFromCross { token_id, .. }251 | Transfer { token_id, .. } => {252 let token_id = TokenId::try_from(token_id).ok()?;253 withdraw_transfer::<T>(&collection, &who, &token_id)254 }255 }256 }257258 pub fn unique_mintable_call_sponsor<T>(259 call: ERC721UniqueMintableCall<T>,260 collection: CollectionHandle<T>,261 who: &T::CrossAccountId,262 ) -> Option<()>263 where264 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,265 {266 use ERC721UniqueMintableCall::*;267268 match call {269 // Readonly270 ERC165Call(_, _) => None,271272 // Sponsored273 Mint { .. }274 | MintCheckId { .. }275 | MintWithTokenUri { .. }276 | MintWithTokenUriCheckId { .. } => withdraw_create_item::<T>(277 &collection,278 &who,279 &CreateItemData::NFT(CreateNftData::default()),280 ),281 }282 }283}284285/// Module for methods of refungible token286///287/// Existance of token should be checked before searching for sponsor288/// because RefungibleTokenHandle doesn't check token's existence upon creation289mod erc20 {290 use super::*;291292 pub fn call_sponsor<T>(293 call: ERC20Call<T>,294 token: RefungibleTokenHandle<T>,295 who: &T::CrossAccountId,296 ) -> Option<()>297 where298 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,299 {300 use ERC20Call::*;301302 match call {303 // Readonly304 ERC165Call(_, _)305 | Name306 | Symbol307 | TotalSupply308 | Decimals309 | BalanceOf { .. }310 | Allowance { .. } => None,311312 Transfer { .. } => {313 let RefungibleTokenHandle(handle, token_id) = token;314 let token_id = token_id.try_into().ok()?;315 withdraw_transfer::<T>(&handle, &who, &token_id)316 }317 TransferFrom { from, .. } => {318 let RefungibleTokenHandle(handle, token_id) = token;319 let token_id = token_id.try_into().ok()?;320 let from = T::CrossAccountId::from_eth(from);321 withdraw_transfer::<T>(&handle, &from, &token_id)322 }323 Approve { .. } => {324 let RefungibleTokenHandle(handle, token_id) = token;325 let token_id = token_id.try_into().ok()?;326 withdraw_approve::<T>(&handle, who.as_sub(), &token_id)327 }328 }329 }330331 pub fn unique_extensions_call_sponsor<T>(332 call: ERC20UniqueExtensionsCall<T>,333 token: RefungibleTokenHandle<T>,334 who: &T::CrossAccountId,335 ) -> Option<()>336 where337 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,338 {339 use ERC20UniqueExtensionsCall::*;340341 match call {342 // Readonly343 ERC165Call(_, _) => None,344345 // Not sponsored346 AllowanceCross { .. } | BurnFrom { .. } | BurnFromCross { .. } | Repartition { .. } => {347 None348 }349350 TransferCross { .. } | TransferFromCross { .. } => {351 let RefungibleTokenHandle(handle, token_id) = token;352 let token_id = token_id.try_into().ok()?;353 withdraw_transfer::<T>(&handle, &who, &token_id)354 }355356 ApproveCross { .. } => {357 let RefungibleTokenHandle(handle, token_id) = token;358 let token_id = token_id.try_into().ok()?;359 withdraw_approve::<T>(&handle, who.as_sub(), &token_id)360 }361 }362 }363}364365mod erc1633 {366 use super::*;367368 pub fn call_sponsor<T>(369 call: ERC1633Call<T>,370 _token: RefungibleTokenHandle<T>,371 _who: &T::CrossAccountId,372 ) -> Option<()>373 where374 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,375 {376 use ERC1633Call::*;377378 match call {379 // Readonly380 ERC165Call(_, _) | ParentToken | ParentTokenId => None,381 }382 }383}1// 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//! Implements EVM sponsoring logic via TransactionValidityHack1819use core::convert::TryInto;20use pallet_common::CollectionHandle;21use pallet_evm::account::CrossAccountId;22use pallet_fungible::Config as FungibleConfig;23use pallet_refungible::Config as RefungibleConfig;24use pallet_nonfungible::Config as NonfungibleConfig;25use pallet_unique::Config as UniqueConfig;26use up_data_structs::{CreateItemData, CreateNftData, TokenId};2728use super::common;29use crate::runtime_common::sponsoring::*;3031use pallet_refungible::{32 erc::{33 ERC721BurnableCall, ERC721Call, ERC721EnumerableCall, ERC721MetadataCall,34 ERC721UniqueExtensionsCall, ERC721UniqueMintableCall, TokenPropertiesCall,35 UniqueRefungibleCall,36 },37 erc_token::{38 ERC1633Call, ERC20Call, ERC20UniqueExtensionsCall, RefungibleTokenHandle,39 UniqueRefungibleTokenCall,40 },41};4243pub fn call_sponsor<T>(44 call: UniqueRefungibleCall<T>,45 collection: CollectionHandle<T>,46 who: &T::CrossAccountId,47) -> Option<()>48where49 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,50{51 use UniqueRefungibleCall::*;5253 match call {54 // Readonly55 ERC165Call(_, _) => None,5657 ERC721Enumerable(call) => erc721::enumerable_call_sponsor(call, collection, who),58 ERC721Burnable(call) => erc721::burnable_call_sponsor(call, collection, who),59 ERC721Metadata(call) => erc721::metadata_call_sponsor(call, collection, who),60 Collection(call) => common::collection_call_sponsor(call, collection, who),61 ERC721(call) => erc721::call_sponsor(call, collection, who),62 ERC721UniqueExtensions(call) => {63 erc721::unique_extensions_call_sponsor(call, collection, who)64 }65 ERC721UniqueMintable(call) => erc721::unique_mintable_call_sponsor(call, collection, who),66 TokenProperties(call) => token_properties_call_sponsor(call, collection, who),67 }68}6970pub fn token_properties_call_sponsor<T>(71 call: TokenPropertiesCall<T>,72 collection: CollectionHandle<T>,73 who: &T::CrossAccountId,74) -> Option<()>75where76 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,77{78 use TokenPropertiesCall::*;7980 match call {81 // Readonly82 ERC165Call(_, _) | Property { .. } | TokenPropertyPermissions => None,8384 // Not sponsored85 SetTokenPropertyPermission { .. }86 | SetTokenPropertyPermissions { .. }87 | SetProperties { .. }88 | DeleteProperty { .. }89 | DeleteProperties { .. } => None,9091 SetProperty {92 token_id,93 key,94 value,95 ..96 } => {97 let token_id = TokenId::try_from(token_id).ok()?;98 withdraw_set_token_property::<T>(&collection, &who, &token_id, key.len() + value.len())99 }100 }101}102103pub fn token_call_sponsor<T>(104 call: UniqueRefungibleTokenCall<T>,105 token: RefungibleTokenHandle<T>,106 who: &T::CrossAccountId,107) -> Option<()>108where109 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,110{111 use UniqueRefungibleTokenCall::*;112113 match call {114 // Readonly115 ERC165Call(_, _) => None,116117 ERC20(call) => erc20::call_sponsor(call, token, who),118 ERC20UniqueExtensions(call) => erc20::unique_extensions_call_sponsor(call, token, who),119 ERC1633(call) => erc1633::call_sponsor(call, token, who),120 }121}122123mod erc721 {124 use super::*;125126 pub fn call_sponsor<T>(127 call: ERC721Call<T>,128 collection: CollectionHandle<T>,129 _who: &T::CrossAccountId,130 ) -> Option<()>131 where132 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,133 {134 use ERC721Call::*;135136 match call {137 // Readonly138 ERC165Call(_, _)139 | BalanceOf { .. }140 | OwnerOf { .. }141 | GetApproved { .. }142 | IsApprovedForAll { .. } => None,143144 // Not sponsored145 SafeTransferFromWithData { .. }146 | SafeTransferFrom { .. }147 | SetApprovalForAll { .. } => None,148149 TransferFrom { token_id, from, .. } => {150 let token_id = TokenId::try_from(token_id).ok()?;151 let from = T::CrossAccountId::from_eth(from);152 withdraw_transfer::<T>(&collection, &from, &token_id)153 }154155 // Not supported156 Approve { .. } => None,157 }158 }159160 pub fn enumerable_call_sponsor<T>(161 call: ERC721EnumerableCall<T>,162 _collection: CollectionHandle<T>,163 _who: &T::CrossAccountId,164 ) -> Option<()>165 where166 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,167 {168 use ERC721EnumerableCall::*;169170 match call {171 // Readonly172 ERC165Call(_, _) | TokenByIndex { .. } | TokenOfOwnerByIndex { .. } | TotalSupply => {173 None174 }175 }176 }177178 pub fn burnable_call_sponsor<T>(179 call: ERC721BurnableCall<T>,180 _collection: CollectionHandle<T>,181 _who: &T::CrossAccountId,182 ) -> Option<()>183 where184 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,185 {186 use ERC721BurnableCall::*;187188 match call {189 // Readonly190 ERC165Call(_, _) => None,191192 // Not sponsored193 Burn { .. } => None,194 }195 }196197 pub fn metadata_call_sponsor<T>(198 call: ERC721MetadataCall<T>,199 _collection: CollectionHandle<T>,200 _who: &T::CrossAccountId,201 ) -> Option<()>202 where203 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,204 {205 use ERC721MetadataCall::*;206207 match call {208 // Readonly209 ERC165Call(_, _) | NameProxy | SymbolProxy | TokenUri { .. } => None,210 }211 }212213 pub fn unique_extensions_call_sponsor<T>(214 call: ERC721UniqueExtensionsCall<T>,215 collection: CollectionHandle<T>,216 who: &T::CrossAccountId,217 ) -> Option<()>218 where219 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,220 {221 use ERC721UniqueExtensionsCall::*;222223 match call {224 // Readonly225 ERC165Call(_, _)226 | Name227 | Symbol228 | Description229 | CrossOwnerOf { .. }230 | OwnerOfCross { .. }231 | BalanceOfCross { .. }232 | Properties { .. }233 | NextTokenId234 | TokenContractAddress { .. }235 | CollectionHelperAddress => None,236237 // Not sponsored238 BurnFrom { .. }239 | BurnFromCross { .. }240 | MintBulk { .. }241 | MintBulkWithTokenUri { .. } => None,242243 MintCross { .. } => withdraw_create_item::<T>(244 &collection,245 &who,246 &CreateItemData::NFT(CreateNftData::default()),247 ),248249 TransferCross { token_id, .. }250 | TransferFromCross { token_id, .. }251 | Transfer { token_id, .. } => {252 let token_id = TokenId::try_from(token_id).ok()?;253 withdraw_transfer::<T>(&collection, &who, &token_id)254 }255 }256 }257258 pub fn unique_mintable_call_sponsor<T>(259 call: ERC721UniqueMintableCall<T>,260 collection: CollectionHandle<T>,261 who: &T::CrossAccountId,262 ) -> Option<()>263 where264 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,265 {266 use ERC721UniqueMintableCall::*;267268 match call {269 // Readonly270 ERC165Call(_, _) => None,271272 // Sponsored273 Mint { .. }274 | MintCheckId { .. }275 | MintWithTokenUri { .. }276 | MintWithTokenUriCheckId { .. } => withdraw_create_item::<T>(277 &collection,278 &who,279 &CreateItemData::NFT(CreateNftData::default()),280 ),281 }282 }283}284285/// Module for methods of refungible token286///287/// Existance of token should be checked before searching for sponsor288/// because RefungibleTokenHandle doesn't check token's existence upon creation289mod erc20 {290 use super::*;291292 pub fn call_sponsor<T>(293 call: ERC20Call<T>,294 token: RefungibleTokenHandle<T>,295 who: &T::CrossAccountId,296 ) -> Option<()>297 where298 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,299 {300 use ERC20Call::*;301302 match call {303 // Readonly304 ERC165Call(_, _)305 | Name306 | Symbol307 | TotalSupply308 | Decimals309 | BalanceOf { .. }310 | Allowance { .. } => None,311312 Transfer { .. } => {313 let RefungibleTokenHandle(handle, token_id) = token;314 let token_id = token_id.try_into().ok()?;315 withdraw_transfer::<T>(&handle, &who, &token_id)316 }317 TransferFrom { from, .. } => {318 let RefungibleTokenHandle(handle, token_id) = token;319 let token_id = token_id.try_into().ok()?;320 let from = T::CrossAccountId::from_eth(from);321 withdraw_transfer::<T>(&handle, &from, &token_id)322 }323 Approve { .. } => {324 let RefungibleTokenHandle(handle, token_id) = token;325 let token_id = token_id.try_into().ok()?;326 withdraw_approve::<T>(&handle, who.as_sub(), &token_id)327 }328 }329 }330331 pub fn unique_extensions_call_sponsor<T>(332 call: ERC20UniqueExtensionsCall<T>,333 token: RefungibleTokenHandle<T>,334 who: &T::CrossAccountId,335 ) -> Option<()>336 where337 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,338 {339 use ERC20UniqueExtensionsCall::*;340341 match call {342 // Readonly343 ERC165Call(_, _) => None,344345 // Not sponsored346 AllowanceCross { .. }347 | BalanceOfCross { .. }348 | BurnFrom { .. }349 | BurnFromCross { .. }350 | Repartition { .. } => None,351352 TransferCross { .. } | TransferFromCross { .. } => {353 let RefungibleTokenHandle(handle, token_id) = token;354 let token_id = token_id.try_into().ok()?;355 withdraw_transfer::<T>(&handle, &who, &token_id)356 }357358 ApproveCross { .. } => {359 let RefungibleTokenHandle(handle, token_id) = token;360 let token_id = token_id.try_into().ok()?;361 withdraw_approve::<T>(&handle, who.as_sub(), &token_id)362 }363 }364 }365}366367mod erc1633 {368 use super::*;369370 pub fn call_sponsor<T>(371 call: ERC1633Call<T>,372 _token: RefungibleTokenHandle<T>,373 _who: &T::CrossAccountId,374 ) -> Option<()>375 where376 T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig,377 {378 use ERC1633Call::*;379380 match call {381 // Readonly382 ERC165Call(_, _) | ParentToken | ParentTokenId => None,383 }384 }385}tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -130,6 +130,23 @@
{ "internalType": "uint256", "name": "sub", "type": "uint256" }
],
"internalType": "struct CrossAddress",
+ "name": "owner",
+ "type": "tuple"
+ }
+ ],
+ "name": "balanceOfCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct CrossAddress",
"name": "from",
"type": "tuple"
},
tests/src/eth/api/UniqueRefungibleToken.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungibleToken.sol
+++ b/tests/src/eth/api/UniqueRefungibleToken.sol
@@ -23,7 +23,7 @@
function parentTokenId() external view returns (uint256);
}
-/// @dev the ERC-165 identifier for this interface is 0x01d536fc
+/// @dev the ERC-165 identifier for this interface is 0xedd3a564
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @dev Function to check the amount of tokens that an owner allowed to a spender.
/// @param owner crossAddress The address which owns the funds.
@@ -60,6 +60,13 @@
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);
+ /// @notice Balance of account
+ /// @param owner An cross address for whom to query the balance
+ /// @return The number of fingibles owned by `owner`, possibly zero
+ /// @dev EVM selector for this function is: 0xec069398,
+ /// or in textual repr: balanceOfCross((address,uint256))
+ function balanceOfCross(CrossAddress memory owner) external view returns (uint256);
+
/// @dev Function that changes total amount of the tokens.
/// Throws if `msg.sender` doesn't owns all of the tokens.
/// @param amount New total amount of the tokens.
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -466,6 +466,21 @@
expect(await collection.getTokenBalance(tokenId, {Substrate: ownerSub.address})).to.be.equal(150n);
}
});
+
+ itEth('Check balanceOfCross()', async ({helper}) => {
+ const collection = await helper.rft.mintCollection(alice, {});
+ const owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
+ const {tokenId} = await collection.mintToken(alice, 200n, {Ethereum: owner.eth});
+ const tokenAddress = helper.ethAddress.fromTokenId(collection.collectionId, tokenId);
+ const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, owner.eth);
+
+ expect(BigInt(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})) === 200n).to.be.true;
+
+ for (let i = 1n; i < 100n; i++) {
+ await tokenContract.methods.repartition(i).send({from: owner.eth});
+ expect(BigInt(await tokenContract.methods.balanceOfCross(owner).call({from: owner.eth})) === i).to.be.true;
+ }
+ });
});
describe('Refungible: Fees', () => {