From 8e9f54f75d0efbe153513f7fb171e5cbbe814d8c Mon Sep 17 00:00:00 2001 From: Mathieu Hofman Date: Tue, 9 Apr 2024 15:56:03 +0000 Subject: [PATCH 1/2] fix(cosmos): bump iavl dep --- golang/cosmos/go.mod | 3 +++ golang/cosmos/go.sum | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/golang/cosmos/go.mod b/golang/cosmos/go.mod index c4c2202e6af..3c51bc15cbf 100644 --- a/golang/cosmos/go.mod +++ b/golang/cosmos/go.mod @@ -171,6 +171,9 @@ replace ( // We need a fork of cosmos-sdk until all of the differences are merged. github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.1 + // replace broken iavl + github.com/cosmos/iavl => github.com/cosmos/iavl v0.19.7 + // https://pkg.go.dev/vuln/GO-2023-2409 github.com/dvsekhvalnov/jose2go => github.com/dvsekhvalnov/jose2go v1.5.1-0.20231206184617-48ba0b76bc88 diff --git a/golang/cosmos/go.sum b/golang/cosmos/go.sum index b6bd9a041c2..3ed543a29ef 100644 --- a/golang/cosmos/go.sum +++ b/golang/cosmos/go.sum @@ -376,8 +376,8 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU= -github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/iavl v0.19.7 h1:ij32FaEnwxfEurtK0QKDNhTWFnz6NUmrI5gky/WnoY0= +github.com/cosmos/iavl v0.19.7/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go/v6 v6.2.1 h1:NiaDXTRhKwf3n9kELD4VRIe5zby1yk1jBvaz9tXTQ6k= github.com/cosmos/ibc-go/v6 v6.2.1/go.mod h1:XLsARy4Y7+GtAqzMcxNdlQf6lx+ti1e8KcMGv5NIK7A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= From df1c1f1de0534acdb9784b498926d82399139a76 Mon Sep 17 00:00:00 2001 From: Jim Larson Date: Fri, 12 Apr 2024 12:50:58 -0700 Subject: [PATCH 2/2] fix: pick up iavl, client type flag, and simulation fixes --- golang/cosmos/go.mod | 2 +- golang/cosmos/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/golang/cosmos/go.mod b/golang/cosmos/go.mod index 3c51bc15cbf..7558956e329 100644 --- a/golang/cosmos/go.mod +++ b/golang/cosmos/go.mod @@ -169,7 +169,7 @@ replace ( github.com/confio/ics23/go => github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1 // We need a fork of cosmos-sdk until all of the differences are merged. - github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.1 + github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.2 // replace broken iavl github.com/cosmos/iavl => github.com/cosmos/iavl v0.19.7 diff --git a/golang/cosmos/go.sum b/golang/cosmos/go.sum index 3ed543a29ef..f5f93ba41db 100644 --- a/golang/cosmos/go.sum +++ b/golang/cosmos/go.sum @@ -232,8 +232,8 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBA github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/agoric-labs/cometbft v0.34.30-alpha.agoric.1 h1:tqCNL72pQXdUmBzgv1md5SN2U3K/PaYQ4qZ5pFv8v6w= github.com/agoric-labs/cometbft v0.34.30-alpha.agoric.1/go.mod h1:myvkihZD8eg9jKE3WFaugkNoL5nvEqlP7Jbjg98pCek= -github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.1 h1:VZFX9Mogwt4cVTnkdt9zA6UJue4XYXdBURNhlTWw71Q= -github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.1/go.mod h1:zUe5lsg/X7SeSO1nGkzOh9EGKO295szfrxIxYmeLYic= +github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.2 h1:RhejLqrW8kGuO4GbH3y1+ttfRCwRobDh7wmfnkdSGHI= +github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.2/go.mod h1:d7e4h+w7FNBNmE6ysp6duBVuQg67pqMtvsLwpT9ca3E= github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1 h1:2jvHI/2d+psWAZy6FQ0vXJCHUtfU3ZbbW+pQFL04arQ= github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=