From 3bf17c9e96a298c409606f56ad3a628beaecb76f Mon Sep 17 00:00:00 2001 From: "Jieyi Long (THETA Network)" Date: Wed, 22 Mar 2023 00:22:43 +0800 Subject: [PATCH] More fixes --- ledger/execution/tx_validator_set_update.go | 2 +- ledger/ledger.go | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ledger/execution/tx_validator_set_update.go b/ledger/execution/tx_validator_set_update.go index 56dd143..993dafc 100644 --- a/ledger/execution/tx_validator_set_update.go +++ b/ledger/execution/tx_validator_set_update.go @@ -110,7 +110,7 @@ func (exec *SubchainValidatorSetUpdateTxExecutor) process(chainID string, view * } if currentDynasty.Cmp(common.Big0) == 0 { - // special handling: the node just loaded the genesis snapshot, we should trust the initial ValidatorSet specified by the snapshot + // special handling: currentDynasty is 0 means the node just loaded the genesis snapshot, we should trust the initial ValidatorSet specified by the snapshot validatorSetSpecifiedInTheSnapshot := view.GetValidatorSet() logger.Debugf("currentDynasty: %v", currentDynasty) diff --git a/ledger/ledger.go b/ledger/ledger.go index 6466967..385097f 100644 --- a/ledger/ledger.go +++ b/ledger/ledger.go @@ -678,11 +678,15 @@ func (ledger *Ledger) getNewDynastyAndValidatorSet(view *slst.StoreView) (enteri logger.Debugf("currentDynasty: %v, witnessedDynasty: %v, egistrationDynasty: %v, registrationMainchainHeight: %v", currentDynasty, witnessedDynasty, registrationDynasty, registrationMainchainHeight) if witnessedDynasty.Cmp(registrationDynasty) == 0 { - // For the initial dynasty, i.e. the dynasty during which the subchain was registered, instead of querying - // the validator set from the main chain, we trust the validator set in the snapshot - if currentDynasty.Cmp(common.Big0) == 0 { // the first validator set update - return true, witnessedDynasty, view.GetValidatorSet() // the validator set specified in the snapshot + // Specicial case: When the node is in the dynasty where the subchain was registered. The subchain should use the ValidatorSet + // specified in the snapshot (in stead of querying the main chain). Yet, the node needs to update the dynasty + // in the ViewStore to witnessedDynasty if witnessedDynasty is not 0 + + if witnessedDynasty.Cmp(common.Big0) != 0 && currentDynasty.Cmp(common.Big0) == 0 { // the first validator set update + // update the dynast to witnessedDynasty, and continue to use the validator set specified in the snapshot + return true, witnessedDynasty, view.GetValidatorSet() } else { + // witnessedDynasty is 0, so no update is needed, continue to use the ValidatorSet loaded from the snapshot return false, nil, nil } }