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.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": "spender",15 "type": "address"16 },17 {18 "indexed": false,19 "internalType": "uint256",20 "name": "value",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": "from",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "to",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "uint256",45 "name": "value",46 "type": "uint256"47 }48 ],49 "name": "Transfer",50 "type": "event"51 },52 {53 "inputs": [54 {55 "components": [56 { "internalType": "address", "name": "eth", "type": "address" },57 { "internalType": "uint256", "name": "sub", "type": "uint256" }58 ],59 "internalType": "struct CrossAccount",60 "name": "newAdmin",61 "type": "tuple"62 }63 ],64 "name": "addCollectionAdminCross",65 "outputs": [],66 "stateMutability": "nonpayable",67 "type": "function"68 },69 {70 "inputs": [71 {72 "components": [73 { "internalType": "address", "name": "eth", "type": "address" },74 { "internalType": "uint256", "name": "sub", "type": "uint256" }75 ],76 "internalType": "struct CrossAccount",77 "name": "user",78 "type": "tuple"79 }80 ],81 "name": "addToCollectionAllowListCross",82 "outputs": [],83 "stateMutability": "nonpayable",84 "type": "function"85 },86 {87 "inputs": [88 { "internalType": "address", "name": "owner", "type": "address" },89 { "internalType": "address", "name": "spender", "type": "address" }90 ],91 "name": "allowance",92 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],93 "stateMutability": "view",94 "type": "function"95 },96 {97 "inputs": [98 {99 "components": [100 { "internalType": "address", "name": "eth", "type": "address" },101 { "internalType": "uint256", "name": "sub", "type": "uint256" }102 ],103 "internalType": "struct CrossAccount",104 "name": "user",105 "type": "tuple"106 }107 ],108 "name": "allowlistedCross",109 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],110 "stateMutability": "view",111 "type": "function"112 },113 {114 "inputs": [115 { "internalType": "address", "name": "spender", "type": "address" },116 { "internalType": "uint256", "name": "amount", "type": "uint256" }117 ],118 "name": "approve",119 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],120 "stateMutability": "nonpayable",121 "type": "function"122 },123 {124 "inputs": [125 {126 "components": [127 { "internalType": "address", "name": "eth", "type": "address" },128 { "internalType": "uint256", "name": "sub", "type": "uint256" }129 ],130 "internalType": "struct CrossAccount",131 "name": "spender",132 "type": "tuple"133 },134 { "internalType": "uint256", "name": "amount", "type": "uint256" }135 ],136 "name": "approveCross",137 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],138 "stateMutability": "nonpayable",139 "type": "function"140 },141 {142 "inputs": [143 { "internalType": "address", "name": "owner", "type": "address" }144 ],145 "name": "balanceOf",146 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],147 "stateMutability": "view",148 "type": "function"149 },150 {151 "inputs": [152 {153 "components": [154 { "internalType": "address", "name": "eth", "type": "address" },155 { "internalType": "uint256", "name": "sub", "type": "uint256" }156 ],157 "internalType": "struct CrossAccount",158 "name": "from",159 "type": "tuple"160 },161 { "internalType": "uint256", "name": "amount", "type": "uint256" }162 ],163 "name": "burnFromCross",164 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],165 "stateMutability": "nonpayable",166 "type": "function"167 },168 {169 "inputs": [170 {171 "components": [172 { "internalType": "address", "name": "eth", "type": "address" },173 { "internalType": "uint256", "name": "sub", "type": "uint256" }174 ],175 "internalType": "struct CrossAccount",176 "name": "newOwner",177 "type": "tuple"178 }179 ],180 "name": "changeCollectionOwnerCross",181 "outputs": [],182 "stateMutability": "nonpayable",183 "type": "function"184 },185 {186 "inputs": [],187 "name": "collectionAdmins",188 "outputs": [189 {190 "components": [191 { "internalType": "address", "name": "eth", "type": "address" },192 { "internalType": "uint256", "name": "sub", "type": "uint256" }193 ],194 "internalType": "struct CrossAccount[]",195 "name": "",196 "type": "tuple[]"197 }198 ],199 "stateMutability": "view",200 "type": "function"201 },202 {203 "inputs": [],204 "name": "collectionHelperAddress",205 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],206 "stateMutability": "view",207 "type": "function"208 },209 {210 "inputs": [],211 "name": "collectionLimits",212 "outputs": [213 {214 "components": [215 {216 "internalType": "enum CollectionLimitField",217 "name": "field",218 "type": "uint8"219 },220 { "internalType": "bool", "name": "status", "type": "bool" },221 { "internalType": "uint256", "name": "value", "type": "uint256" }222 ],223 "internalType": "struct CollectionLimit[]",224 "name": "",225 "type": "tuple[]"226 }227 ],228 "stateMutability": "view",229 "type": "function"230 },231 {232 "inputs": [],233 "name": "collectionNestingPermissions",234 "outputs": [235 {236 "components": [237 {238 "internalType": "enum CollectionPermissions",239 "name": "field_0",240 "type": "uint8"241 },242 { "internalType": "bool", "name": "field_1", "type": "bool" }243 ],244 "internalType": "struct Tuple33[]",245 "name": "",246 "type": "tuple[]"247 }248 ],249 "stateMutability": "view",250 "type": "function"251 },252 {253 "inputs": [],254 "name": "collectionNestingRestrictedCollectionIds",255 "outputs": [256 {257 "components": [258 { "internalType": "bool", "name": "field_0", "type": "bool" },259 {260 "internalType": "uint256[]",261 "name": "field_1",262 "type": "uint256[]"263 }264 ],265 "internalType": "struct Tuple30",266 "name": "",267 "type": "tuple"268 }269 ],270 "stateMutability": "view",271 "type": "function"272 },273 {274 "inputs": [],275 "name": "collectionOwner",276 "outputs": [277 {278 "components": [279 { "internalType": "address", "name": "eth", "type": "address" },280 { "internalType": "uint256", "name": "sub", "type": "uint256" }281 ],282 "internalType": "struct CrossAccount",283 "name": "",284 "type": "tuple"285 }286 ],287 "stateMutability": "view",288 "type": "function"289 },290 {291 "inputs": [292 { "internalType": "string[]", "name": "keys", "type": "string[]" }293 ],294 "name": "collectionProperties",295 "outputs": [296 {297 "components": [298 { "internalType": "string", "name": "key", "type": "string" },299 { "internalType": "bytes", "name": "value", "type": "bytes" }300 ],301 "internalType": "struct Property[]",302 "name": "",303 "type": "tuple[]"304 }305 ],306 "stateMutability": "view",307 "type": "function"308 },309 {310 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],311 "name": "collectionProperty",312 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],313 "stateMutability": "view",314 "type": "function"315 },316 {317 "inputs": [],318 "name": "collectionSponsor",319 "outputs": [320 {321 "components": [322 { "internalType": "address", "name": "eth", "type": "address" },323 { "internalType": "uint256", "name": "sub", "type": "uint256" }324 ],325 "internalType": "struct CrossAccount",326 "name": "",327 "type": "tuple"328 }329 ],330 "stateMutability": "view",331 "type": "function"332 },333 {334 "inputs": [],335 "name": "confirmCollectionSponsorship",336 "outputs": [],337 "stateMutability": "nonpayable",338 "type": "function"339 },340 {341 "inputs": [],342 "name": "contractAddress",343 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],344 "stateMutability": "view",345 "type": "function"346 },347 {348 "inputs": [],349 "name": "decimals",350 "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }],351 "stateMutability": "view",352 "type": "function"353 },354 {355 "inputs": [356 { "internalType": "string[]", "name": "keys", "type": "string[]" }357 ],358 "name": "deleteCollectionProperties",359 "outputs": [],360 "stateMutability": "nonpayable",361 "type": "function"362 },363 {364 "inputs": [],365 "name": "description",366 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],367 "stateMutability": "view",368 "type": "function"369 },370 {371 "inputs": [],372 "name": "hasCollectionPendingSponsor",373 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],374 "stateMutability": "view",375 "type": "function"376 },377 {378 "inputs": [379 {380 "components": [381 { "internalType": "address", "name": "eth", "type": "address" },382 { "internalType": "uint256", "name": "sub", "type": "uint256" }383 ],384 "internalType": "struct CrossAccount",385 "name": "user",386 "type": "tuple"387 }388 ],389 "name": "isOwnerOrAdminCross",390 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],391 "stateMutability": "view",392 "type": "function"393 },394 {395 "inputs": [396 { "internalType": "address", "name": "to", "type": "address" },397 { "internalType": "uint256", "name": "amount", "type": "uint256" }398 ],399 "name": "mint",400 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],401 "stateMutability": "nonpayable",402 "type": "function"403 },404 {405 "inputs": [406 {407 "components": [408 { "internalType": "address", "name": "field_0", "type": "address" },409 { "internalType": "uint256", "name": "field_1", "type": "uint256" }410 ],411 "internalType": "struct Tuple9[]",412 "name": "amounts",413 "type": "tuple[]"414 }415 ],416 "name": "mintBulk",417 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],418 "stateMutability": "nonpayable",419 "type": "function"420 },421 {422 "inputs": [423 {424 "components": [425 { "internalType": "address", "name": "eth", "type": "address" },426 { "internalType": "uint256", "name": "sub", "type": "uint256" }427 ],428 "internalType": "struct CrossAccount",429 "name": "to",430 "type": "tuple"431 },432 { "internalType": "uint256", "name": "amount", "type": "uint256" }433 ],434 "name": "mintCross",435 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],436 "stateMutability": "nonpayable",437 "type": "function"438 },439 {440 "inputs": [],441 "name": "name",442 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],443 "stateMutability": "view",444 "type": "function"445 },446 {447 "inputs": [448 {449 "components": [450 { "internalType": "address", "name": "eth", "type": "address" },451 { "internalType": "uint256", "name": "sub", "type": "uint256" }452 ],453 "internalType": "struct CrossAccount",454 "name": "admin",455 "type": "tuple"456 }457 ],458 "name": "removeCollectionAdminCross",459 "outputs": [],460 "stateMutability": "nonpayable",461 "type": "function"462 },463 {464 "inputs": [],465 "name": "removeCollectionSponsor",466 "outputs": [],467 "stateMutability": "nonpayable",468 "type": "function"469 },470 {471 "inputs": [472 {473 "components": [474 { "internalType": "address", "name": "eth", "type": "address" },475 { "internalType": "uint256", "name": "sub", "type": "uint256" }476 ],477 "internalType": "struct CrossAccount",478 "name": "user",479 "type": "tuple"480 }481 ],482 "name": "removeFromCollectionAllowListCross",483 "outputs": [],484 "stateMutability": "nonpayable",485 "type": "function"486 },487 {488 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],489 "name": "setCollectionAccess",490 "outputs": [],491 "stateMutability": "nonpayable",492 "type": "function"493 },494 {495 "inputs": [496 {497 "components": [498 {499 "internalType": "enum CollectionLimitField",500 "name": "field",501 "type": "uint8"502 },503 { "internalType": "bool", "name": "status", "type": "bool" },504 { "internalType": "uint256", "name": "value", "type": "uint256" }505 ],506 "internalType": "struct CollectionLimit",507 "name": "limit",508 "type": "tuple"509 }510 ],511 "name": "setCollectionLimit",512 "outputs": [],513 "stateMutability": "nonpayable",514 "type": "function"515 },516 {517 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],518 "name": "setCollectionMintMode",519 "outputs": [],520 "stateMutability": "nonpayable",521 "type": "function"522 },523 {524 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],525 "name": "setCollectionNesting",526 "outputs": [],527 "stateMutability": "nonpayable",528 "type": "function"529 },530 {531 "inputs": [532 { "internalType": "bool", "name": "enable", "type": "bool" },533 {534 "internalType": "address[]",535 "name": "collections",536 "type": "address[]"537 }538 ],539 "name": "setCollectionNesting",540 "outputs": [],541 "stateMutability": "nonpayable",542 "type": "function"543 },544 {545 "inputs": [546 {547 "components": [548 { "internalType": "string", "name": "key", "type": "string" },549 { "internalType": "bytes", "name": "value", "type": "bytes" }550 ],551 "internalType": "struct Property[]",552 "name": "properties",553 "type": "tuple[]"554 }555 ],556 "name": "setCollectionProperties",557 "outputs": [],558 "stateMutability": "nonpayable",559 "type": "function"560 },561 {562 "inputs": [563 {564 "components": [565 { "internalType": "address", "name": "eth", "type": "address" },566 { "internalType": "uint256", "name": "sub", "type": "uint256" }567 ],568 "internalType": "struct CrossAccount",569 "name": "sponsor",570 "type": "tuple"571 }572 ],573 "name": "setCollectionSponsorCross",574 "outputs": [],575 "stateMutability": "nonpayable",576 "type": "function"577 },578 {579 "inputs": [580 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }581 ],582 "name": "supportsInterface",583 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],584 "stateMutability": "view",585 "type": "function"586 },587 {588 "inputs": [],589 "name": "symbol",590 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],591 "stateMutability": "view",592 "type": "function"593 },594 {595 "inputs": [],596 "name": "totalSupply",597 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],598 "stateMutability": "view",599 "type": "function"600 },601 {602 "inputs": [603 { "internalType": "address", "name": "to", "type": "address" },604 { "internalType": "uint256", "name": "amount", "type": "uint256" }605 ],606 "name": "transfer",607 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],608 "stateMutability": "nonpayable",609 "type": "function"610 },611 {612 "inputs": [613 {614 "components": [615 { "internalType": "address", "name": "eth", "type": "address" },616 { "internalType": "uint256", "name": "sub", "type": "uint256" }617 ],618 "internalType": "struct CrossAccount",619 "name": "to",620 "type": "tuple"621 },622 { "internalType": "uint256", "name": "amount", "type": "uint256" }623 ],624 "name": "transferCross",625 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],626 "stateMutability": "nonpayable",627 "type": "function"628 },629 {630 "inputs": [631 { "internalType": "address", "name": "from", "type": "address" },632 { "internalType": "address", "name": "to", "type": "address" },633 { "internalType": "uint256", "name": "amount", "type": "uint256" }634 ],635 "name": "transferFrom",636 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],637 "stateMutability": "nonpayable",638 "type": "function"639 },640 {641 "inputs": [642 {643 "components": [644 { "internalType": "address", "name": "eth", "type": "address" },645 { "internalType": "uint256", "name": "sub", "type": "uint256" }646 ],647 "internalType": "struct CrossAccount",648 "name": "from",649 "type": "tuple"650 },651 {652 "components": [653 { "internalType": "address", "name": "eth", "type": "address" },654 { "internalType": "uint256", "name": "sub", "type": "uint256" }655 ],656 "internalType": "struct CrossAccount",657 "name": "to",658 "type": "tuple"659 },660 { "internalType": "uint256", "name": "amount", "type": "uint256" }661 ],662 "name": "transferFromCross",663 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],664 "stateMutability": "nonpayable",665 "type": "function"666 },667 {668 "inputs": [],669 "name": "uniqueCollectionType",670 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],671 "stateMutability": "view",672 "type": "function"673 }674]tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -247,8 +247,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": "",
@@ -271,7 +278,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple45[]",
+ "internalType": "struct Tuple48[]",
"name": "",
"type": "tuple[]"
}
@@ -292,7 +299,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple42",
+ "internalType": "struct Tuple45",
"name": "",
"type": "tuple"
}
@@ -662,8 +669,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/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,
}