From 5311ed7f68ae52c7b244acef2a0e2ac2930ed7c9 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 14 Nov 2018 10:30:52 -0800 Subject: [PATCH] fix: catch up to sol_deserialize() signature change --- web3.js/examples/bpf-c-noop/src/noop.c | 6 ++++-- web3.js/test/fixtures/noop/noop.o | Bin 1800 -> 2144 bytes 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web3.js/examples/bpf-c-noop/src/noop.c b/web3.js/examples/bpf-c-noop/src/noop.c index 5d51182a48..3ea4a20e3a 100644 --- a/web3.js/examples/bpf-c-noop/src/noop.c +++ b/web3.js/examples/bpf-c-noop/src/noop.c @@ -10,12 +10,14 @@ extern bool entrypoint(const uint8_t *input) { uint64_t ka_len; const uint8_t *data; uint64_t data_len; + SolClusterInfo info; sol_log("Hello World"); - if (!sol_deserialize(input, ka, SOL_ARRAY_SIZE(ka), &ka_len, &data, &data_len)) { + if (!sol_deserialize(input, ka, SOL_ARRAY_SIZE(ka), &ka_len, &data, &data_len, &info)) { return false; } - sol_log_params(ka_len, ka, data, data_len); + sol_log_64(info.tick_height, 0, 0, 0, 0); + sol_log_params(ka, ka_len, data, data_len); return true; } diff --git a/web3.js/test/fixtures/noop/noop.o b/web3.js/test/fixtures/noop/noop.o index 3fe091225e806ae0e2098620af4b0e6f405ed37a..8645eb135d2c1b8791f1c742178b831c50bef662 100644 GIT binary patch literal 2144 zcmbtVO-NKx6h2PrOuw37=zuU0kpvBnsY$gMj6%po1Q7&bBMw$P9UULoGIw@<9lathyfF8>=R4<~dw%Yn_x9f4{Zw5Y*r_vdh#TvfhVFk09Uf0sqJ z^P_94%qN%B?$!_STM*e@5RCDB8nL7W@d=erD%J~HT`cdz?A=$Xli9aqZnFcoD0z)) z9@C0ZcAevjUabi(Y%|7GL>$SaVB?J7WQ*WoaU}0WZ|A4c4<3bm+uF$?x<#%35q@IL z-~9OT|J3;1iq?Ng@}RoVd1K9IaK^e?9(oUso5!<{Tl?zcmZWZWPmb$ zk6VE+hK8`h?V|}dea@zJ;pG&NUBl|oe zcGjOX`lHC&U(ihP{gpc5nwZZ-;ut6gK_&O3QVrCB&FWsX|_) zU_#%K@qzNI9{))Bb&tQR{HEvsjq(o}YtvKZ*J>269wbEr??ra(clSH&K| zZu2qJ+pQYI8zOgM1eK9eSfWD;`GQ)>R{;xf%y9+xd#z-TMSXV*o_{UxE=zy=#O?Wf zvaZN8z_#by`m1W*tDhF57{BZHWL8-csdcu$N%?n(bbgo027US@yO|4qNL#XIMg5V+0gOWaNNGoYxn?BGb2b)8| zYY$#}^JIGS_PjlB{tF&^>`@SFZ*gX4rcG9Yhb+8&JKxOC%znGs_m68&a-Ih|Jop1= zma+gJX3pkSJFP+ zr~9UJqJ7o#tRL-%Y%}0{ko7sfg=BzJ)x#WcUrmoMMz+au9~nUPR~@JAZ+7jM)nf*J zTkOQKRFr}a@ZUxbdBpd|&T}x3`>d|l!XGLj_(J%vPW)5hzd8IP;lGfGBjcf+W3Ur{ zSNOo;FC$-cgOQuHyj?W*^LzqNcZLSFLtlvu9GB!9Sc`3{sqYN=$zG9tsD0$v%hI>{ zPaGSBITGDTVYx1$~Kff?Vr}rxQ(B4MJ>M~>jMeY JKDEByx4%?gy;=YO