OSDN Git Service

Merge branch 'dev' into wallet
authorBlockmeta-区块元 <blockmeta@8btc.com>
Tue, 31 Oct 2017 12:34:00 +0000 (20:34 +0800)
committerBlockmeta-区块元 <blockmeta@8btc.com>
Tue, 31 Oct 2017 12:34:00 +0000 (20:34 +0800)
commitc4958b3bbae66270bb28985a5e1e6f4e7a5ec3d6
tree10f6fb96cba4fae914736b1af3d1398399c2a879
parent5f668242d7921be0356db8ec5f6230e69fd656b8
parentb7c01ac870303549608dcc4f6b0811822104f111
Merge branch 'dev' into wallet
blockchain/hsm.go
blockchain/transact.go
blockchain/txbuilder/txbuilder.go
consensus/general.go