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

Hashed Time-Locked Contracts #1370

Merged
merged 56 commits into from Dec 21, 2018

Conversation

@jmjatlanta
Copy link
Contributor

commented Oct 13, 2018

Changes to implement BSIP 44

Fixes issue #1468

Show resolved Hide resolved libraries/chain/htlc_evaluator.cpp Outdated
Show resolved Hide resolved libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp Outdated
Show resolved Hide resolved libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp Outdated
@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Dec 19, 2018

Missing a test case for htlc_extend

@pmconrad pmconrad referenced this pull request Dec 19, 2018

Closed

HTLC sneak preview #1475

@jmjatlanta

This comment has been minimized.

Copy link
Contributor Author

commented Dec 20, 2018

Missing a test case for htlc_extend

added to htlc_tests/htlc_fulfilled

Show resolved Hide resolved tests/tests/htlc_tests.cpp Outdated
if (fee_params.fee_per_kb == 0)
return fee_params.fee;
uint64_t product = 1024 * fee_params.fee_per_kb;
FC_ASSERT( product / 1024 == fee_params.fee_per_kb, "Fee calculation overflow");

This comment has been minimized.

Copy link
@pmconrad

pmconrad Dec 21, 2018

Contributor

Ah, no -

uint64_t kb = ( preimage.size() + 1023 ) / 1024;
uint64_t product = kb * fee_params.fee_per_kb;
FC_ASSERT( kb == 0 || product / kb == fee_params.fee_per_kb, "Fee calculation overflow");
@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Dec 21, 2018

Thanks!

@pmconrad pmconrad merged commit 1195aef into bitshares:hardfork Dec 21, 2018

1 of 2 checks passed

ci/dockercloud Your tests are pending in Docker Cloud
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pmconrad pmconrad deleted the jmjatlanta:htlc2 branch Dec 21, 2018

@pmconrad pmconrad restored the jmjatlanta:htlc2 branch Dec 21, 2018

@pmconrad pmconrad referenced this pull request Feb 1, 2019

Open

Port ACCT from Scorum #12

@bitfag bitfag referenced this pull request Apr 25, 2019

Open

HTLC support #63

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.