Skip to content

Commit 2892114

Browse files
authored
feat: add Bitcoin Testnet4 static chain info (#2911)
* add bitcoin Testnet4 static chain info * add changelog entry * remove integer based Signet and Testnet4 chain names as they're deprecated * fix generated files * fix compile error * fix unit test
1 parent 3e0b307 commit 2892114

File tree

8 files changed

+117
-107
lines changed

8 files changed

+117
-107
lines changed

changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* [2870](https://github.com/zeta-chain/node/pull/2870) - support for multiple Bitcoin chains in the zetaclient
1313
* [2883](https://github.com/zeta-chain/node/pull/2883) - add chain static information for btc signet testnet
1414
* [2907](https://github.com/zeta-chain/node/pull/2907) - derive Bitcoin tss address by chain id and added more Signet static info
15+
* [2911](https://github.com/zeta-chain/node/pull/2911) - add chain static information for btc testnet4
1516

1617
### Refactor
1718

docs/openapi/openapi.swagger.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -56986,7 +56986,6 @@ definitions:
5698656986
- solana_mainnet
5698756987
- solana_devnet
5698856988
- solana_localnet
56989-
- btc_signet_testnet
5699056989
default: empty
5699156990
title: |-
5699256991
ChainName represents the name of the chain

pkg/chains/chains.go

+14-1
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ var (
169169
Name: "btc_testnet",
170170
}
171171

172+
// BitcoinSignetTestnet is Bitcoin Signet testnet
172173
BitcoinSignetTestnet = Chain{
173-
ChainName: ChainName_btc_signet_testnet,
174174
ChainId: 18333,
175175
Network: Network_btc,
176176
NetworkType: NetworkType_testnet,
@@ -181,6 +181,18 @@ var (
181181
Name: "btc_signet_testnet",
182182
}
183183

184+
// BitcoinTestnet4 is Bitcoin testnet4
185+
BitcoinTestnet4 = Chain{
186+
ChainId: 18334,
187+
Network: Network_btc,
188+
NetworkType: NetworkType_testnet,
189+
Vm: Vm_no_vm,
190+
Consensus: Consensus_bitcoin,
191+
IsExternal: true,
192+
CctxGateway: CCTXGateway_observers,
193+
Name: "btc_testnet4",
194+
}
195+
184196
// Amoy is Polygon amoy testnet
185197
Amoy = Chain{
186198
ChainName: ChainName_amoy_testnet,
@@ -360,6 +372,7 @@ func DefaultChainsList() []Chain {
360372
Ethereum,
361373
BitcoinTestnet,
362374
BitcoinSignetTestnet,
375+
BitcoinTestnet4,
363376
Mumbai,
364377
Amoy,
365378
BscTestnet,

pkg/chains/chains.pb.go

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

pkg/chains/chains_test.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import (
1111
func TestChain_Name(t *testing.T) {
1212
t.Run("new Name field is compatible with ChainName enum", func(t *testing.T) {
1313
for _, chain := range chains.DefaultChainsList() {
14-
require.EqualValues(t, chain.Name, chain.ChainName.String())
14+
if chain.ChainName != chains.ChainName_empty {
15+
require.EqualValues(t, chain.Name, chain.ChainName.String())
16+
}
1517
}
1618
})
1719
}
@@ -43,6 +45,7 @@ func TestChainListByNetworkType(t *testing.T) {
4345
chains.ZetaChainTestnet,
4446
chains.BitcoinTestnet,
4547
chains.BitcoinSignetTestnet,
48+
chains.BitcoinTestnet4,
4649
chains.Mumbai,
4750
chains.Amoy,
4851
chains.BscTestnet,
@@ -95,6 +98,7 @@ func TestChainListByNetwork(t *testing.T) {
9598
chains.BitcoinMainnet,
9699
chains.BitcoinTestnet,
97100
chains.BitcoinSignetTestnet,
101+
chains.BitcoinTestnet4,
98102
chains.BitcoinRegtest,
99103
},
100104
},
@@ -144,6 +148,7 @@ func TestDefaultChainList(t *testing.T) {
144148
chains.Ethereum,
145149
chains.BitcoinTestnet,
146150
chains.BitcoinSignetTestnet,
151+
chains.BitcoinTestnet4,
147152
chains.Mumbai,
148153
chains.Amoy,
149154
chains.BscTestnet,
@@ -181,6 +186,7 @@ func TestChainListByGateway(t *testing.T) {
181186
chains.Ethereum,
182187
chains.BitcoinTestnet,
183188
chains.BitcoinSignetTestnet,
189+
chains.BitcoinTestnet4,
184190
chains.Mumbai,
185191
chains.Amoy,
186192
chains.BscTestnet,
@@ -224,6 +230,7 @@ func TestExternalChainList(t *testing.T) {
224230
chains.Ethereum,
225231
chains.BitcoinTestnet,
226232
chains.BitcoinSignetTestnet,
233+
chains.BitcoinTestnet4,
227234
chains.Mumbai,
228235
chains.Amoy,
229236
chains.BscTestnet,

proto/zetachain/zetacore/pkg/chains/chains.proto

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ enum ChainName {
4848
solana_mainnet = 21;
4949
solana_devnet = 22;
5050
solana_localnet = 23;
51-
52-
btc_signet_testnet = 24;
5351
}
5452

5553
// Network represents the network of the chain

typescript/zetachain/zetacore/pkg/chains/chains_pb.d.ts

-5
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ export declare enum ChainName {
148148
* @generated from enum value: solana_localnet = 23;
149149
*/
150150
solana_localnet = 23,
151-
152-
/**
153-
* @generated from enum value: btc_signet_testnet = 24;
154-
*/
155-
btc_signet_testnet = 24,
156151
}
157152

158153
/**

zetaclient/config/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type BTCConfig struct {
5050
RPCUsername string `mask:"filled"`
5151
RPCPassword string `mask:"filled"`
5252
RPCHost string `mask:"filled"`
53-
RPCParams string // "regtest", "mainnet", "testnet3" , "signet"
53+
RPCParams string // "regtest", "mainnet", "testnet3" , "signet", "testnet4"
5454
RPCAlertLatency int64
5555
}
5656

0 commit comments

Comments
 (0)