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: segregated witness #368

Merged
merged 2 commits into from
Apr 8, 2019

Conversation

zhangsoledad
Copy link
Member

@zhangsoledad zhangsoledad commented Mar 28, 2019


This is a BREAKING CHANGE.

@zhangsoledad zhangsoledad changed the title feat: segregated witness [WIP] feat: segregated witness Mar 28, 2019
@zhangsoledad zhangsoledad changed the title [WIP] feat: segregated witness feat: segregated witness Mar 29, 2019
@doitian
Copy link
Member

doitian commented Mar 29, 2019

Is this PR going to be merged now, or after all the SDKs have been upgraded?

core/src/transaction.rs Outdated Show resolved Hide resolved
@zhangsoledad
Copy link
Member Author

Is this PR going to be merged now, or after all the SDKs have been upgraded?

Either is Ok.

@ashchan
Copy link
Contributor

ashchan commented Apr 1, 2019

Is this PR going to be merged now, or after all the SDKs have been upgraded?

Either is Ok.

SDKs are catching up (planed to be include in v0.9.0 as the previous Script refactoring) but I don't think they should block core. Personally I think we should merge this and allow toolchain team a few days to implement the SDKs.

@zhangsoledad zhangsoledad force-pushed the zhangsoledad/segwit branch from 99b7beb to adf0f72 Compare April 1, 2019 08:28
@zhangsoledad zhangsoledad added the s:discussion-needed Status: Need to Discuss label Apr 1, 2019
@zhangsoledad zhangsoledad changed the title feat: segregated witness [HOLD] feat: segregated witness Apr 1, 2019
@zhangsoledad zhangsoledad force-pushed the zhangsoledad/segwit branch from adf0f72 to 79effbf Compare April 2, 2019 08:52
@zhangsoledad zhangsoledad removed the s:discussion-needed Status: Need to Discuss label Apr 2, 2019
@zhangsoledad zhangsoledad changed the title [HOLD] feat: segregated witness feat: segregated witness Apr 2, 2019
@zhangsoledad zhangsoledad requested review from quake, xxuejie and janx April 2, 2019 08:52
@zhangsoledad zhangsoledad force-pushed the zhangsoledad/segwit branch from 79effbf to c77f577 Compare April 2, 2019 10:22
core/src/block.rs Outdated Show resolved Hide resolved
@doitian
Copy link
Member

doitian commented Apr 8, 2019

@doitian doitian mentioned this pull request Apr 8, 2019
9 tasks
@doitian
Copy link
Member

doitian commented Apr 8, 2019

bors r+

bors bot added a commit that referenced this pull request Apr 8, 2019
368: feat: segregated witness r=doitian a=zhangsoledad

* [ ] rfc#0019
* [ ] mruby-contracts nervosnetwork/mruby-contracts#9
* [ ] ruby sdk
* [ ] ruby scripts nervosnetwork/ckb-ruby-scripts#10
* [ ] ckb-system-scripts nervosnetwork/ckb-system-scripts#5
* [ ] ruby-demo nervosnetwork/ckb-demo-ruby#78
* [ ] swift sdk
* [ ] java sdk
* [ ] js sdk

---

This is a **BREAKING CHANGE**.

Co-authored-by: zhangsoledad <[email protected]>
@zhangsoledad
Copy link
Member Author

bors r-

@bors
Copy link
Contributor

bors bot commented Apr 8, 2019

Canceled

@zhangsoledad zhangsoledad force-pushed the zhangsoledad/segwit branch from 51ab4e2 to c39a762 Compare April 8, 2019 03:30
@zhangsoledad
Copy link
Member Author

need regenerate flatbuffers verifier,
wait #409

@doitian doitian added s:waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed s:waiting-for-bors labels Apr 8, 2019
@doitian doitian merged commit c39a762 into nervosnetwork:develop Apr 8, 2019
doitian added a commit that referenced this pull request Apr 8, 2019
368: feat: segregated witness r=janx,quake a=zhangsoledad

Co-authored-by: zhangsoledad <[email protected]>
@doitian doitian mentioned this pull request Apr 8, 2019
doitian added a commit that referenced this pull request Apr 22, 2019
🎉[ᚬmaster] Rc/v0.9.0

### Bug Fixes

* #410: network panic errors r=jjyr a=jjyr

    * Peer Store no such table
    * get peer index panic

* #386: flatbuffers vtable `num_fields` overflow r=zhangsoledad a=doitian

    Refs nervosnetwork/cfb#16

* #385: Upgrade p2p fix repeat connection bug r=jjyr a=TheWaWaR

    Related PR: nervosnetwork/tentacle#92

* #382: reset peer store connection status when setup r=TheWaWaR a=jjyr

    1. reset peer status
    2. remove banned addrs from peer_attemps result

* #424: many bug fixes of the p2p network issues fix a=TheWaWaR,zhangsoledad

### Features

* #491: update lock cell for segwit and address format a=classicalliu

* #368: segregated witness r=janx,quake a=zhangsoledad

* #409: remove uncle cellbase r=doitian a=zhangsoledad

* #369: Embed testnet chain spec in compiled binary r=doitian a=xxuejie

* #344: Revise script structure r=xxuejie a=xxuejie

* #425: Bundle app config in compiled binary a=doitian

### Improvements

* #392: avoid recursive lock a=zhangsoledad

### BREAKING CHANGES

This release has changed core data structure, please delete the old data directory.

The testnet chain spec is also changed, which is incompatible with previous versions.

Command line argument `-c` is removed, and a new command line argument `-C` is added. See `ckb help` for details.

Now the command `ckb` no longer searches the config file `nodes/default.toml`. It looks for the config file `ckb.toml` or `ckb-miner.toml` in current directory and uses the default config options when not found. A new command `ckb init` is added, see its usage with `ckb init --help`.

Config file `ckb.toml` changes:

- Removed `logger.file`, `db.path` and `network.path` from config file.
- Added config option `logger.log_to_stdout` and `logger.log_to_file`.
- Section `block_assembler` now accepts two options `binary_hash` and `args`. 
- Added a new option to set sentry DSN.

File `miner.toml` changes:

- Option `spec` is moved under `chain`, which is consistent with `ckb.toml`.
- Move miner own config options under section `miner`.
- Remove `logger.file` from config file.
- Add config option `logger.log_to_stdout` and `logger.log_to_file`.

It is recommended to export the config files via `ckb init`, then apply the
modifications upon the new config files.
@zhangsoledad zhangsoledad deleted the zhangsoledad/segwit branch August 16, 2019 02:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants