difftreelog
chore generate stubs & types
in: master
11 files changed
Cargo.lockdiffbeforeafterboth--- 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",
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- 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"
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- 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;
}
pallets/refungible/Cargo.tomldiffbeforeafterboth--- 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"
pallets/refungible/src/lib.rsdiffbeforeafterboth--- 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::*;
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- 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;
}
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- 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[]"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- 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[]"
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- 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;
}
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- 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;
}
tests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth1// Auto-generated via `yarn polkadot-types-from-chain`, do not edit2/* eslint-disable */34// import type lookup before we augment - in some environments5// this is required to allow for ambient/previous definitions6import '@polkadot/api-base/types/consts';78import type { ApiTypes, AugmentedConst } from '@polkadot/api-base/types';9import type { Option, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';10import type { Codec } from '@polkadot/types-codec/types';11import type { H160, Perbill, Permill } from '@polkadot/types/interfaces/runtime';12import type { FrameSupportPalletId, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, UpDataStructsCollectionLimits, XcmV1MultiLocation } from '@polkadot/types/lookup';1314export type __AugmentedConst<ApiType extends ApiTypes> = AugmentedConst<ApiType>;1516declare module '@polkadot/api-base/types/consts' {17 interface AugmentedConsts<ApiType extends ApiTypes> {18 appPromotion: {19 /**20 * Rate of return for interval in blocks defined in `RecalculationInterval`.21 **/22 intervalIncome: Perbill & AugmentedConst<ApiType>;23 /**24 * Decimals for the `Currency`.25 **/26 nominal: u128 & AugmentedConst<ApiType>;27 /**28 * The app's pallet id, used for deriving its sovereign account address.29 **/30 palletId: FrameSupportPalletId & AugmentedConst<ApiType>;31 /**32 * In parachain blocks.33 **/34 pendingInterval: u32 & AugmentedConst<ApiType>;35 /**36 * In relay blocks.37 **/38 recalculationInterval: u32 & AugmentedConst<ApiType>;39 /**40 * Generic const41 **/42 [key: string]: Codec;43 };44 balances: {45 /**46 * The minimum amount required to keep an account open.47 **/48 existentialDeposit: u128 & AugmentedConst<ApiType>;49 /**50 * The maximum number of locks that should exist on an account.51 * Not strictly enforced, but used for weight estimation.52 **/53 maxLocks: u32 & AugmentedConst<ApiType>;54 /**55 * The maximum number of named reserves that can exist on an account.56 **/57 maxReserves: u32 & AugmentedConst<ApiType>;58 /**59 * Generic const60 **/61 [key: string]: Codec;62 };63 common: {64 /**65 * Maximum admins per collection.66 **/67 collectionAdminsLimit: u32 & AugmentedConst<ApiType>;68 /**69 * Set price to create a collection.70 **/71 collectionCreationPrice: u128 & AugmentedConst<ApiType>;72 /**73 * Address under which the CollectionHelper contract would be available.74 **/75 contractAddress: H160 & AugmentedConst<ApiType>;76 /**77 * Generic const78 **/79 [key: string]: Codec;80 };81 configuration: {82 appPromotionDailyRate: Perbill & AugmentedConst<ApiType>;83 dayRelayBlocks: u32 & AugmentedConst<ApiType>;84 defaultMinGasPrice: u64 & AugmentedConst<ApiType>;85 defaultWeightToFeeCoefficient: u32 & AugmentedConst<ApiType>;86 maxOverridedAllowedLocations: u32 & AugmentedConst<ApiType>;87 /**88 * Generic const89 **/90 [key: string]: Codec;91 };92 evmContractHelpers: {93 /**94 * Address, under which magic contract will be available95 **/96 contractAddress: H160 & AugmentedConst<ApiType>;97 /**98 * Generic const99 **/100 [key: string]: Codec;101 };102 inflation: {103 /**104 * Number of blocks that pass between treasury balance updates due to inflation105 **/106 inflationBlockInterval: u32 & AugmentedConst<ApiType>;107 /**108 * Generic const109 **/110 [key: string]: Codec;111 };112 system: {113 /**114 * Maximum number of block number to block hash mappings to keep (oldest pruned first).115 **/116 blockHashCount: u32 & AugmentedConst<ApiType>;117 /**118 * The maximum length of a block (in bytes).119 **/120 blockLength: FrameSystemLimitsBlockLength & AugmentedConst<ApiType>;121 /**122 * Block & extrinsics weights: base values and limits.123 **/124 blockWeights: FrameSystemLimitsBlockWeights & AugmentedConst<ApiType>;125 /**126 * The weight of runtime database operations the runtime can invoke.127 **/128 dbWeight: SpWeightsRuntimeDbWeight & AugmentedConst<ApiType>;129 /**130 * The designated SS58 prefix of this chain.131 * 132 * This replaces the "ss58Format" property declared in the chain spec. Reason is133 * that the runtime should know about the prefix in order to make use of it as134 * an identifier of the chain.135 **/136 ss58Prefix: u16 & AugmentedConst<ApiType>;137 /**138 * Get the chain's current version.139 **/140 version: SpVersionRuntimeVersion & AugmentedConst<ApiType>;141 /**142 * Generic const143 **/144 [key: string]: Codec;145 };146 timestamp: {147 /**148 * The minimum period between blocks. Beware that this is different to the *expected*149 * period that the block production apparatus provides. Your chosen consensus system will150 * generally work with this to determine a sensible block time. e.g. For Aura, it will be151 * double this period on default settings.152 **/153 minimumPeriod: u64 & AugmentedConst<ApiType>;154 /**155 * Generic const156 **/157 [key: string]: Codec;158 };159 tokens: {160 maxLocks: u32 & AugmentedConst<ApiType>;161 /**162 * The maximum number of named reserves that can exist on an account.163 **/164 maxReserves: u32 & AugmentedConst<ApiType>;165 /**166 * Generic const167 **/168 [key: string]: Codec;169 };170 transactionPayment: {171 /**172 * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their173 * `priority`174 * 175 * This value is multipled by the `final_fee` to obtain a "virtual tip" that is later176 * added to a tip component in regular `priority` calculations.177 * It means that a `Normal` transaction can front-run a similarly-sized `Operational`178 * extrinsic (with no tip), by including a tip value greater than the virtual tip.179 * 180 * ```rust,ignore181 * // For `Normal`182 * let priority = priority_calc(tip);183 * 184 * // For `Operational`185 * let virtual_tip = (inclusion_fee + tip) * OperationalFeeMultiplier;186 * let priority = priority_calc(tip + virtual_tip);187 * ```188 * 189 * Note that since we use `final_fee` the multiplier applies also to the regular `tip`190 * sent with the transaction. So, not only does the transaction get a priority bump based191 * on the `inclusion_fee`, but we also amplify the impact of tips applied to `Operational`192 * transactions.193 **/194 operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;195 /**196 * Generic const197 **/198 [key: string]: Codec;199 };200 treasury: {201 /**202 * Percentage of spare funds (if any) that are burnt per spend period.203 **/204 burn: Permill & AugmentedConst<ApiType>;205 /**206 * The maximum number of approvals that can wait in the spending queue.207 * 208 * NOTE: This parameter is also used within the Bounties Pallet extension if enabled.209 **/210 maxApprovals: u32 & AugmentedConst<ApiType>;211 /**212 * The treasury's pallet id, used for deriving its sovereign account ID.213 **/214 palletId: FrameSupportPalletId & AugmentedConst<ApiType>;215 /**216 * Fraction of a proposal's value that should be bonded in order to place the proposal.217 * An accepted proposal gets these back. A rejected proposal does not.218 **/219 proposalBond: Permill & AugmentedConst<ApiType>;220 /**221 * Maximum amount of funds that should be placed in a deposit for making a proposal.222 **/223 proposalBondMaximum: Option<u128> & AugmentedConst<ApiType>;224 /**225 * Minimum amount of funds that should be placed in a deposit for making a proposal.226 **/227 proposalBondMinimum: u128 & AugmentedConst<ApiType>;228 /**229 * Period between successive spends.230 **/231 spendPeriod: u32 & AugmentedConst<ApiType>;232 /**233 * Generic const234 **/235 [key: string]: Codec;236 };237 unique: {238 /**239 * Maximum admins per collection.240 **/241 collectionAdminsLimit: u32 & AugmentedConst<ApiType>;242 /**243 * Default FT collection limit.244 **/245 ftDefaultCollectionLimits: UpDataStructsCollectionLimits & AugmentedConst<ApiType>;246 /**247 * Maximal length of a collection description.248 **/249 maxCollectionDescriptionLength: u32 & AugmentedConst<ApiType>;250 /**251 * Maximal length of a collection name.252 **/253 maxCollectionNameLength: u32 & AugmentedConst<ApiType>;254 /**255 * Maximum size for all collection properties.256 **/257 maxCollectionPropertiesSize: u32 & AugmentedConst<ApiType>;258 /**259 * A maximum number of token properties.260 **/261 maxPropertiesPerItem: u32 & AugmentedConst<ApiType>;262 /**263 * Maximal length of a property key.264 **/265 maxPropertyKeyLength: u32 & AugmentedConst<ApiType>;266 /**267 * Maximal length of a property value.268 **/269 maxPropertyValueLength: u32 & AugmentedConst<ApiType>;270 /**271 * Maximal length of a token prefix.272 **/273 maxTokenPrefixLength: u32 & AugmentedConst<ApiType>;274 /**275 * Maximum size of all token properties.276 **/277 maxTokenPropertiesSize: u32 & AugmentedConst<ApiType>;278 /**279 * A maximum number of levels of depth in the token nesting tree.280 **/281 nestingBudget: u32 & AugmentedConst<ApiType>;282 /**283 * Default NFT collection limit.284 **/285 nftDefaultCollectionLimits: UpDataStructsCollectionLimits & AugmentedConst<ApiType>;286 /**287 * Default RFT collection limit.288 **/289 rftDefaultCollectionLimits: UpDataStructsCollectionLimits & AugmentedConst<ApiType>;290 /**291 * Generic const292 **/293 [key: string]: Codec;294 };295 vesting: {296 /**297 * The minimum amount transferred to call `vested_transfer`.298 **/299 minVestedTransfer: u128 & AugmentedConst<ApiType>;300 /**301 * Generic const302 **/303 [key: string]: Codec;304 };305 xTokens: {306 /**307 * Base XCM weight.308 * 309 * The actually weight for an XCM message is `T::BaseXcmWeight +310 * T::Weigher::weight(&msg)`.311 **/312 baseXcmWeight: u64 & AugmentedConst<ApiType>;313 /**314 * Self chain location.315 **/316 selfLocation: XcmV1MultiLocation & AugmentedConst<ApiType>;317 /**318 * Generic const319 **/320 [key: string]: Codec;321 };322 } // AugmentedConsts323} // declare module