Skip to content

Commit 356bf2b

Browse files
jackwallerjackwaller
committed
chore: standardise to yarn
1 parent 8bea223 commit 356bf2b

File tree

3 files changed

+82
-64
lines changed

3 files changed

+82
-64
lines changed

‎Dockerfile

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
FROM public.ecr.aws/docker/library/node:20 AS builder
2+
RUN npm install -g [email protected]
23

3-
RUN npm install -g typescript bun
44
WORKDIR /app
55

66
COPY . .
7-
RUN bun install
7+
88
WORKDIR /app/drift-common/protocol/sdk
9-
RUN yarn build
9+
RUN yarn && yarn build
10+
1011
WORKDIR /app/drift-common/common-ts
11-
RUN yarn build
12+
RUN yarn && yarn build
13+
1214
WORKDIR /app
13-
RUN bun esbuild.config.js
15+
RUN yarn && yarn build
1416

15-
FROM public.ecr.aws/docker/library/node:20-alpine
17+
FROM public.ecr.aws/docker/library/node:20.18.1-alpine
18+
RUN apk add python3 make g++ --virtual .build &&\
19+
npm install -C /lib bigint-buffer @triton-one/[email protected] &&\
20+
apk del .build
21+
1622
COPY --from=builder /app/lib/ ./lib/
17-
RUN apk add --virtual .build python3 g++ make &&\
18-
npm install -C lib bigint-buffer @triton-one/[email protected] &&\
19-
apk del .build &&\
20-
rm -rf /root/.cache/ /root/.npm /usr/local/lib/node_modules
2123

2224
ENV NODE_ENV=production
2325
EXPOSE 9464

‎package.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
},
5555
"scripts": {
5656
"prepare": "husky install",
57-
"build": "yarn clean && tsc",
57+
"build": "node esbuild.config.js",
5858
"clean": "rm -rf lib",
5959
"start": "node lib/index.js",
6060
"dev": "ts-node src/index.ts",
@@ -74,9 +74,5 @@
7474
"lint": "eslint . --ext ts --quiet",
7575
"lint:fix": "eslint . --ext ts --fix",
7676
"playground": "ts-node src/playground.ts"
77-
},
78-
"workspaces": [
79-
"drift-common/protocol/sdk",
80-
"drift-common/common-ts"
81-
]
77+
}
8278
}

‎yarn.lock

+68-48
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,28 @@
371371
resolved "https://registry.yarnpkg.com/@coral-xyz/anchor-errors/-/anchor-errors-0.30.1.tgz#bdfd3a353131345244546876eb4afc0e125bec30"
372372
integrity sha512-9Mkradf5yS5xiLWrl9WrpjqOrAV+/W2RQHDlbnAZBivoGpOs1ECjoDCkVk4aRG8ZdiFiB8zQEVlxf+8fKkmSfQ==
373373

374-
"@coral-xyz/[email protected]", "@coral-xyz/anchor@^0.29.0":
374+
"@coral-xyz/[email protected]":
375+
version "0.28.0"
376+
resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.28.0.tgz#8345c3c9186a91f095f704d7b90cd256f7e8b2dc"
377+
integrity sha512-kQ02Hv2ZqxtWP30WN1d4xxT4QqlOXYDxmEd3k/bbneqhV3X5QMO4LAtoUFs7otxyivOgoqam5Il5qx81FuI4vw==
378+
dependencies:
379+
"@coral-xyz/borsh" "^0.28.0"
380+
"@solana/web3.js" "^1.68.0"
381+
base64-js "^1.5.1"
382+
bn.js "^5.1.2"
383+
bs58 "^4.0.1"
384+
buffer-layout "^1.2.2"
385+
camelcase "^6.3.0"
386+
cross-fetch "^3.1.5"
387+
crypto-hash "^1.3.0"
388+
eventemitter3 "^4.0.7"
389+
js-sha256 "^0.9.0"
390+
pako "^2.0.3"
391+
snake-case "^3.0.4"
392+
superstruct "^0.15.4"
393+
toml "^3.0.0"
394+
395+
"@coral-xyz/anchor@^0.29.0":
375396
version "0.29.0"
376397
resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.29.0.tgz#bd0be95bedfb30a381c3e676e5926124c310ff12"
377398
integrity sha512-eny6QNG0WOwqV0zQ7cs/b1tIuzZGmP7U7EcH+ogt4Gdbl8HDmIYVMh/9aTmYZPaFWjtUaI8qSn73uYEXWfATdA==
@@ -391,6 +412,14 @@
391412
superstruct "^0.15.4"
392413
toml "^3.0.0"
393414

415+
"@coral-xyz/borsh@^0.28.0":
416+
version "0.28.0"
417+
resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.28.0.tgz#fa368a2f2475bbf6f828f4657f40a52102e02b6d"
418+
integrity sha512-/u1VTzw7XooK7rqeD7JLUSwOyRSesPUk0U37BV9zK0axJc1q0nRbKFGFLYCQ16OtdOJTTwGfGp11Lx9B45bRCQ==
419+
dependencies:
420+
bn.js "^5.1.2"
421+
buffer-layout "^1.2.0"
422+
394423
"@coral-xyz/borsh@^0.29.0":
395424
version "0.29.0"
396425
resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.29.0.tgz#79f7045df2ef66da8006d47f5399c7190363e71f"
@@ -424,39 +453,37 @@
424453
kuler "^2.0.0"
425454

426455
"@drift-labs/sdk@file:./drift-common/protocol/sdk", "@drift-labs/sdk@file:drift-common/protocol/sdk":
427-
version "2.104.0-beta.30"
456+
version "2.104.0-beta.0"
428457
dependencies:
429-
"@coral-xyz/anchor" "0.29.0"
458+
"@coral-xyz/anchor" "0.28.0"
430459
"@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"
431-
"@ellipsis-labs/phoenix-sdk" "1.4.5"
460+
"@ellipsis-labs/phoenix-sdk" "^1.4.2"
432461
"@grpc/grpc-js" "^1.8.0"
433462
"@openbook-dex/openbook-v2" "0.2.10"
434-
"@project-serum/serum" "0.13.65"
463+
"@project-serum/serum" "^0.13.38"
435464
"@pythnetwork/client" "2.5.3"
436-
"@pythnetwork/price-service-sdk" "1.7.1"
437-
"@pythnetwork/pyth-solana-receiver" "0.7.0"
465+
"@pythnetwork/price-service-sdk" "^1.7.1"
466+
"@pythnetwork/pyth-solana-receiver" "^0.7.0"
438467
"@solana/spl-token" "0.3.7"
439468
"@solana/web3.js" "1.92.3"
440469
"@switchboard-xyz/on-demand" "1.2.42"
441-
"@triton-one/yellowstone-grpc" "1.3.0"
442-
anchor-bankrun "0.3.0"
443-
nanoid "3.3.4"
444-
node-cache "5.1.2"
470+
"@triton-one/yellowstone-grpc" "0.6.0"
471+
anchor-bankrun "^0.3.0"
472+
node-cache "^5.1.2"
445473
rpc-websockets "7.5.1"
446-
solana-bankrun "0.3.1"
447-
strict-event-emitter-types "2.0.0"
474+
solana-bankrun "^0.3.0"
475+
strict-event-emitter-types "^2.0.0"
448476
tweetnacl "1.0.3"
449-
uuid "8.3.2"
450-
yargs "17.7.2"
451-
zstddec "0.1.0"
477+
uuid "^8.3.2"
478+
zstddec "^0.1.0"
452479

453480
"@drift/common@file:./drift-common/common-ts":
454481
version "1.0.0"
455482
dependencies:
456-
"@drift-labs/sdk" "file:../../../Library/Caches/Yarn/v6/[email protected]01140c44-8536-4871-8ca5-b566580265f6-1734484956666/node_modules/@drift/protocol/sdk"
483+
"@drift-labs/sdk" "file:../Library/Caches/Yarn/v6/[email protected]4e3c4626-2ccf-4799-8c43-1efe010514e5-1736307402016/node_modules/@drift/protocol/sdk"
457484
"@jest/globals" "^29.3.1"
458485
"@slack/web-api" "^6.4.0"
459-
"@solana/spl-token" "0.3.8"
486+
"@solana/spl-token" "^0.3.8"
460487
"@solana/web3.js" "1.66.2"
461488
bcryptjs-react "^2.4.6"
462489
cerializr "^3.1.4"
@@ -471,7 +498,7 @@
471498
winston "^3.13.0"
472499
winston-slack-webhook-transport "^2.3.5"
473500

474-
"@ellipsis-labs/[email protected].5":
501+
"@ellipsis-labs/phoenix-sdk@^1.4.2":
475502
version "1.4.5"
476503
resolved "https://registry.yarnpkg.com/@ellipsis-labs/phoenix-sdk/-/phoenix-sdk-1.4.5.tgz#42cf8de8463b32c910ab8844eae71ca082a6773a"
477504
integrity sha512-vEYgMXuV5/mpnpEi+VK4HO8f6SheHtVLdHHlULBiDN1eECYmL67gq+/cRV7Ar6jAQ7rJZL7xBxhbUW5kugMl6A==
@@ -1581,7 +1608,7 @@
15811608
bn.js "^5.1.2"
15821609
buffer-layout "^1.2.0"
15831610

1584-
"@project-serum/[email protected].65", "@project-serum/serum@^0.13.65":
1611+
"@project-serum/serum@^0.13.38", "@project-serum/serum@^0.13.65":
15851612
version "0.13.65"
15861613
resolved "https://registry.yarnpkg.com/@project-serum/serum/-/serum-0.13.65.tgz#6d3cf07912f13985765237f053cca716fe84b0b0"
15871614
integrity sha512-BHRqsTqPSfFB5p+MgI2pjvMBAQtO8ibTK2fYY96boIFkCI3TTwXDt2gUmspeChKO2pqHr5aKevmexzAcXxrSRA==
@@ -1654,14 +1681,21 @@
16541681
assert "^2.0.0"
16551682
buffer "^6.0.1"
16561683

1657-
"@pythnetwork/price-service-sdk@1.7.1", "@pythnetwork/price-service-sdk@>=1.6.0":
1684+
"@pythnetwork/price-service-sdk@>=1.6.0":
16581685
version "1.7.1"
16591686
resolved "https://registry.yarnpkg.com/@pythnetwork/price-service-sdk/-/price-service-sdk-1.7.1.tgz#dbfc8a8c2189f526346c1f79ec3995e89b690700"
16601687
integrity sha512-xr2boVXTyv1KUt/c6llUTfbv2jpud99pWlMJbFaHGUBoygQsByuy7WbjIJKZ+0Blg1itLZl0Lp/pJGGg8SdJoQ==
16611688
dependencies:
16621689
bn.js "^5.2.1"
16631690

1664-
"@pythnetwork/[email protected]":
1691+
"@pythnetwork/price-service-sdk@^1.7.1":
1692+
version "1.8.0"
1693+
resolved "https://registry.yarnpkg.com/@pythnetwork/price-service-sdk/-/price-service-sdk-1.8.0.tgz#f5f01f654963eb9a0cf12127b4f1a89b60ef008a"
1694+
integrity sha512-tFZ1thj3Zja06DzPIX2dEWSi7kIfIyqreoywvw5NQ3Z1pl5OJHQGMEhxt6Li3UCGSp2ooYZS9wl8/8XfrfrNSA==
1695+
dependencies:
1696+
bn.js "^5.2.1"
1697+
1698+
"@pythnetwork/pyth-solana-receiver@^0.7.0":
16651699
version "0.7.0"
16661700
resolved "https://registry.yarnpkg.com/@pythnetwork/pyth-solana-receiver/-/pyth-solana-receiver-0.7.0.tgz#253a0d15a135d625ceca7ba1b47940dd03b9cab6"
16671701
integrity sha512-OoEAHh92RPRdKkfjkcKGrjC+t0F3SEL754iKFmixN9zyS8pIfZSVfFntmkHa9pWmqEMxdx/i925a8B5ny8Tuvg==
@@ -1953,15 +1987,6 @@
19531987
"@solana/buffer-layout-utils" "^0.2.0"
19541988
buffer "^6.0.3"
19551989

1956-
"@solana/[email protected]":
1957-
version "0.3.8"
1958-
resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.3.8.tgz#8e9515ea876e40a4cc1040af865f61fc51d27edf"
1959-
integrity sha512-ogwGDcunP9Lkj+9CODOWMiVJEdRtqHAtX2rWF62KxnnSWtMZtV9rDhTrZFshiyJmxDnRL/1nKE1yJHg4jjs3gg==
1960-
dependencies:
1961-
"@solana/buffer-layout" "^4.0.0"
1962-
"@solana/buffer-layout-utils" "^0.2.0"
1963-
buffer "^6.0.3"
1964-
19651990
"@solana/spl-token@^0.1.6":
19661991
version "0.1.8"
19671992
resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.1.8.tgz#f06e746341ef8d04165e21fc7f555492a2a0faa6"
@@ -1974,7 +1999,7 @@
19741999
buffer-layout "^1.2.0"
19752000
dotenv "10.0.0"
19762001

1977-
"@solana/spl-token@^0.3.4":
2002+
"@solana/spl-token@^0.3.4", "@solana/spl-token@^0.3.8":
19782003
version "0.3.11"
19792004
resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.3.11.tgz#cdc10f9472b29b39c8983c92592cadd06627fb9a"
19802005
integrity sha512-bvohO3rIMSVL24Pb+I4EYTJ6cL82eFpInEXD/I8K8upOGjpqHsKUoAempR/RnUlI1qSFNyFlWJfu6MNUgfbCQQ==
@@ -2210,10 +2235,10 @@
22102235
js-yaml "^4.1.0"
22112236
protobufjs "^7.2.6"
22122237

2213-
"@triton-one/yellowstone-grpc@1.3.0":
2214-
version "1.3.0"
2215-
resolved "https://registry.yarnpkg.com/@triton-one/yellowstone-grpc/-/yellowstone-grpc-1.3.0.tgz#7caa7006b525149b4780d1295c7d4c34bc6a6ff6"
2216-
integrity sha512-tuwHtoYzvqnahsMrecfNNkQceCYwgiY0qKS8RwqtaxvDEgjm0E+0bXwKz2eUD3ZFYifomJmRKDmSBx9yQzAeMQ==
2238+
"@triton-one/yellowstone-grpc@0.6.0":
2239+
version "0.6.0"
2240+
resolved "https://registry.yarnpkg.com/@triton-one/yellowstone-grpc/-/yellowstone-grpc-0.6.0.tgz#9e6376cec8a42284c23dc195df2c3423c87c4f27"
2241+
integrity sha512-rgdZM2N3U9/d/QKOI5PP+9rSHUl2oSI5Uwzvuss8y/mtTaHFjbOMpXpQXviIeDkusOa+mef4wLYrbjEZCwTXiw==
22172242
dependencies:
22182243
"@grpc/grpc-js" "^1.8.0"
22192244

@@ -2844,7 +2869,7 @@ ajv@^8.0.1, ajv@^8.1.0:
28442869
require-from-string "^2.0.2"
28452870
uri-js "^4.2.2"
28462871

2847-
[email protected]:
2872+
anchor-bankrun@^0.3.0:
28482873
version "0.3.0"
28492874
resolved "https://registry.yarnpkg.com/anchor-bankrun/-/anchor-bankrun-0.3.0.tgz#3789fcecbc201a2334cff228b99cc0da8ef0167e"
28502875
integrity sha512-PYBW5fWX+iGicIS5MIM/omhk1tQPUc0ELAnI/IkLKQJ6d75De/CQRh8MF2bU/TgGyFi6zEel80wUe3uRol9RrQ==
@@ -5181,11 +5206,6 @@ [email protected], ms@^2.0.0, ms@^2.1.1:
51815206
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
51825207
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
51835208

5184-
[email protected]:
5185-
version "3.3.4"
5186-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
5187-
integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
5188-
51895209
natural-compare@^1.4.0:
51905210
version "1.4.0"
51915211
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -5204,7 +5224,7 @@ no-case@^3.0.4:
52045224
lower-case "^2.0.2"
52055225
tslib "^2.0.3"
52065226

5207-
[email protected]:
5227+
node-cache@^5.1.2:
52085228
version "5.1.2"
52095229
resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-5.1.2.tgz#f264dc2ccad0a780e76253a694e9fd0ed19c398d"
52105230
integrity sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==
@@ -6124,7 +6144,7 @@ [email protected]:
61246144
resolved "https://registry.yarnpkg.com/solana-bankrun-linux-x64-musl/-/solana-bankrun-linux-x64-musl-0.3.1.tgz#1a044a132138a0084e82406ec7bf4939f06bed68"
61256145
integrity sha512-6r8i0NuXg3CGURql8ISMIUqhE7Hx/O7MlIworK4oN08jYrP0CXdLeB/hywNn7Z8d1NXrox/NpYUgvRm2yIzAsQ==
61266146

6127-
[email protected].1:
6147+
solana-bankrun@^0.3.0:
61286148
version "0.3.1"
61296149
resolved "https://registry.yarnpkg.com/solana-bankrun/-/solana-bankrun-0.3.1.tgz#13665ab7c1c15ec2b3354aae56980d0ded514998"
61306150
integrity sha512-inRwON7fBU5lPC36HdEqPeDg15FXJYcf77+o0iz9amvkUMJepcwnRwEfTNyMVpVYdgjTOBW5vg+596/3fi1kGA==
@@ -6198,7 +6218,7 @@ stream-shift@^1.0.0:
61986218
resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
61996219
integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
62006220

6201-
[email protected]:
6221+
strict-event-emitter-types@^2.0.0:
62026222
version "2.0.0"
62036223
resolved "https://registry.yarnpkg.com/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz#05e15549cb4da1694478a53543e4e2f4abcf277f"
62046224
integrity sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==
@@ -6545,7 +6565,7 @@ [email protected]:
65456565
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
65466566
integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
65476567

6548-
uuid@8.3.2, uuid@^8.3.2:
6568+
uuid@^8.3.2:
65496569
version "8.3.2"
65506570
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
65516571
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -6779,7 +6799,7 @@ [email protected]:
67796799
y18n "^5.0.5"
67806800
yargs-parser "^20.2.2"
67816801

6782-
yargs@17.7.2, yargs@^17.7.2:
6802+
yargs@^17.7.2:
67836803
version "17.7.2"
67846804
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
67856805
integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -6802,7 +6822,7 @@ yocto-queue@^0.1.0:
68026822
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
68036823
integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
68046824

6805-
[email protected]:
6825+
zstddec@^0.1.0:
68066826
version "0.1.0"
68076827
resolved "https://registry.yarnpkg.com/zstddec/-/zstddec-0.1.0.tgz#7050f3f0e0c3978562d0c566b3e5a427d2bad7ec"
68086828
integrity sha512-w2NTI8+3l3eeltKAdK8QpiLo/flRAr2p8AGeakfMZOXBxOg9HIu4LVDxBi81sYgVhFhdJjv1OrB5ssI8uFPoLg==

0 commit comments

Comments
 (0)