forked from nervosnetwork/force-bridge
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge: merge main branch code before refactor (#5)
* 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>
- Loading branch information
1 parent
ef5836a
commit 06ea3d9
Showing
77 changed files
with
2,289 additions
and
768 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.