From 6c7e28696731e80d86abba1ff1ea59554acd9560 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Thu, 8 Feb 2018 21:07:13 +0100 Subject: [PATCH 1/2] update wasm binaries --- .../release/polkadot_runtime.compact.wasm | Bin 77991 -> 77991 bytes .../release/polkadot_runtime.wasm | Bin 78040 -> 78040 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm index 5418e0432c20b6e36fc79ff8ab4f65e793bcc78b..4f3bdfc57d502916d6b2c4bf1dfeac3f3fae2273 100644 GIT binary patch delta 1767 zcmZ`(du&rx7(d^+t-ae_y9*hm(AT-$tAmQe1fomOT{LlzvUMAe2}Ux#!k~s*72|*ig2v4EF5Hu)-OhS}|EheV%xflowg8JRwtX>KDY>@VueIVB;6VQB_h8a=gia~Xm`iM@Iq;d^k*Wk_jFN1ct;Rh-X zdsK^DBhTY|7M}b6x=+A7KCLlGV~Vz}u^wn#;X_OEY^o8hZqL_A_^;1@@9B5S(}|?s zGGLoGE%h02+{=GkJdDBG(2|)JTP&aw*{Y@tnqn6R>Hh$D&19`mGCPo zgEW=)pmH^zGvMMCE0c7@i0NpT#(MVPO@ePKLreg!%De5qQ)hbMsATVH4BaX}UL^hD6|Ue7WL75v`zlcP+6!6X<=f;xgsf?UPF z-q8(}THQ`JmcduOa{#Nz+r=zU$7e+gP*@y&5ujQ-5xZ-~59yQM?*tkoeA&S#QQ3QN za}MouYXzV7iBQcip4?|2Ne@t&Iyy=9Kmczz#5+$-5f;eRTI^JtphrA%_9@7J;Lc`dZ@7na zdK|4uENf=kI?)JTkufK|(f&f1MR&32AB8ZL##wZ75tPwk7Huek=`&)A)M{)ZCwXtf(AnNLwC{G7UtG%IQcM=Iv2KPpL8H5 zd`=*9K^UHxmISd(A|{F~xgmfKsEYw&RQ6-W8AUoFT6IWcAS@UX-`jSxCi>&_x$k-2 z_c`x*&gnTZr8_aD8@UCN5saXxhP)inkYg}F4u1eqc%EONm!U!3Cro71m{onz_`8|T zlyh(89u2Nm9zakxEU2U!4!X9R3u0EqAX%BkNr_ydfkE=9X3s{j{KNQU$}Gw_2`Gku zY{pE5F zH6kjzY)Ke3Ct)H5(`J5qT>^{Msr5^;@@C2vA{mwVA|;+Bt>mo5ju!83G4XXR4)CbE zTkZygif+Lo$$vrxC___1v6_;xB z)GNPUE3`_40V8+^v>%5xD z!G}ULMR2wXgIV?i{H94ZY(w4Gg4JE!U8oeXiB(ER2kYD9?+W@``r5m@f-Kn9y*cz< zIhg6VEp*ZaMKoax&2vCi;}M3^5+NlS(x>O7qfE^6_=9b%tGkc2_HOof5WJLVH&&Eo zR9u{^NU+c$2fhFid+1XKFg9uzO)<=NW@LXgmmRZ*{&Ilpi2+&6(yR&gv=V$TQ$gz{ ZKT*Qzprf@#d%DvO;!e-xRKh!1e*@*o+KvDK diff --git a/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm index 98dabfb1bbd67a4ab372327b6b328f9d46d2355a..735533a89742f7416fa67be5b74b862d3e84dfb7 100644 GIT binary patch delta 1806 zcmZ`(Yitx%6u#%qE}eF|?a<(+u&+DY(r)Wo9tns|Bprycl`Xs5LLnl?S}Sxd3uRG* z;nCD$02LdrWY$Q`f?y;Ovtfc%in8*CNLURaRf&}N$ZC94LQRACIJ2{@HPIh;zB#Y& zoO{lh8N6W`ykSZH46>DqVo`x)0~?41P$2R@;agbBzoF-#S$|i!l24C2^y`xrTJ}D<>C0?fiq8!o#^{c@3k0s=#%%!GD zL=_`m2YSjOo^Gfzvi#m4gMqe1)IdHtV22R*1w4kbA)pBMTMpU7ihZ=7dPM_M)Jx^C z-W|LR_FM|o4hdetux140-n*oQ|64B z;#M<0VfBI>R3@`x^*oI*q9zqH_B{0xBQ{Mj@?f)P%6}R3Yt7$LaoDZq$w7HBzu5Be z|CjgyEaoeg2WVW;4=!(l@-e=Qpk#|25)@3Rnq=xrWd*A{awFxT*_aiSFnq zp|FJ4JasbP%(wtHafsH_VK?vUXyLDS7M29Po{)_&kDAF|Fl;0Ik2L|B$$C&Zz@t~3 zeB+ul9nESKiMiE&h^SaaZcuIt#SRGHivLB0kppWH26Ms@GN8v^7QGkH{Lwv-FAK1{FUkbF5 z@ZAUQL*?ZIy@fR4(w81ih!Ehv9ouUk&9+yWmg}>+-;c8o^Fsqug%&xWUl`~VjEH+r z%!jf&PGkIXqj}WP>0_drbY&M~kDJF+%Q4ZfsZB-^(UU%aMy{P=DDN`I51BCVWKRcSO=gN7&J>>JQ8l75s^}Xz`#rF9jP>f3v z28`e?7!Qj)OS%qJ*eYzHb+k?n;5^^14l9;ihrCv^R)JYIGi$EaB~o#=J?f8sUHJZn z{m4}~TfR(;ZD_51wxhF_sHYuLX{d;hYC_0N#Jdpp;j!T%_?1be1hq9Nj9K5ocbc`{ za!6uqW2`p1Hi}H$PVKEqm`#&T?JGY_rD>;jvl42W?l_U7m=Na#jw9n7371q<-x^!Z zqH8y>_O7Q}JMpLEl1kH552V|z?ePI)d)!iK9rF7ocwZX#PPw&f zKJahNxTQSf*0FW%1pg|g(7wKvsG~Wdv%L*3;lV4R+vBZ9bGCb=(seQ+l}INe+7a9F z2zZE^KZ#_t-b?R-knE>}Pq8^RbenULudVtVl1f(NhW)k-R%>gfGd H@J8O>IXA_+ delta 1810 zcmZ`(e{54#6u#%amcH$++hdtcx32B&+piAG6b*z-LwKM`H>&G4WK%?)bF$5`F*-yI zLo&fk5NNz=Yl5aML?uC8cp(fKFh>wVVytn-CWpz7cixR%F~qJIhJOIr3}!G=F*jQhvqcfI`JeDLtm9Yd1!&NY3KLm0?$9O|tTt-r z^EC^dE#psB?m~EB(SCet!9|r+$5WnuTS45Rin4>*-IOTBI*4+O=JRd@`#&DPLYZBS zl1^3ZRBRY2*YIdfrJm*Y8X0snuc12fg+2?^aJSE?Z`Sx+f+g&foh;8yN2ns|I7SsJ z*J?ZKu7f3=0(awrBIw?PfZB(eN;Iv0Inbbkf8Vgd5_6;^28~z<1_g~uuI%LxH5M$L zbA^p5e#EGN>~$?kM<81v5jVN0F{Yy-_vt=rg&1zz?nlQ<0czvr2n;U3d0X5pO)@y?P5sz%_1!&Z4 z9r+X*dDUa%S*eVxU^|CyFAXZZw__cDr7I`jt2q5;!kp@0@__Yb!vEOhql3u^D%bH1 zo2F?vX}KikP)DFs4SUq|M{?jN1f_@}jsecdc=ylLmTW)nwBv_ysEO2sfIcB!?Ze*d zfQ4QPlx89PxcwR33hY=-5l-w38^F)~yDRLoWiBEyk-;)*Kp@K~VWJv?PA1B0wHJ4n z1KgvXdiEs>K3@Oaq%#$7(BpHML5~-iL6tl4A$H1ZdEK4>63*>;gu-3iz3<(00wI+^ zNF@-|Sxg{c_+R@5;BIYTza6XNkpqXZxI2T)1Z()Cp;9#Vh8_T@)4mH|Gvdz`f9*5D z;3v{??wa&!cU(R|`I({R=>K(SR}LLxTK_u{5$d>O2|A!JvaijJCs7d z*+f?|D=X?}g#)WdgPF)HCAmqi(|#K15_FXZM^`|}L8ecJjM?<1&X&!YYBcFlM_qjE zbTcL|JhNS|@#V8_z^0xZV`#+39>+c2G=9jEE+p&Uh49>Sh0vtA&;6ov?dNZToXj-Z z(8NMvL28!x$xlyXE4IaU8MKclJpi@GuAI=-H*6}_CcZohIEZ}Us@|?QuD+eTTbjOo z3v1Du-}mKezfE1XaMP3>31w5SFRpbN(!EfOeluVz1ZL=G#&jzhrM%REr#*P!h7LyREjvIDz&SN^=)bC4z#rPb@X%xSfIUUYbd)MY&7Z&ec^#Z zI^ztjDu=3ugAAo*LW(n_kIzewF)7#E5@=`LJ$ Date: Thu, 8 Feb 2018 22:36:24 +0100 Subject: [PATCH 2/2] fix runtime_test --- .../release/polkadot_runtime.compact.wasm | Bin 77991 -> 77991 bytes .../release/polkadot_runtime.wasm | Bin 78040 -> 78040 bytes .../substrate/executor/src/wasm_executor.rs | 11 +++ substrate/substrate/executor/wasm/src/lib.rs | 81 +++++++--------- .../release/runtime_test.compact.wasm | Bin 13991 -> 14152 bytes .../release/runtime_test.wasm | Bin 14116 -> 14248 bytes substrate/substrate/runtime-io/with_std.rs | 29 +++--- substrate/substrate/runtime-io/without_std.rs | 89 ++++++++++++------ 8 files changed, 119 insertions(+), 91 deletions(-) diff --git a/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/substrate/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm index 4f3bdfc57d502916d6b2c4bf1dfeac3f3fae2273..928c72939d1c2d74c34cb180a24421358565776a 100644 GIT binary patch delta 555 zcmZ4fkY)KpmJQDs#aWp+cp-p;kBgg^k(ZH!i-VDC@?S>3dS~I(iqz!NlGON;qQt!7 z#N?99{5%F1zO>A|#GK6H)cB;F{N!u~SN<{}HzlzozbHOAzcjCe!Ho+pQq17aomg6u zkzbTql9^h};K7|zT2dKblwVwuTEyVV$ z&8L{^9T7Pen^9vfptCLP+$S+`ojsNfx4c6_#j;kTtEg;mq<5A*Jg|EeTiz=agLHoY2>^9V_JeiX_6G=W);zXWY4eGfcf}@O zd+}-OQpWe1vJw-77#J)W7#J=9X)z$Z0*Kjwn89&^>U13~Mmt8;>F?DUrDR{Ia&sgI z!z4cdc@99HG+616>Fcx@H8tj_aSIp#1-XENK#GA8EV)6Ao2$4eSwFELQ?IC)!SR6F b^#59n@>~zpxY<+`@)C1Xw=dLYWMc&Y+P$I{ delta 522 zcmZ4fkY)KpmJQDs#d#rsm5GCckBgg^k(ZH!i;;_C@?S>3dI#auiqz!NlGON;qQt!7 z#N?99{5%FnzO>A|#GK6H)cB;F{N!u~C;l=ZHzlzozbHOAzcjCe!I=v#Qq17Oomg6u zkzbTql9^h};L4p+T2dKblwVwuTEyVS$ z&8L{^9T;0SdpX~7+QnUHWx_yj{9-Aj`h-75+ocwm< z5|uA1W=tQL6qp?u&6wUW18H_MrY|5q$c7If0if=!o4~qnZVC|ItkP;A#u&OeboO2r zrXQ-CMHW=D0=a!lHJCwM#baBQCU5@#Y4f!gcg40YWqhxx#PLChfq{(y2!KX$b6f!O zq`|xvRc;kV5NrBJNk&DD6{_3<2Y`}XKoMae21_{}Q03+-E=txA|#GK6H)cB;F{N!u~H~umpHzlzozbHOAzcjCe!JP{(Qq17Nomg6u zkzbTql9^h};K`j*T2dKblwVwuTEyVR$H!qGk|g%5`fci`Q8uCXRZ> z%^#S$92kFWu6DlVxOv|q12M+%&F^>YWnucFvU%O!N>(6O5Pn_n|HTOWny%k9N3wt@

&X#%SPha;mI(;7A)&2Gjt1;qaWl-K|g_@FxZTBj1z z9JR^6I!`c$PCncf2iEm~LxBaP>klW82I_hO;)8TGZ~+-WU9R0AU7Itz_c1a$ZPw_G zWMp)n+|;)Otos9#0y9YW8)hI4)cpm-2kHI*5&-J<>Idu2>kkm#9Cd81(&nEp?}|-k zfB9+aHOBXvvJw-77#J)W7#J=9X)z$Z0*Kjwn89&^>hxGGMmt8;=?WT*QnD{pxj7Pq zVUiz!JO?088m#ok^!r+jni_M|xCIP=f?PmBAjQB4mfWDm%~f2Kte;qrsaI6Y;CMi7 ax`8&MJl6v?ZZ;K#yu{qp?U%F}*;oOPv!e6> delta 519 zcmccdkmbfhmJQDt#d#rsm5GCckBgg^k(ZH!i;;_C@;}DndPm{Ziqz!NlGON;qQt!7 z#N?99{5%FHzO>A|#GK6H)cB;F{N!u~XZ|uEHzlzozbHOAzcjCe!G#MhQq17Womg6u zkzbTql9^h};KrR&T2dKblwVwuTEyVa$H!qGk|k%5`fci`Q8uCXRZ> z%^#S$92i?RS3BQw-28DxDkEd~=I~WhnHW7Lzg?5a^hITIz*=$c7F9E*4QvV=j(=1p z7p+xdTA@05+S(J0;gjRn#evl9Uk6dsz@@+fQuA;fNX=%}_4^nZJvSfO5Xs2sHCb-c z5|uA1W=tQL6qp?u&6wUW18H_MrY|5q$c7If0if<@o4~rcHU|iA4sA6MV+`BeHhV7% z(+}0nt_vzzf!zH|HJCx%pkrH=CO`TAX*2uFyJB0fF}~N7<@g}Pz`(`;1VE#>IW7Qs z(qLYTD!0n?T4_cVEe6LGs@wtxfHGV_8DSu11gkip%FR_=l&qgvkf~Qx%;0!Ib^1ze zMtPkNs@!ZU3VDgSsSJ)kRJkPtfLbhpIs$;S7?558#1I=Ns7;U6Vzgsao35zMD7F2H IHX{ow0Ik!WOaK4? diff --git a/substrate/substrate/executor/src/wasm_executor.rs b/substrate/substrate/executor/src/wasm_executor.rs index 60f437081a..85c1e0e61b 100644 --- a/substrate/substrate/executor/src/wasm_executor.rs +++ b/substrate/substrate/executor/src/wasm_executor.rs @@ -423,6 +423,17 @@ mod tests { let mut calldata = vec![]; calldata.extend_from_slice(key.public().as_ref()); calldata.extend_from_slice(sig.as_ref()); + + assert_eq!( + WasmExecutor.call(&mut ext, &test_code[..], "test_ed25519_verify", &calldata).unwrap(), + vec![1] + ); + + let other_sig = key.sign(b"all is not ok!"); + let mut calldata = vec![]; + calldata.extend_from_slice(key.public().as_ref()); + calldata.extend_from_slice(other_sig.as_ref()); + assert_eq!( WasmExecutor.call(&mut ext, &test_code[..], "test_ed25519_verify", &calldata).unwrap(), vec![0] diff --git a/substrate/substrate/executor/wasm/src/lib.rs b/substrate/substrate/executor/wasm/src/lib.rs index 2002d3cefc..11401a39d7 100644 --- a/substrate/substrate/executor/wasm/src/lib.rs +++ b/substrate/substrate/executor/wasm/src/lib.rs @@ -13,57 +13,42 @@ use runtime_io::{ twox_128, twox_256, ed25519_verify, enumerated_trie_root }; -fn test_blake2_256(input: &[u8]) -> Vec { - blake2_256(&input).to_vec() -} +impl_stubs!( + test_data_in NO_DECODE => |input| { + print("set_storage"); + set_storage(b"input", input); -fn test_twox_256(input: &[u8]) -> Vec { - twox_256(&input).to_vec() -} + print("storage"); + let foo = storage(b"foo"); -fn test_twox_128(input: &[u8]) -> Vec { - twox_128(&input).to_vec() -} + print("set_storage"); + set_storage(b"baz", &foo); -fn test_ed25519_verify(input: &[u8]) -> Vec { - let sig = &input[0..64]; - let pubkey = &input[64..96]; - let msg = b"all ok!"; - [ed25519_verify(sig, &msg[..], pubkey) as u8].to_vec() -} + print("finished!"); + b"all ok!".to_vec() + }, + test_empty_return NO_DECODE => |_| Vec::new(), + test_panic NO_DECODE => |_| panic!("test panic"), + test_conditional_panic NO_DECODE => |input: &[u8]| { + if input.len() > 0 { + panic!("test panic") + } + input.to_vec() + }, + test_blake2_256 NO_DECODE => |input| blake2_256(input).to_vec(), + test_twox_256 NO_DECODE => |input| twox_256(input).to_vec(), + test_twox_128 NO_DECODE => |input| twox_128(input).to_vec(), + test_ed25519_verify NO_DECODE => |input: &[u8]| { + let mut pubkey = [0; 32]; + let mut sig = [0; 64]; -fn test_enumerated_trie_root(_input: &[u8]) -> Vec { - enumerated_trie_root(&[&b"zero"[..], &b"one"[..], &b"two"[..]]).to_vec() -} + pubkey.copy_from_slice(&input[0..32]); + sig.copy_from_slice(&input[32..96]); -fn test_data_in(input: &[u8]) -> Vec { - print("set_storage"); - set_storage(b"input", &input); - - print("storage"); - let foo = storage(b"foo"); - - print("set_storage"); - set_storage(b"baz", &foo); - - print("finished!"); - b"all ok!".to_vec() -} - -fn test_empty_return(_input: &[u8]) -> Vec { - Vec::new() -} - -fn test_panic(_input: &[u8]) -> Vec { - panic!("test panic"); -} - -fn test_conditional_panic(input: &[u8]) -> Vec { - if input.len() > 0 { - panic!("test panic"); + let msg = b"all ok!"; + [ed25519_verify(&sig, &msg[..], &pubkey) as u8].to_vec() + }, + test_enumerated_trie_root NO_DECODE => |_| { + enumerated_trie_root(&[&b"zero"[..], &b"one"[..], &b"two"[..]]).to_vec() } - input.to_vec() -} - -impl_stubs!(test_data_in, test_empty_return, test_panic, test_conditional_panic, - test_blake2_256, test_twox_256, test_twox_128, test_ed25519_verify, test_enumerated_trie_root); +); diff --git a/substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm b/substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm index 2b8e909b3e4b2e6608e409e5a5b1cf6d86e1fa33..6296f219c64cbef48b5a3a7428b3847c0eccfa23 100644 GIT binary patch delta 2749 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 V20wZ*%fN>RvzF4GR(~Iv{2!QdG`9c% diff --git a/substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm b/substrate/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm index b3e3b8389158fdd46669b05e916da8b65b536052..0f00a9675481128e88540e2386816fa406722f2b 100644 GIT binary patch delta 2709 zcmZuyU2I%O6`q;BcfGr_n~d#^y}Ndj@y4;&ak6&Y*h$-zdXgrJ1ff+cQK3?twSArJ z+WW)qHTeN`{a_&;Q0sO=B_I#34r6eQbY|%r~)G_kw;V(;fFj?3*{jQA@R+% z*NJGaeeXBtJ9EyQIp@smO5t{K>8xPYDt+ZrOLhC9)jKbIfyz+xu?QZ&O=-Xi1Z)=I z6pzjH9h#_yU8mwsOlRE8M7BWowtAwIFS*wz%8olM(^>1-{}Bfv@La<(urU$~krOp};D@8qXS*Gb$P?aycC=898fzco{K9C9ESp+phhGBhZU96dM?dgo%#Zz*F{Ht~vrBE>8vW|O`# zX0dTeBSeWF&^?qZp}63xTiKFGD#B`5wFoYKii|O$PAQ-C39E-lUy5P+&g|2mw`Z^E zS7pk-PGFSQAIj6#VZy(v|04%&p$Mp>J$;6HQ-7M=Pleud=%>0rxlGeK)7wXP*!rGB z&(j_16aC%ZZcO}f?=3KA4G(|q@f(LvqnUBf{mL$N!7uN5h9r+a5g~5$ts*-vr2dp1Pel-DIjTP5`0nh zH*zsTJ)f8%bH;5v0of#Hn>H~DdhQ8QR8-hWaxTK4pkvIHa5TnBkO0>JTO^0?rzCe8 zQ`6EOW!HNA21-3G%4~0e=8y&1BK>FNcNX_@B~iUYgsX-r3-}4OcPv3b1W7fY=!z1=0zBT(*D(d6@0R~|<@QwO4 z@f5Q+e5&Eozij(&^Z}aklnlaK3Ol+0gyN6wr>sp&^y`-BORe`U6L?SoP5^G&x)M!W zD}K>me>=KP53KvQ^=J#DzYh@()o{+Vgsm5%o%^67+tlrV=*J#c{o=6xp!+-rgu)&IQz>-50KohF?!EJLCf7?PGLPk=~MD5*CCKWJNur~$PVQ8lKPh59`c zDg9cot8J@I^{BOW^(Iw~sJaKb{;S}NjP~egc#!tg$HSu*P3jLjej+vz(U)XM-34Ay zn{j=;^WQX~E3wD%eJ}Pse4mJ$u^S)7_nr9f4zI`1=0VYCvJo>Os+Ab(z&xfo)Ndr7 zK9Lw>F-g(l0cCrz>NNLF zW^S0%%Y!r7Lbh_nnZ}*Aj!O_%qb$xsXb>K9^|uCw?1O}m1N!}e_{&L*EWAX$OSyH! zDZ^Kda$m84C08-Poer;*w@zhBnW?OMUE=C3&&(CC5*!U4TZ3&Y-YvZCc>ll%2?B}Q zqI&PieHJkXB6;Lb$2NT2ekq+!zl=zHJa!4o;!Kg}Y(hGKYmljD_`t{Kbm7?C8KO2V zF2rX$WvWdEIp+e(9WR5-AI4Cw=75a*zjP%4jMeYeDWGki{8! z355u93fKth7Y2teE`)e%({Hh4exp6N%OSqU`w^9=pOQ{tTBhJ6#4RJjMTm<5dG(4@ zkd?XYRJL&0INk{9^iZOD56T)+VG6PVi~xyx0Covd6hbFj6+^H~oJX6h8&A&ezG|Fz zc+AemDsHCiR%FJ-@*A8-NF82Qvw)63{dY77FWs4D}|q!o1B}&%M&jbJk>aDWab_{uQSQ! delta 2589 zcmZ`*TWDOz8J?Lvd!2K3XLVh#h;zP~@Bin&GppDk%*1Zl9QikS>)w96S7noO6|quCtkjJn&*T%o)$TFjK^i#f7C# zXx6`N{mIB?M0Kfkp;nn%tXF?zqTOM(#nnTS@Y-I^j!CK(7Xzmq98v3yDxp@I)Q_pE zHmiR?dF|c3-)6K$|8rjtZCPuSgBERFOVy1q@1~^|y}H=&MZ^2vA$CLt5pr^7h@AvN z@V&+()+L{i`gY^l=(2B!^@F#D*kQmepYCZ&S$F(GuD#ZDk48W9Z^>cE$d?0pIF{mf zgF+In?)ybTztH{*an&ATFUpWw2A)(Kjt+MGhlaJM^C^6fc3#H!6L)RxAH;fi|L;3C zJd(+v*atKBJR$-3*n>!!%j_(5TXN(uY{n!-4Fbp^30wsuT*hQ2!L-jPI>bz!#Eg1i zBeyU1JVza^;>~Qy(XYgNsnkD+|C&bh5BI!8@9V$rX$SM)*okJx*kXzeF&hB^BzE^5 zy&mhfZiHd!|0*p$Kr|+~gr`84^zbL(&p$`bzQxD)d0tKt;qOT&=W- zuOZh0P{s+ofg}tpXfJtU4alXwn#4OW$hp1Xh0(^pUB^4K3^(wDBKenn8Rxo5mtgoPmqHNG_Iqs{>(JAlXQ0bp(bqgZzFLbS;Qr$2 zG~9cdT6@jd?z3K|v_psdopguO`>bE-tZ!wT{!}0Ix0=a*$^QYUfB8EqHz=dKvXST8 zP*7yE^(X0Zca}#^Ii{VTl2Z;Ut`HM~B*Jl7E3^LkcmXUr3fSvQ(;L|GftJLk>9lG5)ocG}6*IG{#WpS(K2tt(2 z{kZgG{yaL@z^#j!VxFiN_vCXKqFT8JHxyBlb6k+4rEw5C_VL}MQOVl#uu`w({cnjM&0z{CIu2LSI zNEgx*+46$KHC>#V&0iqu4i2qC9>rV3TaWh>*b4$NfBJHF%v@|Ab^mGdV-FX`RUITF z*47b(=HciFAw6Kv0F9y3l#oUsQ5(C?9KxBT%Pv~HZZz>Yw!#)FmGm zHTX2~{yeag(z1`sDpbQ@*MU$VH6VJo%fu}oU!r=YXI3vAu=MTTw&^?m$JTDb8jir# zeLs&Cur%4P0Kc65XMUbEiY80}>;xVI;y5`2^a00!TVXE;_^sVOrR)2_fi`tF_}KUF z9{H{XA6KzdEpvXhdT3?Bx)(7M^fESR6{%lmGLxH>Nf_bWGFzD7Ty)6`=Q252n$1pRbJND~Cg)8u zTax+tvT-$@pU+KV=Q>@oIZLH5wl)|2rV@ArFoq!_m{*$zmbPi4eq-}?w4?obg4>;o z0tBYiS1{YCAJjMPuMB$0;bH~K5;|3&nFY+5qa*$8167CD$#H~MKDSdW#EPck(3pR# zJq2K!duYSqClSKQI8iskTpWX-0fOkG5UOE)rY{z*g}HC1@|$7(=f2L=a)gU2^v#&o zfR1bMD%c$>&5x}_^h{s8u@>Qu8yhNJlIb$S+KlK^{oi8iV(r8JLCO~E*B%^vfwJ{R s-F4^$TWQj79QrA%Hm`*b&rx|j&SS^m#|&lx_~pT@#!aX7@h2z#2Wl)b7XSbN diff --git a/substrate/substrate/runtime-io/with_std.rs b/substrate/substrate/runtime-io/with_std.rs index bcedb48116..cb01133a6c 100644 --- a/substrate/substrate/runtime-io/with_std.rs +++ b/substrate/substrate/runtime-io/with_std.rs @@ -126,25 +126,30 @@ pub fn print(value: T) { #[macro_export] macro_rules! impl_stubs { - ( $( $name:ident => $invoke:expr ),* ) => { + ( $( $new_name:ident $($nodecode:ident)* => $invoke: expr ),*) => { /// Dispatch logic for the native runtime. - pub fn dispatch(method: &str, mut data: &[u8]) -> Option> { + pub fn dispatch(method: &str, data: &[u8]) -> Option> { match method { $( - stringify!($name) => { - let input = match $crate::codec::Slicable::decode(&mut data) { - Some(input) => input, - None => panic!("Bad input data provided to {}", stringify!($name)), - }; - - let output = $invoke(input); - Some($crate::codec::Slicable::to_vec(&output)) - } + stringify!($new_name) => { impl_stubs!(@METHOD data $new_name $($nodecode)* => $invoke) } )* _ => None, } } - } + }; + (@METHOD $data: ident $new_name: ident NO_DECODE => $invoke:expr) => { + Some($invoke($data)) + }; + (@METHOD $data: ident $new_name: ident => $invoke:expr) => {{ + let mut data = $data; + let input = match $crate::codec::Slicable::decode(&mut data) { + Some(input) => input, + None => panic!("Bad input data provided to {}", stringify!($new_name)), + }; + + let output = $invoke(input); + Some($crate::codec::Slicable::to_vec(&output)) + }} } #[cfg(test)] diff --git a/substrate/substrate/runtime-io/without_std.rs b/substrate/substrate/runtime-io/without_std.rs index a4d8e4076d..ecadddeeab 100644 --- a/substrate/substrate/runtime-io/without_std.rs +++ b/substrate/substrate/runtime-io/without_std.rs @@ -14,9 +14,12 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -extern crate substrate_runtime_std as rstd; + extern crate substrate_primitives as primitives; +#[doc(hidden)] +pub extern crate substrate_runtime_std as rstd; + #[doc(hidden)] pub extern crate substrate_codec as codec; @@ -141,10 +144,10 @@ pub fn twox_128(data: &[u8]) -> [u8; 16] { } /// Verify a ed25519 signature. -pub fn ed25519_verify(sig: &[u8], msg: &[u8], pubkey: &[u8]) -> bool { - sig.len() == 64 && pubkey.len() == 32 && unsafe { - ext_ed25519_verify(msg.as_ptr(), msg.len() as u32, sig.as_ptr(), pubkey.as_ptr()) - } == 0 +pub fn ed25519_verify(sig: &[u8; 64], msg: &[u8], pubkey: &[u8; 32]) -> bool { + unsafe { + ext_ed25519_verify(msg.as_ptr(), msg.len() as u32, sig.as_ptr(), pubkey.as_ptr()) == 0 + } } /// Trait for things which can be printed. @@ -181,33 +184,57 @@ pub fn print(value: T) { #[macro_export] macro_rules! impl_stubs { - ( $( $new_name:ident => $invoke:expr ),* ) => { + ( $( $new_name:ident $($nodecode:ident)* => $invoke:expr ),* ) => { $( - #[no_mangle] - pub fn $new_name(input_data: *mut u8, input_len: usize) -> u64 { - let mut input = if input_len == 0 { - &[0u8; 0] - } else { - unsafe { - $crate::slice::from_raw_parts(input_data, input_len) - } - }; - - let input = match $crate::codec::Slicable::decode(&mut input) { - Some(input) => input, - None => panic!("Bad input data provided to {}", stringify!($name)), - }; - - let output = ($invoke)(input); - let output = $crate::codec::Slicable::to_vec(&output); - let res = output.as_ptr() as u64 + ((output.len() as u64) << 32); - - // Leak the output vector to avoid it being freed. - // This is fine in a WASM context since the heap - // will be discarded after the call. - ::core::mem::forget(output); - res - } + impl_stubs!(@METHOD $new_name $($nodecode)* => $invoke); )* + }; + ( @METHOD $new_name:ident NO_DECODE => $invoke:expr ) => { + #[no_mangle] + pub fn $new_name(input_data: *mut u8, input_len: usize) -> u64 { + let input: &[u8] = if input_len == 0 { + &[0u8; 0] + } else { + unsafe { + $crate::slice::from_raw_parts(input_data, input_len) + } + }; + + let output: $crate::rstd::vec::Vec = $invoke(input); + let res = output.as_ptr() as u64 + ((output.len() as u64) << 32); + + // Leak the output vector to avoid it being freed. + // This is fine in a WASM context since the heap + // will be discarded after the call. + ::core::mem::forget(output); + res + } + }; + ( @METHOD $new_name:ident => $invoke:expr ) => { + #[no_mangle] + pub fn $new_name(input_data: *mut u8, input_len: usize) -> u64 { + let mut input = if input_len == 0 { + &[0u8; 0] + } else { + unsafe { + $crate::slice::from_raw_parts(input_data, input_len) + } + }; + + let input = match $crate::codec::Slicable::decode(&mut input) { + Some(input) => input, + None => panic!("Bad input data provided to {}", stringify!($name)), + }; + + let output = ($invoke)(input); + let output = $crate::codec::Slicable::to_vec(&output); + let res = output.as_ptr() as u64 + ((output.len() as u64) << 32); + + // Leak the output vector to avoid it being freed. + // This is fine in a WASM context since the heap + // will be discarded after the call. + ::core::mem::forget(output); + res + } } }