diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8aab8df..9b449be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: with: use-cross: true command: build - args: --target arm-unknown-linux-gnueabihf --features static-ssl --release --locked + args: --target arm-unknown-linux-gnueabihf --release --locked - name: Upload binaries to release uses: svenstaro/upload-release-action@v2 with: diff --git a/Cargo.lock b/Cargo.lock index 6bb3aaf..f0fa2c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,7 @@ checksum = "939d59666dd9a7964a3a5312b9d24c9c107630752ee64f2dd5038189a23fe331" dependencies = [ "abnf", "indexmap", - "itertools 0.10.5", + "itertools", "pretty 0.11.3", ] @@ -85,9 +85,9 @@ checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "arbitrary" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44124848854b941eafdb34f05b3bcf59472f643c7e151eba7c2b69daa469ed5" +checksum = "d86fd10d912cab78764cc44307d9cd5f164e09abbeb87fb19fb6d95937e8da5f" [[package]] name = "arrayvec" @@ -273,9 +273,9 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "candid" -version = "0.7.18" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d510cc32b8b991acc955dd3d5e0cb6f404069d1dccd9203ee90f5865557c9165" +checksum = "19e72fa59e129f61105902051ab41bfd81118d2cce90d0054d2dee353492a3f9" dependencies = [ "anyhow", "arbitrary", @@ -283,9 +283,10 @@ dependencies = [ "byteorder", "candid_derive", "codespan-reporting", + "crc32fast", + "data-encoding", "fake", "hex", - "ic-types 0.5.0", "lalrpop", "lalrpop-util", "leb128", @@ -299,14 +300,15 @@ dependencies = [ "serde", "serde_bytes", "serde_dhall", + "sha2 0.10.6", "thiserror", ] [[package]] name = "candid_derive" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e02c03c4d547674a3f3f3109538fb49871fbe636216daa019f06a62faca9061" +checksum = "58f1f4db7c7d04b87b70b3a35c5dc5c2c9dd73cef8bdf6760e2f18a0d45350dd" dependencies = [ "lazy_static", "proc-macro2", @@ -450,12 +452,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -538,33 +539,34 @@ dependencies = [ [[package]] name = "dhall" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d7b648a24d2edd4ba9f31fe42c831080522d1cf35bca3522887ba0d802745" +checksum = "ec26264de25a8e3642fbb37abb24a6c6be9e19795444e6cf1bb88be5c2d55cc7" dependencies = [ "abnf_to_pest", "annotate-snippets", "elsa", + "half 2.1.0", "hex", - "itertools 0.9.0", + "home", + "itertools", "lazy_static", + "minicbor", "once_cell", "percent-encoding", "pest", "pest_consume", "pest_generator", "quote", - "serde", - "serde_cbor", - "sha2 0.9.9", + "sha2 0.10.6", "url", ] [[package]] name = "dhall_proc_macros" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64ba6f41d9b223e2e1d7c97a1145a1aa03e57d65e1c9c2baa29f194caf322c9" +checksum = "efcdb228bf802b21cd843e5ac3959b6255966238e5ec06d2e4bc6b9935475653" dependencies = [ "proc-macro2", "quote", @@ -646,9 +648,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "ecdsa" -version = "0.14.7" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85789ce7dfbd0f0624c07ef653a08bb2ebf43d3e16531361f46d36dd54334fed" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", "elliptic-curve", @@ -776,21 +778,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.1.0" @@ -927,6 +914,15 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "half" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" +dependencies = [ + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -975,6 +971,15 @@ dependencies = [ "digest 0.10.5", ] +[[package]] +name = "home" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" +dependencies = [ + "winapi", +] + [[package]] name = "http" version = "0.2.8" @@ -1051,21 +1056,21 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ad753f11bed278d7d40b551bdb57090eedb301267019db576a168a53d12dd6" +checksum = "699755970b44fbc3fd97ed75c584bd764fc42a37db8bacf9fed909857750d770" dependencies = [ "async-trait", "base32", "base64", "byteorder", + "candid", "futures-util", "garcon", "hex", "http", "http-body", "hyper-rustls", - "ic-types 0.5.0", "ic-verify-bls-signature", "k256", "leb128", @@ -1088,9 +1093,9 @@ dependencies = [ [[package]] name = "ic-identity-hsm" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb04806b1f28e5579d6bcf9b70941b7052160b87fd1cca091cc854828dbc6f2c" +checksum = "ed32fe4c1338979f4add6257d6dd20875ef7adefb3435d7415a2a3f5806e5f21" dependencies = [ "hex", "ic-agent", @@ -1103,7 +1108,7 @@ dependencies = [ [[package]] name = "ic-repl" -version = "0.3.5" +version = "0.3.6" dependencies = [ "ansi_term", "anyhow", @@ -1123,7 +1128,6 @@ dependencies = [ "lalrpop-util", "libflate", "logos", - "openssl", "pem", "pretty 0.10.0", "pretty-hex", @@ -1136,40 +1140,10 @@ dependencies = [ "rustyline-derive", "serde", "serde_json", + "sha2 0.10.6", "shellexpand", "terminal_size", "tokio", - "walrus", -] - -[[package]] -name = "ic-types" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7d9569a4c91d5c9c202c1666f799a9761bab70a2b59464ee78c45b005e47b8" -dependencies = [ - "crc32fast", - "data-encoding", - "hex", - "serde", - "serde_bytes", - "sha2 0.10.6", - "thiserror", -] - -[[package]] -name = "ic-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a17269dff0ec6ca4c3d04e18fca97d018ff53d809e6d92348fc22f9588e1a5" -dependencies = [ - "crc32fast", - "data-encoding", - "hex", - "serde", - "serde_bytes", - "sha2 0.10.6", - "thiserror", ] [[package]] @@ -1186,14 +1160,14 @@ dependencies = [ [[package]] name = "ic-wasm" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2ae3c75c0ba162ef5480620affd298ee8ea6d4535267c8504fb1f8d9f1f9a6" +checksum = "a61da10f997c0f98b94650ad9bed0382f69025c4d273ebfb55d3dee5e29edfcf" dependencies = [ "anyhow", "candid", "clap", - "ic-types 0.4.2", + "thiserror", "walrus", ] @@ -1240,9 +1214,9 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.7" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9709543bd6c25fdc748da2bed0f6855b07b7e93a203ae31332ac2101ab2f4782" +checksum = "bb31a5d9068fccb34562007cd564bb08fff1478255b0534c549e93fcb658cd90" dependencies = [ "ahash", "atty", @@ -1268,15 +1242,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1330,7 +1295,7 @@ dependencies = [ "bit-set", "diff", "ena", - "itertools 0.10.5", + "itertools", "lalrpop-util", "petgraph", "pico-args", @@ -1365,9 +1330,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.133" +version = "0.2.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" +checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" [[package]] name = "libflate" @@ -1462,6 +1427,27 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "minicbor" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a20020e8e2d1881d8736f64011bb5ff99f1db9947ce3089706945c8915695cb" +dependencies = [ + "half 1.8.2", + "minicbor-derive", +] + +[[package]] +name = "minicbor-derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8608fb1c805b5b6b3d5ab7bd95c40c396df622b64d77b2d621a5eae1eed050ee" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1659,61 +1645,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl" -version = "0.10.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "111.22.0+1.1.1q" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - [[package]] name = "os_str_bytes" version = "6.3.0" @@ -1793,9 +1730,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb779fcf4bb850fbbb0edc96ff6cf34fd90c4b1a112ce042653280d9a7364048" +checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" dependencies = [ "thiserror", "ucd-trie", @@ -1825,9 +1762,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502b62a6d0245378b04ffe0a7fb4f4419a4815fce813bd8a0ec89a56e07d67b1" +checksum = "60b75706b9642ebcb34dab3bc7750f811609a0eb1dd8b88c2d15bf628c1c65b2" dependencies = [ "pest", "pest_generator", @@ -1835,9 +1772,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e629bf49b750254da26132f1a5a9d11fd8a95a3df51d15c4abd1ba154cb6c" +checksum = "f4f9272122f5979a6511a749af9db9bfc810393f63119970d7085fed1c4ea0db" dependencies = [ "pest", "pest_meta", @@ -1848,9 +1785,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec162c71c45e269dfc3fc2916eaeb97feab22993a21bcce4721d08cd7801a6" +checksum = "4c8717927f9b79515e565a64fe46c38b8cd0427e64c40680b14a7365ab09ac8d" dependencies = [ "once_cell", "pest", @@ -1914,12 +1851,6 @@ dependencies = [ "spki", ] -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - [[package]] name = "png" version = "0.16.8" @@ -2021,9 +1952,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.44" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ "unicode-ident", ] @@ -2390,7 +2321,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half", + "half 1.8.2", "serde", ] @@ -2407,9 +2338,9 @@ dependencies = [ [[package]] name = "serde_dhall" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1393976875f3080d8cd1ff54083129e2e6a30d7a62582b67c3eb5924789e8e75" +checksum = "8e1875f011ba1a37810617c9325b590a2539f44adae194578eafa681a276ec98" dependencies = [ "dhall", "dhall_proc_macros", @@ -2496,9 +2427,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.3" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ "digest 0.10.5", "rand_core", @@ -2533,9 +2464,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" @@ -2655,18 +2586,18 @@ checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -2675,9 +2606,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" dependencies = [ "itoa 1.0.3", "libc", @@ -2799,9 +2730,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", ] @@ -2892,12 +2823,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 856b595..2032805 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ic-repl" -version = "0.3.5" +version = "0.3.6" authors = ["DFINITY Team"] edition = "2018" default-run = "ic-repl" @@ -14,7 +14,7 @@ doc = false lalrpop = "0.19" [dependencies] -candid = { version = "0.7", features = ["random"] } +candid = { version = "0.8", features = ["random"] } rustyline = "8.2" rustyline-derive = "0.4" ansi_term = "0.12" @@ -25,11 +25,10 @@ codespan-reporting = "0.11" pretty = "0.10.0" pem = "1.0" shellexpand = "2.1" -ic-agent = "0.20.1" -ic-identity-hsm = "0.20.1" -ic-wasm = "0.1" +ic-agent = "0.21" +ic-identity-hsm = "0.21" +ic-wasm = "0.3" inferno = "0.11" -walrus = "0.19" tokio = { version = "1.20.0", features = ["full"] } garcon = "0.2.3" anyhow = "1.0" @@ -42,12 +41,9 @@ rpassword = "7.0" serde = "1.0" serde_json = "1.0" hex = { version = "0.4", features = ["serde"] } -openssl = "0.10" +sha2 = "0.10" crc32fast = "1.2" qrcode = "0.12" image = { version = "0.23", default-features = false, features = ["png"] } libflate = "1.2" base64 = "0.13" - -[features] -static-ssl = ["openssl/vendored"] diff --git a/src/account_identifier.rs b/src/account_identifier.rs index 778a0ed..61d8fb5 100644 --- a/src/account_identifier.rs +++ b/src/account_identifier.rs @@ -6,8 +6,8 @@ #![allow(clippy::all)] use candid::{CandidType, Principal}; -use openssl::sha::Sha224; use serde::{de, de::Error, Deserialize, Serialize}; +use sha2::{Digest, Sha224, Sha256}; use std::convert::{TryFrom, TryInto}; use std::fmt::{Display, Formatter}; use std::str::FromStr; @@ -37,7 +37,7 @@ impl AccountIdentifier { hash.update(&sub_account.0[..]); AccountIdentifier { - hash: hash.finish(), + hash: hash.finalize().into(), } } @@ -185,11 +185,10 @@ impl TryFrom<&[u8]> for Subaccount { // This function _must_ correspond to how the governance canister computes the // subaccount. pub fn get_neuron_subaccount(controller: &Principal, nonce: u64) -> Subaccount { - use openssl::sha::Sha256; let mut data = Sha256::new(); data.update(&[0x0c]); data.update(b"neuron-stake"); data.update(controller.as_slice()); data.update(&nonce.to_be_bytes()); - Subaccount(data.finish()) + Subaccount(data.finalize().into()) } diff --git a/src/exp.rs b/src/exp.rs index 9a9df70..fd72894 100644 --- a/src/exp.rs +++ b/src/exp.rs @@ -171,7 +171,7 @@ impl Exp { let path = resolve_path(&helper.base_path, file); let blob = std::fs::read(&path) .with_context(|| format!("Cannot read {:?}", path))?; - let mut m = walrus::Module::from_buffer(&blob)?; + let mut m = ic_wasm::utils::parse_wasm(&blob, false)?; ic_wasm::shrink::shrink(&mut m); ic_wasm::instrumentation::instrument(&mut m); IDLValue::Vec(m.emit_wasm().into_iter().map(IDLValue::Nat8).collect())