Release 0.17.0

CHANGELOG.md

@@ -1,4 +1,25 @@
 # burrow changelog
+## v0.16.3
+This release adds an stop-gap fix to the `Transact` method so that it never
+transfers value with the `CallTx` is generates.
+
+We hard-code `amount = fee` so that no value is transferred
+regardless of fee sent. This fixes an invalid jump destination error arising 
+from transferring value to non-payable functions with newer versions of solidity.
+By doing this we can resolve some issues with users of the v0 RPC without making 
+a breaking API change.
+
+## v0.16.2
+This release finalises our accession to the Hyperledger project and updates our
+root package namespace to github.com/hyperledger/burrow.
+
+It also includes a bug fix for rpc/V0 so that BroadcastTx can accept any 
+transaction type and various pieces of internal clean-up.
+
+## v0.16.1
+This release was an internal rename to 'Burrow' with some minor other attendant
+clean up.
+
 ## v0.16.0
 This is a consolidation release that fixes various bugs and improves elements
 of the architecture across the Monax Platform to support a quicker release

Makefile

@@ -31,6 +31,11 @@ check:
 	@gofmt -l -d ${GOFILES_NOVENDOR}
 	@gofmt -l ${GOFILES_NOVENDOR} | read && echo && echo "Your marmot has found a problem with the formatting style of the code." 1>&2 && exit 1 || true
 
+# Just fix it
+.PHONY: fix
+fix:
+	@goimports -l -w ${GOFILES_NOVENDOR}
+
 # fmt runs gofmt -w on the code, modifying any files that do not match
 # the style guide.
 .PHONY: fmt
@@ -67,12 +72,6 @@ install_vendor:
 	go get github.com/Masterminds/glide
 	glide install
 
-# hell runs utility tool hell to selectively update glide dependencies
-.PHONY: hell
-hell:
-	go build -o ${REPO}/target/hell ./util/hell/cmd/hell/main.go
-	./target/hell $(filter-out $@,$(MAKECMDGOALS))
-
 # Dumps Solidity interface contracts for SNatives
 .PHONY: snatives
 snatives:

README.md

@@ -61,7 +61,7 @@ For a Vagrant file see [monax-vagrant](https://github.com/monax/monax-vagrant) f
 
 ## Usage
 
-Once the server has started, it will begin syncing up with the network. At that point you may begin using it. The preferred way is through our [javascript api](https://github.com/hyperledger/burrow.js), but it is possible to connect directly via HTTP or websocket.
+Once the server has started, it will begin syncing up with the network. At that point you may begin using it. The preferred way is through our [javascript api](https://github.com/monax/legacy-contracts.js), but it is possible to connect directly via HTTP or websocket.
 
 ## Configuration
 

circle.yml

@@ -1,21 +1,21 @@
 machine:
   environment:
     GOPATH: $HOME/.go_workspace
-    REPO: ${GOPATH}/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
-    DOCKER_VERSION: 1.9.1
-    DOCKER_MACHINE_VERSION: 0.6.0
+    REPO: ${GOPATH}/src/github.com/hyperledger/burrow
     GO15VENDOREXPERIMENT: 1
+  pre:
+    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
+  services:
+    - docker
   post:
     - git config --global user.email "[email protected]"
     - git config --global user.name "Billings the Bot"
-    - rm -rf ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}
-    - mkdir -p ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}
-    - cp -r ${HOME}/${CIRCLE_PROJECT_REPONAME} ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}/.
+    - rm -rf ${GOPATH%%:*}/src/github.com/hyperledger
+    - mkdir -p ${GOPATH%%:*}/src/github.com/hyperledger
+    - cp -r ${HOME}/${CIRCLE_PROJECT_REPONAME} ${GOPATH%%:*}/src/github.com/hyperledger/.
 
 dependencies:
   override:
-    - sudo curl -L -o /usr/bin/docker http://s3-external-1.amazonaws.com/circle-downloads/docker-$DOCKER_VERSION-circleci; sudo chmod 0775 /usr/bin/docker; sudo usermod -a -G docker $USER; true
-    - sudo service docker start
     - sudo apt-get update && sudo apt-get install -y libgmp3-dev
     - sudo apt-get install jq curl && go get github.com/Masterminds/glide
 

client/methods/helpers.go

@@ -20,10 +20,10 @@ import (
 	"github.com/hyperledger/burrow/definitions"
 	"github.com/hyperledger/burrow/logging"
 	"github.com/hyperledger/burrow/logging/lifecycle"
-	"github.com/hyperledger/burrow/logging/loggers"
+	logging_types "github.com/hyperledger/burrow/logging/types"
 )
 
-func unpackSignAndBroadcast(result *rpc.TxResult, logger loggers.InfoTraceLogger) {
+func unpackSignAndBroadcast(result *rpc.TxResult, logger logging_types.InfoTraceLogger) {
 	if result == nil {
 		// if we don't provide --sign or --broadcast
 		return
@@ -45,10 +45,17 @@ func unpackSignAndBroadcast(result *rpc.TxResult, logger loggers.InfoTraceLogger
 	logging.InfoMsg(logger, "SignAndBroadcast result")
 }
 
-func loggerFromClientDo(do *definitions.ClientDo, scope string) (loggers.InfoTraceLogger, error) {
+func loggerFromClientDo(do *definitions.ClientDo, scope string) (logging_types.InfoTraceLogger, error) {
 	lc, err := core.LoadLoggingConfigFromClientDo(do)
 	if err != nil {
 		return nil, err
 	}
-	return logging.WithScope(lifecycle.NewLoggerFromLoggingConfig(lc), scope), nil
+	logger, err := lifecycle.NewLoggerFromLoggingConfig(lc)
+	if err != nil {
+		return nil, err
+	}
+	logger = logging.WithScope(logger, scope)
+	lifecycle.CaptureStdlibLogOutput(logger)
+	lifecycle.CaptureTendermintLog15Output(logger)
+	return logger, nil
 }

client/mock/client_mock.go

@@ -22,6 +22,7 @@ import (
 	consensus_types "github.com/hyperledger/burrow/consensus/types"
 	core_types "github.com/hyperledger/burrow/core/types"
 	"github.com/hyperledger/burrow/logging/loggers"
+	logging_types "github.com/hyperledger/burrow/logging/types"
 	"github.com/hyperledger/burrow/txs"
 )
 
@@ -115,6 +116,6 @@ func (mock *MockNodeClient) ListValidators() (blockHeight int, bondedValidators,
 	return 0, nil, nil, nil
 }
 
-func (mock *MockNodeClient) Logger() loggers.InfoTraceLogger {
+func (mock *MockNodeClient) Logger() logging_types.InfoTraceLogger {
 	return loggers.NewNoopInfoTraceLogger()
 }

client/node_client.go

@@ -24,7 +24,7 @@ import (
 	consensus_types "github.com/hyperledger/burrow/consensus/types"
 	core_types "github.com/hyperledger/burrow/core/types"
 	"github.com/hyperledger/burrow/logging"
-	"github.com/hyperledger/burrow/logging/loggers"
+	logging_types "github.com/hyperledger/burrow/logging/types"
 	tendermint_client "github.com/hyperledger/burrow/rpc/tendermint/client"
 	tendermint_types "github.com/hyperledger/burrow/rpc/tendermint/core/types"
 	"github.com/hyperledger/burrow/txs"
@@ -46,7 +46,7 @@ type NodeClient interface {
 	ListValidators() (blockHeight int, bondedValidators, unbondingValidators []consensus_types.Validator, err error)
 
 	// Logging context for this NodeClient
-	Logger() loggers.InfoTraceLogger
+	Logger() logging_types.InfoTraceLogger
 }
 
 type NodeWebsocketClient interface {
@@ -64,12 +64,12 @@ var _ NodeClient = (*burrowNodeClient)(nil)
 // burrow-client is a simple struct exposing the client rpc methods
 type burrowNodeClient struct {
 	broadcastRPC string
-	logger       loggers.InfoTraceLogger
+	logger       logging_types.InfoTraceLogger
 }
 
 // BurrowKeyClient.New returns a new monax-keys client for provided rpc location
 // Monax-keys connects over http request-responses
-func NewBurrowNodeClient(rpcString string, logger loggers.InfoTraceLogger) *burrowNodeClient {
+func NewBurrowNodeClient(rpcString string, logger logging_types.InfoTraceLogger) *burrowNodeClient {
 	return &burrowNodeClient{
 		broadcastRPC: rpcString,
 		logger:       logging.WithScope(logger, "BurrowNodeClient"),
@@ -87,7 +87,7 @@ func init() {
 // broadcast to blockchain node
 
 func (burrowNodeClient *burrowNodeClient) Broadcast(tx txs.Tx) (*txs.Receipt, error) {
-	client := rpcclient.NewClientURI(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewURIClient(burrowNodeClient.broadcastRPC)
 	receipt, err := tendermint_client.BroadcastTx(client, tx)
 	if err != nil {
 		return nil, err
@@ -134,7 +134,7 @@ func (burrowNodeClient *burrowNodeClient) DeriveWebsocketClient() (nodeWsClient
 // Status returns the ChainId (GenesisHash), validator's PublicKey, latest block hash
 // the block height and the latest block time.
 func (burrowNodeClient *burrowNodeClient) Status() (GenesisHash []byte, ValidatorPublicKey []byte, LatestBlockHash []byte, LatestBlockHeight int, LatestBlockTime int64, err error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	res, err := tendermint_client.Status(client)
 	if err != nil {
 		err = fmt.Errorf("Error connecting to node (%s) to get status: %s",
@@ -152,7 +152,7 @@ func (burrowNodeClient *burrowNodeClient) Status() (GenesisHash []byte, Validato
 }
 
 func (burrowNodeClient *burrowNodeClient) ChainId() (ChainName, ChainId string, GenesisHash []byte, err error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	chainIdResult, err := tendermint_client.ChainId(client)
 	if err != nil {
 		err = fmt.Errorf("Error connecting to node (%s) to get chain id: %s",
@@ -170,19 +170,19 @@ func (burrowNodeClient *burrowNodeClient) ChainId() (ChainName, ChainId string,
 // QueryContract executes the contract code at address with the given data
 // NOTE: there is no check on the caller;
 func (burrowNodeClient *burrowNodeClient) QueryContract(callerAddress, calleeAddress, data []byte) (ret []byte, gasUsed int64, err error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	callResult, err := tendermint_client.Call(client, callerAddress, calleeAddress, data)
 	if err != nil {
-		err = fmt.Errorf("Error connnecting to node (%s) to query contract at (%X) with data (%X)",
-			burrowNodeClient.broadcastRPC, calleeAddress, data, err.Error())
+		err = fmt.Errorf("Error (%v) connnecting to node (%s) to query contract at (%X) with data (%X)",
+			err.Error(), burrowNodeClient.broadcastRPC, calleeAddress, data)
 		return nil, int64(0), err
 	}
 	return callResult.Return, callResult.GasUsed, nil
 }
 
 // QueryContractCode executes the contract code at address with the given data but with provided code
 func (burrowNodeClient *burrowNodeClient) QueryContractCode(address, code, data []byte) (ret []byte, gasUsed int64, err error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	// TODO: [ben] Call and CallCode have an inconsistent signature; it makes sense for both to only
 	// have a single address that is the contract to query.
 	callResult, err := tendermint_client.CallCode(client, address, code, data)
@@ -196,7 +196,7 @@ func (burrowNodeClient *burrowNodeClient) QueryContractCode(address, code, data
 
 // GetAccount returns a copy of the account
 func (burrowNodeClient *burrowNodeClient) GetAccount(address []byte) (*acc.Account, error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	account, err := tendermint_client.GetAccount(client, address)
 	if err != nil {
 		err = fmt.Errorf("Error connecting to node (%s) to fetch account (%X): %s",
@@ -213,7 +213,7 @@ func (burrowNodeClient *burrowNodeClient) GetAccount(address []byte) (*acc.Accou
 
 // DumpStorage returns the full storage for an account.
 func (burrowNodeClient *burrowNodeClient) DumpStorage(address []byte) (storage *core_types.Storage, err error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	resultStorage, err := tendermint_client.DumpStorage(client, address)
 	if err != nil {
 		err = fmt.Errorf("Error connecting to node (%s) to get storage for account (%X): %s",
@@ -231,7 +231,7 @@ func (burrowNodeClient *burrowNodeClient) DumpStorage(address []byte) (storage *
 // Name registry
 
 func (burrowNodeClient *burrowNodeClient) GetName(name string) (owner []byte, data string, expirationBlock int, err error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	entryResult, err := tendermint_client.GetName(client, name)
 	if err != nil {
 		err = fmt.Errorf("Error connecting to node (%s) to get name registrar entry for name (%s)",
@@ -249,7 +249,7 @@ func (burrowNodeClient *burrowNodeClient) GetName(name string) (owner []byte, da
 
 func (burrowNodeClient *burrowNodeClient) ListValidators() (blockHeight int,
 	bondedValidators []consensus_types.Validator, unbondingValidators []consensus_types.Validator, err error) {
-	client := rpcclient.NewClientJSONRPC(burrowNodeClient.broadcastRPC)
+	client := rpcclient.NewJSONRPCClient(burrowNodeClient.broadcastRPC)
 	validatorsResult, err := tendermint_client.ListValidators(client)
 	if err != nil {
 		err = fmt.Errorf("Error connecting to node (%s) to get validators",
@@ -263,6 +263,6 @@ func (burrowNodeClient *burrowNodeClient) ListValidators() (blockHeight int,
 	return
 }
 
-func (burrowNodeClient *burrowNodeClient) Logger() loggers.InfoTraceLogger {
+func (burrowNodeClient *burrowNodeClient) Logger() logging_types.InfoTraceLogger {
 	return burrowNodeClient.logger
 }

client/websocket_client.go

@@ -19,11 +19,12 @@ import (
 	"fmt"
 	"time"
 
+	logging_types "github.com/hyperledger/burrow/logging/types"
 	"github.com/tendermint/go-rpc/client"
 	"github.com/tendermint/go-wire"
 
 	"github.com/hyperledger/burrow/logging"
-	"github.com/hyperledger/burrow/logging/loggers"
+	tendermint_client "github.com/hyperledger/burrow/rpc/tendermint/client"
 	ctypes "github.com/hyperledger/burrow/rpc/tendermint/core/types"
 	"github.com/hyperledger/burrow/txs"
 )
@@ -46,18 +47,20 @@ var _ NodeWebsocketClient = (*burrowNodeWebsocketClient)(nil)
 type burrowNodeWebsocketClient struct {
 	// TODO: assert no memory leak on closing with open websocket
 	tendermintWebsocket *rpcclient.WSClient
-	logger              loggers.InfoTraceLogger
+	logger              logging_types.InfoTraceLogger
 }
 
 // Subscribe to an eventid
-func (burrowNodeWebsocketClient *burrowNodeWebsocketClient) Subscribe(eventid string) error {
+func (burrowNodeWebsocketClient *burrowNodeWebsocketClient) Subscribe(eventId string) error {
 	// TODO we can in the background listen to the subscription id and remember it to ease unsubscribing later.
-	return burrowNodeWebsocketClient.tendermintWebsocket.Subscribe(eventid)
+	return tendermint_client.Subscribe(burrowNodeWebsocketClient.tendermintWebsocket,
+		eventId)
 }
 
 // Unsubscribe from an eventid
 func (burrowNodeWebsocketClient *burrowNodeWebsocketClient) Unsubscribe(subscriptionId string) error {
-	return burrowNodeWebsocketClient.tendermintWebsocket.Unsubscribe(subscriptionId)
+	return tendermint_client.Unsubscribe(burrowNodeWebsocketClient.tendermintWebsocket,
+		subscriptionId)
 }
 
 // Returns a channel that will receive a confirmation with a result or the exception that
@@ -73,10 +76,10 @@ func (burrowNodeWebsocketClient *burrowNodeWebsocketClient) WaitForConfirmation(
 	var latestBlockHash []byte
 
 	eid := txs.EventStringAccInput(inputAddr)
-	if err := burrowNodeWebsocketClient.tendermintWebsocket.Subscribe(eid); err != nil {
+	if err := burrowNodeWebsocketClient.Subscribe(eid); err != nil {
 		return nil, fmt.Errorf("Error subscribing to AccInput event (%s): %v", eid, err)
 	}
-	if err := burrowNodeWebsocketClient.tendermintWebsocket.Subscribe(txs.EventStringNewBlock()); err != nil {
+	if err := burrowNodeWebsocketClient.Subscribe(txs.EventStringNewBlock()); err != nil {
 		return nil, fmt.Errorf("Error subscribing to NewBlock event: %v", err)
 	}
 	// Read the incoming events
@@ -163,7 +166,7 @@ func (burrowNodeWebsocketClient *burrowNodeWebsocketClient) WaitForConfirmation(
 				confirmationChannel <- Confirmation{
 					BlockHash: latestBlockHash,
 					Event:     &data,
-					Exception: fmt.Errorf("Transaction confirmed with exception:", data.Exception),
+					Exception: fmt.Errorf("Transaction confirmed with exception: %v", data.Exception),
 					Error:     nil,
 				}
 				return

cmd/serve.go

@@ -28,6 +28,7 @@ import (
 	vm "github.com/hyperledger/burrow/manager/burrow-mint/evm"
 	"github.com/hyperledger/burrow/util"
 
+	"github.com/hyperledger/burrow/config"
 	"github.com/spf13/cobra"
 )
 
@@ -95,6 +96,11 @@ func NewCoreFromDo(do *definitions.Do) (*core.Core, error) {
 	do.GenesisFile = path.Join(do.WorkDir,
 		do.Config.GetString("chain.genesis_file"))
 
+	err := config.AssertConfigCompatibleWithRuntime(do.Config)
+	if err != nil {
+		return nil, err
+	}
+
 	if do.Config.GetString("chain.genesis_file") == "" {
 		return nil, fmt.Errorf("The config value chain.genesis_file is empty, " +
 			"but should be set to the location of the genesis.json file.")
@@ -109,8 +115,12 @@ func NewCoreFromDo(do *definitions.Do) (*core.Core, error) {
 		return nil, fmt.Errorf("Failed to load logging config: %s", err)
 	}
 
+	logger, err := lifecycle.NewLoggerFromLoggingConfig(loggerConfig)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to build logger from logging config: %s", err)
+	}
 	// Create a root logger to pass through to dependencies
-	logger := logging.WithScope(lifecycle.NewLoggerFromLoggingConfig(loggerConfig), "Serve")
+	logger = logging.WithScope(logger, "Serve")
 	// Capture all logging from tendermint/tendermint and tendermint/go-*
 	// dependencies
 	lifecycle.CaptureTendermintLog15Output(logger)
@@ -143,8 +153,8 @@ func NewCoreFromDo(do *definitions.Do) (*core.Core, error) {
 	}
 
 	logging.Msg(logger, "Modules configured",
-		"consensusModule", consensusConfig.Version,
-		"applicationManager", managerConfig.Version)
+		"consensusModule", consensusConfig.Name,
+		"applicationManager", managerConfig.Name)
 
 	return core.NewCore(do.ChainId, consensusConfig, managerConfig, logger)
 }
@@ -171,7 +181,7 @@ func ServeRunner(do *definitions.Do) func(*cobra.Command, []string) {
 		}
 
 		if !do.DisableRpc {
-			serverConfig, err := core.LoadServerConfig(do)
+			serverConfig, err := core.LoadServerConfigFromDo(do)
 			if err != nil {
 				util.Fatalf("Failed to load server configuration: %s.", err)
 			}
@@ -188,6 +198,8 @@ func ServeRunner(do *definitions.Do) func(*cobra.Command, []string) {
 				util.Fatalf("Failed to start Tendermint gateway")
 			}
 			<-serverProcess.StopEventChannel()
+			// Attempt graceful shutdown
+			newCore.Stop()
 		} else {
 			signals := make(chan os.Signal, 1)
 			signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)