From 33c2d9b8fc54f9b78a83ca48db8ce15f30b1070c Mon Sep 17 00:00:00 2001 From: vincentwschau <99756290+vincentwschau@users.noreply.github.com> Date: Wed, 8 Jan 2025 13:45:22 -0500 Subject: [PATCH] Patch for ASA-2024-0012 and 0013. (#2666) (cherry picked from commit 2a79ca0186598c7af5ae6267b4ccfb10fd7b61ff) # Conflicts: # protocol/go.mod # protocol/go.sum --- protocol/go.mod | 4 ++++ protocol/go.sum | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/protocol/go.mod b/protocol/go.mod index 0f4821444f..8f88930ccf 100644 --- a/protocol/go.mod +++ b/protocol/go.mod @@ -472,7 +472,11 @@ replace ( // Use dYdX fork of CometBFT github.com/cometbft/cometbft => github.com/dydxprotocol/cometbft v0.38.6-0.20241126215519-69cdde955fd0 // Use dYdX fork of Cosmos SDK +<<<<<<< HEAD github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241127172510-4ee58434cdea +======= + github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250107211707-20a978a867c1 +>>>>>>> 2a79ca01 (Patch for ASA-2024-0012 and 0013. (#2666)) github.com/cosmos/iavl => github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85 ) diff --git a/protocol/go.sum b/protocol/go.sum index fc9ec1f3b6..ab8ceb49f6 100644 --- a/protocol/go.sum +++ b/protocol/go.sum @@ -960,8 +960,13 @@ 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.20241126215519-69cdde955fd0 h1:KBMuBNAE91SVeULnq2XBnmSDGeimI6aM1+YxlLb0yOI= github.com/dydxprotocol/cometbft v0.38.6-0.20241126215519-69cdde955fd0/go.mod h1:XSQX1hQbr54qaJb4/5YNNZGXkAQHHa6bi/KMcN1SQ7w= +<<<<<<< HEAD github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241127172510-4ee58434cdea h1:5jsj2e6zqnx7Q7SiNTYC7UGEW0ymgKFTbLxzp27/2Fg= github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241127172510-4ee58434cdea/go.mod h1:z/5+LD4MJzLqbe+fBCWI2pZLnQbOlzSM82snAw2zceg= +======= +github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250107211707-20a978a867c1 h1:zPRNAsR7j1jCkIEO5VwyaHefRDapdDeN4cQlkJ1hdgA= +github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250107211707-20a978a867c1/go.mod h1:z/5+LD4MJzLqbe+fBCWI2pZLnQbOlzSM82snAw2zceg= +>>>>>>> 2a79ca01 (Patch for ASA-2024-0012 and 0013. (#2666)) github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d h1:HgLu1FD2oDFzlKW6/+SFXlH5Os8cwNTbplQIrQOWx8w= github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d/go.mod h1:zMcD3hfNwd0WMTpdRUhS3QxoCoEtBXWeoKsu3iaLBbQ= github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85 h1:5B/yGZyTBX/OZASQQMnk6Ms/TZja56MYd8OBaVc0Mho=