diff --git a/package.json b/package.json index 59fd040d0..b166254ad 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@across-protocol/constants": "^3.1.20", - "@across-protocol/contracts": "^3.0.16", + "@across-protocol/contracts": "^3.0.17", "@across-protocol/sdk": "^3.3.21", "@arbitrum/sdk": "^4.0.2", "@consensys/linea-sdk": "^0.2.1", @@ -26,7 +26,7 @@ "@maticnetwork/maticjs": "^3.6.0", "@maticnetwork/maticjs-ethers": "^1.0.3", "@openzeppelin/hardhat-upgrades": "^1.28.0", - "@uma/common": "2.33.0", + "@uma/common": "2.37.3", "@uma/logger": "^1.3.0", "axios": "^1.7.4", "dotenv": "^16.3.1", @@ -112,5 +112,19 @@ "publishConfig": { "registry": "https://registry.npmjs.com/", "access": "public" + }, + "resolutions": { + "**/eccrypto/secp256k1": "3.8.1", + "**/eth-crypto/secp256k1": "5.0.1", + "**/libp2p-crypto/secp256k1": "4.0.4", + "**/ethereum-cryptography/secp256k1": "4.0.4", + "**/arbundles/secp256k1": "4.0.4", + "**/ganache/secp256k1": "4.0.4", + "**/ethereumjs-util/secp256k1": "3.8.1" + }, + "overrides": { + "secp256k1@3.7.1": "3.8.1", + "secp256k1@4.0.3": "4.0.4", + "secp256k1@5.0.0": "5.0.1" } } diff --git a/yarn.lock b/yarn.lock index 1b90d9793..011ca2a03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,6 +58,34 @@ yargs "^17.7.2" zksync-web3 "^0.14.3" +"@across-protocol/contracts@^3.0.17": + version "3.0.17" + resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-3.0.17.tgz#eb1c260cc5feeeec24cf300f8ebba29755d17e65" + integrity sha512-XnWoVA10IeEiOxAOOeO7r1sq79lP0EEp3tpajN9sDPBnzVCiwSzhthNSClbbOQOxpOG9NYxBXC9bamEe4AUG2g== + dependencies: + "@across-protocol/constants" "^3.1.19" + "@coral-xyz/anchor" "^0.30.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" "4.9.6" + "@openzeppelin/contracts-upgradeable" "4.9.6" + "@scroll-tech/contracts" "^0.1.0" + "@solana-developers/helpers" "^2.4.0" + "@solana/spl-token" "^0.4.6" + "@solana/web3.js" "^1.31.0" + "@types/yargs" "^17.0.33" + "@uma/common" "^2.37.3" + "@uma/contracts-node" "^0.4.17" + "@uma/core" "^2.61.0" + 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@^3.3.21": version "3.3.21" resolved "https://registry.yarnpkg.com/@across-protocol/sdk/-/sdk-3.3.21.tgz#f223a0d88b09c5f2335723b89e777a36df5255ca" @@ -1954,7 +1982,7 @@ resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.3.tgz#b41053e360c31a32c2640c9a45ee981a7e603fe0" integrity sha512-YhzPdzb612X591FOe68q+qXVXGG2ANZRvDo0RRUtimev85rCrAlv/TLMEZw5c+kq9AbzocLTVX/h2jVIFPL9Xg== -"@nomiclabs/hardhat-etherscan@^3.1.5", "@nomiclabs/hardhat-etherscan@^3.1.7": +"@nomiclabs/hardhat-etherscan@^3.1.7": version "3.1.7" resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.1.7.tgz#72e3d5bd5d0ceb695e097a7f6f5ff6fcbf062b9a" integrity sha512-tZ3TvSgpvsQ6B6OGmo1/Au6u8BrAkvs1mIC/eURA3xgIfznUZBhmpne8hv7BXUzw9xNL3fXdpOYgOQlVMTcoHQ== @@ -3459,23 +3487,28 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" -"@uma/common@2.33.0": - version "2.33.0" - resolved "https://registry.yarnpkg.com/@uma/common/-/common-2.33.0.tgz#25157e804228f91a52f501ca174d9432601836ad" - integrity sha512-w6wKpfXHJzFYHN3QqYGJrCRtussgQBu2L/glmuolxIz1kFS5aGjUnqhll+XJBK9G9RDx2b3J1vBEMAlF25sTVw== +"@uma/common@2.37.3", "@uma/common@^2.37.3": + version "2.37.3" + resolved "https://registry.yarnpkg.com/@uma/common/-/common-2.37.3.tgz#0d7fda1227e3a05563544bb36f418a790c81129d" + integrity sha512-DLcM2xtiFWDbty21r2gsL6AJbOc8G/CMqg0iMxssvkKbz8varsWS44zJF85XGxMlY8fE40w0ZS8MR92xpbsu4g== dependencies: "@across-protocol/contracts" "^0.1.4" + "@ethersproject/address" "^5.7.0" "@ethersproject/bignumber" "^5.0.5" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" "@google-cloud/kms" "^3.0.1" "@google-cloud/storage" "^6.4.2" + "@nomicfoundation/hardhat-verify" "^1.0.4" "@nomiclabs/hardhat-ethers" "^2.2.1" - "@nomiclabs/hardhat-etherscan" "^3.1.5" "@nomiclabs/hardhat-web3" "^2.0.0" "@truffle/contract" "4.6.17" "@truffle/hdwallet-provider" eip1559-beta "@types/ethereum-protocol" "^1.0.0" "@uniswap/v3-core" "^1.0.0-rc.2" abi-decoder "github:UMAprotocol/abi-decoder" + async-retry "^1.3.3" + axios "^1.6.1" bignumber.js "^8.0.1" chalk-pipe "^3.0.0" decimal.js "^10.2.1" @@ -3487,6 +3520,7 @@ lodash.uniqby "^4.7.0" minimist "^1.2.0" moment "^2.24.0" + node-fetch "^2.6.0" node-metamask "github:UMAprotocol/node-metamask" require-context "^1.1.0" solidity-coverage "^0.7.13" @@ -3561,6 +3595,22 @@ "@uniswap/v3-core" "^1.0.0-rc.2" "@uniswap/v3-periphery" "^1.0.0-beta.23" +"@uma/core@^2.61.0": + version "2.61.0" + resolved "https://registry.yarnpkg.com/@uma/core/-/core-2.61.0.tgz#29580736349a47af8fb10beb4bb3b50bfcf912f5" + integrity sha512-bnk+CWW+uWpRilrgUny/gDXHKomG+h1Ug84OXdx+AAvj1/BtlMDOCNNt1OX8LSAz+a0hkiN9s24/zgHclTC/sg== + dependencies: + "@gnosis.pm/safe-contracts" "^1.3.0" + "@gnosis.pm/zodiac" "3.2.0" + "@maticnetwork/fx-portal" "^1.0.4" + "@openzeppelin/contracts" "4.9.6" + "@uma/common" "^2.37.3" + "@uniswap/lib" "4.0.1-alpha" + "@uniswap/v2-core" "1.0.0" + "@uniswap/v2-periphery" "1.1.0-beta.0" + "@uniswap/v3-core" "^1.0.0-rc.2" + "@uniswap/v3-periphery" "^1.0.0-beta.23" + "@uma/logger@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@uma/logger/-/logger-1.3.0.tgz#df5beb2efb4333aa3da320ba3a02168a627dbe72" @@ -4305,6 +4355,15 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" +axios@^1.6.1: + version "1.7.8" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.8.tgz#1997b1496b394c21953e68c14aaa51b7b5de3d6e" + integrity sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw== + dependencies: + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axios@^1.7.4: version "1.7.4" resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"