OSDN Git Service

merge with master
authorColt <colt@ColtdeMBP.lan>
Thu, 17 Aug 2017 04:36:46 +0000 (12:36 +0800)
committerColt <colt@ColtdeMBP.lan>
Thu, 17 Aug 2017 04:36:46 +0000 (12:36 +0800)
commit2acd95ded91bf07542b6a76c4fa242e3c901be6a
treead567016d03e1fbc8e4aa8758de9f86f22e7bf56
parentd7457a5e2a432a11809e113b7b1d31a32fec2f61
parent8ef7a21263ca379dc0ba0193ad84b7e32174f819
merge with master
15 files changed:
protocol/bc/legacy/block_commitment.go
protocol/bc/legacy/block_header.go
protocol/bc/legacy/map.go
protocol/validation/block_test.go
protocol/validation/validation.go
protocol/validation/validation_test.go
protocol/validation/vmcontext.go
protocol/vm/crypto.go
protocol/vm/crypto_test.go
protocol/vm/introspection_test.go
protocol/vm/ops.go
protocol/vm/vm.go
protocol/vm/vm_test.go
protocol/vm/vmutil/script.go
protocol/vm/vmutil/script_test.go