@across-protocol/contracts 3.0.4 → 3.0.6

package/dist/typechain/index.d.ts

@@ -153,6 +153,8 @@ export type { IBlast } from "./contracts/Blast_SpokePool.sol/IBlast";
 export { IBlast__factory } from "./factories/contracts/Blast_SpokePool.sol/IBlast__factory";
 export type { IERC20Rebasing } from "./contracts/Blast_SpokePool.sol/IERC20Rebasing";
 export { IERC20Rebasing__factory } from "./factories/contracts/Blast_SpokePool.sol/IERC20Rebasing__factory";
+export type { IUSDBL2Bridge } from "./contracts/Blast_SpokePool.sol/IUSDBL2Bridge";
+export { IUSDBL2Bridge__factory } from "./factories/contracts/Blast_SpokePool.sol/IUSDBL2Bridge__factory";
 export type { Boba_SpokePool } from "./contracts/Boba_SpokePool";
 export { Boba_SpokePool__factory } from "./factories/contracts/Boba_SpokePool__factory";
 export type { BondToken } from "./contracts/BondToken.sol/BondToken";

package/dist/typechain/index.js

@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IScrollMessenger__factory = exports.IL2GatewayRouter__factory = exports.IL2ETHGateway__factory = exports.IL2ERC20Gateway__factory = exports.IL2GasPriceOracle__factory = exports.IL1ScrollMessenger__factory = exports.IL1GatewayRouter__factory = exports.IL1ETHGateway__factory = exports.IL1ERC20Gateway__factory = exports.IERC165__factory = exports.ERC165__factory = exports.IERC20__factory = exports.IERC20Permit__factory = exports.IERC20Metadata__factory = exports.ERC20__factory = exports.IERC1155Receiver__factory = exports.IERC1155__factory = exports.IERC1155MetadataURI__factory = exports.ERC1155__factory = exports.TransparentUpgradeableProxy__factory = exports.ITransparentUpgradeableProxy__factory = exports.ProxyAdmin__factory = exports.Proxy__factory = exports.ERC1967Upgrade__factory = exports.ERC1967Proxy__factory = exports.UpgradeableBeacon__factory = exports.IBeacon__factory = exports.BeaconProxy__factory = exports.IERC1967__factory = exports.IERC1271__factory = exports.IERC1822Proxiable__factory = exports.Ownable__factory = exports.IAccessControl__factory = exports.AccessControl__factory = exports.ICrossDomainMessengerUpgradeable__factory = exports.ContextUpgradeable__factory = exports.IERC20Upgradeable__factory = exports.IERC20PermitUpgradeable__factory = exports.ReentrancyGuardUpgradeable__factory = exports.UUPSUpgradeable__factory = exports.Initializable__factory = exports.ERC1967UpgradeUpgradeable__factory = exports.IBeaconUpgradeable__factory = exports.IERC1967Upgradeable__factory = exports.IERC1822ProxiableUpgradeable__factory = exports.OwnableUpgradeable__factory = exports.ICrossDomainMessenger__factory = exports.IL1StandardBridge__factory = exports.IL1ERC20Bridge__factory = exports.factories = void 0;
-exports.PolygonZkEVM_Adapter__factory = exports.Polygon_Adapter__factory = exports.IRootChainManager__factory = exports.IFxStateSender__factory = exports.DepositManager__factory = exports.SynthetixBridgeToOptimism__factory = exports.Optimism_Adapter__factory = exports.Mode_Adapter__factory = exports.Mock_Bridge__factory = exports.Mock_Adapter__factory = exports.Lisk_Adapter__factory = exports.Linea_Adapter__factory = exports.AdapterInterface__factory = exports.Ethereum_RescueAdapter__factory = exports.Ethereum_Adapter__factory = exports.CrossDomainEnabled__factory = exports.Boba_Adapter__factory = exports.Blast_Adapter__factory = exports.Base_Adapter__factory = exports.Arbitrum_SendTokensAdapter__factory = exports.Arbitrum_RescueAdapter__factory = exports.ArbitrumL1InboxLike__factory = exports.ArbitrumL1ERC20GatewayLike__factory = exports.Arbitrum_Adapter__factory = exports.ExtendedHubPoolInterface__factory = exports.BondToken__factory = exports.Boba_SpokePool__factory = exports.IERC20Rebasing__factory = exports.IBlast__factory = exports.Blast_SpokePool__factory = exports.Base_SpokePool__factory = exports.StandardBridgeLike__factory = exports.Arbitrum_SpokePool__factory = exports.AcrossConfigStore__factory = exports.SkinnyOptimisticOracleInterface__factory = exports.OptimisticOracleInterface__factory = exports.MerkleDistributorInterface__factory = exports.MerkleDistributor__factory = exports.StoreInterface__factory = exports.IdentifierWhitelistInterface__factory = exports.FinderInterface__factory = exports.OracleInterfaces__factory = exports.OptimisticOracleConstraints__factory = exports.ExpandedIERC20__factory = exports.AddressWhitelistInterface__factory = exports.Timer__factory = exports.Testable__factory = exports.MultiRole__factory = exports.MultiCaller__factory = exports.ExpandedERC20__factory = void 0;
-exports.PolygonRegistry__factory = exports.PolygonIERC20Upgradeable__factory = exports.PolygonERC20Predicate__factory = exports.MaticToken__factory = exports.Polygon_SpokePool__factory = exports.IFxMessageProcessor__factory = exports.Permit2OrderLib__factory = exports.Permit2Depositor__factory = exports.PermissionSplitterProxy__factory = exports.Ovm_SpokePool__factory = exports.IL2ERC20Bridge__factory = exports.SynthetixBridgeToBase__factory = exports.Optimism_SpokePool__factory = exports.Mode_SpokePool__factory = exports.AcrossMerkleDistributor__factory = exports.LpTokenFactory__factory = exports.Lockable__factory = exports.Lisk_SpokePool__factory = exports.Linea_SpokePool__factory = exports.CircleDomainIds__factory = exports.CircleCCTPAdapter__factory = exports.V3SpokePoolInterface__factory = exports.AcrossMessageHandler__factory = exports.SpokePoolInterface__factory = exports.LpTokenFactoryInterface__factory = exports.HubPoolInterface__factory = exports.HubPool__factory = exports.MulticallHandler__factory = exports.WETH9__factory = exports.WETH9Interface__factory = exports.ITelepathyHandler__factory = exports.ITelepathyBroadcaster__factory = exports.IUSDCBridge__factory = exports.ITokenBridge__factory = exports.IMessageService__factory = exports.IPolygonZkEVMBridge__factory = exports.IPermit2__factory = exports.ITokenMinter__factory = exports.ITokenMessenger__factory = exports.Ethereum_SpokePool__factory = exports.ERC7683OrderDepositorExternal__factory = exports.ERC7683OrderDepositor__factory = exports.ISettlementContract__factory = exports.MintableERC1155__factory = exports.ZkSyncInterface__factory = exports.ZkSync_Adapter__factory = exports.ZkBridgeLike__factory = exports.LimitBypassProxy__factory = exports.Succinct_Adapter__factory = exports.Scroll_Adapter__factory = void 0;
-exports.ZkSync_SpokePool__factory = exports.IL2ETH__factory = exports.MultiCallerUpgradeable__factory = exports.EIP712CrossChainUpgradeable__factory = exports.TelepathyBroadcasterMock__factory = exports.RootChainManagerMock__factory = exports.PolygonRegistryMock__factory = exports.PolygonERC20PredicateMock__factory = exports.PolygonERC20Mock__factory = exports.FxStateSenderMock__factory = exports.DepositManagerMock__factory = exports.PolygonERC20Test__factory = exports.MockSpokePoolV2__factory = exports.MockSpokePool__factory = exports.MockOptimism_SpokePool__factory = exports.MockHubPool__factory = exports.MockERC1271__factory = exports.MockCaller__factory = exports.MockBedrockL2StandardBridge__factory = exports.MerkleLibTest__factory = exports.ArbitrumMockErc20GatewayRouter__factory = exports.AcrossMessageHandlerMock__factory = exports.UniversalSwapAndBridge__factory = exports.SwapAndBridgeBase__factory = exports.SwapAndBridge__factory = exports.Succinct_SpokePool__factory = exports.SpokePoolVerifier__factory = exports.SpokePool__factory = exports.Scroll_SpokePool__factory = exports.PolygonZkEVM_SpokePool__factory = exports.IBridgeMessageReceiver__factory = exports.PolygonTokenBridger__factory = void 0;
+exports.Polygon_Adapter__factory = exports.IRootChainManager__factory = exports.IFxStateSender__factory = exports.DepositManager__factory = exports.SynthetixBridgeToOptimism__factory = exports.Optimism_Adapter__factory = exports.Mode_Adapter__factory = exports.Mock_Bridge__factory = exports.Mock_Adapter__factory = exports.Lisk_Adapter__factory = exports.Linea_Adapter__factory = exports.AdapterInterface__factory = exports.Ethereum_RescueAdapter__factory = exports.Ethereum_Adapter__factory = exports.CrossDomainEnabled__factory = exports.Boba_Adapter__factory = exports.Blast_Adapter__factory = exports.Base_Adapter__factory = exports.Arbitrum_SendTokensAdapter__factory = exports.Arbitrum_RescueAdapter__factory = exports.ArbitrumL1InboxLike__factory = exports.ArbitrumL1ERC20GatewayLike__factory = exports.Arbitrum_Adapter__factory = exports.ExtendedHubPoolInterface__factory = exports.BondToken__factory = exports.Boba_SpokePool__factory = exports.IUSDBL2Bridge__factory = exports.IERC20Rebasing__factory = exports.IBlast__factory = exports.Blast_SpokePool__factory = exports.Base_SpokePool__factory = exports.StandardBridgeLike__factory = exports.Arbitrum_SpokePool__factory = exports.AcrossConfigStore__factory = exports.SkinnyOptimisticOracleInterface__factory = exports.OptimisticOracleInterface__factory = exports.MerkleDistributorInterface__factory = exports.MerkleDistributor__factory = exports.StoreInterface__factory = exports.IdentifierWhitelistInterface__factory = exports.FinderInterface__factory = exports.OracleInterfaces__factory = exports.OptimisticOracleConstraints__factory = exports.ExpandedIERC20__factory = exports.AddressWhitelistInterface__factory = exports.Timer__factory = exports.Testable__factory = exports.MultiRole__factory = exports.MultiCaller__factory = exports.ExpandedERC20__factory = void 0;
+exports.PolygonIERC20Upgradeable__factory = exports.PolygonERC20Predicate__factory = exports.MaticToken__factory = exports.Polygon_SpokePool__factory = exports.IFxMessageProcessor__factory = exports.Permit2OrderLib__factory = exports.Permit2Depositor__factory = exports.PermissionSplitterProxy__factory = exports.Ovm_SpokePool__factory = exports.IL2ERC20Bridge__factory = exports.SynthetixBridgeToBase__factory = exports.Optimism_SpokePool__factory = exports.Mode_SpokePool__factory = exports.AcrossMerkleDistributor__factory = exports.LpTokenFactory__factory = exports.Lockable__factory = exports.Lisk_SpokePool__factory = exports.Linea_SpokePool__factory = exports.CircleDomainIds__factory = exports.CircleCCTPAdapter__factory = exports.V3SpokePoolInterface__factory = exports.AcrossMessageHandler__factory = exports.SpokePoolInterface__factory = exports.LpTokenFactoryInterface__factory = exports.HubPoolInterface__factory = exports.HubPool__factory = exports.MulticallHandler__factory = exports.WETH9__factory = exports.WETH9Interface__factory = exports.ITelepathyHandler__factory = exports.ITelepathyBroadcaster__factory = exports.IUSDCBridge__factory = exports.ITokenBridge__factory = exports.IMessageService__factory = exports.IPolygonZkEVMBridge__factory = exports.IPermit2__factory = exports.ITokenMinter__factory = exports.ITokenMessenger__factory = exports.Ethereum_SpokePool__factory = exports.ERC7683OrderDepositorExternal__factory = exports.ERC7683OrderDepositor__factory = exports.ISettlementContract__factory = exports.MintableERC1155__factory = exports.ZkSyncInterface__factory = exports.ZkSync_Adapter__factory = exports.ZkBridgeLike__factory = exports.LimitBypassProxy__factory = exports.Succinct_Adapter__factory = exports.Scroll_Adapter__factory = exports.PolygonZkEVM_Adapter__factory = void 0;
+exports.ZkSync_SpokePool__factory = exports.IL2ETH__factory = exports.MultiCallerUpgradeable__factory = exports.EIP712CrossChainUpgradeable__factory = exports.TelepathyBroadcasterMock__factory = exports.RootChainManagerMock__factory = exports.PolygonRegistryMock__factory = exports.PolygonERC20PredicateMock__factory = exports.PolygonERC20Mock__factory = exports.FxStateSenderMock__factory = exports.DepositManagerMock__factory = exports.PolygonERC20Test__factory = exports.MockSpokePoolV2__factory = exports.MockSpokePool__factory = exports.MockOptimism_SpokePool__factory = exports.MockHubPool__factory = exports.MockERC1271__factory = exports.MockCaller__factory = exports.MockBedrockL2StandardBridge__factory = exports.MerkleLibTest__factory = exports.ArbitrumMockErc20GatewayRouter__factory = exports.AcrossMessageHandlerMock__factory = exports.UniversalSwapAndBridge__factory = exports.SwapAndBridgeBase__factory = exports.SwapAndBridge__factory = exports.Succinct_SpokePool__factory = exports.SpokePoolVerifier__factory = exports.SpokePool__factory = exports.Scroll_SpokePool__factory = exports.PolygonZkEVM_SpokePool__factory = exports.IBridgeMessageReceiver__factory = exports.PolygonTokenBridger__factory = exports.PolygonRegistry__factory = void 0;
 exports.factories = __importStar(require("./factories"));
 var IL1ERC20Bridge__factory_1 = require("./factories/@eth-optimism/contracts/L1/messaging/IL1ERC20Bridge__factory");
 Object.defineProperty(exports, "IL1ERC20Bridge__factory", { enumerable: true, get: function () { return IL1ERC20Bridge__factory_1.IL1ERC20Bridge__factory; } });
@@ -172,6 +172,8 @@ var IBlast__factory_1 = require("./factories/contracts/Blast_SpokePool.sol/IBlas
 Object.defineProperty(exports, "IBlast__factory", { enumerable: true, get: function () { return IBlast__factory_1.IBlast__factory; } });
 var IERC20Rebasing__factory_1 = require("./factories/contracts/Blast_SpokePool.sol/IERC20Rebasing__factory");
 Object.defineProperty(exports, "IERC20Rebasing__factory", { enumerable: true, get: function () { return IERC20Rebasing__factory_1.IERC20Rebasing__factory; } });
+var IUSDBL2Bridge__factory_1 = require("./factories/contracts/Blast_SpokePool.sol/IUSDBL2Bridge__factory");
+Object.defineProperty(exports, "IUSDBL2Bridge__factory", { enumerable: true, get: function () { return IUSDBL2Bridge__factory_1.IUSDBL2Bridge__factory; } });
 var Boba_SpokePool__factory_1 = require("./factories/contracts/Boba_SpokePool__factory");
 Object.defineProperty(exports, "Boba_SpokePool__factory", { enumerable: true, get: function () { return Boba_SpokePool__factory_1.Boba_SpokePool__factory; } });
 var BondToken__factory_1 = require("./factories/contracts/BondToken.sol/BondToken__factory");

package/dist/utils/constants.d.ts

@@ -1,4 +1,4 @@
-export { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
+export { CHAIN_IDs, MAINNET_CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 export declare const FillStatus: {
     Unfilled: number;
     RequestedSlowFill: number;

package/dist/utils/constants.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FillStatus = exports.TOKEN_SYMBOLS_MAP = exports.CHAIN_IDs = void 0;
+exports.FillStatus = exports.TOKEN_SYMBOLS_MAP = exports.MAINNET_CHAIN_IDs = exports.CHAIN_IDs = void 0;
 var constants_1 = require("@across-protocol/constants");
 Object.defineProperty(exports, "CHAIN_IDs", { enumerable: true, get: function () { return constants_1.CHAIN_IDs; } });
+Object.defineProperty(exports, "MAINNET_CHAIN_IDs", { enumerable: true, get: function () { return constants_1.MAINNET_CHAIN_IDs; } });
 Object.defineProperty(exports, "TOKEN_SYMBOLS_MAP", { enumerable: true, get: function () { return constants_1.TOKEN_SYMBOLS_MAP; } });
 exports.FillStatus = {
     Unfilled: 0,

package/dist/utils/utils.hre.js

@@ -7,6 +7,7 @@ exports.hre = exports.deployNewProxy = exports.getSpokePoolDeploymentInfo = void
 const hardhat_1 = __importDefault(require("hardhat"));
 exports.hre = hardhat_1.default;
 const utils_1 = require("./utils");
+const constants_1 = require("@across-protocol/constants");
 /**
  * @description Resolve the HubPool deployment, as well as the HubPool and SpokePool chain IDs for a new deployment.
  * @dev This function relies on having companionNetworks defined in the HardhatUserConfig.
@@ -24,20 +25,25 @@ async function getSpokePoolDeploymentInfo(hre) {
 }
 exports.getSpokePoolDeploymentInfo = getSpokePoolDeploymentInfo;
 async function deployNewProxy(name, constructorArgs, initArgs, implementationOnly = false) {
-    const { deployments, run, upgrades } = hardhat_1.default;
+    const { deployments, run, upgrades, getChainId } = hardhat_1.default;
+    let chainId = Number(await getChainId());
     let instance;
+    let unsafeAllowArgs = ["delegatecall"]; // Remove after upgrading openzeppelin-contracts-upgradeable post v4.9.3.
+    if ([constants_1.CHAIN_IDs.BLAST, constants_1.CHAIN_IDs.BLAST_SEPOLIA].includes(chainId)) {
+        unsafeAllowArgs.push("state-variable-immutable");
+    }
     if (implementationOnly) {
         instance = (await upgrades.deployImplementation(await (0, utils_1.getContractFactory)(name, {}), {
             constructorArgs,
             kind: "uups",
-            unsafeAllow: ["delegatecall"],
+            unsafeAllow: unsafeAllowArgs,
         }));
         console.log(`New ${name} implementation deployed @ ${instance}`);
     }
     else {
         const proxy = await upgrades.deployProxy(await (0, utils_1.getContractFactory)(name, {}), initArgs, {
             kind: "uups",
-            unsafeAllow: ["delegatecall"],
+            unsafeAllow: unsafeAllowArgs,
             constructorArgs,
             initializer: "initialize",
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@across-protocol/contracts",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "author": "UMA Team",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -32,7 +32,7 @@
     "prepublish": "yarn build && hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json && yarn generate-contract-types"
   },
   "dependencies": {
-    "@across-protocol/constants": "^3.1.3",
+    "@across-protocol/constants": "^3.1.9",
     "@defi-wonderland/smock": "^2.3.4",
     "@eth-optimism/contracts": "^0.5.40",
     "@ethersproject/abstract-provider": "5.7.0",