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.

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: fix validator node registration logic #4718

Merged

Conversation

stringhandler
Copy link
Collaborator

No description provided.

@stringhandler stringhandler changed the base branch from development to feature-dan September 21, 2022 22:18
Copy link
Collaborator

@SWvheerden SWvheerden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good,
I think you left some debug code in thou

@@ -1475,6 +1475,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
let request = request.into_inner();
let report_error_flag = self.report_error_flag();
debug!(target: LOG_TARGET, "Incoming GRPC request for GetActiveValidatorNodes");
dbg!(&request);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

debug code?

}
return;
},
dbg!(&active_validator_nodes);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

debug?

let shard_key = self.get_vn_mapping(&txn, public_key)?;
self.delete_validator_node(&write_txn, public_key, &shard_key)?;
},
// DeleteValidatorNode { public_key } => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove?

fn delete_validator_node(
&self,
txn: &WriteTransaction<'_>,
public_key: &PublicKey,
shard_key: &[u8; 32],
output_hash: &HashOutput,
// shard_key: &[u8; 32],
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove?

Comment on lines 1605 to 1611
// let x: ActiveValidatorNode = lmdb_get(txn, &self.validator_nodes_mapping, shard_key)?.ok_or_else(|| {
// ChainStorageError::ValueNotFound {
// entity: "ActiveValidatorNode",
// field: "shard_key",
// value: shard_key.to_hex(),
// }
// })?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

Comment on lines 2461 to 2464
// ChainStorageError::DataInconsistencyDetected {
// function: "fetch active validator nodes",
// details: format!("Duplicate validator node public key found: {}", v.to_hex()),
// }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

@stringhandler stringhandler merged commit 72018f4 into tari-project:feature-dan Sep 27, 2022
@stringhandler stringhandler deleted the st-fix-vn-registration branch September 27, 2022 09:31
sdbondi added a commit to sdbondi/tari that referenced this pull request Nov 14, 2022
* feature-dan: (21 commits)
  fix(core)!: remove unused get_committees call from base node (tari-project#4880)
  fix: correct value for validator_node_timeout consensus constant in localnet (tari-project#4879)
  feat: add block height to input request to get network consensus constants (tari-project#4856)
  fix: remove unused config for validator node (tari-project#4849)
  feat: add missing fields to grpc consensus constants interface (tari-project#4845)
  chore: merge development into feature-dan (tari-project#4815)
  refactor: split tari_base_node and tari_console_wallet into a lib component (tari-project#4818)
  fix(core)!: adds utxo and block info to get_template_registrations request (tari-project#4789)
  fix: computation of vn mmr (tari-project#4772)
  fix(wallet/grpc): add transaction id and template_address to template_reg response (tari-project#4788)
  fix: fix get shard key (tari-project#4744)
  feat(core): store and fetch templates from lmdb (tari-project#4726)
  fix: fix validator node registration logic (tari-project#4718)
  feat(base_node_grpc_client): add getActiveValidatorNodes method (tari-project#4719)
  fix after merge
  fix(core): bring validator node MR inline with other merkle root code (tari-project#4692)
  feat(core): add validator registration sidechain feature (tari-project#4690)
  fix merge issues
  feat: add grpc to get shard key for public key (tari-project#4654)
  feat: add validator node registration (tari-project#4507)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants