Merge pull request #987 from hyperledger/hotfix-checkpoint-0.23.2

Release checkpointing hotfix 0.23.2

CHANGELOG.md

@@ -1,4 +1,11 @@
 # [Hyperledger Burrow](https://github.com/hyperledger/burrow) Changelog
+## [0.23.2] - 2018-12-18
+Hotfix release for 0.23.1
+### Fixed
+- [State] Fixed issue with checkpointing whereby RWTree would load its readTree from one version lower than it should.
+
+
+
 ## [0.23.1] - 2018-11-14
 ### Fixed
 - [EVM] state/Cache no longer allows SetStorage on accounts that do not exist
@@ -321,6 +328,7 @@ This release marks the start of Eris-DB as the full permissioned blockchain node
   - [Blockchain] Fix getBlocks to respect block height cap.
 
 
+[0.23.2]: https://github.com/hyperledger/burrow/compare/v0.23.1...v0.23.2
 [0.23.1]: https://github.com/hyperledger/burrow/compare/v0.23.0...v0.23.1
 [0.23.0]: https://github.com/hyperledger/burrow/compare/v0.22.0...v0.23.0
 [0.22.0]: https://github.com/hyperledger/burrow/compare/v0.21.0...v0.22.0

NOTES.md

@@ -1,8 +1,5 @@
+Hotfix release for 0.23.1
 ### Fixed
-- [EVM] state/Cache no longer allows SetStorage on accounts that do not exist
-- [GRPC] GetAccount on unknown account no longer causes a panic
+- [State] Fixed issue with checkpointing whereby RWTree would load its readTree from one version lower than it should.
 
-### Added
-- [Docker] Added solc 0.4.25 binary to docker container so that burrow deploy has what it needs to function
-- [Execution] panics from executors are captured and pushed to error sink of TxExecution
 

acm/account.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/tendermint/go-amino"
+	amino "github.com/tendermint/go-amino"
 
 	"github.com/hyperledger/burrow/binary"
 	"github.com/hyperledger/burrow/crypto"

acm/bytecode.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hyperledger/burrow/execution/evm/asm"
 	"github.com/hyperledger/burrow/execution/evm/asm/bc"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 )
 
 type Bytecode []byte

bcm/blockchain.go

@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/burrow/acm/validator"
 	"github.com/hyperledger/burrow/genesis"
 	"github.com/hyperledger/burrow/logging"
-	"github.com/tendermint/go-amino"
+	amino "github.com/tendermint/go-amino"
 	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
@@ -136,17 +136,21 @@ func (bc *Blockchain) ValidatorWriter() validator.Writer {
 	return validator.SyncWriter(bc, bc.validatorCache.AlterPower)
 }
 
-func (bc *Blockchain) CommitBlock(blockTime time.Time,
-	blockHash, appHash []byte) (totalPowerChange, totalFlow *big.Int, err error) {
+func (bc *Blockchain) CommitBlock(blockTime time.Time, blockHash,
+	appHash []byte) (totalPowerChange, totalFlow *big.Int, err error) {
 	bc.Lock()
 	defer bc.Unlock()
-	// Checkpoint on the _previous_ block. If we die, this is where we will resume since we know it must have been
-	// committed since we are committing the next block. If we fall over we can resume a safe committed state and
-	// Tendermint will catch us up
+	// Checkpoint on the _previous_ block. If we die, this is where we will resume since we know all intervening state
+	// has been written successfully since we are committing the next block.
+	// If we fall over we can resume a safe committed state and Tendermint will catch us up
 	err = bc.save()
 	if err != nil {
 		return
 	}
+	// TODO: Because our blockchain reference is unversioned we have no easy way (i.e. other than replaying all blocks)
+	// to recover the validator set. This probably suggests that validator set may not be in the correct place...
+	// should it be a versioned tree in state? Should it be its own DB. We probably ought to do a better job of breaking
+	// apart our various concerns.
 	totalPowerChange, totalFlow, err = bc.validatorCache.Rotate()
 	if err != nil {
 		return

binary/bytes.go

@@ -1,6 +1,6 @@
 package binary
 
-import "github.com/tmthrgd/go-hex"
+import hex "github.com/tmthrgd/go-hex"
 
 type HexBytes []byte
 

binary/word256.go

@@ -20,7 +20,7 @@ import (
 	"math/big"
 	"sort"
 
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 )
 
 var (

cmd/burrow/commands/config_options.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hyperledger/burrow/config"
 	"github.com/hyperledger/burrow/crypto"
-	"github.com/jawher/mow.cli"
+	cli "github.com/jawher/mow.cli"
 )
 
 type configOptions struct {

cmd/burrow/commands/configure.go

@@ -17,10 +17,10 @@ import (
 	"github.com/hyperledger/burrow/logging"
 	"github.com/hyperledger/burrow/logging/logconfig"
 	"github.com/hyperledger/burrow/logging/logconfig/presets"
-	"github.com/jawher/mow.cli"
-	"github.com/tendermint/go-amino"
+	cli "github.com/jawher/mow.cli"
+	amino "github.com/tendermint/go-amino"
 	tmEd25519 "github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/encoding/amino"
+	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/p2p"
 )
 

cmd/burrow/commands/deploy.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/hyperledger/burrow/deploy"
+	pkgs "github.com/hyperledger/burrow/deploy"
 	"github.com/hyperledger/burrow/deploy/def"
 	"github.com/hyperledger/burrow/deploy/util"
 	cli "github.com/jawher/mow.cli"

cmd/burrow/commands/start.go

@@ -3,7 +3,7 @@ package commands
 import (
 	"context"
 
-	"github.com/jawher/mow.cli"
+	cli "github.com/jawher/mow.cli"
 )
 
 func Start(output Output) func(cmd *cli.Cmd) {

consensus/tendermint/amino.go

@@ -1,8 +1,8 @@
 package tendermint
 
 import (
-	"github.com/tendermint/go-amino"
-	"github.com/tendermint/tendermint/crypto/encoding/amino"
+	amino "github.com/tendermint/go-amino"
+	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 )
 
 var cdc = amino.NewCodec()

core/kernel.go

@@ -52,7 +52,6 @@ import (
 )
 
 const (
-	FirstBlockTimeout      = 3 * time.Second
 	CooldownTime           = 1000 * time.Millisecond
 	ServerShutdownTimeout  = 1000 * time.Millisecond
 	LoggingCallerDepth     = 5

crypto/address.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/burrow/binary"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 	"golang.org/x/crypto/ripemd160"
 )
 

crypto/public_key.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/tendermint/tendermint/crypto/tmhash"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 	"golang.org/x/crypto/ed25519"
 	"golang.org/x/crypto/ripemd160"
 )

crypto/signature.go

@@ -3,7 +3,7 @@ package crypto
 import (
 	"fmt"
 
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 	"golang.org/x/crypto/ed25519"
 )
 

deploy/def/deploy.go

@@ -1,7 +1,7 @@
 package def
 
 import (
-	"github.com/go-ozzo/ozzo-validation"
+	validation "github.com/go-ozzo/ozzo-validation"
 	"github.com/hyperledger/burrow/deploy/def/rule"
 )
 

deploy/def/job.go

@@ -7,7 +7,7 @@ import (
 
 	"fmt"
 
-	"github.com/go-ozzo/ozzo-validation"
+	validation "github.com/go-ozzo/ozzo-validation"
 	"github.com/hyperledger/burrow/deploy/def/rule"
 	"github.com/hyperledger/burrow/execution/evm/abi"
 )

deploy/def/jobs.go

@@ -3,7 +3,7 @@ package def
 import (
 	"regexp"
 
-	"github.com/go-ozzo/ozzo-validation"
+	validation "github.com/go-ozzo/ozzo-validation"
 	"github.com/go-ozzo/ozzo-validation/is"
 	"github.com/hyperledger/burrow/deploy/def/rule"
 	"github.com/hyperledger/burrow/execution/evm/abi"

deploy/def/rule/rules.go

@@ -10,7 +10,7 @@ import (
 
 	"reflect"
 
-	"github.com/go-ozzo/ozzo-validation"
+	validation "github.com/go-ozzo/ozzo-validation"
 	"github.com/hyperledger/burrow/acm"
 	"github.com/hyperledger/burrow/crypto"
 	"github.com/hyperledger/burrow/permission"

deploy/loader/load_package_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 func TestUnmarshal(t *testing.T) {

deploy/util/readers.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/hyperledger/burrow/execution/exec"
 	log "github.com/sirupsen/logrus"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 )
 
 // This is a closer function which is called by most of the tx_run functions

event/emitter.go

@@ -24,7 +24,7 @@ import (
 	"github.com/hyperledger/burrow/logging/structure"
 	"github.com/hyperledger/burrow/process"
 	"github.com/tendermint/tendermint/libs/common"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 )
 
 const DefaultEventBufferCapacity = 2 << 10

execution/evm/abi/core_test.go

@@ -2,14 +2,14 @@ package abi
 
 import (
 	"bytes"
+	"encoding/hex"
 	"fmt"
 	"math/big"
 	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tmthrgd/go-hex"
 )
 
 //To Test:

execution/evm/vm_test.go

@@ -30,7 +30,7 @@ import (
 	"github.com/hyperledger/burrow/permission"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 	"golang.org/x/crypto/ripemd160"
 )
 

execution/exec/event_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hyperledger/burrow/event/query"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 )
 
 func TestEventTagQueries(t *testing.T) {

execution/exec/log_event.go

@@ -22,7 +22,7 @@ import (
 	. "github.com/hyperledger/burrow/binary"
 	"github.com/hyperledger/burrow/event"
 	"github.com/hyperledger/burrow/event/query"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 )
 
 const logNTextTopicCutset = "\x00"

execution/execution_test.go

@@ -47,7 +47,7 @@ import (
 	"github.com/hyperledger/burrow/txs/payload"
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tendermint/libs/db"
-	"github.com/tmthrgd/go-hex"
+	hex "github.com/tmthrgd/go-hex"
 )
 
 var (

execution/names/names.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/burrow/event/query"
-	"github.com/tendermint/go-amino"
+	amino "github.com/tendermint/go-amino"
 )
 
 var MinNameRegistrationPeriod uint64 = 5

execution/solidity/event_emitter.sol.go

@@ -1,6 +1,6 @@
 package solidity
 
-import "github.com/tmthrgd/go-hex"
+import hex "github.com/tmthrgd/go-hex"
 
 var Bytecode_EventEmitter = hex.MustDecodeString("6080604052348015600f57600080fd5b506101ae8061001f6000396000f300608060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e8e49a7114610046575b600080fd5b34801561005257600080fd5b5061005b61005d565b005b60405180807f68617368000000000000000000000000000000000000000000000000000000008152506004019050604051809103902060667f446f776e736965210000000000000000000000000000000000000000000000007f20aec2a3bcd8050a3a9e852e9d424805bad75ba33b57077464c73ae98d0582696001602a604051808315151515815260200180602001838152602001828103825260518152602001807f446f6e617564616d7066736368696666666168727473656c656b7472697a697481526020017fc3a474656e686175707462657472696562737765726b626175756e746572626581526020017f616d74656e676573656c6c736368616674000000000000000000000000000000815250606001935050505060405180910390a45600a165627a7a723058207be0ad144dc8e62d251e31f9bb1e6c3b524a20540e44c3d5e293840c5929f87d0029")
 var Abi_EventEmitter = []byte(`[{"constant":false,"inputs":[],"name":"EmitOne","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"direction","type":"bytes32"},{"indexed":false,"name":"trueism","type":"bool"},{"indexed":false,"name":"german","type":"string"},{"indexed":true,"name":"newDepth","type":"int64"},{"indexed":false,"name":"bignum","type":"int256"},{"indexed":true,"name":"hash","type":"string"}],"name":"ManyTypes","type":"event"}]`)

execution/solidity/revert.sol.go

@@ -1,6 +1,6 @@
 package solidity
 
-import "github.com/tmthrgd/go-hex"
+import hex "github.com/tmthrgd/go-hex"
 
 var Bytecode_Revert = hex.MustDecodeString("608060405234801561001057600080fd5b5061021b806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680635b202afb146100515780636037b04c14610084575b600080fd5b34801561005d57600080fd5b50610082600480360381019080803563ffffffff16906020019092919050505061009b565b005b34801561009057600080fd5b506100996101ea565b005b60008163ffffffff161415610118576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252600f8152602001807f492068617665207265766572746564000000000000000000000000000000000081525060200191505060405180910390fd5b8080600190039150508063ffffffff167ff7f0feb5b4ac5276c55faa8936d962de931ebe8333a2efdc0506878de3979ba960405160405180910390a23073ffffffffffffffffffffffffffffffffffffffff16635b202afb826040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808263ffffffff1663ffffffff168152602001915050600060405180830381600087803b1580156101cf57600080fd5b505af11580156101e3573d6000803e3d6000fd5b5050505050565b600080fd00a165627a7a72305820a3516a67407c836cf4e49d0ebaefa62936349341208d4492682d5d896aace2930029")
 var Abi_Revert = []byte(`[{"constant":false,"inputs":[{"name":"i","type":"uint32"}],"name":"RevertAt","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"RevertNoReason","outputs":[],"payable":false,"stateMutability":"pure","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"i","type":"uint32"}],"name":"NotReverting","type":"event"}]`)

execution/solidity/strange_loop.sol.go

@@ -1,6 +1,6 @@
 package solidity
 
-import "github.com/tmthrgd/go-hex"
+import hex "github.com/tmthrgd/go-hex"
 
 var Bytecode_StrangeLoop = hex.MustDecodeString("60806040526017600055602260015560116002556001600360006101000a81548160ff02191690831515021790555034801561003a57600080fd5b506103da8061004a6000396000f300608060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063ebb384dd14610046575b600080fd5b34801561005257600080fd5b5061005b610071565b6040518082815260200191505060405180910390f35b60006002549050600360009054906101000a900460ff161561026b5760015460025412156101a5576002600081548092919060010191905055506002547f55707369652100000000000000000000000000000000000000000000000000007f3ff0b1eac80ecf8e93d1a2d7982a9230f8ea7693439fd548687b08a5e292b09760405160405180910390a360025490503073ffffffffffffffffffffffffffffffffffffffff1663ebb384dd6040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15801561016457600080fd5b505af1158015610178573d6000803e3d6000fd5b505050506040513d602081101561018e57600080fd5b810190808051906020019092919050505050610266565b6000600360006101000a81548160ff02191690831515021790555060025490503073ffffffffffffffffffffffffffffffffffffffff1663ebb384dd6040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15801561022957600080fd5b505af115801561023d573d6000803e3d6000fd5b505050506040513d602081101561025357600080fd5b8101908080519060200190929190505050505b6103aa565b600054600254131561038457600260008154809291906001900391905055506002547f446f776e736965210000000000000000000000000000000000000000000000007f3ff0b1eac80ecf8e93d1a2d7982a9230f8ea7693439fd548687b08a5e292b09760405160405180910390a360025490503073ffffffffffffffffffffffffffffffffffffffff1663ebb384dd6040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15801561034357600080fd5b505af1158015610357573d6000803e3d6000fd5b505050506040513d602081101561036d57600080fd5b8101908080519060200190929190505050506103a9565b6001600360006101000a81548160ff02191690831515021790555060025490506103ab565b5b5b905600a165627a7a7230582041ad4ce1fbc3f745e4d16c9012cba786b18b22abad1cd0494a8ef15016655a900029")
 var Abi_StrangeLoop = []byte(`[{"constant":false,"inputs":[],"name":"UpsieDownsie","outputs":[{"name":"i","type":"int256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"direction","type":"bytes32"},{"indexed":true,"name":"newDepth","type":"int256"}],"name":"ChangeLevel","type":"event"}]`)

execution/solidity/zero_reset.sol.go

@@ -1,6 +1,6 @@
 package solidity
 
-import "github.com/tmthrgd/go-hex"
+import hex "github.com/tmthrgd/go-hex"
 
 var Bytecode_ZeroReset = hex.MustDecodeString("608060405234801561001057600080fd5b506101c0806100206000396000f300608060405260043610610077576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680620267a41461007c5780634ef65c3b146100a757806362738998146100d4578063747586b8146100ff578063987dc8201461012c578063b15a0d5f14610143575b600080fd5b34801561008857600080fd5b5061009161015a565b6040518082815260200191505060405180910390f35b3480156100b357600080fd5b506100d260048036038101908080359060200190929190505050610164565b005b3480156100e057600080fd5b506100e961016e565b6040518082815260200191505060405180910390f35b34801561010b57600080fd5b5061012a60048036038101908080359060200190929190505050610177565b005b34801561013857600080fd5b50610141610181565b005b34801561014f57600080fd5b5061015861018a565b005b6000600154905090565b8060018190555050565b60008054905090565b8060008190555050565b60008081905550565b60006001819055505600a165627a7a72305820c19c71b6113c0b546a6cf9c093b61a1e9c9f42f62811bb4ebaff2f02b860a43e0029")
 var Abi_ZeroReset = []byte(`[{"constant":true,"inputs":[],"name":"getUint","outputs":[{"name":"retUint","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"x","type":"uint256"}],"name":"setUint","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getInt","outputs":[{"name":"retInt","type":"int256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"x","type":"int256"}],"name":"setInt","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"setIntToZero","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"setUintToZero","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]`)

execution/state.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/hyperledger/burrow/txs/payload"
 
-	"github.com/tendermint/go-amino"
+	amino "github.com/tendermint/go-amino"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 
 	"github.com/hyperledger/burrow/acm"
@@ -88,6 +88,10 @@ type CommitID struct {
 	Version int64
 }
 
+func (cid CommitID) String() string {
+	return fmt.Sprintf("Commit{Hash: %v, Height: %v, TreeVersion: %v}", cid.Hash, cid.Height, cid.Version)
+}
+
 // Writers to state are responsible for calling State.Lock() before calling
 type State struct {
 	// Values not reassigned
@@ -348,7 +352,7 @@ func (s *State) GetTx(txHash []byte) (*exec.TxExecution, error) {
 }
 
 func (s *State) GetBlock(height uint64) (*exec.BlockExecution, error) {
-	bs := s.tree.Get(blockRefKeyFormat.Key(height))
+	bs := s.refs.Get(blockRefKeyFormat.Key(height))
 	if len(bs) == 0 {
 		return nil, nil
 	}