feat(hardfork): ckb2021 hardfork features #2715

yangby-cryptape · 2021-05-24T00:47:33Z

Suggestions for Review

The best way to review this PR is reviewing each commit independently.

Brief introduction for Commits

New hardfork Features

All following features can be found in RFC PRs.

feat(hardfork): in the "since epoch", the index should be less than length

Ref: CKB-RFCs PR 223: Ensure that index < length in input since field using epoch
feat(hardfork): use block timestamp of input cells as relative since start timestamp

Ref: CKB-RFCs PR 221: Use Block Timestamp as Start Timestamp in Since
[Reverted] ~~feat(hardfork): allow unknown block versions and transactions versions~~

~~Ref: CKB-RFCs PR 230: Allow unknown tx & block version~~
feat(hardfork): allow script multiple matches on identical data for type hash-type scripts

Ref: CKB-RFCs PR 222: Allow script multiple matches on identical code
feat(hardfork): reuse the uncles hash in the header as the extra hash

Ref: CKB-RFCs PR 224: Add a variable length field in the block header
[Reverted] ~~feat(hardfork): allow loading uncommitted cell data hashes from tx pool~~

~~Ref: CKB-RFCs PR 228: ckb2021: fix load_cell_data_hash syscall~~

Other Important Commits

feat(hardfork): setup the components for hard fork features
refactor: let verifiers know the real environment that the transaction is in

Almost all features require this refactor commit.
refactor: remove useless parameter "with_data" because it always be true (tricky)

So I can change less APIs and less code to apply the feature: allow loading uncommitted cell data hashes from tx pool.

About Tests

Almost all features have detailed integration tests (or unit tests):

Many blocks before hardfork;
Only one block before hardfork;
The block at hardfork;
Many blocks after hardfork.

All commits can passed all integration tests and unit tests.

Ensure load_cell_data_hash is consistent with the load_cell_data behavior

…n is in

…ength

…start timestamp

…ype hash-type scripts

…rue (tricky)

…nto branch ckb2021-develop

tx-pool/src/component/pending.rs

yangby-cryptape · 2021-06-04T03:14:52Z

I will apply all request changes at last in one commit.

…elative since start timestamp

…cation and add a unit test

… versions" This reverts commit d1c0bbe.

…om tx pool" This reverts commit 10ffedf.

…eb0d9) into branch ckb2021-develop" This reverts commit 0a1225c, reversing changes made to 40847ca.

…ays be true (tricky)" This reverts commit 40847ca.

verification/src/transaction_verifier.rs

…olved

yangby-cryptape · 2021-06-15T04:27:05Z

bors r+

2715: feat(hardfork): ckb2021 hardfork features r=yangby-cryptape a=yangby-cryptape ### Suggestions for Review **The best way to review this PR is reviewing each commit independently.** ### Brief introduction for Commits #### New hardfork Features **All following features can be found in RFC PRs.** - feat(hardfork): in the "since epoch", the index should be less than length Ref: [CKB-RFCs PR 223: Ensure that index < length in input since field using epoch](nervosnetwork/rfcs#223) - feat(hardfork): use block timestamp of input cells as relative since start timestamp Ref: [CKB-RFCs PR 221: Use Block Timestamp as Start Timestamp in Since](nervosnetwork/rfcs#221) - **[Reverted]** ~~feat(hardfork): allow unknown block versions and transactions versions~~ ~~Ref: [CKB-RFCs PR 230: Allow unknown tx & block version](nervosnetwork/rfcs#230 - feat(hardfork): allow script multiple matches on identical data for type hash-type scripts Ref: [CKB-RFCs PR 222: Allow script multiple matches on identical code](nervosnetwork/rfcs#222) - feat(hardfork): reuse the uncles hash in the header as the extra hash Ref: [CKB-RFCs PR 224: Add a variable length field in the block header](nervosnetwork/rfcs#224) - **[Reverted]** ~~feat(hardfork): allow loading uncommitted cell data hashes from tx pool~~ ~~Ref: [CKB-RFCs PR 228: ckb2021: fix load_cell_data_hash syscall](nervosnetwork/rfcs#228 #### Other Important Commits - feat(hardfork): setup the components for hard fork features - refactor: let verifiers know the real environment that the transaction is in Almost all features require this refactor commit. - refactor: remove useless parameter "with_data" because it always be true (tricky) So I can change less APIs and less code to apply the feature: allow loading uncommitted cell data hashes from tx pool. ### About Tests Almost all features have detailed integration tests (or unit tests): - Many blocks before hardfork; - Only one block before hardfork; - The block at hardfork; - Many blocks after hardfork. All commits can passed all integration tests and unit tests. Co-authored-by: zhangsoledad <787953403@qq.com> Co-authored-by: Boyu Yang <yangby@cryptape.com>

doitian

Let bors work

quake · 2021-06-15T06:14:08Z

bors r=quake,doitian,zhangsoledad

bors · 2021-06-15T06:38:37Z

Build succeeded:

ci

zhangsoledad and others added 6 commits May 8, 2021 22:17

fix: load cell data hash by input

33eb0d9

Ensure load_cell_data_hash is consistent with the load_cell_data behavior

ci: run ci temporarily for development

e640236

feat(hardfork): setup the components for hard fork features

3f35ca8

refactor: let verifiers know the real environment that the transactio…

b546065

…n is in

feat(hardfork): in the "since epoch", the index should be less than l…

92a7256

…ength

feat(hardfork): use block timestamp of input cells as relative since …

4d75c5c

…start timestamp

yangby-cryptape changed the base branch from ckb2021-staging to develop May 25, 2021 17:46

yangby-cryptape added the s:hold Status: Put this issue on hold. label May 25, 2021

This comment has been minimized.

Sign in to view

yangby-cryptape added 2 commits May 26, 2021 07:27

feat(hardfork): allow unknown block versions and transactions versions

d1c0bbe

feat(hardfork): allow script multiple matches on identical data for t…

3cf555e

…ype hash-type scripts

This comment has been minimized.

Sign in to view

feat(hardfork): reuse the uncles hash in the header as the extra hash

5a7efe7

This comment has been minimized.

Sign in to view

yangby-cryptape added 4 commits May 26, 2021 22:28

Merge branch develop (commit: 3ee1712) into branch ckb2021-develop

ba971f1

refactor: remove useless parameter "with_data" because it always be t…

40847ca

…rue (tricky)

Merge branch zhangsoledad/fix_load_cell_data_hash (commit: 33eb0d9) i…

0a1225c

…nto branch ckb2021-develop

feat(hardfork): allow loading uncommitted cell data hashes from tx pool

10ffedf

yangby-cryptape force-pushed the ckb2021-develop branch from fb0fbea to f70a3e8 Compare May 31, 2021 03:30

yangby-cryptape marked this pull request as ready for review May 31, 2021 03:34

yangby-cryptape requested review from doitian, keroro520, quake and zhangsoledad as code owners May 31, 2021 03:34

yangby-cryptape requested a review from a team May 31, 2021 03:34

quake reviewed Jun 4, 2021

View reviewed changes

tx-pool/src/component/pending.rs Outdated Show resolved Hide resolved

yangby-cryptape added 2 commits June 8, 2021 11:20

fix(hardfork): a mistake when use block timestamp of input cells as r…

4919ae3

…elative since start timestamp

chore(hardfork): apply review suggestions about the extra hash verifi…

f781872

…cation and add a unit test

yangby-cryptape removed the s:waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. label Jun 8, 2021

yangby-cryptape added 4 commits June 10, 2021 17:19

Revert "feat(hardfork): allow unknown block versions and transactions…

8239d1d

… versions" This reverts commit d1c0bbe.

Revert "feat(hardfork): allow loading uncommitted cell data hashes fr…

bc5c61f

…om tx pool" This reverts commit 10ffedf.

Revert "Merge branch zhangsoledad/fix_load_cell_data_hash (commit: 33…

4e1109e

…eb0d9) into branch ckb2021-develop" This reverts commit 0a1225c, reversing changes made to 40847ca.

Revert "refactor: remove useless parameter "with_data" because it alw…

56c145e

…ays be true (tricky)" This reverts commit 40847ca.

quake previously approved these changes Jun 11, 2021

View reviewed changes

verification/src/transaction_verifier.rs Outdated Show resolved Hide resolved

yangby-cryptape dismissed quake’s stale review via 74453a7 June 11, 2021 12:38

chore(hardfork): apply review suggestions about block timestamp in since

30360a2

yangby-cryptape force-pushed the ckb2021-develop branch from 74453a7 to 30360a2 Compare June 11, 2021 12:44

quake previously approved these changes Jun 11, 2021

View reviewed changes

Merge branch 'develop' into zhangsoledad/ckb2021-develop-confilct-res…

6893a07

…olved

yangby-cryptape dismissed quake’s stale review via 6893a07 June 11, 2021 15:02

quake previously approved these changes Jun 11, 2021

View reviewed changes

Merge branch 'develop' into ckb2021-develop

c397d22

yangby-cryptape dismissed quake’s stale review via c397d22 June 14, 2021 16:28

quake approved these changes Jun 14, 2021

View reviewed changes

zhangsoledad approved these changes Jun 15, 2021

View reviewed changes

doitian approved these changes Jun 15, 2021

View reviewed changes

bors bot merged commit 85d04c3 into develop Jun 15, 2021

bors bot deleted the ckb2021-develop branch June 15, 2021 06:38

yangby-cryptape added u:ckb2021 Upgrade: Fork ckb2021 and removed s:waiting-on-reviewers Status: Waiting for Review labels Jul 1, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(hardfork): ckb2021 hardfork features #2715

feat(hardfork): ckb2021 hardfork features #2715

yangby-cryptape commented May 24, 2021 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

yangby-cryptape commented Jun 4, 2021

yangby-cryptape commented Jun 15, 2021

doitian left a comment

quake commented Jun 15, 2021

bors bot commented Jun 15, 2021

feat(hardfork): ckb2021 hardfork features #2715

feat(hardfork): ckb2021 hardfork features #2715

Conversation

yangby-cryptape commented May 24, 2021 • edited Loading

Suggestions for Review

Brief introduction for Commits

New hardfork Features

Other Important Commits

About Tests

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

yangby-cryptape commented Jun 4, 2021

yangby-cryptape commented Jun 15, 2021

doitian left a comment

Choose a reason for hiding this comment

quake commented Jun 15, 2021

bors bot commented Jun 15, 2021

yangby-cryptape commented May 24, 2021 •

edited

Loading