| Revision | 92edf53254b4558c8c1f4df9598a5d3e9f36a366 (tree) |
|---|---|
| Time | 2018-03-26 19:35:27 |
| Author | Yongfeng LI <wliyongfeng@gmai...> |
| Commiter | Yongfeng LI |
Merge branch 'dev'
.gitignore Makefile account/indexer.go api/accounts.go api/api.go api/blockchain_reactor.go api/hsm.go api/miner.go api/query.go api/receivers.go api/transact.go api/txfeeds.go api/types.go blockchain/account/indexer.go blockchain/account/receivers.go blockchain/account/receivers_test.go blockchain/accounts.go blockchain/accounts_test.go blockchain/asset/asset_test.go blockchain/assets_test.go => asset/asset_test.go blockchain/block_keeper.go blockchain/blockchain_reactor.go blockchain/hsm.go blockchain/hsm_test.go blockchain/miner.go blockchain/net.go blockchain/pseudohsm/pseudohsm.go blockchain/pseudohsm/pseudohsm_test.go blockchain/query.go blockchain/query/annotated.go blockchain/query/filter/doc.go blockchain/query/transactions.go blockchain/reactor.go blockchain/receivers.go blockchain/rpc/net.go blockchain/rpc_reactor.go blockchain/signers/signers.go blockchain/tls.go blockchain/transact.go blockchain/txbuilder/actions.go blockchain/txbuilder/builder.go blockchain/txbuilder/constraint.go blockchain/txbuilder/data_witness.go blockchain/txbuilder/finalize.go blockchain/txbuilder/rawtxsig_witness.go blockchain/txbuilder/signature_program.go blockchain/txbuilder/signature_witness.go blockchain/txbuilder/signing_instruction.go blockchain/txbuilder/txbuilder.go blockchain/txbuilder/txbuilder_test.go blockchain/txbuilder/types.go blockchain/txbuilder/witness.go blockchain/txdb/store.go blockchain/txfeed/txfeed.go blockchain/txfeeds.go cmd/bytomcli/commands/account.go cmd/bytomcli/commands/block.go cmd/bytomcli/commands/bytomcli.go cmd/bytomcli/commands/key.go cmd/bytomcli/commands/transaction.go cmd/bytomd/commands/run_node.go cmd/bytomd/main.go cmd/miner/main.go common/math/dist.go common/math/dist_test.go common/sort.go config/genesis.go config/genesis_test.go consensus/difficulty/difficulty.go consensus/difficulty/difficulty_test.go consensus/general.go crypto/scrypt/scrypt.go crypto/scrypt/smix.go dashboard/dashboard.go database/leveldb/store.go database/store.go mining/cpuminer/cpuminer.go mining/mining.go mining/miningpool/minepool.go mining/tensority/matrix.go mining/tensority/seed.go mining/tensority/tensority.go mining/tensority/tensority_test.go net/http/authn/authn.go net/http/authn/authn_test.go node/node.go p2p/addrbook_test.go p2p/connection_test.go p2p/listener_test.go p2p/netaddress_test.go p2p/peer_set_test.go p2p/peer_test.go p2p/pex_reactor_test.go p2p/secret_connection_test.go p2p/switch.go p2p/switch_test.go p2p/trust/config.go p2p/trust/metric.go p2p/trust/metric_test.go p2p/trust/store.go p2p/trust/store_test.go p2p/trust/ticker.go protocol/bc/asset.go protocol/bc/asset_test.go protocol/bc/bc.pb.go protocol/bc/bc.proto protocol/bc/bctest/tx.go protocol/bc/blockheader.go protocol/bc/entry.go protocol/bc/entry_test.go protocol/bc/issuance.go protocol/bc/legacy/fuzz_test.go protocol/bc/merkle_test.go protocol/bc/output.go protocol/bc/retirement.go protocol/bc/spend.go protocol/bc/tx_status.go protocol/bc/tx_status_test.go protocol/bc/txheader.go protocol/bc/types/fuzz_test.go protocol/bc/{legacy => types}/bc_test.go protocol/bc/{legacy => types}/block.go protocol/bc/{legacy => types}/block_commitment.go protocol/bc/{legacy => types}/block_header.go protocol/bc/{legacy => types}/block_test.go protocol/bc/{legacy => types}/coinbase.go protocol/bc/{legacy => types}/issuance.go protocol/bc/{legacy => types}/issuance_witness.go protocol/bc/{legacy => types}/map.go protocol/bc/{legacy => types}/map_test.go protocol/bc/{legacy => types}/output_commitment.go protocol/bc/{legacy => types}/spend.go protocol/bc/{legacy => types}/transaction.go protocol/bc/{legacy => types}/transaction_test.go protocol/bc/{legacy => types}/tx_test.go protocol/bc/{legacy => types}/txinput.go protocol/bc/{legacy => types}/txoutput.go protocol/block.go protocol/protocol.go protocol/state/utxo_view.go protocol/state/utxo_view_test.go protocol/tx.go protocol/tx_test.go protocol/validation/block_test.go protocol/validation/validation.go protocol/validation/validation_test.go protocol/validation/vmcontext.go protocol/validation/vmcontext_test.go protocol/vm/context.go protocol/vm/introspection.go protocol/vm/introspection_test.go protocol/vm/ops.go protocol/vm/stack_test.go protocol/vm/vmutil/script.go protocol/vm/vmutil/script_test.go protocol/{mempool.go => txpool.go} protocol/{mempool_test.go => txpool_test.go} test/integration/standard_transaction_test.go test/performance/mining_test.go test/util.go types/genesis.go types/signable.go util/util.go version/version.go {blockchain => api}/accesstokens.go {blockchain => api}/assets.go {blockchain => api}/errors.go {blockchain => api}/metrics.go {blockchain => api}/request.go {blockchain => api}/transact_test.go {blockchain => api}/wallet.go {blockchain/accesstoken => accesstoken}/accesstoken.go {blockchain/accesstoken => accesstoken}/accesstoken_test.go {blockchain/account => account}/accounts.go {blockchain/account => account}/accounts_test.go {blockchain/account => account}/builder.go {blockchain/account => account}/reserve.go {blockchain/account => account}/reserve_test.go {blockchain/asset => asset}/annotate.go {blockchain/asset => asset}/asset.go {blockchain/asset => asset}/builder.go {blockchain/txdb => database/leveldb}/cache.go {blockchain/txdb => database/leveldb}/mainchain.go {blockchain/txdb => database/leveldb}/mainchain_test.go {blockchain/txdb => database/leveldb}/utxo_view.go {blockchain/txdb => database/leveldb}/utxo_view_test.go {blockchain/txdb => database}/storage/storage.pb.go {blockchain/txdb => database}/storage/storage.proto {blockchain/txdb => database}/storage/utxo_entry.go {blockchain/wallet => wallet}/annotated.go {blockchain/wallet => wallet}/indexer.go {blockchain/wallet => wallet}/wallet.go {blockchain/wallet => wallet}/wallet_test.go
Fork