Merge branch 'v0.1' into fix_utxo_valid_height

author shenao78 <shenao.78@163.com>

Thu, 13 Jun 2019 08:55:40 +0000 (16:55 +0800)

committer shenao78 <shenao.78@163.com>

Thu, 13 Jun 2019 08:55:40 +0000 (16:55 +0800)
author shenao78 <shenao.78@163.com>
Thu, 13 Jun 2019 08:55:40 +0000 (16:55 +0800)
committer shenao78 <shenao.78@163.com>
Thu, 13 Jun 2019 08:55:40 +0000 (16:55 +0800)
diff --cc wallet/utxo.go
Simple merge
diff --cc wallet/utxo_test.go
Simple merge
author	shenao78 <shenao.78@163.com>
	Thu, 13 Jun 2019 08:55:40 +0000 (16:55 +0800)
committer	shenao78 <shenao.78@163.com>
	Thu, 13 Jun 2019 08:55:40 +0000 (16:55 +0800)
		1	2
wallet/utxo.go	patch \|	diff1 \|	diff2 \|	blob \| history
wallet/utxo_test.go	patch \|	diff1 \|	diff2 \|	blob \| history