From 0f19dd14f80d1446dbcfd808d94c38b714b2ab12 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 17:36:54 -0400 Subject: [PATCH] Upgrade cosmos fork to use libsecp256k1 from go-ethereum (backport #1210) (#1517) * Upgrade cosmos fork to use libsecp256k1 from go-ethereum (#1210) (cherry picked from commit 42cbee63bcb8960df4c2ed73f5bf419bf97c805f) # Conflicts: # protocol/go.mod # protocol/go.sum * resolve conflict --------- Co-authored-by: roy-dydx <133032749+roy-dydx@users.noreply.github.com> Co-authored-by: Roy Li <roy@dydx.exchange> --- protocol/Makefile | 4 ---- protocol/go.mod | 2 +- protocol/go.sum | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/protocol/Makefile b/protocol/Makefile index 6c8b11fb94..1860b031b9 100644 --- a/protocol/Makefile +++ b/protocol/Makefile @@ -35,10 +35,6 @@ ifeq ($(LEDGER_ENABLED),true) endif endif -# libsecp256k1_sdk is disabled by default as both ethereum/go-ethereum and cosmos/cosmos-sdk will define duplicate symbols -ifeq (secp,$(findstring secp,$(COSMOS_BUILD_OPTIONS))) - build_tags += libsecp256k1_sdk # Requires CGO_ENABLED=1 -endif ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS))) build_tags += gcc endif diff --git a/protocol/go.mod b/protocol/go.mod index c0a986cc0d..2f6548e930 100644 --- a/protocol/go.mod +++ b/protocol/go.mod @@ -414,7 +414,7 @@ replace ( // Use dYdX fork of CometBFT github.com/cometbft/cometbft => github.com/dydxprotocol/cometbft v0.38.6-0.20240426214049-a7ed4c26b62c // Use dYdX fork of Cosmos SDK - github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.5-0.20240220212824-35f31482370c + github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.5-0.20240514191316-d7a660d6f78b github.com/cosmos/iavl => github.com/dydxprotocol/iavl v1.1.1-0.20240408175732-0fca9d69cbc4 ) diff --git a/protocol/go.sum b/protocol/go.sum index 3260c62607..584c373a3b 100644 --- a/protocol/go.sum +++ b/protocol/go.sum @@ -522,8 +522,8 @@ github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/dydxprotocol/cometbft v0.38.6-0.20240426214049-a7ed4c26b62c h1:nZ/smgLPZNgEBmxnejq/Qv2htLNfXK7DYFNV+EsgNcY= github.com/dydxprotocol/cometbft v0.38.6-0.20240426214049-a7ed4c26b62c/go.mod h1:EBEod7kZfNr4W0VooOrTEMSiXNrSyiQ/M2FL/rOcPCs= -github.com/dydxprotocol/cosmos-sdk v0.50.5-0.20240220212824-35f31482370c h1:vTcPGxL/uU0MF/Wfzi3G0uzLweEj/417qs1enjf0q60= -github.com/dydxprotocol/cosmos-sdk v0.50.5-0.20240220212824-35f31482370c/go.mod h1:AgkOyykpqwdRuf8cLqoA6PxNZC6ODwNmPrEGYuRzBFY= +github.com/dydxprotocol/cosmos-sdk v0.50.5-0.20240514191316-d7a660d6f78b h1:fqqozdlBmkpishFdCHbrhB/5/eF0G3sFhry+oSRpRCQ= +github.com/dydxprotocol/cosmos-sdk v0.50.5-0.20240514191316-d7a660d6f78b/go.mod h1:0aNcByZzPnnr0A3EfICX+2BJm8IT4fJjrOECu1QOphU= github.com/dydxprotocol/iavl v1.1.1-0.20240408175732-0fca9d69cbc4 h1:/ylf3Y3CVT8uFy7E2C/wRcoOEcTMieNiymGqHGsLzKQ= github.com/dydxprotocol/iavl v1.1.1-0.20240408175732-0fca9d69cbc4/go.mod h1:8xIUkgVvwvVrBu81scdPty+/Dx9GqwHnAvXz4cwF7RY= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=