From 5712418fae07794bb41c954cfe699ccfab08405f Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Mon, 10 Jun 2024 19:07:37 +0530 Subject: [PATCH] Regenerate sushiswap-v3 watcher --- packages/v3-watcher/.gitignore | 2 ++ packages/v3-watcher/README.md | 2 +- packages/v3-watcher/environments/local.toml | 7 +++++-- packages/v3-watcher/package.json | 12 ++++++------ packages/v3-watcher/src/resolvers.ts | 2 ++ .../subgraph-build/Factory/Factory.wasm | Bin 228235 -> 228196 bytes .../NonfungiblePositionManager.wasm | Bin 232581 -> 232579 bytes .../subgraph-build/templates/Pool/Pool.wasm | Bin 326224 -> 326222 bytes 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/v3-watcher/.gitignore b/packages/v3-watcher/.gitignore index 0b4cc3f..549d70b 100644 --- a/packages/v3-watcher/.gitignore +++ b/packages/v3-watcher/.gitignore @@ -4,3 +4,5 @@ out/ .vscode .idea + +gql-logs/ diff --git a/packages/v3-watcher/README.md b/packages/v3-watcher/README.md index 6a71b43..9f74a88 100644 --- a/packages/v3-watcher/README.md +++ b/packages/v3-watcher/README.md @@ -2,7 +2,7 @@ ## Source -* Subgraph: sushiswap-subgraphs [v0.1.1-watcher-0.1.0](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher-0.1.0) +* Subgraph: [sushiswap-subgraphs v0.1.1-watcher-0.1.0](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher-0.1.0) ## Setup diff --git a/packages/v3-watcher/environments/local.toml b/packages/v3-watcher/environments/local.toml index bab02fc..138f854 100644 --- a/packages/v3-watcher/environments/local.toml +++ b/packages/v3-watcher/environments/local.toml @@ -70,10 +70,10 @@ ] # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client) - rpcClient = true + rpcClient = false # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint - isFEVM = true + isFEVM = false # Boolean flag to filter event logs by contracts filterLogsByAddresses = true @@ -93,6 +93,9 @@ subgraphEventsOrder = true blockDelayInMilliSecs = 2000 + # Number of blocks by which block processing lags behind head + blockProcessingOffset = 16 + # Boolean to switch between modes of processing events when starting the server. # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them. # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head). diff --git a/packages/v3-watcher/package.json b/packages/v3-watcher/package.json index fd464b1..18dda85 100644 --- a/packages/v3-watcher/package.json +++ b/packages/v3-watcher/package.json @@ -29,7 +29,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/cerc-io/watcher-ts.git" + "url": "https://github.com/cerc-io/watcher-ts.git" }, "author": "", "license": "AGPL-3.0", @@ -39,11 +39,11 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.3.19", - "@cerc-io/cli": "^0.2.94", - "@cerc-io/ipld-eth-client": "^0.2.94", - "@cerc-io/solidity-mapper": "^0.2.94", - "@cerc-io/util": "^0.2.94", - "@cerc-io/graph-node": "^0.2.94", + "@cerc-io/cli": "^0.2.97", + "@cerc-io/ipld-eth-client": "^0.2.97", + "@cerc-io/solidity-mapper": "^0.2.97", + "@cerc-io/util": "^0.2.97", + "@cerc-io/graph-node": "^0.2.97", "@ethersproject/providers": "^5.4.4", "debug": "^4.3.1", "decimal.js": "^10.3.1", diff --git a/packages/v3-watcher/src/resolvers.ts b/packages/v3-watcher/src/resolvers.ts index 0b13ec1..5af43d8 100644 --- a/packages/v3-watcher/src/resolvers.ts +++ b/packages/v3-watcher/src/resolvers.ts @@ -89,6 +89,8 @@ const executeAndRecordMetrics = async ( apiKey: expressContext.req.header('x-api-key'), origin: expressContext.req.headers.origin }); + + throw error; } finally { endTimer(); } diff --git a/packages/v3-watcher/subgraph-build/Factory/Factory.wasm b/packages/v3-watcher/subgraph-build/Factory/Factory.wasm index 88049417246186039f2dd376f47569e17f36db0b..ae80ef127274281d2b904f06286cf9bd3dcbcb51 100644 GIT binary patch delta 4062 zcmZWr4Nz3q6@KR|DDN#01VIpx)g(sZUl6sSlE@3G=^)ma8WROg43kFFCe@5dle7&> zN~b#$+7d}Uj6nm2M3fC;QQiUzEJ)&tC@Z33Tnt3op@zUVVQA;!y=;| znT=)(mQ|gIYiRiV$B6!YWfR^k0cnFV4_NoZi;F=rtN)c&g{qP{q|jng;l(+q`uD*+ zlvH?aZAhV77-~TkcB$5~U4u`BT0a1uc?Rd=&R4X7n6rD7{`}3a>l@ zs_VL>o(46vY~4_N*|PD~P+e9uzC^Jf1&g$tbt}qR#}lBk;nKJ#8i)34hXAGkxTqc> z4}FysVS-IiO5043C%dY^0#T2uW36!;nE)(WOTK`2BtP`-WShYD?Jm>+%56U?Tm-@ z=&Pal1lT0kAJWMq0kTF3uo`5a;T+QyrX~imtxSYG&hfqg7u`$*jUG;9y~dNu9PHqxX87iq;QxE9R)!FW%j5%&b*!VkUHeOB>9DIouMB4>Kq(P3N`T=9O75gwc~L;W~4(vLGDzAl9gG6^9(O@DUh< zdd-{-U!iPm2G#dIsDtFmgPEM7np#&uyzDdlUk3a%bOy|t=`ncDr1)AuttfX~JYMrlb-vBu#rLs-;-qg7?x)CmL>b6ZFb0fO6Q+Z&UDi3w&EQiRI zNcqDMt`!x);>GCeq-*;iRlBkqz6pU!?JPme6goqE*^b?Cw-&yiOI560`ucVw_r`;; zBNR%tZaegH|7&~e;LWMB>m={=kDzu_+6W|R8I2G&3oG5!)DKzohkjVfN95>-V|>pq zU4U^M>ZZ*X`J`Ohic63Z!g_gEpxwln_yr^*W5zH{2uvM;Hj`Z1qwCiT{d_HV6!LC6 zTXkpn7+jUPp}zVSazf13GoY5nsTWa=rr}jEM|x+%g`crFuNUmhs%#Qa6I}v0&Wi(YWQ7O~0qB&*)QU-yJQ_ui)*DcWLXE;nfHn z>Z7!5ypIdrn2qA;(Y8K{_eRT}e!bBa-0DZIegoRV`HV9PFh7z{aL-P>haZHNo#^Cc zufKx-K(K3DUd8)OA-f$gtd+cuyOF+b!~`wlxA@75(0oaq+(&n5xFNb{KbRp&QpW@e z|9<*S!2f}64=}C+Ns@ACS|dJ0Ne-MQ+bcP^KvEsF+<~(duP|9-w34bLmk@wR2pTIqbkh#VgEAmZ_p%2QHXaaX^=K3gm2V z3U9*HnPY~#7dH_-7R?QFu>hzBIK$8ZeH_Kcbz@I7=@1Shvfmycttu zr!ZN}O|E8KruYrhc91%nF?D*H^t6;FEs-9SROdl`p_?*W@NP z-fO{yiq|klYbe5r%ffk=6^DY1aHl9qn4+XZwAP9D&`+E=KRk^y9M)-WI_$)B#c!Cl zTB>#8;#k3`H5iQdiQ}=*gcFmajBD~6VH-W&ipylDo!R+fZ+lwtDY@bkHY>!rebla687#6|p3~2FANYo-iJdb6<$gP)m;Jy5)4S4L2%d!erga zBb3pO?=C4hstcDh-V)|>41AX5I{FmejUcj~oBZv#ImZ5XUB|)5f0~(R+tY^k(z`Bv zVQEi;E;_(?OEhca4@Lcgn8`&R1MGVt`-lg<7bk0D)nMQ3r z7#X{WJFQ9g*D&4|UPzZu@S-shKw?cZ?~&6MATFDl*^wkz0fAx{^+ z6YY1hT_UNrRxrOIs(gj4pWzHza1y7}yjsi+YtsqkH1;VLDHZMd`kHpJ-a_;l{!($e zbdK9a`%bcx7r&tNbm-234&nTh;_YO60cY-{MQ)ramz>b;a$4ucMEa>4lc&8ZEti(^ zRf!N6HF<*ey76tr-=*8OPlcT#lE%~KQ@C0#`HUmHopL&Q3QJ}CNjCGvQ<&4uzYQgB zHu*5h>2Nm|$bQ4LQQT?Vu8f`1$&;sOq82m6#Y~sGb>BcYeQ_FdqV1>I&SgQyY;io9 z^zLcCpqG0vBHAy4EN|-pbAbrvi(ufQ7As@y6x*Hbp_@IT-S{5}{Y9I1h94oXFr9oF zXXu49ctoz~4Te+Bim)(wBcr{v*t9@eQb!mSOMuSes-zavj&m4aSb2%XW*Yt^U95|JC^#OTM2cXDsxySs$4;0j zsn!87PYbRTM^RMr1CCNqN#nTqW3c8^x274H4jtmt5iJQ252eEKt0q0;fu9KgYhe$j^>IX%${D=RCqJ z@x85sgcNliSKtjVtvQc#3M&Q;^0DBgD>&&7PDXel2g~AW{KB>vdTjS!)vGN2!q9pz zIH~5z_wJ)hID%4)g=)o+zPO9=&WP$Y0yh`~+bJG4CSAcve{fR#r7rTGfz<|j83Su? x1Shs@U=AJN+PUuPYhW=)2dfbqy2OKR)x|8h$~(J8f9}T=^k38J`f>2%{{#1)$L|0D delta 4021 zcmZuz4OCQh7Jv8hA@2I&1%~{PnjmSR1!$@MR1{Q_p2cCjTuEOP(+JPt%()y4+kh zqqev!8RaTSn4gU%GnQ{Zl2W_x-0g^ts`CE8yoHV`n1qrFFD{ELR*R#|5h|=xomKGU zbdXHy_tK&$RWd~u3;mPhQ2jX_L-g_&x*v#gZUfa>-qt-4%WUOWyKBH%yX*WvO=x+) z_Kiy$Bfwuivi}+AD7W;_Py!!=S(?RpedV71(crJ`?Dr>P**47%5DhRuH3)@h+fK0& zP@ptz2Qwtxqh6BAM}Ct;&mzRorU;m=3>b!>ZumR`-bLFEZ9^oy4bVf0(QqH9*B*|B zHBsQyj+$VE2;Lg22cH@T1vEDvVsJZLkGwk$%9(Umyddq+-i;T*{FIxZ2iuqcF(9ID z8mTYn?L^qf4yj475zDHztx1pt;H3Idu$qg=NQTvD`+$m*p@8AJWYFkx3cGgDT`7=3 zbty2L!}q6fI?FCvlFGCu+L;Q4v?`5h0ot3&w25gj0S)lDhN*xUaa?gi) zdwN4mZOdp_0yHdN!0Q#hovj;@;V7VXt6Tn45R&9D!J?G{bgFKDmj!Q(M#)9C9v;1UdIfjeOwpSbqp zT$aj!25Qq~No~OLoXry`|8D4K+uidZ7I?o)RXC4j`)S&I=!PCmSpfe*#aR#Pz`LM! zN3csanHPaeu{G$rFG4!)$3^f+gktl6YAXTte@Om9n5wKAV*$uKScf!kA(W1g%MR--H?^LJ;HhC#%y-%KAs*23XX5!dEIUm(3-Bhca>W7^w}D+I%f?Q#dGK0ejab+KGr{v9`^XtAMs0sfVOHqPKk(gyWyg? z=_TBZX{jJdQUbq^N>4~@rAMSS(zCpJM$3Bzop(e}lhncYfHGdeF?@rYph!~fRn%99 z%M*tL&XCl~ZH9guG#t8(mj%D-N7z*N@@kmn*_&9+3(@_ zMAat@Tx3v4u^IZ(jgud&d|y|43>h$FAIob+t>dDe;w;ZdIg&bLFiNX`m66MRV2em$ zuco#8xm`Yixu!09V?X99)(>=8@d35$$6IBefxBo#J>I5Rck131J85w}j+H$I_R{n9 zm?Z}VZm0PTI8OEn z9IEH(2D~}Z`k@XhSmueAO$)V*+SoVIXBfMFX;dJW7JKmKIBtq(x1Pegn~ZZff%2^jKy&_UI}%9rR$H95mn{ea~TJha+swZN!;!P{1Ow(Pta+0onHv!%ES_ zwni+=5AJ0sj*;aUGZ#II-=5|ChadAST@EOG7&T1H;KN{fgVd^0nS;1W4(!w8^wAwnxaHQN zT0KmuYgm})R{k=Kg9)N%9v9H}f5wTo1cgFulVx%QJBSZ-UV;9ac^$(${6y#2KcSU} zaFXm3c&X^r>xXc`l*&4Wq5&)ug^T#ioE$G3Nx`pXf_r45HMNeLLrK886|`ID-moI8qrhbfx$dE{3AFnd#?x2LxKQ>T)Pr=J~Ts;Kf&E&rycFQ!l-K9LwauF@{Cr@*Lm7pM%HCko)ANS6gt6 z>^QDNH+|KDPbifwI@#Vr!994Jendltvh)P)*~`kac0QuO31%)8VNE{#jqLD+eidK8#kHcM@x4Ut8Eb7&7}Aa>*5bn%#;^mjngQ z;9+L@tCMJL*9jFYuMviioFI?_+t*z3Fj%a`~rB z9Wn@|r>U$B)0E27dN})O+Si6t#sviC0{d9XVh)hsm)OtXm3Gh%ZI~l_I+(|8@zQKR z-?>2nxrc-FgdgWF@|@A5cv;GQ96{VT{10Tn(Dw=bzYTqaq*^+`6nBZSnP2gk`J3*f zpdV)xcd!jnmed|zK&+$=2pKP_Z=D5`Vh+(cxGJeGRwVKw^b9xn*$_9zU}mu7@K;!e z!pqVHrg&kDG(3gU#!46?sm`ukFpUhmifcnWTto*GLhjao7>f#Ci1J+2+K%_5^&E{q zh4{;l&^?U>W~Tf5!EP%N0qhSpi&{hpJ9tdU{FVXLbiGLOFfZaSHRXx|=4R z#&N~IZbRQ2UR((;O3oXmw|F6klW`7*z-F--ei)a0uIF~K4CQDJFFJVflQv%wif|~F z#j3AIcfP`MxJ9*I&<)irLs4Df#g*`)P?8?wWY){6$AI=pc6BC1QTyW=95 ge|qR=*}zq)1I&W+yt7_ FUjUuO4x#`6 diff --git a/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm b/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm index 46a279ce156725cdd8e51005694155e241c0e2c5..9687a2e48757ab577f88c1d0fc9038331cc90b0c 100644 GIT binary patch delta 56 zcmcccMflto;f5B*7N#xC?GG8ZZ0~r;Je5gIl#zjffe(mt84?*X8S;QIm7%2F^a=BJ J(&!;7%~}h7*ZLM8S;UwymsR! M%-fBhut