Skip to content

Commit

Permalink
Merge pull request #1846 from oasisprotocol/kostko/feature/oasis-core…
Browse files Browse the repository at this point in the history 
…-24.1.0

Bump Oasis Core to 24.1
  • Loading branch information
@kostko
kostko committed Jul 1, 2024
2 parents 22326fa + 1e09a73 commit dfa1d9b
Show file tree
Hide file tree
Showing 19 changed files with 463 additions and 463 deletions.
244 changes: 122 additions & 122 deletions Cargo.lock
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions client-sdk/go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.2

// Should be synced with Oasis Core as replace directives are not propagated.
replace (
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.2-oasis1
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.7-oasis1
golang.org/x/crypto/curve25519 => github.com/oasisprotocol/curve25519-voi/primitives/x25519 v0.0.0-20210505121811-294cf0fbfb43
golang.org/x/crypto/ed25519 => github.com/oasisprotocol/curve25519-voi/primitives/ed25519 v0.0.0-20210505121811-294cf0fbfb43
)
Expand All @@ -15,7 +15,7 @@ require (
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7
github.com/oasisprotocol/oasis-core/go v0.2400.0
github.com/oasisprotocol/oasis-core/go v0.2401.0
github.com/shopspring/decimal v1.4.0
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.23.0
Expand All @@ -30,7 +30,7 @@ require (
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cometbft/cometbft v0.37.6 // indirect
github.com/cometbft/cometbft v0.37.7 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions client-sdk/go/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,14 +361,14 @@ github.com/multiformats/go-multistream v0.5.0 h1:5htLSLl7lvJk3xx3qT/8Zm9J4K8vEOf
github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dydlEqV3l6N3/GBsX6ILA=
github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
github.com/oasisprotocol/cometbft v0.37.2-oasis1 h1:7yr/5f0vV1bQLKoZHFhs3mcHay3nLKT9m8bVIJAgdMU=
github.com/oasisprotocol/cometbft v0.37.2-oasis1/go.mod h1:w7GZmT0jJ/i9Uz9ZWtzE3chuNZ3phUboSrFzPZIoYts=
github.com/oasisprotocol/cometbft v0.37.7-oasis1 h1:g0Em8QuX8lM0dUyTm0Uqxr1I9MVESzseNdqe2TUUbM4=
github.com/oasisprotocol/cometbft v0.37.7-oasis1/go.mod h1:nSVQTIrRBnQMkL8LbR6RUL18vTWWuOlIINFrDzWxlXI=
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dlRvE5fWabOchtH7znfiFCcOvmIYgOeAS5ifBXBlh9Q=
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s=
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:UqoUn6cHESlliMhOnKLWr+CBH+e3bazUPvFj1XZwAjs=
github.com/oasisprotocol/oasis-core/go v0.2400.0 h1:pAYIz8bt0iLcTha9aLpMjM+8GfKA50pXDl3+Lj6FgFg=
github.com/oasisprotocol/oasis-core/go v0.2400.0/go.mod h1:7Ub+/AHGXtmoguyLIfqBi0xIN0ZeoKmaib0A9BA0DyE=
github.com/oasisprotocol/oasis-core/go v0.2401.0 h1:ggFn5e7sTZFzITL8hFv8WXLkCfVAfHoJPLLmReSGR00=
github.com/oasisprotocol/oasis-core/go v0.2401.0/go.mod h1:1YqXr6AYJGv6CTaep/XIZ56cfq0820PFz6ALfvoyyq8=
github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
Expand Down
4 changes: 2 additions & 2 deletions client-sdk/ts-web/core/reflect-go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ go 1.22.2

replace github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.2-oasis1

require github.com/oasisprotocol/oasis-core/go v0.2400.0
require github.com/oasisprotocol/oasis-core/go v0.2401.0

require (
github.com/a8m/envsubst v1.4.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cometbft/cometbft v0.37.6 // indirect
github.com/cometbft/cometbft v0.37.7 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect