Skip to content

Commit

Permalink
Merge branch 'main' into wjthieme/anchor-0.30.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@wjthieme
wjthieme authored Aug 9, 2024
2 parents ec1e1f7 + ebdb68f commit ac69e16
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 95 deletions.
2 changes: 1 addition & 1 deletion legacy-sdk/scripts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@solana/spl-token": "^0.4.8"
},
"devDependencies": {
"@types/mocha": "^9.0.0",
"@types/mocha": "^10.0.7",
"@types/mz": "^2.7.3",
"mz": "^2.7.0",
"typescript": "^5.3.3"
Expand Down
4 changes: 2 additions & 2 deletions legacy-sdk/whirlpool/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"types": "dist/index.d.ts",
"peerDependencies": {
"@coral-xyz/anchor": "~0.30.0",
"@orca-so/common-sdk": "0.6.0",
"@orca-so/common-sdk": "0.6.2",
"@solana/spl-token": "^0.4.8",
"@solana/web3.js": "^1.90.0",
"decimal.js": "^10.4.3"
Expand All @@ -17,7 +17,7 @@
},
"devDependencies": {
"@coral-xyz/anchor": "~0.30.0",
"@orca-so/common-sdk": "0.6.0",
"@orca-so/common-sdk": "0.6.2",
"@orca-so/whirlpools-program": "*",
"@solana/spl-token": "^0.4.8",
"@solana/web3.js": "^1.90.0",
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
},
"devDependencies": {
"@types/bn.js": "~5.1.5",
"@types/mocha": "^10.0.6",
"@types/node": "^20.10.8",
"@types/mocha": "^10.0.7",
"@types/node": "^22.1.0",
"husky": "^9.1.4",
"lint-staged": "^15.2.8",
"mocha": "^10.2.0",
"nx": "^19.4.2",
"nx": "^19.5.7",
"prettier": "^3.1.1",
"rimraf": "^6.0.1",
"ts-mocha": "^10.0.0"
Expand Down
155 changes: 66 additions & 89 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,98 +168,98 @@ __metadata:
languageName: node
linkType: hard

"@nrwl/tao@npm:19.5.6":
version: 19.5.6
resolution: "@nrwl/tao@npm:19.5.6"
"@nrwl/tao@npm:19.5.7":
version: 19.5.7
resolution: "@nrwl/tao@npm:19.5.7"
dependencies:
nx: "npm:19.5.6"
nx: "npm:19.5.7"
tslib: "npm:^2.3.0"
bin:
tao: index.js
checksum: 10c0/31d698d408e12e84b392c71ff82eea288ba0a15582d413460efac3bed932555b72d4812aa5783fe7e8eaee44777be472702403eb662551e33279e807dafb5484
checksum: 10c0/4a86e121688728cd78a41fbfada3248ae77e172bf2f7c63d06fecb9fb76972c13702beaf552d298130d8a2fdff17350b688ca62976ef11ee9169891d05329002
languageName: node
linkType: hard

"@nx/nx-darwin-arm64@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-darwin-arm64@npm:19.5.6"
"@nx/nx-darwin-arm64@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-darwin-arm64@npm:19.5.7"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@nx/nx-darwin-x64@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-darwin-x64@npm:19.5.6"
"@nx/nx-darwin-x64@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-darwin-x64@npm:19.5.7"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@nx/nx-freebsd-x64@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-freebsd-x64@npm:19.5.6"
"@nx/nx-freebsd-x64@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-freebsd-x64@npm:19.5.7"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard

"@nx/nx-linux-arm-gnueabihf@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.5.6"
"@nx/nx-linux-arm-gnueabihf@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.5.7"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@nx/nx-linux-arm64-gnu@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-linux-arm64-gnu@npm:19.5.6"
"@nx/nx-linux-arm64-gnu@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-linux-arm64-gnu@npm:19.5.7"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@nx/nx-linux-arm64-musl@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-linux-arm64-musl@npm:19.5.6"
"@nx/nx-linux-arm64-musl@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-linux-arm64-musl@npm:19.5.7"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@nx/nx-linux-x64-gnu@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-linux-x64-gnu@npm:19.5.6"
"@nx/nx-linux-x64-gnu@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-linux-x64-gnu@npm:19.5.7"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@nx/nx-linux-x64-musl@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-linux-x64-musl@npm:19.5.6"
"@nx/nx-linux-x64-musl@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-linux-x64-musl@npm:19.5.7"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@nx/nx-win32-arm64-msvc@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-win32-arm64-msvc@npm:19.5.6"
"@nx/nx-win32-arm64-msvc@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-win32-arm64-msvc@npm:19.5.7"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@nx/nx-win32-x64-msvc@npm:19.5.6":
version: 19.5.6
resolution: "@nx/nx-win32-x64-msvc@npm:19.5.6"
"@nx/nx-win32-x64-msvc@npm:19.5.7":
version: 19.5.7
resolution: "@nx/nx-win32-x64-msvc@npm:19.5.7"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@orca-so/common-sdk@npm:0.6.0":
version: 0.6.0
resolution: "@orca-so/common-sdk@npm:0.6.0"
"@orca-so/common-sdk@npm:0.6.2":
version: 0.6.2
resolution: "@orca-so/common-sdk@npm:0.6.2"
dependencies:
tiny-invariant: "npm:^1.3.1"
peerDependencies:
"@solana/spl-token": ^0.4.1
"@solana/web3.js": ^1.90.0
decimal.js: ^10.4.3
checksum: 10c0/a62b66a727c845a31f5cd3ca5c80ccc5740621e55ebaee63f262a50359a6b78d5bf9c3f8524594789fe69cf4f4efa0a06d2e1e541e53063f5dcba63a76eee3b8
checksum: 10c0/d15613317bbd232469b5e2e1855d309ed6d984f4bfd36ef1444e6c4bbab68a2395866c2e68ad71558e2ddcdcf71639f0b8d471fb15ed846634b3d012f51f1f46
languageName: node
linkType: hard

Expand All @@ -275,7 +275,7 @@ __metadata:
dependencies:
"@project-serum/anchor": "npm:~0.26.0"
"@solana/spl-token": "npm:^0.4.8"
"@types/mocha": "npm:^9.0.0"
"@types/mocha": "npm:^10.0.7"
"@types/mz": "npm:^2.7.3"
mz: "npm:^2.7.0"
typescript: "npm:^5.3.3"
Expand All @@ -287,7 +287,7 @@ __metadata:
resolution: "@orca-so/whirlpools-sdk@workspace:legacy-sdk/whirlpool"
dependencies:
"@coral-xyz/anchor": "npm:~0.30.0"
"@orca-so/common-sdk": "npm:0.6.0"
"@orca-so/common-sdk": "npm:0.6.2"
"@orca-so/whirlpools-program": "npm:*"
"@solana/spl-token": "npm:^0.4.8"
"@solana/web3.js": "npm:^1.90.0"
Expand All @@ -296,7 +296,7 @@ __metadata:
typescript: "npm:^5.3.3"
peerDependencies:
"@coral-xyz/anchor": ~0.30.0
"@orca-so/common-sdk": 0.6.0
"@orca-so/common-sdk": 0.6.2
"@solana/spl-token": ^0.4.8
"@solana/web3.js": ^1.90.0
decimal.js: ^10.4.3
Expand All @@ -308,12 +308,12 @@ __metadata:
resolution: "@orca-so/whirlpools@workspace:."
dependencies:
"@types/bn.js": "npm:~5.1.5"
"@types/mocha": "npm:^10.0.6"
"@types/node": "npm:^20.10.8"
"@types/mocha": "npm:^10.0.7"
"@types/node": "npm:^22.1.0"
husky: "npm:^9.1.4"
lint-staged: "npm:^15.2.8"
mocha: "npm:^10.2.0"
nx: "npm:^19.4.2"
nx: "npm:^19.5.7"
prettier: "npm:^3.1.1"
rimraf: "npm:^6.0.1"
ts-mocha: "npm:^10.0.0"
Expand Down Expand Up @@ -664,20 +664,13 @@ __metadata:
languageName: node
linkType: hard

"@types/mocha@npm:^10.0.6":
"@types/mocha@npm:^10.0.7":
version: 10.0.7
resolution: "@types/mocha@npm:10.0.7"
checksum: 10c0/48a2df4dd02b6e66a11129dca6a23cf0cc3995faf8525286eb851043685bd8b7444780f4bb29a1c42df7559ed63294e5308bfce3a6b862ad2e0359cb21c21329
languageName: node
linkType: hard

"@types/mocha@npm:^9.0.0":
version: 9.1.1
resolution: "@types/mocha@npm:9.1.1"
checksum: 10c0/d033742ce0c92b917815b6e515165ee396866d0db0c0bbe0c301e49402abe3a61bd51e5bb1df7577f1fac60c99ee505fa744f515b476cc934ecb57f709f327e9
languageName: node
linkType: hard

"@types/mz@npm:^2.7.3":
version: 2.7.8
resolution: "@types/mz@npm:2.7.8"
Expand All @@ -687,7 +680,7 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:*":
"@types/node@npm:*, @types/node@npm:^22.1.0":
version: 22.1.0
resolution: "@types/node@npm:22.1.0"
dependencies:
Expand All @@ -703,15 +696,6 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^20.10.8":
version: 20.14.14
resolution: "@types/node@npm:20.14.14"
dependencies:
undici-types: "npm:~5.26.4"
checksum: 10c0/4fc8d368df2b6f5497698327b30db68d7d20e32221ce7d057fb15cbd5834685b2fde0440609e4cb2204e5d305b928f008faf41b950a425f3fd55b60cb1b997cf
languageName: node
linkType: hard

"@types/uuid@npm:^8.3.4":
version: 8.3.4
resolution: "@types/uuid@npm:8.3.4"
Expand Down Expand Up @@ -2572,9 +2556,9 @@ __metadata:
languageName: node
linkType: hard

"mocha@npm:^10.2.0":
version: 10.7.0
resolution: "mocha@npm:10.7.0"
"mocha@npm:^10.7.3":
version: 10.7.3
resolution: "mocha@npm:10.7.3"
dependencies:
ansi-colors: "npm:^4.1.3"
browser-stdout: "npm:^1.3.1"
Expand All @@ -2599,7 +2583,7 @@ __metadata:
bin:
_mocha: bin/_mocha
mocha: bin/mocha.js
checksum: 10c0/4d9e04fffa66e147e6250561077fcae1d7220bebba98e5649742e2e11b1c432ce9ab3c20fc27fb7cbd2be533b9a2843d47130aa54570047be698e157add02961
checksum: 10c0/76a205905ec626262d903954daca31ba8e0dd4347092f627b98b8508dcdb5b30be62ec8f7a405fab3b2e691bdc099721c3291b330c3ee85b8ec40d3d179f8728
languageName: node
linkType: hard

Expand Down Expand Up @@ -2733,22 +2717,22 @@ __metadata:
languageName: node
linkType: hard

"nx@npm:19.5.6, nx@npm:^19.4.2":
version: 19.5.6
resolution: "nx@npm:19.5.6"
"nx@npm:19.5.7, nx@npm:^19.5.7":
version: 19.5.7
resolution: "nx@npm:19.5.7"
dependencies:
"@napi-rs/wasm-runtime": "npm:0.2.4"
"@nrwl/tao": "npm:19.5.6"
"@nx/nx-darwin-arm64": "npm:19.5.6"
"@nx/nx-darwin-x64": "npm:19.5.6"
"@nx/nx-freebsd-x64": "npm:19.5.6"
"@nx/nx-linux-arm-gnueabihf": "npm:19.5.6"
"@nx/nx-linux-arm64-gnu": "npm:19.5.6"
"@nx/nx-linux-arm64-musl": "npm:19.5.6"
"@nx/nx-linux-x64-gnu": "npm:19.5.6"
"@nx/nx-linux-x64-musl": "npm:19.5.6"
"@nx/nx-win32-arm64-msvc": "npm:19.5.6"
"@nx/nx-win32-x64-msvc": "npm:19.5.6"
"@nrwl/tao": "npm:19.5.7"
"@nx/nx-darwin-arm64": "npm:19.5.7"
"@nx/nx-darwin-x64": "npm:19.5.7"
"@nx/nx-freebsd-x64": "npm:19.5.7"
"@nx/nx-linux-arm-gnueabihf": "npm:19.5.7"
"@nx/nx-linux-arm64-gnu": "npm:19.5.7"
"@nx/nx-linux-arm64-musl": "npm:19.5.7"
"@nx/nx-linux-x64-gnu": "npm:19.5.7"
"@nx/nx-linux-x64-musl": "npm:19.5.7"
"@nx/nx-win32-arm64-msvc": "npm:19.5.7"
"@nx/nx-win32-x64-msvc": "npm:19.5.7"
"@yarnpkg/lockfile": "npm:^1.1.0"
"@yarnpkg/parsers": "npm:3.0.0-rc.46"
"@zkochan/js-yaml": "npm:0.0.7"
Expand Down Expand Up @@ -2814,7 +2798,7 @@ __metadata:
bin:
nx: bin/nx.js
nx-cloud: bin/nx-cloud.js
checksum: 10c0/3008a43300560284fc4dc4c7a06047882f7d5fff54c6fc700587c1d58ccca74fbd64cd2cbf5483d27c30f0f9ee187f100e999a1aef85c2fd4796317953dcd11d
checksum: 10c0/4d805c63021ee7b23ff97911cf1ee76f381d15893e8efdbe0b082590a85e6958e8a192bf7e90a1f90224a04b4a0abf8dabf4221e94d1c7e32c937f438d3eb512
languageName: node
linkType: hard

Expand Down Expand Up @@ -3622,13 +3606,6 @@ __metadata:
languageName: node
linkType: hard

"undici-types@npm:~5.26.4":
version: 5.26.5
resolution: "undici-types@npm:5.26.5"
checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501
languageName: node
linkType: hard

"undici-types@npm:~6.13.0":
version: 6.13.0
resolution: "undici-types@npm:6.13.0"
Expand Down

0 comments on commit ac69e16

Please sign in to comment.