@hyperlane-xyz/core 1.3.0 → 1.3.2

package/README.md

@@ -6,7 +6,6 @@ On-chain implementations of Hyperlane in Solidity.
 
 - `npm install --dev`
 - `brew install jq`   OR   `sudo apt-get install jq`
-- `npm install -g solhint`, check it is installed using `solhint --version`
 
 ## Build
 

package/contracts/Mailbox.sol

@@ -189,7 +189,7 @@ contract Mailbox is
      * @return root The root of the Mailbox's merkle tree.
      * @return index The index of the last element in the tree.
      */
-    function latestCheckpoint() public view returns (bytes32, uint32) {
+    function latestCheckpoint() external view returns (bytes32, uint32) {
         return (root(), count() - 1);
     }
 
@@ -241,6 +241,7 @@ contract Mailbox is
             if (address(_val) != address(0)) {
                 return _val;
             }
+            // solhint-disable-next-line no-empty-blocks
         } catch {}
         return defaultIsm;
     }

package/contracts/Router.sol

@@ -11,7 +11,7 @@ import {EnumerableMapExtended} from "./libs/EnumerableMapExtended.sol";
 abstract contract Router is HyperlaneConnectionClient, IMessageRecipient {
     using EnumerableMapExtended for EnumerableMapExtended.UintToBytes32Map;
 
-    string constant NO_ROUTER_ENROLLED_REVERT_MESSAGE =
+    string private constant NO_ROUTER_ENROLLED_REVERT_MESSAGE =
         "No router enrolled for domain. Did you specify the right domain ID?";
 
     // ============ Mutable Storage ============
@@ -71,8 +71,9 @@ abstract contract Router is HyperlaneConnectionClient, IMessageRecipient {
     // ============ External functions ============
     function domains() external view returns (uint32[] memory) {
         bytes32[] storage rawKeys = _routers.keys();
-        uint32[] memory keys = new uint32[](rawKeys.length);
-        for (uint256 i = 0; i < rawKeys.length; i++) {
+        uint256 length = rawKeys.length;
+        uint32[] memory keys = new uint32[](length);
+        for (uint256 i = 0; i < length; i++) {
             keys[i] = uint32(uint256(rawKeys[i]));
         }
         return keys;
@@ -109,7 +110,8 @@ abstract contract Router is HyperlaneConnectionClient, IMessageRecipient {
         bytes32[] calldata _addresses
     ) external virtual onlyOwner {
         require(_domains.length == _addresses.length, "!length");
-        for (uint256 i = 0; i < _domains.length; i += 1) {
+        uint256 length = _domains.length;
+        for (uint256 i = 0; i < length; i += 1) {
             _enrollRemoteRouter(_domains[i], _addresses[i]);
         }
     }
@@ -125,7 +127,6 @@ abstract contract Router is HyperlaneConnectionClient, IMessageRecipient {
         bytes32 _sender,
         bytes calldata _message
     ) external virtual override onlyMailbox onlyRemoteRouter(_origin, _sender) {
-        // TODO: callbacks on success/failure
         _handle(_origin, _sender, _message);
     }
 

package/contracts/igps/InterchainGasPaymaster.sol

@@ -50,12 +50,6 @@ contract InterchainGasPaymaster is
         address gasOracle;
     }
 
-    // ============ Constructor ============
-
-    constructor(address _beneficiary) {
-        initialize(msg.sender, _beneficiary); // allows contract to be used without proxying
-    }
-
     // ============ External Functions ============
 
     /**

package/contracts/interfaces/IAggregationIsm.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
-pragma solidity >=0.6.0;
+pragma solidity >=0.6.11;
 
 import {IInterchainSecurityModule} from "./IInterchainSecurityModule.sol";
 

package/contracts/interfaces/isms/IMultisigIsm.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
-pragma solidity >=0.6.0;
+pragma solidity >=0.6.11;
 
 import {IInterchainSecurityModule} from "../IInterchainSecurityModule.sol";
 

package/contracts/isms/aggregation/AbstractAggregationIsm.sol

@@ -17,6 +17,7 @@ import {AggregationIsmMetadata} from "../../libs/isms/AggregationIsmMetadata.sol
 abstract contract AbstractAggregationIsm is IAggregationIsm {
     // ============ Constants ============
 
+    // solhint-disable-next-line const-name-snakecase
     uint8 public constant moduleType =
         uint8(IInterchainSecurityModule.Types.MULTISIG);
 

package/contracts/isms/multisig/AbstractMultisigIsm.sol

@@ -20,6 +20,7 @@ import {MerkleLib} from "../../libs/Merkle.sol";
 abstract contract AbstractMultisigIsm is IMultisigIsm {
     // ============ Constants ============
 
+    // solhint-disable-next-line const-name-snakecase
     uint8 public constant moduleType =
         uint8(IInterchainSecurityModule.Types.MULTISIG);
 
@@ -109,12 +110,12 @@ abstract contract AbstractMultisigIsm is IMultisigIsm {
                 MultisigIsmMetadata.signatureAt(_metadata, i)
             );
             // Loop through remaining validators until we find a match
-            for (
-                ;
+            while (
                 _validatorIndex < _validatorCount &&
-                    _signer != _validators[_validatorIndex];
-                ++_validatorIndex
-            ) {}
+                _signer != _validators[_validatorIndex]
+            ) {
+                ++_validatorIndex;
+            }
             // Fail if we never found a match
             require(_validatorIndex < _validatorCount, "!threshold");
             ++_validatorIndex;

package/contracts/isms/multisig/LegacyMultisigIsm.sol

@@ -29,6 +29,7 @@ contract LegacyMultisigIsm is IMultisigIsm, Ownable {
 
     // ============ Constants ============
 
+    // solhint-disable-next-line const-name-snakecase
     uint8 public constant moduleType =
         uint8(IInterchainSecurityModule.Types.LEGACY_MULTISIG);
 
@@ -102,10 +103,12 @@ contract LegacyMultisigIsm is IMultisigIsm, Ownable {
         uint32[] calldata _domains,
         address[][] calldata _validators
     ) external onlyOwner {
-        require(_domains.length == _validators.length, "!length");
-        for (uint256 i = 0; i < _domains.length; i += 1) {
+        uint256 domainsLength = _domains.length;
+        require(domainsLength == _validators.length, "!length");
+        for (uint256 i = 0; i < domainsLength; i += 1) {
             address[] calldata _domainValidators = _validators[i];
-            for (uint256 j = 0; j < _domainValidators.length; j += 1) {
+            uint256 validatorsLength = _domainValidators.length;
+            for (uint256 j = 0; j < validatorsLength; j += 1) {
                 _enrollValidator(_domains[i], _domainValidators[j]);
             }
             _updateCommitment(_domains[i]);
@@ -155,8 +158,9 @@ contract LegacyMultisigIsm is IMultisigIsm, Ownable {
         uint32[] calldata _domains,
         uint8[] calldata _thresholds
     ) external onlyOwner {
-        require(_domains.length == _thresholds.length, "!length");
-        for (uint256 i = 0; i < _domains.length; i += 1) {
+        uint256 length = _domains.length;
+        require(length == _thresholds.length, "!length");
+        for (uint256 i = 0; i < length; i += 1) {
             setThreshold(_domains[i], _thresholds[i]);
         }
     }
@@ -202,7 +206,7 @@ contract LegacyMultisigIsm is IMultisigIsm, Ownable {
      * @param _message Formatted Hyperlane message (see Message.sol).
      */
     function verify(bytes calldata _metadata, bytes calldata _message)
-        public
+        external
         view
         returns (bool)
     {
@@ -340,12 +344,12 @@ contract LegacyMultisigIsm is IMultisigIsm, Ownable {
         for (uint256 i = 0; i < _threshold; ++i) {
             address _signer = ECDSA.recover(_digest, _metadata.signatureAt(i));
             // Loop through remaining validators until we find a match
-            for (
-                ;
+            while (
                 _validatorIndex < _validatorCount &&
-                    _signer != _metadata.validatorAt(_validatorIndex);
-                ++_validatorIndex
-            ) {}
+                _signer != _metadata.validatorAt(_validatorIndex)
+            ) {
+                ++_validatorIndex;
+            }
             // Fail if we never found a match
             require(_validatorIndex < _validatorCount, "!threshold");
             ++_validatorIndex;

package/contracts/libs/MetaProxy.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.7.6;
 
 /// @dev Adapted from https://eips.ethereum.org/EIPS/eip-3448
 library MetaProxy {
-    bytes32 constant PREFIX =
+    bytes32 private constant PREFIX =
         hex"600b380380600b3d393df3363d3d373d3d3d3d60368038038091363936013d73";
-    bytes13 constant SUFFIX = hex"5af43d3d93803e603457fd5bf3";
+    bytes13 private constant SUFFIX = hex"5af43d3d93803e603457fd5bf3";
 
     function bytecode(address _implementation, bytes memory _metadata)
         internal

package/contracts/libs/MinimalProxy.sol

@@ -3,8 +3,9 @@ pragma solidity >=0.6.11;
 
 // Library for building bytecode of minimal proxies (see https://eips.ethereum.org/EIPS/eip-1167)
 library MinimalProxy {
-    bytes20 constant PREFIX = hex"3d602d80600a3d3981f3363d3d373d3d3d363d73";
-    bytes15 constant SUFFIX = hex"5af43d82803e903d91602b57fd5bf3";
+    bytes20 private constant PREFIX =
+        hex"3d602d80600a3d3981f3363d3d373d3d3d363d73";
+    bytes15 private constant SUFFIX = hex"5af43d82803e903d91602b57fd5bf3";
 
     function bytecode(address implementation)
         internal

package/contracts/middleware/InterchainQueryRouter.sol

@@ -136,7 +136,6 @@ contract InterchainQueryRouter is Router, IInterchainQueryRouter {
             address senderAddress = sender.bytes32ToAddress();
             bytes[] memory rawCalls = InterchainQueryMessage.rawCalls(_message);
             CallLib.multicallto(senderAddress, rawCalls);
-            //
             emit QueryResolved(_origin, senderAddress);
         } else {
             assert(false);

package/contracts/middleware/liquidity-layer/LiquidityLayerRouter.sol

@@ -11,8 +11,11 @@ import {ILiquidityLayerMessageRecipient} from "../../interfaces/ILiquidityLayerM
 import {TypeCasts} from "../../libs/TypeCasts.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract LiquidityLayerRouter is Router, ILiquidityLayerRouter {
+    using SafeERC20 for IERC20;
+
     // Token bridge => adapter address
     mapping(string => address) public liquidityLayerAdapters;
 
@@ -50,12 +53,7 @@ contract LiquidityLayerRouter is Router, ILiquidityLayerRouter {
         ILiquidityLayerAdapter _adapter = _getAdapter(_bridge);
 
         // Transfer the tokens to the adapter
-        // TODO: use safeTransferFrom
-        // TODO: Are there scenarios where a transferFrom fails and it doesn't revert?
-        require(
-            IERC20(_token).transferFrom(msg.sender, address(_adapter), _amount),
-            "!transfer in"
-        );
+        IERC20(_token).safeTransferFrom(msg.sender, address(_adapter), _amount);
 
         // Reverts if the bridge was unsuccessful.
         // Gets adapter-specific data that is encoded into the message

package/contracts/middleware/liquidity-layer/adapters/CircleBridgeAdapter.sol

@@ -8,8 +8,11 @@ import {ICircleMessageTransmitter} from "../interfaces/circle/ICircleMessageTran
 import {ILiquidityLayerAdapter} from "../interfaces/ILiquidityLayerAdapter.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract CircleBridgeAdapter is ILiquidityLayerAdapter, Router {
+    using SafeERC20 for IERC20;
+
     /// @notice The TokenMessenger contract.
     ITokenMessenger public tokenMessenger;
 
@@ -22,7 +25,7 @@ contract CircleBridgeAdapter is ILiquidityLayerAdapter, Router {
     /// @notice Hyperlane domain => Circle domain.
     /// ATM, known Circle domains are Ethereum = 0 and Avalanche = 1.
     /// Note this could result in ambiguity between the Circle domain being
-    /// Ethereum or unknown. TODO fix?
+    /// Ethereum or unknown.
     mapping(uint32 => uint32) public hyperlaneDomainToCircleDomain;
 
     /// @notice Token symbol => address of token on local chain.
@@ -70,8 +73,8 @@ contract CircleBridgeAdapter is ILiquidityLayerAdapter, Router {
         address _tokenMessenger,
         address _circleMessageTransmitter,
         address _liquidityLayerRouter
-    ) public initializer {
-        // Transfer ownership of the contract to deployer
+    ) external initializer {
+        __Ownable_init();
         _transferOwnership(_owner);
 
         tokenMessenger = ITokenMessenger(_tokenMessenger);
@@ -96,11 +99,7 @@ contract CircleBridgeAdapter is ILiquidityLayerAdapter, Router {
         uint32 _circleDomain = hyperlaneDomainToCircleDomain[
             _destinationDomain
         ];
-        bytes32 _remoteRouter = routers(_destinationDomain);
-        require(
-            _remoteRouter != bytes32(0),
-            "CircleBridgeAdapter: No router for domain"
-        );
+        bytes32 _remoteRouter = _mustHaveRemoteRouter(_destinationDomain);
 
         // Approve the token to Circle. We assume that the LiquidityLayerRouter
         // has already transferred the token to this contract.
@@ -127,6 +126,7 @@ contract CircleBridgeAdapter is ILiquidityLayerAdapter, Router {
         uint256 _amount,
         bytes calldata _adapterData // The adapter data from the message
     ) external onlyLiquidityLayerRouter returns (address, uint256) {
+        _mustHaveRemoteRouter(_originDomain);
         // The origin Circle domain
         uint32 _originCircleDomain = hyperlaneDomainToCircleDomain[
             _originDomain
@@ -151,10 +151,9 @@ contract CircleBridgeAdapter is ILiquidityLayerAdapter, Router {
         );
 
         // Transfer the token out to the recipient
-        // TODO: use safeTransfer
         // Circle doesn't charge any fee, so we can safely transfer out the
         // exact amount that was bridged over.
-        require(_token.transfer(_recipient, _amount), "!transfer out");
+        _token.safeTransfer(_recipient, _amount);
 
         return (address(_token), _amount);
     }

package/contracts/middleware/liquidity-layer/adapters/PortalAdapter.sol

@@ -21,7 +21,7 @@ contract PortalAdapter is ILiquidityLayerAdapter, Router {
     /// @notice transferId => token address
     mapping(bytes32 => address) public portalTransfersProcessed;
 
-    uint32 localDomain;
+    uint32 public localDomain;
 
     // We could technically use Portal's sequence number here but it doesn't
     // get passed through, so we would have to parse the VAA twice

package/contracts/test/TestInterchainGasPaymaster.sol

@@ -8,7 +8,9 @@ contract TestInterchainGasPaymaster is InterchainGasPaymaster {
     uint256 public constant gasPrice = 10;
 
     // Ensure the same constructor interface as the inherited InterchainGasPaymaster
-    constructor(address _beneficiary) InterchainGasPaymaster(_beneficiary) {}
+    constructor(address _beneficiary) {
+        initialize(msg.sender, _beneficiary);
+    }
 
     function quoteGasPayment(uint32, uint256 gasAmount)
         public

package/dist/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/IERC20Permit.d.ts

@@ -0,0 +1,75 @@
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "../../../../../../common";
+import type { FunctionFragment, Result } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
+import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
+export interface IERC20PermitInterface extends utils.Interface {
+    functions: {
+        "DOMAIN_SEPARATOR()": FunctionFragment;
+        "nonces(address)": FunctionFragment;
+        "permit(address,address,uint256,uint256,uint8,bytes32,bytes32)": FunctionFragment;
+    };
+    getFunction(nameOrSignatureOrTopic: "DOMAIN_SEPARATOR" | "nonces" | "permit"): FunctionFragment;
+    encodeFunctionData(functionFragment: "DOMAIN_SEPARATOR", values?: undefined): string;
+    encodeFunctionData(functionFragment: "nonces", values: [string]): string;
+    encodeFunctionData(functionFragment: "permit", values: [
+        string,
+        string,
+        BigNumberish,
+        BigNumberish,
+        BigNumberish,
+        BytesLike,
+        BytesLike
+    ]): string;
+    decodeFunctionResult(functionFragment: "DOMAIN_SEPARATOR", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "nonces", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "permit", data: BytesLike): Result;
+    events: {};
+}
+export interface IERC20Permit extends BaseContract {
+    connect(signerOrProvider: Signer | Provider | string): this;
+    attach(addressOrName: string): this;
+    deployed(): Promise<this>;
+    interface: IERC20PermitInterface;
+    queryFilter<TEvent extends TypedEvent>(event: TypedEventFilter<TEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TEvent>>;
+    listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>;
+    listeners(eventName?: string): Array<Listener>;
+    removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this;
+    removeAllListeners(eventName?: string): this;
+    off: OnEvent<this>;
+    on: OnEvent<this>;
+    once: OnEvent<this>;
+    removeListener: OnEvent<this>;
+    functions: {
+        DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<[string]>;
+        nonces(owner: string, overrides?: CallOverrides): Promise<[BigNumber]>;
+        permit(owner: string, spender: string, value: BigNumberish, deadline: BigNumberish, v: BigNumberish, r: BytesLike, s: BytesLike, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+    };
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
+    nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
+    permit(owner: string, spender: string, value: BigNumberish, deadline: BigNumberish, v: BigNumberish, r: BytesLike, s: BytesLike, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    callStatic: {
+        DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
+        nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
+        permit(owner: string, spender: string, value: BigNumberish, deadline: BigNumberish, v: BigNumberish, r: BytesLike, s: BytesLike, overrides?: CallOverrides): Promise<void>;
+    };
+    filters: {};
+    estimateGas: {
+        DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<BigNumber>;
+        nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
+        permit(owner: string, spender: string, value: BigNumberish, deadline: BigNumberish, v: BigNumberish, r: BytesLike, s: BytesLike, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+    };
+    populateTransaction: {
+        DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        nonces(owner: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        permit(owner: string, spender: string, value: BigNumberish, deadline: BigNumberish, v: BigNumberish, r: BytesLike, s: BytesLike, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+    };
+}
+//# sourceMappingURL=IERC20Permit.d.ts.map

package/dist/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/IERC20Permit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IERC20Permit.d.ts","sourceRoot":"","sources":["../../../../../../../types/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/IERC20Permit.ts"],"names":[],"mappings":"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"}

package/dist/{contracts/Create2Factory.js → @openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/IERC20Permit.js}

@@ -1,4 +1,4 @@
 "use strict";
 /* Autogenerated file. Do not edit manually. */
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=Create2Factory.js.map
+//# sourceMappingURL=IERC20Permit.js.map

package/dist/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/IERC20Permit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IERC20Permit.js","sourceRoot":"","sources":["../../../../../../../types/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/IERC20Permit.ts"],"names":[],"mappings":";AAAA,+CAA+C"}

package/dist/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/index.d.ts

@@ -0,0 +1,2 @@
+export type { IERC20Permit } from "./IERC20Permit";
+//# sourceMappingURL=index.d.ts.map

package/dist/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../types/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/index.ts"],"names":[],"mappings":"AAGA,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/index.js

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

package/dist/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/index.js.map

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

package/dist/@openzeppelin/contracts/token/ERC20/extensions/index.d.ts

@@ -0,0 +1,3 @@
+import type * as draftIerc20PermitSol from "./draft-IERC20Permit.sol";
+export type { draftIerc20PermitSol };
+//# sourceMappingURL=index.d.ts.map

package/dist/@openzeppelin/contracts/token/ERC20/extensions/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../types/@openzeppelin/contracts/token/ERC20/extensions/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,oBAAoB,MAAM,0BAA0B,CAAC;AAEtE,YAAY,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/@openzeppelin/contracts/token/ERC20/extensions/index.js

@@ -0,0 +1,4 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=index.js.map

package/dist/@openzeppelin/contracts/token/ERC20/extensions/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../types/@openzeppelin/contracts/token/ERC20/extensions/index.ts"],"names":[],"mappings":";AAAA,+CAA+C"}

package/dist/@openzeppelin/contracts/token/ERC20/index.d.ts

@@ -1,2 +1,4 @@
+import type * as extensions from "./extensions";
+export type { extensions };
 export type { IERC20 } from "./IERC20";
 //# sourceMappingURL=index.d.ts.map

package/dist/@openzeppelin/contracts/token/ERC20/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../types/@openzeppelin/contracts/token/ERC20/index.ts"],"names":[],"mappings":"AAGA,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../types/@openzeppelin/contracts/token/ERC20/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,UAAU,MAAM,cAAc,CAAC;AAEhD,YAAY,EAAE,UAAU,EAAE,CAAC;AAC3B,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}

package/dist/@openzeppelin/contracts/token/ERC20/index.js

@@ -1,3 +1,4 @@
 "use strict";
+/* Autogenerated file. Do not edit manually. */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=index.js.map

package/dist/@openzeppelin/contracts/token/ERC20/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../types/@openzeppelin/contracts/token/ERC20/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../types/@openzeppelin/contracts/token/ERC20/index.ts"],"names":[],"mappings":";AAAA,+CAA+C"}

package/dist/contracts/index.d.ts

@@ -16,7 +16,6 @@ export type { middleware };
 export type { mock };
 export type { test };
 export type { upgrade };
-export type { Create2Factory } from "./Create2Factory";
 export type { GasRouter } from "./GasRouter";
 export type { HyperlaneConnectionClient } from "./HyperlaneConnectionClient";
 export type { Mailbox } from "./Mailbox";

package/dist/contracts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../types/contracts/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,0BAA0B,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,UAAU,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,UAAU,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAC;AAE1C,YAAY,EAAE,0BAA0B,EAAE,CAAC;AAE3C,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,OAAO,EAAE,CAAC;AACxB,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,YAAY,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../types/contracts/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,0BAA0B,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,UAAU,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,UAAU,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAC;AAE1C,YAAY,EAAE,0BAA0B,EAAE,CAAC;AAE3C,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,IAAI,EAAE,CAAC;AAErB,YAAY,EAAE,OAAO,EAAE,CAAC;AACxB,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,YAAY,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/contracts/middleware/liquidity-layer/adapters/PortalAdapter.d.ts

@@ -15,6 +15,7 @@ export interface PortalAdapterInterface extends utils.Interface {
         "interchainGasPaymaster()": FunctionFragment;
         "interchainSecurityModule()": FunctionFragment;
         "liquidityLayerRouter()": FunctionFragment;
+        "localDomain()": FunctionFragment;
         "mailbox()": FunctionFragment;
         "nonce()": FunctionFragment;
         "owner()": FunctionFragment;
@@ -30,7 +31,7 @@ export interface PortalAdapterInterface extends utils.Interface {
         "transferId(uint32,uint224)": FunctionFragment;
         "transferOwnership(address)": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "addDomain" | "completeTransfer" | "domains" | "enrollRemoteRouter" | "enrollRemoteRouters" | "handle" | "hyperlaneDomainToWormholeDomain" | "initialize" | "interchainGasPaymaster" | "interchainSecurityModule" | "liquidityLayerRouter" | "mailbox" | "nonce" | "owner" | "portalTokenBridge" | "portalTransfersProcessed" | "receiveTokens" | "renounceOwnership" | "routers" | "sendTokens" | "setInterchainGasPaymaster" | "setInterchainSecurityModule" | "setMailbox" | "transferId" | "transferOwnership"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "addDomain" | "completeTransfer" | "domains" | "enrollRemoteRouter" | "enrollRemoteRouters" | "handle" | "hyperlaneDomainToWormholeDomain" | "initialize" | "interchainGasPaymaster" | "interchainSecurityModule" | "liquidityLayerRouter" | "localDomain" | "mailbox" | "nonce" | "owner" | "portalTokenBridge" | "portalTransfersProcessed" | "receiveTokens" | "renounceOwnership" | "routers" | "sendTokens" | "setInterchainGasPaymaster" | "setInterchainSecurityModule" | "setMailbox" | "transferId" | "transferOwnership"): FunctionFragment;
     encodeFunctionData(functionFragment: "addDomain", values: [BigNumberish, BigNumberish]): string;
     encodeFunctionData(functionFragment: "completeTransfer", values: [BytesLike]): string;
     encodeFunctionData(functionFragment: "domains", values?: undefined): string;
@@ -42,6 +43,7 @@ export interface PortalAdapterInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "interchainGasPaymaster", values?: undefined): string;
     encodeFunctionData(functionFragment: "interchainSecurityModule", values?: undefined): string;
     encodeFunctionData(functionFragment: "liquidityLayerRouter", values?: undefined): string;
+    encodeFunctionData(functionFragment: "localDomain", values?: undefined): string;
     encodeFunctionData(functionFragment: "mailbox", values?: undefined): string;
     encodeFunctionData(functionFragment: "nonce", values?: undefined): string;
     encodeFunctionData(functionFragment: "owner", values?: undefined): string;
@@ -67,6 +69,7 @@ export interface PortalAdapterInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "interchainGasPaymaster", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "interchainSecurityModule", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "liquidityLayerRouter", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "localDomain", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "mailbox", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "nonce", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
@@ -200,6 +203,7 @@ export interface PortalAdapter extends BaseContract {
         interchainGasPaymaster(overrides?: CallOverrides): Promise<[string]>;
         interchainSecurityModule(overrides?: CallOverrides): Promise<[string]>;
         liquidityLayerRouter(overrides?: CallOverrides): Promise<[string]>;
+        localDomain(overrides?: CallOverrides): Promise<[number]>;
         mailbox(overrides?: CallOverrides): Promise<[string]>;
         nonce(overrides?: CallOverrides): Promise<[BigNumber]>;
         owner(overrides?: CallOverrides): Promise<[string]>;
@@ -252,6 +256,7 @@ export interface PortalAdapter extends BaseContract {
     interchainGasPaymaster(overrides?: CallOverrides): Promise<string>;
     interchainSecurityModule(overrides?: CallOverrides): Promise<string>;
     liquidityLayerRouter(overrides?: CallOverrides): Promise<string>;
+    localDomain(overrides?: CallOverrides): Promise<number>;
     mailbox(overrides?: CallOverrides): Promise<string>;
     nonce(overrides?: CallOverrides): Promise<BigNumber>;
     owner(overrides?: CallOverrides): Promise<string>;
@@ -292,6 +297,7 @@ export interface PortalAdapter extends BaseContract {
         interchainGasPaymaster(overrides?: CallOverrides): Promise<string>;
         interchainSecurityModule(overrides?: CallOverrides): Promise<string>;
         liquidityLayerRouter(overrides?: CallOverrides): Promise<string>;
+        localDomain(overrides?: CallOverrides): Promise<number>;
         mailbox(overrides?: CallOverrides): Promise<string>;
         nonce(overrides?: CallOverrides): Promise<BigNumber>;
         owner(overrides?: CallOverrides): Promise<string>;
@@ -349,6 +355,7 @@ export interface PortalAdapter extends BaseContract {
         interchainGasPaymaster(overrides?: CallOverrides): Promise<BigNumber>;
         interchainSecurityModule(overrides?: CallOverrides): Promise<BigNumber>;
         liquidityLayerRouter(overrides?: CallOverrides): Promise<BigNumber>;
+        localDomain(overrides?: CallOverrides): Promise<BigNumber>;
         mailbox(overrides?: CallOverrides): Promise<BigNumber>;
         nonce(overrides?: CallOverrides): Promise<BigNumber>;
         owner(overrides?: CallOverrides): Promise<BigNumber>;
@@ -402,6 +409,7 @@ export interface PortalAdapter extends BaseContract {
         interchainGasPaymaster(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         interchainSecurityModule(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         liquidityLayerRouter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        localDomain(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         mailbox(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         nonce(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;