diff --git a/contracts/utils/cryptography/draft-ERC7739Utils.sol b/contracts/utils/cryptography/draft-ERC7739Utils.sol index e47f20b4114..368c801eb3a 100644 --- a/contracts/utils/cryptography/draft-ERC7739Utils.sol +++ b/contracts/utils/cryptography/draft-ERC7739Utils.sol @@ -58,7 +58,7 @@ library ERC7739Utils { * - `APP_DOMAIN_SEPARATOR` is the EIP-712 {EIP712-_domainSeparatorV4} of the application smart contract that is * requesting the signature verification (though ERC-1271). * - `contentsHash` is the hash of the underlying data structure or message. - * - `contentsDescr` is a descriptor of the "contents" part of the the EIP-712 type of the nested signature. + * - `contentsDescr` is a descriptor of the "contents" part of the EIP-712 type of the nested signature. * * NOTE: This function returns empty if the input format is invalid instead of reverting. * data instead. diff --git a/docs/modules/ROOT/pages/accounts.adoc b/docs/modules/ROOT/pages/accounts.adoc index c2f89963629..b2e8d419574 100644 --- a/docs/modules/ROOT/pages/accounts.adoc +++ b/docs/modules/ROOT/pages/accounts.adoc @@ -33,7 +33,7 @@ TIP: Given xref:api:utils/cryptography.adoc#SignerERC7913[`SignerERC7913`] provi ==== Accounts factory -The first time you send an user operation, your account will be created deterministically (i.e. its code and address can be predicted) using the the `initCode` field in the UserOperation. This field contains both the address of a smart contract (the factory) and the data required to call it and create your smart account. +The first time you send an user operation, your account will be created deterministically (i.e. its code and address can be predicted) using the `initCode` field in the UserOperation. This field contains both the address of a smart contract (the factory) and the data required to call it and create your smart account. Suggestively, you can create your own account factory using the xref:api:proxy.adoc#Clones[Clones library], taking advantage of decreased deployment costs and account address predictability. diff --git a/docs/modules/ROOT/pages/erc6909.adoc b/docs/modules/ROOT/pages/erc6909.adoc index 164ded8ed0c..174b4f0e8ab 100644 --- a/docs/modules/ROOT/pages/erc6909.adoc +++ b/docs/modules/ROOT/pages/erc6909.adoc @@ -1,6 +1,6 @@ = ERC-6909 -ERC-6909 is a draft EIP that draws on ERC-1155 learnings since it was published in 2018. The main goals of ERC-6909 is to decrease gas costs and complexity--this is mainly accomplished by removing batching and callbacks. +ERC-6909 is a draft EIP that draws on ERC-1155 learnings since it was published in 2018. The main goals of ERC-6909 are to decrease gas costs and complexity--this is mainly accomplished by removing batching and callbacks. TIP: To understand the inspiration for a multi token standard, see the xref:erc1155.adoc#multi-token-standard[multi token standard] section within the EIP-1155 docs. @@ -14,7 +14,7 @@ There are three main changes from ERC-1155 which are as follows: == Constructing an ERC-6909 Token Contract -We'll use ERC-6909 to track multiple items in a game, each having their own unique attributes. All item types will by minted to the deployer of the contract, which we can later transfer to players. We'll also use the xref:api:token/ERC6909.adoc#ERC6909Metadata[`ERC6909Metadata`] extension to add decimals to our fungible items (the vanilla ERC-6909 implementation does not have decimals). +We'll use ERC-6909 to track multiple items in a game, each having their own unique attributes. All item types will be minted to the deployer of the contract, which we can later transfer to players. We'll also use the xref:api:token/ERC6909.adoc#ERC6909Metadata[`ERC6909Metadata`] extension to add decimals to our fungible items (the vanilla ERC-6909 implementation does not have decimals). For simplicity, we will mint all items in the constructor--however, minting functionality could be added to the contract to mint on demand to players. diff --git a/docs/templates/properties.js b/docs/templates/properties.js index 8d6b2867da2..5a6d18eced9 100644 --- a/docs/templates/properties.js +++ b/docs/templates/properties.js @@ -35,7 +35,7 @@ module.exports.fullname = function fullname({ item }) { module.exports.inheritance = function ({ item, build }) { if (!isNodeType('ContractDefinition', item)) { - throw new Error('used inherited-items on non-contract'); + throw new Error('inheritance modifier used on non-contract'); } return item.linearizedBaseContracts @@ -65,14 +65,14 @@ module.exports['has-internal-variables'] = function ({ item }) { module.exports.functions = function ({ item }) { return [ - ...[...findAll('FunctionDefinition', item)].filter(f => f.visibility !== 'private'), - ...[...findAll('VariableDeclaration', item)].filter(f => f.visibility === 'public'), + ...findAll('FunctionDefinition', item).filter(f => f.visibility !== 'private'), + ...findAll('VariableDeclaration', item).filter(f => f.visibility === 'public'), ]; }; module.exports.returns2 = function ({ item }) { if (isNodeType('VariableDeclaration', item)) { - return [{ type: item.typeDescriptions.typeString }]; + return [{ type: item.typeName.typeDescriptions.typeString }]; } else { return item.returns; }