Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
doitian committed Sep 1, 2023
2 parents e585192 + d1695ba commit b4a71b9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ jobs:
cd ..
export OPENSSL_LIB_DIR=${TOP_DIR}/openssl-1.1.1
export OPENSSL_INCLUDE_DIR=${TOP_DIR}/openssl-1.1.1/include
PKG_CONFIG_ALLOW_CROSS=1 CC=gcc CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc CKB_BUILD_TARGET="--target=aarch64-unknown-linux-gnu" make prod_portable
PKG_CONFIG_ALLOW_CROSS=1 CC=gcc CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc cargo build --target=aarch64-unknown-linux-gnu --release --features portable
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
gpg --import devtools/ci/signer.asc
devtools/ci/package.sh target/aarch64-unknown-linux-gnu/prod/ckb
devtools/ci/package.sh target/aarch64-unknown-linux-gnu/release/ckb
mv ${{ github.workspace }}/releases/ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }} ${{ github.workspace }}
mv ${{ github.workspace }}/releases/ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc ${{ github.workspace }}
- name: upload-zip-file
Expand Down
20 changes: 9 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
### Features
* #4079, **tx-pol:** Implement `Replace-by-Fee(RBF)` for tx-pool (@chenyukang)
This feature enables users to replace a transaction with a higher fee rate, which is useful when the transaction is stuck in the tx-pool:
* Add `min_rbf_rate` in `ckb.toml` with default value `1500`, which means the minimum extra fee rate for RBF, the unit is `shannons/KB`
* Add fields `fee` and `min_replace_fee` in `get_transaction`, which means the the minimal fee need to pay for RBF for a specific transaction
* The replaced transaction will be removed from `tx-pool` and with the status `Rejected`.
# [v0.110.1](https://github.com/nervosnetwork/ckb/compare/v0.110.0...v0.110.1) (2023-08-20)

### Improvements
* #3993, **tx-pool:** Almost reimplemented `tx-pool` with `multi_index_map`, with the following improvements (@chenyukang):
* Sort txs in pool by `score` in `Pending` stage, `txs` with higher `score` be processed first
* Evict `txs` from pool with `descendants_count` and `fee_rate`
* Eliminate redundant code for clean and consistent code
BREAKING: Light Client Protocol Softfork Activation in Mainnet

| Field | Value | Note |
| ----- | ----- | ---- |
| start | 8,282 | 2023/09/01 00:00:00 utc |
| timeout | 8,552 | 8,282 + 270 |
| min\_activation\_epoch | 8,648 | 2023/11/01 00:00:00 utc |
| threshold | 80% | |

# [v0.110.0](https://github.com/nervosnetwork/ckb/compare/v0.109.0...v0.110.0) (2023-05-15)

Expand Down

0 comments on commit b4a71b9

Please sign in to comment.