From 2840085147576a561d31205e15fb1b021696bce5 Mon Sep 17 00:00:00 2001 From: kingsleydon <10992364+kingsleydon@users.noreply.github.com> Date: Fri, 23 Feb 2024 05:04:16 +0800 Subject: [PATCH] remove bunx --- Dockerfile | 2 +- bun.lockb | Bin 171878 -> 171902 bytes commands.json | 22 ++++++++++++++-------- package.json | 1 + patches/prom-client+14.2.0.patch | 13 ------------- src/constants.ts | 14 +++++++------- src/loadInitialState.ts | 7 +++++-- yarn.lock | 2 +- 8 files changed, 29 insertions(+), 32 deletions(-) delete mode 100644 patches/prom-client+14.2.0.patch diff --git a/Dockerfile b/Dockerfile index 864aaec..376c354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,4 +37,4 @@ COPY --from=prerelease /usr/src/app/package.json . # run the app USER bun -CMD ["sh", "-c", "bunx squid-typeorm-migration apply && bun lib/main.js"] +CMD ["sh", "-c", "npx squid-typeorm-migration apply && node lib/main.js"] diff --git a/bun.lockb b/bun.lockb index 5188728e75e9512aba0db69f1bb7e2e7234cfc1c..c54d96e25e86570810b33acee58a6d819be19ff7 100755 GIT binary patch delta 8638 zcmeI1dz4jG9mnq(o&$&=$cTUpBC(*vScEMU3;_!T1xj8D2!zkV7XrTUlB9skAz+|G zmSxC8kk=qED569O+Cy8S`9jl{&{7I%Ss5YN=X2&qYoHOazh|%eIp6*J{r2nZbMCo! z@3Z@H~W%gZ`pvZ(>piG<#JLCU7!%UgGo)GhXzTlRr=TI?MoZXsC$^aCHfd9 zRi$wznRPBb7lsE4Gjq$ikhm@0{p|X=&`jHWk!MJM}ui} zcC1kQ8$7eB zK{}S6Nc`cfRE65kqOdEg{>7j!iTIMk*I_9R&v<17R12;OTh(3-4y+7Js`g_VBvpGo zSbhVTDy#nT%!@k3HDOaYs#5Q$E#LsRfemaAeHJzTyRe@}O~+E}zW`pU{EHkMz#qV* zdIqm*kW?$Y2KwIsld6Ab=$oN$p{CKq{Qe{0s2bGN1K?}V8g|b}Fi?MQBS6 zl3L*PKP>{SBT!kLk+%5N_NZsxG4xE7Pp%UO2l8c&Pf-VQHgUCkXfL#MQOPM4&*G@u z2ep%Lgss~6g{ZEJ!msM@AGT_}0jREl;aANL3R|s@JtA!M)U2UVIBalq1k{$LgJ-pN zigI^h8E~xr*v!xfH9Irx&!Z0a{-~$g`>e1lX+E3$xe-wP!lkIL1stsSKo^=h zy)9osJ+pViubSNzc2(*Oz8~?=()_Us*v1|X4&;MqQ1wjy7WVO|PlSI(`J*&{M8Gop zIW$0P(Tg1yqWbIE>!+xp1`$`CvF50*7937NyJ-B6a{Ub$>ly`AJ3KpVRr{-`u5RI1 zo$B+#R?YV0;N9OFHQqPueyHvA5C0%E*B8uK;nFBD7&SK3!%=Dj!|*$$S46onmMcAT zZu{(Jx(dtryBW3BiAIl7TbUGo)p@=>%1;S@W!07EV7;jkSGB(vdUrwY^z3izd>nSX z06hs^jyeykEm(SRZc#SOwOA(A?l+*iHio|{wUy1p?e?kAr$e`(d~#dE{-p*Ig!0L1YbUg#7TDTxs^x1?-gat5{n~jlj-) zyRv$}orb?I`h|%9zuJ{HvOA>-S`1yFdXd8|US6RCo_pvADsT`KuQ> z6_1Uo7B^0je($I);2+d&;FN9;tzP6*FLJ6EIn|4tsuw-}AE;jBR4;O>7dhFFX7wVc zdXd8uk@Q)MpJ`JUmQP)nj4SN%akhxdN?wN*dofLJLOm+l}gn!WcKj9S3LmY6?*6w#TbYN}P@KNGCh5|n z6WPv??H8gA;Y4TzjlnO%$Z;5PacaI?J| zoCAIrhCvr7g6802b^_c26T!DYzA4%PFTu-D4jbWdcmf`Sb?|W7cx}?8+xcX>!(1qZ z+u;tl6Q;neFdQy}%V7kJgrVukwMmP17m@AANWKVP0$=ykM;kyLs0$0y2PshZ$uR%{ZAACVHm_ba2N$?uH z4x8Xf*bGm@Qg{R&g%!{X?t}Z`W*F<+tZ$PU4Fh2i^n?D;iB8S}-)0rUTb#w)@DBV5 z-i2RN?ziv;`5mwg_EOf3&d1>icoNpZdT`rx1*`?-$%KABgsW3*hU}8(P2+2LM~(8CVM?Fb3Snd=9ok8LWZ+)aeU5iLZg{p&#~} z=ze!n|4kt`Ed6=$8CL?c2`&L2>^_D0Bn?XQxd0}J2wDM0F(PHS4wyZqUv1)~cJ RZ!D^C?k?|KRM2(Ce*jBO@-hGb delta 8525 zcmeI1dyrOj8OP6AScFA0<^0Y$ zzxV9^p7)an%iegfY{B4kYt@i$vvWr!Nh0l`D>Q;0ps6YJ)WOtJ=nKaCfp#crzy5_@ z1laaI4S z@DFN!^4tzNXK)SpEUu3hsw2$-d(H)|SgoH2*3S>U3Ds&+XSx7vzYsLEU*VqQ_xnk0 zdL(U@MmyDkZqv_?zM(v)w_FcX^=}6+ZzX7|@l`sQs=peX-dfO9{dGE+s=onjzY(+| z&A)#`lU#jb_Z4bt)>7&o0_XG?IM(B#e?+bSbNHK4tv0p))8M1nk|d`lPT;SgsZRQN z9Za>u3t;>u(9|@)`NncqW0Jh$0jo_t-F6#c+rhK$07rcTw3^g@yTDnz8TuBgp}E2m zd~d&>6zdVh_JK>Z0lhs@Lq`eKFAHDQKO8l5M8u2L`Xi%VlhCGV;rf%LDFGi)E0j;t zI<$=rraC~|h_{P)v3f_2A+CN6^~yVk9*^=#PT=4;C+estA1D;56X}Mp_6Y48^=g`* zKffa9@ZX83>ab^8iw=mmYJ5=ms{IC|hK593wKz0>Rn$LaWq%>Uj2%Iv5bQqZwdX4 zL9AE}-O9mrw<7BQe`Q^H!nUsVaJYl!!pz41MHPk)g zs<*mV_^QRzIJo-zq1K-f{y@}m21R@*s;Ra=%lbYPhEuR^gon?l1B@i@Ej=&Vjg59{ zn(w%%Q_lN08P8#_h}vRxlqnHcz0Xsl{fvkgtD$Q+*e@6Ls{YSIuSJ{UFD^;C6i%EG zIEugu)cdeH8mR&Hmr8?lwXz(Vgsm6DsPWQcttDfln zh<}JW(Y+D>80C}f3*SL(pE_8L8h-(c8`zjJRO2=6P^>rZ%D7AiQ*A#59H(xl!cFjhyp^D--k4Q7n5tj5Q>ojj)a_LKM(p3Q z_?>WvqN#N|l`pensoSZFJymorGu_4~X$5<-Du*z?^c7q)ZC14blVV=b>WG=i>`B=R zI*^HLOL;|>u4agF6tyav_?73h*}= zeyB;FfoI`4xCg3X6Wj~yU_C5_p3n<=!)efmiz#F|_~9&B1XE!eOoth86^zRIu1lMi zj-c2-`@y=jO~=kmr3-u=b`dT^8$$y)3{0!tlHEenF2ARE8!Ut6a68-qcY^6YlSvs} zMwVpT)}<|SejWX)os2GHXj6Pw!O!4wFvVI1reOENCy?UTgO;!p-vqQd;CEmfnCZR- zOk7_J*TGDf1=qtbpa=9ax8Iw>Y0wA!$!0i{xDre)yZ|r4eQ-ZK01v|La0lE4cSB#8 z3pc`K7zgLW7#IRW!JnrG!3mt>8{qFt4O70buW%Kw!glyOyarFw@F{qS@-y%l?50CC zx(V)u`(Zt70P~r5!%Fb=>|6TRa322IaBG_Va6{T9cPBBEs?)%{zlrQ2Xn*)NoDTh< zHJt7F;URbws$d?B1^<#i0S|*YQ}d^T=yL|VO#K=#r!x@$Z>Xuof195)x7Z$h$IXMA zsay`e#C;3*hwg9+^Z@@7?SaAIYuDH8tKh431%2j#KR(Zb(QpBMhJy)hU;g&{Fa7r? zLdM$=E`*D~H>q#VOX0gP5hlR*;Vd|lLEiPtjLpiP+?bB3KK`Ecg2U5k*}_NCPTcRL wy84lHQd-^n(R9SnMo%>3?AUSHl4d3StG6{PIlrXQsPg^6r>h5)mvo!+A8B6c3jhEB diff --git a/commands.json b/commands.json index bacb544..be369a9 100644 --- a/commands.json +++ b/commands.json @@ -3,12 +3,12 @@ "commands": { "clean": { "description": "delete all build artifacts", - "cmd": ["bunx", "rimraf", "lib"] + "cmd": ["npx", "--yes", "rimraf", "lib"] }, "build": { "description": "Build the squid project", "deps": ["clean"], - "cmd": ["tsc", "--project", "tsconfig.build.json"] + "cmd": ["tsc", "-p", "tsconfig.build.json"] }, "up": { "description": "Start a PG database", @@ -29,7 +29,7 @@ }, "migration:clean": { "description": "Clean the migrations folder", - "cmd": ["bunx", "rimraf", "./db/migrations"] + "cmd": ["npx", "--yes", "rimraf", "./db/migrations"] }, "migration": { "deps": ["build"], @@ -47,12 +47,12 @@ "process": { "description": "Load .env and start the squid processor", "deps": ["build", "migration:apply"], - "cmd": ["bun", "lib/main.js"] + "cmd": ["node", "--require=dotenv/config", "lib/main.js"] }, "process:prod": { "description": "Start the squid processor", "deps": ["migration:apply"], - "cmd": ["bun", "lib/main.js"], + "cmd": ["node", "lib/main.js"], "hidden": true }, "serve": { @@ -74,17 +74,23 @@ ] }, "check-updates": { - "cmd": ["bunx", "npm-check-updates", "--filter=/subsquid/", "--upgrade"], + "cmd": [ + "npx", + "--yes", + "npm-check-updates", + "--filter=/subsquid/", + "--upgrade" + ], "hidden": true }, "bump": { "description": "Bump @subsquid packages to the latest versions", "deps": ["check-updates"], - "cmd": ["bun", "i", "-f"] + "cmd": ["npm", "i", "-f"] }, "open": { "description": "Open a local browser window", - "cmd": ["bunx", "--yes", "opener"] + "cmd": ["npx", "--yes", "opener"] } } } diff --git a/package.json b/package.json index 7c443f6..7ace609 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "@subsquid/typeorm-migration": "^1.3.0", "@subsquid/typeorm-store": "^1.2.6", "date-fns": "^3.3.1", + "dotenv": "^16.4.5", "lodash": "^4.17.21", "patch-package": "^8.0.0", "pg": "^8.11.3", diff --git a/patches/prom-client+14.2.0.patch b/patches/prom-client+14.2.0.patch deleted file mode 100644 index d3890b0..0000000 --- a/patches/prom-client+14.2.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/prom-client/lib/metrics/eventLoopLag.js b/node_modules/prom-client/lib/metrics/eventLoopLag.js -index 45d5c33..aa8a847 100644 ---- a/node_modules/prom-client/lib/metrics/eventLoopLag.js -+++ b/node_modules/prom-client/lib/metrics/eventLoopLag.js -@@ -6,7 +6,7 @@ const Gauge = require('../gauge'); - let perf_hooks; - try { - /* eslint-disable node/no-unsupported-features/node-builtins */ -- perf_hooks = require('perf_hooks'); -+ // perf_hooks = require('perf_hooks'); - } catch { - // node version is too old - } diff --git a/src/constants.ts b/src/constants.ts index b7b93e1..4f38dae 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,22 +1,22 @@ export const INITIAL_BLOCK = 3000000 export const TO_BLOCK = - Bun.env.TO_BLOCK != null ? parseInt(Bun.env.TO_BLOCK) : undefined + process.env.TO_BLOCK != null ? parseInt(process.env.TO_BLOCK) : undefined export const BASE_POOL_ACCOUNT = '42qnPyfw3sbWMGGtTPPc2YFNZRKPGXswRszyQQjGs2FDxdim' export const RPC_ENDPOINT = - Bun.env.RPC_ENDPOINT || 'https://khala-rpc.dwellir.com' + process.env.RPC_ENDPOINT || 'https://khala-rpc.dwellir.com' -export const ENABLE_SNAPSHOT = Bun.env.ENABLE_SNAPSHOT === '1' +export const ENABLE_SNAPSHOT = process.env.ENABLE_SNAPSHOT === '1' -export const FORCE_REFRESH_IDENTITY = Bun.env.FORCE_REFRESH_IDENTITY === '1' +export const FORCE_REFRESH_IDENTITY = process.env.FORCE_REFRESH_IDENTITY === '1' export const CLEAR_WITHDRAWAL_DATE = - typeof Bun.env.CLEAR_WITHDRAWAL_DATE === 'string' - ? new Date(Bun.env.CLEAR_WITHDRAWAL_DATE) + typeof process.env.CLEAR_WITHDRAWAL_DATE === 'string' + ? new Date(process.env.CLEAR_WITHDRAWAL_DATE) : undefined export const CLEAR_WITHDRAWAL_THRESHOLD = - Bun.env.CLEAR_WITHDRAWAL_THRESHOLD || '0.01' + process.env.CLEAR_WITHDRAWAL_THRESHOLD || '0.01' diff --git a/src/loadInitialState.ts b/src/loadInitialState.ts index 09d19eb..21181d4 100644 --- a/src/loadInitialState.ts +++ b/src/loadInitialState.ts @@ -1,4 +1,5 @@ import assert from 'assert' +import fs from 'fs' import path from 'path' import {BigDecimal} from '@subsquid/big-decimal' import {groupBy} from 'lodash' @@ -107,9 +108,11 @@ interface InitialState { } const loadInitialState = async (ctx: Ctx): Promise => { - const initialState: InitialState = await Bun.file( + const data = fs.readFileSync( path.resolve(__dirname, `../initial_state/${INITIAL_BLOCK}.json`), - ).json() + 'utf8', + ) + const initialState: InitialState = JSON.parse(data) const updatedTime = new Date(initialState.timestamp) const globalState = new GlobalState({ id: '0', diff --git a/yarn.lock b/yarn.lock index 07b6cf9..8097b4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1432,7 +1432,7 @@ destroy@1.2.0: resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -dotenv@^16.0.3, dotenv@^16.3.1: +dotenv@^16.0.3, dotenv@^16.3.1, dotenv@^16.4.5: version "16.4.5" resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz" integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==