Commit Graph

132 Commits

Author SHA1 Message Date
Aiden X 60e3ea3909
Merge pull request #86 from jsrzx/master
修正错误的make目标
2020-05-29 09:16:21 +08:00
jasonruan 9813d859e3 修正错误的make目标 2020-05-28 12:27:07 +08:00
Aiden X 69fe5b3055
Merge pull request #84 from meshplus/refactor/build-tx-merkle-tree
feat(*): construct interchain txs merkle tree
2020-05-28 11:06:25 +08:00
zhourong c6e48f257d feat(*): construct interchain txs merkle tree 2020-05-28 10:55:09 +08:00
Aiden X c3d850d3d4
Merge pull request #85 from meshplus/feat/add-bitxhub-solo-dockerfile
feat/add bitxhub solo dockerfile
2020-05-28 01:11:28 +08:00
jiangzhe 9b3097f66d feat/add bitxhub solo dockerfile 2020-05-27 19:12:25 +08:00
Aiden X 5a866c23eb
Merge pull request #81 from meshplus/fix/add-build-raft-in-dockerfile
fix(dockerfile):add build raft in dockerfile
2020-05-26 12:47:46 +08:00
Aiden X 3a70d32e95
Merge pull request #83 from meshplus/test/fix-executor-test
test(executor): fix occasional test hang
2020-05-26 12:47:31 +08:00
zhourong 9f07926d1d test(executor): fix occasional test hang 2020-05-26 10:41:46 +08:00
jiangzhe ec97dbf0c4 fix(dockerfile):add build raft in dockerfile 2020-05-25 20:36:54 +08:00
Aiden X 82a3ac119b
Merge pull request #79 from meshplus/build/add-dockerfile
build(docker): add wasm dep lib
2020-05-25 14:38:46 +08:00
Aiden X a8a8497ef5 build(docker): add wasm dep lib 2020-05-25 14:17:36 +08:00
Aiden X da85059f82
Merge pull request #68 from meshplus/build/add-dockerfile
build(docker): add Dockerfile
2020-05-25 14:14:04 +08:00
Aiden X e455572fef build(docker): add Dockerfile 2020-05-22 15:46:19 +08:00
Aiden X b9c3a2b4e9
Merge pull request #78 from meshplus/refactor/genesis
refactor(config): read genesis config from genesis.json
2020-05-22 15:36:53 +08:00
zhourong 73a6820e9b refactor(config): read genesis config from genesis.json 2020-05-22 14:40:44 +08:00
Aiden X ff7a978400
Merge pull request #77 from meshplus/feat/add-prometheus-monitor
feat(monitor):add monitor point
2020-05-21 23:32:24 +08:00
jiangzhe 1e47675fd1 feat(monitor):add monitor point 2020-05-21 19:08:53 +08:00
Aiden X 8d904d43a0
Merge pull request #76 from meshplus/feat/add-prometheus-monitor
feat(*):add prometheus monitor
2020-05-19 14:02:40 +08:00
jiangzhe 4fc2202c7d feat(*):add prometheus monitor 2020-05-15 19:39:01 +08:00
Aiden X 92574e81f5
Merge pull request #75 from meshplus/feat/add-example
feat: add validation rule example
2020-05-15 19:09:36 +08:00
levi9311 574251e003 feat: add validation rule example
add validation rule rust example
2020-05-15 13:37:53 +08:00
Aiden X 664d5c4bcd
Merge pull request #74 from meshplus/feat/add-query-interchain
feat(*):add query interchain
2020-05-13 20:10:13 +08:00
jiangzhe bc681ea6fa feat(*):add query interchain 2020-05-12 19:39:08 +08:00
Aiden X 40d7c6aaf0
Merge pull request #73 from meshplus/fix/duplicate-proto-type
fix(*): use latest kit
2020-05-09 14:31:20 +08:00
Aiden X 830d5f4556 fix(*): use latest kit
Closes: #50
2020-05-09 14:18:51 +08:00
Aiden X 06c6ff3676
Merge pull request #72 from meshplus/fix/fix-concurrent-map-write
fix(*): fix concurrent map write in swarm.go
2020-05-08 16:13:23 +08:00
Aiden X f9660ca155
Merge pull request #70 from meshplus/refactor/separate-persistence-from-exec
refactor(*): separate data persistence from block execution
2020-05-08 16:11:15 +08:00
zhourong 948f27521f fix(*): fix concurrent map write in swarm.go 2020-05-08 16:08:21 +08:00
zhourong 8d71fd392f refactor(*): separate data persistence from block execution 2020-05-08 11:09:13 +08:00
Aiden X 6fd0786aba
Merge pull request #69 from meshplus/refactor/remove-appchain-module
refactor(contracts): remove appchain manager
2020-05-07 15:51:25 +08:00
jiangzhe b139e29a17 refactor(contracts): remove appchain manager
1. remove appchain contract to bitxhub-core project.
2. extract IBTP contract from appchain.
2020-05-07 14:54:01 +08:00
Aiden X 1f8c8a29a6
Merge pull request #64 from meshplus/refactor/tester
refactor(tester): rm gosdk and use core api
2020-04-29 19:19:58 +08:00
Aiden X 94b7d5a8d3 refactor(tester): rm gosdk and use core api 2020-04-29 19:10:25 +08:00
Aiden X 381798c319
Merge pull request #61 from meshplus/ledger
refactor(ledger): add interface to remove journal
2020-04-29 16:40:02 +08:00
Aiden X 4a167cf715
Merge pull request #67 from meshplus/feat/add-get-pubkey
feat: add get public key
2020-04-29 16:25:56 +08:00
levi9311 3609a9fc1c feat: add get public key
Add get public key in interchain.
2020-04-29 15:57:55 +08:00
Aiden X 6366a22a70
Merge pull request #66 from meshplus/fix/fix-concurrent-map-writes
fix(*): fix concurrent map writes
2020-04-29 15:33:28 +08:00
zhourong ecb30f79da fix(*): fix concurrent map writes 2020-04-29 15:03:31 +08:00
Aiden X 33055dfafc
Merge pull request #62 from meshplus/feat/register-with-pubkey
feat: add register pubkey
2020-04-28 19:26:44 +08:00
Aiden X 249e9de88c
Merge pull request #65 from meshplus/feat/default-txWrapper
feat(api): add default tx wrapper for return
2020-04-28 19:26:05 +08:00
Alexader 574f90cc3a feat(api): add default tx wrapper for return
1. add default tx wrapper for return when a block contains no interchan tx
2. close channel when GetInterchainWrapper and GetBlockHeader finish
2020-04-28 19:09:43 +08:00
Aiden X e6229af3db
Merge pull request #63 from meshplus/fix-concurrent-map-writes
fix(ledger): fix concurrent map writes
2020-04-28 16:48:54 +08:00
zhourong a3b2be6909 fix(ledger): fix concurrent map writes 2020-04-28 16:41:27 +08:00
zhourong e72cb6cbab refactor(ledger): add interface to remove journal 2020-04-28 16:27:15 +08:00
xialiwei 5796919e82 feat: add register pubkey
Now appchain registration need upload public key.
2020-04-28 15:02:55 +08:00
Aiden X 58696975ae
Merge pull request #60 from meshplus/ledger
refactor(*): deal with DB error in storage
2020-04-28 12:44:02 +08:00
zhourong 06869782ce refactor(*): deal with DB error in storage 2020-04-28 11:11:34 +08:00
Aiden X d0511641cd
Merge pull request #58 from meshplus/refactor/extract-order-module
refactor(order):extract order module to pkg module
2020-04-27 18:52:46 +08:00
Aiden X 500f802c7c
Merge pull request #59 from meshplus/ledger
refactor(ledger): rollback ledger to a certain block according to the…
2020-04-27 18:52:27 +08:00