Skip to content

Commit

Permalink
Merge branch 'across-protocol:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ishantiw authored Jul 2, 2024
2 parents d9a26f1 + 0c7c1d8 commit 7ad6be2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 49 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"node": ">=16.18.0"
},
"dependencies": {
"@across-protocol/constants": "^3.1.3",
"@across-protocol/contracts": "^3.0.0",
"@across-protocol/sdk": "^3.1.3",
"@across-protocol/constants": "^3.1.5",
"@across-protocol/contracts": "^3.0.3",
"@across-protocol/sdk": "^3.1.8",
"@arbitrum/sdk": "^3.1.3",
"@consensys/linea-sdk": "^0.2.1",
"@defi-wonderland/smock": "^2.3.5",
Expand Down
62 changes: 16 additions & 46 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,16 @@
"@uma/common" "^2.17.0"
hardhat "^2.9.3"

"@across-protocol/constants@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.0.0.tgz#0f5cbcaf40d43babbecb322d91a689b49c5536a0"
integrity sha512-iJz1EDdYr+GRgHRZwcAw2G06ZvV9VOW6GQ846X7G/dd8wVQej18v1Fpx6th4bcSba1j7jR5Hfi+/zqSDoxyLmw==

"@across-protocol/constants@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.0.1.tgz#8fb2760a3c64801c9324bcbf76084fae9dfabb52"
integrity sha512-cCrhLEpYfiFeDrXscUgdRTnOW5Sn2W9mmdrxxl1dXLC+tYMb1c2rgQVBQNxrdW7LGiDqCR4a5m5jYgWPXonzQg==

"@across-protocol/constants@^3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.1.tgz#fdcb19a06948a445694274507cad99d01cb647c7"
integrity sha512-f0a+5LgGojmzG2J4OyjBUP/HyU+R6FztG9bcsWH4tl1TcSEm9JjWst3K26LYUIKLmVq/nu/QSXoC6IRIHKZsOQ==

"@across-protocol/constants@^3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.3.tgz#534764a4137bd5181ab4214543d0cbbf44a90c63"
integrity sha512-4pUjJrRor9gFPAsskbva6bDK780tzXYMWtqCtBa1jOUc+X3PxC6U6lF7ZoyX+lqU/KcfAWDLg8YEsz+KLm3NrQ==

"@across-protocol/constants@^3.1.5":
version "3.1.5"
resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.5.tgz#58cdd06816518b5cf1d92d94a4bc175ab0bc9d0c"
integrity sha512-3bqBNdYhVnpNwd9zwxmDWewM0ixRxTiL0SCHmOWlmDEx9xqPFHx5t+GLJWOa18wIoPP5KWv/TyI+fdwi3Tg5Bw==

"@across-protocol/contracts@^0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-0.1.4.tgz#64b3d91e639d2bb120ea94ddef3d160967047fa5"
Expand All @@ -40,32 +30,12 @@
"@openzeppelin/contracts" "4.1.0"
"@uma/core" "^2.18.0"

"@across-protocol/contracts@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-3.0.0.tgz#2897823d51d1fb8bd4292e9d05500c4d824c3c08"
integrity sha512-4rZTWR8gJAKecdfbhX31HHL5QgRuKJFL7epNEiPfHODFDivAfCltUkY/ozxf0EUnl2u3DrfrEhc6HeOS2lXNHw==
dependencies:
"@across-protocol/constants" "^3.0.0"
"@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"
"@uma/common" "^2.34.0"
"@uma/contracts-node" "^0.4.17"
"@uma/core" "^2.56.0"
axios "^1.6.2"
zksync-web3 "^0.14.3"

"@across-protocol/contracts@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-3.0.1.tgz#05944932ee5f64895c940041c2770824964fb00f"
integrity sha512-8OGsYRRzewrsb3OKhM2KBQAILXpQ6OWNmiuKqnX9el7x2K+sLdWVjBklPybI8mgngbJ/vALstulkQtQXOqkZ1Q==
"@across-protocol/contracts@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-3.0.3.tgz#e3f97af29b7ed55c82305e89272b30915632c226"
integrity sha512-4pQkgyUOhzgKk5kVrJsLOXmI9ko31aDKI7aEi9nYIU5at6JcWteySGvlFtRZVgq1gQqv0uiYHcSrKoP7dlVE/A==
dependencies:
"@across-protocol/constants" "^3.0.1"
"@across-protocol/constants" "^3.1.3"
"@defi-wonderland/smock" "^2.3.4"
"@eth-optimism/contracts" "^0.5.40"
"@ethersproject/abstract-provider" "5.7.0"
Expand All @@ -80,14 +50,14 @@
axios "^1.6.2"
zksync-web3 "^0.14.3"

"@across-protocol/sdk@^3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@across-protocol/sdk/-/sdk-3.1.3.tgz#be791b77a84b4098b4ebc691bc307cdc442c1464"
integrity sha512-+qVR7iMTF3cN0hLklLMeOVeIshPwbh/WNe6fMxnbfiGT27fRJQZFQgnH7PGC1FtcHnYAOewsDk0tP7HhQfi44A==
"@across-protocol/sdk@^3.1.8":
version "3.1.8"
resolved "https://registry.yarnpkg.com/@across-protocol/sdk/-/sdk-3.1.8.tgz#0f6f8c5b3aa6f13d9ca955b2a00a50d902ef4bc2"
integrity sha512-gIV6p3lfb0kKN2JI8ZBikma4xUnTMAeruaUQ1oMwtVSZgEybiKw+CKJYgamG9MavXYDFa0uSYLzhD5PCmZ4Xxw==
dependencies:
"@across-protocol/across-token" "^1.0.0"
"@across-protocol/constants" "^3.1.1"
"@across-protocol/contracts" "^3.0.1"
"@across-protocol/constants" "^3.1.5"
"@across-protocol/contracts" "^3.0.3"
"@eth-optimism/sdk" "^3.3.1"
"@pinata/sdk" "^2.1.0"
"@types/mocha" "^10.0.1"
Expand Down

0 comments on commit 7ad6be2

Please sign in to comment.