Merge branch 'master' into feature/zksync-etherscan-like

# Conflicts: # package.json
1inch · Dec 24, 2024 · 3bd7111 · 3bd7111
2 parents 5df5473 + 422cc3f
commit 3bd7111
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/contracts/mixins/PermitAndCall.sol b/contracts/mixins/PermitAndCall.sol
@@ -15,7 +15,7 @@ abstract contract PermitAndCall {
 
     /**
      * @notice Executes a permit for an ERC20 token and then a specified action in a single transaction.
-     * @param permit ERC20 token address (20 bytes) concatinated with the permit data, allowing this contract to spend the token.
+     * @param permit ERC20 token address (20 bytes) concatenated with the permit data, allowing this contract to spend the token.
      * Format: [token address (20 bytes)][permit data]
      * @param action The data representing the action to be executed after the permit.
      */

diff --git a/docs/contracts/mixins/PermitAndCall.md b/docs/contracts/mixins/PermitAndCall.md
@@ -19,6 +19,6 @@ Executes a permit for an ERC20 token and then a specified action in a single tra
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| permit | bytes | ERC20 token address (20 bytes) concatinated with the permit data, allowing this contract to spend the token. Format: [token address (20 bytes)][permit data] |
+| permit | bytes | ERC20 token address (20 bytes) concatenated with the permit data, allowing this contract to spend the token. Format: [token address (20 bytes)][permit data] |
 | action | bytes | The data representing the action to be executed after the permit. |
 
diff --git a/src/utils.ts b/src/utils.ts
@@ -212,7 +212,7 @@ export async function saveContractWithCreate3Deployment(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const receipt = await provider.getTransactionReceipt(deployTxHash) as {[key: string]: any};
     if (receipt != null) {
-        // conver ethers.TransactionReceipt object to hardhat-deploy.Receipt object
+        // convert ethers.TransactionReceipt object to hardhat-deploy.Receipt object
         receipt.transactionHash = receipt.transactionHash || receipt.hash;
         receipt.transactionIndex = receipt.transactionIndex || receipt.index;
         ['provider', 'blobGasPrice', 'type', 'root', 'hash', 'index'].forEach(key => delete receipt[key]);