From f5a501ec99bf8f9d906f8db1412c6c1b2eac1d09 Mon Sep 17 00:00:00 2001 From: PraetorP Date: Fri, 16 Dec 2022 14:48:48 +0000 Subject: [PATCH] chore: generate stubs & types --- --- a/Cargo.lock +++ b/Cargo.lock @@ -6342,7 +6342,7 @@ [[package]] name = "pallet-nonfungible" -version = "0.1.11" +version = "0.1.12" dependencies = [ "ethereum 0.14.0", "evm-coder", @@ -6501,7 +6501,7 @@ [[package]] name = "pallet-refungible" -version = "0.2.10" +version = "0.2.11" dependencies = [ "derivative", "ethereum 0.14.0", --- a/pallets/nonfungible/Cargo.toml +++ b/pallets/nonfungible/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-nonfungible" -version = "0.1.11" +version = "0.1.12" license = "GPLv3" edition = "2021" --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -42,7 +42,11 @@ /// @param permissions Permissions for keys. /// @dev EVM selector for this function is: 0xbd92983a, /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[]) +<<<<<<< HEAD function setTokenPropertyPermissions(Tuple59[] memory permissions) public { +======= + function setTokenPropertyPermissions(Tuple56[] memory permissions) public { +>>>>>>> 9e929f90... chore: generate stubs & types require(false, stub_error); permissions; dummy = 0; @@ -51,10 +55,17 @@ /// @notice Get permissions for token properties. /// @dev EVM selector for this function is: 0xf23d7790, /// or in textual repr: tokenPropertyPermissions() +<<<<<<< HEAD function tokenPropertyPermissions() public view returns (Tuple59[] memory) { require(false, stub_error); dummy; return new Tuple59[](0); +======= + function tokenPropertyPermissions() public view returns (Tuple56[] memory) { + require(false, stub_error); + dummy; + return new Tuple56[](0); +>>>>>>> 9e929f90... chore: generate stubs & types } // /// @notice Set token property value. @@ -144,6 +155,7 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple59 { string field_0; Tuple57[] field_1; @@ -151,6 +163,15 @@ /// @dev anonymous struct struct Tuple57 { +======= +struct Tuple56 { + string field_0; + Tuple54[] field_1; +} + +/// @dev anonymous struct +struct Tuple54 { +>>>>>>> 9e929f90... chore: generate stubs & types EthTokenPermissions field_0; bool field_1; } --- a/pallets/refungible/Cargo.toml +++ b/pallets/refungible/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-refungible" -version = "0.2.10" +version = "0.2.11" license = "GPLv3" edition = "2021" --- a/pallets/refungible/src/lib.rs +++ b/pallets/refungible/src/lib.rs @@ -113,7 +113,8 @@ AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec, CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH, MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission, - PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap, CreateRefungibleExMultipleOwners, + PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap, + CreateRefungibleExMultipleOwners, }; pub use pallet::*; --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -42,7 +42,11 @@ /// @param permissions Permissions for keys. /// @dev EVM selector for this function is: 0xbd92983a, /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[]) +<<<<<<< HEAD function setTokenPropertyPermissions(Tuple58[] memory permissions) public { +======= + function setTokenPropertyPermissions(Tuple55[] memory permissions) public { +>>>>>>> 9e929f90... chore: generate stubs & types require(false, stub_error); permissions; dummy = 0; @@ -51,10 +55,17 @@ /// @notice Get permissions for token properties. /// @dev EVM selector for this function is: 0xf23d7790, /// or in textual repr: tokenPropertyPermissions() +<<<<<<< HEAD function tokenPropertyPermissions() public view returns (Tuple58[] memory) { require(false, stub_error); dummy; return new Tuple58[](0); +======= + function tokenPropertyPermissions() public view returns (Tuple55[] memory) { + require(false, stub_error); + dummy; + return new Tuple55[](0); +>>>>>>> 9e929f90... chore: generate stubs & types } // /// @notice Set token property value. @@ -144,6 +155,7 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple58 { string field_0; Tuple56[] field_1; @@ -151,6 +163,15 @@ /// @dev anonymous struct struct Tuple56 { +======= +struct Tuple55 { + string field_0; + Tuple53[] field_1; +} + +/// @dev anonymous struct +struct Tuple53 { +>>>>>>> 9e929f90... chore: generate stubs & types EthTokenPermissions field_0; bool field_1; } --- a/tests/src/eth/abi/nonFungible.json +++ b/tests/src/eth/abi/nonFungible.json @@ -770,12 +770,20 @@ }, { "internalType": "bool", "name": "field_1", "type": "bool" } ], +<<<<<<< HEAD "internalType": "struct Tuple57[]", +======= + "internalType": "struct Tuple54[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "field_1", "type": "tuple[]" } ], +<<<<<<< HEAD "internalType": "struct Tuple59[]", +======= + "internalType": "struct Tuple56[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "permissions", "type": "tuple[]" } @@ -836,12 +844,20 @@ }, { "internalType": "bool", "name": "field_1", "type": "bool" } ], +<<<<<<< HEAD "internalType": "struct Tuple57[]", +======= + "internalType": "struct Tuple54[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "field_1", "type": "tuple[]" } ], +<<<<<<< HEAD "internalType": "struct Tuple59[]", +======= + "internalType": "struct Tuple56[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "", "type": "tuple[]" } --- a/tests/src/eth/abi/reFungible.json +++ b/tests/src/eth/abi/reFungible.json @@ -752,12 +752,20 @@ }, { "internalType": "bool", "name": "field_1", "type": "bool" } ], +<<<<<<< HEAD "internalType": "struct Tuple56[]", +======= + "internalType": "struct Tuple53[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "field_1", "type": "tuple[]" } ], +<<<<<<< HEAD "internalType": "struct Tuple58[]", +======= + "internalType": "struct Tuple55[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "permissions", "type": "tuple[]" } @@ -827,12 +835,20 @@ }, { "internalType": "bool", "name": "field_1", "type": "bool" } ], +<<<<<<< HEAD "internalType": "struct Tuple56[]", +======= + "internalType": "struct Tuple53[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "field_1", "type": "tuple[]" } ], +<<<<<<< HEAD "internalType": "struct Tuple58[]", +======= + "internalType": "struct Tuple55[]", +>>>>>>> 9e929f90... chore: generate stubs & types "name": "", "type": "tuple[]" } --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -30,12 +30,20 @@ /// @param permissions Permissions for keys. /// @dev EVM selector for this function is: 0xbd92983a, /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[]) +<<<<<<< HEAD function setTokenPropertyPermissions(Tuple52[] memory permissions) external; +======= + function setTokenPropertyPermissions(Tuple49[] memory permissions) external; +>>>>>>> 9e929f90... chore: generate stubs & types /// @notice Get permissions for token properties. /// @dev EVM selector for this function is: 0xf23d7790, /// or in textual repr: tokenPropertyPermissions() +<<<<<<< HEAD function tokenPropertyPermissions() external view returns (Tuple52[] memory); +======= + function tokenPropertyPermissions() external view returns (Tuple49[] memory); +>>>>>>> 9e929f90... chore: generate stubs & types // /// @notice Set token property value. // /// @dev Throws error if `msg.sender` has no permission to edit the property. @@ -97,6 +105,7 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple52 { string field_0; Tuple50[] field_1; @@ -104,6 +113,15 @@ /// @dev anonymous struct struct Tuple50 { +======= +struct Tuple49 { + string field_0; + Tuple47[] field_1; +} + +/// @dev anonymous struct +struct Tuple47 { +>>>>>>> 9e929f90... chore: generate stubs & types EthTokenPermissions field_0; bool field_1; } --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -30,12 +30,20 @@ /// @param permissions Permissions for keys. /// @dev EVM selector for this function is: 0xbd92983a, /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[]) +<<<<<<< HEAD function setTokenPropertyPermissions(Tuple51[] memory permissions) external; +======= + function setTokenPropertyPermissions(Tuple48[] memory permissions) external; +>>>>>>> 9e929f90... chore: generate stubs & types /// @notice Get permissions for token properties. /// @dev EVM selector for this function is: 0xf23d7790, /// or in textual repr: tokenPropertyPermissions() +<<<<<<< HEAD function tokenPropertyPermissions() external view returns (Tuple51[] memory); +======= + function tokenPropertyPermissions() external view returns (Tuple48[] memory); +>>>>>>> 9e929f90... chore: generate stubs & types // /// @notice Set token property value. // /// @dev Throws error if `msg.sender` has no permission to edit the property. @@ -97,6 +105,7 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple51 { string field_0; Tuple49[] field_1; @@ -104,6 +113,15 @@ /// @dev anonymous struct struct Tuple49 { +======= +struct Tuple48 { + string field_0; + Tuple46[] field_1; +} + +/// @dev anonymous struct +struct Tuple46 { +>>>>>>> 9e929f90... chore: generate stubs & types EthTokenPermissions field_0; bool field_1; } --- a/tests/src/interfaces/augment-api-consts.ts +++ b/tests/src/interfaces/augment-api-consts.ts @@ -83,7 +83,7 @@ dayRelayBlocks: u32 & AugmentedConst; defaultMinGasPrice: u64 & AugmentedConst; defaultWeightToFeeCoefficient: u32 & AugmentedConst; - maxOverridedAllowedLocations: u32 & AugmentedConst; + maxXcmAllowedLocations: u32 & AugmentedConst; /** * Generic const **/ -- gitstuff