Skip to content

Commit 0e878fa

Browse files
mergify[bot]tqin7
mergify[bot]
and
tqin7
authored
upgrade cometbft and v9.1 (backport #3082) (#3084)
Co-authored-by: Tian <tian@dydx.exchange>
1 parent 3b0e414 commit 0e878fa

File tree

10 files changed

+95
-55
lines changed

10 files changed

+95
-55
lines changed

‎protocol/app/upgrades.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package app
33
import (
44
"fmt"
55

6-
v_9_0 "github.com/dydxprotocol/v4-chain/protocol/app/upgrades/v9.0"
6+
v_9_1 "github.com/dydxprotocol/v4-chain/protocol/app/upgrades/v9.1"
77

88
upgradetypes "cosmossdk.io/x/upgrade/types"
99
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,20 +14,20 @@ var (
1414
// `Upgrades` defines the upgrade handlers and store loaders for the application.
1515
// New upgrades should be added to this slice after they are implemented.
1616
Upgrades = []upgrades.Upgrade{
17-
v_9_0.Upgrade,
17+
v_9_1.Upgrade,
1818
}
1919
Forks = []upgrades.Fork{}
2020
)
2121

2222
// setupUpgradeHandlers registers the upgrade handlers to perform custom upgrade
2323
// logic and state migrations for software upgrades.
2424
func (app *App) setupUpgradeHandlers() {
25-
if app.UpgradeKeeper.HasHandler(v_9_0.UpgradeName) {
26-
panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_9_0.UpgradeName))
25+
if app.UpgradeKeeper.HasHandler(v_9_1.UpgradeName) {
26+
panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_9_1.UpgradeName))
2727
}
2828
app.UpgradeKeeper.SetUpgradeHandler(
29-
v_9_0.UpgradeName,
30-
v_9_0.CreateUpgradeHandler(
29+
v_9_1.UpgradeName,
30+
v_9_1.CreateUpgradeHandler(
3131
app.ModuleManager,
3232
app.configurator,
3333
),

‎protocol/app/upgrades/v9.1/constants.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package v_9_1
2+
3+
import (
4+
store "cosmossdk.io/store/types"
5+
"github.com/dydxprotocol/v4-chain/protocol/app/upgrades"
6+
)
7+
8+
const (
9+
UpgradeName = "v9.1"
10+
)
11+
12+
var Upgrade = upgrades.Upgrade{
13+
UpgradeName: UpgradeName,
14+
StoreUpgrades: store.StoreUpgrades{},
15+
}

‎protocol/app/upgrades/v9.1/upgrade.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package v_9_1
2+
3+
import (
4+
"context"
5+
"fmt"
6+
7+
upgradetypes "cosmossdk.io/x/upgrade/types"
8+
"github.com/cosmos/cosmos-sdk/types/module"
9+
"github.com/dydxprotocol/v4-chain/protocol/lib"
10+
)
11+
12+
func CreateUpgradeHandler(
13+
mm *module.Manager,
14+
configurator module.Configurator,
15+
) upgradetypes.UpgradeHandler {
16+
return func(ctx context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
17+
sdkCtx := lib.UnwrapSDKContext(ctx, "app/upgrades")
18+
sdkCtx.Logger().Info(fmt.Sprintf("Running %s Upgrade...", UpgradeName))
19+
20+
return mm.RunMigrations(ctx, configurator, vm)
21+
}
22+
}

‎protocol/app/upgrades/v9.0/upgrade_container_test.go‎ renamed to ‎protocol/app/upgrades/v9.1/upgrade_container_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//go:build all || container_test
22

3-
package v_9_0_test
3+
package v_9_1_test
44

55
import (
66
"testing"
77

8-
v_9_0 "github.com/dydxprotocol/v4-chain/protocol/app/upgrades/v9.0"
8+
v_9_1 "github.com/dydxprotocol/v4-chain/protocol/app/upgrades/v9.1"
99

1010
"github.com/dydxprotocol/v4-chain/protocol/testing/containertest"
1111
"github.com/dydxprotocol/v4-chain/protocol/testutil/constants"
@@ -24,16 +24,14 @@ func TestStateUpgrade(t *testing.T) {
2424
preUpgradeSetups(node, t)
2525
preUpgradeChecks(node, t)
2626

27-
err = containertest.UpgradeTestnet(nodeAddress, t, node, v_9_0.UpgradeName)
27+
err = containertest.UpgradeTestnet(nodeAddress, t, node, v_9_1.UpgradeName)
2828
require.NoError(t, err)
2929

3030
postUpgradeChecks(node, t)
3131
}
3232

3333
func preUpgradeSetups(node *containertest.Node, t *testing.T) {}
3434

35-
func preUpgradeChecks(node *containertest.Node, t *testing.T) {
36-
// Add test for your upgrade handler logic below
37-
}
35+
func preUpgradeChecks(node *containertest.Node, t *testing.T) {}
3836

3937
func postUpgradeChecks(node *containertest.Node, t *testing.T) {}

‎protocol/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,13 +470,13 @@ replace (
470470
// Use dYdX fork of Cosmos SDK/store
471471
cosmossdk.io/store => github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d
472472
// Use dYdX fork of CometBFT
473-
github.com/cometbft/cometbft => github.com/dydxprotocol/cometbft v0.38.6-0.20250807031327-f63a6917efaf
473+
github.com/cometbft/cometbft => github.com/dydxprotocol/cometbft v0.38.6-0.20250917222732-ee7f1a0892c4
474474
// Fixes the issue that `tx_search` resolves to a single entry, due to an cometbft-db interface
475475
// change in v0.13.0+.
476476
// TODO(CT-1343): Remove and fix properly by backporting upstream fix to cometbft fork.
477477
github.com/cometbft/cometbft-db => github.com/cometbft/cometbft-db v0.12.0
478478
// Use dYdX fork of Cosmos SDK
479-
github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250807152116-6f31ad979963
479+
github.com/cosmos/cosmos-sdk => github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250918154803-8e8ecbb19aa4
480480
github.com/cosmos/iavl => github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85
481481
)
482482

‎protocol/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -956,10 +956,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
956956
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
957957
github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY=
958958
github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
959-
github.com/dydxprotocol/cometbft v0.38.6-0.20250807031327-f63a6917efaf h1:vXv/PaoaX7rliUZc+lNQImTGgVqJd5E/+oBmiiFuZ2c=
960-
github.com/dydxprotocol/cometbft v0.38.6-0.20250807031327-f63a6917efaf/go.mod h1:XSQX1hQbr54qaJb4/5YNNZGXkAQHHa6bi/KMcN1SQ7w=
961-
github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250807152116-6f31ad979963 h1:wQ9/y+bTIzrTM+a5fXyPXlO/eBJ9eNTjaDEgtFc6Tds=
962-
github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250807152116-6f31ad979963/go.mod h1:eH8zy3vkucEABErRjoIYul87+Pzw25xOP+fEoGjV0do=
959+
github.com/dydxprotocol/cometbft v0.38.6-0.20250917222732-ee7f1a0892c4 h1:hxWJ4ypVQmJe7mCRwpezCPJ+xIvnKbIQeDqMCzV5w4g=
960+
github.com/dydxprotocol/cometbft v0.38.6-0.20250917222732-ee7f1a0892c4/go.mod h1:XSQX1hQbr54qaJb4/5YNNZGXkAQHHa6bi/KMcN1SQ7w=
961+
github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250918154803-8e8ecbb19aa4 h1:jPMFeAox8YwIjUqxabNV/qFuf/EQlTemtTSCShOxMho=
962+
github.com/dydxprotocol/cosmos-sdk v0.50.6-0.20250918154803-8e8ecbb19aa4/go.mod h1:RFE4a5qI7zc42tja8BGBZ3HNSosygF9WWyjLcyr2bFg=
963963
github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d h1:HgLu1FD2oDFzlKW6/+SFXlH5Os8cwNTbplQIrQOWx8w=
964964
github.com/dydxprotocol/cosmos-sdk/store v1.0.3-0.20240326192503-dd116391188d/go.mod h1:zMcD3hfNwd0WMTpdRUhS3QxoCoEtBXWeoKsu3iaLBbQ=
965965
github.com/dydxprotocol/iavl v1.1.1-0.20240509161911-1c8b8e787e85 h1:5B/yGZyTBX/OZASQQMnk6Ms/TZja56MYd8OBaVc0Mho=

‎protocol/testing/containertest/preupgrade_genesis.json‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
11
{
2+
"app_name": "dydxprotocold",
3+
"app_version": "7.0.0-dev0-303-g3b0e4145c",
24
"genesis_time": "2023-01-01T00:00:00Z",
35
"chain_id": "localdydxprotocol",
4-
"initial_height": "1",
5-
"consensus_params": {
6-
"block": {
7-
"max_bytes": "4194304",
8-
"max_gas": "-1"
9-
},
10-
"evidence": {
11-
"max_age_num_blocks": "100000",
12-
"max_age_duration": "172800000000000",
13-
"max_bytes": "1048576"
14-
},
15-
"validator": {
16-
"pub_key_types": [
17-
"ed25519"
18-
]
19-
},
20-
"version": {
21-
"app": "0"
22-
},
23-
"abci": {
24-
"vote_extensions_enable_height": "1"
25-
}
26-
},
27-
"app_hash": "",
6+
"initial_height": 1,
7+
"app_hash": null,
288
"app_state": {
299
"affiliates": {
3010
"affiliate_tiers": {
@@ -995,7 +975,7 @@
995975
}
996976
}
997977
],
998-
"memo": "17e5e45691f0d01449c84fd4ae87279578cdd7ec@172.17.0.2:26656",
978+
"memo": "17e5e45691f0d01449c84fd4ae87279578cdd7ec@172.17.0.3:26656",
999979
"timeout_height": "0",
1000980
"extension_options": [],
1001981
"non_critical_extension_options": []
@@ -1024,7 +1004,7 @@
10241004
"tip": null
10251005
},
10261006
"signatures": [
1027-
"if2HfLoAml9gqflexUHYvYyFWf0AzkQ7t/Mw+P8DuSdfr5dVSB4cCv9+wwDbE4NyLUE7cNVQMaoOQ8V1K2NOIQ=="
1007+
"POWeH0CNzrc8Xm6uyf6/zd+b5MsJKktrwwql36ZxfF1AnKiibA/L4V8xUKy4IBMR0czFNC2XTm5rKpV2Qu6/Ow=="
10281008
]
10291009
},
10301010
{
@@ -1057,7 +1037,7 @@
10571037
}
10581038
}
10591039
],
1060-
"memo": "47539956aaa8e624e0f1d926040e54908ad0eb44@172.17.0.2:26656",
1040+
"memo": "47539956aaa8e624e0f1d926040e54908ad0eb44@172.17.0.3:26656",
10611041
"timeout_height": "0",
10621042
"extension_options": [],
10631043
"non_critical_extension_options": []
@@ -1086,7 +1066,7 @@
10861066
"tip": null
10871067
},
10881068
"signatures": [
1089-
"wWCZzrfbEQ5C2BD+6uJClE+nSrpdP6wI5PQ/mZgmXHEYhOypO28ERxdOxfFxsrkQM/+ld4wdKaBN22xLQvUaVA=="
1069+
"WbfHBen6+atbFg4xNs3IfAQ0dWZGaseAqQQQ3TPRVSkOcPHQQtcJsYoFDB+/l+bVdL3RosrIE5BWba4NfSaUDQ=="
10901070
]
10911071
},
10921072
{
@@ -1119,7 +1099,7 @@
11191099
}
11201100
}
11211101
],
1122-
"memo": "5882428984d83b03d0c907c1f0af343534987052@172.17.0.2:26656",
1102+
"memo": "5882428984d83b03d0c907c1f0af343534987052@172.17.0.3:26656",
11231103
"timeout_height": "0",
11241104
"extension_options": [],
11251105
"non_critical_extension_options": []
@@ -1148,7 +1128,7 @@
11481128
"tip": null
11491129
},
11501130
"signatures": [
1151-
"GvnYbASVMlHB3gQG4MxLTTU+fHXQql4pREOwhtrpj/I+8/ml7oc63xKT0vrzu1/c3Esvgp33xvZ03ma+6Mkw+w=="
1131+
"vgwRg79LG2qXD7a2bTQ3Vdh/W014BNN7iFIVPo/kL4F0uPPkj1jXBuwMTu0ZGKhyRs2WkD2xu85jDxTvxwbWsA=="
11521132
]
11531133
},
11541134
{
@@ -1181,7 +1161,7 @@
11811161
}
11821162
}
11831163
],
1184-
"memo": "b69182310be02559483e42c77b7b104352713166@172.17.0.2:26656",
1164+
"memo": "b69182310be02559483e42c77b7b104352713166@172.17.0.3:26656",
11851165
"timeout_height": "0",
11861166
"extension_options": [],
11871167
"non_critical_extension_options": []
@@ -1210,7 +1190,7 @@
12101190
"tip": null
12111191
},
12121192
"signatures": [
1213-
"pI4b5CW4xkYgkOB2ivPlelk2oDB5B/DjqWEPUZKOD3s0Evnmqgqx8l197Ue4NgO4d0rDmBvmWYwJOa+09ZPEKQ=="
1193+
"5wgtDLRGpZJxPzc1Lnz1+vjeKRUZRfUyh98kwmzeB5AAshjDq9f98msfCJY6CMvtIuA1+euusLUZri8HEvQ4BA=="
12141194
]
12151195
}
12161196
]
@@ -4463,7 +4443,8 @@
44634443
"delegations": [],
44644444
"unbonding_delegations": [],
44654445
"redelegations": [],
4466-
"exported": false
4446+
"exported": false,
4447+
"proposers": []
44674448
},
44684449
"stats": {
44694450
"params": {
@@ -4594,5 +4575,29 @@
45944575
}
45954576
]
45964577
}
4578+
},
4579+
"consensus": {
4580+
"params": {
4581+
"block": {
4582+
"max_bytes": "4194304",
4583+
"max_gas": "-1"
4584+
},
4585+
"evidence": {
4586+
"max_age_num_blocks": "100000",
4587+
"max_age_duration": "172800000000000",
4588+
"max_bytes": "1048576"
4589+
},
4590+
"validator": {
4591+
"pub_key_types": [
4592+
"ed25519"
4593+
]
4594+
},
4595+
"version": {
4596+
"app": "0"
4597+
},
4598+
"abci": {
4599+
"vote_extensions_enable_height": "1"
4600+
}
4601+
}
45974602
}
4598-
}
4603+
}

‎protocol/testing/version/VERSION_CURRENT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v9.0
1+
v9.1

‎protocol/testing/version/VERSION_FULL_NAME_PREUPGRADE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v8.2.0
1+
v9.0.0

‎protocol/testing/version/VERSION_PREUPGRADE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v8.2
1+
v9.0

0 commit comments

Comments
 (0)