Skip to content

Commit

Permalink
Bump Oasis Core to 22.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pro-wh committed Mar 4, 2022
1 parent 9f233d5 commit e0221a2
Show file tree
Hide file tree
Showing 5 changed files with 259 additions and 253 deletions.
1 change: 1 addition & 0 deletions .changelog/290.feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump Oasis Core to 22.0
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include common.mk

OASIS_RELEASE := 21.3.9
OASIS_RELEASE := 22.0
ROSETTA_CLI_RELEASE := 0.7.3

# Check which tool to use for downloading.
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM golang:1.17-bullseye AS build
# Install prerequisites.
RUN apt-get update && apt-get install -y bzip2 libseccomp-dev

ARG CORE_BRANCH=v21.3.9
ARG CORE_BRANCH=v22.0
ARG CORE_GITHUB=https://github.com/oasisprotocol/oasis-core

ARG GATEWAY_BRANCH=master
Expand All @@ -25,8 +25,8 @@ ARG JEMALLOC_CHECKSUM=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537
ARG GENESIS_MAINNET_URL=https://github.com/oasisprotocol/mainnet-artifacts/releases/download/2021-04-28/genesis.json
ARG GENESIS_MAINNET_FILE_CHECKSUM=8ae33cffe67e3df1be392dddde332a73f207cede5992c93600b0ae65c22af2a2

ARG GENESIS_TESTNET_URL=https://github.com/oasisprotocol/testnet-artifacts/releases/download/2021-04-13/genesis.json
ARG GENESIS_TESTNET_FILE_CHECKSUM=ccac45fdf81f572c63e915a2dcb90b4281443020229a0df38d76018b55674489
ARG GENESIS_TESTNET_URL=https://github.com/oasisprotocol/testnet-artifacts/releases/download/2022-03-03/genesis.json
ARG GENESIS_TESTNET_FILE_CHECKSUM=4c3d271253d2a324816de3b9a048261b674471e7d4f9a02995a769489bd41984

# Fetch and build jemalloc (used by BadgerDB).
RUN wget -O jemalloc.tar.bz2 \
Expand Down
30 changes: 14 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/tendermint/tendermint => github.com/oasisprotocol/tendermint
require (
github.com/coinbase/rosetta-cli v0.7.3
github.com/coinbase/rosetta-sdk-go v0.7.3
github.com/oasisprotocol/oasis-core/go v0.2103.9
github.com/oasisprotocol/oasis-core/go v0.2200.0
google.golang.org/grpc v1.44.0
)

Expand All @@ -22,7 +22,7 @@ require (
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coinbase/kryptology v1.5.5 // indirect
github.com/consensys/gnark-crypto v0.5.3 // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
Expand All @@ -34,37 +34,37 @@ require (
github.com/ethereum/go-ethereum v1.10.13 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/fxamacker/cbor/v2 v2.2.1-0.20200820021930-bafca87fa6db // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/klauspost/compress v1.12.3 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/neilotoole/errgroup v0.1.6 // indirect
github.com/nixberg/chacha-rng-go v0.1.0 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20210505121811-294cf0fbfb43 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20211219162838-e9a669f65da9 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.31.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/segmentio/fasthash v1.0.3 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.9.0 // indirect
github.com/spf13/viper v1.10.1 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tendermint/tendermint v0.34.9 // indirect
github.com/tendermint/tendermint v0.34.15 // indirect
github.com/tidwall/gjson v1.12.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
Expand All @@ -73,16 +73,14 @@ require (
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/whyrusleeping/go-logging v0.0.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.dedis.ch/fixbuf v1.0.3 // indirect
go.dedis.ch/kyber/v3 v3.0.13 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272 // indirect
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc/security/advancedtls v0.0.0-20200902210233-8630cac324bf // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/ini.v1 v1.63.2 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

0 comments on commit e0221a2

Please sign in to comment.