Skip to content

Commit

Permalink
Upgrade wawaka to WAMR-1.1.2 release
Browse files Browse the repository at this point in the history
Signed-off-by: Marcela Melara <marcela.melara@intel.com>
  • Loading branch information
marcelamelara authored and cmickeyb committed Jan 6, 2023
1 parent 46c50a3 commit 3eb4368
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions common/interpreter/wawaka_wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ There are many toolchains that could be used to build a WASM code. By default, W
compiled with the compilers provided by [WASI SDK](https://github.com/WebAssembly/wasi-sdk). To use
WASI SDK, download and install the appropriate package file from
https://github.com/WebAssembly/wasi-sdk/releases (we have verified that release wasi-sdk-12 works
with WAMR version WAMR-01-18-2022).
with WAMR version WAMR-1.1.2).

```bash
wget -q -P /tmp https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk_12.0_amd64.deb
Expand All @@ -46,14 +46,14 @@ SDK would be installed in the directory `/opt/wasi-sdk`.
If wawaka is configured as the contract interpreter, the libraries implementing the WASM interpreter
will be built for use with Intel SGX. The source for the WAMR interpreter is
included as a submodule in the interpreters/ folder, and will
always point to the latest tagged commit that we have validated: `WAMR-01-18-2022`.
always point to the latest tagged commit that we have validated: `WAMR-1.1.2`.
If the PDO parent repo was not cloned with the `--recurse-submodules` flag,
you will have to explictly pull the submodule source.

```
cd ${PDO_SOURCE_ROOT}/interpreters/wasm-micro-runtime
git submodule update --init
git checkout WAMR-01-18-2022 # optional
git checkout WAMR-1.1.2 # optional
```

The WAMR API is built during the Wawaka build, so no additional
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.pdo-build
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# - pdo repo branch to use: PDO_REPO_BRANCH (default: main)
# - build in debug mode: PDO_DEBUG_BUILD (default: 0)
# - contract interpreter (gipsy or wawaka): PDO_INTERPRETER (default: gipsy)
# - wamr version: WAMR (default: WAMR-01-18-2022)
# - wamr version: WAMR (default: WAMR-1.1.2)

# Build:
# $ docker build -f docker/Dockerfile.pdo-build -t pdo-build docker
Expand Down Expand Up @@ -109,7 +109,7 @@ ENV PDO_LEDGER_KEY_ROOT=${PDO_LEDGER_KEY_ROOT}

# - web-assembly/wasm/wawaka
# - Configure WAMR source
ARG WAMR=WAMR-01-18-2022
ARG WAMR=WAMR-1.1.2
RUN cd /project/pdo/src/private-data-objects/interpreters/wasm-micro-runtime \
&& git checkout ${WAMR}\
&& echo "export WASM_SRC=$(pwd)" >> /etc/profile.d/pdo.sh
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ happening inside a contract, do not use with confidential contracts.
`WASM_SRC` points to the installation of the wasm-micro-runtime. This
is used to build the WASM interpreter for the wawaka contract interpreter.
The git submodule points to the latest tagged commit of [WAMR](https://github.com/bytecodealliance/wasm-micro-runtime) we have validated:
`WAMR-01-18-2022`.
`WAMR-1.1.2`.

<!-- -------------------------------------------------- -->
### `WASM_MEM_CONFIG`
Expand Down
2 changes: 1 addition & 1 deletion interpreters/wasm-micro-runtime

0 comments on commit 3eb4368

Please sign in to comment.