difftreelog
feat add evm OptionUint type
in: master
19 files changed
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -66,6 +66,56 @@
T::CrossAccountId::from_sub(account_id)
}
+/// Ethereum representation of Optional value with uint256.
+#[derive(Debug, Default, AbiCoder)]
+pub struct OptionUint {
+ status: bool,
+ value: uint256,
+}
+
+impl From<u32> for OptionUint {
+ fn from(value: u32) -> Self {
+ Self {
+ status: true,
+ value: uint256::from(value),
+ }
+ }
+}
+
+impl From<Option<u32>> for OptionUint {
+ fn from(value: Option<u32>) -> Self {
+ match value {
+ Some(value) => Self {
+ status: true,
+ value: value.into(),
+ },
+ None => Self {
+ status: false,
+ value: Default::default(),
+ },
+ }
+ }
+}
+
+impl From<Option<bool>> for OptionUint {
+ fn from(value: Option<bool>) -> Self {
+ match value {
+ Some(value) => Self {
+ status: true,
+ value: if value {
+ uint256::from(1)
+ } else {
+ Default::default()
+ },
+ },
+ None => Self {
+ status: false,
+ value: Default::default(),
+ },
+ }
+ }
+}
+
/// Cross account struct
#[derive(Debug, Default, AbiCoder)]
pub struct CrossAccount {
@@ -164,8 +214,7 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionLimit {
field: CollectionLimitField,
- status: bool,
- value: uint256,
+ value: OptionUint,
}
impl CollectionLimit {
@@ -173,43 +222,24 @@
pub fn from_int(field: CollectionLimitField, value: u32) -> Self {
Self {
field,
- status: true,
value: value.into(),
}
}
/// Make [`CollectionLimit`] from [`CollectionLimitField`] and optional int value.
pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {
- value
- .map(|v| Self {
- field,
- status: true,
- value: v.into(),
- })
- .unwrap_or(Self {
- field,
- status: false,
- value: Default::default(),
- })
+ Self {
+ field,
+ value: value.into(),
+ }
}
/// Make [`CollectionLimit`] from [`CollectionLimitField`] and bool value.
pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {
- value
- .map(|v| Self {
- field,
- status: true,
- value: if v {
- uint256::from(1)
- } else {
- Default::default()
- },
- })
- .unwrap_or(Self {
- field,
- status: false,
- value: Default::default(),
- })
+ Self {
+ field,
+ value: value.into(),
+ }
}
}
@@ -217,14 +247,14 @@
type Error = evm_coder::execution::Error;
fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {
- if !self.status {
+ if !self.value.status {
return Err(Self::Error::Revert("user can't disable limits".into()));
}
- let value = self.value.try_into().map_err(|error| {
+ let value = self.value.value.try_into().map_err(|error| {
Self::Error::Revert(format!(
"can't convert value to u32 \"{}\" because: \"{error}\"",
- self.value
+ self.value.value
))
})?;
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -18,7 +18,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
contract Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -172,8 +172,8 @@
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Some limit.
- /// @dev EVM selector for this function is: 0x2a2235e7,
- /// or in textual repr: setCollectionLimit((uint8,bool,uint256))
+ /// @dev EVM selector for this function is: 0x2316ee74,
+ /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
function setCollectionLimit(CollectionLimit memory limit) public {
require(false, stub_error);
limit;
@@ -257,19 +257,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple30 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple33 memory) {
require(false, stub_error);
dummy;
- return Tuple30(false, new uint256[](0));
+ return Tuple33(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple33[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple36[] memory) {
require(false, stub_error);
dummy;
- return new Tuple33[](0);
+ return new Tuple36[](0);
}
/// Set the collection access method.
@@ -452,13 +452,13 @@
}
/// @dev anonymous struct
-struct Tuple33 {
+struct Tuple36 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple30 {
+struct Tuple33 {
bool field_0;
uint256[] field_1;
}
@@ -466,6 +466,10 @@
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
+ OptionUint value;
+}
+
+struct OptionUint {
bool status;
uint256 value;
}
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -162,7 +162,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
contract Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -316,8 +316,8 @@
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Some limit.
- /// @dev EVM selector for this function is: 0x2a2235e7,
- /// or in textual repr: setCollectionLimit((uint8,bool,uint256))
+ /// @dev EVM selector for this function is: 0x2316ee74,
+ /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
function setCollectionLimit(CollectionLimit memory limit) public {
require(false, stub_error);
limit;
@@ -401,19 +401,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple42 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple45 memory) {
require(false, stub_error);
dummy;
- return Tuple42(false, new uint256[](0));
+ return Tuple45(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple45[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple48[] memory) {
require(false, stub_error);
dummy;
- return new Tuple45[](0);
+ return new Tuple48[](0);
}
/// Set the collection access method.
@@ -596,13 +596,13 @@
}
/// @dev anonymous struct
-struct Tuple45 {
+struct Tuple48 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple42 {
+struct Tuple45 {
bool field_0;
uint256[] field_1;
}
@@ -610,6 +610,10 @@
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
+ OptionUint value;
+}
+
+struct OptionUint {
bool status;
uint256 value;
}
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -162,7 +162,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
contract Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -316,8 +316,8 @@
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Some limit.
- /// @dev EVM selector for this function is: 0x2a2235e7,
- /// or in textual repr: setCollectionLimit((uint8,bool,uint256))
+ /// @dev EVM selector for this function is: 0x2316ee74,
+ /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
function setCollectionLimit(CollectionLimit memory limit) public {
require(false, stub_error);
limit;
@@ -401,19 +401,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple44 memory) {
require(false, stub_error);
dummy;
- return Tuple41(false, new uint256[](0));
+ return Tuple44(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple44[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple47[] memory) {
require(false, stub_error);
dummy;
- return new Tuple44[](0);
+ return new Tuple47[](0);
}
/// Set the collection access method.
@@ -596,13 +596,13 @@
}
/// @dev anonymous struct
-struct Tuple44 {
+struct Tuple47 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple41 {
+struct Tuple44 {
bool field_0;
uint256[] field_1;
}
@@ -610,6 +610,10 @@
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
+ OptionUint value;
+}
+
+struct OptionUint {
bool status;
uint256 value;
}
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -217,8 +217,15 @@
"name": "field",
"type": "uint8"
},
- { "internalType": "bool", "name": "status", "type": "bool" },
- { "internalType": "uint256", "name": "value", "type": "uint256" }
+ {
+ "components": [
+ { "internalType": "bool", "name": "status", "type": "bool" },
+ { "internalType": "uint256", "name": "value", "type": "uint256" }
+ ],
+ "internalType": "struct OptionUint",
+ "name": "value",
+ "type": "tuple"
+ }
],
"internalType": "struct CollectionLimit[]",
"name": "",
@@ -241,7 +248,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple33[]",
+ "internalType": "struct Tuple36[]",
"name": "",
"type": "tuple[]"
}
@@ -262,7 +269,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple30",
+ "internalType": "struct Tuple33",
"name": "",
"type": "tuple"
}
@@ -500,8 +507,15 @@
"name": "field",
"type": "uint8"
},
- { "internalType": "bool", "name": "status", "type": "bool" },
- { "internalType": "uint256", "name": "value", "type": "uint256" }
+ {
+ "components": [
+ { "internalType": "bool", "name": "status", "type": "bool" },
+ { "internalType": "uint256", "name": "value", "type": "uint256" }
+ ],
+ "internalType": "struct OptionUint",
+ "name": "value",
+ "type": "tuple"
+ }
],
"internalType": "struct CollectionLimit",
"name": "limit",
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "approved",15 "type": "address"16 },17 {18 "indexed": true,19 "internalType": "uint256",20 "name": "tokenId",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "owner",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "operator",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "bool",45 "name": "approved",46 "type": "bool"47 }48 ],49 "name": "ApprovalForAll",50 "type": "event"51 },52 {53 "anonymous": false,54 "inputs": [],55 "name": "MintingFinished",56 "type": "event"57 },58 {59 "anonymous": false,60 "inputs": [61 {62 "indexed": true,63 "internalType": "address",64 "name": "from",65 "type": "address"66 },67 {68 "indexed": true,69 "internalType": "address",70 "name": "to",71 "type": "address"72 },73 {74 "indexed": true,75 "internalType": "uint256",76 "name": "tokenId",77 "type": "uint256"78 }79 ],80 "name": "Transfer",81 "type": "event"82 },83 {84 "inputs": [85 {86 "components": [87 { "internalType": "address", "name": "eth", "type": "address" },88 { "internalType": "uint256", "name": "sub", "type": "uint256" }89 ],90 "internalType": "struct CrossAccount",91 "name": "newAdmin",92 "type": "tuple"93 }94 ],95 "name": "addCollectionAdminCross",96 "outputs": [],97 "stateMutability": "nonpayable",98 "type": "function"99 },100 {101 "inputs": [102 {103 "components": [104 { "internalType": "address", "name": "eth", "type": "address" },105 { "internalType": "uint256", "name": "sub", "type": "uint256" }106 ],107 "internalType": "struct CrossAccount",108 "name": "user",109 "type": "tuple"110 }111 ],112 "name": "addToCollectionAllowListCross",113 "outputs": [],114 "stateMutability": "nonpayable",115 "type": "function"116 },117 {118 "inputs": [119 {120 "components": [121 { "internalType": "address", "name": "eth", "type": "address" },122 { "internalType": "uint256", "name": "sub", "type": "uint256" }123 ],124 "internalType": "struct CrossAccount",125 "name": "user",126 "type": "tuple"127 }128 ],129 "name": "allowlistedCross",130 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],131 "stateMutability": "view",132 "type": "function"133 },134 {135 "inputs": [136 { "internalType": "address", "name": "approved", "type": "address" },137 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }138 ],139 "name": "approve",140 "outputs": [],141 "stateMutability": "nonpayable",142 "type": "function"143 },144 {145 "inputs": [146 {147 "components": [148 { "internalType": "address", "name": "eth", "type": "address" },149 { "internalType": "uint256", "name": "sub", "type": "uint256" }150 ],151 "internalType": "struct CrossAccount",152 "name": "approved",153 "type": "tuple"154 },155 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }156 ],157 "name": "approveCross",158 "outputs": [],159 "stateMutability": "nonpayable",160 "type": "function"161 },162 {163 "inputs": [164 { "internalType": "address", "name": "owner", "type": "address" }165 ],166 "name": "balanceOf",167 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],168 "stateMutability": "view",169 "type": "function"170 },171 {172 "inputs": [173 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }174 ],175 "name": "burn",176 "outputs": [],177 "stateMutability": "nonpayable",178 "type": "function"179 },180 {181 "inputs": [182 {183 "components": [184 { "internalType": "address", "name": "eth", "type": "address" },185 { "internalType": "uint256", "name": "sub", "type": "uint256" }186 ],187 "internalType": "struct CrossAccount",188 "name": "from",189 "type": "tuple"190 },191 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }192 ],193 "name": "burnFromCross",194 "outputs": [],195 "stateMutability": "nonpayable",196 "type": "function"197 },198 {199 "inputs": [200 {201 "components": [202 { "internalType": "address", "name": "eth", "type": "address" },203 { "internalType": "uint256", "name": "sub", "type": "uint256" }204 ],205 "internalType": "struct CrossAccount",206 "name": "newOwner",207 "type": "tuple"208 }209 ],210 "name": "changeCollectionOwnerCross",211 "outputs": [],212 "stateMutability": "nonpayable",213 "type": "function"214 },215 {216 "inputs": [],217 "name": "collectionAdmins",218 "outputs": [219 {220 "components": [221 { "internalType": "address", "name": "eth", "type": "address" },222 { "internalType": "uint256", "name": "sub", "type": "uint256" }223 ],224 "internalType": "struct CrossAccount[]",225 "name": "",226 "type": "tuple[]"227 }228 ],229 "stateMutability": "view",230 "type": "function"231 },232 {233 "inputs": [],234 "name": "collectionHelperAddress",235 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],236 "stateMutability": "view",237 "type": "function"238 },239 {240 "inputs": [],241 "name": "collectionLimits",242 "outputs": [243 {244 "components": [245 {246 "internalType": "enum CollectionLimitField",247 "name": "field",248 "type": "uint8"249 },250 { "internalType": "bool", "name": "status", "type": "bool" },251 { "internalType": "uint256", "name": "value", "type": "uint256" }252 ],253 "internalType": "struct CollectionLimit[]",254 "name": "",255 "type": "tuple[]"256 }257 ],258 "stateMutability": "view",259 "type": "function"260 },261 {262 "inputs": [],263 "name": "collectionNestingPermissions",264 "outputs": [265 {266 "components": [267 {268 "internalType": "enum CollectionPermissions",269 "name": "field_0",270 "type": "uint8"271 },272 { "internalType": "bool", "name": "field_1", "type": "bool" }273 ],274 "internalType": "struct Tuple45[]",275 "name": "",276 "type": "tuple[]"277 }278 ],279 "stateMutability": "view",280 "type": "function"281 },282 {283 "inputs": [],284 "name": "collectionNestingRestrictedCollectionIds",285 "outputs": [286 {287 "components": [288 { "internalType": "bool", "name": "field_0", "type": "bool" },289 {290 "internalType": "uint256[]",291 "name": "field_1",292 "type": "uint256[]"293 }294 ],295 "internalType": "struct Tuple42",296 "name": "",297 "type": "tuple"298 }299 ],300 "stateMutability": "view",301 "type": "function"302 },303 {304 "inputs": [],305 "name": "collectionOwner",306 "outputs": [307 {308 "components": [309 { "internalType": "address", "name": "eth", "type": "address" },310 { "internalType": "uint256", "name": "sub", "type": "uint256" }311 ],312 "internalType": "struct CrossAccount",313 "name": "",314 "type": "tuple"315 }316 ],317 "stateMutability": "view",318 "type": "function"319 },320 {321 "inputs": [322 { "internalType": "string[]", "name": "keys", "type": "string[]" }323 ],324 "name": "collectionProperties",325 "outputs": [326 {327 "components": [328 { "internalType": "string", "name": "key", "type": "string" },329 { "internalType": "bytes", "name": "value", "type": "bytes" }330 ],331 "internalType": "struct Property[]",332 "name": "",333 "type": "tuple[]"334 }335 ],336 "stateMutability": "view",337 "type": "function"338 },339 {340 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],341 "name": "collectionProperty",342 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],343 "stateMutability": "view",344 "type": "function"345 },346 {347 "inputs": [],348 "name": "collectionSponsor",349 "outputs": [350 {351 "components": [352 { "internalType": "address", "name": "eth", "type": "address" },353 { "internalType": "uint256", "name": "sub", "type": "uint256" }354 ],355 "internalType": "struct CrossAccount",356 "name": "",357 "type": "tuple"358 }359 ],360 "stateMutability": "view",361 "type": "function"362 },363 {364 "inputs": [],365 "name": "confirmCollectionSponsorship",366 "outputs": [],367 "stateMutability": "nonpayable",368 "type": "function"369 },370 {371 "inputs": [],372 "name": "contractAddress",373 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],374 "stateMutability": "view",375 "type": "function"376 },377 {378 "inputs": [379 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }380 ],381 "name": "crossOwnerOf",382 "outputs": [383 {384 "components": [385 { "internalType": "address", "name": "eth", "type": "address" },386 { "internalType": "uint256", "name": "sub", "type": "uint256" }387 ],388 "internalType": "struct CrossAccount",389 "name": "",390 "type": "tuple"391 }392 ],393 "stateMutability": "view",394 "type": "function"395 },396 {397 "inputs": [398 { "internalType": "string[]", "name": "keys", "type": "string[]" }399 ],400 "name": "deleteCollectionProperties",401 "outputs": [],402 "stateMutability": "nonpayable",403 "type": "function"404 },405 {406 "inputs": [407 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },408 { "internalType": "string[]", "name": "keys", "type": "string[]" }409 ],410 "name": "deleteProperties",411 "outputs": [],412 "stateMutability": "nonpayable",413 "type": "function"414 },415 {416 "inputs": [],417 "name": "description",418 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],419 "stateMutability": "view",420 "type": "function"421 },422 {423 "inputs": [],424 "name": "finishMinting",425 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],426 "stateMutability": "nonpayable",427 "type": "function"428 },429 {430 "inputs": [431 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }432 ],433 "name": "getApproved",434 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],435 "stateMutability": "view",436 "type": "function"437 },438 {439 "inputs": [],440 "name": "hasCollectionPendingSponsor",441 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],442 "stateMutability": "view",443 "type": "function"444 },445 {446 "inputs": [447 { "internalType": "address", "name": "owner", "type": "address" },448 { "internalType": "address", "name": "operator", "type": "address" }449 ],450 "name": "isApprovedForAll",451 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],452 "stateMutability": "view",453 "type": "function"454 },455 {456 "inputs": [457 {458 "components": [459 { "internalType": "address", "name": "eth", "type": "address" },460 { "internalType": "uint256", "name": "sub", "type": "uint256" }461 ],462 "internalType": "struct CrossAccount",463 "name": "user",464 "type": "tuple"465 }466 ],467 "name": "isOwnerOrAdminCross",468 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],469 "stateMutability": "view",470 "type": "function"471 },472 {473 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],474 "name": "mint",475 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],476 "stateMutability": "nonpayable",477 "type": "function"478 },479 {480 "inputs": [481 {482 "components": [483 { "internalType": "address", "name": "eth", "type": "address" },484 { "internalType": "uint256", "name": "sub", "type": "uint256" }485 ],486 "internalType": "struct CrossAccount",487 "name": "to",488 "type": "tuple"489 },490 {491 "components": [492 { "internalType": "string", "name": "key", "type": "string" },493 { "internalType": "bytes", "name": "value", "type": "bytes" }494 ],495 "internalType": "struct Property[]",496 "name": "properties",497 "type": "tuple[]"498 }499 ],500 "name": "mintCross",501 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],502 "stateMutability": "nonpayable",503 "type": "function"504 },505 {506 "inputs": [507 { "internalType": "address", "name": "to", "type": "address" },508 { "internalType": "string", "name": "tokenUri", "type": "string" }509 ],510 "name": "mintWithTokenURI",511 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],512 "stateMutability": "nonpayable",513 "type": "function"514 },515 {516 "inputs": [],517 "name": "mintingFinished",518 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],519 "stateMutability": "view",520 "type": "function"521 },522 {523 "inputs": [],524 "name": "name",525 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],526 "stateMutability": "view",527 "type": "function"528 },529 {530 "inputs": [],531 "name": "nextTokenId",532 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],533 "stateMutability": "view",534 "type": "function"535 },536 {537 "inputs": [538 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }539 ],540 "name": "ownerOf",541 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],542 "stateMutability": "view",543 "type": "function"544 },545 {546 "inputs": [547 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },548 { "internalType": "string[]", "name": "keys", "type": "string[]" }549 ],550 "name": "properties",551 "outputs": [552 {553 "components": [554 { "internalType": "string", "name": "key", "type": "string" },555 { "internalType": "bytes", "name": "value", "type": "bytes" }556 ],557 "internalType": "struct Property[]",558 "name": "",559 "type": "tuple[]"560 }561 ],562 "stateMutability": "view",563 "type": "function"564 },565 {566 "inputs": [567 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },568 { "internalType": "string", "name": "key", "type": "string" }569 ],570 "name": "property",571 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],572 "stateMutability": "view",573 "type": "function"574 },575 {576 "inputs": [577 {578 "components": [579 { "internalType": "address", "name": "eth", "type": "address" },580 { "internalType": "uint256", "name": "sub", "type": "uint256" }581 ],582 "internalType": "struct CrossAccount",583 "name": "admin",584 "type": "tuple"585 }586 ],587 "name": "removeCollectionAdminCross",588 "outputs": [],589 "stateMutability": "nonpayable",590 "type": "function"591 },592 {593 "inputs": [],594 "name": "removeCollectionSponsor",595 "outputs": [],596 "stateMutability": "nonpayable",597 "type": "function"598 },599 {600 "inputs": [601 {602 "components": [603 { "internalType": "address", "name": "eth", "type": "address" },604 { "internalType": "uint256", "name": "sub", "type": "uint256" }605 ],606 "internalType": "struct CrossAccount",607 "name": "user",608 "type": "tuple"609 }610 ],611 "name": "removeFromCollectionAllowListCross",612 "outputs": [],613 "stateMutability": "nonpayable",614 "type": "function"615 },616 {617 "inputs": [618 { "internalType": "address", "name": "from", "type": "address" },619 { "internalType": "address", "name": "to", "type": "address" },620 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }621 ],622 "name": "safeTransferFrom",623 "outputs": [],624 "stateMutability": "nonpayable",625 "type": "function"626 },627 {628 "inputs": [629 { "internalType": "address", "name": "from", "type": "address" },630 { "internalType": "address", "name": "to", "type": "address" },631 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },632 { "internalType": "bytes", "name": "data", "type": "bytes" }633 ],634 "name": "safeTransferFrom",635 "outputs": [],636 "stateMutability": "nonpayable",637 "type": "function"638 },639 {640 "inputs": [641 { "internalType": "address", "name": "operator", "type": "address" },642 { "internalType": "bool", "name": "approved", "type": "bool" }643 ],644 "name": "setApprovalForAll",645 "outputs": [],646 "stateMutability": "nonpayable",647 "type": "function"648 },649 {650 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],651 "name": "setCollectionAccess",652 "outputs": [],653 "stateMutability": "nonpayable",654 "type": "function"655 },656 {657 "inputs": [658 {659 "components": [660 {661 "internalType": "enum CollectionLimitField",662 "name": "field",663 "type": "uint8"664 },665 { "internalType": "bool", "name": "status", "type": "bool" },666 { "internalType": "uint256", "name": "value", "type": "uint256" }667 ],668 "internalType": "struct CollectionLimit",669 "name": "limit",670 "type": "tuple"671 }672 ],673 "name": "setCollectionLimit",674 "outputs": [],675 "stateMutability": "nonpayable",676 "type": "function"677 },678 {679 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],680 "name": "setCollectionMintMode",681 "outputs": [],682 "stateMutability": "nonpayable",683 "type": "function"684 },685 {686 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],687 "name": "setCollectionNesting",688 "outputs": [],689 "stateMutability": "nonpayable",690 "type": "function"691 },692 {693 "inputs": [694 { "internalType": "bool", "name": "enable", "type": "bool" },695 {696 "internalType": "address[]",697 "name": "collections",698 "type": "address[]"699 }700 ],701 "name": "setCollectionNesting",702 "outputs": [],703 "stateMutability": "nonpayable",704 "type": "function"705 },706 {707 "inputs": [708 {709 "components": [710 { "internalType": "string", "name": "key", "type": "string" },711 { "internalType": "bytes", "name": "value", "type": "bytes" }712 ],713 "internalType": "struct Property[]",714 "name": "properties",715 "type": "tuple[]"716 }717 ],718 "name": "setCollectionProperties",719 "outputs": [],720 "stateMutability": "nonpayable",721 "type": "function"722 },723 {724 "inputs": [725 {726 "components": [727 { "internalType": "address", "name": "eth", "type": "address" },728 { "internalType": "uint256", "name": "sub", "type": "uint256" }729 ],730 "internalType": "struct CrossAccount",731 "name": "sponsor",732 "type": "tuple"733 }734 ],735 "name": "setCollectionSponsorCross",736 "outputs": [],737 "stateMutability": "nonpayable",738 "type": "function"739 },740 {741 "inputs": [742 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },743 {744 "components": [745 { "internalType": "string", "name": "key", "type": "string" },746 { "internalType": "bytes", "name": "value", "type": "bytes" }747 ],748 "internalType": "struct Property[]",749 "name": "properties",750 "type": "tuple[]"751 }752 ],753 "name": "setProperties",754 "outputs": [],755 "stateMutability": "nonpayable",756 "type": "function"757 },758 {759 "inputs": [760 {761 "components": [762 { "internalType": "string", "name": "key", "type": "string" },763 {764 "components": [765 {766 "internalType": "enum TokenPermissionField",767 "name": "code",768 "type": "uint8"769 },770 { "internalType": "bool", "name": "value", "type": "bool" }771 ],772 "internalType": "struct PropertyPermission[]",773 "name": "permissions",774 "type": "tuple[]"775 }776 ],777 "internalType": "struct TokenPropertyPermission[]",778 "name": "permissions",779 "type": "tuple[]"780 }781 ],782 "name": "setTokenPropertyPermissions",783 "outputs": [],784 "stateMutability": "nonpayable",785 "type": "function"786 },787 {788 "inputs": [789 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }790 ],791 "name": "supportsInterface",792 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],793 "stateMutability": "view",794 "type": "function"795 },796 {797 "inputs": [],798 "name": "symbol",799 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],800 "stateMutability": "view",801 "type": "function"802 },803 {804 "inputs": [805 { "internalType": "uint256", "name": "index", "type": "uint256" }806 ],807 "name": "tokenByIndex",808 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],809 "stateMutability": "view",810 "type": "function"811 },812 {813 "inputs": [814 { "internalType": "address", "name": "owner", "type": "address" },815 { "internalType": "uint256", "name": "index", "type": "uint256" }816 ],817 "name": "tokenOfOwnerByIndex",818 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],819 "stateMutability": "view",820 "type": "function"821 },822 {823 "inputs": [],824 "name": "tokenPropertyPermissions",825 "outputs": [826 {827 "components": [828 { "internalType": "string", "name": "key", "type": "string" },829 {830 "components": [831 {832 "internalType": "enum TokenPermissionField",833 "name": "code",834 "type": "uint8"835 },836 { "internalType": "bool", "name": "value", "type": "bool" }837 ],838 "internalType": "struct PropertyPermission[]",839 "name": "permissions",840 "type": "tuple[]"841 }842 ],843 "internalType": "struct TokenPropertyPermission[]",844 "name": "",845 "type": "tuple[]"846 }847 ],848 "stateMutability": "view",849 "type": "function"850 },851 {852 "inputs": [853 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }854 ],855 "name": "tokenURI",856 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],857 "stateMutability": "view",858 "type": "function"859 },860 {861 "inputs": [],862 "name": "totalSupply",863 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],864 "stateMutability": "view",865 "type": "function"866 },867 {868 "inputs": [869 { "internalType": "address", "name": "to", "type": "address" },870 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }871 ],872 "name": "transfer",873 "outputs": [],874 "stateMutability": "nonpayable",875 "type": "function"876 },877 {878 "inputs": [879 {880 "components": [881 { "internalType": "address", "name": "eth", "type": "address" },882 { "internalType": "uint256", "name": "sub", "type": "uint256" }883 ],884 "internalType": "struct CrossAccount",885 "name": "to",886 "type": "tuple"887 },888 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }889 ],890 "name": "transferCross",891 "outputs": [],892 "stateMutability": "nonpayable",893 "type": "function"894 },895 {896 "inputs": [897 { "internalType": "address", "name": "from", "type": "address" },898 { "internalType": "address", "name": "to", "type": "address" },899 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }900 ],901 "name": "transferFrom",902 "outputs": [],903 "stateMutability": "nonpayable",904 "type": "function"905 },906 {907 "inputs": [908 {909 "components": [910 { "internalType": "address", "name": "eth", "type": "address" },911 { "internalType": "uint256", "name": "sub", "type": "uint256" }912 ],913 "internalType": "struct CrossAccount",914 "name": "from",915 "type": "tuple"916 },917 {918 "components": [919 { "internalType": "address", "name": "eth", "type": "address" },920 { "internalType": "uint256", "name": "sub", "type": "uint256" }921 ],922 "internalType": "struct CrossAccount",923 "name": "to",924 "type": "tuple"925 },926 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }927 ],928 "name": "transferFromCross",929 "outputs": [],930 "stateMutability": "nonpayable",931 "type": "function"932 },933 {934 "inputs": [],935 "name": "uniqueCollectionType",936 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],937 "stateMutability": "view",938 "type": "function"939 }940]1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "approved",15 "type": "address"16 },17 {18 "indexed": true,19 "internalType": "uint256",20 "name": "tokenId",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "owner",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "operator",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "bool",45 "name": "approved",46 "type": "bool"47 }48 ],49 "name": "ApprovalForAll",50 "type": "event"51 },52 {53 "anonymous": false,54 "inputs": [],55 "name": "MintingFinished",56 "type": "event"57 },58 {59 "anonymous": false,60 "inputs": [61 {62 "indexed": true,63 "internalType": "address",64 "name": "from",65 "type": "address"66 },67 {68 "indexed": true,69 "internalType": "address",70 "name": "to",71 "type": "address"72 },73 {74 "indexed": true,75 "internalType": "uint256",76 "name": "tokenId",77 "type": "uint256"78 }79 ],80 "name": "Transfer",81 "type": "event"82 },83 {84 "inputs": [85 {86 "components": [87 { "internalType": "address", "name": "eth", "type": "address" },88 { "internalType": "uint256", "name": "sub", "type": "uint256" }89 ],90 "internalType": "struct CrossAccount",91 "name": "newAdmin",92 "type": "tuple"93 }94 ],95 "name": "addCollectionAdminCross",96 "outputs": [],97 "stateMutability": "nonpayable",98 "type": "function"99 },100 {101 "inputs": [102 {103 "components": [104 { "internalType": "address", "name": "eth", "type": "address" },105 { "internalType": "uint256", "name": "sub", "type": "uint256" }106 ],107 "internalType": "struct CrossAccount",108 "name": "user",109 "type": "tuple"110 }111 ],112 "name": "addToCollectionAllowListCross",113 "outputs": [],114 "stateMutability": "nonpayable",115 "type": "function"116 },117 {118 "inputs": [119 {120 "components": [121 { "internalType": "address", "name": "eth", "type": "address" },122 { "internalType": "uint256", "name": "sub", "type": "uint256" }123 ],124 "internalType": "struct CrossAccount",125 "name": "user",126 "type": "tuple"127 }128 ],129 "name": "allowlistedCross",130 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],131 "stateMutability": "view",132 "type": "function"133 },134 {135 "inputs": [136 { "internalType": "address", "name": "approved", "type": "address" },137 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }138 ],139 "name": "approve",140 "outputs": [],141 "stateMutability": "nonpayable",142 "type": "function"143 },144 {145 "inputs": [146 {147 "components": [148 { "internalType": "address", "name": "eth", "type": "address" },149 { "internalType": "uint256", "name": "sub", "type": "uint256" }150 ],151 "internalType": "struct CrossAccount",152 "name": "approved",153 "type": "tuple"154 },155 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }156 ],157 "name": "approveCross",158 "outputs": [],159 "stateMutability": "nonpayable",160 "type": "function"161 },162 {163 "inputs": [164 { "internalType": "address", "name": "owner", "type": "address" }165 ],166 "name": "balanceOf",167 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],168 "stateMutability": "view",169 "type": "function"170 },171 {172 "inputs": [173 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }174 ],175 "name": "burn",176 "outputs": [],177 "stateMutability": "nonpayable",178 "type": "function"179 },180 {181 "inputs": [182 {183 "components": [184 { "internalType": "address", "name": "eth", "type": "address" },185 { "internalType": "uint256", "name": "sub", "type": "uint256" }186 ],187 "internalType": "struct CrossAccount",188 "name": "from",189 "type": "tuple"190 },191 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }192 ],193 "name": "burnFromCross",194 "outputs": [],195 "stateMutability": "nonpayable",196 "type": "function"197 },198 {199 "inputs": [200 {201 "components": [202 { "internalType": "address", "name": "eth", "type": "address" },203 { "internalType": "uint256", "name": "sub", "type": "uint256" }204 ],205 "internalType": "struct CrossAccount",206 "name": "newOwner",207 "type": "tuple"208 }209 ],210 "name": "changeCollectionOwnerCross",211 "outputs": [],212 "stateMutability": "nonpayable",213 "type": "function"214 },215 {216 "inputs": [],217 "name": "collectionAdmins",218 "outputs": [219 {220 "components": [221 { "internalType": "address", "name": "eth", "type": "address" },222 { "internalType": "uint256", "name": "sub", "type": "uint256" }223 ],224 "internalType": "struct CrossAccount[]",225 "name": "",226 "type": "tuple[]"227 }228 ],229 "stateMutability": "view",230 "type": "function"231 },232 {233 "inputs": [],234 "name": "collectionHelperAddress",235 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],236 "stateMutability": "view",237 "type": "function"238 },239 {240 "inputs": [],241 "name": "collectionLimits",242 "outputs": [243 {244 "components": [245 {246 "internalType": "enum CollectionLimitField",247 "name": "field",248 "type": "uint8"249 },250 {251 "components": [252 { "internalType": "bool", "name": "status", "type": "bool" },253 { "internalType": "uint256", "name": "value", "type": "uint256" }254 ],255 "internalType": "struct OptionUint",256 "name": "value",257 "type": "tuple"258 }259 ],260 "internalType": "struct CollectionLimit[]",261 "name": "",262 "type": "tuple[]"263 }264 ],265 "stateMutability": "view",266 "type": "function"267 },268 {269 "inputs": [],270 "name": "collectionNestingPermissions",271 "outputs": [272 {273 "components": [274 {275 "internalType": "enum CollectionPermissions",276 "name": "field_0",277 "type": "uint8"278 },279 { "internalType": "bool", "name": "field_1", "type": "bool" }280 ],281 "internalType": "struct Tuple48[]",282 "name": "",283 "type": "tuple[]"284 }285 ],286 "stateMutability": "view",287 "type": "function"288 },289 {290 "inputs": [],291 "name": "collectionNestingRestrictedCollectionIds",292 "outputs": [293 {294 "components": [295 { "internalType": "bool", "name": "field_0", "type": "bool" },296 {297 "internalType": "uint256[]",298 "name": "field_1",299 "type": "uint256[]"300 }301 ],302 "internalType": "struct Tuple45",303 "name": "",304 "type": "tuple"305 }306 ],307 "stateMutability": "view",308 "type": "function"309 },310 {311 "inputs": [],312 "name": "collectionOwner",313 "outputs": [314 {315 "components": [316 { "internalType": "address", "name": "eth", "type": "address" },317 { "internalType": "uint256", "name": "sub", "type": "uint256" }318 ],319 "internalType": "struct CrossAccount",320 "name": "",321 "type": "tuple"322 }323 ],324 "stateMutability": "view",325 "type": "function"326 },327 {328 "inputs": [329 { "internalType": "string[]", "name": "keys", "type": "string[]" }330 ],331 "name": "collectionProperties",332 "outputs": [333 {334 "components": [335 { "internalType": "string", "name": "key", "type": "string" },336 { "internalType": "bytes", "name": "value", "type": "bytes" }337 ],338 "internalType": "struct Property[]",339 "name": "",340 "type": "tuple[]"341 }342 ],343 "stateMutability": "view",344 "type": "function"345 },346 {347 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],348 "name": "collectionProperty",349 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],350 "stateMutability": "view",351 "type": "function"352 },353 {354 "inputs": [],355 "name": "collectionSponsor",356 "outputs": [357 {358 "components": [359 { "internalType": "address", "name": "eth", "type": "address" },360 { "internalType": "uint256", "name": "sub", "type": "uint256" }361 ],362 "internalType": "struct CrossAccount",363 "name": "",364 "type": "tuple"365 }366 ],367 "stateMutability": "view",368 "type": "function"369 },370 {371 "inputs": [],372 "name": "confirmCollectionSponsorship",373 "outputs": [],374 "stateMutability": "nonpayable",375 "type": "function"376 },377 {378 "inputs": [],379 "name": "contractAddress",380 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],381 "stateMutability": "view",382 "type": "function"383 },384 {385 "inputs": [386 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }387 ],388 "name": "crossOwnerOf",389 "outputs": [390 {391 "components": [392 { "internalType": "address", "name": "eth", "type": "address" },393 { "internalType": "uint256", "name": "sub", "type": "uint256" }394 ],395 "internalType": "struct CrossAccount",396 "name": "",397 "type": "tuple"398 }399 ],400 "stateMutability": "view",401 "type": "function"402 },403 {404 "inputs": [405 { "internalType": "string[]", "name": "keys", "type": "string[]" }406 ],407 "name": "deleteCollectionProperties",408 "outputs": [],409 "stateMutability": "nonpayable",410 "type": "function"411 },412 {413 "inputs": [414 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },415 { "internalType": "string[]", "name": "keys", "type": "string[]" }416 ],417 "name": "deleteProperties",418 "outputs": [],419 "stateMutability": "nonpayable",420 "type": "function"421 },422 {423 "inputs": [],424 "name": "description",425 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],426 "stateMutability": "view",427 "type": "function"428 },429 {430 "inputs": [],431 "name": "finishMinting",432 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],433 "stateMutability": "nonpayable",434 "type": "function"435 },436 {437 "inputs": [438 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }439 ],440 "name": "getApproved",441 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],442 "stateMutability": "view",443 "type": "function"444 },445 {446 "inputs": [],447 "name": "hasCollectionPendingSponsor",448 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],449 "stateMutability": "view",450 "type": "function"451 },452 {453 "inputs": [454 { "internalType": "address", "name": "owner", "type": "address" },455 { "internalType": "address", "name": "operator", "type": "address" }456 ],457 "name": "isApprovedForAll",458 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],459 "stateMutability": "view",460 "type": "function"461 },462 {463 "inputs": [464 {465 "components": [466 { "internalType": "address", "name": "eth", "type": "address" },467 { "internalType": "uint256", "name": "sub", "type": "uint256" }468 ],469 "internalType": "struct CrossAccount",470 "name": "user",471 "type": "tuple"472 }473 ],474 "name": "isOwnerOrAdminCross",475 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],476 "stateMutability": "view",477 "type": "function"478 },479 {480 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],481 "name": "mint",482 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],483 "stateMutability": "nonpayable",484 "type": "function"485 },486 {487 "inputs": [488 {489 "components": [490 { "internalType": "address", "name": "eth", "type": "address" },491 { "internalType": "uint256", "name": "sub", "type": "uint256" }492 ],493 "internalType": "struct CrossAccount",494 "name": "to",495 "type": "tuple"496 },497 {498 "components": [499 { "internalType": "string", "name": "key", "type": "string" },500 { "internalType": "bytes", "name": "value", "type": "bytes" }501 ],502 "internalType": "struct Property[]",503 "name": "properties",504 "type": "tuple[]"505 }506 ],507 "name": "mintCross",508 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],509 "stateMutability": "nonpayable",510 "type": "function"511 },512 {513 "inputs": [514 { "internalType": "address", "name": "to", "type": "address" },515 { "internalType": "string", "name": "tokenUri", "type": "string" }516 ],517 "name": "mintWithTokenURI",518 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],519 "stateMutability": "nonpayable",520 "type": "function"521 },522 {523 "inputs": [],524 "name": "mintingFinished",525 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],526 "stateMutability": "view",527 "type": "function"528 },529 {530 "inputs": [],531 "name": "name",532 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],533 "stateMutability": "view",534 "type": "function"535 },536 {537 "inputs": [],538 "name": "nextTokenId",539 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],540 "stateMutability": "view",541 "type": "function"542 },543 {544 "inputs": [545 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }546 ],547 "name": "ownerOf",548 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],549 "stateMutability": "view",550 "type": "function"551 },552 {553 "inputs": [554 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },555 { "internalType": "string[]", "name": "keys", "type": "string[]" }556 ],557 "name": "properties",558 "outputs": [559 {560 "components": [561 { "internalType": "string", "name": "key", "type": "string" },562 { "internalType": "bytes", "name": "value", "type": "bytes" }563 ],564 "internalType": "struct Property[]",565 "name": "",566 "type": "tuple[]"567 }568 ],569 "stateMutability": "view",570 "type": "function"571 },572 {573 "inputs": [574 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },575 { "internalType": "string", "name": "key", "type": "string" }576 ],577 "name": "property",578 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],579 "stateMutability": "view",580 "type": "function"581 },582 {583 "inputs": [584 {585 "components": [586 { "internalType": "address", "name": "eth", "type": "address" },587 { "internalType": "uint256", "name": "sub", "type": "uint256" }588 ],589 "internalType": "struct CrossAccount",590 "name": "admin",591 "type": "tuple"592 }593 ],594 "name": "removeCollectionAdminCross",595 "outputs": [],596 "stateMutability": "nonpayable",597 "type": "function"598 },599 {600 "inputs": [],601 "name": "removeCollectionSponsor",602 "outputs": [],603 "stateMutability": "nonpayable",604 "type": "function"605 },606 {607 "inputs": [608 {609 "components": [610 { "internalType": "address", "name": "eth", "type": "address" },611 { "internalType": "uint256", "name": "sub", "type": "uint256" }612 ],613 "internalType": "struct CrossAccount",614 "name": "user",615 "type": "tuple"616 }617 ],618 "name": "removeFromCollectionAllowListCross",619 "outputs": [],620 "stateMutability": "nonpayable",621 "type": "function"622 },623 {624 "inputs": [625 { "internalType": "address", "name": "from", "type": "address" },626 { "internalType": "address", "name": "to", "type": "address" },627 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }628 ],629 "name": "safeTransferFrom",630 "outputs": [],631 "stateMutability": "nonpayable",632 "type": "function"633 },634 {635 "inputs": [636 { "internalType": "address", "name": "from", "type": "address" },637 { "internalType": "address", "name": "to", "type": "address" },638 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },639 { "internalType": "bytes", "name": "data", "type": "bytes" }640 ],641 "name": "safeTransferFrom",642 "outputs": [],643 "stateMutability": "nonpayable",644 "type": "function"645 },646 {647 "inputs": [648 { "internalType": "address", "name": "operator", "type": "address" },649 { "internalType": "bool", "name": "approved", "type": "bool" }650 ],651 "name": "setApprovalForAll",652 "outputs": [],653 "stateMutability": "nonpayable",654 "type": "function"655 },656 {657 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],658 "name": "setCollectionAccess",659 "outputs": [],660 "stateMutability": "nonpayable",661 "type": "function"662 },663 {664 "inputs": [665 {666 "components": [667 {668 "internalType": "enum CollectionLimitField",669 "name": "field",670 "type": "uint8"671 },672 {673 "components": [674 { "internalType": "bool", "name": "status", "type": "bool" },675 { "internalType": "uint256", "name": "value", "type": "uint256" }676 ],677 "internalType": "struct OptionUint",678 "name": "value",679 "type": "tuple"680 }681 ],682 "internalType": "struct CollectionLimit",683 "name": "limit",684 "type": "tuple"685 }686 ],687 "name": "setCollectionLimit",688 "outputs": [],689 "stateMutability": "nonpayable",690 "type": "function"691 },692 {693 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],694 "name": "setCollectionMintMode",695 "outputs": [],696 "stateMutability": "nonpayable",697 "type": "function"698 },699 {700 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],701 "name": "setCollectionNesting",702 "outputs": [],703 "stateMutability": "nonpayable",704 "type": "function"705 },706 {707 "inputs": [708 { "internalType": "bool", "name": "enable", "type": "bool" },709 {710 "internalType": "address[]",711 "name": "collections",712 "type": "address[]"713 }714 ],715 "name": "setCollectionNesting",716 "outputs": [],717 "stateMutability": "nonpayable",718 "type": "function"719 },720 {721 "inputs": [722 {723 "components": [724 { "internalType": "string", "name": "key", "type": "string" },725 { "internalType": "bytes", "name": "value", "type": "bytes" }726 ],727 "internalType": "struct Property[]",728 "name": "properties",729 "type": "tuple[]"730 }731 ],732 "name": "setCollectionProperties",733 "outputs": [],734 "stateMutability": "nonpayable",735 "type": "function"736 },737 {738 "inputs": [739 {740 "components": [741 { "internalType": "address", "name": "eth", "type": "address" },742 { "internalType": "uint256", "name": "sub", "type": "uint256" }743 ],744 "internalType": "struct CrossAccount",745 "name": "sponsor",746 "type": "tuple"747 }748 ],749 "name": "setCollectionSponsorCross",750 "outputs": [],751 "stateMutability": "nonpayable",752 "type": "function"753 },754 {755 "inputs": [756 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },757 {758 "components": [759 { "internalType": "string", "name": "key", "type": "string" },760 { "internalType": "bytes", "name": "value", "type": "bytes" }761 ],762 "internalType": "struct Property[]",763 "name": "properties",764 "type": "tuple[]"765 }766 ],767 "name": "setProperties",768 "outputs": [],769 "stateMutability": "nonpayable",770 "type": "function"771 },772 {773 "inputs": [774 {775 "components": [776 { "internalType": "string", "name": "key", "type": "string" },777 {778 "components": [779 {780 "internalType": "enum TokenPermissionField",781 "name": "code",782 "type": "uint8"783 },784 { "internalType": "bool", "name": "value", "type": "bool" }785 ],786 "internalType": "struct PropertyPermission[]",787 "name": "permissions",788 "type": "tuple[]"789 }790 ],791 "internalType": "struct TokenPropertyPermission[]",792 "name": "permissions",793 "type": "tuple[]"794 }795 ],796 "name": "setTokenPropertyPermissions",797 "outputs": [],798 "stateMutability": "nonpayable",799 "type": "function"800 },801 {802 "inputs": [803 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }804 ],805 "name": "supportsInterface",806 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],807 "stateMutability": "view",808 "type": "function"809 },810 {811 "inputs": [],812 "name": "symbol",813 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],814 "stateMutability": "view",815 "type": "function"816 },817 {818 "inputs": [819 { "internalType": "uint256", "name": "index", "type": "uint256" }820 ],821 "name": "tokenByIndex",822 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],823 "stateMutability": "view",824 "type": "function"825 },826 {827 "inputs": [828 { "internalType": "address", "name": "owner", "type": "address" },829 { "internalType": "uint256", "name": "index", "type": "uint256" }830 ],831 "name": "tokenOfOwnerByIndex",832 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],833 "stateMutability": "view",834 "type": "function"835 },836 {837 "inputs": [],838 "name": "tokenPropertyPermissions",839 "outputs": [840 {841 "components": [842 { "internalType": "string", "name": "key", "type": "string" },843 {844 "components": [845 {846 "internalType": "enum TokenPermissionField",847 "name": "code",848 "type": "uint8"849 },850 { "internalType": "bool", "name": "value", "type": "bool" }851 ],852 "internalType": "struct PropertyPermission[]",853 "name": "permissions",854 "type": "tuple[]"855 }856 ],857 "internalType": "struct TokenPropertyPermission[]",858 "name": "",859 "type": "tuple[]"860 }861 ],862 "stateMutability": "view",863 "type": "function"864 },865 {866 "inputs": [867 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }868 ],869 "name": "tokenURI",870 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],871 "stateMutability": "view",872 "type": "function"873 },874 {875 "inputs": [],876 "name": "totalSupply",877 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],878 "stateMutability": "view",879 "type": "function"880 },881 {882 "inputs": [883 { "internalType": "address", "name": "to", "type": "address" },884 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }885 ],886 "name": "transfer",887 "outputs": [],888 "stateMutability": "nonpayable",889 "type": "function"890 },891 {892 "inputs": [893 {894 "components": [895 { "internalType": "address", "name": "eth", "type": "address" },896 { "internalType": "uint256", "name": "sub", "type": "uint256" }897 ],898 "internalType": "struct CrossAccount",899 "name": "to",900 "type": "tuple"901 },902 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }903 ],904 "name": "transferCross",905 "outputs": [],906 "stateMutability": "nonpayable",907 "type": "function"908 },909 {910 "inputs": [911 { "internalType": "address", "name": "from", "type": "address" },912 { "internalType": "address", "name": "to", "type": "address" },913 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }914 ],915 "name": "transferFrom",916 "outputs": [],917 "stateMutability": "nonpayable",918 "type": "function"919 },920 {921 "inputs": [922 {923 "components": [924 { "internalType": "address", "name": "eth", "type": "address" },925 { "internalType": "uint256", "name": "sub", "type": "uint256" }926 ],927 "internalType": "struct CrossAccount",928 "name": "from",929 "type": "tuple"930 },931 {932 "components": [933 { "internalType": "address", "name": "eth", "type": "address" },934 { "internalType": "uint256", "name": "sub", "type": "uint256" }935 ],936 "internalType": "struct CrossAccount",937 "name": "to",938 "type": "tuple"939 },940 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }941 ],942 "name": "transferFromCross",943 "outputs": [],944 "stateMutability": "nonpayable",945 "type": "function"946 },947 {948 "inputs": [],949 "name": "uniqueCollectionType",950 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],951 "stateMutability": "view",952 "type": "function"953 }954]tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -229,8 +229,15 @@
"name": "field",
"type": "uint8"
},
- { "internalType": "bool", "name": "status", "type": "bool" },
- { "internalType": "uint256", "name": "value", "type": "uint256" }
+ {
+ "components": [
+ { "internalType": "bool", "name": "status", "type": "bool" },
+ { "internalType": "uint256", "name": "value", "type": "uint256" }
+ ],
+ "internalType": "struct OptionUint",
+ "name": "value",
+ "type": "tuple"
+ }
],
"internalType": "struct CollectionLimit[]",
"name": "",
@@ -253,7 +260,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple44[]",
+ "internalType": "struct Tuple47[]",
"name": "",
"type": "tuple[]"
}
@@ -274,7 +281,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple41",
+ "internalType": "struct Tuple44",
"name": "",
"type": "tuple"
}
@@ -644,8 +651,15 @@
"name": "field",
"type": "uint8"
},
- { "internalType": "bool", "name": "status", "type": "bool" },
- { "internalType": "uint256", "name": "value", "type": "uint256" }
+ {
+ "components": [
+ { "internalType": "bool", "name": "status", "type": "bool" },
+ { "internalType": "uint256", "name": "value", "type": "uint256" }
+ ],
+ "internalType": "struct OptionUint",
+ "name": "value",
+ "type": "tuple"
+ }
],
"internalType": "struct CollectionLimit",
"name": "limit",
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,7 +13,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
interface Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -114,8 +114,8 @@
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Some limit.
- /// @dev EVM selector for this function is: 0x2a2235e7,
- /// or in textual repr: setCollectionLimit((uint8,bool,uint256))
+ /// @dev EVM selector for this function is: 0x2316ee74,
+ /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
function setCollectionLimit(CollectionLimit memory limit) external;
/// Get contract address.
@@ -166,12 +166,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple26 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple28 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple29[] memory);
+ function collectionNestingPermissions() external view returns (Tuple31[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -286,7 +286,7 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple31 {
CollectionPermissions field_0;
bool field_1;
}
@@ -300,7 +300,7 @@
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple28 {
bool field_0;
uint256[] field_1;
}
@@ -308,6 +308,10 @@
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
+ OptionUint value;
+}
+
+struct OptionUint {
bool status;
uint256 value;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -115,7 +115,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
interface Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -216,8 +216,8 @@
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Some limit.
- /// @dev EVM selector for this function is: 0x2a2235e7,
- /// or in textual repr: setCollectionLimit((uint8,bool,uint256))
+ /// @dev EVM selector for this function is: 0x2316ee74,
+ /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
function setCollectionLimit(CollectionLimit memory limit) external;
/// Get contract address.
@@ -268,12 +268,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple36 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple38 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple39[] memory);
+ function collectionNestingPermissions() external view returns (Tuple41[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -388,7 +388,7 @@
}
/// @dev anonymous struct
-struct Tuple39 {
+struct Tuple41 {
CollectionPermissions field_0;
bool field_1;
}
@@ -402,7 +402,7 @@
}
/// @dev anonymous struct
-struct Tuple36 {
+struct Tuple38 {
bool field_0;
uint256[] field_1;
}
@@ -410,6 +410,10 @@
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
+ OptionUint value;
+}
+
+struct OptionUint {
bool status;
uint256 value;
}
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -115,7 +115,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x23201442
+/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
interface Collection is Dummy, ERC165 {
// /// Set collection property.
// ///
@@ -216,8 +216,8 @@
/// Set limits for the collection.
/// @dev Throws error if limit not found.
/// @param limit Some limit.
- /// @dev EVM selector for this function is: 0x2a2235e7,
- /// or in textual repr: setCollectionLimit((uint8,bool,uint256))
+ /// @dev EVM selector for this function is: 0x2316ee74,
+ /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
function setCollectionLimit(CollectionLimit memory limit) external;
/// Get contract address.
@@ -268,12 +268,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple37 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple38[] memory);
+ function collectionNestingPermissions() external view returns (Tuple40[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -388,7 +388,7 @@
}
/// @dev anonymous struct
-struct Tuple38 {
+struct Tuple40 {
CollectionPermissions field_0;
bool field_1;
}
@@ -402,7 +402,7 @@
}
/// @dev anonymous struct
-struct Tuple35 {
+struct Tuple37 {
bool field_0;
uint256[] field_1;
}
@@ -410,6 +410,10 @@
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
+ OptionUint value;
+}
+
+struct OptionUint {
bool status;
uint256 value;
}
tests/src/eth/collectionLimits.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionLimits.test.ts
+++ b/tests/src/eth/collectionLimits.test.ts
@@ -46,15 +46,15 @@
};
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, testCase.case, owner);
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: limits.accountTokenOwnershipLimit}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, status: true, value: limits.sponsoredDataSize}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataRateLimit, status: true, value: limits.sponsoredDataRateLimit}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TokenLimit, status: true, value: limits.tokenLimit}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorTransferTimeout, status: true, value: limits.sponsorTransferTimeout}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorApproveTimeout, status: true, value: limits.sponsorApproveTimeout}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, status: true, value: limits.ownerCanTransfer}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanDestroy, status: true, value: limits.ownerCanDestroy}).send();
- await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TransferEnabled, status: true, value: limits.transfersEnabled}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: limits.accountTokenOwnershipLimit}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, value: {status: true, value: limits.sponsoredDataSize}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataRateLimit, value: {status: true, value: limits.sponsoredDataRateLimit}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TokenLimit, value: {status: true, value: limits.tokenLimit}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorTransferTimeout, value: {status: true, value: limits.sponsorTransferTimeout}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorApproveTimeout, value: {status: true, value: limits.sponsorApproveTimeout}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, value: {status: true, value: limits.ownerCanTransfer}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanDestroy, value: {status: true, value: limits.ownerCanDestroy}}).send();
+ await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TransferEnabled, value: {status: true, value: limits.transfersEnabled}}).send();
// Check limits from sub:
const data = (await helper.rft.getData(collectionId))!;
@@ -63,15 +63,15 @@
// Check limits from eth:
const limitsEvm = await collectionEvm.methods.collectionLimits().call({from: owner});
expect(limitsEvm).to.have.length(9);
- expect(limitsEvm[0]).to.deep.eq([CollectionLimitField.AccountTokenOwnership.toString(), true, limits.accountTokenOwnershipLimit.toString()]);
- expect(limitsEvm[1]).to.deep.eq([CollectionLimitField.SponsoredDataSize.toString(), true, limits.sponsoredDataSize.toString()]);
- expect(limitsEvm[2]).to.deep.eq([CollectionLimitField.SponsoredDataRateLimit.toString(), true, limits.sponsoredDataRateLimit.toString()]);
- expect(limitsEvm[3]).to.deep.eq([CollectionLimitField.TokenLimit.toString(), true, limits.tokenLimit.toString()]);
- expect(limitsEvm[4]).to.deep.eq([CollectionLimitField.SponsorTransferTimeout.toString(), true, limits.sponsorTransferTimeout.toString()]);
- expect(limitsEvm[5]).to.deep.eq([CollectionLimitField.SponsorApproveTimeout.toString(), true, limits.sponsorApproveTimeout.toString()]);
- expect(limitsEvm[6]).to.deep.eq([CollectionLimitField.OwnerCanTransfer.toString(), true, limits.ownerCanTransfer.toString()]);
- expect(limitsEvm[7]).to.deep.eq([CollectionLimitField.OwnerCanDestroy.toString(), true, limits.ownerCanDestroy.toString()]);
- expect(limitsEvm[8]).to.deep.eq([CollectionLimitField.TransferEnabled.toString(), true, limits.transfersEnabled.toString()]);
+ expect(limitsEvm[0]).to.deep.eq([CollectionLimitField.AccountTokenOwnership.toString(), [true, limits.accountTokenOwnershipLimit.toString()]]);
+ expect(limitsEvm[1]).to.deep.eq([CollectionLimitField.SponsoredDataSize.toString(), [true, limits.sponsoredDataSize.toString()]]);
+ expect(limitsEvm[2]).to.deep.eq([CollectionLimitField.SponsoredDataRateLimit.toString(), [true, limits.sponsoredDataRateLimit.toString()]]);
+ expect(limitsEvm[3]).to.deep.eq([CollectionLimitField.TokenLimit.toString(), [true, limits.tokenLimit.toString()]]);
+ expect(limitsEvm[4]).to.deep.eq([CollectionLimitField.SponsorTransferTimeout.toString(), [true, limits.sponsorTransferTimeout.toString()]]);
+ expect(limitsEvm[5]).to.deep.eq([CollectionLimitField.SponsorApproveTimeout.toString(), [true, limits.sponsorApproveTimeout.toString()]]);
+ expect(limitsEvm[6]).to.deep.eq([CollectionLimitField.OwnerCanTransfer.toString(), [true, limits.ownerCanTransfer.toString()]]);
+ expect(limitsEvm[7]).to.deep.eq([CollectionLimitField.OwnerCanDestroy.toString(), [true, limits.ownerCanDestroy.toString()]]);
+ expect(limitsEvm[8]).to.deep.eq([CollectionLimitField.TransferEnabled.toString(), [true, limits.transfersEnabled.toString()]]);
}));
});
@@ -101,24 +101,24 @@
// Cannot set non-existing limit
await expect(collectionEvm.methods
- .setCollectionLimit({field: 9, status: true, value: 1})
+ .setCollectionLimit({field: 9, value: {status: true, value: 1}})
.call()).to.be.rejectedWith('Value not convertible into enum "CollectionLimitField"');
// Cannot disable limits
await expect(collectionEvm.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: false, value: 200})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: false, value: 200}})
.call()).to.be.rejectedWith('user can\'t disable limits');
await expect(collectionEvm.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: invalidLimits.accountTokenOwnershipLimit})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: invalidLimits.accountTokenOwnershipLimit}})
.call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);
await expect(collectionEvm.methods
- .setCollectionLimit({field: CollectionLimitField.TransferEnabled, status: true, value: 3})
+ .setCollectionLimit({field: CollectionLimitField.TransferEnabled, value: {status: true, value: 3}})
.call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);
expect(() => collectionEvm.methods
- .setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, status: true, value: -1}).send()).to.throw('value out-of-bounds');
+ .setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, value: {status: true, value: -1}}).send()).to.throw('value out-of-bounds');
}));
[
@@ -133,12 +133,12 @@
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, testCase.case, owner);
await expect(collectionEvm.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.call({from: nonOwner}))
.to.be.rejectedWith('NoPermission');
await expect(collectionEvm.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.send({from: nonOwner}))
.to.be.rejected;
}));
tests/src/eth/createFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -197,7 +197,7 @@
}
{
await expect(peasantCollection.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
});
@@ -222,7 +222,7 @@
}
{
await expect(peasantCollection.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
});
tests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -208,7 +208,7 @@
}
{
await expect(malfeasantCollection.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
});
@@ -233,7 +233,7 @@
}
{
await expect(malfeasantCollection.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
});
tests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -240,7 +240,7 @@
}
{
await expect(peasantCollection.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
});
@@ -265,7 +265,7 @@
}
{
await expect(peasantCollection.methods
- .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
+ .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}})
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
});
tests/src/eth/events.test.tsdiffbeforeafterboth--- a/tests/src/eth/events.test.ts
+++ b/tests/src/eth/events.test.ts
@@ -233,7 +233,7 @@
});
const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionLimitSet']}]);
{
- await collection.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, status: true, value: 0}).send({from: owner});
+ await collection.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, value: {status: true, value: 0}}).send({from: owner});
await helper.wait.newBlocks(1);
expect(ethEvents).to.containSubset([
{
tests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -13,6 +13,12 @@
event: string,
args: { [key: string]: string }
};
+
+export interface OptionUint {
+ status: boolean,
+ value: bigint,
+}
+
export interface TEthCrossAccount {
readonly eth: string,
readonly sub: string | Uint8Array,
@@ -40,6 +46,5 @@
export interface CollectionLimit {
field: CollectionLimitField,
- status: boolean,
- value: bigint | number,
+ value: OptionUint,
}