difftreelog
misk: update stubs
in: master
7 files changed
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -106,6 +106,7 @@
/// @title A contract that allows you to work with collections.
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev the ERC-165 identifier for this interface is 0xb3152af3
=======
/// @dev the ERC-165 identifier for this interface is 0x674be726
@@ -113,6 +114,9 @@
=======
/// @dev the ERC-165 identifier for this interface is 0x943ee094
>>>>>>> fix: after rebase
+=======
+/// @dev the ERC-165 identifier for this interface is 0xefe988e0
+>>>>>>> misk: update stubs
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -130,7 +134,7 @@
/// Set collection properties.
///
/// @param properties Vector of properties key/value pair.
- /// @dev EVM selector for this function is: 0xf90c1ce9,
+ /// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
function setCollectionProperties(Tuple21[] memory properties) public {
require(false, stub_error);
@@ -152,7 +156,7 @@
/// Delete collection properties.
///
/// @param keys Properties keys.
- /// @dev EVM selector for this function is: 0x56d4684a,
+ /// @dev EVM selector for this function is: 0xee206ee3,
/// or in textual repr: deleteCollectionProperties(string[])
function deleteCollectionProperties(string[] memory keys) public {
require(false, stub_error);
@@ -179,7 +183,7 @@
///
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- /// @dev EVM selector for this function is: 0x5cad7311,
+ /// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
function collectionProperties(string[] memory keys) public view returns (Tuple21[] memory) {
require(false, stub_error);
@@ -206,9 +210,16 @@
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
///
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x403e96a7,
/// or in textual repr: setCollectionSponsorCross((address,uint256))
function setCollectionSponsorCross(Tuple6 memory sponsor) public {
+=======
+ /// @dev EVM selector for this function is: 0x84a1d5a8,
+ /// or in textual repr: setCollectionSponsorCross(EthCrossAccount)
+ /// or in the expanded repr: setCollectionSponsorCross((address,uint256))
+ function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
sponsor;
dummy = 0;
@@ -248,6 +259,7 @@
/// or in textual repr: collectionSponsor()
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
function collectionSponsor() public view returns (Tuple6 memory) {
require(false, stub_error);
dummy;
@@ -264,6 +276,12 @@
dummy;
return Tuple8(0x0000000000000000000000000000000000000000, 0);
>>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+ function collectionSponsor() public view returns (Tuple24 memory) {
+ require(false, stub_error);
+ dummy;
+ return Tuple24(0x0000000000000000000000000000000000000000, 0);
+>>>>>>> misk: update stubs
}
/// Set limits for the collection.
@@ -312,9 +330,16 @@
/// Add collection admin.
/// @param newAdmin Cross account administrator address.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x62e3c7c2,
/// or in textual repr: addCollectionAdminCross((address,uint256))
function addCollectionAdminCross(Tuple6 memory newAdmin) public {
+=======
+ /// @dev EVM selector for this function is: 0x859aa7d6,
+ /// or in textual repr: addCollectionAdminCross(EthCrossAccount)
+ /// or in the expanded repr: addCollectionAdminCross((address,uint256))
+ function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
newAdmin;
dummy = 0;
@@ -322,9 +347,16 @@
/// Remove collection admin.
/// @param admin Cross account administrator address.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x810d1503,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
function removeCollectionAdminCross(Tuple6 memory admin) public {
+=======
+ /// @dev EVM selector for this function is: 0x6c0cd173,
+ /// or in textual repr: removeCollectionAdminCross(EthCrossAccount)
+ /// or in the expanded repr: removeCollectionAdminCross((address,uint256))
+ function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
admin;
dummy = 0;
@@ -366,7 +398,7 @@
///
/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'
/// @param collections Addresses of collections that will be available for nesting.
- /// @dev EVM selector for this function is: 0x112d4586,
+ /// @dev EVM selector for this function is: 0x64872396,
/// or in textual repr: setCollectionNesting(bool,address[])
function setCollectionNesting(bool enable, address[] memory collections) public {
require(false, stub_error);
@@ -413,9 +445,16 @@
/// Add user to allowed list.
///
/// @param user User cross account address.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xf074da88,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
function addToCollectionAllowListCross(Tuple6 memory user) public {
+=======
+ /// @dev EVM selector for this function is: 0xa0184a3a,
+ /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount)
+ /// or in the expanded repr: addToCollectionAllowListCross((address,uint256))
+ function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
user;
dummy = 0;
@@ -435,9 +474,16 @@
/// Remove user from allowed list.
///
/// @param user User cross account address.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xc00df45c,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
function removeFromCollectionAllowListCross(Tuple6 memory user) public {
+=======
+ /// @dev EVM selector for this function is: 0x09ba452a,
+ /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount)
+ /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256))
+ function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
user;
dummy = 0;
@@ -471,9 +517,16 @@
///
/// @param user User cross account to verify
/// @return "true" if account is the owner or admin
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x5aba3351,
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {
+=======
+ /// @dev EVM selector for this function is: 0x3e75a905,
+ /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount)
+ /// or in the expanded repr: isOwnerOrAdminCross((address,uint256))
+ function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+>>>>>>> misk: update stubs
require(false, stub_error);
user;
dummy;
@@ -499,6 +552,7 @@
/// or in textual repr: collectionOwner()
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
function collectionOwner() public view returns (Tuple6 memory) {
require(false, stub_error);
dummy;
@@ -515,6 +569,12 @@
dummy;
return Tuple8(0x0000000000000000000000000000000000000000, 0);
>>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+ function collectionOwner() public view returns (EthCrossAccount memory) {
+ require(false, stub_error);
+ dummy;
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+>>>>>>> misk: update stubs
}
/// Changes collection owner to another account
@@ -535,19 +595,33 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
+<<<<<<< HEAD
function collectionAdmins() public view returns (Tuple6[] memory) {
require(false, stub_error);
dummy;
return new Tuple6[](0);
+=======
+ function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+ require(false, stub_error);
+ dummy;
+ return new EthCrossAccount[](0);
+>>>>>>> misk: update stubs
}
/// Changes collection owner to another account
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner cross account
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xbdff793d,
/// or in textual repr: setOwnerCross((address,uint256))
function setOwnerCross(Tuple6 memory newOwner) public {
+=======
+ /// @dev EVM selector for this function is: 0xe5c9913f,
+ /// or in textual repr: setOwnerCross(EthCrossAccount)
+ /// or in the expanded repr: setOwnerCross((address,uint256))
+ function setOwnerCross(EthCrossAccount memory newOwner) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
newOwner;
dummy = 0;
@@ -556,12 +630,24 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple19 {
+=======
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
+}
+
+/// @dev anonymous struct
+struct Tuple24 {
+>>>>>>> misk: update stubs
address field_0;
uint256 field_1;
}
+<<<<<<< HEAD
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -608,6 +694,8 @@
=======
>>>>>>> feat: Add custum signature with unlimited nesting.
=======
+=======
+>>>>>>> misk: update stubs
/// @dev anonymous struct
struct Tuple21 {
string field_0;
@@ -717,10 +805,14 @@
/// @title Unique extensions for ERC721.
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev the ERC-165 identifier for this interface is 0x244543ee
=======
/// @dev the ERC-165 identifier for this interface is 0xcc97cb35
>>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+/// @dev the ERC-165 identifier for this interface is 0xb76006ac
+>>>>>>> misk: update stubs
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -746,9 +838,16 @@
/// operator of the current owner.
/// @param approved The new substrate address approved NFT controller
/// @param tokenId The NFT to approve
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x106fdb59,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(Tuple6 memory approved, uint256 tokenId) public {
+=======
+ /// @dev EVM selector for this function is: 0x0ecd0ab0,
+ /// or in textual repr: approveCross(EthCrossAccount,uint256)
+ /// or in the expanded repr: approveCross((address,uint256),uint256)
+ function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
approved;
tokenId;
@@ -777,6 +876,7 @@
/// @param tokenId The NFT to transfer
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)
+ /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
<<<<<<< HEAD
Tuple6 memory from,
@@ -815,9 +915,16 @@
/// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
/// @param from The current owner of the NFT
/// @param tokenId The NFT to transfer
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xa8106d4a,
/// or in textual repr: burnFromCross((address,uint256),uint256)
function burnFromCross(Tuple6 memory from, uint256 tokenId) public {
+=======
+ /// @dev EVM selector for this function is: 0xbb2f5a58,
+ /// or in textual repr: burnFromCross(EthCrossAccount,uint256)
+ /// or in the expanded repr: burnFromCross((address,uint256),uint256)
+ function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+>>>>>>> misk: update stubs
require(false, stub_error);
from;
tokenId;
@@ -873,7 +980,7 @@
/// should be obtained with `nextTokenId` method
/// @param to The new owner
/// @param tokenIds IDs of the minted NFTs
- /// @dev EVM selector for this function is: 0xf9d9a5a3,
+ /// @dev EVM selector for this function is: 0x44a9945e,
/// or in textual repr: mintBulk(address,uint256[])
function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {
require(false, stub_error);
@@ -888,7 +995,7 @@
/// numbers and first number should be obtained with `nextTokenId` method
/// @param to The new owner
/// @param tokens array of pairs of token ID and token URI for minted tokens
- /// @dev EVM selector for this function is: 0xfd4e2a99,
+ /// @dev EVM selector for this function is: 0x36543006,
/// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) public returns (bool) {
require(false, stub_error);
@@ -907,6 +1014,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple6 {
address field_0;
@@ -925,6 +1033,8 @@
uint256 field_1;
}
+=======
+>>>>>>> misk: update stubs
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x780e9d63
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 0x55dba91922contract 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(32 string memory key,33 bool isMutable,34 bool collectionAdmin,35 bool tokenOwner36 ) public {37 require(false, stub_error);38 key;39 isMutable;40 collectionAdmin;41 tokenOwner;42 dummy = 0;43 }4445 /// @notice Set token property value.46 /// @dev Throws error if `msg.sender` has no permission to edit the property.47 /// @param tokenId ID of the token.48 /// @param key Property key.49 /// @param value Property value.50 /// @dev EVM selector for this function is: 0x1752d67b,51 /// or in textual repr: setProperty(uint256,string,bytes)52 function setProperty(53 uint256 tokenId,54 string memory key,55 bytes memory value56 ) public {57 require(false, stub_error);58 tokenId;59 key;60 value;61 dummy = 0;62 }6364 /// @notice Set token properties value.65 /// @dev Throws error if `msg.sender` has no permission to edit the property.66 /// @param tokenId ID of the token.67 /// @param properties settable properties68 /// @dev EVM selector for this function is: 0x14ed3a6e,69 /// or in textual repr: setProperties(uint256,(string,bytes)[])70 function setProperties(uint256 tokenId, Tuple19[] memory properties) public {71 require(false, stub_error);72 tokenId;73 properties;74 dummy = 0;75 }7677 /// @notice Delete token property value.78 /// @dev Throws error if `msg.sender` has no permission to edit the property.79 /// @param tokenId ID of the token.80 /// @param key Property key.81 /// @dev EVM selector for this function is: 0x066111d1,82 /// or in textual repr: deleteProperty(uint256,string)83 function deleteProperty(uint256 tokenId, string memory key) public {84 require(false, stub_error);85 tokenId;86 key;87 dummy = 0;88 }8990 /// @notice Get token property value.91 /// @dev Throws error if key not found92 /// @param tokenId ID of the token.93 /// @param key Property key.94 /// @return Property value bytes95 /// @dev EVM selector for this function is: 0x7228c327,96 /// or in textual repr: property(uint256,string)97 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {98 require(false, stub_error);99 tokenId;100 key;101 dummy;102 return hex"";103 }104}105106/// @title A contract that allows you to work with collections.107/// @dev the ERC-165 identifier for this interface is 0xb3152af3108contract Collection is Dummy, ERC165 {109 /// Set collection property.110 ///111 /// @param key Property key.112 /// @param value Propery value.113 /// @dev EVM selector for this function is: 0x2f073f66,114 /// or in textual repr: setCollectionProperty(string,bytes)115 function setCollectionProperty(string memory key, bytes memory value) public {116 require(false, stub_error);117 key;118 value;119 dummy = 0;120 }121122 /// Set collection properties.123 ///124 /// @param properties Vector of properties key/value pair.125 /// @dev EVM selector for this function is: 0x50b26b2a,126 /// or in textual repr: setCollectionProperties((string,bytes)[])127 function setCollectionProperties(Tuple19[] memory properties) public {128 require(false, stub_error);129 properties;130 dummy = 0;131 }132133 /// Delete collection property.134 ///135 /// @param key Property key.136 /// @dev EVM selector for this function is: 0x7b7debce,137 /// or in textual repr: deleteCollectionProperty(string)138 function deleteCollectionProperty(string memory key) public {139 require(false, stub_error);140 key;141 dummy = 0;142 }143144 /// Delete collection properties.145 ///146 /// @param keys Properties keys.147 /// @dev EVM selector for this function is: 0xee206ee3,148 /// or in textual repr: deleteCollectionProperties(string[])149 function deleteCollectionProperties(string[] memory keys) public {150 require(false, stub_error);151 keys;152 dummy = 0;153 }154155 /// Get collection property.156 ///157 /// @dev Throws error if key not found.158 ///159 /// @param key Property key.160 /// @return bytes The property corresponding to the key.161 /// @dev EVM selector for this function is: 0xcf24fd6d,162 /// or in textual repr: collectionProperty(string)163 function collectionProperty(string memory key) public view returns (bytes memory) {164 require(false, stub_error);165 key;166 dummy;167 return hex"";168 }169170 /// Get collection properties.171 ///172 /// @param keys Properties keys. Empty keys for all propertyes.173 /// @return Vector of properties key/value pairs.174 /// @dev EVM selector for this function is: 0x285fb8e6,175 /// or in textual repr: collectionProperties(string[])176 function collectionProperties(string[] memory keys) public view returns (Tuple19[] memory) {177 require(false, stub_error);178 keys;179 dummy;180 return new Tuple19[](0);181 }182183 /// Set the sponsor of the collection.184 ///185 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.186 ///187 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.188 /// @dev EVM selector for this function is: 0x7623402e,189 /// or in textual repr: setCollectionSponsor(address)190 function setCollectionSponsor(address sponsor) public {191 require(false, stub_error);192 sponsor;193 dummy = 0;194 }195196 /// Set the sponsor of the collection.197 ///198 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.199 ///200 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.201 /// @dev EVM selector for this function is: 0x84a1d5a8,202 /// or in textual repr: setCollectionSponsorCross((address,uint256))203 function setCollectionSponsorCross(Tuple6 memory sponsor) public {204 require(false, stub_error);205 sponsor;206 dummy = 0;207 }208209 /// Whether there is a pending sponsor.210 /// @dev EVM selector for this function is: 0x058ac185,211 /// or in textual repr: hasCollectionPendingSponsor()212 function hasCollectionPendingSponsor() public view returns (bool) {213 require(false, stub_error);214 dummy;215 return false;216 }217218 /// Collection sponsorship confirmation.219 ///220 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.221 /// @dev EVM selector for this function is: 0x3c50e97a,222 /// or in textual repr: confirmCollectionSponsorship()223 function confirmCollectionSponsorship() public {224 require(false, stub_error);225 dummy = 0;226 }227228 /// Remove collection sponsor.229 /// @dev EVM selector for this function is: 0x6e0326a3,230 /// or in textual repr: removeCollectionSponsor()231 function removeCollectionSponsor() public {232 require(false, stub_error);233 dummy = 0;234 }235236 /// Get current sponsor.237 ///238 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.239 /// @dev EVM selector for this function is: 0x6ec0a9f1,240 /// or in textual repr: collectionSponsor()241 function collectionSponsor() public view returns (Tuple6 memory) {242 require(false, stub_error);243 dummy;244 return Tuple6(0x0000000000000000000000000000000000000000, 0);245 }246247 /// Set limits for the collection.248 /// @dev Throws error if limit not found.249 /// @param limit Name of the limit. Valid names:250 /// "accountTokenOwnershipLimit",251 /// "sponsoredDataSize",252 /// "sponsoredDataRateLimit",253 /// "tokenLimit",254 /// "sponsorTransferTimeout",255 /// "sponsorApproveTimeout"256 /// @param value Value of the limit.257 /// @dev EVM selector for this function is: 0x6a3841db,258 /// or in textual repr: setCollectionLimit(string,uint32)259 function setCollectionLimit(string memory limit, uint32 value) public {260 require(false, stub_error);261 limit;262 value;263 dummy = 0;264 }265266 /// Set limits for the collection.267 /// @dev Throws error if limit not found.268 /// @param limit Name of the limit. Valid names:269 /// "ownerCanTransfer",270 /// "ownerCanDestroy",271 /// "transfersEnabled"272 /// @param value Value of the limit.273 /// @dev EVM selector for this function is: 0x993b7fba,274 /// or in textual repr: setCollectionLimit(string,bool)275 function setCollectionLimit(string memory limit, bool value) public {276 require(false, stub_error);277 limit;278 value;279 dummy = 0;280 }281282 /// Get contract address.283 /// @dev EVM selector for this function is: 0xf6b4dfb4,284 /// or in textual repr: contractAddress()285 function contractAddress() public view returns (address) {286 require(false, stub_error);287 dummy;288 return 0x0000000000000000000000000000000000000000;289 }290291 /// Add collection admin.292 /// @param newAdmin Cross account administrator address.293 /// @dev EVM selector for this function is: 0x859aa7d6,294 /// or in textual repr: addCollectionAdminCross((address,uint256))295 function addCollectionAdminCross(Tuple6 memory newAdmin) public {296 require(false, stub_error);297 newAdmin;298 dummy = 0;299 }300301 /// Remove collection admin.302 /// @param admin Cross account administrator address.303 /// @dev EVM selector for this function is: 0x6c0cd173,304 /// or in textual repr: removeCollectionAdminCross((address,uint256))305 function removeCollectionAdminCross(Tuple6 memory admin) public {306 require(false, stub_error);307 admin;308 dummy = 0;309 }310311 /// Add collection admin.312 /// @param newAdmin Address of the added administrator.313 /// @dev EVM selector for this function is: 0x92e462c7,314 /// or in textual repr: addCollectionAdmin(address)315 function addCollectionAdmin(address newAdmin) public {316 require(false, stub_error);317 newAdmin;318 dummy = 0;319 }320321 /// Remove collection admin.322 ///323 /// @param admin Address of the removed administrator.324 /// @dev EVM selector for this function is: 0xfafd7b42,325 /// or in textual repr: removeCollectionAdmin(address)326 function removeCollectionAdmin(address admin) public {327 require(false, stub_error);328 admin;329 dummy = 0;330 }331332 /// Toggle accessibility of collection nesting.333 ///334 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'335 /// @dev EVM selector for this function is: 0x112d4586,336 /// or in textual repr: setCollectionNesting(bool)337 function setCollectionNesting(bool enable) public {338 require(false, stub_error);339 enable;340 dummy = 0;341 }342343 /// Toggle accessibility of collection nesting.344 ///345 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'346 /// @param collections Addresses of collections that will be available for nesting.347 /// @dev EVM selector for this function is: 0x64872396,348 /// or in textual repr: setCollectionNesting(bool,address[])349 function setCollectionNesting(bool enable, address[] memory collections) public {350 require(false, stub_error);351 enable;352 collections;353 dummy = 0;354 }355356 /// Set the collection access method.357 /// @param mode Access mode358 /// 0 for Normal359 /// 1 for AllowList360 /// @dev EVM selector for this function is: 0x41835d4c,361 /// or in textual repr: setCollectionAccess(uint8)362 function setCollectionAccess(uint8 mode) public {363 require(false, stub_error);364 mode;365 dummy = 0;366 }367368 /// Checks that user allowed to operate with collection.369 ///370 /// @param user User address to check.371 /// @dev EVM selector for this function is: 0xd63a8e11,372 /// or in textual repr: allowed(address)373 function allowed(address user) public view returns (bool) {374 require(false, stub_error);375 user;376 dummy;377 return false;378 }379380 /// Add the user to the allowed list.381 ///382 /// @param user Address of a trusted user.383 /// @dev EVM selector for this function is: 0x67844fe6,384 /// or in textual repr: addToCollectionAllowList(address)385 function addToCollectionAllowList(address user) public {386 require(false, stub_error);387 user;388 dummy = 0;389 }390391 /// Add user to allowed list.392 ///393 /// @param user User cross account address.394 /// @dev EVM selector for this function is: 0xa0184a3a,395 /// or in textual repr: addToCollectionAllowListCross((address,uint256))396 function addToCollectionAllowListCross(Tuple6 memory user) public {397 require(false, stub_error);398 user;399 dummy = 0;400 }401402 /// Remove the user from the allowed list.403 ///404 /// @param user Address of a removed user.405 /// @dev EVM selector for this function is: 0x85c51acb,406 /// or in textual repr: removeFromCollectionAllowList(address)407 function removeFromCollectionAllowList(address user) public {408 require(false, stub_error);409 user;410 dummy = 0;411 }412413 /// Remove user from allowed list.414 ///415 /// @param user User cross account address.416 /// @dev EVM selector for this function is: 0x09ba452a,417 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))418 function removeFromCollectionAllowListCross(Tuple6 memory user) public {419 require(false, stub_error);420 user;421 dummy = 0;422 }423424 /// Switch permission for minting.425 ///426 /// @param mode Enable if "true".427 /// @dev EVM selector for this function is: 0x00018e84,428 /// or in textual repr: setCollectionMintMode(bool)429 function setCollectionMintMode(bool mode) public {430 require(false, stub_error);431 mode;432 dummy = 0;433 }434435 /// Check that account is the owner or admin of the collection436 ///437 /// @param user account to verify438 /// @return "true" if account is the owner or admin439 /// @dev EVM selector for this function is: 0x9811b0c7,440 /// or in textual repr: isOwnerOrAdmin(address)441 function isOwnerOrAdmin(address user) public view returns (bool) {442 require(false, stub_error);443 user;444 dummy;445 return false;446 }447448 /// Check that account is the owner or admin of the collection449 ///450 /// @param user User cross account to verify451 /// @return "true" if account is the owner or admin452 /// @dev EVM selector for this function is: 0x3e75a905,453 /// or in textual repr: isOwnerOrAdminCross((address,uint256))454 function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {455 require(false, stub_error);456 user;457 dummy;458 return false;459 }460461 /// Returns collection type462 ///463 /// @return `Fungible` or `NFT` or `ReFungible`464 /// @dev EVM selector for this function is: 0xd34b55b8,465 /// or in textual repr: uniqueCollectionType()466 function uniqueCollectionType() public view returns (string memory) {467 require(false, stub_error);468 dummy;469 return "";470 }471472 /// Get collection owner.473 ///474 /// @return Tuble with sponsor address and his substrate mirror.475 /// If address is canonical then substrate mirror is zero and vice versa.476 /// @dev EVM selector for this function is: 0xdf727d3b,477 /// or in textual repr: collectionOwner()478 function collectionOwner() public view returns (Tuple6 memory) {479 require(false, stub_error);480 dummy;481 return Tuple6(0x0000000000000000000000000000000000000000, 0);482 }483484 /// Changes collection owner to another account485 ///486 /// @dev Owner can be changed only by current owner487 /// @param newOwner new owner account488 /// @dev EVM selector for this function is: 0x4f53e226,489 /// or in textual repr: changeCollectionOwner(address)490 function changeCollectionOwner(address newOwner) public {491 require(false, stub_error);492 newOwner;493 dummy = 0;494 }495496 /// Get collection administrators497 ///498 /// @return Vector of tuples with admins address and his substrate mirror.499 /// If address is canonical then substrate mirror is zero and vice versa.500 /// @dev EVM selector for this function is: 0x5813216b,501 /// or in textual repr: collectionAdmins()502 function collectionAdmins() public view returns (Tuple6[] memory) {503 require(false, stub_error);504 dummy;505 return new Tuple6[](0);506 }507508 /// Changes collection owner to another account509 ///510 /// @dev Owner can be changed only by current owner511 /// @param newOwner new owner cross account512 /// @dev EVM selector for this function is: 0xe5c9913f,513 /// or in textual repr: setOwnerCross((address,uint256))514 function setOwnerCross(Tuple6 memory newOwner) public {515 require(false, stub_error);516 newOwner;517 dummy = 0;518 }519}520521/// @dev anonymous struct522struct Tuple19 {523 string field_0;524 bytes field_1;525}526527/// @dev the ERC-165 identifier for this interface is 0x5b5e139f528contract ERC721Metadata is Dummy, ERC165 {529 // /// @notice A descriptive name for a collection of NFTs in this contract530 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`531 // /// @dev EVM selector for this function is: 0x06fdde03,532 // /// or in textual repr: name()533 // function name() public view returns (string memory) {534 // require(false, stub_error);535 // dummy;536 // return "";537 // }538539 // /// @notice An abbreviated name for NFTs in this contract540 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`541 // /// @dev EVM selector for this function is: 0x95d89b41,542 // /// or in textual repr: symbol()543 // function symbol() public view returns (string memory) {544 // require(false, stub_error);545 // dummy;546 // return "";547 // }548549 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.550 ///551 /// @dev If the token has a `url` property and it is not empty, it is returned.552 /// 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`.553 /// If the collection property `baseURI` is empty or absent, return "" (empty string)554 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix555 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).556 ///557 /// @return token's const_metadata558 /// @dev EVM selector for this function is: 0xc87b56dd,559 /// or in textual repr: tokenURI(uint256)560 function tokenURI(uint256 tokenId) public view returns (string memory) {561 require(false, stub_error);562 tokenId;563 dummy;564 return "";565 }566}567568/// @title ERC721 Token that can be irreversibly burned (destroyed).569/// @dev the ERC-165 identifier for this interface is 0x42966c68570contract ERC721Burnable is Dummy, ERC165 {571 /// @notice Burns a specific ERC721 token.572 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized573 /// operator of the current owner.574 /// @param tokenId The RFT to approve575 /// @dev EVM selector for this function is: 0x42966c68,576 /// or in textual repr: burn(uint256)577 function burn(uint256 tokenId) public {578 require(false, stub_error);579 tokenId;580 dummy = 0;581 }582}583584/// @dev inlined interface585contract ERC721UniqueMintableEvents {586 event MintingFinished();587}588589/// @title ERC721 minting logic.590/// @dev the ERC-165 identifier for this interface is 0x476ff149591contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {592 /// @dev EVM selector for this function is: 0x05d2035b,593 /// or in textual repr: mintingFinished()594 function mintingFinished() public view returns (bool) {595 require(false, stub_error);596 dummy;597 return false;598 }599600 /// @notice Function to mint token.601 /// @param to The new owner602 /// @return uint256 The id of the newly minted token603 /// @dev EVM selector for this function is: 0x6a627842,604 /// or in textual repr: mint(address)605 function mint(address to) public returns (uint256) {606 require(false, stub_error);607 to;608 dummy = 0;609 return 0;610 }611612 // /// @notice Function to mint token.613 // /// @dev `tokenId` should be obtained with `nextTokenId` method,614 // /// unlike standard, you can't specify it manually615 // /// @param to The new owner616 // /// @param tokenId ID of the minted RFT617 // /// @dev EVM selector for this function is: 0x40c10f19,618 // /// or in textual repr: mint(address,uint256)619 // function mint(address to, uint256 tokenId) public returns (bool) {620 // require(false, stub_error);621 // to;622 // tokenId;623 // dummy = 0;624 // return false;625 // }626627 /// @notice Function to mint token with the given tokenUri.628 /// @param to The new owner629 /// @param tokenUri Token URI that would be stored in the NFT properties630 /// @return uint256 The id of the newly minted token631 /// @dev EVM selector for this function is: 0x45c17782,632 /// or in textual repr: mintWithTokenURI(address,string)633 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {634 require(false, stub_error);635 to;636 tokenUri;637 dummy = 0;638 return 0;639 }640641 // /// @notice Function to mint token with the given tokenUri.642 // /// @dev `tokenId` should be obtained with `nextTokenId` method,643 // /// unlike standard, you can't specify it manually644 // /// @param to The new owner645 // /// @param tokenId ID of the minted RFT646 // /// @param tokenUri Token URI that would be stored in the RFT properties647 // /// @dev EVM selector for this function is: 0x50bb4e7f,648 // /// or in textual repr: mintWithTokenURI(address,uint256,string)649 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {650 // require(false, stub_error);651 // to;652 // tokenId;653 // tokenUri;654 // dummy = 0;655 // return false;656 // }657658 /// @dev Not implemented659 /// @dev EVM selector for this function is: 0x7d64bcb4,660 /// or in textual repr: finishMinting()661 function finishMinting() public returns (bool) {662 require(false, stub_error);663 dummy = 0;664 return false;665 }666}667668/// @title Unique extensions for ERC721.669/// @dev the ERC-165 identifier for this interface is 0x81feb398670contract ERC721UniqueExtensions is Dummy, ERC165 {671 /// @notice A descriptive name for a collection of NFTs in this contract672 /// @dev EVM selector for this function is: 0x06fdde03,673 /// or in textual repr: name()674 function name() public view returns (string memory) {675 require(false, stub_error);676 dummy;677 return "";678 }679680 /// @notice An abbreviated name for NFTs in this contract681 /// @dev EVM selector for this function is: 0x95d89b41,682 /// or in textual repr: symbol()683 function symbol() public view returns (string memory) {684 require(false, stub_error);685 dummy;686 return "";687 }688689 /// @notice Transfer ownership of an RFT690 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`691 /// is the zero address. Throws if `tokenId` is not a valid RFT.692 /// Throws if RFT pieces have multiple owners.693 /// @param to The new owner694 /// @param tokenId The RFT to transfer695 /// @dev EVM selector for this function is: 0xa9059cbb,696 /// or in textual repr: transfer(address,uint256)697 function transfer(address to, uint256 tokenId) public {698 require(false, stub_error);699 to;700 tokenId;701 dummy = 0;702 }703704 /// @notice Transfer ownership of an RFT705 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`706 /// is the zero address. Throws if `tokenId` is not a valid RFT.707 /// Throws if RFT pieces have multiple owners.708 /// @param to The new owner709 /// @param tokenId The RFT to transfer710 /// @dev EVM selector for this function is: 0xd5cf430b,711 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)712 function transferFromCross(713 Tuple6 memory from,714 Tuple6 memory to,715 uint256 tokenId716 ) public {717 require(false, stub_error);718 from;719 to;720 tokenId;721 dummy = 0;722 }723724 /// @notice Burns a specific ERC721 token.725 /// @dev Throws unless `msg.sender` is the current owner or an authorized726 /// operator for this RFT. Throws if `from` is not the current owner. Throws727 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.728 /// Throws if RFT pieces have multiple owners.729 /// @param from The current owner of the RFT730 /// @param tokenId The RFT to transfer731 /// @dev EVM selector for this function is: 0x79cc6790,732 /// or in textual repr: burnFrom(address,uint256)733 function burnFrom(address from, uint256 tokenId) public {734 require(false, stub_error);735 from;736 tokenId;737 dummy = 0;738 }739740 /// @notice Burns a specific ERC721 token.741 /// @dev Throws unless `msg.sender` is the current owner or an authorized742 /// operator for this RFT. Throws if `from` is not the current owner. Throws743 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.744 /// Throws if RFT pieces have multiple owners.745 /// @param from The current owner of the RFT746 /// @param tokenId The RFT to transfer747 /// @dev EVM selector for this function is: 0xbb2f5a58,748 /// or in textual repr: burnFromCross((address,uint256),uint256)749 function burnFromCross(Tuple6 memory from, uint256 tokenId) public {750 require(false, stub_error);751 from;752 tokenId;753 dummy = 0;754 }755756 /// @notice Returns next free RFT ID.757 /// @dev EVM selector for this function is: 0x75794a3c,758 /// or in textual repr: nextTokenId()759 function nextTokenId() public view returns (uint256) {760 require(false, stub_error);761 dummy;762 return 0;763 }764765 // /// @notice Function to mint multiple tokens.766 // /// @dev `tokenIds` should be an array of consecutive numbers and first number767 // /// should be obtained with `nextTokenId` method768 // /// @param to The new owner769 // /// @param tokenIds IDs of the minted RFTs770 // /// @dev EVM selector for this function is: 0x44a9945e,771 // /// or in textual repr: mintBulk(address,uint256[])772 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {773 // require(false, stub_error);774 // to;775 // tokenIds;776 // dummy = 0;777 // return false;778 // }779780 // /// @notice Function to mint multiple tokens with the given tokenUris.781 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive782 // /// numbers and first number should be obtained with `nextTokenId` method783 // /// @param to The new owner784 // /// @param tokens array of pairs of token ID and token URI for minted tokens785 // /// @dev EVM selector for this function is: 0x36543006,786 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])787 // function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) public returns (bool) {788 // require(false, stub_error);789 // to;790 // tokens;791 // dummy = 0;792 // return false;793 // }794795 /// Returns EVM address for refungible token796 ///797 /// @param token ID of the token798 /// @dev EVM selector for this function is: 0xab76fac6,799 /// or in textual repr: tokenContractAddress(uint256)800 function tokenContractAddress(uint256 token) public view returns (address) {801 require(false, stub_error);802 token;803 dummy;804 return 0x0000000000000000000000000000000000000000;805 }806}807808/// @dev anonymous struct809struct Tuple8 {810 uint256 field_0;811 string field_1;812}813814/// @dev anonymous struct815struct Tuple6 {816 address field_0;817 uint256 field_1;818}819820/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension821/// @dev See https://eips.ethereum.org/EIPS/eip-721822/// @dev the ERC-165 identifier for this interface is 0x780e9d63823contract ERC721Enumerable is Dummy, ERC165 {824 /// @notice Enumerate valid RFTs825 /// @param index A counter less than `totalSupply()`826 /// @return The token identifier for the `index`th NFT,827 /// (sort order not specified)828 /// @dev EVM selector for this function is: 0x4f6ccce7,829 /// or in textual repr: tokenByIndex(uint256)830 function tokenByIndex(uint256 index) public view returns (uint256) {831 require(false, stub_error);832 index;833 dummy;834 return 0;835 }836837 /// Not implemented838 /// @dev EVM selector for this function is: 0x2f745c59,839 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)840 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {841 require(false, stub_error);842 owner;843 index;844 dummy;845 return 0;846 }847848 /// @notice Count RFTs tracked by this contract849 /// @return A count of valid RFTs tracked by this contract, where each one of850 /// them has an assigned and queryable owner not equal to the zero address851 /// @dev EVM selector for this function is: 0x18160ddd,852 /// or in textual repr: totalSupply()853 function totalSupply() public view returns (uint256) {854 require(false, stub_error);855 dummy;856 return 0;857 }858}859860/// @dev inlined interface861contract ERC721Events {862 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);863 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);864 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);865}866867/// @title ERC-721 Non-Fungible Token Standard868/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md869/// @dev the ERC-165 identifier for this interface is 0x58800161870contract ERC721 is Dummy, ERC165, ERC721Events {871 /// @notice Count all RFTs assigned to an owner872 /// @dev RFTs assigned to the zero address are considered invalid, and this873 /// function throws for queries about the zero address.874 /// @param owner An address for whom to query the balance875 /// @return The number of RFTs owned by `owner`, possibly zero876 /// @dev EVM selector for this function is: 0x70a08231,877 /// or in textual repr: balanceOf(address)878 function balanceOf(address owner) public view returns (uint256) {879 require(false, stub_error);880 owner;881 dummy;882 return 0;883 }884885 /// @notice Find the owner of an RFT886 /// @dev RFTs assigned to zero address are considered invalid, and queries887 /// about them do throw.888 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for889 /// the tokens that are partially owned.890 /// @param tokenId The identifier for an RFT891 /// @return The address of the owner of the RFT892 /// @dev EVM selector for this function is: 0x6352211e,893 /// or in textual repr: ownerOf(uint256)894 function ownerOf(uint256 tokenId) public view returns (address) {895 require(false, stub_error);896 tokenId;897 dummy;898 return 0x0000000000000000000000000000000000000000;899 }900901 /// @dev Not implemented902 /// @dev EVM selector for this function is: 0x60a11672,903 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)904 function safeTransferFromWithData(905 address from,906 address to,907 uint256 tokenId,908 bytes memory data909 ) public {910 require(false, stub_error);911 from;912 to;913 tokenId;914 data;915 dummy = 0;916 }917918 /// @dev Not implemented919 /// @dev EVM selector for this function is: 0x42842e0e,920 /// or in textual repr: safeTransferFrom(address,address,uint256)921 function safeTransferFrom(922 address from,923 address to,924 uint256 tokenId925 ) public {926 require(false, stub_error);927 from;928 to;929 tokenId;930 dummy = 0;931 }932933 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE934 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE935 /// THEY MAY BE PERMANENTLY LOST936 /// @dev Throws unless `msg.sender` is the current owner or an authorized937 /// operator for this RFT. Throws if `from` is not the current owner. Throws938 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.939 /// Throws if RFT pieces have multiple owners.940 /// @param from The current owner of the NFT941 /// @param to The new owner942 /// @param tokenId The NFT to transfer943 /// @dev EVM selector for this function is: 0x23b872dd,944 /// or in textual repr: transferFrom(address,address,uint256)945 function transferFrom(946 address from,947 address to,948 uint256 tokenId949 ) public {950 require(false, stub_error);951 from;952 to;953 tokenId;954 dummy = 0;955 }956957 /// @dev Not implemented958 /// @dev EVM selector for this function is: 0x095ea7b3,959 /// or in textual repr: approve(address,uint256)960 function approve(address approved, uint256 tokenId) public {961 require(false, stub_error);962 approved;963 tokenId;964 dummy = 0;965 }966967 /// @dev Not implemented968 /// @dev EVM selector for this function is: 0xa22cb465,969 /// or in textual repr: setApprovalForAll(address,bool)970 function setApprovalForAll(address operator, bool approved) public {971 require(false, stub_error);972 operator;973 approved;974 dummy = 0;975 }976977 /// @dev Not implemented978 /// @dev EVM selector for this function is: 0x081812fc,979 /// or in textual repr: getApproved(uint256)980 function getApproved(uint256 tokenId) public view returns (address) {981 require(false, stub_error);982 tokenId;983 dummy;984 return 0x0000000000000000000000000000000000000000;985 }986987 /// @dev Not implemented988 /// @dev EVM selector for this function is: 0xe985e9c5,989 /// or in textual repr: isApprovedForAll(address,address)990 function isApprovedForAll(address owner, address operator) public view returns (address) {991 require(false, stub_error);992 owner;993 operator;994 dummy;995 return 0x0000000000000000000000000000000000000000;996 }997}998999contract UniqueRefungible is1000 Dummy,1001 ERC165,1002 ERC721,1003 ERC721Enumerable,1004 ERC721UniqueExtensions,1005 ERC721UniqueMintable,1006 ERC721Burnable,1007 ERC721Metadata,1008 Collection,1009 TokenProperties1010{}tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -72,6 +72,7 @@
/// @title A contract that allows you to work with collections.
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev the ERC-165 identifier for this interface is 0xb3152af3
=======
/// @dev the ERC-165 identifier for this interface is 0x674be726
@@ -79,6 +80,9 @@
=======
/// @dev the ERC-165 identifier for this interface is 0x943ee094
>>>>>>> fix: after rebase
+=======
+/// @dev the ERC-165 identifier for this interface is 0xefe988e0
+>>>>>>> misk: update stubs
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -91,7 +95,7 @@
/// Set collection properties.
///
/// @param properties Vector of properties key/value pair.
- /// @dev EVM selector for this function is: 0xf90c1ce9,
+ /// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
function setCollectionProperties(Tuple21[] memory properties) external;
@@ -105,7 +109,7 @@
/// Delete collection properties.
///
/// @param keys Properties keys.
- /// @dev EVM selector for this function is: 0x56d4684a,
+ /// @dev EVM selector for this function is: 0xee206ee3,
/// or in textual repr: deleteCollectionProperties(string[])
function deleteCollectionProperties(string[] memory keys) external;
@@ -123,7 +127,7 @@
///
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- /// @dev EVM selector for this function is: 0x5cad7311,
+ /// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
@@ -141,9 +145,16 @@
/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
///
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x403e96a7,
/// or in textual repr: setCollectionSponsorCross((address,uint256))
function setCollectionSponsorCross(Tuple6 memory sponsor) external;
+=======
+ /// @dev EVM selector for this function is: 0x84a1d5a8,
+ /// or in textual repr: setCollectionSponsorCross(EthCrossAccount)
+ /// or in the expanded repr: setCollectionSponsorCross((address,uint256))
+ function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+>>>>>>> misk: update stubs
/// Whether there is a pending sponsor.
/// @dev EVM selector for this function is: 0x058ac185,
@@ -167,7 +178,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple8 memory);
+ function collectionSponsor() external view returns (Tuple24 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -201,6 +212,7 @@
/// Add collection admin.
/// @param newAdmin Cross account administrator address.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x62e3c7c2,
/// or in textual repr: addCollectionAdminCross((address,uint256))
function addCollectionAdminCross(Tuple6 memory newAdmin) external;
@@ -210,6 +222,19 @@
/// @dev EVM selector for this function is: 0x810d1503,
/// or in textual repr: removeCollectionAdminCross((address,uint256))
function removeCollectionAdminCross(Tuple6 memory admin) external;
+=======
+ /// @dev EVM selector for this function is: 0x859aa7d6,
+ /// or in textual repr: addCollectionAdminCross(EthCrossAccount)
+ /// or in the expanded repr: addCollectionAdminCross((address,uint256))
+ function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+
+ /// Remove collection admin.
+ /// @param admin Cross account administrator address.
+ /// @dev EVM selector for this function is: 0x6c0cd173,
+ /// or in textual repr: removeCollectionAdminCross(EthCrossAccount)
+ /// or in the expanded repr: removeCollectionAdminCross((address,uint256))
+ function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+>>>>>>> misk: update stubs
/// Add collection admin.
/// @param newAdmin Address of the added administrator.
@@ -235,7 +260,7 @@
///
/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'
/// @param collections Addresses of collections that will be available for nesting.
- /// @dev EVM selector for this function is: 0x112d4586,
+ /// @dev EVM selector for this function is: 0x64872396,
/// or in textual repr: setCollectionNesting(bool,address[])
function setCollectionNesting(bool enable, address[] memory collections) external;
@@ -264,9 +289,16 @@
/// Add user to allowed list.
///
/// @param user User cross account address.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xf074da88,
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
function addToCollectionAllowListCross(Tuple6 memory user) external;
+=======
+ /// @dev EVM selector for this function is: 0xa0184a3a,
+ /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount)
+ /// or in the expanded repr: addToCollectionAllowListCross((address,uint256))
+ function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
/// Remove the user from the allowed list.
///
@@ -278,9 +310,16 @@
/// Remove user from allowed list.
///
/// @param user User cross account address.
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xc00df45c,
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
function removeFromCollectionAllowListCross(Tuple6 memory user) external;
+=======
+ /// @dev EVM selector for this function is: 0x09ba452a,
+ /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount)
+ /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256))
+ function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
/// Switch permission for minting.
///
@@ -301,9 +340,16 @@
///
/// @param user User cross account to verify
/// @return "true" if account is the owner or admin
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x5aba3351,
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);
+=======
+ /// @dev EVM selector for this function is: 0x3e75a905,
+ /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount)
+ /// or in the expanded repr: isOwnerOrAdminCross((address,uint256))
+ function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+>>>>>>> misk: update stubs
/// Returns collection type
///
@@ -318,7 +364,7 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
- function collectionOwner() external view returns (Tuple8 memory);
+ function collectionOwner() external view returns (EthCrossAccount memory);
/// Changes collection owner to another account
///
@@ -334,15 +380,38 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
+<<<<<<< HEAD
function collectionAdmins() external view returns (Tuple6[] memory);
+=======
+ function collectionAdmins() external view returns (EthCrossAccount[] memory);
+>>>>>>> misk: update stubs
/// Changes collection owner to another account
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner cross account
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xbdff793d,
/// or in textual repr: setOwnerCross((address,uint256))
function setOwnerCross(Tuple6 memory newOwner) external;
+=======
+ /// @dev EVM selector for this function is: 0xe5c9913f,
+ /// or in textual repr: setOwnerCross(EthCrossAccount)
+ /// or in the expanded repr: setOwnerCross((address,uint256))
+ function setOwnerCross(EthCrossAccount memory newOwner) external;
+}
+
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
+}
+
+/// @dev anonymous struct
+struct Tuple24 {
+ address field_0;
+ uint256 field_1;
+>>>>>>> misk: update stubs
}
<<<<<<< HEAD
@@ -459,10 +528,14 @@
/// @title Unique extensions for ERC721.
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev the ERC-165 identifier for this interface is 0x244543ee
=======
/// @dev the ERC-165 identifier for this interface is 0xcc97cb35
>>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+/// @dev the ERC-165 identifier for this interface is 0xb76006ac
+>>>>>>> misk: update stubs
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -480,9 +553,16 @@
/// operator of the current owner.
/// @param approved The new substrate address approved NFT controller
/// @param tokenId The NFT to approve
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0x106fdb59,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(Tuple6 memory approved, uint256 tokenId) external;
+=======
+ /// @dev EVM selector for this function is: 0x0ecd0ab0,
+ /// or in textual repr: approveCross(EthCrossAccount,uint256)
+ /// or in the expanded repr: approveCross((address,uint256),uint256)
+ function approveCross(EthCrossAccount memory approved, uint256 tokenId) external;
+>>>>>>> misk: update stubs
/// @notice Transfer ownership of an NFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -501,6 +581,7 @@
/// @param tokenId The NFT to transfer
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)
+ /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
<<<<<<< HEAD
Tuple6 memory from,
@@ -528,9 +609,16 @@
/// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
/// @param from The current owner of the NFT
/// @param tokenId The NFT to transfer
+<<<<<<< HEAD
/// @dev EVM selector for this function is: 0xa8106d4a,
/// or in textual repr: burnFromCross((address,uint256),uint256)
function burnFromCross(Tuple6 memory from, uint256 tokenId) external;
+=======
+ /// @dev EVM selector for this function is: 0xbb2f5a58,
+ /// or in textual repr: burnFromCross(EthCrossAccount,uint256)
+ /// or in the expanded repr: burnFromCross((address,uint256),uint256)
+ function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;
+>>>>>>> misk: update stubs
/// @notice Returns next free NFT ID.
/// @dev EVM selector for this function is: 0x75794a3c,
@@ -565,7 +653,7 @@
/// should be obtained with `nextTokenId` method
/// @param to The new owner
/// @param tokenIds IDs of the minted NFTs
- /// @dev EVM selector for this function is: 0xf9d9a5a3,
+ /// @dev EVM selector for this function is: 0x44a9945e,
/// or in textual repr: mintBulk(address,uint256[])
function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);
@@ -574,7 +662,7 @@
/// numbers and first number should be obtained with `nextTokenId` method
/// @param to The new owner
/// @param tokens array of pairs of token ID and token URI for minted tokens
- /// @dev EVM selector for this function is: 0xfd4e2a99,
+ /// @dev EVM selector for this function is: 0x36543006,
/// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
}
@@ -586,6 +674,7 @@
string field_1;
}
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple8 {
address field_0;
@@ -598,6 +687,8 @@
uint256 field_1;
}
+=======
+>>>>>>> misk: update stubs
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x780e9d63
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -85,7 +85,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple19[] memory properties) external;
+ function setCollectionProperties(Tuple20[] memory properties) external;
/// Delete collection property.
///
@@ -117,7 +117,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple19[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple20[] memory);
/// Set the sponsor of the collection.
///
@@ -134,8 +134,14 @@
///
/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
/// @dev EVM selector for this function is: 0x84a1d5a8,
+<<<<<<< HEAD
/// or in textual repr: setCollectionSponsorCross((address,uint256))
function setCollectionSponsorCross(Tuple6 memory sponsor) external;
+=======
+ /// or in textual repr: setCollectionSponsorCross(EthCrossAccount)
+ /// or in the expanded repr: setCollectionSponsorCross((address,uint256))
+ function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+>>>>>>> misk: update stubs
/// Whether there is a pending sponsor.
/// @dev EVM selector for this function is: 0x058ac185,
@@ -159,7 +165,11 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
+<<<<<<< HEAD
function collectionSponsor() external view returns (Tuple6 memory);
+=======
+ function collectionSponsor() external view returns (Tuple23 memory);
+>>>>>>> misk: update stubs
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -194,14 +204,26 @@
/// Add collection admin.
/// @param newAdmin Cross account administrator address.
/// @dev EVM selector for this function is: 0x859aa7d6,
+<<<<<<< HEAD
/// or in textual repr: addCollectionAdminCross((address,uint256))
function addCollectionAdminCross(Tuple6 memory newAdmin) external;
+=======
+ /// or in textual repr: addCollectionAdminCross(EthCrossAccount)
+ /// or in the expanded repr: addCollectionAdminCross((address,uint256))
+ function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+>>>>>>> misk: update stubs
/// Remove collection admin.
/// @param admin Cross account administrator address.
/// @dev EVM selector for this function is: 0x6c0cd173,
+<<<<<<< HEAD
/// or in textual repr: removeCollectionAdminCross((address,uint256))
function removeCollectionAdminCross(Tuple6 memory admin) external;
+=======
+ /// or in textual repr: removeCollectionAdminCross(EthCrossAccount)
+ /// or in the expanded repr: removeCollectionAdminCross((address,uint256))
+ function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+>>>>>>> misk: update stubs
/// Add collection admin.
/// @param newAdmin Address of the added administrator.
@@ -257,8 +279,14 @@
///
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0xa0184a3a,
+<<<<<<< HEAD
/// or in textual repr: addToCollectionAllowListCross((address,uint256))
function addToCollectionAllowListCross(Tuple6 memory user) external;
+=======
+ /// or in textual repr: addToCollectionAllowListCross(EthCrossAccount)
+ /// or in the expanded repr: addToCollectionAllowListCross((address,uint256))
+ function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
/// Remove the user from the allowed list.
///
@@ -271,8 +299,14 @@
///
/// @param user User cross account address.
/// @dev EVM selector for this function is: 0x09ba452a,
+<<<<<<< HEAD
/// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
function removeFromCollectionAllowListCross(Tuple6 memory user) external;
+=======
+ /// or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount)
+ /// or in the expanded repr: removeFromCollectionAllowListCross((address,uint256))
+ function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
/// Switch permission for minting.
///
@@ -294,8 +328,14 @@
/// @param user User cross account to verify
/// @return "true" if account is the owner or admin
/// @dev EVM selector for this function is: 0x3e75a905,
+<<<<<<< HEAD
/// or in textual repr: isOwnerOrAdminCross((address,uint256))
function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);
+=======
+ /// or in textual repr: isOwnerOrAdminCross(EthCrossAccount)
+ /// or in the expanded repr: isOwnerOrAdminCross((address,uint256))
+ function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+>>>>>>> misk: update stubs
/// Returns collection type
///
@@ -306,11 +346,15 @@
/// Get collection owner.
///
- /// @return Tuble with sponsor address and his substrate mirror.
+ /// @return Tuple with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
+<<<<<<< HEAD
function collectionOwner() external view returns (Tuple6 memory);
+=======
+ function collectionOwner() external view returns (EthCrossAccount memory);
+>>>>>>> misk: update stubs
/// Changes collection owner to another account
///
@@ -326,19 +370,41 @@
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0x5813216b,
/// or in textual repr: collectionAdmins()
+<<<<<<< HEAD
function collectionAdmins() external view returns (Tuple6[] memory);
+=======
+ function collectionAdmins() external view returns (EthCrossAccount[] memory);
+>>>>>>> misk: update stubs
/// Changes collection owner to another account
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner cross account
/// @dev EVM selector for this function is: 0xe5c9913f,
+<<<<<<< HEAD
/// or in textual repr: setOwnerCross((address,uint256))
function setOwnerCross(Tuple6 memory newOwner) external;
+=======
+ /// or in textual repr: setOwnerCross(EthCrossAccount)
+ /// or in the expanded repr: setOwnerCross((address,uint256))
+ function setOwnerCross(EthCrossAccount memory newOwner) external;
+}
+
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
+}
+
+/// @dev anonymous struct
+struct Tuple23 {
+ address field_0;
+ uint256 field_1;
+>>>>>>> misk: update stubs
}
/// @dev anonymous struct
-struct Tuple19 {
+struct Tuple20 {
string field_0;
bytes field_1;
}
@@ -465,10 +531,16 @@
/// @param to The new owner
/// @param tokenId The RFT to transfer
/// @dev EVM selector for this function is: 0xd5cf430b,
- /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
+ /// or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)
+ /// or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
+<<<<<<< HEAD
Tuple6 memory from,
Tuple6 memory to,
+=======
+ EthCrossAccount memory from,
+ EthCrossAccount memory to,
+>>>>>>> misk: update stubs
uint256 tokenId
) external;
@@ -491,14 +563,21 @@
/// @param from The current owner of the RFT
/// @param tokenId The RFT to transfer
/// @dev EVM selector for this function is: 0xbb2f5a58,
+<<<<<<< HEAD
/// or in textual repr: burnFromCross((address,uint256),uint256)
function burnFromCross(Tuple6 memory from, uint256 tokenId) external;
+=======
+ /// or in textual repr: burnFromCross(EthCrossAccount,uint256)
+ /// or in the expanded repr: burnFromCross((address,uint256),uint256)
+ function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;
+>>>>>>> misk: update stubs
/// @notice Returns next free RFT ID.
/// @dev EVM selector for this function is: 0x75794a3c,
/// or in textual repr: nextTokenId()
function nextTokenId() external view returns (uint256);
+<<<<<<< HEAD
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -516,6 +595,25 @@
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) external returns (bool);
+=======
+ /// @notice Function to mint multiple tokens.
+ /// @dev `tokenIds` should be an array of consecutive numbers and first number
+ /// should be obtained with `nextTokenId` method
+ /// @param to The new owner
+ /// @param tokenIds IDs of the minted RFTs
+ /// @dev EVM selector for this function is: 0x44a9945e,
+ /// or in textual repr: mintBulk(address,uint256[])
+ function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);
+
+ /// @notice Function to mint multiple tokens with the given tokenUris.
+ /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+ /// numbers and first number should be obtained with `nextTokenId` method
+ /// @param to The new owner
+ /// @param tokens array of pairs of token ID and token URI for minted tokens
+ /// @dev EVM selector for this function is: 0x36543006,
+ /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
+ function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) external returns (bool);
+>>>>>>> misk: update stubs
/// Returns EVM address for refungible token
///
@@ -526,17 +624,24 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple8 {
+=======
+struct Tuple11 {
+>>>>>>> misk: update stubs
uint256 field_0;
string field_1;
}
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple6 {
address field_0;
uint256 field_1;
}
+=======
+>>>>>>> misk: update stubs
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x780e9d63
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -62,10 +62,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "newAdmin",
"type": "tuple"
}
@@ -88,10 +93,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "user",
"type": "tuple"
}
@@ -134,10 +144,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "spender",
"type": "tuple"
},
@@ -171,10 +186,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "from",
"type": "tuple"
},
@@ -182,6 +202,7 @@
],
"name": "burnFromCross",
"outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+<<<<<<< HEAD
"stateMutability": "nonpayable",
"type": "function"
},
@@ -191,6 +212,8 @@
],
"name": "changeCollectionOwner",
"outputs": [],
+=======
+>>>>>>> misk: update stubs
"stateMutability": "nonpayable",
"type": "function"
},
@@ -200,10 +223,15 @@
"outputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6[]",
+ "internalType": "struct EthCrossAccount[]",
"name": "",
"type": "tuple[]"
}
@@ -217,10 +245,15 @@
"outputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
@@ -239,7 +272,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple10[]",
+ "internalType": "struct Tuple14[]",
"name": "",
"type": "tuple[]"
}
@@ -263,7 +296,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple6",
+ "internalType": "struct Tuple8",
"name": "",
"type": "tuple"
}
@@ -328,10 +361,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "user",
"type": "tuple"
}
@@ -358,7 +396,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple6[]",
+ "internalType": "struct Tuple8[]",
"name": "amounts",
"type": "tuple[]"
}
@@ -388,10 +426,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "admin",
"type": "tuple"
}
@@ -421,10 +464,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "user",
"type": "tuple"
}
@@ -496,7 +544,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple10[]",
+ "internalType": "struct Tuple14[]",
"name": "properties",
"type": "tuple[]"
}
@@ -529,10 +577,15 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "sponsor",
"type": "tuple"
}
@@ -544,12 +597,28 @@
},
{
"inputs": [
+<<<<<<< HEAD
{
"components": [
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+ ],
+ "name": "setOwner",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "newOwner",
"type": "tuple"
}
@@ -607,19 +676,29 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "from",
"type": "tuple"
},
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
],
- "internalType": "struct Tuple6",
+ "internalType": "struct EthCrossAccount",
"name": "to",
"type": "tuple"
},
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -93,10 +93,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "newAdmin",
"type": "tuple"
}
@@ -119,10 +123,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "user",
"type": "tuple"
}
@@ -155,10 +163,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "approved",
"type": "tuple"
},
@@ -201,10 +213,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "from",
"type": "tuple"
},
@@ -230,10 +246,14 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6[]",
+=======
+ "internalType": "struct EthCrossAccount[]",
+>>>>>>> misk: update stubs
"name": "",
"type": "tuple[]"
}
@@ -247,11 +267,12 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
"internalType": "struct Tuple6",
=======
"internalType": "struct Tuple19",
@@ -259,6 +280,9 @@
=======
"internalType": "struct Tuple8",
>>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "",
"type": "tuple"
}
@@ -319,6 +343,7 @@
],
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
"internalType": "struct Tuple6",
=======
"internalType": "struct Tuple19",
@@ -326,6 +351,9 @@
=======
"internalType": "struct Tuple8",
>>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+ "internalType": "struct Tuple24",
+>>>>>>> misk: update stubs
"name": "",
"type": "tuple"
}
@@ -428,10 +456,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "user",
"type": "tuple"
}
@@ -556,10 +588,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "admin",
"type": "tuple"
}
@@ -589,10 +625,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "user",
"type": "tuple"
}
@@ -745,10 +785,14 @@
"inputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "sponsor",
"type": "tuple"
}
@@ -785,6 +829,7 @@
{
"components": [
<<<<<<< HEAD
+<<<<<<< HEAD
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
=======
@@ -795,6 +840,14 @@
"internalType": "struct Tuple19[]",
"name": "properties",
"type": "tuple[]"
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "newOwner",
+ "type": "tuple"
+>>>>>>> misk: update stubs
}
],
"name": "setProperties",
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -93,10 +93,17 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "newAdmin",
"type": "tuple"
}
@@ -119,10 +126,17 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "user",
"type": "tuple"
}
@@ -183,10 +197,17 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "from",
"type": "tuple"
},
@@ -212,10 +233,17 @@
"outputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6[]",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount[]",
+>>>>>>> misk: update stubs
"name": "",
"type": "tuple[]"
}
@@ -229,10 +257,17 @@
"outputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "",
"type": "tuple"
}
@@ -251,7 +286,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple19[]",
+ "internalType": "struct Tuple20[]",
"name": "",
"type": "tuple[]"
}
@@ -275,7 +310,11 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple6",
+=======
+ "internalType": "struct Tuple23",
+>>>>>>> misk: update stubs
"name": "",
"type": "tuple"
}
@@ -369,10 +408,17 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "user",
"type": "tuple"
}
@@ -383,23 +429,68 @@
"type": "function"
},
{
+<<<<<<< HEAD
"inputs": [{ "internalType": "address", "name": "to", "type": "address" }],
"name": "mint",
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+=======
+ "inputs": [
+ { "internalType": "address", "name": "to", "type": "address" },
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+ ],
+ "name": "mint",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+>>>>>>> misk: update stubs
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
+<<<<<<< HEAD
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
"name": "mintWithTokenURI",
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+=======
+ { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" }
+ ],
+ "name": "mintBulk",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "nonpayable",
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "address", "name": "to", "type": "address" },
+ {
+ "components": [
+ { "internalType": "uint256", "name": "field_0", "type": "uint256" },
+ { "internalType": "string", "name": "field_1", "type": "string" }
+ ],
+ "internalType": "struct Tuple11[]",
+ "name": "tokens",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintBulkWithTokenURI",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "address", "name": "to", "type": "address" },
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+ { "internalType": "string", "name": "tokenUri", "type": "string" }
+ ],
+ "name": "mintWithTokenURI",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+>>>>>>> misk: update stubs
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "mintingFinished",
"outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
@@ -452,10 +543,17 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "admin",
"type": "tuple"
}
@@ -485,10 +583,17 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "user",
"type": "tuple"
}
@@ -593,7 +698,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple19[]",
+ "internalType": "struct Tuple20[]",
"name": "properties",
"type": "tuple[]"
}
@@ -626,10 +731,17 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "sponsor",
"type": "tuple"
}
@@ -641,6 +753,7 @@
},
{
"inputs": [
+<<<<<<< HEAD
{
"components": [
{ "internalType": "address", "name": "field_0", "type": "address" },
@@ -650,6 +763,9 @@
"name": "newOwner",
"type": "tuple"
}
+=======
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+>>>>>>> misk: update stubs
],
"name": "setOwnerCross",
"outputs": [],
@@ -661,12 +777,21 @@
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" },
{
"components": [
+<<<<<<< HEAD
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
"internalType": "struct Tuple19[]",
"name": "properties",
"type": "tuple[]"
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "newOwner",
+ "type": "tuple"
+>>>>>>> misk: update stubs
}
],
"name": "setProperties",
@@ -782,19 +907,33 @@
"inputs": [
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "from",
"type": "tuple"
},
{
"components": [
+<<<<<<< HEAD
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
"internalType": "struct Tuple6",
+=======
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
"name": "to",
"type": "tuple"
},