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

feat(offchain): update ckb-relay #52

Merged
merged 120 commits into from Nov 24, 2020
Merged

feat(offchain): update ckb-relay #52

merged 120 commits into from Nov 24, 2020

Conversation

fpChan
Copy link
Contributor

@fpChan fpChan commented Nov 23, 2020

  • prepare multi transction with all header . then send all transaction to eth

  • update docs

  • fix unlock bug

fpChan and others added 29 commits November 17, 2020 11:25
# Conflicts:
#	offchain-modules/cli/src/commands/mod.rs
#	offchain-modules/cli/src/commands/types.rs
#	offchain-modules/lib/Cargo.toml
#	offchain-modules/lib/src/transfer/to_ckb.rs
#	offchain-modules/lib/src/transfer/to_eth.rs
#	offchain-modules/lib/src/util/ckb_util.rs
#	offchain-modules/lib/src/util/settings.rs
#	offchain-modules/test.sh
docker: mount config to geth container
Co-authored-by: zhounan <vyclzn@gmail.com>
# Conflicts:
#	offchain-modules/cli/src/commands/mod.rs
#	offchain-modules/cli/src/commands/types.rs
#	offchain-modules/lib/src/transfer/to_ckb.rs
#	offchain-modules/lib/src/transfer/to_eth.rs
#	offchain-modules/lib/src/util/ckb_util.rs
#	offchain-modules/lib/src/util/eth_util.rs
# Conflicts:
#	offchain-modules/cli/src/commands/mod.rs
#	offchain-modules/lib/src/relay/ckb_relay.rs
# Conflicts:
#	offchain-modules/lib/src/util/eth_util.rs
@cryptowen cryptowen merged commit 2f9a581 into nervosnetwork:main Nov 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants