Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use different database file names for btc signet and testnet4 #3225

Merged
merged 5 commits into from
Dec 2, 2024
Merged

fix: use different database file names for btc signet and testnet4 #3225

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75c2857
use different database file names for btc signet and testnet4
ws4charlie Nov 27, 2024
3647b5d
Merge branch 'develop' into fix-signet-database-name
ws4charlie Nov 27, 2024
92eb8ad
add changelog entry
ws4charlie Nov 27, 2024
54b452f
update signet,testnet4 database file name pattern; add unit test
ws4charlie Nov 27, 2024
7b113bd
use chain name as bitcoin database suffix for regnet, signet and test…
ws4charlie Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

* [3206](https://github.com/zeta-chain/node/pull/3206) - skip Solana unsupported transaction version to not block inbound observation
* [3184](https://github.com/zeta-chain/node/pull/3184) - zetaclient should not retry if inbound vote message validation fails
* [3225](https://github.com/zeta-chain/node/pull/3225) - use separate database file names for btc signet and testnet4

## v23.0.0

Expand Down
21 changes: 16 additions & 5 deletions zetaclient/orchestrator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"github.com/pkg/errors"
"github.com/tonkeeper/tongo/ton"

"github.com/zeta-chain/node/pkg/chains"
toncontracts "github.com/zeta-chain/node/pkg/contracts/ton"
"github.com/zeta-chain/node/zetaclient/chains/base"
btcobserver "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer"
Expand All @@ -32,10 +33,6 @@
"github.com/zeta-chain/node/zetaclient/metrics"
)

// btcDatabaseFilename is the Bitcoin database file name now used in mainnet,
// so we keep using it here for backward compatibility
const btcDatabaseFilename = "btc_chain_client"

// CreateSignerMap creates a map of interfaces.ChainSigner (by chainID) for all chains in the config.
// Note that signer construction failure for a chain does not prevent the creation of signers for other chains.
func CreateSignerMap(
Expand Down Expand Up @@ -363,7 +360,7 @@
continue
}

database, err := db.NewFromSqlite(dbpath, btcDatabaseFilename, true)
database, err := db.NewFromSqlite(dbpath, btcDatabaseFileName(*rawChain), true)
ws4charlie marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
logger.Std.Error().Err(err).Msgf("unable to open database for BTC chain %d", chainID)
continue
Expand Down Expand Up @@ -481,6 +478,20 @@
return added, removed, nil
}

func btcDatabaseFileName(chain chains.Chain) string {
ws4charlie marked this conversation as resolved.
Show resolved Hide resolved
// btcDatabaseFilename is the Bitcoin database file name now used in mainnet and testnet3
// so we keep using it here for backward compatibility
const btcDatabaseFilename = "btc_chain_client"
ws4charlie marked this conversation as resolved.
Show resolved Hide resolved

// For additional bitcoin networks, we use the chain name as the database file name
switch chain.ChainId {
case chains.BitcoinMainnet.ChainId, chains.BitcoinTestnet.ChainId:
ws4charlie marked this conversation as resolved.
Show resolved Hide resolved
return btcDatabaseFilename
default:
return chain.Name

Check warning on line 491 in zetaclient/orchestrator/bootstrap.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/orchestrator/bootstrap.go#L490-L491 

Added lines #L490 - L491 were not covered by tests
}
ws4charlie marked this conversation as resolved.
Show resolved Hide resolved
}

func makeTONClient(
ctx context.Context,
cfg config.TONConfig,
Expand Down
Loading