From ce438fb5813a3955ddd77cfd1a3c477ab84c3932 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 10:30:38 +0100 Subject: [PATCH] chore: update to tagged submodules (backport #8218) (#8223) * chore: update to tagged submodules (#8218) (cherry picked from commit 55278a3068087058464d653a09135206c7d4288b) # Conflicts: # go.mod # go.sum # osmomath/go.mod # osmomath/go.sum # osmoutils/go.mod # osmoutils/go.sum # x/epochs/go.mod # x/epochs/go.sum # x/ibc-hooks/go.mod # x/ibc-hooks/go.sum * chore: fix merge conflicts * chore: fix merge conflicts --------- Co-authored-by: PaddyMc --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- osmomath/go.mod | 2 +- osmomath/go.sum | 4 ++-- osmoutils/go.mod | 2 +- osmoutils/go.sum | 8 ++++---- x/epochs/go.mod | 2 +- x/epochs/go.sum | 8 ++++---- x/ibc-hooks/go.mod | 4 ++-- x/ibc-hooks/go.sum | 12 ++++++------ 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 97356105e9b..daebe61cdd3 100644 --- a/go.mod +++ b/go.mod @@ -28,10 +28,10 @@ require ( github.com/mattn/go-sqlite3 v1.14.17 github.com/ory/dockertest/v3 v3.10.0 github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 - github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 - github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 - github.com/osmosis-labs/osmosis/x/epochs v0.0.9-0.20240502181753-5ba797611f84 - github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15-0.20240502181753-5ba797611f84 + github.com/osmosis-labs/osmosis/osmomath v0.0.13 + github.com/osmosis-labs/osmosis/osmoutils v0.0.13 + github.com/osmosis-labs/osmosis/x/epochs v0.0.9 + github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15 github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea github.com/pkg/errors v0.9.1 github.com/rakyll/statik v0.1.7 diff --git a/go.sum b/go.sum index 80be1ee7760..9ff7d5f05a2 100644 --- a/go.sum +++ b/go.sum @@ -1485,14 +1485,14 @@ github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/ github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k= github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY= github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI= -github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 h1:h7fA83QzN1vVibEi+WpLNDxHwsDhc+t2kkRcfQ8jSF8= -github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:eWYAcQOQLAfj2AVAXYzRJECpmSgGPXbXPsFFtI4SMhI= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 h1:/OXRU8pDbMFkIxfv8sBFbmW7TD+nmPn9J2FPrA1Btis= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:UFD8ht+LfM/3ge8LqMt1uUqXcC7UabAkR5/jTanfdX0= -github.com/osmosis-labs/osmosis/x/epochs v0.0.9-0.20240502181753-5ba797611f84 h1:zyAQg4YHVqokeAT1OYtapXLrgrnDYwft02Qln2lFFzU= -github.com/osmosis-labs/osmosis/x/epochs v0.0.9-0.20240502181753-5ba797611f84/go.mod h1:9slBqQ/wuqHsjRZAvNXsSXPMKKPPUm7ttPQO8y8WgwE= -github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15-0.20240502181753-5ba797611f84 h1:w5/xe/hWI01UPvl7DEJpAkBEZ+WojC2fjO72DJSxP6M= -github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15-0.20240502181753-5ba797611f84/go.mod h1:2NeUt7QGUnSsbm/ShzbjwqugkWTrmCDCXHmtz776kx0= +github.com/osmosis-labs/osmosis/osmomath v0.0.13 h1:BqOlG9SxHn8D4RmCbeF4Cg4/2FUobFe+QNxflRTM4QA= +github.com/osmosis-labs/osmosis/osmomath v0.0.13/go.mod h1:eEvmkFLKy1h+EKTr2rhFpmLu4solO3XG0jZt10VSCSI= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13 h1:+9EGL5dSL6JH2AD1TiJ+zhkqcwhtg8hPzAPvcjSpQeU= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13/go.mod h1:lMdKRtlQQk3hOdt/HHrcKnCm3LhxR7PP2/jHFktfiUI= +github.com/osmosis-labs/osmosis/x/epochs v0.0.9 h1:KKNMuoGlGv3yxmh+hF5yIqjYbxjXW8vBDFiCIfZcn78= +github.com/osmosis-labs/osmosis/x/epochs v0.0.9/go.mod h1:jROhCibKGjWW1IyPaCFUIEJ9P25S0VawgIpWRxcqYqQ= +github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15 h1:bUBZwiMibgQWQQSqyMPqj0p54hpsDwbkCpNROWdWYJk= +github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15/go.mod h1:c72yyA6FvQNgOm/NxQuDXQfRpYy2JCJpf1o+G4kFuyM= github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea h1:jcwN05LSSV7Vdp+FHp3WtabuFtBb7l+ki4O5R2P1Sr4= github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea/go.mod h1:d3wAamev0J2ABDeUvCDTUnw0mMrraXRia1e/dqq/xFI= github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8= diff --git a/osmomath/go.mod b/osmomath/go.mod index 488d6646e6e..30f36bc55b4 100644 --- a/osmomath/go.mod +++ b/osmomath/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.5 require ( cosmossdk.io/math v1.3.0 github.com/cosmos/cosmos-sdk v0.47.8 - github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 + github.com/osmosis-labs/osmosis/osmoutils v0.0.13 github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/osmomath/go.sum b/osmomath/go.sum index 6e6f2e686ae..0912cc06155 100644 --- a/osmomath/go.sum +++ b/osmomath/go.sum @@ -263,8 +263,8 @@ github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 h1:/OXRU8pDbMFkIxfv8sBFbmW7TD+nmPn9J2FPrA1Btis= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:UFD8ht+LfM/3ge8LqMt1uUqXcC7UabAkR5/jTanfdX0= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13 h1:+9EGL5dSL6JH2AD1TiJ+zhkqcwhtg8hPzAPvcjSpQeU= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13/go.mod h1:lMdKRtlQQk3hOdt/HHrcKnCm3LhxR7PP2/jHFktfiUI= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= diff --git a/osmoutils/go.mod b/osmoutils/go.mod index 4095b6075fa..f5a158b8651 100644 --- a/osmoutils/go.mod +++ b/osmoutils/go.mod @@ -13,7 +13,7 @@ require ( github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/iavl v1.1.2-0.20240405173644-e52f7630d3b7 github.com/cosmos/ibc-go/v7 v7.4.0 - github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 + github.com/osmosis-labs/osmosis/osmomath v0.0.13 github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 diff --git a/osmoutils/go.sum b/osmoutils/go.sum index 3333856113f..4adc8861973 100644 --- a/osmoutils/go.sum +++ b/osmoutils/go.sum @@ -1273,12 +1273,12 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= -github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1 h1:HezZywIk7C9UbCMuqrpBgC0gQi9F1rPtBcf/XzrWXDY= -github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg= +github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2 h1:sEYLujiwT2rMRQVtZbYhEEj8rRGPxszdoqTANqaP3YQ= +github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k= -github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 h1:h7fA83QzN1vVibEi+WpLNDxHwsDhc+t2kkRcfQ8jSF8= -github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:eWYAcQOQLAfj2AVAXYzRJECpmSgGPXbXPsFFtI4SMhI= +github.com/osmosis-labs/osmosis/osmomath v0.0.13 h1:BqOlG9SxHn8D4RmCbeF4Cg4/2FUobFe+QNxflRTM4QA= +github.com/osmosis-labs/osmosis/osmomath v0.0.13/go.mod h1:eEvmkFLKy1h+EKTr2rhFpmLu4solO3XG0jZt10VSCSI= github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888 h1:c+b4PKumqTYNDOOP+R53lnjxiocmYwjLgfBR6VfnGes= github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888/go.mod h1:TI3Qr4dqna7/afmPJUlueSg2iX5gI4YzHuye3y83S5E= github.com/osmosis-labs/osmosis/x/epochs v0.0.9-0.20240502181753-5ba797611f84 h1:zyAQg4YHVqokeAT1OYtapXLrgrnDYwft02Qln2lFFzU= diff --git a/x/epochs/go.mod b/x/epochs/go.mod index e9877c70a81..d9410f5ed02 100644 --- a/x/epochs/go.mod +++ b/x/epochs/go.mod @@ -11,7 +11,7 @@ require ( github.com/cosmos/gogoproto v1.4.11 github.com/golang/protobuf v1.5.4 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 + github.com/osmosis-labs/osmosis/osmoutils v0.0.13 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc diff --git a/x/epochs/go.sum b/x/epochs/go.sum index 893b73b09bd..1c19c270ce8 100644 --- a/x/epochs/go.sum +++ b/x/epochs/go.sum @@ -1220,14 +1220,14 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= -github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1 h1:HezZywIk7C9UbCMuqrpBgC0gQi9F1rPtBcf/XzrWXDY= -github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg= +github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2 h1:sEYLujiwT2rMRQVtZbYhEEj8rRGPxszdoqTANqaP3YQ= +github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k= github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 h1:h7fA83QzN1vVibEi+WpLNDxHwsDhc+t2kkRcfQ8jSF8= github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:eWYAcQOQLAfj2AVAXYzRJECpmSgGPXbXPsFFtI4SMhI= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 h1:/OXRU8pDbMFkIxfv8sBFbmW7TD+nmPn9J2FPrA1Btis= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:UFD8ht+LfM/3ge8LqMt1uUqXcC7UabAkR5/jTanfdX0= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13 h1:+9EGL5dSL6JH2AD1TiJ+zhkqcwhtg8hPzAPvcjSpQeU= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13/go.mod h1:lMdKRtlQQk3hOdt/HHrcKnCm3LhxR7PP2/jHFktfiUI= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= diff --git a/x/ibc-hooks/go.mod b/x/ibc-hooks/go.mod index 7140e58342e..e3e26a10a2e 100644 --- a/x/ibc-hooks/go.mod +++ b/x/ibc-hooks/go.mod @@ -13,8 +13,8 @@ require ( github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/ibc-go/v7 v7.4.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 - github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 + github.com/osmosis-labs/osmosis/osmomath v0.0.13 + github.com/osmosis-labs/osmosis/osmoutils v0.0.13 github.com/spf13/cobra v1.8.0 google.golang.org/grpc v1.63.2 google.golang.org/protobuf v1.33.0 diff --git a/x/ibc-hooks/go.sum b/x/ibc-hooks/go.sum index 5ad158baea9..8349c96636e 100644 --- a/x/ibc-hooks/go.sum +++ b/x/ibc-hooks/go.sum @@ -1235,14 +1235,14 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= -github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1 h1:HezZywIk7C9UbCMuqrpBgC0gQi9F1rPtBcf/XzrWXDY= -github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-1/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg= +github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2 h1:sEYLujiwT2rMRQVtZbYhEEj8rRGPxszdoqTANqaP3YQ= +github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM= github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k= -github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84 h1:h7fA83QzN1vVibEi+WpLNDxHwsDhc+t2kkRcfQ8jSF8= -github.com/osmosis-labs/osmosis/osmomath v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:eWYAcQOQLAfj2AVAXYzRJECpmSgGPXbXPsFFtI4SMhI= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84 h1:/OXRU8pDbMFkIxfv8sBFbmW7TD+nmPn9J2FPrA1Btis= -github.com/osmosis-labs/osmosis/osmoutils v0.0.13-0.20240502181753-5ba797611f84/go.mod h1:UFD8ht+LfM/3ge8LqMt1uUqXcC7UabAkR5/jTanfdX0= +github.com/osmosis-labs/osmosis/osmomath v0.0.13 h1:BqOlG9SxHn8D4RmCbeF4Cg4/2FUobFe+QNxflRTM4QA= +github.com/osmosis-labs/osmosis/osmomath v0.0.13/go.mod h1:eEvmkFLKy1h+EKTr2rhFpmLu4solO3XG0jZt10VSCSI= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13 h1:+9EGL5dSL6JH2AD1TiJ+zhkqcwhtg8hPzAPvcjSpQeU= +github.com/osmosis-labs/osmosis/osmoutils v0.0.13/go.mod h1:lMdKRtlQQk3hOdt/HHrcKnCm3LhxR7PP2/jHFktfiUI= github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8= github.com/osmosis-labs/wasmd v0.45.0-osmo/go.mod h1:J6eRvwii5T1WxhetZkBg1kOJS3GTn1Bw2OLyZBb8EVU= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=