diff --git a/contracts/AtomicWethDepositor.sol b/contracts/AtomicWethDepositor.sol index 75091d2d87..45dc81e218 100644 --- a/contracts/AtomicWethDepositor.sol +++ b/contracts/AtomicWethDepositor.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-only pragma solidity ^0.8.0; -import "@openzeppelin/contracts/access/Ownable.sol"; -import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts-v4/access/Ownable.sol"; +import "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; +import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import "@uma/core/contracts/common/implementation/MultiCaller.sol"; import "@uma/core/contracts/common/implementation/Lockable.sol"; diff --git a/hardhat.config.ts b/hardhat.config.ts index 587244b5fb..a47c8caa3c 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -20,7 +20,7 @@ import "@openzeppelin/hardhat-upgrades"; dotenv.config(); -const solcVersion = "0.8.23"; +const solcVersion = "0.8.30"; const LARGE_CONTRACT_COMPILER_SETTINGS = { version: solcVersion, diff --git a/package.json b/package.json index 93a1a45bd5..592831e59e 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@across-protocol/constants": "^3.1.89", - "@across-protocol/contracts": "^4.1.14", + "@across-protocol/contracts": "^4.1.16", "@across-protocol/contracts-beta": "npm:@across-protocol/contracts@4.1.12-beta.7", - "@across-protocol/sdk": "4.3.98", + "@across-protocol/sdk": "4.3.99", "@arbitrum/sdk": "^4.0.2", "@consensys/linea-sdk": "^0.3.0", "@coral-xyz/anchor": "^0.31.1", diff --git a/yarn.lock b/yarn.lock index 1cea56060c..fb294de2b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -103,6 +103,40 @@ yargs "^17.7.2" zksync-web3 "^0.14.3" +"@across-protocol/contracts@^4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-4.1.16.tgz#9e95c5260a9430eff5c9081bb09164fe1fcdb3da" + integrity sha512-YkJTJtlRRfCyLjVO9+6V444TB7Sw+Z/oAFIS8m52Zr6wSXGMIaSigyFMBY1GMGjMvJHg4G/3Xbzs5CGqZ1QV8w== + dependencies: + "@across-protocol/constants" "^3.1.88" + "@coral-xyz/anchor" "^0.31.1" + "@defi-wonderland/smock" "^2.3.4" + "@eth-optimism/contracts" "^0.5.40" + "@ethersproject/abstract-provider" "5.7.0" + "@ethersproject/abstract-signer" "5.7.0" + "@ethersproject/bignumber" "5.7.0" + "@openzeppelin/contracts" "5.5.0" + "@openzeppelin/contracts-upgradeable" "5.5.0" + "@openzeppelin/contracts-upgradeable-v4" "npm:@openzeppelin/contracts-upgradeable@4.9.6" + "@openzeppelin/contracts-v4" "npm:@openzeppelin/contracts@4.9.6" + "@openzeppelin/foundry-upgrades" "^0.4.0" + "@safe-global/protocol-kit" "^6.1.1" + "@scroll-tech/contracts" "^0.1.0" + "@solana-developers/helpers" "^2.4.0" + "@solana-program/address-lookup-table" "^0.7.0" + "@solana-program/token" "^0.5.1" + "@solana/kit" "^2.1.0" + "@solana/spl-token" "^0.4.6" + "@solana/web3.js" "1.98.2" + "@types/yargs" "^17.0.33" + "@uma/common" "^2.37.3" + "@uma/contracts-node" "^0.4.17" + axios "^1.7.4" + bs58 "^6.0.0" + prettier-plugin-rust "^0.1.9" + yargs "^17.7.2" + zksync-web3 "^0.14.3" + "@across-protocol/sdk@4.3.98": version "4.3.98" resolved "https://registry.yarnpkg.com/@across-protocol/sdk/-/sdk-4.3.98.tgz#667d20ce04d4aae94a48f1d1a2f33b9da0032d5d"