From a773e75026882e25d9cb43d6a774473ae5bd8a49 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Mon, 13 Nov 2023 22:47:52 +0100 Subject: [PATCH] update wasm init (#544) --- executor/scripts/pack-wasm.cjs | 5 ++--- packages/core/src/wasm-executor/browser-wasm-executor.js | 5 ----- packages/core/src/wasm-executor/node-wasm-executor.js | 5 ----- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/executor/scripts/pack-wasm.cjs b/executor/scripts/pack-wasm.cjs index b948f5ea..9261fffb 100755 --- a/executor/scripts/pack-wasm.cjs +++ b/executor/scripts/pack-wasm.cjs @@ -19,9 +19,8 @@ const BYTES = '${base64}'; import { base64Decode, unzlibSync } from '@polkadot/wasm-util'; const WASM_BYTES = unzlibSync(base64Decode(BYTES, new Uint8Array(LEN_IN)), new Uint8Array(LEN_OUT)); -import wasmInit, { initSync } from "./chopsticks_executor.js"; -const blob = new Blob([WASM_BYTES], { type: "application/wasm" }); -export const wasmReady = typeof Bun !== undefined ? Promise.resolve(initSync(WASM_BYTES)) : wasmInit(URL.createObjectURL(blob)); +import { initSync } from "./chopsticks_executor.js"; +initSync(new WebAssembly.Module(WASM_BYTES)); export * from "./chopsticks_executor.js"; `); diff --git a/packages/core/src/wasm-executor/browser-wasm-executor.js b/packages/core/src/wasm-executor/browser-wasm-executor.js index a085ec30..2cdb64cb 100644 --- a/packages/core/src/wasm-executor/browser-wasm-executor.js +++ b/packages/core/src/wasm-executor/browser-wasm-executor.js @@ -2,28 +2,23 @@ import * as Comlink from 'comlink' import * as pkg from '@acala-network/chopsticks-executor' const getRuntimeVersion = async (code) => { - await pkg.wasmReady return pkg.get_runtime_version(code) } // trie_version: 0 for old trie, 1 for new trie const calculateStateRoot = async (entries, trie_version) => { - await pkg.wasmReady return pkg.calculate_state_root(entries, trie_version) } const decodeProof = async (trieRootHash, keys, nodes) => { - await pkg.wasmReady return pkg.decode_proof(trieRootHash, keys, nodes) } const createProof = async (nodes, entries) => { - await pkg.wasmReady return pkg.create_proof(nodes, entries) } const runTask = async (task, callback) => { - await pkg.wasmReady return pkg.run_task(task, callback, 'info') } diff --git a/packages/core/src/wasm-executor/node-wasm-executor.js b/packages/core/src/wasm-executor/node-wasm-executor.js index d19744db..ce225a80 100644 --- a/packages/core/src/wasm-executor/node-wasm-executor.js +++ b/packages/core/src/wasm-executor/node-wasm-executor.js @@ -5,28 +5,23 @@ import { parentPort } from 'node:worker_threads' import nodeEndpoint from 'comlink/dist/umd/node-adapter.js' const getRuntimeVersion = async (code) => { - await pkg.wasmReady return pkg.get_runtime_version(code) } // trie_version: 0 for old trie, 1 for new trie const calculateStateRoot = async (entries, trie_version) => { - await pkg.wasmReady return pkg.calculate_state_root(entries, trie_version) } const decodeProof = async (trieRootHash, keys, nodes) => { - await pkg.wasmReady return pkg.decode_proof(trieRootHash, keys, nodes) } const createProof = async (nodes, entries) => { - await pkg.wasmReady return pkg.create_proof(nodes, entries) } const runTask = async (task, callback) => { - await pkg.wasmReady return pkg.run_task(task, callback, process.env.RUST_LOG) }