Skip to content

Commit

Permalink
Merge pull request #683 from oasisprotocol/andrew7234/bump-oasis-sdk
Browse files Browse the repository at this point in the history
bump oasis-sdk version to v0.8.2
  • Loading branch information
Andrew7234 authored Apr 19, 2024
2 parents 7a8682f + 9fec6ab commit bfd57fe
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 154 deletions.
1 change: 1 addition & 0 deletions .changelog/683.internal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bump oasis-sdk version
26 changes: 13 additions & 13 deletions .github/workflows/ci-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:
CI_TEST_CONN_STRING: "postgresql://postgres:[email protected]:5432/postgres?sslmode=disable"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.21.3
go-version: 1.22.x
- name: Install Go tools
run: go install github.com/deepmap/oapi-codegen/cmd/[email protected]
- name: Build Go
Expand All @@ -60,7 +60,7 @@ jobs:
# NOTE: This should run _after_ the build step, so that oapi-codegen has already run
# and generated the Go code that points to some of the dependencies.
run: |
go mod tidy -v -x -compat=1.21 # goreleaser does the same; can find lingering issues
go mod tidy -v -x -compat=1.22 # goreleaser does the same; can find lingering issues
echo TIDY RESULTS START; git diff || true; echo TIDY RESULTS END
- name: Upload to codecov.io
uses: codecov/[email protected]
Expand Down Expand Up @@ -101,11 +101,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22.x
- name: Autogenerate Go code
run: |
go install github.com/deepmap/oapi-codegen/cmd/[email protected]
Expand Down Expand Up @@ -137,13 +137,13 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22.x
- name: Autogenerate Go code
run: |
go install github.com/deepmap/oapi-codegen/cmd/[email protected]
Expand All @@ -168,13 +168,13 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22.x
- name: Autogenerate Go code
run: |
go install github.com/deepmap/oapi-codegen/cmd/[email protected]
Expand Down
20 changes: 0 additions & 20 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,26 +211,6 @@ func (sc *SourceConfig) SDKNetwork() *sdkConfig.Network {
}

func (sc *SourceConfig) SDKParaTime(runtime common.Runtime) *sdkConfig.ParaTime {
// XXX Remove once https://github.com/oasisprotocol/oasis-sdk/pull/1638 is merged.
// This hardcodes the pontusx paratime config until then.
if runtime == common.RuntimePontusx {
return &sdkConfig.ParaTime{
Description: "Pontus-X Testnet",
ID: "0000000000000000000000000000000000000000000000004febe52eb412b421",
Denominations: map[string]*sdkConfig.DenominationInfo{
sdkConfig.NativeDenominationKey: {
Symbol: "EUROe",
Decimals: 18,
},
// The consensus layer denomination when deposited into the runtime.
"TEST": {
Symbol: "TEST",
Decimals: 18,
},
},
}
}

return sc.SDKNetwork().ParaTimes.All[string(runtime)]
}

Expand Down
4 changes: 2 additions & 2 deletions docker/nexus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bookworm AS nexus-builder
FROM golang:1.22-bookworm AS nexus-builder

WORKDIR /code/go

Expand All @@ -20,7 +20,7 @@ RUN npx redoc-cli build api/spec/v1.yaml -o api/spec/v1.html

############

FROM golang:1.21-bookworm AS nexus
FROM golang:1.22-bookworm AS nexus

WORKDIR /nexus

Expand Down
2 changes: 1 addition & 1 deletion docker/oasis-net-runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bookworm AS oasis-core
FROM golang:1.22-bookworm AS oasis-core

ARG OASIS_CORE_VERSION=23.0.2

Expand Down
2 changes: 1 addition & 1 deletion docker/oasis-node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bookworm AS oasis-node
FROM golang:1.22-bookworm AS oasis-node

ARG OASIS_CORE_VERSION=23.0.2

Expand Down
63 changes: 31 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/oasisprotocol/nexus

go 1.21
go 1.22

toolchain go1.21.3
toolchain go1.22.2

replace (
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.2-oasis1
Expand All @@ -15,20 +15,20 @@ replace (

require (
github.com/dgraph-io/ristretto v0.1.1
github.com/ethereum/go-ethereum v1.13.4
github.com/ethereum/go-ethereum v1.13.12
github.com/go-chi/chi/v5 v5.0.7
github.com/go-kit/log v0.2.1
github.com/golang-migrate/migrate/v4 v4.15.2
github.com/google/uuid v1.3.1
github.com/google/uuid v1.4.0
github.com/jackc/pgx/v5 v5.5.4
github.com/knadh/koanf v1.4.1
github.com/oasisprotocol/oasis-core/go v0.2300.1
github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0
github.com/prometheus/client_golang v1.14.0
github.com/oasisprotocol/oasis-core/go v0.2300.10
github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.8.2
github.com/prometheus/client_golang v1.17.0
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.4
golang.org/x/sync v0.4.0 // indirect
google.golang.org/grpc v1.59.0
github.com/stretchr/testify v1.9.0
golang.org/x/sync v0.6.0 // indirect
google.golang.org/grpc v1.61.1
gopkg.in/yaml.v2 v2.4.0 // indirect
)

Expand All @@ -39,7 +39,7 @@ require (
github.com/a8m/envsubst v1.4.2 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
github.com/bits-and-blooms/bitset v1.13.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
Expand All @@ -50,15 +50,15 @@ require (
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/cosmos/gogoproto v1.4.1 // indirect
github.com/crate-crypto/go-kzg-4844 v0.6.0 // indirect
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/eapache/channels v1.1.0 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/ethereum/c-kzg-4844 v0.3.1 // indirect
github.com/ethereum/c-kzg-4844 v0.4.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getkin/kin-openapi v0.107.0 // indirect
Expand All @@ -68,7 +68,6 @@ require (
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
Expand All @@ -82,7 +81,7 @@ require (
github.com/hashicorp/go-plugin v1.4.6 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/holiman/uint256 v1.2.4 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/invopop/yaml v0.1.0 // indirect
github.com/ipfs/go-cid v0.4.1 // indirect
Expand All @@ -98,11 +97,11 @@ require (
github.com/labstack/gommon v0.4.0 // indirect
github.com/lib/pq v1.10.7 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-libp2p v0.30.0 // indirect
github.com/libp2p/go-libp2p v0.32.2 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
Expand All @@ -115,11 +114,11 @@ require (
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr v0.11.0 // indirect
github.com/multiformats/go-multiaddr v0.12.0 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multicodec v0.9.0 // indirect
github.com/multiformats/go-multihash v0.2.3 // indirect
github.com/multiformats/go-multistream v0.4.1 // indirect
github.com/multiformats/go-multistream v0.5.0 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
github.com/oklog/run v1.0.0 // indirect
Expand All @@ -128,9 +127,9 @@ require (
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
Expand All @@ -150,15 +149,15 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.16.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
golang.org/x/tools v0.18.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/grpc/security/advancedtls v0.0.0-20221004221323-12db695f1648 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand All @@ -175,6 +174,6 @@ require (
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a
github.com/oasisprotocol/metadata-registry-tools v0.0.0-20230424075921-93d132769e14
github.com/rs/cors v1.8.3
golang.org/x/crypto v0.18.0
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/crypto v0.21.0
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
)
Loading

0 comments on commit bfd57fe

Please sign in to comment.