Commit Graph

291 Commits

Author SHA1 Message Date
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
Alburt ffa2d6721d
Merge pull request #41 from meshplus/refactor/network-interface
refactor(network): rm idStore and modify interface
2020-04-21 17:23:44 +08:00
Aiden X 759f61eac3 refactor(network): rm idStore and modify interface 2020-04-21 17:11:54 +08:00
Aiden X a9924a3817
Merge pull request #32 from 4ever9/ci/update-codecov-1.0.6
ci(codecov): update to 1.0.6
2020-04-21 13:49:55 +08:00
Aiden X 2fd7f98274 ci(codecov): update to 1.0.6 2020-04-21 12:47:33 +08:00
Aiden X 94a42fbe85
Merge pull request #29 from terasum/master
fix(internal/repo/config.go): fix typo
2020-04-21 12:28:54 +08:00
Aiden X caada28c3b
Merge pull request #30 from meshplus/ci/use-v2-checkout
ci(*): use v2 checkout
2020-04-20 21:52:07 +08:00
Aiden X f4621dd025 ci(*): use v2 checkout 2020-04-20 21:31:40 +08:00
Chen Quan 89cf230dae
fix(internal/repo/config.go): fix typo 2020-04-20 20:51:30 +08:00
Aiden X 1ec8bf3c40
Merge pull request #28 from meshplus/scripts/quick_start/add-specific-version-for-pier
chore(scripts): checkout specific version for pier
2020-04-18 16:28:01 +08:00
Aiden X 1b7656935b chore(scripts): checkout specific version for pier
Closes: #19
2020-04-18 00:19:35 +08:00
Alburt 14365611ea
Merge pull request #26 from meshplus/fix/fix-node-test-failure
fix(node):fix the failure of node test
2020-04-17 19:22:58 +08:00
jiangzhe e2c1bc8db1 fix(node):fix the failure of node test 2020-04-17 17:16:17 +08:00
Aiden X c42ed255b3
Merge pull request #25 from meshplus/feat/handle-invalid-chain_id
feat(executor): handling invalid destination chain id
2020-04-17 11:13:12 +08:00
Alexader ae54604bf9 feat(executor): handling invalid destination chain id
When the destination chain id of ibtp is not exist in bitxhub, its content should still be processed.
close #22
2020-04-17 10:29:45 +08:00
Aiden X 5c47b60284
Merge pull request #20 from meshplus/refactor/illegal-tx-handling
refactor(executor): refactor illegal tx handling
2020-04-16 20:44:31 +08:00
Alexader ec0bd485d6 refactor(executor): refactor illegal tx handling
when the destination chain id is illegal, bitxhub should ignore it instead of returning error. The appchain which invoked this tx will wait for this tx to timeout.
2020-04-16 20:38:08 +08:00
Aiden X 9ebc083a89
Merge pull request #21 from meshplus/feat/new-validation-engine
Refactor validation engine
2020-04-16 20:34:11 +08:00
levi9311 d1af9adfef feat: adjust validation and wasm module
move wasm lib to validation module
wasm instance now need imports to create
2020-04-16 20:10:24 +08:00
levi9311 3e602dcd07 feat: add auto determine fabric internal rule
Now internal rule manager will automatically use fabric internal rule address when it can not find wasm address
2020-04-16 11:26:56 +08:00