Skip to content

Commit 36c1fee

Browse files
authored
Merge pull request #736 from oasisprotocol/ptrus/feature/update-core-sdk-paratimes
feat: Update oasis dependendcies
2 parents 684ab67 + 0531450 commit 36c1fee

File tree

11 files changed

+152
-128
lines changed

11 files changed

+152
-128
lines changed

.github/workflows/ci-benchmarks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
ports:
3737
- 5432:5432
3838
env:
39-
OASIS_CORE_VERSION: "24.0"
39+
OASIS_CORE_VERSION: "25.3"
4040
OASIS_NODE: ${{ github.workspace }}/oasis_core/oasis-node
4141
OASIS_NET_RUNNER: ${{ github.workspace }}/oasis_core/oasis-net-runner
42-
SAPPHIRE_PARATIME_VERSION: 0.7.3
42+
SAPPHIRE_PARATIME_VERSION: 0.10.3
4343
GATEWAY__CHAIN_ID: 23293
4444
SAPPHIRE_PARATIME: ${{ github.workspace }}/oasis_core/sapphire-paratime
4545
OASIS_NODE_DATADIR: /tmp/oasis-sapphire-benchmarks
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Go
5454
uses: actions/setup-go@v5
5555
with:
56-
go-version: "1.23.x"
56+
go-version: "1.24.x"
5757

5858
- name: Install prerequisites
5959
run: |
@@ -67,7 +67,7 @@ jobs:
6767
mkdir -p "$(dirname ${SAPPHIRE_PARATIME})"
6868
wget "https://github.com/oasisprotocol/sapphire-paratime/releases/download/v${SAPPHIRE_PARATIME_VERSION}/localnet-sapphire-paratime.orc" -O "${SAPPHIRE_PARATIME}.orc"
6969
unzip "${SAPPHIRE_PARATIME}.orc"
70-
mv runtime.elf "${SAPPHIRE_PARATIME}"
70+
mv ronl.elf "${SAPPHIRE_PARATIME}"
7171
chmod a+x "${SAPPHIRE_PARATIME}"
7272
go build
7373
cd benchmarks

.github/workflows/ci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup Go
3838
uses: actions/setup-go@v5
3939
with:
40-
go-version: "1.23.x"
40+
go-version: "1.24.x"
4141
- name: Install gitlint
4242
run: |
4343
python -m pip install gitlint
@@ -50,6 +50,6 @@ jobs:
5050
- name: Lint Go
5151
uses: golangci/golangci-lint-action@v6
5252
with:
53-
version: v1.62.0
53+
version: v1.64.5
5454
# Always run this step so that all linting errors can be seen at once.
5555
if: always()

.github/workflows/ci-test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
ports:
3636
- 5432:5432
3737
env:
38-
OASIS_CORE_VERSION: "24.3.2"
38+
OASIS_CORE_VERSION: "25.3"
3939
OASIS_NODE_BINARY: ${{ github.workspace }}/oasis_core/oasis-node
4040
OASIS_NET_RUNNER_BINARY: ${{ github.workspace }}/oasis_core/oasis-net-runner
4141
EMERALD_PARATIME_VERSION: 11.0.0-testnet
@@ -50,7 +50,7 @@ jobs:
5050
- name: Setup Go
5151
uses: actions/setup-go@v5
5252
with:
53-
go-version: "1.23.x"
53+
go-version: "1.24.x"
5454

5555
- name: Install prerequisites
5656
run: |
@@ -107,10 +107,10 @@ jobs:
107107
ports:
108108
- 5432:5432
109109
env:
110-
OASIS_CORE_VERSION: "24.3.2"
110+
OASIS_CORE_VERSION: "25.3"
111111
OASIS_NODE_BINARY: ${{ github.workspace }}/oasis_core/oasis-node
112112
OASIS_NET_RUNNER_BINARY: ${{ github.workspace }}/oasis_core/oasis-net-runner
113-
SAPPHIRE_PARATIME_VERSION: 0.9.2
113+
SAPPHIRE_PARATIME_VERSION: 0.10.3
114114
GATEWAY__CHAIN_ID: 23293
115115
GATEWAY__OASIS_RPCS: true
116116
SAPPHIRE_PARATIME: ${{ github.workspace }}/oasis_core/sapphire-paratime
@@ -125,7 +125,7 @@ jobs:
125125
- name: Setup Go
126126
uses: actions/setup-go@v5
127127
with:
128-
go-version: "1.23.x"
128+
go-version: "1.24.x"
129129

130130
- name: Install prerequisites
131131
run: |
@@ -148,7 +148,7 @@ jobs:
148148
149149
- name: Spinup oasis-node
150150
run:
151-
PARATIME_BINARY="${SAPPHIRE_PARATIME}" PARATIME_VERSION="${SAPPHIRE_PARATIME_VERSION}" OASIS_UNSAFE_SKIP_AVR_VERIFY=1 OASIS_UNSAFE_ALLOW_DEBUG_ENCLAVES=1 OASIS_UNSAFE_MOCK_SGX=1 tests/tools/spinup-oasis-stack.sh > /dev/null &
151+
PARATIME_BINARY="${SAPPHIRE_PARATIME}" PARATIME_VERSION="${SAPPHIRE_PARATIME_VERSION}" OASIS_UNSAFE_SKIP_AVR_VERIFY=1 OASIS_UNSAFE_ALLOW_DEBUG_ENCLAVES=1 OASIS_UNSAFE_MOCK_TEE=1 tests/tools/spinup-oasis-stack.sh > /dev/null &
152152
sleep 60
153153

154154
- name: Unit tests with coverage

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version: "1.23.x"
23+
go-version: "1.24.x"
2424

2525
- name: Install GoReleaser
2626
uses: goreleaser/goreleaser-action@v6

docker/common/nexus.env.production

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ REACT_APP_LOCALNET_API=http://localhost:8547/v1/
77
REACT_APP_META_TITLE="Oasis Explorer - Localnet"
88
REACT_APP_META_IMAGE="Oasis Explorer - OpenGraph Banner.png"
99
REACT_APP_META_MANIFEST=app.webmanifest
10-
REACT_APP_META_FAVICON=favicon.svg
11-
REACT_APP_META_APPLE_ICON="Icon Blue 192.png"
10+
REACT_APP_META_FAVICON=https://assets.oasis.io/logotypes/favicon.svg
11+
REACT_APP_META_APPLE_ICON="https://assets.oasis.io/logotypes/Icon Blue 192.png"
12+
REACT_APP_SOCIAL_TELEGRAM=https://t.me/oasisprotocolcommunity
13+
REACT_APP_SOCIAL_TWITTER=https://twitter.com/oasisprotocol
14+
REACT_APP_SOCIAL_DISCORD=https://oasis.io/discord
15+
REACT_APP_SOCIAL_YOUTUBE=https://www.youtube.com/channel/UC35UFPcZ2F1wjPxhPrSsESQ
16+
REACT_APP_SOCIAL_REDDIT=https://www.reddit.com/r/oasisnetwork/
1217
REACT_APP_META_DESC="Official explorer for the Oasis Network - Localnet"
1318
REACT_APP_SHOW_BUILD_BANNERS=true
1419
REACT_APP_FIXED_NETWORK=localnet

docker/common/nexus.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ analysis:
4747
interval: 30s
4848
evm_abi_{{PARATIME_NAME}}:
4949
interval: 30s
50+
rofl_{{PARATIME_NAME}}:
51+
interval: 5s
52+
rofl_instance_transactions_{{PARATIME_NAME}}:
53+
interval: 5s
54+
roflmarket_{{PARATIME_NAME}}:
55+
interval: 5s
5056
validator_staking_history:
5157
from: 1
5258
node_stats:

docker/common/start.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ if [[ "${OASIS_DOCKER_START_EXPLORER}" == "yes" ]]; then
393393
sed -i 's|{{EXPLORER_PORT}}|'"${EXPLORER_PORT}"'|g' "${OASIS_EXPLORER_NGINX_CONFIG_FILE}"
394394
sed -i 's|{{EXPLORER_DIR}}|'"${OASIS_EXPLORER_DIR}"'|g' "${OASIS_EXPLORER_NGINX_CONFIG_FILE}"
395395
ln -s ${OASIS_EXPLORER_NGINX_CONFIG_FILE} /etc/nginx/sites-enabled/explorer
396-
service nginx start
397-
nginx -s reload
396+
service nginx start 2>1 &>/dev/null
397+
nginx -s reload 2>1 &>/dev/null
398398

399399
# Wait for Explorer to start.
400400
while ! curl -s http://localhost:${EXPLORER_PORT}/ 2>1 &>/dev/null; do echo -n .; sleep 1; done
@@ -403,7 +403,8 @@ fi
403403

404404
# Add Localnet to Oasis CLI and make it default.
405405
if [ ! -z "${OASIS_CLI_BINARY:-}" ]; then
406-
${OASIS_CLI_BINARY} network add-local localnet unix:/serverdir/node/net-runner/network/client-0/internal.sock -y
406+
# XXX: Fix to absolute socket path once https://github.com/oasisprotocol/cli/issues/471 is fixed.
407+
${OASIS_CLI_BINARY} network add-local localnet unix:serverdir/node/net-runner/network/client-0/internal.sock -y
407408
${OASIS_CLI_BINARY} paratime add localnet ${PARATIME_NAME} 8000000000000000000000000000000000000000000000000000000000000000 --num-decimals 18 -y
408409
${OASIS_CLI_BINARY} network set-default localnet
409410
fi

docker/emerald-localnet/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Build oasis-web3-gateway
2-
FROM golang:1.23.3 AS oasis-web3-gateway
2+
FROM golang:1.24.0 AS oasis-web3-gateway
33

44
COPY . /go/oasis-web3-gateway
55
RUN cd oasis-web3-gateway && make && strip -S -x oasis-web3-gateway
66

7-
FROM ghcr.io/oasisprotocol/oasis-core-dev:stable-24.2.x AS oasis-core-dev
7+
FROM ghcr.io/oasisprotocol/oasis-core-dev:stable-25.2.x AS oasis-core-dev
88

9-
ARG NEXUS_VERSION=0.5.3
9+
ARG NEXUS_VERSION=0.6.13
1010
RUN wget https://github.com/oasisprotocol/nexus/releases/download/v${NEXUS_VERSION}/oasis_nexus_${NEXUS_VERSION}_linux_amd64.tar.gz \
1111
&& tar -zxvf oasis_nexus_${NEXUS_VERSION}_linux_amd64.tar.gz \
1212
&& strip -S -x /oasis_nexus_${NEXUS_VERSION}_linux_amd64/nexus \
@@ -30,7 +30,7 @@ RUN wget https://github.com/oasisprotocol/nexus/releases/download/v${NEXUS_VERSI
3030
# && rm -rf /nexus-git
3131

3232
ARG EXPLORER_REPO=https://github.com/oasisprotocol/explorer.git
33-
ARG EXPLORER_VERSION=v1.16.1
33+
ARG EXPLORER_VERSION=v1.20.0
3434
COPY docker/common/nexus.env.production /nexus.env.production
3535
RUN git clone ${EXPLORER_REPO} explorer --depth 1 \
3636
&& cd explorer \
@@ -63,8 +63,8 @@ RUN apt update && apt install -y bash libseccomp2 unzip jq binutils curl wget ng
6363
&& rm -f /etc/apt/keyrings/envoy-keyring.gpg
6464

6565
# Docker-specific variables
66-
ENV OASIS_CORE_VERSION=24.3.1
67-
ENV OASIS_CLI_VERSION=0.10.3
66+
ENV OASIS_CORE_VERSION=25.3
67+
ENV OASIS_CLI_VERSION=0.13.4
6868
ENV PARATIME_VERSION=11.0.0-testnet
6969
ENV PARATIME_NAME=emerald
7070
ENV GATEWAY__CHAIN_ID=0xa514

docker/sapphire-localnet/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG PARATIME_VERSION=0.9.2
1+
ARG PARATIME_VERSION=0.10.3
22
ARG PARATIME_NAME=sapphire
33

4-
FROM ghcr.io/oasisprotocol/oasis-core-dev:stable-24.3.x AS oasis-core-dev
4+
FROM ghcr.io/oasisprotocol/oasis-core-dev:stable-25.3.x AS oasis-core-dev
55

66
ARG PARATIME_VERSION
77
ARG PARATIME_NAME
@@ -11,19 +11,19 @@ ARG PARATIME_NAME
1111
# variant.
1212
# Note that the simple keymanager is always freshly built because we need to
1313
# specify different build options from what is in the release version.
14-
ARG OASIS_CORE_SIMPLE_KM_BRANCH=stable/24.3.x
15-
ARG OASIS_CORE_VERSION=24.3.2
14+
ARG OASIS_CORE_SIMPLE_KM_BRANCH=stable/25.3.x
15+
ARG OASIS_CORE_VERSION=25.3
1616
#ARG OASIS_CORE_BRANCH=stable/24.3.x
17-
ARG OASIS_CLI_VERSION=0.10.3
17+
ARG OASIS_CLI_VERSION=0.13.4
1818
#ARG OASIS_CLI_BRANCH=master
1919
ARG OASIS_WEB3_GATEWAY_BRANCH=v5.2.0-rc1
2020
#ARG OASIS_WEB3_GATEWAY_VERSION=main
2121
#ARG OASIS_SAPPHIRE_PARATIME_BRANCH=main
2222

23-
ARG NEXUS_VERSION=0.5.3
24-
#ARG NEXUS_BRANCH=main
23+
ARG NEXUS_VERSION=0.6.13
24+
# ARG NEXUS_BRANCH=main
2525

26-
ARG EXPLORER_BRANCH=v1.16.1
26+
ARG EXPLORER_BRANCH=v1.20.0
2727

2828
COPY docker/common /out
2929
COPY tests/tools/* /out/
@@ -183,7 +183,7 @@ ENV OASIS_EXPLORER_DIR=/explorer
183183
ENV OASIS_EXPLORER_NGINX_CONFIG_FILE=/explorer.nginx.conf
184184
ENV OASIS_UNSAFE_SKIP_AVR_VERIFY=1
185185
ENV OASIS_UNSAFE_ALLOW_DEBUG_ENCLAVES=1
186-
ENV OASIS_UNSAFE_MOCK_SGX=1
186+
ENV OASIS_UNSAFE_MOCK_TEE=1
187187

188188
ARG VERSION
189189

go.mod

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/oasisprotocol/oasis-web3-gateway
22

3-
go 1.23.3
3+
go 1.24.0
4+
5+
toolchain go1.24.3
46

57
replace (
68
// Should be synced with Oasis Core as replace directives are not propagated.
@@ -19,8 +21,8 @@ require (
1921
github.com/gorilla/mux v1.8.1
2022
github.com/gorilla/websocket v1.5.3
2123
github.com/knadh/koanf v1.5.0
22-
github.com/oasisprotocol/oasis-core/go v0.2403.0
23-
github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.11.1
24+
github.com/oasisprotocol/oasis-core/go v0.2502.0
25+
github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.14.0
2426
github.com/prometheus/client_golang v1.22.0
2527
github.com/rs/cors v1.11.1
2628
github.com/spf13/cobra v1.9.1
@@ -43,18 +45,18 @@ require (
4345
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
4446
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
4547
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
46-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
48+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4749
github.com/cespare/xxhash/v2 v2.3.0 // indirect
48-
github.com/cometbft/cometbft v0.37.11 // indirect
50+
github.com/cometbft/cometbft v0.37.15 // indirect
4951
github.com/consensys/bavard v0.1.13 // indirect
5052
github.com/consensys/gnark-crypto v0.12.1 // indirect
5153
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
5254
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
5355
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5456
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
5557
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
56-
github.com/dgraph-io/badger/v4 v4.3.1 // indirect
57-
github.com/dgraph-io/ristretto v1.0.0 // indirect
58+
github.com/dgraph-io/badger/v4 v4.5.1 // indirect
59+
github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
5860
github.com/dustin/go-humanize v1.0.1 // indirect
5961
github.com/eapache/channels v1.1.0 // indirect
6062
github.com/eapache/queue v1.1.0 // indirect
@@ -68,11 +70,10 @@ require (
6870
github.com/go-logfmt/logfmt v0.6.0 // indirect
6971
github.com/go-ole/go-ole v1.3.0 // indirect
7072
github.com/gofrs/flock v0.8.1 // indirect
71-
github.com/gogo/protobuf v1.3.2 // indirect
7273
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7374
github.com/golang/protobuf v1.5.4 // indirect
7475
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
75-
github.com/google/flatbuffers v24.3.25+incompatible // indirect
76+
github.com/google/flatbuffers v24.12.23+incompatible // indirect
7677
github.com/hashicorp/go-hclog v1.5.0 // indirect
7778
github.com/hashicorp/go-plugin v1.4.6 // indirect
7879
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
@@ -82,14 +83,14 @@ require (
8283
github.com/holiman/uint256 v1.3.1 // indirect
8384
github.com/huin/goupnp v1.3.0 // indirect
8485
github.com/inconshreveable/mousetrap v1.1.0 // indirect
85-
github.com/ipfs/go-cid v0.4.1 // indirect
86+
github.com/ipfs/go-cid v0.5.0 // indirect
8687
github.com/ipfs/go-log/v2 v2.5.1 // indirect
8788
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
8889
github.com/jinzhu/inflection v1.0.0 // indirect
8990
github.com/klauspost/compress v1.18.0 // indirect
90-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
91+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
9192
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
92-
github.com/libp2p/go-libp2p v0.36.5 // indirect
93+
github.com/libp2p/go-libp2p v0.39.0 // indirect
9394
github.com/magiconair/properties v1.8.7 // indirect
9495
github.com/mattn/go-colorable v0.1.14 // indirect
9596
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -103,11 +104,11 @@ require (
103104
github.com/mr-tron/base58 v1.2.0 // indirect
104105
github.com/multiformats/go-base32 v0.1.0 // indirect
105106
github.com/multiformats/go-base36 v0.2.0 // indirect
106-
github.com/multiformats/go-multiaddr v0.13.0 // indirect
107+
github.com/multiformats/go-multiaddr v0.14.0 // indirect
107108
github.com/multiformats/go-multibase v0.2.0 // indirect
108109
github.com/multiformats/go-multicodec v0.9.0 // indirect
109110
github.com/multiformats/go-multihash v0.2.3 // indirect
110-
github.com/multiformats/go-multistream v0.5.0 // indirect
111+
github.com/multiformats/go-multistream v0.6.0 // indirect
111112
github.com/multiformats/go-varint v0.0.7 // indirect
112113
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
113114
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
@@ -148,8 +149,8 @@ require (
148149
go.opentelemetry.io/otel/trace v1.34.0 // indirect
149150
go.uber.org/multierr v1.11.0 // indirect
150151
go.uber.org/zap v1.27.0 // indirect
151-
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
152-
golang.org/x/net v0.35.0 // indirect
152+
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
153+
golang.org/x/net v0.38.0 // indirect
153154
golang.org/x/sync v0.14.0 // indirect
154155
golang.org/x/sys v0.33.0 // indirect
155156
golang.org/x/text v0.25.0 // indirect

0 commit comments

Comments
 (0)