From 451ce12c643f15da6a83100daa88b3b4ffbeb2ac Mon Sep 17 00:00:00 2001 From: drklee3 Date: Tue, 21 Jan 2025 15:06:23 -0800 Subject: [PATCH 1/4] chore(deps): Update Cosmos SDK to v0.47.15 This uses a TEMPORARY commit hash for testing, from PR https://github.com/Kava-Labs/cosmos-sdk/pull/560 This will be tested first against mainnet to ensure there are no apphash mismatch errors --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 26a339cbb..9e480e544 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ toolchain go1.22.8 require ( cosmossdk.io/errors v1.0.1 - cosmossdk.io/log v1.3.1 - cosmossdk.io/math v1.3.0 + cosmossdk.io/log v1.4.1 + cosmossdk.io/math v1.4.0 cosmossdk.io/simapp v0.0.0-20231127212628-044ff4d8c015 github.com/Kava-Labs/opendb v0.0.0-20240719173129-a2f11f6d7e51 github.com/cenkalti/backoff/v4 v4.3.0 @@ -179,7 +179,7 @@ require ( github.com/rjeczalik/notify v0.9.1 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/rs/cors v1.11.1 // indirect - github.com/rs/zerolog v1.32.0 // indirect + github.com/rs/zerolog v1.33.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sasha-s/go-deadlock v0.3.5 // indirect @@ -230,7 +230,7 @@ replace ( // Use cometbft fork of tendermint github.com/cometbft/cometbft => github.com/kava-labs/cometbft v0.37.13-kava.1 // Use cosmos-sdk fork with backported fix for unsafe-reset-all, staking transfer events, and custom tally handler support - github.com/cosmos/cosmos-sdk => github.com/kava-labs/cosmos-sdk v0.47.10-iavl-v1-kava.2 + github.com/cosmos/cosmos-sdk => github.com/kava-labs/cosmos-sdk v0.47.16-0.20250121221936-a254e397844d github.com/cosmos/iavl => github.com/kava-labs/iavl v1.2.0-kava.2 // See https://github.com/cosmos/cosmos-sdk/pull/13093 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index d46e8fab8..6cdaf1868 100644 --- a/go.sum +++ b/go.sum @@ -194,10 +194,10 @@ cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98ok cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= -cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= -cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= -cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= -cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= +cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= +cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= +cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= +cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= cosmossdk.io/simapp v0.0.0-20231127212628-044ff4d8c015 h1:ARUqouMWNreV8e5wxPberry+tm+Uk+1eeJDt3KXQEn0= cosmossdk.io/simapp v0.0.0-20231127212628-044ff4d8c015/go.mod h1:VNknW36ZIgwkjKtb6eyA4RZ7x9+ZpKMVCsAUA6bFWnk= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -903,8 +903,8 @@ github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kava-labs/cometbft v0.37.13-kava.1 h1:r7HgFDLu6jCfVbRMoQCpvcGzFEvmqyLKeVibFtxjLkk= github.com/kava-labs/cometbft v0.37.13-kava.1/go.mod h1:PHxduPKAWdfFUAqi6a2nrA+WBfjEqQ6Vg27fIBntRYE= -github.com/kava-labs/cosmos-sdk v0.47.10-iavl-v1-kava.2 h1:rbUXwJFlrRd05G1D5S5zAlmTTBbkcf0w36QFf5+i9tk= -github.com/kava-labs/cosmos-sdk v0.47.10-iavl-v1-kava.2/go.mod h1:OwLYEBcsnijCLE8gYkwQ7jycZZ/Acd+a83pJU+V+MKw= +github.com/kava-labs/cosmos-sdk v0.47.16-0.20250121221936-a254e397844d h1:pE08cUZMrcfwDOInJkKswsOF1zNM5yBbJ7SnOi3uHYo= +github.com/kava-labs/cosmos-sdk v0.47.16-0.20250121221936-a254e397844d/go.mod h1:3pOQQAEomoC6oCIWuYoVJdadWFexIkHmi2pGsPKQo90= github.com/kava-labs/ethermint v0.21.0-kava-v27.0 h1:TzFhLQULsyQUA+b620FMGvZHTNriRuWLFGShwW/4xCA= github.com/kava-labs/ethermint v0.21.0-kava-v27.0/go.mod h1:zGcUyJhdcoO0VfxAQwiXpGjBAV8w+Hig1yaH2l7KB5k= github.com/kava-labs/iavl v1.2.0-kava.2 h1:RfEqQ9u7fvhzXOfYxxqEnVNCTb3pYJiT7X86N6cgI0M= @@ -1206,8 +1206,8 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= -github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= From 0114b1f65266c1818f4b20fdf9f9152a290f593b Mon Sep 17 00:00:00 2001 From: drklee3 Date: Wed, 22 Jan 2025 12:52:06 -0800 Subject: [PATCH 2/4] chore(deps): Use tagged cosmos-sdk@v0.47.15-iavl-v1-kava.1 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9e480e544..bfb40d585 100644 --- a/go.mod +++ b/go.mod @@ -230,7 +230,7 @@ replace ( // Use cometbft fork of tendermint github.com/cometbft/cometbft => github.com/kava-labs/cometbft v0.37.13-kava.1 // Use cosmos-sdk fork with backported fix for unsafe-reset-all, staking transfer events, and custom tally handler support - github.com/cosmos/cosmos-sdk => github.com/kava-labs/cosmos-sdk v0.47.16-0.20250121221936-a254e397844d + github.com/cosmos/cosmos-sdk => github.com/kava-labs/cosmos-sdk v0.47.15-iavl-v1-kava.1 github.com/cosmos/iavl => github.com/kava-labs/iavl v1.2.0-kava.2 // See https://github.com/cosmos/cosmos-sdk/pull/13093 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index 6cdaf1868..57ec4c9f2 100644 --- a/go.sum +++ b/go.sum @@ -903,8 +903,8 @@ github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kava-labs/cometbft v0.37.13-kava.1 h1:r7HgFDLu6jCfVbRMoQCpvcGzFEvmqyLKeVibFtxjLkk= github.com/kava-labs/cometbft v0.37.13-kava.1/go.mod h1:PHxduPKAWdfFUAqi6a2nrA+WBfjEqQ6Vg27fIBntRYE= -github.com/kava-labs/cosmos-sdk v0.47.16-0.20250121221936-a254e397844d h1:pE08cUZMrcfwDOInJkKswsOF1zNM5yBbJ7SnOi3uHYo= -github.com/kava-labs/cosmos-sdk v0.47.16-0.20250121221936-a254e397844d/go.mod h1:3pOQQAEomoC6oCIWuYoVJdadWFexIkHmi2pGsPKQo90= +github.com/kava-labs/cosmos-sdk v0.47.15-iavl-v1-kava.1 h1:8cGSQsQgdpE8TGyU86WbNVRlRmzrDMGV9r16wl/CIMA= +github.com/kava-labs/cosmos-sdk v0.47.15-iavl-v1-kava.1/go.mod h1:3pOQQAEomoC6oCIWuYoVJdadWFexIkHmi2pGsPKQo90= github.com/kava-labs/ethermint v0.21.0-kava-v27.0 h1:TzFhLQULsyQUA+b620FMGvZHTNriRuWLFGShwW/4xCA= github.com/kava-labs/ethermint v0.21.0-kava-v27.0/go.mod h1:zGcUyJhdcoO0VfxAQwiXpGjBAV8w+Hig1yaH2l7KB5k= github.com/kava-labs/iavl v1.2.0-kava.2 h1:RfEqQ9u7fvhzXOfYxxqEnVNCTb3pYJiT7X86N6cgI0M= From b13a0a07303ad848ab4d7025f14d7bd3cdc7d438 Mon Sep 17 00:00:00 2001 From: drklee3 Date: Wed, 22 Jan 2025 12:59:41 -0800 Subject: [PATCH 3/4] chore(tests/e2e-ibc): Use tagged cosmos-sdk@v0.47.15-iavl-v1-kava.1 --- tests/e2e-ibc/go.mod | 8 ++++---- tests/e2e-ibc/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/e2e-ibc/go.mod b/tests/e2e-ibc/go.mod index 85852871c..d3ede8f5a 100644 --- a/tests/e2e-ibc/go.mod +++ b/tests/e2e-ibc/go.mod @@ -5,7 +5,7 @@ go 1.22.7 toolchain go1.22.8 require ( - cosmossdk.io/math v1.3.0 + cosmossdk.io/math v1.4.0 github.com/cosmos/ibc-go/v7 v7.4.0 github.com/ethereum/go-ethereum v1.10.26 github.com/stretchr/testify v1.9.0 @@ -27,7 +27,7 @@ require ( cosmossdk.io/core v0.6.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect cosmossdk.io/errors v1.0.1 // indirect - cosmossdk.io/log v1.3.1 // indirect + cosmossdk.io/log v1.4.1 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -207,7 +207,7 @@ require ( github.com/rjeczalik/notify v0.9.1 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/rs/cors v1.11.1 // indirect - github.com/rs/zerolog v1.32.0 // indirect + github.com/rs/zerolog v1.33.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sasha-s/go-deadlock v0.3.5 // indirect @@ -283,7 +283,7 @@ replace ( // Use cometbft fork of tendermint github.com/cometbft/cometbft => github.com/kava-labs/cometbft v0.37.13-kava.1 // Use cosmos-sdk fork with backported fix for unsafe-reset-all, staking transfer events, and custom tally handler support - github.com/cosmos/cosmos-sdk => github.com/kava-labs/cosmos-sdk v0.47.10-iavl-v1-kava.2 + github.com/cosmos/cosmos-sdk => github.com/kava-labs/cosmos-sdk v0.47.15-iavl-v1-kava.1 github.com/cosmos/iavl => github.com/kava-labs/iavl v1.2.0-kava.2 // See https://github.com/cosmos/cosmos-sdk/pull/13093 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/tests/e2e-ibc/go.sum b/tests/e2e-ibc/go.sum index f8350e946..3cef3026f 100644 --- a/tests/e2e-ibc/go.sum +++ b/tests/e2e-ibc/go.sum @@ -190,10 +190,10 @@ cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98ok cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= -cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= -cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= -cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= -cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= +cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= +cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= +cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= +cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= cosmossdk.io/simapp v0.0.0-20231127212628-044ff4d8c015 h1:ARUqouMWNreV8e5wxPberry+tm+Uk+1eeJDt3KXQEn0= cosmossdk.io/simapp v0.0.0-20231127212628-044ff4d8c015/go.mod h1:VNknW36ZIgwkjKtb6eyA4RZ7x9+ZpKMVCsAUA6bFWnk= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -837,8 +837,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kava-labs/cometbft v0.37.13-kava.1 h1:r7HgFDLu6jCfVbRMoQCpvcGzFEvmqyLKeVibFtxjLkk= github.com/kava-labs/cometbft v0.37.13-kava.1/go.mod h1:PHxduPKAWdfFUAqi6a2nrA+WBfjEqQ6Vg27fIBntRYE= -github.com/kava-labs/cosmos-sdk v0.47.10-iavl-v1-kava.2 h1:rbUXwJFlrRd05G1D5S5zAlmTTBbkcf0w36QFf5+i9tk= -github.com/kava-labs/cosmos-sdk v0.47.10-iavl-v1-kava.2/go.mod h1:OwLYEBcsnijCLE8gYkwQ7jycZZ/Acd+a83pJU+V+MKw= +github.com/kava-labs/cosmos-sdk v0.47.15-iavl-v1-kava.1 h1:8cGSQsQgdpE8TGyU86WbNVRlRmzrDMGV9r16wl/CIMA= +github.com/kava-labs/cosmos-sdk v0.47.15-iavl-v1-kava.1/go.mod h1:3pOQQAEomoC6oCIWuYoVJdadWFexIkHmi2pGsPKQo90= github.com/kava-labs/ethermint v0.21.0-kava-v27.0 h1:TzFhLQULsyQUA+b620FMGvZHTNriRuWLFGShwW/4xCA= github.com/kava-labs/ethermint v0.21.0-kava-v27.0/go.mod h1:zGcUyJhdcoO0VfxAQwiXpGjBAV8w+Hig1yaH2l7KB5k= github.com/kava-labs/iavl v1.2.0-kava.2 h1:RfEqQ9u7fvhzXOfYxxqEnVNCTb3pYJiT7X86N6cgI0M= @@ -1146,8 +1146,8 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= -github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= From f5afc55e86461b9a8f752e2a38ad6a418a772012 Mon Sep 17 00:00:00 2001 From: drklee3 Date: Wed, 22 Jan 2025 13:07:44 -0800 Subject: [PATCH 4/4] docs: Add v0.27.1 to changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b13fcf5c..78bc14fe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,11 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## [v0.27.1] + +### Improvements +- (deps) [#2062] Bump cosmos-sdk to v0.47.15-iavl-v1-kava.1 + ## [v0.27.0] ### State Machine Breaking Changes @@ -410,6 +415,7 @@ the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.38.4/CHANGELOG.md). [ethermint#82]: https://github.com/Kava-Labs/ethermint/pull/82 [ethermint#77]: https://github.com/Kava-Labs/ethermint/pull/77 [ethermint#75]: https://github.com/Kava-Labs/ethermint/pull/75 +[#2062]: https://github.com/Kava-Labs/kava/pull/2062 [#2047]: https://github.com/Kava-Labs/kava/pull/2047 [#2017]: https://github.com/Kava-Labs/kava/pull/2017 [#1973]: https://github.com/Kava-Labs/kava/pull/1973 @@ -482,6 +488,7 @@ the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.38.4/CHANGELOG.md). [#751]: https://github.com/Kava-Labs/kava/pull/751 [#780]: https://github.com/Kava-Labs/kava/pull/780 [unreleased]: https://github.com/Kava-Labs/kava/compare/v0.26.2-iavl-v1...release/v0.26.x-iavl-v1 +[v0.27.1]: https://github.com/Kava-Labs/kava/compare/v0.27.0...v0.27.1 [v0.27.0]: https://github.com/Kava-Labs/kava/compare/v0.26.2-iavl-v1...v0.27.0 [v0.26.2-iavl-v1]: https://github.com/Kava-Labs/kava/compare/v0.26.2...v0.26.2-iavl-v1 [v0.26.2]: https://github.com/Kava-Labs/kava/compare/v0.26.1...v0.26.2