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

feat: Add multisig system script cell #1740

Merged
merged 2 commits into from
Oct 30, 2019
Merged

Conversation

jjyr
Copy link
Contributor

@jjyr jjyr commented Oct 20, 2019

nervosnetwork/ckb-system-scripts#60

  • Add multisig to genesis

@jjyr jjyr requested a review from a team October 20, 2019 13:56
@jjyr jjyr added this to the v0.24.0 milestone Oct 20, 2019
@jjyr jjyr force-pushed the p2sh-multisig-system-script branch 2 times, most recently from 9495bf5 to 267d99c Compare October 20, 2019 16:03
@jjyr jjyr force-pushed the p2sh-multisig-system-script branch from 267d99c to ba7d1d7 Compare October 21, 2019 02:26
@jjyr jjyr changed the title feat: Add multisig system script cell [HOLD]feat: Add multisig system script cell Oct 24, 2019
nervos-bot[bot]
nervos-bot bot previously requested changes Oct 24, 2019
Copy link

@nervos-bot nervos-bot bot left a comment

Choose a reason for hiding this comment

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

Hold as requested by @jjyr.

@@ -31,9 +31,9 @@ pub const ITEM_MISSING: u8 = 2;
pub const SLICE_OUT_OF_BOUND: u8 = 3;

pub const LOAD_TRANSACTION_SYSCALL_NUMBER: u64 = 2051;
pub const LOAD_SCRIPT_SYSCALL_NUMBER: u64 = 2052;
Copy link
Member

Choose a reason for hiding this comment

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

Why change the syscall number? cc @xxuejie

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To keep syscall number consistent, the number 205x is used to describe load the whole struct, and 206x is used to describe load the hash of the struct.

@doitian
Copy link
Member

doitian commented Oct 29, 2019

Please rebase onto the latest change in nervosnetwork/ckb-system-scripts#60

@jjyr jjyr changed the title [HOLD]feat: Add multisig system script cell feat: Add multisig system script cell Oct 29, 2019
@nervos-bot nervos-bot bot dismissed their stale review October 29, 2019 10:12

Unhold as requested by @jjyr.

@jjyr jjyr requested a review from doitian October 29, 2019 10:12
@doitian doitian merged commit d18fd52 into develop Oct 30, 2019
@bors bors bot deleted the p2sh-multisig-system-script branch October 30, 2019 04:01
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.

3 participants