@hyperlane-xyz/core 1.1.3 → 1.1.4

package/contracts/middleware/InterchainQueryRouter.sol

@@ -5,6 +5,8 @@ pragma solidity ^0.8.13;
 import {CallLib} from "../libs/Call.sol";
 import {Router} from "../Router.sol";
 import {IInterchainQueryRouter} from "../../interfaces/IInterchainQueryRouter.sol";
+import {InterchainCallMessage} from "./InterchainCallMessage.sol";
+import {TypeCasts} from "../libs/TypeCasts.sol";
 
 // ============ External Imports ============
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
@@ -16,13 +18,8 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
  * @dev Currently does not support Sovereign Consensus (user specified Interchain Security Modules).
  */
 contract InterchainQueryRouter is Router, IInterchainQueryRouter {
-    using CallLib for address;
-    using CallLib for CallLib.Call[];
-
-    enum Action {
-        DISPATCH,
-        RESOLVE
-    }
+    using TypeCasts for address;
+    using TypeCasts for bytes32;
 
     /**
      * @notice Emitted when a query is dispatched to another chain.
@@ -34,11 +31,11 @@ contract InterchainQueryRouter is Router, IInterchainQueryRouter {
         address indexed sender
     );
     /**
-     * @notice Emitted when a query is returned to the origin chain.
-     * @param originDomain The domain of the chain to return the result to.
+     * @notice Emitted when a query is executed on the and callback dispatched to the origin chain.
+     * @param originDomain The domain of the chain that dispatched the query and receives the callback.
      * @param sender The address to receive the result.
      */
-    event QueryReturned(uint32 indexed originDomain, address indexed sender);
+    event QueryExecuted(uint32 indexed originDomain, bytes32 indexed sender);
     /**
      * @notice Emitted when a query is resolved on the origin chain.
      * @param destinationDomain The domain of the chain that was queried.
@@ -71,63 +68,21 @@ contract InterchainQueryRouter is Router, IInterchainQueryRouter {
     }
 
     /**
-     * @param _destinationDomain Domain of destination chain
-     * @param target The address of the contract to query on destination chain.
-     * @param queryData The calldata of the view call to make on the destination chain.
-     * @param callback Callback function selector on `msg.sender` and optionally abi-encoded prefix arguments.
-     * @return messageId The ID of the message encoding the query.
+     * @notice Dispatches a sequence of static calls (query) to the destination domain and set of callbacks to resolve the results on the dispatcher.
+     * @param _destinationDomain The domain of the chain to query.
+     * @param calls The sequence of static calls to dispatch and callbacks on the sender to resolve the results.
+     * @dev Recommend using CallLib.build to format the interchain calls.
+     * @dev Callbacks must be returned to the `msg.sender` for security reasons. Require this contract is the `msg.sender` on callbacks.
      */
     function query(
         uint32 _destinationDomain,
-        address target,
-        bytes calldata queryData,
-        bytes calldata callback
-    ) external returns (bytes32 messageId) {
-        // TODO: fix this ugly arrayification
-        CallLib.Call[] memory calls = new CallLib.Call[](1);
-        calls[0] = CallLib.Call({to: target, data: queryData});
-        bytes[] memory callbacks = new bytes[](1);
-        callbacks[0] = callback;
-        messageId = query(_destinationDomain, calls, callbacks);
-    }
-
-    /**
-     * @param _destinationDomain Domain of destination chain
-     * @param call Call (to and data packed struct) to be made on destination chain.
-     * @param callback Callback function selector on `msg.sender` and optionally abi-encoded prefix arguments.
-     */
-    function query(
-        uint32 _destinationDomain,
-        CallLib.Call calldata call,
-        bytes calldata callback
-    ) external returns (bytes32 messageId) {
-        // TODO: fix this ugly arrayification
-        CallLib.Call[] memory calls = new CallLib.Call[](1);
-        calls[0] = call;
-        bytes[] memory callbacks = new bytes[](1);
-        callbacks[0] = callback;
-        messageId = query(_destinationDomain, calls, callbacks);
-    }
-
-    /**
-     * @param _destinationDomain Domain of destination chain
-     * @param calls Array of calls (to and data packed struct) to be made on destination chain in sequence.
-     * @param callbacks Array of callback function selectors on `msg.sender` and optionally abi-encoded prefix arguments.
-     */
-    function query(
-        uint32 _destinationDomain,
-        CallLib.Call[] memory calls,
-        bytes[] memory callbacks
+        CallLib.StaticCallWithCallback[] calldata calls
     ) public returns (bytes32 messageId) {
-        require(
-            calls.length == callbacks.length,
-            "InterchainQueryRouter: calls and callbacks must be same length"
-        );
+        emit QueryDispatched(_destinationDomain, msg.sender);
         messageId = _dispatch(
             _destinationDomain,
-            abi.encode(Action.DISPATCH, msg.sender, calls, callbacks)
+            InterchainCallMessage.format(calls, msg.sender.addressToBytes32())
         );
-        emit QueryDispatched(_destinationDomain, msg.sender);
     }
 
     /**
@@ -140,27 +95,28 @@ contract InterchainQueryRouter is Router, IInterchainQueryRouter {
         bytes32, // router sender
         bytes calldata _message
     ) internal override {
-        Action action = Action(uint8(bytes1(_message[31])));
-        if (action == Action.DISPATCH) {
-            (
-                ,
-                address sender,
-                CallLib.Call[] memory calls,
-                bytes[] memory callbacks
-            ) = abi.decode(
-                    _message,
-                    (Action, address, CallLib.Call[], bytes[])
-                );
-            callbacks = calls._multicallAndResolve(callbacks);
-            _dispatch(_origin, abi.encode(Action.RESOLVE, sender, callbacks));
-            emit QueryReturned(_origin, sender);
-        } else if (action == Action.RESOLVE) {
-            (, address sender, bytes[] memory resolveCallbacks) = abi.decode(
-                _message,
-                (Action, address, bytes[])
+        InterchainCallMessage.CallType calltype = InterchainCallMessage
+            .calltype(_message);
+        bytes32 sender = InterchainCallMessage.sender(_message);
+        if (
+            calltype == InterchainCallMessage.CallType.STATIC_CALL_WITH_CALLBACK
+        ) {
+            CallLib.StaticCallWithCallback[]
+                memory callsWithCallback = InterchainCallMessage
+                    .callsWithCallbacks(_message);
+            bytes[] memory callbacks = CallLib.multistaticcall(
+                callsWithCallback
             );
-            sender._multicall(resolveCallbacks);
-            emit QueryResolved(_origin, sender);
+            emit QueryExecuted(_origin, sender);
+            _dispatch(_origin, InterchainCallMessage.format(callbacks, sender));
+        } else if (calltype == InterchainCallMessage.CallType.RAW_CALLDATA) {
+            address senderAddress = sender.bytes32ToAddress();
+            bytes[] memory rawCalls = InterchainCallMessage.rawCalls(_message);
+            CallLib.multicallto(senderAddress, rawCalls);
+            //
+            emit QueryResolved(_origin, senderAddress);
+        } else {
+            assert(false);
         }
     }
 }

package/contracts/mock/MockHyperlaneEnvironment.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.13;
 
 import "./MockMailbox.sol";
 import "../middleware/InterchainQueryRouter.sol";
-import "../igps/InterchainGasPaymaster.sol";
+import "../test/TestInterchainGasPaymaster.sol";
 import "../test/TestIsm.sol";
 
 import {TypeCasts} from "../libs/TypeCasts.sol";
@@ -13,7 +13,7 @@ contract MockHyperlaneEnvironment {
     uint32 destinationDomain;
 
     mapping(uint32 => MockMailbox) public mailboxes;
-    mapping(uint32 => InterchainGasPaymaster) public igps;
+    mapping(uint32 => TestInterchainGasPaymaster) public igps;
     mapping(uint32 => IInterchainSecurityModule) public isms;
     mapping(uint32 => InterchainQueryRouter) public queryRouters;
 
@@ -27,8 +27,8 @@ contract MockHyperlaneEnvironment {
         originMailbox.addRemoteMailbox(_destinationDomain, destinationMailbox);
         destinationMailbox.addRemoteMailbox(_originDomain, originMailbox);
 
-        igps[originDomain] = new InterchainGasPaymaster();
-        igps[destinationDomain] = new InterchainGasPaymaster();
+        igps[originDomain] = new TestInterchainGasPaymaster();
+        igps[destinationDomain] = new TestInterchainGasPaymaster();
 
         isms[originDomain] = new TestIsm();
         isms[destinationDomain] = new TestIsm();

package/contracts/test/TestGasRouter.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity >=0.6.11;
+
+import "./TestRouter.sol";
+import "../GasRouter.sol";
+
+contract TestGasRouter is TestRouter, GasRouter {
+    function dispatchWithGas(
+        uint32 _destinationDomain,
+        bytes memory _messageBody,
+        uint256 _gasPayment,
+        address _gasPaymentRefundAddress
+    ) external payable {
+        _dispatchWithGas(
+            _destinationDomain,
+            _messageBody,
+            _gasPayment,
+            _gasPaymentRefundAddress
+        );
+    }
+
+    function dispatchWithGas(
+        uint32 _destinationDomain,
+        bytes memory _messageBody
+    ) external payable {
+        _dispatchWithGas(_destinationDomain, _messageBody);
+    }
+}

package/contracts/test/TestInterchainGasPaymaster.sol

@@ -2,30 +2,21 @@
 pragma solidity >=0.8.0;
 
 // ============ Internal Imports ============
-import {IInterchainGasPaymaster} from "../../interfaces/IInterchainGasPaymaster.sol";
+import {InterchainGasPaymaster} from "../igps/InterchainGasPaymaster.sol";
 
-contract TestInterchainGasPaymaster is IInterchainGasPaymaster {
-    event GasPayment(
-        bytes32 indexed messageId,
-        uint256 gasAmount,
-        uint256 payment
-    );
+contract TestInterchainGasPaymaster is InterchainGasPaymaster {
+    uint256 gasPrice = 0;
 
-    function payForGas(
-        bytes32 _messageId,
-        uint32,
-        uint256 _gasAmount,
-        address
-    ) external payable override {
-        emit GasPayment(_messageId, _gasAmount, msg.value);
+    function setGasPrice(uint256 _gasPrice) external {
+        gasPrice = _gasPrice;
     }
 
-    function quoteGasPayment(uint32, uint256)
+    function quoteGasPayment(uint32, uint256 gasAmount)
         public
-        pure
+        view
         override
         returns (uint256)
     {
-        return 0;
+        return gasPrice * gasAmount;
     }
 }

package/contracts/test/TestQuery.sol

@@ -3,6 +3,9 @@ pragma solidity ^0.8.13;
 
 import {InterchainQueryRouter} from "../middleware/InterchainQueryRouter.sol";
 import {TypeCasts} from "../libs/TypeCasts.sol";
+import {CallLib} from "../libs/Call.sol";
+
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 contract TestQuery {
     InterchainQueryRouter public router;
@@ -18,18 +21,20 @@ contract TestQuery {
      */
     function queryRouterOwner(uint32 domain, uint256 secret) external {
         address target = TypeCasts.bytes32ToAddress(router.routers(domain));
-        bytes memory data = abi.encodeWithSignature("owner()");
-        bytes memory callback = bytes.concat(
-            this.receiveRouterOwer.selector,
-            bytes32(secret)
+        CallLib.StaticCallWithCallback[]
+            memory calls = new CallLib.StaticCallWithCallback[](1);
+        calls[0] = CallLib.build(
+            target,
+            abi.encodeWithSelector(Ownable.owner.selector),
+            abi.encodeWithSelector(this.receiveRouterOwner.selector, secret)
         );
-        router.query(domain, target, data, callback);
+        router.query(domain, calls);
     }
 
     /**
      * @dev `msg.sender` must be restricted to `this.router` to prevent any local account from spoofing query data.
      */
-    function receiveRouterOwer(uint256 secret, address owner) external {
+    function receiveRouterOwner(uint256 secret, address owner) external {
         require(msg.sender == address(router), "TestQuery: not from router");
         emit Owner(secret, owner);
     }

package/contracts/test/TestQuerySender.sol

@@ -3,6 +3,7 @@ pragma solidity >=0.8.0;
 
 import {IInterchainGasPaymaster} from "../../interfaces/IInterchainGasPaymaster.sol";
 import {IInterchainQueryRouter} from "../../interfaces/IInterchainQueryRouter.sol";
+import {CallLib} from "../libs/Call.sol";
 
 contract TestQuerySender {
     IInterchainQueryRouter queryRouter;
@@ -32,13 +33,13 @@ contract TestQuerySender {
         bytes calldata _targetData,
         uint256 _gasAmount
     ) external payable {
-        bytes32 _messageId = queryRouter.query(
+        queryAndPayFor(
             _destinationDomain,
             _target,
             _targetData,
-            abi.encodePacked(this.handleQueryAddressResult.selector)
+            this.handleQueryAddressResult.selector,
+            _gasAmount
         );
-        _payForGas(_messageId, _destinationDomain, _gasAmount);
     }
 
     function handleQueryAddressResult(address _result) external {
@@ -52,13 +53,13 @@ contract TestQuerySender {
         bytes calldata _targetData,
         uint256 _gasAmount
     ) external payable {
-        bytes32 _messageId = queryRouter.query(
+        queryAndPayFor(
             _destinationDomain,
             _target,
             _targetData,
-            abi.encodePacked(this.handleQueryUint256Result.selector)
+            this.handleQueryUint256Result.selector,
+            _gasAmount
         );
-        _payForGas(_messageId, _destinationDomain, _gasAmount);
     }
 
     function handleQueryUint256Result(uint256 _result) external {
@@ -72,13 +73,13 @@ contract TestQuerySender {
         bytes calldata _targetData,
         uint256 _gasAmount
     ) external payable {
-        bytes32 _messageId = queryRouter.query(
+        queryAndPayFor(
             _destinationDomain,
             _target,
             _targetData,
-            abi.encodePacked(this.handleQueryBytes32Result.selector)
+            this.handleQueryBytes32Result.selector,
+            _gasAmount
         );
-        _payForGas(_messageId, _destinationDomain, _gasAmount);
     }
 
     function handleQueryBytes32Result(bytes32 _result) external {
@@ -86,11 +87,21 @@ contract TestQuerySender {
         lastBytes32Result = _result;
     }
 
-    function _payForGas(
-        bytes32 _messageId,
+    function queryAndPayFor(
         uint32 _destinationDomain,
+        address _target,
+        bytes calldata _targetData,
+        bytes4 _callbackSelector,
         uint256 _gasAmount
     ) internal {
+        CallLib.StaticCallWithCallback[]
+            memory calls = new CallLib.StaticCallWithCallback[](1);
+        calls[0] = CallLib.build(
+            _target,
+            _targetData,
+            abi.encodePacked(_callbackSelector)
+        );
+        bytes32 _messageId = queryRouter.query(_destinationDomain, calls);
         interchainGasPaymaster.payForGas{value: msg.value}(
             _messageId,
             _destinationDomain,

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/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol/IERC20Permit.js

@@ -0,0 +1,4 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# 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"}