@1inch/solidity-utils 3.1.0 → 3.3.0

package/contracts/libraries/SafeERC20.sol

@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol";
+import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Permit.sol";
 import "../interfaces/IDaiLikePermit.sol";
 import "../interfaces/IPermit2.sol";
 import "../interfaces/IWETH.sol";
@@ -59,7 +59,7 @@ library SafeERC20 {
 
     /**
      * @notice Attempts to safely transfer tokens from one address to another.
-     * @dev If permit2 is true, uses the Permit2 standard; otherwise uses the standard ERC20 transferFrom. 
+     * @dev If permit2 is true, uses the Permit2 standard; otherwise uses the standard ERC20 transferFrom.
      * Either requires `true` in return data, or requires target to be smart-contract and empty return data.
      * @param token The IERC20 token contract from which the tokens will be transferred.
      * @param from The address from which the tokens will be transferred.
@@ -238,7 +238,7 @@ library SafeERC20 {
     }
 
     /**
-     * @notice Attempts to execute the `permit` function on the provided token with custom owner and spender parameters. 
+     * @notice Attempts to execute the `permit` function on the provided token with custom owner and spender parameters.
      * Permit type is determined automatically based on permit calldata (IERC20Permit, IDaiLikePermit, and IPermit2).
      * @dev Wraps `tryPermit` function and forwards revert reason if permit fails.
      * @param token The IERC20 token to execute the permit function on.
@@ -265,9 +265,9 @@ library SafeERC20 {
      * @notice The function attempts to call the permit function on a given ERC20 token.
      * @dev The function is designed to support a variety of permit functions, namely: IERC20Permit, IDaiLikePermit, and IPermit2.
      * It accommodates both Compact and Full formats of these permit types.
-     * Please note, it is expected that the `expiration` parameter for the compact Permit2 and the `deadline` parameter 
+     * Please note, it is expected that the `expiration` parameter for the compact Permit2 and the `deadline` parameter
      * for the compact Permit are to be incremented by one before invoking this function. This approach is motivated by
-     * gas efficiency considerations; as the unlimited expiration period is likely to be the most common scenario, and 
+     * gas efficiency considerations; as the unlimited expiration period is likely to be the most common scenario, and
      * zeros are cheaper to pass in terms of gas cost. Thus, callers should increment the expiration or deadline by one
      * before invocation for optimized performance.
      * @param token The address of the ERC20 token on which to call the permit function.
@@ -349,7 +349,7 @@ library SafeERC20 {
                 mstore(add(ptr, 0x24), token) // store token
 
                 calldatacopy(add(ptr, 0x50), permit.offset, 0x14)             // store amount = copy permit.offset 0x00..0x13
-                // and(0xffffffffffff, ...) - conversion to uint48 
+                // and(0xffffffffffff, ...) - conversion to uint48
                 mstore(add(ptr, 0x64), and(0xffffffffffff, sub(shr(224, calldataload(add(permit.offset, 0x14))), 1))) // store expiration = ((permit.offset 0x14..0x17 - 1) & 0xffffffffffff)
                 mstore(add(ptr, 0x84), shr(224, calldataload(add(permit.offset, 0x18)))) // store nonce = copy permit.offset 0x18..0x1b
                 mstore(add(ptr, 0xa4), spender)                               // store spender
@@ -383,7 +383,7 @@ library SafeERC20 {
      * @param selector The function signature that is to be called on the token contract.
      * @param to The address to which the token amount will be transferred.
      * @param amount The token amount to be transferred.
-     * @return success A boolean indicating if the call was successful. Returns 'true' on success and 'false' on failure. 
+     * @return success A boolean indicating if the call was successful. Returns 'true' on success and 'false' on failure.
      * In case of success but no returned data, validates that the contract code exists.
      * In case of returned data, ensures that it's a boolean `true`.
      */

package/contracts/mocks/ERC20PermitMock.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
+import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 import "./TokenMock.sol";
 
 contract ERC20PermitMock is ERC20Permit, TokenMock {

package/contracts/mocks/TokenCustomDecimalsMock.sol

@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
+import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 
 contract TokenCustomDecimalsMock is ERC20Permit, Ownable {
     uint8 internal immutable _decimals;
@@ -13,7 +13,7 @@ contract TokenCustomDecimalsMock is ERC20Permit, Ownable {
         string memory symbol,
         uint256 amount,
         uint8 decimals_
-    ) ERC20(name, symbol) ERC20Permit(name) {
+    ) ERC20(name, symbol) ERC20Permit(name) Ownable(msg.sender) {
         _mint(msg.sender, amount);
         _decimals = decimals_;
     }

package/contracts/mocks/TokenMock.sol

@@ -7,7 +7,7 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract TokenMock is ERC20, Ownable {
     // solhint-disable-next-line no-empty-blocks
-    constructor(string memory name, string memory symbol) ERC20(name, symbol) {}
+    constructor(string memory name, string memory symbol) ERC20(name, symbol) Ownable(msg.sender) {}
 
     function mint(address account, uint256 amount) external onlyOwner {
         _mint(account, amount);

package/dist/src/utils.d.ts

@@ -1,5 +1,5 @@
 import '@nomicfoundation/hardhat-ethers';
-import { BaseContract, BigNumberish, Contract, ContractTransactionReceipt, ContractTransactionResponse, JsonRpcProvider, Wallet } from 'ethers';
+import { BaseContract, BigNumberish, BytesLike, Contract, ContractTransactionReceipt, ContractTransactionResponse, JsonRpcProvider, Signer, Wallet } from 'ethers';
 import { DeployOptions, DeployResult } from 'hardhat-deploy/types';
 import { constants } from './prelude';
 interface DeployContractOptions {
@@ -21,6 +21,7 @@ interface DeployContractOptions {
 export declare function deployAndGetContract({ contractName, constructorArgs, deployments, deployer, deploymentName, skipVerify, skipIfAlreadyDeployed, gasPrice, maxPriorityFeePerGas, maxFeePerGas, log, waitConfirmations, }: DeployContractOptions): Promise<Contract>;
 export declare function timeIncreaseTo(seconds: number | string): Promise<void>;
 export declare function deployContract(name: string, parameters?: Array<BigNumberish>): Promise<BaseContract>;
+export declare function deployContractFromBytecode(abi: any[], bytecode: BytesLike, parameters?: Array<BigNumberish>, signer?: Signer): Promise<BaseContract>;
 type Token = {
     balanceOf: (address: string) => Promise<bigint>;
     getAddress: () => Promise<string>;

package/dist/src/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.countInstructions = exports.signMessage = exports.fixSignature = exports.trackReceivedTokenAndTx = exports.deployContract = exports.timeIncreaseTo = exports.deployAndGetContract = void 0;
+exports.countInstructions = exports.signMessage = exports.fixSignature = exports.trackReceivedTokenAndTx = exports.deployContractFromBytecode = exports.deployContract = exports.timeIncreaseTo = exports.deployAndGetContract = void 0;
 const tslib_1 = require("tslib");
 require("@nomicfoundation/hardhat-ethers"); // required to populate the HardhatRuntimeEnvironment with ethers
 const hardhat_1 = tslib_1.__importStar(require("hardhat"));
@@ -51,6 +51,14 @@ async function deployContract(name, parameters = []) {
     return instance;
 }
 exports.deployContract = deployContract;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function deployContractFromBytecode(abi, bytecode, parameters = [], signer) {
+    const ContractFactory = await hardhat_1.ethers.getContractFactory(abi, bytecode, signer);
+    const instance = await ContractFactory.deploy(...parameters);
+    await instance.waitForDeployment();
+    return instance;
+}
+exports.deployContractFromBytecode = deployContractFromBytecode;
 async function trackReceivedTokenAndTx(provider, token, wallet, txPromise, ...args) {
     const tokenAddress = 'address' in token ? token.address : await token.getAddress();
     const isETH = tokenAddress === prelude_1.constants.ZERO_ADDRESS || tokenAddress === prelude_1.constants.EEE_ADDRESS;

package/dist/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC,CAAE,iEAAiE;AAC5G,2DAAsC;AACtC,sFAAgE;AAIhE,uCAAsC;AAkB/B,KAAK,UAAU,oBAAoB,CAAC,EACvC,YAAY,EACZ,eAAe,EACf,WAAW,EACX,QAAQ,EACR,cAAc,GAAG,YAAY,EAC7B,UAAU,GAAG,KAAK,EAClB,qBAAqB,GAAG,IAAI,EAC5B,QAAQ,EACR,oBAAoB,EACpB,YAAY,EACZ,GAAG,GAAG,IAAI,EACV,iBAAiB,GAAG,mBAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACvD;IACpB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAE/B,MAAM,aAAa,GAAkB;QACjC,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,YAAY;QACtB,qBAAqB;QACrB,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE;QAC9B,oBAAoB,EAAE,oBAAoB,EAAE,QAAQ,EAAE;QACtD,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE;QACtC,GAAG;QACH,iBAAiB;KACpB,CAAC;IACF,MAAM,YAAY,GAAiB,MAAM,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAE/E,IAAI,CAAC,CAAC,UAAU,IAAI,mBAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;QAClE,MAAM,iBAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC3B,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,oBAAoB,EAAE,eAAe;SACxC,CAAC,CAAC;KACN;SAAM;QACH,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;KACxC;IACD,OAAO,MAAM,gBAAM,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;AAC1E,CAAC;AA5CD,oDA4CC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAwB;IACzD,MAAM,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,eAAe,EAAE,CAAC;IAClD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3D,MAAM,8BAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAJD,wCAIC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,aAAkC,EAAE;IACnF,MAAM,eAAe,GAAG,MAAM,gBAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC;IAC7D,MAAM,QAAQ,CAAC,iBAAiB,EAAE,CAAC;IACnC,OAAO,QAAQ,CAAC;AACpB,CAAC;AALD,wCAKC;AAOM,KAAK,UAAU,uBAAuB,CACzC,QAAgF,EAChF,KAAqG,EACrG,MAAc,EACd,SAA+D,EAC/D,GAAG,IAAO;IAEV,MAAM,YAAY,GAAG,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IACnF,MAAM,KAAK,GAAG,YAAY,KAAK,mBAAS,CAAC,YAAY,IAAI,YAAY,KAAK,mBAAS,CAAC,WAAW,CAAC;IAChG,MAAM,UAAU,GAAG,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;IAEhF,MAAM,UAAU,GAAW,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,QAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK;QACzE,CAAC,CAAC,QAAS,CAAC,OAAO,GAAG,QAAS,CAAC,QAAQ;QACxC,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,WAAW,GAAW,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,CAAC,WAAW,GAAG,UAAU,GAAG,MAAM,EAAE,QAAS,CAAC,CAAC;AAC1D,CAAC;AAlBD,0DAkBC;AAED,SAAgB,YAAY,CAAC,SAAiB;IAC1C,2EAA2E;IAC3E,2CAA2C;IAC3C,uFAAuF;IACvF,IAAI,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,GAAG,EAAE,EAAE;QACR,CAAC,IAAI,EAAE,CAAC;KACX;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;AAC1C,CAAC;AAVD,oCAUC;AAEM,KAAK,UAAU,WAAW,CAC7B,MAAsF,EACtF,aAAkC,IAAI;IAEtC,OAAO,YAAY,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;AAC9D,CAAC;AALD,kCAKC;AAEM,KAAK,UAAU,iBAAiB;AACnC,8DAA8D;AAC9D,QAAyF,EACzF,MAAc,EACd,YAAsB;IAEtB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAElC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9B,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,8CAaC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC,CAAE,iEAAiE;AAC5G,2DAAsC;AACtC,sFAAgE;AAIhE,uCAAsC;AAkB/B,KAAK,UAAU,oBAAoB,CAAC,EACvC,YAAY,EACZ,eAAe,EACf,WAAW,EACX,QAAQ,EACR,cAAc,GAAG,YAAY,EAC7B,UAAU,GAAG,KAAK,EAClB,qBAAqB,GAAG,IAAI,EAC5B,QAAQ,EACR,oBAAoB,EACpB,YAAY,EACZ,GAAG,GAAG,IAAI,EACV,iBAAiB,GAAG,mBAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACvD;IACpB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAE/B,MAAM,aAAa,GAAkB;QACjC,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,YAAY;QACtB,qBAAqB;QACrB,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE;QAC9B,oBAAoB,EAAE,oBAAoB,EAAE,QAAQ,EAAE;QACtD,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE;QACtC,GAAG;QACH,iBAAiB;KACpB,CAAC;IACF,MAAM,YAAY,GAAiB,MAAM,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAE/E,IAAI,CAAC,CAAC,UAAU,IAAI,mBAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;QAClE,MAAM,iBAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC3B,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,oBAAoB,EAAE,eAAe;SACxC,CAAC,CAAC;KACN;SAAM;QACH,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;KACxC;IACD,OAAO,MAAM,gBAAM,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;AAC1E,CAAC;AA5CD,oDA4CC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAwB;IACzD,MAAM,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,eAAe,EAAE,CAAC;IAClD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3D,MAAM,8BAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAJD,wCAIC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,aAAkC,EAAE;IACnF,MAAM,eAAe,GAAG,MAAM,gBAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC;IAC7D,MAAM,QAAQ,CAAC,iBAAiB,EAAE,CAAC;IACnC,OAAO,QAAQ,CAAC;AACpB,CAAC;AALD,wCAKC;AAED,8DAA8D;AACvD,KAAK,UAAU,0BAA0B,CAAC,GAAU,EAAE,QAAmB,EAAE,aAAkC,EAAE,EAAE,MAAe;IACnI,MAAM,eAAe,GAAG,MAAM,gBAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC;IAC7D,MAAM,QAAQ,CAAC,iBAAiB,EAAE,CAAC;IACnC,OAAO,QAAQ,CAAC;AACpB,CAAC;AALD,gEAKC;AAOM,KAAK,UAAU,uBAAuB,CACzC,QAAgF,EAChF,KAAqG,EACrG,MAAc,EACd,SAA+D,EAC/D,GAAG,IAAO;IAEV,MAAM,YAAY,GAAG,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IACnF,MAAM,KAAK,GAAG,YAAY,KAAK,mBAAS,CAAC,YAAY,IAAI,YAAY,KAAK,mBAAS,CAAC,WAAW,CAAC;IAChG,MAAM,UAAU,GAAG,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;IAEhF,MAAM,UAAU,GAAW,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,QAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK;QACzE,CAAC,CAAC,QAAS,CAAC,OAAO,GAAG,QAAS,CAAC,QAAQ;QACxC,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,WAAW,GAAW,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,CAAC,WAAW,GAAG,UAAU,GAAG,MAAM,EAAE,QAAS,CAAC,CAAC;AAC1D,CAAC;AAlBD,0DAkBC;AAED,SAAgB,YAAY,CAAC,SAAiB;IAC1C,2EAA2E;IAC3E,2CAA2C;IAC3C,uFAAuF;IACvF,IAAI,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,GAAG,EAAE,EAAE;QACR,CAAC,IAAI,EAAE,CAAC;KACX;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;AAC1C,CAAC;AAVD,oCAUC;AAEM,KAAK,UAAU,WAAW,CAC7B,MAAsF,EACtF,aAAkC,IAAI;IAEtC,OAAO,YAAY,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;AAC9D,CAAC;AALD,kCAKC;AAEM,KAAK,UAAU,iBAAiB;AACnC,8DAA8D;AAC9D,QAAyF,EACzF,MAAc,EACd,YAAsB;IAEtB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAElC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9B,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,8CAaC"}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.d.ts

@@ -0,0 +1,20 @@
+import type { BaseContract, FunctionFragment, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener } from "../../../../common";
+export interface IERC1155ErrorsInterface extends Interface {
+}
+export interface IERC1155Errors extends BaseContract {
+    connect(runner?: ContractRunner | null): IERC1155Errors;
+    waitForDeployment(): Promise<this>;
+    interface: IERC1155ErrorsInterface;
+    queryFilter<TCEvent extends TypedContractEvent>(event: TCEvent, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    queryFilter<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    on<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    on<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
+    listeners(eventName?: string): Promise<Array<Listener>>;
+    removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
+    getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
+    filters: {};
+}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IERC1155Errors.js.map

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IERC1155Errors.js","sourceRoot":"","sources":["../../../../../../typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.ts"],"names":[],"mappings":""}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.d.ts

@@ -0,0 +1,20 @@
+import type { BaseContract, FunctionFragment, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener } from "../../../../common";
+export interface IERC20ErrorsInterface extends Interface {
+}
+export interface IERC20Errors extends BaseContract {
+    connect(runner?: ContractRunner | null): IERC20Errors;
+    waitForDeployment(): Promise<this>;
+    interface: IERC20ErrorsInterface;
+    queryFilter<TCEvent extends TypedContractEvent>(event: TCEvent, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    queryFilter<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    on<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    on<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
+    listeners(eventName?: string): Promise<Array<Listener>>;
+    removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
+    getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
+    filters: {};
+}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IERC20Errors.js.map

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IERC20Errors.js","sourceRoot":"","sources":["../../../../../../typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.ts"],"names":[],"mappings":""}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.d.ts

@@ -0,0 +1,20 @@
+import type { BaseContract, FunctionFragment, Interface, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener } from "../../../../common";
+export interface IERC721ErrorsInterface extends Interface {
+}
+export interface IERC721Errors extends BaseContract {
+    connect(runner?: ContractRunner | null): IERC721Errors;
+    waitForDeployment(): Promise<this>;
+    interface: IERC721ErrorsInterface;
+    queryFilter<TCEvent extends TypedContractEvent>(event: TCEvent, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    queryFilter<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    on<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    on<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
+    listeners(eventName?: string): Promise<Array<Listener>>;
+    removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
+    getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
+    filters: {};
+}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IERC721Errors.js.map

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IERC721Errors.js","sourceRoot":"","sources":["../../../../../../typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.ts"],"names":[],"mappings":""}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.d.ts

@@ -0,0 +1,3 @@
+export type { IERC1155Errors } from "./IERC1155Errors";
+export type { IERC20Errors } from "./IERC20Errors";
+export type { IERC721Errors } from "./IERC721Errors";

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=index.js.map

package/dist/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts"],"names":[],"mappings":""}

package/dist/typechain-types/@openzeppelin/contracts/interfaces/index.d.ts

@@ -1,2 +1,4 @@
+import type * as draftIerc6093Sol from "./draft-IERC6093.sol";
+export type { draftIerc6093Sol };
 export type { IERC1271 } from "./IERC1271";
 export type { IERC5267 } from "./IERC5267";

package/dist/typechain-types/@openzeppelin/contracts/token/ERC20/ERC20.d.ts

@@ -1,14 +1,12 @@
 import type { BaseContract, BigNumberish, BytesLike, FunctionFragment, Result, Interface, EventFragment, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
 import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedLogDescription, TypedListener, TypedContractMethod } from "../../../../common";
 export interface ERC20Interface extends Interface {
-    getFunction(nameOrSignature: "allowance" | "approve" | "balanceOf" | "decimals" | "decreaseAllowance" | "increaseAllowance" | "name" | "symbol" | "totalSupply" | "transfer" | "transferFrom"): FunctionFragment;
+    getFunction(nameOrSignature: "allowance" | "approve" | "balanceOf" | "decimals" | "name" | "symbol" | "totalSupply" | "transfer" | "transferFrom"): FunctionFragment;
     getEvent(nameOrSignatureOrTopic: "Approval" | "Transfer"): EventFragment;
     encodeFunctionData(functionFragment: "allowance", values: [AddressLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "approve", values: [AddressLike, BigNumberish]): string;
     encodeFunctionData(functionFragment: "balanceOf", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "decimals", values?: undefined): string;
-    encodeFunctionData(functionFragment: "decreaseAllowance", values: [AddressLike, BigNumberish]): string;
-    encodeFunctionData(functionFragment: "increaseAllowance", values: [AddressLike, BigNumberish]): string;
     encodeFunctionData(functionFragment: "name", values?: undefined): string;
     encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
     encodeFunctionData(functionFragment: "totalSupply", values?: undefined): string;
@@ -18,8 +16,6 @@ export interface ERC20Interface extends Interface {
     decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "decreaseAllowance", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "increaseAllowance", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "totalSupply", data: BytesLike): Result;
@@ -81,37 +77,25 @@ export interface ERC20 extends BaseContract {
     ], "view">;
     approve: TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     balanceOf: TypedContractMethod<[account: AddressLike], [bigint], "view">;
     decimals: TypedContractMethod<[], [bigint], "view">;
-    decreaseAllowance: TypedContractMethod<[
-        spender: AddressLike,
-        subtractedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
-    increaseAllowance: TypedContractMethod<[
-        spender: AddressLike,
-        addedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
     name: TypedContractMethod<[], [string], "view">;
     symbol: TypedContractMethod<[], [string], "view">;
     totalSupply: TypedContractMethod<[], [bigint], "view">;
     transfer: TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     transferFrom: TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -124,37 +108,25 @@ export interface ERC20 extends BaseContract {
     ], "view">;
     getFunction(nameOrSignature: "approve"): TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     getFunction(nameOrSignature: "balanceOf"): TypedContractMethod<[account: AddressLike], [bigint], "view">;
     getFunction(nameOrSignature: "decimals"): TypedContractMethod<[], [bigint], "view">;
-    getFunction(nameOrSignature: "decreaseAllowance"): TypedContractMethod<[
-        spender: AddressLike,
-        subtractedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
-    getFunction(nameOrSignature: "increaseAllowance"): TypedContractMethod<[
-        spender: AddressLike,
-        addedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
     getFunction(nameOrSignature: "name"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "symbol"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "totalSupply"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "transfer"): TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     getFunction(nameOrSignature: "transferFrom"): TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;

package/dist/typechain-types/@openzeppelin/contracts/token/ERC20/IERC20.d.ts

@@ -71,7 +71,7 @@ export interface IERC20 extends BaseContract {
     ], "view">;
     approve: TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -79,14 +79,14 @@ export interface IERC20 extends BaseContract {
     totalSupply: TypedContractMethod<[], [bigint], "view">;
     transfer: TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     transferFrom: TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -99,7 +99,7 @@ export interface IERC20 extends BaseContract {
     ], "view">;
     getFunction(nameOrSignature: "approve"): TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -107,14 +107,14 @@ export interface IERC20 extends BaseContract {
     getFunction(nameOrSignature: "totalSupply"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "transfer"): TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     getFunction(nameOrSignature: "transferFrom"): TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;

package/dist/typechain-types/@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.d.ts

@@ -1,16 +1,14 @@
 import type { BaseContract, BigNumberish, BytesLike, FunctionFragment, Result, Interface, EventFragment, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
 import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedLogDescription, TypedListener, TypedContractMethod } from "../../../../../common";
 export interface ERC20PermitInterface extends Interface {
-    getFunction(nameOrSignature: "DOMAIN_SEPARATOR" | "allowance" | "approve" | "balanceOf" | "decimals" | "decreaseAllowance" | "eip712Domain" | "increaseAllowance" | "name" | "nonces" | "permit" | "symbol" | "totalSupply" | "transfer" | "transferFrom"): FunctionFragment;
+    getFunction(nameOrSignature: "DOMAIN_SEPARATOR" | "allowance" | "approve" | "balanceOf" | "decimals" | "eip712Domain" | "name" | "nonces" | "permit" | "symbol" | "totalSupply" | "transfer" | "transferFrom"): FunctionFragment;
     getEvent(nameOrSignatureOrTopic: "Approval" | "EIP712DomainChanged" | "Transfer"): EventFragment;
     encodeFunctionData(functionFragment: "DOMAIN_SEPARATOR", values?: undefined): string;
     encodeFunctionData(functionFragment: "allowance", values: [AddressLike, AddressLike]): string;
     encodeFunctionData(functionFragment: "approve", values: [AddressLike, BigNumberish]): string;
     encodeFunctionData(functionFragment: "balanceOf", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "decimals", values?: undefined): string;
-    encodeFunctionData(functionFragment: "decreaseAllowance", values: [AddressLike, BigNumberish]): string;
     encodeFunctionData(functionFragment: "eip712Domain", values?: undefined): string;
-    encodeFunctionData(functionFragment: "increaseAllowance", values: [AddressLike, BigNumberish]): string;
     encodeFunctionData(functionFragment: "name", values?: undefined): string;
     encodeFunctionData(functionFragment: "nonces", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "permit", values: [
@@ -31,9 +29,7 @@ export interface ERC20PermitInterface extends Interface {
     decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "decreaseAllowance", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "eip712Domain", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "increaseAllowance", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "nonces", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "permit", data: BytesLike): Result;
@@ -108,18 +104,12 @@ export interface ERC20Permit extends BaseContract {
     ], "view">;
     approve: TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     balanceOf: TypedContractMethod<[account: AddressLike], [bigint], "view">;
     decimals: TypedContractMethod<[], [bigint], "view">;
-    decreaseAllowance: TypedContractMethod<[
-        spender: AddressLike,
-        subtractedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
     eip712Domain: TypedContractMethod<[
     ], [
         [
@@ -140,12 +130,6 @@ export interface ERC20Permit extends BaseContract {
             extensions: bigint[];
         }
     ], "view">;
-    increaseAllowance: TypedContractMethod<[
-        spender: AddressLike,
-        addedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
     name: TypedContractMethod<[], [string], "view">;
     nonces: TypedContractMethod<[owner: AddressLike], [bigint], "view">;
     permit: TypedContractMethod<[
@@ -163,14 +147,14 @@ export interface ERC20Permit extends BaseContract {
     totalSupply: TypedContractMethod<[], [bigint], "view">;
     transfer: TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     transferFrom: TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -184,18 +168,12 @@ export interface ERC20Permit extends BaseContract {
     ], "view">;
     getFunction(nameOrSignature: "approve"): TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     getFunction(nameOrSignature: "balanceOf"): TypedContractMethod<[account: AddressLike], [bigint], "view">;
     getFunction(nameOrSignature: "decimals"): TypedContractMethod<[], [bigint], "view">;
-    getFunction(nameOrSignature: "decreaseAllowance"): TypedContractMethod<[
-        spender: AddressLike,
-        subtractedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
     getFunction(nameOrSignature: "eip712Domain"): TypedContractMethod<[
     ], [
         [
@@ -216,12 +194,6 @@ export interface ERC20Permit extends BaseContract {
             extensions: bigint[];
         }
     ], "view">;
-    getFunction(nameOrSignature: "increaseAllowance"): TypedContractMethod<[
-        spender: AddressLike,
-        addedValue: BigNumberish
-    ], [
-        boolean
-    ], "nonpayable">;
     getFunction(nameOrSignature: "name"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "nonces"): TypedContractMethod<[owner: AddressLike], [bigint], "view">;
     getFunction(nameOrSignature: "permit"): TypedContractMethod<[
@@ -239,14 +211,14 @@ export interface ERC20Permit extends BaseContract {
     getFunction(nameOrSignature: "totalSupply"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "transfer"): TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     getFunction(nameOrSignature: "transferFrom"): TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;

package/dist/typechain-types/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.d.ts

@@ -77,7 +77,7 @@ export interface IERC20Metadata extends BaseContract {
     ], "view">;
     approve: TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -88,14 +88,14 @@ export interface IERC20Metadata extends BaseContract {
     totalSupply: TypedContractMethod<[], [bigint], "view">;
     transfer: TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     transferFrom: TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -108,7 +108,7 @@ export interface IERC20Metadata extends BaseContract {
     ], "view">;
     getFunction(nameOrSignature: "approve"): TypedContractMethod<[
         spender: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
@@ -119,14 +119,14 @@ export interface IERC20Metadata extends BaseContract {
     getFunction(nameOrSignature: "totalSupply"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "transfer"): TypedContractMethod<[
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;
     getFunction(nameOrSignature: "transferFrom"): TypedContractMethod<[
         from: AddressLike,
         to: AddressLike,
-        amount: BigNumberish
+        value: BigNumberish
     ], [
         boolean
     ], "nonpayable">;

package/dist/typechain-types/@openzeppelin/contracts/utils/Nonces.d.ts

@@ -0,0 +1,25 @@
+import type { BaseContract, BytesLike, FunctionFragment, Result, Interface, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener, TypedContractMethod } from "../../../common";
+export interface NoncesInterface extends Interface {
+    getFunction(nameOrSignature: "nonces"): FunctionFragment;
+    encodeFunctionData(functionFragment: "nonces", values: [AddressLike]): string;
+    decodeFunctionResult(functionFragment: "nonces", data: BytesLike): Result;
+}
+export interface Nonces extends BaseContract {
+    connect(runner?: ContractRunner | null): Nonces;
+    waitForDeployment(): Promise<this>;
+    interface: NoncesInterface;
+    queryFilter<TCEvent extends TypedContractEvent>(event: TCEvent, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    queryFilter<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TypedEventLog<TCEvent>>>;
+    on<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    on<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(event: TCEvent, listener: TypedListener<TCEvent>): Promise<this>;
+    once<TCEvent extends TypedContractEvent>(filter: TypedDeferredTopicFilter<TCEvent>, listener: TypedListener<TCEvent>): Promise<this>;
+    listeners<TCEvent extends TypedContractEvent>(event: TCEvent): Promise<Array<TypedListener<TCEvent>>>;
+    listeners(eventName?: string): Promise<Array<Listener>>;
+    removeAllListeners<TCEvent extends TypedContractEvent>(event?: TCEvent): Promise<this>;
+    nonces: TypedContractMethod<[owner: AddressLike], [bigint], "view">;
+    getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
+    getFunction(nameOrSignature: "nonces"): TypedContractMethod<[owner: AddressLike], [bigint], "view">;
+    filters: {};
+}