From d3f3eafb070290843c4fb099dd6c55c80d362f0e Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Sun, 5 Nov 2023 17:56:04 -0700 Subject: [PATCH] potentially revert go mod changes --- go.mod | 10 +++++----- osmoutils/go.mod | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 58358eb629c..1ed6c0790f4 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.0 - cosmossdk.io/math v1.1.2 + cosmossdk.io/math v1.1.3-rc.1 cosmossdk.io/tools/rosetta v0.2.1 github.com/CosmWasm/wasmd v0.40.1 github.com/cometbft/cometbft v0.37.2 @@ -364,7 +364,7 @@ require ( replace ( cosmossdk.io/math => cosmossdk.io/math v1.1.2 - + github.com/coinbase/rosetta-sdk-go => github.com/coinbase/rosetta-sdk-go v0.7.9 // force utilizing the following versions github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20231030033644-c3c7ab7f52ea @@ -384,10 +384,10 @@ replace ( // github.com/osmosis-labs/osmosis/x/ibc-hooks => ./x/ibc-hooks ) -// exclusion so we use v1.0.0 -exclude github.com/coinbase/rosetta-sdk-go v0.7.9 +// // exclusion so we use v1.0.0 +// exclude github.com/coinbase/rosetta-sdk-go v0.7.9 -exclude cosmossdk.io/math v1.1.3-rc.1 +// exclude cosmossdk.io/math v1.1.3-rc.1 // // exclusion so we use v1.0.0-beta.2 // exclude github.com/cosmos/cosmos-proto v1.0.0-beta.3 diff --git a/osmoutils/go.mod b/osmoutils/go.mod index b182383d286..586218e951b 100644 --- a/osmoutils/go.mod +++ b/osmoutils/go.mod @@ -158,11 +158,11 @@ require ( ) replace ( - cosmossdk.io/math => cosmossdk.io/math v1.1.2 // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk, current branch: osmosis-main. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/05346fa12992 github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.6-0.20231030033644-c3c7ab7f52ea github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb + cosmossdk.io/math => cosmossdk.io/math v1.1.2 // Local replaces commented for development // github.com/osmosis-labs/osmosis/osmomath => ../osmomath