From 5256f2fe2b30fe7b4df1bf65060dd628b13bfe01 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 17:53:55 -0800 Subject: [PATCH] build: update sdk version to updated fork version (backport #1718) (#1719) Co-authored-by: Ryan Christoffersen <12519942+ryanchristo@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- types/go.mod | 2 +- types/go.sum | 4 ++-- x/data/go.mod | 2 +- x/data/go.sum | 4 ++-- x/ecocredit/go.mod | 2 +- x/ecocredit/go.sum | 4 ++-- x/intertx/go.mod | 4 ++-- x/intertx/go.sum | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 6d664284c6..8b405bed3a 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,7 @@ require ( replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-1 +replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-2 replace github.com/regen-network/regen-ledger/api/v2 => ./api diff --git a/go.sum b/go.sum index eb5ba1c035..8eba14c44d 100644 --- a/go.sum +++ b/go.sum @@ -875,8 +875,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1 h1:8qsylsnUUygzYD/DzAgnkrjfNuruGEAbSSkPR6jPd2I= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2 h1:kaQDUZg5LYw0ub49LEQDPFRK1JFZJv5V5Pr1JW0IBS8= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= diff --git a/types/go.mod b/types/go.mod index fdeca555d5..2819ea61dc 100644 --- a/types/go.mod +++ b/types/go.mod @@ -144,7 +144,7 @@ require ( replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-1 +replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-2 replace github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 diff --git a/types/go.sum b/types/go.sum index d63ba09ea8..7c1151635d 100644 --- a/types/go.sum +++ b/types/go.sum @@ -801,8 +801,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1 h1:8qsylsnUUygzYD/DzAgnkrjfNuruGEAbSSkPR6jPd2I= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2 h1:kaQDUZg5LYw0ub49LEQDPFRK1JFZJv5V5Pr1JW0IBS8= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= diff --git a/x/data/go.mod b/x/data/go.mod index cf931d7139..53480169b2 100644 --- a/x/data/go.mod +++ b/x/data/go.mod @@ -170,7 +170,7 @@ require ( replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-1 +replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-2 replace github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 diff --git a/x/data/go.sum b/x/data/go.sum index 91fe3a7f73..1354e0cf80 100644 --- a/x/data/go.sum +++ b/x/data/go.sum @@ -872,8 +872,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1 h1:8qsylsnUUygzYD/DzAgnkrjfNuruGEAbSSkPR6jPd2I= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2 h1:kaQDUZg5LYw0ub49LEQDPFRK1JFZJv5V5Pr1JW0IBS8= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= diff --git a/x/ecocredit/go.mod b/x/ecocredit/go.mod index 69c32cc49f..3361373ee9 100644 --- a/x/ecocredit/go.mod +++ b/x/ecocredit/go.mod @@ -171,7 +171,7 @@ require ( replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-1 +replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-2 replace github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 diff --git a/x/ecocredit/go.sum b/x/ecocredit/go.sum index 449b6c58d8..5581412809 100644 --- a/x/ecocredit/go.sum +++ b/x/ecocredit/go.sum @@ -873,8 +873,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1 h1:8qsylsnUUygzYD/DzAgnkrjfNuruGEAbSSkPR6jPd2I= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2 h1:kaQDUZg5LYw0ub49LEQDPFRK1JFZJv5V5Pr1JW0IBS8= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= diff --git a/x/intertx/go.mod b/x/intertx/go.mod index e5bd60c479..ce7d694c37 100644 --- a/x/intertx/go.mod +++ b/x/intertx/go.mod @@ -11,6 +11,7 @@ require ( github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/pkg/errors v0.9.1 github.com/regen-network/gocuke v0.6.2 github.com/regen-network/regen-ledger/types/v2 v2.0.0 github.com/spf13/cobra v1.6.1 @@ -89,7 +90,6 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.12.2 // indirect github.com/prometheus/client_model v0.2.0 // indirect @@ -126,7 +126,7 @@ require ( replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-1 +replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.46.7-regen-2 replace github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 diff --git a/x/intertx/go.sum b/x/intertx/go.sum index e0bf5c12f7..2dd447e4f5 100644 --- a/x/intertx/go.sum +++ b/x/intertx/go.sum @@ -441,8 +441,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1 h1:8qsylsnUUygzYD/DzAgnkrjfNuruGEAbSSkPR6jPd2I= -github.com/regen-network/cosmos-sdk v0.46.7-regen-1/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2 h1:kaQDUZg5LYw0ub49LEQDPFRK1JFZJv5V5Pr1JW0IBS8= +github.com/regen-network/cosmos-sdk v0.46.7-regen-2/go.mod h1:VNXooaAWPvMmhrerxtevK/KFRuN81ccBqZCMZPBBsiw= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4=