File tree Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -472,7 +472,11 @@ replace (
472
472
// Use dYdX fork of CometBFT
473
473
github.com/cometbft/cometbft => github.com/dydxprotocol/cometbft v0.38.6-0.20241126215519-69cdde955fd0
474
474
// Use dYdX fork of Cosmos SDK
475
+ <<<<<<< HEAD
475
476
github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241127172510-4ee58434cdea
477
+ =======
478
+ github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250107211707-20a978a867c1
479
+ >>>>>>> 2a79ca01 (Patch for ASA-2024-0012 and 0013. (#2666))
476
480
github.com/cosmos/iavl => github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85
477
481
)
478
482
Original file line number Diff line number Diff line change @@ -960,8 +960,13 @@ github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA
960
960
github.com/dvsekhvalnov/jose2go v1.6.0 /go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU =
961
961
github.com/dydxprotocol/cometbft v0.38.6-0.20241126215519-69cdde955fd0 h1:KBMuBNAE91SVeULnq2XBnmSDGeimI6aM1+YxlLb0yOI =
962
962
github.com/dydxprotocol/cometbft v0.38.6-0.20241126215519-69cdde955fd0 /go.mod h1:XSQX1hQbr54qaJb4/5YNNZGXkAQHHa6bi/KMcN1SQ7w =
963
+ <<<<<<< HEAD
963
964
github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241127172510-4ee58434cdea h1:5jsj2e6zqnx7Q7SiNTYC7UGEW0ymgKFTbLxzp27/2Fg =
964
965
github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241127172510-4ee58434cdea /go.mod h1:z/5+LD4MJzLqbe+fBCWI2pZLnQbOlzSM82snAw2zceg =
966
+ =======
967
+ github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250107211707-20a978a867c1 h1:zPRNAsR7j1jCkIEO5VwyaHefRDapdDeN4cQlkJ1hdgA =
968
+ github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250107211707-20a978a867c1 /go.mod h1:z/5+LD4MJzLqbe+fBCWI2pZLnQbOlzSM82snAw2zceg =
969
+ >>>>>>> 2a79ca01 (Patch for ASA-2024-0012 and 0013. (#2666))
965
970
github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d h1:HgLu1FD2oDFzlKW6/+SFXlH5Os8cwNTbplQIrQOWx8w =
966
971
github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d /go.mod h1:zMcD3hfNwd0WMTpdRUhS3QxoCoEtBXWeoKsu3iaLBbQ =
967
972
github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85 h1:5B/yGZyTBX/OZASQQMnk6Ms/TZja56MYd8OBaVc0Mho =
You can’t perform that action at this time.
0 commit comments