Skip to content
This repository was archived by the owner on Apr 4, 2024. It is now read-only.

Commit a8ea4ec

Browse files
danburckfacs95
andauthored
backport: add v0.19.3 dragonberry changes to main and bump iavl to v0.19.4 (#1419)
* backport: v0.19.3 dragonberry changes and iavl bump * add v0.19.3 changelog * update gomod2nix * fix linter * use latest for golangci github workflow Co-authored-by: Freddy Caceres <[email protected]>
1 parent 9181079 commit a8ea4ec

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
- uses: actions/setup-go@v3
1818
with:
1919
go-version: 1.19
20+
check-latest: true
2021
- uses: actions/checkout@v3
2122
- uses: technote-space/[email protected]
2223
with:
@@ -27,7 +28,7 @@ jobs:
2728
- uses: golangci/[email protected]
2829
with:
2930
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
30-
version: v1.46.2
31+
version: latest
3132
args: --timeout 10m
3233
github-token: ${{ secrets.github_token }}
3334
# Check only if there are differences in the source code

.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ run:
66
linters:
77
enable:
88
- bodyclose
9-
- deadcode
109
- depguard
1110
- dogsled
1211
- dupl
@@ -30,7 +29,6 @@ linters:
3029
- unconvert
3130
- unparam
3231
- unused
33-
- varcheck
3432
- nolintlint
3533
- asciicheck
3634
- exportloopref

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
7878
* (state) [#1320](https://github.com/evmos/ethermint/pull/1320) Fix codehash check mismatch when the code has been deleted in the evm state.
7979
* (rpc) [#1392](https://github.com/evmos/ethermint/pull/1392) Allow fill the proposer address in json-rpc through tendermint api, and pass explicitly to grpc query handler.
8080

81+
## [v0.19.3] - 2022-10-14
82+
83+
* (deps) [1381](https://github.com/evmos/ethermint/pull/1381) Bump sdk to `v0.45.9`
84+
8185
## [v0.19.2] - 2022-08-29
8286

8387
### Improvements

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ require (
7070
github.com/cosmos/btcutil v1.0.4 // indirect
7171
github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect
7272
github.com/cosmos/gorocksdb v1.2.0 // indirect
73-
github.com/cosmos/iavl v0.19.3 // indirect
73+
github.com/cosmos/iavl v0.19.4 // indirect
7474
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
7575
github.com/cosmos/ledger-go v0.9.2 // indirect
7676
github.com/creachadair/taskgroup v0.3.2 // indirect
@@ -192,6 +192,8 @@ require (
192192
replace (
193193
// use cosmos keyring
194194
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
195+
// ics23 patch for dragonberry
196+
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
195197
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
196198
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
197199
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE
235235
github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI=
236236
github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA=
237237
github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M=
238-
github.com/confio/ics23/go v0.7.0 h1:00d2kukk7sPoHWL4zZBZwzxnpA2pec1NPdwbSokJ5w8=
239-
github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
240238
github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
241239
github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
242240
github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
@@ -254,13 +252,15 @@ github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hk
254252
github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw=
255253
github.com/cosmos/cosmos-sdk v0.46.3 h1:2jdJYcSwh4AtFJKGoNGvmEy2mKDWtGaVZphGpvedljQ=
256254
github.com/cosmos/cosmos-sdk v0.46.3/go.mod h1:AynIAjXwtS3T/ApdhNCz/7/KGMbZSUBbKRTcbukb2ic=
255+
github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k=
256+
github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30=
257257
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
258258
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
259259
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
260260
github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y=
261261
github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
262-
github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg=
263-
github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
262+
github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=
263+
github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
264264
github.com/cosmos/ibc-go/v5 v5.0.1 h1:ZI5xCi6RDOL+hyu6Wx/w6JoAYFlOoK5hijsRTVWo+RA=
265265
github.com/cosmos/ibc-go/v5 v5.0.1/go.mod h1:LX0DHLW3dfi/1e4BJzi8MGLWmQ4DSraPEgVjyo3VzAo=
266266
github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU=

gomod2nix.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ schema = 3
8484
version = "v0.7.9"
8585
hash = "sha256-ZWIXIXcHGjeCNgMrpXymry8/8esDDauGFfF/+gEoO1Y="
8686
[mod."github.com/confio/ics23/go"]
87-
version = "v0.7.0"
88-
hash = "sha256-FjUQfDKtX+/13+UjJzbYPAkgM4GPZ0vk+dKz7/iRetw="
87+
version = "v0.8.0"
88+
hash = "sha256-mFKxFHp7RaE1L5NdtH9H9px2Cy6I5uOZVnFOgE8Nrew="
89+
replaced = "github.com/cosmos/cosmos-sdk/ics23/go"
8990
[mod."github.com/cosmos/btcutil"]
9091
version = "v1.0.4"
9192
hash = "sha256-JvcBXBdjdmnaW/nyf/tw/uaOAGn1b78yxrtl2/Rs3kA="
@@ -102,8 +103,8 @@ schema = 3
102103
version = "v1.2.0"
103104
hash = "sha256-209TcVuXc5s/TcOvNlaQ1HEJAUDTEK3nxPhs+d8TEcY="
104105
[mod."github.com/cosmos/iavl"]
105-
version = "v0.19.3"
106-
hash = "sha256-rmW2KoKmm4YXmYIYE1vXMOCaDyP1ym0qsW224PYc9rg="
106+
version = "v0.19.4"
107+
hash = "sha256-EmpRZ48pjPFq/fIHneut9Vyo5QJATfb3ZO7KzWnqs9g="
107108
[mod."github.com/cosmos/ibc-go/v5"]
108109
version = "v5.0.1"
109110
hash = "sha256-44Vyj9i4gh6U0BGNsEFqRsHAYdxfuJmLGdtPWxcBfWQ="

x/feemarket/types/keys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const (
1919
// prefix bytes for the feemarket persistent store
2020
const (
2121
prefixBlockGasWanted = iota + 1
22-
deprecatedPrefixBaseFee //nolint
22+
deprecatedPrefixBaseFee // unused
2323
)
2424

2525
const (

0 commit comments

Comments
 (0)