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.

Sign up for GitHub

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

feat(dapp-lib): integrated multi-signature server #219

Open
wants to merge 160 commits into
base: develop
Choose a base branch
from
Open

feat(dapp-lib): integrated multi-signature server #219

wants to merge 160 commits into from

Conversation

LeonLi000
Copy link
Contributor

@LeonLi000 LeonLi000 commented Mar 3, 2021 •
edited

  1. multi-signature server features: simple and easy to use, can be deployed independently.
  2. provide two signature interfaces based on json rpc.
  3. some modifications have been made to the off-chain adaptation of the multi-signature server.

LeonLi000 and others added 30 commits December 30, 2020 10:35
@LeonLi000
modify bridge default capacity
3bfbd00
@fpChan
fix(off-chain): update the way of find eth cell (nervosnetwork#136)
7e35ed7 
* feat(off-chain): add relay monitor

* feat(off-chain): add light client conservator

* feat(off-chain): remove telegram bot token

* feat(off-chain): update relay monitor with conservator list

* style(off-chain): add block in new line

* feat(off-chain): send all info once time

* style(off-chain): remove monitor in script

* style(off-chain): change find light cell way

* fix(off-chain): add light client and chain height difference

* fix(off-chain): update get live eth cell way
@cosinlink
fix: force server (nervosnetwork#134)
c8bd187 
* fix: db locked error by increasing timeout

* add optional param for test

* change thread num

* fix retry

* fix: deploy eth contracts out of gas

* fix clippy

* fix(deploy scripts): deploy.js bug while using custom wallet, this is a bug of hardhat framework

Co-authored-by: Ethan Hu <cosinlink@163.com>
@JacobDenver007
fix(ckb-contracts): add unit test (nervosnetwork#106)
1d42644 
* fix(ckb-contracts): add ut

* fix(ckb-contracts): add ut for bridge typescript

* fix(ckb-contracts): new mock tests

* fix(ckb-contracts): fix clippy

* fix(ckb-contracts): bridge typescript tests

* fix(ckb-contracts): add light client tests

* fix(ckb-contracts): fix clippy

* fix(ckb-contracts): fix clippy

* fix(ckb-contracts): add recipient tests

* fix(ckb-contracts): fix test

* fix(ckb-contracts): fulfill recipient testcases

* fix(ckb-contracts): bridge test
@JacobDenver007
feat(ckb-contracts): add simple bridge typescript (nervosnetwork#141)
36fec12 
* feat(ckb-contracts): add simple bridge typescript

* fix(ckb-contracts): fix bug to rename to simple-bridge

* feat(offchain): add simple bridge typescript

* fix clippy

* fix(demo): fix command line

* fix(ckb-contracts): add debug
feat: add arg to force create new bridge cell (nervosnetwork#148)
648f639
feat: return need capacity amount in not enough error (nervosnetwork#149
9b4148b 
)
@cosinlink
chore: add git submodule update --init for local-ci (nervosnetwork#152
b7411a3 
)
@JacobDenver007
fix(ckb-contracts): add history merkle root for ckb contracts (nervos…
0d6f750 
…network#145)

* fix(ckb-contracts): add history merkle root for ckb contracts

* fix(ckb-contracts): update types to make bridge lock only verify merkle proof

* fix(ckb-contracts): smt tests

* fix(ckb-contracts): fix clippy

* fix(ckb-contracts): comment bridge tests

* fix(ckb-contracts): define local Hasher to avoid inporting private repo

* fix(offchain): add SMT.store rocksdb impl

* fix(ckb-contracts): use header.number and header.hash to verify smt tree

* fix(offchain): use history merkle toor to update eth light client & execute mint

* fix(offchain): modify monitor and server

* fix(offchain): add cache to rocksdb

* fix(offchain): add readonlydb and pre merkle proof check
feat: optimize mint witness (nervosnetwork#160)
f34dac2 
* feat: optimize mint witness

* add doc

* chore: small refact for recipient typescript

* remove test for temp, get it back when fixed the test
@JacobDenver007
fix(ckb-contracts): fix testcase (nervosnetwork#161)
6351e2a
@JacobDenver007
fix(ckb-contracts): new bridge capsule tests (nervosnetwork#165)
645f6ed 
* fix(ckb-contracts): new bridge capsule tests

* fix(ckb-contracts): fix testcase format
@cosinlink
feat(eth-contracts): add openzeppelin upgradeable contract demo and t…
f21db4e 
…est (nervosnetwork#140)

* feat(eth-contracts): add openzeppelin upgradeable contract demo and test

* feat(eth-contracts): add openzeppelin upgradeable CKBChainV2 and TokenLocker, tests of them

* feat(eth-contracts): add deploy-openzeppelin.js for openzeppelin upgradeable contracts

* feat(eth-contracts): remove unused code

* feat(eth-contracts): remove unused script

* fix: ci error, add --network option

* test: fix ci error

* test: fix ci error2

* feat: add new deploy.js and deploy-erc20.js for openzeppelin upgradeable contracts

* fix: ci error

* fix: add retry times to deploy.js to fix deploy proxy error

* chore: modify start-geth to restart-geth

* feat(eth-contracts/test/utils): add retryPromise, getMockTinyHeaderParam for openzeppelin upgradeable contracts

* feat: add new deploy.js and setSpecificTinyHeader.js

* feat: modify setSpecificTinyHeader

* feat: add upgrade.js script

* lint: fix

* fix: test error

* fix: ci error

* fix: ci error on hardhat config

* fix: ci error on hardhat config

* fix: ci accounts error on hardhat config

* fix: add deploy ci error info

* lint: fix

* fix: delete unused contracts to fix local-ci problem

* fix: delete unused contracts to fix local-ci problem

* fix: modify old contract name to fix name conflict problem in openzeppelin validate check

* chore: modify test contract to test folder

* chore: modify test contract name to avoid contract name conflict

* feat(eth-contracts): fix todo, replace IERC2O.transfer with safeTransfer, fix blockNumber + numConfirmations overflow in CKBChain,

* fix: remove delegateCall in Address.sol, because openzeppelin upgrades doesn't support it
doc: step by step guide (nervosnetwork#170)
6986354 
* doc: step by step guide

* add toc
doc: update step by step guide (nervosnetwork#180)
5b900f5
test: fix coverage test (nervosnetwork#183)
81e1f6d 
* add coverate test in makefile

* fix eth coverate test

* update github workflow config

* fix config problem

* fix ci

* fix ci

* fix ci

* fix ci

* move coverage test to seprate file
@JacobDenver007
fix(ckb-contracts): add ckb contracts tests (nervosnetwork#191)
2e9b4fe 
* fix(ckb-contracts): add simple bridge typescript tests

* fix(ckb-contracts): refactor eth recipient typescript tests

* fix(ckb-contracts): add tests for eth bridge lockscript

* fix(ckb-contracts): add eth bridge lock manage test
@LeonLi000
improve indexer code
95421d0
@cosinlink
feat: add coverage on openzeppelin upgradeable contracts (nervosnetwo…
baf8256 
…rk#193)
@LeonLi000
fix: Increase eth indexer and ckb indexer state dependency
cfe2662
@LeonLi000
feat: optimize indexer sql struct
d377422
@LeonLi000
fix: add bridge typescript code hash verify in handle mint tx
28b16d4
@LeonLi000
merge from remote
9473528
doc: update step-by-step guide (nervosnetwork#196)
5078fc3
@LeonLi000 @nolanxyg
Update offchain-modules/lib/src/dapp/db/source/indexer.sql
8c05218 
Co-authored-by: mkxbl <33241113+mkxbl@users.noreply.github.com>
@LeonLi000
add sedner_addr index
86aee17
@LeonLi000
Merge branch 'dapp-lib' of https://github.com/LeonLi000/force-bridge-eth
1423003 
 into dapp-lib
@LeonLi000
Merge remote-tracking branch 'upstream/main' into main
5c84893
@LeonLi000
merge from main
c319d8e
@LeonLi000 @nolanxyg
Update offchain-modules/lib/src/dapp/db/source/indexer.sql
ca59c4b 
Co-authored-by: mkxbl <33241113+mkxbl@users.noreply.github.com>
@LeonLi000
github ci test
6a9b86a
@LeonLi000
make github ci
87af289
@LeonLi000
make github ci
a99642e
@LeonLi000
add input output lockscript verify
2680078
@LeonLi000
add ckb tx lock&type script verify
ded33b8
@LeonLi000
add the test of multiple signature servers
115ebee
@LeonLi000
optimize collect_signatures
5988842
@LeonLi000
optimize ckb relayer
1a807bf
@LeonLi000
Merge remote-tracking branch 'upstream/dapp-lib' into dapp-lib
a1201d5
@LeonLi000
merge from dapp-lib
dd1dab0
@LeonLi000
make clippy
e18c99d
@LeonLi000
minor change
508749f
@LeonLi000
code clean
1ce07b8
@LeonLi000
add some log info
8a69594
@LeonLi000
draft: add readme.md
3632ba4
@LeonLi000
update sign server as submodule
0392fc2
@LeonLi000
minor change
1a56927
@LeonLi000
remove sdk dependence in sign server
293ecfb
@LeonLi000
minor change
dc2d715
@LeonLi000
remove force bridge eth types dependence in sign server
28c65c9
@LeonLi000
make clippy
343a9c5
@LeonLi000
feat(sign-server): Simplify user configuration
07c5d4c
@LeonLi000
Merge remote-tracking branch 'upstream/dapp-lib' into dapp-lib
7d34cb1
@LeonLi000
merge from remote
b28b74e
@LeonLi000
minor change
d1c56c4
@LeonLi000
make github ci
725f1d5
@LeonLi000
make github ci
e4feda4
@LeonLi000
minor change
882254c
nolanxyg
nolanxyg reviewed Mar 22, 2021
View reviewed changes
Copy link
Collaborator

@nolanxyg nolanxyg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

miss eth unsigned tx verification: https://github.com/LeonLi000/sign-server/blob/main/src/main.rs#L89

Makefile
@@ -126,12 +126,14 @@ local-ci:
make close-dev-env
rm -rf ~/.force-bridge/eth-rocksdb
rm -rf ~/.force-bridge/ckb-rocksdb
rm -rf ~/.force-bridge/ckb-rocksdb
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rm -rf ~/.force-bridge/ckb-rocksdb

@e00dan
Copy link

e00dan commented Apr 23, 2021

Hi there, can I ask what's the status of this pull request?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nolanxyg nolanxyg nolanxyg left review comments

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
7 participants
@LeonLi000 @codecov-io @e00dan @nolanxyg @fpChan @JacobDenver007 @cosinlink