Skip to content

Commit 0fa54ed

Browse files
lumtislumtis
authored
feat: add Polygon, Base and Base Sepolia in static chain info (#2470)
* add polygon * base proto * add Base * make generate * changelog * update setup handler * update upgrade dockerfile
1 parent f85559c commit 0fa54ed

File tree

10 files changed

+202
-81
lines changed

10 files changed

+202
-81
lines changed

‎Dockerfile-upgrade

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ WORKDIR /go/delivery/zeta-node
2020
RUN mkdir -p $GOPATH/bin/old
2121
RUN mkdir -p $GOPATH/bin/new
2222

23-
ARG OLD_VERSION=v15.0.0
24-
ENV NEW_VERSION=v17
23+
ARG OLD_VERSION=v17.0.1
24+
ENV NEW_VERSION=v18
2525

2626
# Build new release from the current source
2727
COPY go.mod /go/delivery/zeta-node/

‎app/setup_handlers.go

+2-12
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@ import (
55
sdk "github.com/cosmos/cosmos-sdk/types"
66
"github.com/cosmos/cosmos-sdk/types/module"
77
"github.com/cosmos/cosmos-sdk/x/upgrade/types"
8-
authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
9-
lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types"
10-
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
118
)
129

13-
const releaseVersion = "v17"
10+
const releaseVersion = "v18"
1411

1512
func SetupHandlers(app *App) {
1613
app.UpgradeKeeper.SetUpgradeHandler(releaseVersion, func(ctx sdk.Context, _ types.Plan, vm module.VersionMap) (module.VersionMap, error) {
@@ -19,23 +16,16 @@ func SetupHandlers(app *App) {
1916
for m, mb := range app.mm.Modules {
2017
vm[m] = mb.ConsensusVersion()
2118
}
22-
VersionMigrator{v: vm}.TriggerMigration(observertypes.ModuleName)
2319

2420
return app.mm.RunMigrations(ctx, app.configurator, vm)
2521
})
2622

27-
app.UpgradeKeeper.SetUpgradeHandler("v17-athens", func(ctx sdk.Context, _ types.Plan, vm module.VersionMap) (module.VersionMap, error) {
28-
return vm, nil
29-
})
30-
3123
upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
3224
if err != nil {
3325
panic(err)
3426
}
3527
if upgradeInfo.Name == releaseVersion && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
36-
storeUpgrades := storetypes.StoreUpgrades{
37-
Added: []string{authoritytypes.ModuleName, lightclienttypes.ModuleName},
38-
}
28+
storeUpgrades := storetypes.StoreUpgrades{}
3929
// Use upgrade store loader for the initial loading of all stores when app starts,
4030
// it checks if version == upgradeHeight and applies store upgrades before loading the stores,
4131
// so that new stores start with the correct version (the current height of chain),

‎changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## v18.0.0
4+
5+
* [2470](https://github.com/zeta-chain/node/pull/2470) - add Polygon, Base and Base Sepolia in static chain info
6+
37
## v17.0.1
48

59
### Fixes

‎docs/openapi/openapi.swagger.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -53612,6 +53612,10 @@ definitions:
5361253612
- goerli_localnet
5361353613
- btc_regtest
5361453614
- amoy_testnet
53615+
- optimism_mainnet
53616+
- optimism_sepolia
53617+
- base_mainnet
53618+
- base_sepolia
5361553619
default: empty
5361653620
chainsReceiveStatus:
5361753621
type: string

‎pkg/chains/chain.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ func IsZetaChain(chainID int64) bool {
9191
func IsEVMChain(chainID int64) bool {
9292
return chainID == 5 || // Goerli
9393
chainID == AmoyChain().ChainId ||
94-
chainID == SepoliaChain().ChainId || // Sepolia
94+
chainID == PolygonChain().ChainId ||
95+
chainID == SepoliaChain().ChainId ||
96+
chainID == BaseMainnetChain().ChainId ||
97+
chainID == BaseSepoliaChain().ChainId ||
9598
chainID == 80001 || // Polygon mumbai
9699
chainID == 97 || // BSC testnet
97100
chainID == 1001 || // klaytn baobab

‎pkg/chains/chains.go

+23
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ func PolygonChain() Chain {
6262
}
6363
}
6464

65+
func BaseMainnetChain() Chain {
66+
return Chain{
67+
ChainName: ChainName_base_mainnet,
68+
ChainId: 8453,
69+
}
70+
}
71+
6572
// Testnet chains
6673

6774
func SepoliaChain() Chain {
@@ -106,6 +113,13 @@ func AmoyChain() Chain {
106113
}
107114
}
108115

116+
func BaseSepoliaChain() Chain {
117+
return Chain{
118+
ChainName: ChainName_base_sepolia,
119+
ChainId: 84532,
120+
}
121+
}
122+
109123
// Privnet chains
110124

111125
func BtcRegtestChain() Chain {
@@ -133,12 +147,15 @@ func DefaultChainsList() []*Chain {
133147
BtcMainnetChain(),
134148
BscMainnetChain(),
135149
EthChain(),
150+
PolygonChain(),
151+
BaseMainnetChain(),
136152
BtcTestNetChain(),
137153
MumbaiChain(),
138154
AmoyChain(),
139155
BscTestnetChain(),
140156
GoerliChain(),
141157
SepoliaChain(),
158+
BaseSepoliaChain(),
142159
BtcRegtestChain(),
143160
GoerliLocalnetChain(),
144161
ZetaChainMainnet(),
@@ -155,6 +172,8 @@ func MainnetChainList() []*Chain {
155172
BtcMainnetChain(),
156173
BscMainnetChain(),
157174
EthChain(),
175+
BaseMainnetChain(),
176+
PolygonChain(),
158177
})
159178
}
160179

@@ -165,6 +184,7 @@ func TestnetChainList() []*Chain {
165184
BtcTestNetChain(),
166185
MumbaiChain(),
167186
AmoyChain(),
187+
BaseSepoliaChain(),
168188
BscTestnetChain(),
169189
GoerliChain(),
170190
SepoliaChain(),
@@ -186,12 +206,15 @@ func ExternalChainList() []*Chain {
186206
BtcMainnetChain(),
187207
BscMainnetChain(),
188208
EthChain(),
209+
PolygonChain(),
210+
BaseMainnetChain(),
189211
BtcTestNetChain(),
190212
MumbaiChain(),
191213
AmoyChain(),
192214
BscTestnetChain(),
193215
GoerliChain(),
194216
SepoliaChain(),
217+
BaseSepoliaChain(),
195218
BtcRegtestChain(),
196219
GoerliLocalnetChain(),
197220
})

‎pkg/chains/chains.pb.go

+74-60
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/chains/chains_test.go

+65-6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,71 @@ func TestChainListFunctions(t *testing.T) {
4444
function func() []*Chain
4545
expected []Chain
4646
}{
47-
{"DefaultChainsList", DefaultChainsList, []Chain{BtcMainnetChain(), BscMainnetChain(), EthChain(), BtcTestNetChain(), MumbaiChain(), AmoyChain(), BscTestnetChain(), GoerliChain(), SepoliaChain(), BtcRegtestChain(), GoerliLocalnetChain(), ZetaChainMainnet(), ZetaTestnetChain(), ZetaMocknetChain(), ZetaPrivnetChain()}},
48-
{"MainnetChainList", MainnetChainList, []Chain{ZetaChainMainnet(), BtcMainnetChain(), BscMainnetChain(), EthChain()}},
49-
{"TestnetChainList", TestnetChainList, []Chain{ZetaTestnetChain(), BtcTestNetChain(), MumbaiChain(), AmoyChain(), BscTestnetChain(), GoerliChain(), SepoliaChain()}},
50-
{"PrivnetChainList", PrivnetChainList, []Chain{ZetaPrivnetChain(), BtcRegtestChain(), GoerliLocalnetChain()}},
51-
{"ExternalChainList", ExternalChainList, []Chain{BtcMainnetChain(), BscMainnetChain(), EthChain(), BtcTestNetChain(), MumbaiChain(), AmoyChain(), BscTestnetChain(), GoerliChain(), SepoliaChain(), BtcRegtestChain(), GoerliLocalnetChain()}},
52-
{"ZetaChainList", ZetaChainList, []Chain{ZetaChainMainnet(), ZetaTestnetChain(), ZetaMocknetChain(), ZetaPrivnetChain()}},
47+
{"DefaultChainsList", DefaultChainsList, []Chain{
48+
BtcMainnetChain(),
49+
BscMainnetChain(),
50+
EthChain(),
51+
PolygonChain(),
52+
BaseMainnetChain(),
53+
BtcTestNetChain(),
54+
MumbaiChain(),
55+
AmoyChain(),
56+
BscTestnetChain(),
57+
GoerliChain(),
58+
SepoliaChain(),
59+
BaseSepoliaChain(),
60+
BtcRegtestChain(),
61+
GoerliLocalnetChain(),
62+
ZetaChainMainnet(),
63+
ZetaTestnetChain(),
64+
ZetaMocknetChain(),
65+
ZetaPrivnetChain(),
66+
}},
67+
{"MainnetChainList", MainnetChainList, []Chain{
68+
ZetaChainMainnet(),
69+
BtcMainnetChain(),
70+
BscMainnetChain(),
71+
EthChain(),
72+
BaseMainnetChain(),
73+
PolygonChain(),
74+
}},
75+
{"TestnetChainList", TestnetChainList, []Chain{
76+
ZetaTestnetChain(),
77+
BtcTestNetChain(),
78+
MumbaiChain(),
79+
AmoyChain(),
80+
BaseSepoliaChain(),
81+
BscTestnetChain(),
82+
GoerliChain(),
83+
SepoliaChain(),
84+
}},
85+
{"PrivnetChainList", PrivnetChainList, []Chain{
86+
ZetaPrivnetChain(),
87+
BtcRegtestChain(),
88+
GoerliLocalnetChain(),
89+
}},
90+
{"ExternalChainList", ExternalChainList, []Chain{
91+
BtcMainnetChain(),
92+
BscMainnetChain(),
93+
EthChain(),
94+
PolygonChain(),
95+
BaseMainnetChain(),
96+
BtcTestNetChain(),
97+
MumbaiChain(),
98+
AmoyChain(),
99+
BscTestnetChain(),
100+
GoerliChain(),
101+
SepoliaChain(),
102+
BaseSepoliaChain(),
103+
BtcRegtestChain(),
104+
GoerliLocalnetChain(),
105+
}},
106+
{"ZetaChainList", ZetaChainList, []Chain{
107+
ZetaChainMainnet(),
108+
ZetaTestnetChain(),
109+
ZetaMocknetChain(),
110+
ZetaPrivnetChain(),
111+
}},
53112
}
54113

55114
for _, lt := range listTests {

0 commit comments

Comments
 (0)