Commit Graph

210 Commits

Author SHA1 Message Date
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
jiangzhe 813a7322db refactor(order):extract order module to pkg module 2020-04-27 17:27:43 +08:00
zhourong e2b5302f22 refactor(ledger): rollback ledger to a certain block according to the journals 2020-04-27 17:18:22 +08:00
Aiden X d0f58fce83
Merge pull request #57 from meshplus/ledger
fix(ledger): get prevJournalHash when new ledger
2020-04-27 14:07:14 +08:00
zhourong 67b059aa45 fix(ledger): get prevJournalHash when new ledger 2020-04-27 14:00:46 +08:00
Aiden X a0da50b9b9
Merge pull request #49 from meshplus/feat/split-merkle-wrapper
feat(*): split merkleWrapper into header and txWrapper
2020-04-27 13:15:55 +08:00
Alexader 3ae115af8f feat(*): split merkleWrapper into header and txWrapper
change grpc api SyncMerkleWrapper into GetInterchainTxWrapper and
GetBlockHeader
2020-04-27 11:23:36 +08:00
Aiden X 07fd9c1679
Merge pull request #56 from meshplus/fix/rename-ldflags
fix(Makefile): Use GOLDFLAGS
2020-04-26 22:40:47 +08:00
Aiden X 558508348f fix(Makefile): Use GOLDFLAGS 2020-04-26 22:20:52 +08:00
Aiden X fc272f869a
Merge pull request #55 from meshplus/ledger
refactor(ledger): use KV instead of tree
2020-04-26 21:05:59 +08:00
zhourong 86f946d2d4 refactor(ledger): use KV instead of tree 2020-04-26 20:49:28 +08:00
Aiden X ac73a48a29
Merge pull request #54 from meshplus/fix/fix-quick-start-file-name
fix(srcipt): rename fabric rule file
2020-04-26 12:26:51 +08:00
xialiwei 2dcb1ac49b fix(srcipt): rename fabric rule file
Rename fabric rule file. Replace hyphen with underline.
2020-04-26 11:22:11 +08:00
Aiden X c26b3320ef
Merge pull request #53 from meshplus/fix/fix-start-fabric-validation
fix(scripts): fix fabric wasm file input args
2020-04-26 10:57:38 +08:00
xialiwei db2fcb149b fix(scripts): fix fabric wasm file input args
With new validation policy, a new arg is required when call start_verify function. Replace new wasm file for new validation policy.

fixes #51
2020-04-26 10:46:15 +08:00
Aiden X a231a218c4
Merge pull request #45 from meshplus/fix/fix-getblocks-grpc
fix(grpc): fix getblocks func
2020-04-22 20:23:52 +08:00
jiangzhe 2c561b9864 fix(grpc): fix getblocks func 2020-04-22 16:55:59 +08:00
Aiden X e5eaea1527
Merge pull request #44 from meshplus/refactor/use-kit-network
refactor(network): use bitxhub-kit network module
2020-04-22 16:29:23 +08:00
Aiden X 4739043936 refactor(network): use bitxhub-kit network module 2020-04-22 16:02:56 +08:00
Aiden X 3e40509dbe
Merge pull request #43 from meshplus/refactor/network-interface
refactor(network): add message handler
2020-04-22 15:49:36 +08:00
Aiden X 825bfaea12 refactor(network): add message handler 2020-04-22 15:30:13 +08:00
Aiden X 92a4bc9373
Merge pull request #42 from meshplus/feat/rm-wasm-validation-core
feat(validation): rm wasm validation core
2020-04-21 21:05:51 +08:00
levi9311 7c896563b1 feat: remove wasm core
remove wasm core function
2020-04-21 21:01:53 +08:00