feat: bump iroha; build executor; use kagami wasm

Signed-off-by: quacumque <quacumque@fastmail.jp>

Author: 0x009922

executor/Dockerfile

@@ -0,0 +1,16 @@
+FROM hyperledger/iroha:experimental-xx-858df795cc8ea480a214ff73f3087a3bbf5f7d85 AS iroha
+
+FROM rust:1.89-bullseye
+WORKDIR /app
+
+ARG IROHA_REV=858df795cc8ea480a214ff73f3087a3bbf5f7d85
+RUN git init && \
+    git remote add origin https://github.com/hyperledger-iroha/iroha.git && \
+    git fetch origin $IROHA_REV && \
+    git reset --hard FETCH_HEAD
+
+COPY --from=iroha /usr/local/bin/kagami /usr/local/bin/
+# TODO: add rust-src component to Iroha's rust-toolchain.toml
+RUN mkdir -p outputs && \
+    rustup component add rust-src && \
+    kagami wasm build wasm/libs/default_executor --out-file outputs/executor.wasm

generator/executor.wasm

@@ -16,7 +16,7 @@ assert(dirname);
 const CONFIG_DIR = path.relative(Deno.cwd(), path.resolve(dirname, "../config"));
 const EXECUTOR = path.resolve(dirname, "executor.wasm");
 
-const IROHA_IMAGE = `hyperledger/iroha:experimental-xx-8c67c3eb749af3b9c468d5b601d6fd40e1d8a453`;
+const IROHA_IMAGE = `hyperledger/iroha:experimental-xx-858df795cc8ea480a214ff73f3087a3bbf5f7d85`;
 const CHAINS = ["aaa", "bbb", "ccc"].slice(0, 1);
 const PEERS_ON_CHAIN = 1;
 const ACCOUNTS_ON_CHAIN = 3;
@@ -30,8 +30,9 @@ const ASSETS = [
 
 const CONFIG_MOUNT = "/config";
 
+const EXECUTOR_BUILDER_SERVICE_NAME = "executor-builder";
 const TRIGGER_BUILDER_SERVICE_NAME = "trigger-builder";
-const TRIGGER_WASM_NAME = "hub_chain_trigger.opt.wasm";
+const TRIGGER_WASM_NAME = "hub_chain_trigger.wasm";
 
 const Hub = Symbol("hub-chain");
 type ChainId = typeof Hub | string;
@@ -76,10 +77,6 @@ const relayAccounts = new Map(CHAINS.map((chain) => {
   }];
 }));
 
-const genesisKeys = new Map<ChainId, iroha.KeyPair>(
-  ([...CHAINS, Hub] as const).map((chain) => [chain, iroha.KeyPair.random()]),
-);
-
 const peerKeys = new Map<ChainId, iroha.KeyPair[]>(
   ([...CHAINS, Hub] as const).map(
     chain => [chain, Array.from({ length: PEERS_ON_CHAIN }, () => iroha.KeyPair.random())],
@@ -225,8 +222,9 @@ function genesisFor(chain: ChainId) {
   const topology = peerKeys.get(chain)!.map(x => x.publicKey());
 
   return {
+    creation_time: new Date().toISOString(),
     chain: chainToStr(chain),
-    executor: "executor.wasm",
+    executor: "wasm/executor.wasm",
     instructions,
     wasm_dir: ".",
     wasm_triggers: [
@@ -247,6 +245,10 @@ function genesisFor(chain: ChainId) {
         commit_time_ms: 1000,
         max_clock_drift_ms: 1000,
       },
+      smart_contract: {
+        fuel: 200_000_000,
+        memory: 200_000_000,
+      },
     },
   };
 }
@@ -263,7 +265,6 @@ function chainPublicPort(chain: ChainId): number {
 
 function peerComposeService(chain: ChainId, i: number) {
   const peerKey = peerKeys.get(chain)!.at(i)!;
-  const genesisKey = genesisKeys.get(chain)!;
 
   const id = peerServiceId(chain, i);
   const trustedPeers = JSON.stringify(
@@ -276,31 +277,15 @@ function peerComposeService(chain: ChainId, i: number) {
 
   const environment = {
     CHAIN: chainToStr(chain),
+    GENESIS: `${CONFIG_MOUNT}/chain-${chainToStr(chain)}-genesis.json`,
     PUBLIC_KEY: peerKey.publicKey().multihash(),
     PRIVATE_KEY: peerKey.privateKey().multihash(),
-    GENESIS_PUBLIC_KEY: genesisKey.publicKey().multihash(),
     P2P_PUBLIC_ADDRESS: `${id}:1337`,
     TRUSTED_PEERS: trustedPeers,
     TERMINAL_COLORS: "true",
   };
 
-  const isGenesis = i === 0;
-  if (isGenesis) {
-    Object.assign(environment, {
-      GENESIS: "/tmp/genesis.signed.scale",
-      GENESIS_PRIVATE_KEY: genesisKey.privateKey().multihash(),
-    });
-  }
-
-  const command = isGenesis
-    ? `/bin/sh -c "
-  kagami genesis sign ${CONFIG_MOUNT}/chain-${chainToStr(chain)}-genesis.json \\\n\
-    --public-key $GENESIS_PUBLIC_KEY \\\n\
-    --private-key $GENESIS_PRIVATE_KEY \\\n\
-    --out-file /tmp/genesis.signed.scale \\\n\
-  && irohad --config ${CONFIG_MOUNT}/irohad.toml
-"`
-    : `irohad --config ${CONFIG_MOUNT}/irohad.toml`;
+  const command = `irohad --config ${CONFIG_MOUNT}/irohad.toml`;
 
   const ports = i === 0 ? [`${chainPublicPort(chain)}:8080`] : [];
 
@@ -318,6 +303,9 @@ function peerComposeService(chain: ChainId, i: number) {
         [TRIGGER_BUILDER_SERVICE_NAME]: {
           condition: "service_completed_successfully",
         },
+        [EXECUTOR_BUILDER_SERVICE_NAME]: {
+          condition: "service_completed_successfully",
+        },
       },
       healthcheck: {
         test: "test $(curl -s http://127.0.0.1:8080/status/blocks) -gt 0",
@@ -419,13 +407,25 @@ function triggerBuilderService() {
     build: {
       context: "../trigger",
     },
-    volumes: [`../config/wasm:/app/outputs`],
+    volumes: [`../config/wasm:/usr/wasm`],
+    command: `\
+sh -c "
+  cp /app/outputs/* /usr/wasm/ &&
+  echo 'Copied WASMs'
+"`,
   };
 }
 
+function defaultExecutorBuilderService() {
+  const cfg = triggerBuilderService();
+  cfg.build.context = `../executor`;
+  return cfg;
+}
+
 const dockerCompose = {
   services: {
     [TRIGGER_BUILDER_SERVICE_NAME]: triggerBuilderService(),
+    [EXECUTOR_BUILDER_SERVICE_NAME]: defaultExecutorBuilderService(),
     ...peerServices(),
     ...relayServices(),
     // ui: uiService(),
@@ -449,10 +449,6 @@ for (const chain of ALL_CHAINS) {
   }
 }
 
-const executorDest = path.join(CONFIG_DIR, "executor.wasm");
-$.logStep("Writing", executorDest);
-await Deno.copyFile(EXECUTOR, executorDest);
-
 await writeConfig("ui.json", JSON.stringify(uiConfig(), null, 2));
 
 $.logStep("Completed!", `Now you can run "docker-compose -f ${path.join(CONFIG_DIR, "docker-compose.yml")} up"`);

generator/mod.ts

@@ -0,0 +1,4 @@
+.dockerignore
+.gitignore
+Dockerfile
+/target

trigger/.dockerignore

@@ -9,8 +9,8 @@ debug = []
 crate-type = ['cdylib']
 
 [dependencies]
-iroha_crypto = { git = "https://github.com/hyperledger-iroha/iroha.git", rev = "d77d19d2", default-features = false }
-iroha_trigger = { git = "https://github.com/hyperledger-iroha/iroha.git", rev = "d77d19d2" }
+iroha_crypto = { git = "https://github.com/hyperledger-iroha/iroha.git", rev = "858df795", default-features = false }
+iroha_trigger = { git = "https://github.com/hyperledger-iroha/iroha.git", rev = "858df795" }
 
 anyhow = { version = "1.0", default-features = false }
 dlmalloc = { version = "0.2.6", features = ["global"] }

trigger/Cargo.lock

@@ -1,15 +1,15 @@
+FROM hyperledger/iroha:experimental-xx-858df795cc8ea480a214ff73f3087a3bbf5f7d85 AS iroha
+
 FROM rust:1.89-bullseye
 WORKDIR /app
 
 COPY rust-toolchain.toml .
 RUN rustup install
 
-COPY Cargo.lock Cargo.toml .
-COPY .cargo .cargo
-COPY src src
-RUN cargo build --release
-
-RUN mkdir -p outputs && cp target/wasm32-unknown-unknown/release/hub_chain_trigger.wasm ./outputs/
-
-RUN apt-get update && apt-get install binaryen
-RUN cd outputs && wasm-opt hub_chain_trigger.wasm -o hub_chain_trigger.opt.wasm -Oz --vacuum
+COPY . .
+RUN --mount=type=cache,target=/root/.cargo/git/db \
+    --mount=type=cache,target=/root/.cargo/registry/cache \
+    --mount=type=cache,target=/root/.cargo/registry/index \
+    cargo fetch
+COPY --from=iroha /usr/local/bin/kagami /usr/local/bin/
+RUN mkdir -p outputs && kagami wasm build . --out-file outputs/hub_chain_trigger.wasm

trigger/Cargo.toml

@@ -1,3 +1,4 @@
 [toolchain]
-channel = "1.89.0"
+channel = "nightly-2025-05-08"
 targets = ["wasm32-unknown-unknown"]
+components = ["rust-src"]