Skip to content

Commit 4af719e

Browse files
authored
Merge pull request #1088 from oasisprotocol/ptrus/feature/update-dependencies
go: Bump dependencies
2 parents b07faa1 + 56f0475 commit 4af719e

File tree

6 files changed

+269
-141
lines changed

6 files changed

+269
-141
lines changed

.changelog/1088.feature.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump Go dependencies

analyzer/runtime/runtime_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ package runtime_test
99
import (
1010
"context"
1111
"fmt"
12+
"math"
1213
"os"
1314
"sync"
1415
"testing"
1516
"time"
1617

17-
"github.com/ethereum/go-ethereum/common/math"
1818
"github.com/stretchr/testify/require"
1919

2020
"github.com/oasisprotocol/oasis-core/go/common/cbor"

analyzer/uncategorized/evm_raw_tx.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@ func decodeEthRawTx(body []byte, minGasPrice common.BigInt) (*sdkTypes.Transacti
2626
} else {
2727
tb = evmV1.Create(ethTx.Value().Bytes(), ethTx.Data())
2828
}
29+
2930
chainIDBI := ethTx.ChainId()
31+
if chainIDBI == nil || chainIDBI.Cmp(big.NewInt(0)) == 0 {
32+
// Legacy transactions don't have a chain ID, use 1 in that case as a default.
33+
// https://github.com/ethereum/go-ethereum/issues/31653
34+
chainIDBI = big.NewInt(1)
35+
}
3036
signer := ethTypes.LatestSignerForChainID(chainIDBI)
3137
pubUncompressed, err := CancunSenderPub(signer, &ethTx)
3238
if err != nil {

go.mod

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ replace (
1212
)
1313

1414
require (
15-
github.com/ethereum/go-ethereum v1.14.0
16-
github.com/go-chi/chi/v5 v5.0.7
15+
github.com/ethereum/go-ethereum v1.16.1
16+
github.com/go-chi/chi/v5 v5.2.2
1717
github.com/go-kit/log v0.2.1
18-
github.com/golang-migrate/migrate/v4 v4.18.2
18+
github.com/golang-migrate/migrate/v4 v4.18.3
1919
github.com/google/uuid v1.6.0
2020
github.com/jackc/pgx/v5 v5.7.5
21-
github.com/knadh/koanf v1.4.1
22-
github.com/prometheus/client_golang v1.20.5
23-
github.com/spf13/cobra v1.8.1
21+
github.com/knadh/koanf v1.5.0
22+
github.com/prometheus/client_golang v1.22.0
23+
github.com/spf13/cobra v1.9.1
2424
github.com/stretchr/testify v1.10.0
25-
golang.org/x/sync v0.13.0
26-
google.golang.org/grpc v1.68.0
25+
golang.org/x/sync v0.16.0
26+
google.golang.org/grpc v1.73.0
2727
gopkg.in/yaml.v2 v2.4.0 // indirect
2828
)
2929

@@ -34,18 +34,17 @@ require (
3434
github.com/a8m/envsubst v1.4.2 // indirect
3535
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
3636
github.com/beorn7/perks v1.0.1 // indirect
37-
github.com/bits-and-blooms/bitset v1.13.0 // indirect
37+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
3838
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
3939
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
4040
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
4141
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4242
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4343
github.com/cloudflare/circl v1.3.7 // indirect
44-
github.com/cometbft/cometbft v0.37.15 // indirect
45-
github.com/consensys/bavard v0.1.13 // indirect
46-
github.com/consensys/gnark-crypto v0.12.1 // indirect
44+
github.com/consensys/gnark-crypto v0.18.0 // indirect
4745
github.com/cosmos/gogoproto v1.7.0 // indirect
48-
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
46+
github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect
47+
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
4948
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
5049
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5150
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
@@ -56,23 +55,24 @@ require (
5655
github.com/eapache/channels v1.1.0 // indirect
5756
github.com/eapache/queue v1.1.0 // indirect
5857
github.com/emirpasic/gods v1.18.1 // indirect
59-
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
60-
github.com/fatih/color v1.14.1 // indirect
58+
github.com/ethereum/c-kzg-4844/v2 v2.1.0 // indirect
59+
github.com/ethereum/go-verkle v0.2.2 // indirect
60+
github.com/fatih/color v1.16.0 // indirect
6161
github.com/fsnotify/fsnotify v1.7.0 // indirect
6262
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
6363
github.com/getkin/kin-openapi v0.127.0 // indirect
6464
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6565
github.com/go-git/go-billy/v5 v5.5.0 // indirect
6666
github.com/go-git/go-git/v5 v5.11.0 // indirect
67-
github.com/go-kit/kit v0.13.0 // indirect
67+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
6868
github.com/go-logfmt/logfmt v0.6.0 // indirect
6969
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7070
github.com/go-openapi/swag v0.23.0 // indirect
7171
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7272
github.com/golang/protobuf v1.5.4 // indirect
7373
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
7474
github.com/google/flatbuffers v24.12.23+incompatible // indirect
75-
github.com/google/go-cmp v0.6.0 // indirect
75+
github.com/google/go-cmp v0.7.0 // indirect
7676
github.com/google/go-github/v39 v39.2.0 // indirect
7777
github.com/google/go-querystring v1.1.0 // indirect
7878
github.com/gtank/merlin v0.1.1 // indirect
@@ -82,7 +82,7 @@ require (
8282
github.com/hashicorp/go-plugin v1.4.6 // indirect
8383
github.com/hashicorp/hcl v1.0.0 // indirect
8484
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
85-
github.com/holiman/uint256 v1.2.4 // indirect
85+
github.com/holiman/uint256 v1.3.2 // indirect
8686
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8787
github.com/invopop/yaml v0.3.1 // indirect
8888
github.com/ipfs/go-cid v0.5.0 // indirect
@@ -94,7 +94,7 @@ require (
9494
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
9595
github.com/josharian/intern v1.0.0 // indirect
9696
github.com/kevinburke/ssh_config v1.2.0 // indirect
97-
github.com/klauspost/compress v1.17.11 // indirect
97+
github.com/klauspost/compress v1.18.0 // indirect
9898
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
9999
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
100100
github.com/libp2p/go-libp2p v0.39.0 // indirect
@@ -108,7 +108,6 @@ require (
108108
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
109109
github.com/mitchellh/mapstructure v1.5.0 // indirect
110110
github.com/mitchellh/reflectwalk v1.0.2 // indirect
111-
github.com/mmcloughlin/addchain v0.4.0 // indirect
112111
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
113112
github.com/mr-tron/base58 v1.2.0 // indirect
114113
github.com/multiformats/go-base32 v0.1.0 // indirect
@@ -142,46 +141,48 @@ require (
142141
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
143142
github.com/spf13/afero v1.11.0 // indirect
144143
github.com/spf13/cast v1.6.0 // indirect
145-
github.com/spf13/pflag v1.0.5 // indirect
144+
github.com/spf13/pflag v1.0.6 // indirect
146145
github.com/spf13/viper v1.19.0 // indirect
146+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
147147
github.com/subosito/gotenv v1.6.0 // indirect
148-
github.com/supranational/blst v0.3.11 // indirect
148+
github.com/supranational/blst v0.3.14 // indirect
149149
github.com/tidwall/btree v1.6.0 // indirect
150150
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
151151
github.com/x448/float16 v0.8.4 // indirect
152152
github.com/xanzy/ssh-agent v0.3.3 // indirect
153+
github.com/zeebo/errs v1.4.0 // indirect
153154
go.dedis.ch/fixbuf v1.0.3 // indirect
154155
go.opencensus.io v0.24.0 // indirect
155156
go.uber.org/atomic v1.11.0 // indirect
156157
go.uber.org/multierr v1.11.0 // indirect
157158
go.uber.org/zap v1.27.0 // indirect
158159
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
159-
golang.org/x/mod v0.23.0 // indirect
160-
golang.org/x/net v0.38.0 // indirect
161-
golang.org/x/oauth2 v0.24.0 // indirect
162-
golang.org/x/sys v0.32.0 // indirect
163-
golang.org/x/text v0.24.0 // indirect
164-
golang.org/x/tools v0.29.0 // indirect
165-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
160+
golang.org/x/mod v0.25.0 // indirect
161+
golang.org/x/net v0.41.0 // indirect
162+
golang.org/x/oauth2 v0.28.0 // indirect
163+
golang.org/x/sys v0.33.0 // indirect
164+
golang.org/x/text v0.26.0 // indirect
165+
golang.org/x/tools v0.33.0 // indirect
166+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
166167
google.golang.org/grpc/security/advancedtls v0.0.0-20221004221323-12db695f1648 // indirect
167-
google.golang.org/protobuf v1.36.4 // indirect
168+
google.golang.org/protobuf v1.36.6 // indirect
168169
gopkg.in/ini.v1 v1.67.0 // indirect
169170
gopkg.in/warnings.v0 v0.1.2 // indirect
170171
gopkg.in/yaml.v3 v3.0.1 // indirect
171172
lukechampine.com/blake3 v1.3.0 // indirect
172-
rsc.io/tmplfunc v0.0.3 // indirect
173173
)
174174

175175
require (
176176
github.com/akrylysov/pogreb v0.10.2
177+
github.com/cometbft/cometbft v0.37.15
177178
github.com/dgraph-io/ristretto v1.0.0
178179
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
179180
github.com/oapi-codegen/runtime v1.1.1
180181
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a
181182
github.com/oasisprotocol/metadata-registry-tools v0.0.0-20240304080528-3218befba9ca
182-
github.com/oasisprotocol/oasis-core/go v0.2503.0
183+
github.com/oasisprotocol/oasis-core/go v0.2504.0
183184
github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.15.2
184185
github.com/rs/cors v1.11.1
185186
go.dedis.ch/kyber/v3 v3.1.0
186-
golang.org/x/crypto v0.37.0
187+
golang.org/x/crypto v0.39.0
187188
)

0 commit comments

Comments
 (0)