From 49b2d365b10be773905b1b7555cae59d8b2257a8 Mon Sep 17 00:00:00 2001 From: Teddy Ding Date: Mon, 21 Oct 2024 13:12:55 -0400 Subject: [PATCH] Always reset Oe - bump SDK --- .github/workflows/protocol-build-and-push-mainnet.yml | 1 + .github/workflows/protocol-build-and-push-snapshot.yml | 1 + .github/workflows/protocol-build-and-push-testnet.yml | 1 + .github/workflows/protocol-build-and-push.yml | 1 + protocol/go.mod | 2 +- protocol/go.sum | 4 ++-- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/protocol-build-and-push-mainnet.yml b/.github/workflows/protocol-build-and-push-mainnet.yml index 3999f9fda4..da88616aa7 100644 --- a/.github/workflows/protocol-build-and-push-mainnet.yml +++ b/.github/workflows/protocol-build-and-push-mainnet.yml @@ -7,6 +7,7 @@ on: # yamllint disable-line rule:truthy - 'release/protocol/v[0-9]+.x' # e.g. release/protocol/v1.x push: branches: + - 'td/**' - 'release/protocol/v[0-9]+.[0-9]+.x' # e.g. release/protocol/v0.1.x - 'release/protocol/v[0-9]+.x' # e.g. release/protocol/v1.x diff --git a/.github/workflows/protocol-build-and-push-snapshot.yml b/.github/workflows/protocol-build-and-push-snapshot.yml index e5ff2c8b05..d8fcf45c11 100644 --- a/.github/workflows/protocol-build-and-push-snapshot.yml +++ b/.github/workflows/protocol-build-and-push-snapshot.yml @@ -3,6 +3,7 @@ name: Protocol Build & Push Image to AWS ECR on: # yamllint disable-line rule:truthy push: branches: + - 'td/**' - main - 'release/protocol/v[0-9]+.[0-9]+.x' # e.g. release/protocol/v0.1.x - 'release/protocol/v[0-9]+.x' # e.g. release/protocol/v1.x diff --git a/.github/workflows/protocol-build-and-push-testnet.yml b/.github/workflows/protocol-build-and-push-testnet.yml index 29e79317ee..0e16ec862e 100644 --- a/.github/workflows/protocol-build-and-push-testnet.yml +++ b/.github/workflows/protocol-build-and-push-testnet.yml @@ -7,6 +7,7 @@ on: # yamllint disable-line rule:truthy - 'release/protocol/v[0-9]+.x' # e.g. release/protocol/v1.x push: branches: + - 'td/**' - 'release/protocol/v[0-9]+.[0-9]+.x' # e.g. release/protocol/v0.1.x - 'release/protocol/v[0-9]+.x' # e.g. release/protocol/v1.x diff --git a/.github/workflows/protocol-build-and-push.yml b/.github/workflows/protocol-build-and-push.yml index ade5341369..a7706153c8 100644 --- a/.github/workflows/protocol-build-and-push.yml +++ b/.github/workflows/protocol-build-and-push.yml @@ -3,6 +3,7 @@ name: Protocol Build & Push Image to AWS ECR on: # yamllint disable-line rule:truthy push: branches: + - 'td/**' - main - 'release/protocol/v[0-9]+.[0-9]+.x' # e.g. release/protocol/v0.1.x - 'release/protocol/v[0-9]+.x' # e.g. release/protocol/v1.x diff --git a/protocol/go.mod b/protocol/go.mod index b2224d6ad0..a19f92c860 100644 --- a/protocol/go.mod +++ b/protocol/go.mod @@ -465,7 +465,7 @@ replace ( // Use dYdX fork of CometBFT github.com/cometbft/cometbft => github.com/dydxprotocol/cometbft v0.38.6-0.20241001172045-cfee87f3abbf // Use dYdX fork of Cosmos SDK - github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20240808180557-4b1c1dc17703 + github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241021163619-676b1f562830 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 e3611326e6..cbb42050c3 100644 --- a/protocol/go.sum +++ b/protocol/go.sum @@ -955,8 +955,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.20241001172045-cfee87f3abbf h1:pdKqF/qshVtVxcCfpK93QSUIIV3UjR/zj0RfPuqFPwU= github.com/dydxprotocol/cometbft v0.38.6-0.20241001172045-cfee87f3abbf/go.mod h1:EBEod7kZfNr4W0VooOrTEMSiXNrSyiQ/M2FL/rOcPCs= -github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20240808180557-4b1c1dc17703 h1:4bNZ3j0dhbxWfqyEKc0sC2377m+t+wFuFDocqig9VLo= -github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20240808180557-4b1c1dc17703/go.mod h1:TWUDGvgHJ49+QI6WOf03km3TuUOoAplzgnsjGQH3L7s= +github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241021163619-676b1f562830 h1:k42Neb1yg7QiQ7HCWwfXZhy/Ls+IZGw0mcuL31Cjum8= +github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20241021163619-676b1f562830/go.mod h1:TWUDGvgHJ49+QI6WOf03km3TuUOoAplzgnsjGQH3L7s= 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=