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

Pull upstream #16

Merged
merged 50 commits into from Jun 5, 2019
Merged

Pull upstream #16

merged 50 commits into from Jun 5, 2019

Conversation

vsubhuman
Copy link

Pulling latest upstream after input-output-hk#704

vsubhuman and others added 7 commits May 24, 2019 16:48
Since phi() is the probability that a pool is selected, we have to
check whether we're *below* that number.
Fix above_stake_threshold and add genesis leadership selection test
…set-functions

Extracted file-offset functions
@vsubhuman vsubhuman marked this pull request as ready for review May 24, 2019 18:32
Copy link

@rooooooooob rooooooooob left a comment

Choose a reason for hiding this comment

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

lgtm, just mockchain changes.

(big_pool_vrf_private_key, 0, Value(1000)),
);

for _i in 0..10 {
Copy link

Choose a reason for hiding this comment

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

Copy link
Author

Choose a reason for hiding this comment

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

That's not our code, tho )


let nr_slots = slots_per_epoch;

for _i in 0..nr_slots {
Copy link

Choose a reason for hiding this comment

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

same as above

let slots_per_epoch = 200000;
let active_slots_coeff = 0.1;

let (_genesis_hash, mut ledger) = create_initial_fake_ledger(
Copy link

Choose a reason for hiding this comment

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

if this is not used, I think you can also just do _

Choose a reason for hiding this comment

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

It's not used. marking it as _genesis_hash is done to both signify it is not used (so it doesn't trip the rustc unused variable linter), while also still documenting what it is we're iterating over.

This PR is also just updating our fork with IOHK's repo (thus this is their code) before we send them a PR back, so we don't want to be making needless changes which would just complicate our PRs in their repo.

All changes in this PR are also in the in-development/experimental shelley module which we are not using yet for the bridge or anything else.

ecioppettini and others added 16 commits May 27, 2019 16:48
Add function to get txid from not yet signed transaction (because it's
needed for signing)
Add function to get root xprv (to be able to derive the necessary
private key for signing)
while this function should not be used to create a new ledger state
it is necessary to have for the block content selection
…-changes

Mockchain changes: LedgerParameters in the Leadership and apply_fragment
vincenthz and others added 26 commits May 29, 2019 15:01
…transaction-example

IOHKCRB-34 Sign transaction example
multiple secret key maps their public key to the same public key algorithm.
Allow to specify public key as ed25519, regardless
of the type of ed25519 (normal or extended)
use Ed25519 in public interfaces now
adjustment linked to the new split in half constraint to traits
This fix ensures the actual output is "<addr>".
…ble_to_string

AddressReadable prints AddressReadable("<addr>")
…nt-autocreate

register stake key on auto creation of account
After this revision, the "tower-h2" feature no longer exists.
Require that the response streams produced by the service
implementation satisfy Send + 'static. This reduces a lot of bound
work for generic protocol implementations that require the streams
to be sendable across threads. A future port of network-grpc to
tower-hyper will be one such implementation.
This ContentService method was only used by network-ntt, and, if that
protocol implementation is ever continued, it should be replaced with
the implementation of message_subscription.
Require that any response futures the service implementation
returns satisfy Send + 'static, just like the streams.
The tower-hyper port needs this, too.
…ervice-returns-sendable

Send + 'static bounds for types returned by the network service implementation
@rooooooooob rooooooooob merged commit e9eb716 into master-emurgo Jun 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
8 participants