Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions contracts/AtomicWethDepositor.sol
Original file line number Diff line number Diff line change
@@ -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";
Comment on lines +4 to +6
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are needed due to OZ v5 upgrade in contracts repo

import "@uma/core/contracts/common/implementation/MultiCaller.sol";
import "@uma/core/contracts/common/implementation/Lockable.sol";

Expand Down
2 changes: 1 addition & 1 deletion hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import "@openzeppelin/hardhat-upgrades";

dotenv.config();

const solcVersion = "0.8.23";
const solcVersion = "0.8.30";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumping solidity version as well to match the contracts repo solidity version


const LARGE_CONTRACT_COMPILER_SETTINGS = {
version: solcVersion,
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]",
"@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",
Expand Down
34 changes: 34 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]"
"@openzeppelin/contracts-v4" "npm:@openzeppelin/[email protected]"
"@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/[email protected]":
version "4.3.98"
resolved "https://registry.yarnpkg.com/@across-protocol/sdk/-/sdk-4.3.98.tgz#667d20ce04d4aae94a48f1d1a2f33b9da0032d5d"
Expand Down