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

merge main code #3

Merged
merged 17 commits into from May 18, 2021
Merged

merge main code #3

merged 17 commits into from May 18, 2021

Conversation

fpChan
Copy link

@fpChan fpChan commented May 18, 2021

No description provided.

fpChan and others added 17 commits May 6, 2021 23:43
* 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
Co-authored-by: wangbing <wangbing@cryptape.com>
* 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

* feat: update ckb getBalance

* fix: update txSummary
Co-authored-by: wangbing <wangbing@cryptape.com>
* chore: lint for staged files

* chore: check the types when lint
* docs: add user-guide.md

* chore: add pw-lock ref link
* 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>
…osnetwork#67)

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

* fix

* fix

* fix
* 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

* fix ci

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

* fix
* feat: support other address query

* chore: format log

* chore: format response

* fix: update filter
@solargatsby solargatsby marked this pull request as ready for review May 18, 2021 09:57
@solargatsby solargatsby merged commit 6c75939 into solargatsby:multi-sig May 18, 2021
@fpChan fpChan deleted the multi-sig-tmp branch May 21, 2021 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants