difftreelog
Merge pull request #853 from UniqueNetwork/fix/erc20
in: master
9 files changed
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -57,7 +57,7 @@
},
}
-#[solidity_interface(name = ERC20, events(ERC20Events))]
+#[solidity_interface(name = ERC20, events(ERC20Events), expect_selector = 0x942e8b22)]
impl<T: Config> FungibleHandle<T> {
fn name(&self) -> Result<String> {
Ok(decode_utf16(self.name.iter().copied())
@@ -134,11 +134,6 @@
let spender = T::CrossAccountId::from_eth(spender);
Ok(<Allowance<T>>::get((self.id, owner, spender)).into())
- }
-
- /// @notice Returns collection helper contract address
- fn collection_helper_address(&self) -> Result<Address> {
- Ok(T::ContractAddress::get())
}
}
@@ -312,6 +307,11 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
+
+ /// @notice Returns collection helper contract address
+ fn collection_helper_address(&self) -> Result<Address> {
+ Ok(T::ContractAddress::get())
+ }
}
#[solidity_interface(
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.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 you to work with collections.21/// @dev the ERC-165 identifier for this interface is 0x2a14cfd122contract Collection is Dummy, ERC165 {23 // /// Set collection property.24 // ///25 // /// @param key Property key.26 // /// @param value Propery value.27 // /// @dev EVM selector for this function is: 0x2f073f66,28 // /// or in textual repr: setCollectionProperty(string,bytes)29 // function setCollectionProperty(string memory key, bytes memory value) public {30 // require(false, stub_error);31 // key;32 // value;33 // dummy = 0;34 // }3536 /// Set collection properties.37 ///38 /// @param properties Vector of properties key/value pair.39 /// @dev EVM selector for this function is: 0x50b26b2a,40 /// or in textual repr: setCollectionProperties((string,bytes)[])41 function setCollectionProperties(Property[] memory properties) public {42 require(false, stub_error);43 properties;44 dummy = 0;45 }4647 // /// Delete collection property.48 // ///49 // /// @param key Property key.50 // /// @dev EVM selector for this function is: 0x7b7debce,51 // /// or in textual repr: deleteCollectionProperty(string)52 // function deleteCollectionProperty(string memory key) public {53 // require(false, stub_error);54 // key;55 // dummy = 0;56 // }5758 /// Delete collection properties.59 ///60 /// @param keys Properties keys.61 /// @dev EVM selector for this function is: 0xee206ee3,62 /// or in textual repr: deleteCollectionProperties(string[])63 function deleteCollectionProperties(string[] memory keys) public {64 require(false, stub_error);65 keys;66 dummy = 0;67 }6869 /// Get collection property.70 ///71 /// @dev Throws error if key not found.72 ///73 /// @param key Property key.74 /// @return bytes The property corresponding to the key.75 /// @dev EVM selector for this function is: 0xcf24fd6d,76 /// or in textual repr: collectionProperty(string)77 function collectionProperty(string memory key) public view returns (bytes memory) {78 require(false, stub_error);79 key;80 dummy;81 return hex"";82 }8384 /// Get collection properties.85 ///86 /// @param keys Properties keys. Empty keys for all propertyes.87 /// @return Vector of properties key/value pairs.88 /// @dev EVM selector for this function is: 0x285fb8e6,89 /// or in textual repr: collectionProperties(string[])90 function collectionProperties(string[] memory keys) public view returns (Property[] memory) {91 require(false, stub_error);92 keys;93 dummy;94 return new Property[](0);95 }9697 // /// Set the sponsor of the collection.98 // ///99 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.100 // ///101 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.102 // /// @dev EVM selector for this function is: 0x7623402e,103 // /// or in textual repr: setCollectionSponsor(address)104 // function setCollectionSponsor(address sponsor) public {105 // require(false, stub_error);106 // sponsor;107 // dummy = 0;108 // }109110 /// Set the sponsor of the collection.111 ///112 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.113 ///114 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.115 /// @dev EVM selector for this function is: 0x84a1d5a8,116 /// or in textual repr: setCollectionSponsorCross((address,uint256))117 function setCollectionSponsorCross(CrossAddress memory sponsor) public {118 require(false, stub_error);119 sponsor;120 dummy = 0;121 }122123 /// Whether there is a pending sponsor.124 /// @dev EVM selector for this function is: 0x058ac185,125 /// or in textual repr: hasCollectionPendingSponsor()126 function hasCollectionPendingSponsor() public view returns (bool) {127 require(false, stub_error);128 dummy;129 return false;130 }131132 /// Collection sponsorship confirmation.133 ///134 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.135 /// @dev EVM selector for this function is: 0x3c50e97a,136 /// or in textual repr: confirmCollectionSponsorship()137 function confirmCollectionSponsorship() public {138 require(false, stub_error);139 dummy = 0;140 }141142 /// Remove collection sponsor.143 /// @dev EVM selector for this function is: 0x6e0326a3,144 /// or in textual repr: removeCollectionSponsor()145 function removeCollectionSponsor() public {146 require(false, stub_error);147 dummy = 0;148 }149150 /// Get current sponsor.151 ///152 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.153 /// @dev EVM selector for this function is: 0x6ec0a9f1,154 /// or in textual repr: collectionSponsor()155 function collectionSponsor() public view returns (CrossAddress memory) {156 require(false, stub_error);157 dummy;158 return CrossAddress(0x0000000000000000000000000000000000000000, 0);159 }160161 /// Get current collection limits.162 ///163 /// @return Array of collection limits164 /// @dev EVM selector for this function is: 0xf63bc572,165 /// or in textual repr: collectionLimits()166 function collectionLimits() public view returns (CollectionLimit[] memory) {167 require(false, stub_error);168 dummy;169 return new CollectionLimit[](0);170 }171172 /// Set limits for the collection.173 /// @dev Throws error if limit not found.174 /// @param limit Some limit.175 /// @dev EVM selector for this function is: 0x2316ee74,176 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))177 function setCollectionLimit(CollectionLimit memory limit) public {178 require(false, stub_error);179 limit;180 dummy = 0;181 }182183 /// Get contract address.184 /// @dev EVM selector for this function is: 0xf6b4dfb4,185 /// or in textual repr: contractAddress()186 function contractAddress() public view returns (address) {187 require(false, stub_error);188 dummy;189 return 0x0000000000000000000000000000000000000000;190 }191192 /// Add collection admin.193 /// @param newAdmin Cross account administrator address.194 /// @dev EVM selector for this function is: 0x859aa7d6,195 /// or in textual repr: addCollectionAdminCross((address,uint256))196 function addCollectionAdminCross(CrossAddress memory newAdmin) public {197 require(false, stub_error);198 newAdmin;199 dummy = 0;200 }201202 /// Remove collection admin.203 /// @param admin Cross account administrator address.204 /// @dev EVM selector for this function is: 0x6c0cd173,205 /// or in textual repr: removeCollectionAdminCross((address,uint256))206 function removeCollectionAdminCross(CrossAddress memory admin) public {207 require(false, stub_error);208 admin;209 dummy = 0;210 }211212 // /// Add collection admin.213 // /// @param newAdmin Address of the added administrator.214 // /// @dev EVM selector for this function is: 0x92e462c7,215 // /// or in textual repr: addCollectionAdmin(address)216 // function addCollectionAdmin(address newAdmin) public {217 // require(false, stub_error);218 // newAdmin;219 // dummy = 0;220 // }221222 // /// Remove collection admin.223 // ///224 // /// @param admin Address of the removed administrator.225 // /// @dev EVM selector for this function is: 0xfafd7b42,226 // /// or in textual repr: removeCollectionAdmin(address)227 // function removeCollectionAdmin(address admin) public {228 // require(false, stub_error);229 // admin;230 // dummy = 0;231 // }232233 /// Toggle accessibility of collection nesting.234 ///235 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'236 /// @dev EVM selector for this function is: 0x112d4586,237 /// or in textual repr: setCollectionNesting(bool)238 function setCollectionNesting(bool enable) public {239 require(false, stub_error);240 enable;241 dummy = 0;242 }243244 /// Toggle accessibility of collection nesting.245 ///246 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'247 /// @param collections Addresses of collections that will be available for nesting.248 /// @dev EVM selector for this function is: 0x64872396,249 /// or in textual repr: setCollectionNesting(bool,address[])250 function setCollectionNesting(bool enable, address[] memory collections) public {251 require(false, stub_error);252 enable;253 collections;254 dummy = 0;255 }256257 /// Returns nesting for a collection258 /// @dev EVM selector for this function is: 0x22d25bfe,259 /// or in textual repr: collectionNestingRestrictedCollectionIds()260 function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {261 require(false, stub_error);262 dummy;263 return CollectionNesting(false, new uint256[](0));264 }265266 /// Returns permissions for a collection267 /// @dev EVM selector for this function is: 0x5b2eaf4b,268 /// or in textual repr: collectionNestingPermissions()269 function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {270 require(false, stub_error);271 dummy;272 return new CollectionNestingPermission[](0);273 }274275 /// Set the collection access method.276 /// @param mode Access mode277 /// @dev EVM selector for this function is: 0x41835d4c,278 /// or in textual repr: setCollectionAccess(uint8)279 function setCollectionAccess(AccessMode mode) public {280 require(false, stub_error);281 mode;282 dummy = 0;283 }284285 /// Checks that user allowed to operate with collection.286 ///287 /// @param user User address to check.288 /// @dev EVM selector for this function is: 0x91b6df49,289 /// or in textual repr: allowlistedCross((address,uint256))290 function allowlistedCross(CrossAddress memory user) public view returns (bool) {291 require(false, stub_error);292 user;293 dummy;294 return false;295 }296297 // /// Add the user to the allowed list.298 // ///299 // /// @param user Address of a trusted user.300 // /// @dev EVM selector for this function is: 0x67844fe6,301 // /// or in textual repr: addToCollectionAllowList(address)302 // function addToCollectionAllowList(address user) public {303 // require(false, stub_error);304 // user;305 // dummy = 0;306 // }307308 /// Add user to allowed list.309 ///310 /// @param user User cross account address.311 /// @dev EVM selector for this function is: 0xa0184a3a,312 /// or in textual repr: addToCollectionAllowListCross((address,uint256))313 function addToCollectionAllowListCross(CrossAddress memory user) public {314 require(false, stub_error);315 user;316 dummy = 0;317 }318319 // /// Remove the user from the allowed list.320 // ///321 // /// @param user Address of a removed user.322 // /// @dev EVM selector for this function is: 0x85c51acb,323 // /// or in textual repr: removeFromCollectionAllowList(address)324 // function removeFromCollectionAllowList(address user) public {325 // require(false, stub_error);326 // user;327 // dummy = 0;328 // }329330 /// Remove user from allowed list.331 ///332 /// @param user User cross account address.333 /// @dev EVM selector for this function is: 0x09ba452a,334 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))335 function removeFromCollectionAllowListCross(CrossAddress memory user) public {336 require(false, stub_error);337 user;338 dummy = 0;339 }340341 /// Switch permission for minting.342 ///343 /// @param mode Enable if "true".344 /// @dev EVM selector for this function is: 0x00018e84,345 /// or in textual repr: setCollectionMintMode(bool)346 function setCollectionMintMode(bool mode) public {347 require(false, stub_error);348 mode;349 dummy = 0;350 }351352 // /// Check that account is the owner or admin of the collection353 // ///354 // /// @param user account to verify355 // /// @return "true" if account is the owner or admin356 // /// @dev EVM selector for this function is: 0x9811b0c7,357 // /// or in textual repr: isOwnerOrAdmin(address)358 // function isOwnerOrAdmin(address user) public view returns (bool) {359 // require(false, stub_error);360 // user;361 // dummy;362 // return false;363 // }364365 /// Check that account is the owner or admin of the collection366 ///367 /// @param user User cross account to verify368 /// @return "true" if account is the owner or admin369 /// @dev EVM selector for this function is: 0x3e75a905,370 /// or in textual repr: isOwnerOrAdminCross((address,uint256))371 function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {372 require(false, stub_error);373 user;374 dummy;375 return false;376 }377378 /// Returns collection type379 ///380 /// @return `Fungible` or `NFT` or `ReFungible`381 /// @dev EVM selector for this function is: 0xd34b55b8,382 /// or in textual repr: uniqueCollectionType()383 function uniqueCollectionType() public view returns (string memory) {384 require(false, stub_error);385 dummy;386 return "";387 }388389 /// Get collection owner.390 ///391 /// @return Tuble with sponsor address and his substrate mirror.392 /// If address is canonical then substrate mirror is zero and vice versa.393 /// @dev EVM selector for this function is: 0xdf727d3b,394 /// or in textual repr: collectionOwner()395 function collectionOwner() public view returns (CrossAddress memory) {396 require(false, stub_error);397 dummy;398 return CrossAddress(0x0000000000000000000000000000000000000000, 0);399 }400401 // /// Changes collection owner to another account402 // ///403 // /// @dev Owner can be changed only by current owner404 // /// @param newOwner new owner account405 // /// @dev EVM selector for this function is: 0x4f53e226,406 // /// or in textual repr: changeCollectionOwner(address)407 // function changeCollectionOwner(address newOwner) public {408 // require(false, stub_error);409 // newOwner;410 // dummy = 0;411 // }412413 /// Get collection administrators414 ///415 /// @return Vector of tuples with admins address and his substrate mirror.416 /// If address is canonical then substrate mirror is zero and vice versa.417 /// @dev EVM selector for this function is: 0x5813216b,418 /// or in textual repr: collectionAdmins()419 function collectionAdmins() public view returns (CrossAddress[] memory) {420 require(false, stub_error);421 dummy;422 return new CrossAddress[](0);423 }424425 /// Changes collection owner to another account426 ///427 /// @dev Owner can be changed only by current owner428 /// @param newOwner new owner cross account429 /// @dev EVM selector for this function is: 0x6496c497,430 /// or in textual repr: changeCollectionOwnerCross((address,uint256))431 function changeCollectionOwnerCross(CrossAddress memory newOwner) public {432 require(false, stub_error);433 newOwner;434 dummy = 0;435 }436}437438/// Cross account struct439struct CrossAddress {440 address eth;441 uint256 sub;442}443444/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).445enum AccessMode {446 /// Access grant for owner and admins. Used as default.447 Normal,448 /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.449 AllowList450}451452/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.453struct CollectionNestingPermission {454 CollectionPermissionField field;455 bool value;456}457458/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.459enum CollectionPermissionField {460 /// Owner of token can nest tokens under it.461 TokenOwner,462 /// Admin of token collection can nest tokens under token.463 CollectionAdmin464}465466/// Nested collections.467struct CollectionNesting {468 bool token_owner;469 uint256[] ids;470}471472/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.473struct CollectionLimit {474 CollectionLimitField field;475 OptionUint256 value;476}477478/// Optional value479struct OptionUint256 {480 /// Shows the status of accessibility of value481 bool status;482 /// Actual value if `status` is true483 uint256 value;484}485486/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.487enum CollectionLimitField {488 /// How many tokens can a user have on one account.489 AccountTokenOwnership,490 /// How many bytes of data are available for sponsorship.491 SponsoredDataSize,492 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]493 SponsoredDataRateLimit,494 /// How many tokens can be mined into this collection.495 TokenLimit,496 /// Timeouts for transfer sponsoring.497 SponsorTransferTimeout,498 /// Timeout for sponsoring an approval in passed blocks.499 SponsorApproveTimeout,500 /// Whether the collection owner of the collection can send tokens (which belong to other users).501 OwnerCanTransfer,502 /// Can the collection owner burn other people's tokens.503 OwnerCanDestroy,504 /// Is it possible to send tokens from this collection between users.505 TransferEnabled506}507508/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).509struct Property {510 string key;511 bytes value;512}513514/// @dev the ERC-165 identifier for this interface is 0x65789571515contract ERC20UniqueExtensions is Dummy, ERC165 {516 /// @notice A description for the collection.517 /// @dev EVM selector for this function is: 0x7284e416,518 /// or in textual repr: description()519 function description() public view returns (string memory) {520 require(false, stub_error);521 dummy;522 return "";523 }524525 /// @dev EVM selector for this function is: 0x269e6158,526 /// or in textual repr: mintCross((address,uint256),uint256)527 function mintCross(CrossAddress memory to, uint256 amount) public returns (bool) {528 require(false, stub_error);529 to;530 amount;531 dummy = 0;532 return false;533 }534535 /// @dev EVM selector for this function is: 0x0ecd0ab0,536 /// or in textual repr: approveCross((address,uint256),uint256)537 function approveCross(CrossAddress memory spender, uint256 amount) public returns (bool) {538 require(false, stub_error);539 spender;540 amount;541 dummy = 0;542 return false;543 }544545 // /// Burn tokens from account546 // /// @dev Function that burns an `amount` of the tokens of a given account,547 // /// deducting from the sender's allowance for said account.548 // /// @param from The account whose tokens will be burnt.549 // /// @param amount The amount that will be burnt.550 // /// @dev EVM selector for this function is: 0x79cc6790,551 // /// or in textual repr: burnFrom(address,uint256)552 // function burnFrom(address from, uint256 amount) public returns (bool) {553 // require(false, stub_error);554 // from;555 // amount;556 // dummy = 0;557 // return false;558 // }559560 /// Burn tokens from account561 /// @dev Function that burns an `amount` of the tokens of a given account,562 /// deducting from the sender's allowance for said account.563 /// @param from The account whose tokens will be burnt.564 /// @param amount The amount that will be burnt.565 /// @dev EVM selector for this function is: 0xbb2f5a58,566 /// or in textual repr: burnFromCross((address,uint256),uint256)567 function burnFromCross(CrossAddress memory from, uint256 amount) public returns (bool) {568 require(false, stub_error);569 from;570 amount;571 dummy = 0;572 return false;573 }574575 /// Mint tokens for multiple accounts.576 /// @param amounts array of pairs of account address and amount577 /// @dev EVM selector for this function is: 0x1acf2d55,578 /// or in textual repr: mintBulk((address,uint256)[])579 function mintBulk(Tuple9[] memory amounts) public returns (bool) {580 require(false, stub_error);581 amounts;582 dummy = 0;583 return false;584 }585586 /// @dev EVM selector for this function is: 0x2ada85ff,587 /// or in textual repr: transferCross((address,uint256),uint256)588 function transferCross(CrossAddress memory to, uint256 amount) public returns (bool) {589 require(false, stub_error);590 to;591 amount;592 dummy = 0;593 return false;594 }595596 /// @dev EVM selector for this function is: 0xd5cf430b,597 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)598 function transferFromCross(599 CrossAddress memory from,600 CrossAddress memory to,601 uint256 amount602 ) public returns (bool) {603 require(false, stub_error);604 from;605 to;606 amount;607 dummy = 0;608 return false;609 }610611 /// @notice Returns collection helper contract address612 /// @dev EVM selector for this function is: 0x1896cce6,613 /// or in textual repr: collectionHelperAddress()614 function collectionHelperAddress() public view returns (address) {615 require(false, stub_error);616 dummy;617 return 0x0000000000000000000000000000000000000000;618 }619}620621/// @dev anonymous struct622struct Tuple9 {623 address field_0;624 uint256 field_1;625}626627/// @dev the ERC-165 identifier for this interface is 0x40c10f19628contract ERC20Mintable is Dummy, ERC165 {629 /// Mint tokens for `to` account.630 /// @param to account that will receive minted tokens631 /// @param amount amount of tokens to mint632 /// @dev EVM selector for this function is: 0x40c10f19,633 /// or in textual repr: mint(address,uint256)634 function mint(address to, uint256 amount) public returns (bool) {635 require(false, stub_error);636 to;637 amount;638 dummy = 0;639 return false;640 }641}642643/// @dev inlined interface644contract ERC20Events {645 event Transfer(address indexed from, address indexed to, uint256 value);646 event Approval(address indexed owner, address indexed spender, uint256 value);647}648649/// @dev the ERC-165 identifier for this interface is 0x942e8b22650contract ERC20 is Dummy, ERC165, ERC20Events {651 /// @dev EVM selector for this function is: 0x06fdde03,652 /// or in textual repr: name()653 function name() public view returns (string memory) {654 require(false, stub_error);655 dummy;656 return "";657 }658659 /// @dev EVM selector for this function is: 0x95d89b41,660 /// or in textual repr: symbol()661 function symbol() public view returns (string memory) {662 require(false, stub_error);663 dummy;664 return "";665 }666667 /// @dev EVM selector for this function is: 0x18160ddd,668 /// or in textual repr: totalSupply()669 function totalSupply() public view returns (uint256) {670 require(false, stub_error);671 dummy;672 return 0;673 }674675 /// @dev EVM selector for this function is: 0x313ce567,676 /// or in textual repr: decimals()677 function decimals() public view returns (uint8) {678 require(false, stub_error);679 dummy;680 return 0;681 }682683 /// @dev EVM selector for this function is: 0x70a08231,684 /// or in textual repr: balanceOf(address)685 function balanceOf(address owner) public view returns (uint256) {686 require(false, stub_error);687 owner;688 dummy;689 return 0;690 }691692 /// @dev EVM selector for this function is: 0xa9059cbb,693 /// or in textual repr: transfer(address,uint256)694 function transfer(address to, uint256 amount) public returns (bool) {695 require(false, stub_error);696 to;697 amount;698 dummy = 0;699 return false;700 }701702 /// @dev EVM selector for this function is: 0x23b872dd,703 /// or in textual repr: transferFrom(address,address,uint256)704 function transferFrom(705 address from,706 address to,707 uint256 amount708 ) public returns (bool) {709 require(false, stub_error);710 from;711 to;712 amount;713 dummy = 0;714 return false;715 }716717 /// @dev EVM selector for this function is: 0x095ea7b3,718 /// or in textual repr: approve(address,uint256)719 function approve(address spender, uint256 amount) public returns (bool) {720 require(false, stub_error);721 spender;722 amount;723 dummy = 0;724 return false;725 }726727 /// @dev EVM selector for this function is: 0xdd62ed3e,728 /// or in textual repr: allowance(address,address)729 function allowance(address owner, address spender) public view returns (uint256) {730 require(false, stub_error);731 owner;732 spender;733 dummy;734 return 0;735 }736}737738contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -353,7 +353,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x7dee5997
+/// @dev the ERC-165 identifier for this interface is 0x65789571
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
@@ -403,6 +403,11 @@
CrossAddress memory to,
uint256 amount
) external returns (bool);
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() external view returns (address);
}
/// @dev anonymous struct
@@ -427,7 +432,7 @@
event Approval(address indexed owner, address indexed spender, uint256 value);
}
-/// @dev the ERC-165 identifier for this interface is 0x8cb847c4
+/// @dev the ERC-165 identifier for this interface is 0x942e8b22
interface ERC20 is Dummy, ERC165, ERC20Events {
/// @dev EVM selector for this function is: 0x06fdde03,
/// or in textual repr: name()
@@ -468,11 +473,6 @@
/// @dev EVM selector for this function is: 0xdd62ed3e,
/// or in textual repr: allowance(address,address)
function allowance(address owner, address spender) external view returns (uint256);
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() external view returns (address);
}
interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}