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

Jump to bottom

fix: change watch ckb mint status way #69

Merged
merged 10 commits into from May 12, 2021
Merged

fix: change watch ckb mint status way #69

merged 10 commits into from May 12, 2021

Conversation

fpChan
Copy link
Contributor

@fpChan fpChan commented May 11, 2021

No description provided.

@codecov-commenter
Copy link

codecov-commenter commented May 11, 2021 •
edited

Codecov Report

Merging #69 (9d9c09a) into main (00cbbcf) will increase coverage by 7.00%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main      #69      +/-   ##
==========================================
+ Coverage   42.79%   49.79%   +7.00%     
==========================================
  Files          46       23      -23     
  Lines        2414      488    -1926     
  Branches       77       29      -48     
==========================================
- Hits         1033      243     -790     
+ Misses       1381      245    -1136
Impacted Files Coverage Δ
offchain-modules/src/packages/db/ckb.ts 23.07% <0.00%> (-0.93%) ⬇️
...fchain-modules/src/packages/db/entity/EosUnlock.ts 100.00% <ø> (ø)
...fchain-modules/src/packages/db/entity/EthUnlock.ts 100.00% <ø> (ø)
...fchain-modules/src/packages/db/entity/BtcUnlock.ts 100.00% <100.00%> (ø)
offchain-modules/src/packages/db/entity/CkbMint.ts 100.00% <100.00%> (ø)
...es/eth-contracts/contracts/libraries/SafeERC20.sol
...-modules/ckb-contracts/types/src/recipient_cell.rs
...-contracts/lib/recipient-typescript-lib/src/lib.rs
...th-contracts/contracts/libraries/MultisigUtils.sol
...modules/ckb-contracts/types/src/generated/basic.rs
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 00cbbcf...9d9c09a. Read the comment docs.

@fpChan fpChan marked this pull request as ready for review May 11, 2021 10:57
@solargatsby solargatsby merged commit a7ab5af into nervosnetwork:main May 12, 2021
solargatsby added a commit to solargatsby/force-bridge that referenced this pull request May 18, 2021
@fpChan @solargatsby
@homura @nolanxyg @JacobDenver007
merge main code (#3)
6c75939 
* fix: fix ckb contract name and burn amount (nervosnetwork#58)

* fix: add btc confirm and orm time zone and contract eth name

* chore: format ckb contract code

* chore: format ckb contract code

* fix: remove btc confirm part

* fix(cli): fix cli asset ownLockHash (nervosnetwork#59)

Co-authored-by: wangbing <wangbing@cryptape.com>

* fix: add btc confirm number and add sql timezone (nervosnetwork#60)

* fix: add btc confirm and orm time zone and contract eth name

* chore: format ckb contract code

* chore: format ckb contract code

* fix: remove ckb contracts

* chore: format ckb code

* feat: update ckb assetid (nervosnetwork#62)

* fix(rpc): fix getBalance too slow (nervosnetwork#63)

* feat: update ckb assetid

* feat: update ckb getBalance

* fix: update txSummary

* fix(eos): using private node in ci test (nervosnetwork#42)

Co-authored-by: wangbing <wangbing@cryptape.com>

* chore: lint for staged files  (nervosnetwork#65)

* chore: lint for staged files

* chore: check the types when lint

* docs: add user-guide.md (nervosnetwork#61)

* docs: add user-guide.md

* chore: add pw-lock ref link

* fix: update tx summary query (nervosnetwork#66)

* fix: opt log (nervosnetwork#57)

* fix: opt log

* feat(log): 增加file类型的日志输出

* chore(log): opt ckb & eth handler log

* chore(log): opt ci test log

* fix: update tron-ci test order, to fix tron ci test failed cause by local time large then tron test server time

Co-authored-by: wangbing <wangbing@cryptape.com>

* chore: prepare husky to avoid cannot find git error (nervosnetwork#70)

* fix(ckb-contracts): add bridge_lock_hash_type to recipient data (nervosnetwork#67)

* fix(ckb-contracts): add bridge_lock_hash_type to recipient data

* fix

* fix

* fix

* fix: change watch ckb mint status way (nervosnetwork#69)

* fix: change watch ckb mint status way

* fix: update ckb handler

* chore: update code

* chore: update logger

* chore: update logger info

* chore: reset mint sent log

* fix: remove mysql index of enum

* fix: use index

* feat: support use private key path in config (nervosnetwork#75)

* feat: support use private key path in config

* fix ci

* lint

* fix(offchain): deploy asset bridge cell when start (nervosnetwork#74)

* fix(offchain): deploy asset bridge cell when start

* fix

* feat: support query by other chain address  (nervosnetwork#71)

* feat: support other address query

* chore: format log

* chore: format response

* fix: update filter

Co-authored-by: Eric.Wang <136147966@qq.com>
Co-authored-by: wangbing <wangbing@cryptape.com>
Co-authored-by: Yonghui Lin <homura.dev@gmail.com>
Co-authored-by: mkxbl <33241113+mkxbl@users.noreply.github.com>
Co-authored-by: JacobDenver007 <29848184+JacobDenver007@users.noreply.github.com>
Co-authored-by: Wenchao Hu <me@huwenchao.com>
solargatsby added a commit to solargatsby/force-bridge that referenced this pull request May 20, 2021
@fpChan @solargatsby
@homura @nolanxyg @JacobDenver007
merge: merge main branch code before refactor (#5)
06ea3d9 
* fix: fix ckb contract name and burn amount (nervosnetwork#58)

* fix: add btc confirm and orm time zone and contract eth name

* chore: format ckb contract code

* chore: format ckb contract code

* fix: remove btc confirm part

* fix(cli): fix cli asset ownLockHash (nervosnetwork#59)

Co-authored-by: wangbing <wangbing@cryptape.com>

* fix: add btc confirm number and add sql timezone (nervosnetwork#60)

* fix: add btc confirm and orm time zone and contract eth name

* chore: format ckb contract code

* chore: format ckb contract code

* fix: remove ckb contracts

* chore: format ckb code

* feat: update ckb assetid (nervosnetwork#62)

* fix(rpc): fix getBalance too slow (nervosnetwork#63)

* feat: update ckb assetid

* feat: update ckb getBalance

* fix: update txSummary

* fix(eos): using private node in ci test (nervosnetwork#42)

Co-authored-by: wangbing <wangbing@cryptape.com>

* chore: lint for staged files  (nervosnetwork#65)

* chore: lint for staged files

* chore: check the types when lint

* docs: add user-guide.md (nervosnetwork#61)

* docs: add user-guide.md

* chore: add pw-lock ref link

* fix: update tx summary query (nervosnetwork#66)

* fix: opt log (nervosnetwork#57)

* fix: opt log

* feat(log): 增加file类型的日志输出

* chore(log): opt ckb & eth handler log

* chore(log): opt ci test log

* fix: update tron-ci test order, to fix tron ci test failed cause by local time large then tron test server time

Co-authored-by: wangbing <wangbing@cryptape.com>

* chore: prepare husky to avoid cannot find git error (nervosnetwork#70)

* fix(ckb-contracts): add bridge_lock_hash_type to recipient data (nervosnetwork#67)

* fix(ckb-contracts): add bridge_lock_hash_type to recipient data

* fix

* fix

* fix

* fix: change watch ckb mint status way (nervosnetwork#69)

* fix: change watch ckb mint status way

* fix: update ckb handler

* chore: update code

* chore: update logger

* chore: update logger info

* chore: reset mint sent log

* fix: remove mysql index of enum

* fix: use index

* feat: support use private key path in config (nervosnetwork#75)

* feat: support use private key path in config

* fix ci

* lint

* fix(offchain): deploy asset bridge cell when start (nervosnetwork#74)

* fix(offchain): deploy asset bridge cell when start

* fix

* feat: support query by other chain address  (nervosnetwork#71)

* feat: support other address query

* chore: format log

* chore: format response

* fix: update filter

* fix: pass the ci

* fix: pass the tron ci

Co-authored-by: Eric.Wang <136147966@qq.com>
Co-authored-by: wangbing <wangbing@cryptape.com>
Co-authored-by: Yonghui Lin <homura.dev@gmail.com>
Co-authored-by: mkxbl <33241113+mkxbl@users.noreply.github.com>
Co-authored-by: JacobDenver007 <29848184+JacobDenver007@users.noreply.github.com>
Co-authored-by: Wenchao Hu <me@huwenchao.com>
@fpChan fpChan deleted the ckb-mint branch May 21, 2021 04:27
solargatsby added a commit that referenced this pull request May 26, 2021
@fpChan @LeonLi000
@JacobDenver007 @solargatsby @homura @nolanxyg
feat: add multi sign support (#85)
573df19 
* feat: implement mint && createBridgeCell

* impl burn && watch burn event

* code clean

* feat: support tron network

* feat: fix tron integration

* feat: support eos chain

* feat: use ForceBridgeCongi instead of nconf

* fix: bugfix on ckb handler

* chore: code format

* chore: bugfix when deploy ckb

* feat: impl molecule serialization

* feat: optimize ckb handler for eth

* fix(tron): optimize tron handler

* feat: optimize ckb handler for tron

* feat: support getSudtBalance

* feat: optimize ckb handler for eos

* chore: clean code

* minor change

* fix: fix unit test

* chore: make github-ci

* minor change

* fix: fix pr comments

* fix: use indexer waitUntilSync intead of asleep

* fix: ckb rpc url fix

* fix: github ci fix

* fix: the problem of amount conversion

* fix: amount visualization optimization

* chore: use tron shasta testnet

* feat: support btc cross-chain

* fix: update burn hash start with 0x of btc module

* fix: remove usless comments

* feat: support btc cross-chain

* chore: remove usless comments

* feat: impl ckb multisig

* fix: github ci fix

* chore: minor change

* chore: remove unused file

* chore: test github ci

* chore: test github ci

* chore: test github ci

* feat: optimize bridge cell when mint same asset

* chore: remove unused file

* chore: clean code

* merge from main

* fix: bugfix when txStatus is null

* fix: github ci

* fix: github ci

* fix: github ci

* fix: use config.json instead of  multisig infos.json

* chore: minor change

* feat: add multi-sign server

* remove pwlocks dep

* minor change

* refactor: add multisigMgr

* feat: add ckb mint & create bridge cell verify

* refactor: opt sig server

* feat: add eth unlock verify (#2)

* feat: add eth unlock verify

* feat: add unlock record verify

* chore: update the config

* feat: add eth signer

* fix(ci): ckbSigner support btc,eos,tron

* merge: merge main branch code before refactor (#5)

* fix: fix ckb contract name and burn amount (#58)

* fix: add btc confirm and orm time zone and contract eth name

* chore: format ckb contract code

* chore: format ckb contract code

* fix: remove btc confirm part

* fix(cli): fix cli asset ownLockHash (#59)

Co-authored-by: wangbing <wangbing@cryptape.com>

* fix: add btc confirm number and add sql timezone (#60)

* fix: add btc confirm and orm time zone and contract eth name

* chore: format ckb contract code

* chore: format ckb contract code

* fix: remove ckb contracts

* chore: format ckb code

* feat: update ckb assetid (#62)

* fix(rpc): fix getBalance too slow (#63)

* feat: update ckb assetid

* feat: update ckb getBalance

* fix: update txSummary

* fix(eos): using private node in ci test (#42)

Co-authored-by: wangbing <wangbing@cryptape.com>

* chore: lint for staged files  (#65)

* chore: lint for staged files

* chore: check the types when lint

* docs: add user-guide.md (#61)

* docs: add user-guide.md

* chore: add pw-lock ref link

* fix: update tx summary query (#66)

* fix: opt log (#57)

* fix: opt log

* feat(log): 增加file类型的日志输出

* chore(log): opt ckb & eth handler log

* chore(log): opt ci test log

* fix: update tron-ci test order, to fix tron ci test failed cause by local time large then tron test server time

Co-authored-by: wangbing <wangbing@cryptape.com>

* chore: prepare husky to avoid cannot find git error (#70)

* fix(ckb-contracts): add bridge_lock_hash_type to recipient data (#67)

* fix(ckb-contracts): add bridge_lock_hash_type to recipient data

* fix

* fix

* fix

* fix: change watch ckb mint status way (#69)

* fix: change watch ckb mint status way

* fix: update ckb handler

* chore: update code

* chore: update logger

* chore: update logger info

* chore: reset mint sent log

* fix: remove mysql index of enum

* fix: use index

* feat: support use private key path in config (#75)

* feat: support use private key path in config

* fix ci

* lint

* fix(offchain): deploy asset bridge cell when start (#74)

* fix(offchain): deploy asset bridge cell when start

* fix

* feat: support query by other chain address  (#71)

* feat: support other address query

* chore: format log

* chore: format response

* fix: update filter

* fix: pass the ci

* fix: pass the tron ci

Co-authored-by: Eric.Wang <136147966@qq.com>
Co-authored-by: wangbing <wangbing@cryptape.com>
Co-authored-by: Yonghui Lin <homura.dev@gmail.com>
Co-authored-by: mkxbl <33241113+mkxbl@users.noreply.github.com>
Co-authored-by: JacobDenver007 <29848184+JacobDenver007@users.noreply.github.com>
Co-authored-by: Wenchao Hu <me@huwenchao.com>

* style: format code to pass the verify

* feat: add ckb-multi-sign

* chore: update the code lint

* fix: fix some problems

* style: format code to pass check

* style: remove src package

* chore: format code

* fix: use main branch lint-staged

* fix: remove unused code and config

Co-authored-by: LeonLi000 <matrix.skygirl@gmail.com>
Co-authored-by: jacobdenver007 <jacobdenver@163.com>
Co-authored-by: wangbing <wangbing@cryptape.com>
Co-authored-by: Eric.Wang <136147966@qq.com>
Co-authored-by: Yonghui Lin <homura.dev@gmail.com>
Co-authored-by: mkxbl <33241113+mkxbl@users.noreply.github.com>
Co-authored-by: JacobDenver007 <29848184+JacobDenver007@users.noreply.github.com>
Co-authored-by: Wenchao Hu <me@huwenchao.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@fpChan @codecov-commenter @solargatsby