OSDN Git Service

merge with the dev
authorpaladz <453256728@qq.com>
Sun, 29 Oct 2017 12:20:58 +0000 (20:20 +0800)
committerpaladz <453256728@qq.com>
Sun, 29 Oct 2017 12:20:58 +0000 (20:20 +0800)
commitec959707f7ebe6d1e1bacbafb1a035b665427acb
tree1f343d549033d17231c2037f00b5e49345f93faa
parent6ce4d859afc97b32fa24d58536734c8f5461270b
parent9696f0e7d905f87364ec584e47d1ab318b60d9b7
merge with the dev
blockchain/pin/pin.go
blockchain/transact.go
node/node.go
protocol/block.go