Updates.
This commit is contained in:
parent
5927daf6fa
commit
f96ab58f0c
|
@ -54,8 +54,9 @@ clear_on_drop = "*"
|
||||||
version = "*"
|
version = "*"
|
||||||
# git = "https://github.com/c0gent/hbbft"
|
# git = "https://github.com/c0gent/hbbft"
|
||||||
git = "https://github.com/poanetwork/hbbft"
|
git = "https://github.com/poanetwork/hbbft"
|
||||||
branch = "c0gent-rng-sync"
|
# branch = "c0gent-rng-sync"
|
||||||
# branch = "master"
|
# branch = "afck-netinfo"
|
||||||
|
branch = "master"
|
||||||
# path = "../hbbft"
|
# path = "../hbbft"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
|
|
2
gdb-node
2
gdb-node
|
@ -37,6 +37,8 @@ else
|
||||||
DIRECTORY="release"
|
DIRECTORY="release"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
cargo build $RELEASE
|
cargo build $RELEASE
|
||||||
|
|
||||||
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
||||||
|
|
|
@ -37,6 +37,8 @@ else
|
||||||
DIRECTORY="release"
|
DIRECTORY="release"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
cargo build $RELEASE
|
cargo build $RELEASE
|
||||||
|
|
||||||
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
||||||
|
|
2
run-node
2
run-node
|
@ -37,6 +37,8 @@ else
|
||||||
DIRECTORY="release"
|
DIRECTORY="release"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
cargo build $RELEASE
|
cargo build $RELEASE
|
||||||
|
|
||||||
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
||||||
|
|
|
@ -13,9 +13,9 @@ use crossbeam::queue::SegQueue;
|
||||||
use hbbft::{
|
use hbbft::{
|
||||||
crypto::{PublicKey, PublicKeySet},
|
crypto::{PublicKey, PublicKeySet},
|
||||||
dynamic_honey_badger::{ChangeState, JoinPlan, Message as DhbMessage, Change as DhbChange, Input as DhbInput},
|
dynamic_honey_badger::{ChangeState, JoinPlan, Message as DhbMessage, Change as DhbChange, Input as DhbInput},
|
||||||
messaging::{DistAlgorithm, Target},
|
|
||||||
// queueing_honey_badger::{Change as QhbChange, Input as QhbInput},
|
// queueing_honey_badger::{Change as QhbChange, Input as QhbInput},
|
||||||
sync_key_gen::{Ack, Part, PartOutcome, SyncKeyGen},
|
sync_key_gen::{Ack, Part, PartOutcome, SyncKeyGen},
|
||||||
|
DistAlgorithm, Target
|
||||||
};
|
};
|
||||||
use peer::Peers;
|
use peer::Peers;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
|
@ -10,9 +10,8 @@ use crossbeam::queue::SegQueue;
|
||||||
use hbbft::{
|
use hbbft::{
|
||||||
crypto::{PublicKey, SecretKey},
|
crypto::{PublicKey, SecretKey},
|
||||||
dynamic_honey_badger::{DynamicHoneyBadger, JoinPlan, Error as DhbError},
|
dynamic_honey_badger::{DynamicHoneyBadger, JoinPlan, Error as DhbError},
|
||||||
messaging::{DistAlgorithm, NetworkInfo},
|
|
||||||
// queueing_honey_badger::{Error as QhbError, DynamicHoneyBadger},
|
|
||||||
sync_key_gen::{Ack, Part, PartOutcome, SyncKeyGen},
|
sync_key_gen::{Ack, Part, PartOutcome, SyncKeyGen},
|
||||||
|
DistAlgorithm, NetworkInfo,
|
||||||
};
|
};
|
||||||
use peer::Peers;
|
use peer::Peers;
|
||||||
use std::{collections::BTreeMap, fmt};
|
use std::{collections::BTreeMap, fmt};
|
||||||
|
@ -281,7 +280,7 @@ impl<T: Contribution> State<T> {
|
||||||
local_sk: SecretKey,
|
local_sk: SecretKey,
|
||||||
peers: &Peers<T>,
|
peers: &Peers<T>,
|
||||||
cfg: &Config,
|
cfg: &Config,
|
||||||
step_queue: &SegQueue<Step<T>>,
|
_step_queue: &SegQueue<Step<T>>,
|
||||||
) -> Result<SegQueue<InputOrMessage<T>>, Error> {
|
) -> Result<SegQueue<InputOrMessage<T>>, Error> {
|
||||||
let iom_queue_ret;
|
let iom_queue_ret;
|
||||||
*self = match self {
|
*self = match self {
|
||||||
|
@ -308,9 +307,8 @@ impl<T: Contribution> State<T> {
|
||||||
|
|
||||||
let netinfo = NetworkInfo::new(local_uid, sk_share, pk_set, local_sk, node_ids);
|
let netinfo = NetworkInfo::new(local_uid, sk_share, pk_set, local_sk, node_ids);
|
||||||
|
|
||||||
let (dhb, dhb_step) = DynamicHoneyBadger::builder()
|
let dhb = DynamicHoneyBadger::builder()
|
||||||
.build(netinfo)?;
|
.build(netinfo);
|
||||||
step_queue.push(dhb_step);
|
|
||||||
|
|
||||||
info!("");
|
info!("");
|
||||||
info!("== HONEY BADGER INITIALIZED ==");
|
info!("== HONEY BADGER INITIALIZED ==");
|
||||||
|
|
15
src/lib.rs
15
src/lib.rs
|
@ -34,15 +34,6 @@ extern crate serde;
|
||||||
extern crate serde_bytes;
|
extern crate serde_bytes;
|
||||||
extern crate tokio_serde_bincode;
|
extern crate tokio_serde_bincode;
|
||||||
|
|
||||||
// Config {
|
|
||||||
// batch_size: DEFAULT_BATCH_SIZE,
|
|
||||||
// txn_gen_count: DEFAULT_TXN_GEN_COUNT,
|
|
||||||
// txn_gen_interval: DEFAULT_TXN_GEN_INTERVAL,
|
|
||||||
// txn_bytes: DEFAULT_TXN_BYTES,
|
|
||||||
// keygen_peer_count: DEFAULT_KEYGEN_PEER_COUNT,
|
|
||||||
// output_extra_delay_ms: DEFAULT_OUTPUT_EXTRA_DELAY_MS,
|
|
||||||
// }
|
|
||||||
|
|
||||||
#[cfg(feature = "nightly")]
|
#[cfg(feature = "nightly")]
|
||||||
use alloc_system::System;
|
use alloc_system::System;
|
||||||
|
|
||||||
|
@ -68,14 +59,12 @@ use std::{
|
||||||
};
|
};
|
||||||
use tokio::{io, net::TcpStream, prelude::*, codec::{Framed, LengthDelimitedCodec}};
|
use tokio::{io, net::TcpStream, prelude::*, codec::{Framed, LengthDelimitedCodec}};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
// use bincode::{serialize, deserialize};
|
|
||||||
use hbbft::{
|
use hbbft::{
|
||||||
crypto::{PublicKey, PublicKeySet},
|
crypto::{PublicKey, PublicKeySet},
|
||||||
dynamic_honey_badger::{JoinPlan, Message as DhbMessage, DynamicHoneyBadger, Input as DhbInput},
|
dynamic_honey_badger::{JoinPlan, Message as DhbMessage, DynamicHoneyBadger, Input as DhbInput},
|
||||||
messaging::Step as MessagingStep,
|
|
||||||
// queueing_honey_badger::{Input as QhbInput},
|
|
||||||
sync_key_gen::{Ack, Part},
|
sync_key_gen::{Ack, Part},
|
||||||
traits::Contribution as HbbftContribution,
|
Step as MessagingStep,
|
||||||
|
Contribution as HbbftContribution,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub use blockchain::{Blockchain, MiningError};
|
pub use blockchain::{Blockchain, MiningError};
|
||||||
|
|
|
@ -37,6 +37,8 @@ else
|
||||||
DIRECTORY="release"
|
DIRECTORY="release"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
cargo build $RELEASE
|
cargo build $RELEASE
|
||||||
|
|
||||||
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
# printf "\nLimiting process memory limit to 400MiB...\n\n"
|
||||||
|
|
Loading…
Reference in New Issue