Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(docker): Bump sapphire 0.7.0-testnet and emerald 11.0.0-testnet #467

Merged
merged 2 commits into from
Oct 23, 2023
Merged

feat(docker): Bump sapphire 0.7.0-testnet and emerald 11.0.0-testnet #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56a9dc2
feat: Bump sapphire-dev 0.7.0-testnet and emerald-dev 11.0.0-testnet
matevz Oct 20, 2023
0fe3c46
fix: Fix the default amount in README to correct 10,000 TEST
matevz Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Chain IDs:
- Sapphire Localnet: `0x5afd` (`23293`)

By default, a random mnemonic will be generated and the first 5 accounts will
be funded 100 ROSE. Flags `-amount`, `-to`, `-n` can be added to specify an
be funded 10,000 TEST. Flags `-amount`, `-to`, `-n` can be added to specify an
initial ROSE deposit, existing mnemonic and the number of addresses to derive
and fund respectively.

Expand Down
11 changes: 5 additions & 6 deletions docker/common/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,24 @@ while ! [[ -S ${OASIS_NODE_SOCKET} ]]; do sleep 1; done
${OASIS_WEB3_GATEWAY} --config ${OASIS_WEB3_GATEWAY_CONFIG_FILE} 2>1 &>/var/log/oasis-web3-gateway.log &
OASIS_WEB3_GATEWAY_PID=$!

# Wait for compute nodes before initiating deposit.
echo -n " * Bootstrapping network (this might take a minute)"
if [[ ${SAPPHIRE_BACKEND} == 'mock' ]]; then
echo -n " * Bootstrapping network (this might take a minute)"

echo -n .
${OASIS_NODE} debug control wait-nodes -n 2 -a unix:${OASIS_NODE_SOCKET}

echo -n .
${OASIS_NODE} debug control set-epoch --epoch 1 -a unix:${OASIS_NODE_SOCKET}

echo .
echo -n .
${OASIS_NODE} debug control set-epoch --epoch 2 -a unix:${OASIS_NODE_SOCKET}
else
echo " * Bootstrapping network (this might take a minute)"
# Wait for compute nodes before initiating deposit.
${OASIS_NODE} debug control wait-ready -a unix:${OASIS_NODE_SOCKET}
fi

echo
echo " * Populating accounts"
echo ""
echo
${OASIS_DEPOSIT} -sock unix:${OASIS_NODE_SOCKET} "$@"

echo
Expand Down
4 changes: 2 additions & 2 deletions docker/emerald-dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ RUN cd oasis-web3-gateway && make build
FROM ubuntu:22.04

# Docker-specific variables
ENV OASIS_CORE_VERSION=22.2.6
ENV PARATIME_VERSION=10.0.0
ENV OASIS_CORE_VERSION=23.0.1
ENV PARATIME_VERSION=11.0.0-testnet
ENV PARATIME_NAME=emerald
ENV GATEWAY__CHAIN_ID=0xa514

Expand Down
8 changes: 4 additions & 4 deletions docker/sapphire-dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ COPY . /go/oasis-web3-gateway
RUN cd oasis-web3-gateway && make build

# Build simple-keymanager
FROM oasisprotocol/oasis-core-dev:stable-22.2.x AS oasis-core-dev
FROM ghcr.io/oasisprotocol/oasis-core-dev:stable-23.0.x AS oasis-core-dev

ENV OASIS_UNSAFE_SKIP_KM_POLICY=1

RUN git clone https://github.com/oasisprotocol/oasis-core.git --branch stable/22.2.x --depth 1 \
RUN git clone https://github.com/oasisprotocol/oasis-core.git --branch stable/23.0.x --depth 1 \
&& cd oasis-core/tests/runtimes/simple-keymanager \
&& cargo build

Expand All @@ -34,8 +34,8 @@ RUN apt update -qq \

# Docker-specific variables
ENV OASIS_CORE_VERSION=23.0.1
ENV OASIS_CLI_VERSION=0.5.0
ENV PARATIME_VERSION=0.6.4
ENV OASIS_CLI_VERSION=0.6.0
ENV PARATIME_VERSION=0.7.0-testnet
ENV PARATIME_NAME=sapphire
ENV GATEWAY__CHAIN_ID=0x5afd

Expand Down