dependency bump: tendermint, k8s

 * app/market: use block creator address in header to determine facilitator.
 * cmd/akashd: rename context -> session

fixes #197

Author: boz

_build/Dockerfile.akashd

@@ -2,4 +2,4 @@ FROM busybox:glibc
 
 COPY ./akashd .
 
-EXPOSE 46656 46657 46658
+EXPOSE 26656 26657 26658

_docs/testnet/client-usage.md

@@ -274,7 +274,7 @@ In the example above:
 
 | Short | Verbose | Argument | Required | Description |
 |:--|:--|:--|:--|:--|
-| -t | --type | (ed25519\|secp256k1\|ledger) | N | Type of key (default "ed25519"). |
+| -t | --type | (secp256k1\|ed25519\|ledger) | N | Type of key (default "ed25519"). |
 
 #### `List`
 List all your local keys.
@@ -855,4 +855,4 @@ None
 
 **Flags**
 
-None
+None

_docs/usage.md

@@ -54,7 +54,7 @@ make
 example:
 
 ```sh
-./akash init --node=tcp://localhost:46657 --genesis=data/node/genesis.json
+./akash init --node=tcp://localhost:26657 --genesis=data/node/genesis.json
 ```
 
 ## Start node
@@ -211,7 +211,7 @@ For the `[p2p] seeds` field add each validators `[p2p]laddr` separated by comma
 
 Example:
 ```
-"0.0.0.0:46656,0.0.0.0:46666,0.0.0.0:46676,0.0.0.0:46686"
+"0.0.0.0:26656,0.0.0.0:26666,0.0.0.0:26676,0.0.0.0:26686"
 ```
 
 ## Start nodes

_integration/cmp/base.go

@@ -28,6 +28,6 @@ func akash_(root vars.Ref, name string, args ...string) gx.Cmd {
 
 	cmd.WithMeta(g.
 		Require("akash-path", root.Name()).
-		Default("akash-node", "http://localhost:46657"))
+		Default("akash-node", "http://localhost:26657"))
 	return cmd
 }

_run/common.sh

@@ -3,7 +3,7 @@ AKASH_ROOT=../..
 DATA_ROOT=data
 AKASH_DIR=$DATA_ROOT/client
 AKASHD_DIR=$DATA_ROOT/node
-DEFAULT_AKASH_NODE="http://localhost:46657"
+DEFAULT_AKASH_NODE="http://localhost:26657"
 
 _akash() {
   AKASH_NODE="${AKASH_NODE:-$DEFAULT_AKASH_NODE}" \

_run/multi/akash-node/values.yaml

@@ -8,5 +8,5 @@ ingress:
 
 akashd:
   ports:
-    p2p: 46656
-    rpc: 46657
+    p2p: 26656
+    rpc: 26657

app/account/app.go

@@ -11,8 +11,8 @@ import (
 	appstate "github.com/ovrclk/akash/state"
 	"github.com/ovrclk/akash/types"
 	"github.com/ovrclk/akash/types/code"
-	tmtypes "github.com/tendermint/abci/types"
-	"github.com/tendermint/tmlibs/log"
+	abci_types "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 const (
@@ -27,51 +27,51 @@ func NewApp(logger log.Logger) (apptypes.Application, error) {
 	return &app{apptypes.NewBaseApp(Name, logger)}, nil
 }
 
-func (a *app) AcceptQuery(req tmtypes.RequestQuery) bool {
+func (a *app) AcceptQuery(req abci_types.RequestQuery) bool {
 	return strings.HasPrefix(req.GetPath(), appstate.AccountPath)
 }
 
-func (a *app) Query(state appstate.State, req tmtypes.RequestQuery) tmtypes.ResponseQuery {
+func (a *app) Query(state appstate.State, req abci_types.RequestQuery) abci_types.ResponseQuery {
 
 	if !a.AcceptQuery(req) {
-		return tmtypes.ResponseQuery{
+		return abci_types.ResponseQuery{
 			Code: code.UNKNOWN_QUERY,
 			Log:  "invalid key",
 		}
 	}
 	id := strings.TrimPrefix(req.Path, appstate.AccountPath)
 	key, err := keys.ParseAccountPath(id)
 	if err != nil {
-		return tmtypes.ResponseQuery{
+		return abci_types.ResponseQuery{
 			Code: code.ERROR,
 			Log:  err.Error(),
 		}
 	}
 
 	acct, err := state.Account().Get(key.ID())
 	if err != nil {
-		return tmtypes.ResponseQuery{
+		return abci_types.ResponseQuery{
 			Code: code.ERROR,
 			Log:  err.Error(),
 		}
 	}
 
 	if acct == nil {
-		return tmtypes.ResponseQuery{
+		return abci_types.ResponseQuery{
 			Code: code.NOT_FOUND,
 			Log:  fmt.Sprintf("account %x not found", key),
 		}
 	}
 
 	bytes, err := proto.Marshal(acct)
 	if err != nil {
-		return tmtypes.ResponseQuery{
+		return abci_types.ResponseQuery{
 			Code: code.ERROR,
 			Log:  err.Error(),
 		}
 	}
 
-	return tmtypes.ResponseQuery{
+	return abci_types.ResponseQuery{
 		Value:  bytes,
 		Height: state.Version(),
 	}
@@ -85,95 +85,95 @@ func (a *app) AcceptTx(ctx apptypes.Context, tx interface{}) bool {
 	return false
 }
 
-func (a *app) CheckTx(state appstate.State, ctx apptypes.Context, tx interface{}) tmtypes.ResponseCheckTx {
+func (a *app) CheckTx(state appstate.State, ctx apptypes.Context, tx interface{}) abci_types.ResponseCheckTx {
 	switch tx := tx.(type) {
 	case *types.TxPayload_TxSend:
 		return a.doCheckTx(state, ctx, tx.TxSend)
 	}
-	return tmtypes.ResponseCheckTx{
+	return abci_types.ResponseCheckTx{
 		Code: code.UNKNOWN_TRANSACTION,
 		Log:  "unknown transaction",
 	}
 }
 
-func (a *app) DeliverTx(state appstate.State, ctx apptypes.Context, tx interface{}) tmtypes.ResponseDeliverTx {
+func (a *app) DeliverTx(state appstate.State, ctx apptypes.Context, tx interface{}) abci_types.ResponseDeliverTx {
 	switch tx := tx.(type) {
 	case *types.TxPayload_TxSend:
 		return a.doDeliverTx(state, ctx, tx.TxSend)
 	}
-	return tmtypes.ResponseDeliverTx{
+	return abci_types.ResponseDeliverTx{
 		Code: code.UNKNOWN_TRANSACTION,
 		Log:  "unknown transaction",
 	}
 }
 
-func (a *app) doCheckTx(state appstate.State, ctx apptypes.Context, tx *types.TxSend) tmtypes.ResponseCheckTx {
+func (a *app) doCheckTx(state appstate.State, ctx apptypes.Context, tx *types.TxSend) abci_types.ResponseCheckTx {
 
 	if !bytes.Equal(ctx.Signer().Address(), tx.From) {
-		return tmtypes.ResponseCheckTx{
+		return abci_types.ResponseCheckTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  "Not signed by sending address",
 		}
 	}
 
 	if bytes.Equal(tx.From, tx.To) {
-		return tmtypes.ResponseCheckTx{
+		return abci_types.ResponseCheckTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  "source and destination can't be the same address",
 		}
 	}
 
 	acct, err := state.Account().Get(tx.From)
 	if err != nil {
-		return tmtypes.ResponseCheckTx{
+		return abci_types.ResponseCheckTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  err.Error(),
 		}
 	}
 	if acct == nil {
-		return tmtypes.ResponseCheckTx{
+		return abci_types.ResponseCheckTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  "unknown source account",
 		}
 	}
 
 	if acct.Balance < tx.Amount {
-		return tmtypes.ResponseCheckTx{
+		return abci_types.ResponseCheckTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  "insufficient funds",
 		}
 	}
 
-	return tmtypes.ResponseCheckTx{}
+	return abci_types.ResponseCheckTx{}
 }
 
-func (a *app) doDeliverTx(state appstate.State, ctx apptypes.Context, tx *types.TxSend) tmtypes.ResponseDeliverTx {
+func (a *app) doDeliverTx(state appstate.State, ctx apptypes.Context, tx *types.TxSend) abci_types.ResponseDeliverTx {
 
 	cresp := a.doCheckTx(state, ctx, tx)
 	if !cresp.IsOK() {
-		return tmtypes.ResponseDeliverTx{
+		return abci_types.ResponseDeliverTx{
 			Code: cresp.Code,
 			Log:  cresp.Log,
 		}
 	}
 
 	acct, err := state.Account().Get(tx.From)
 	if err != nil {
-		return tmtypes.ResponseDeliverTx{
+		return abci_types.ResponseDeliverTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  err.Error(),
 		}
 	}
 	if acct == nil {
-		return tmtypes.ResponseDeliverTx{
+		return abci_types.ResponseDeliverTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  "unknown source account",
 		}
 	}
 
 	toacct, err := state.Account().Get(tx.To)
 	if err != nil {
-		return tmtypes.ResponseDeliverTx{
+		return abci_types.ResponseDeliverTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  err.Error(),
 		}
@@ -189,20 +189,20 @@ func (a *app) doDeliverTx(state appstate.State, ctx apptypes.Context, tx *types.
 	toacct.Balance += tx.Amount
 
 	if err := state.Account().Save(acct); err != nil {
-		return tmtypes.ResponseDeliverTx{
+		return abci_types.ResponseDeliverTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  err.Error(),
 		}
 	}
 
 	if err := state.Account().Save(toacct); err != nil {
-		return tmtypes.ResponseDeliverTx{
+		return abci_types.ResponseDeliverTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  err.Error(),
 		}
 	}
 
-	return tmtypes.ResponseDeliverTx{
+	return abci_types.ResponseDeliverTx{
 		Tags: apptypes.NewTags(a.Name(), apptypes.TxTypeSend),
 	}
 }

app/account/app_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ovrclk/akash/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	tmtypes "github.com/tendermint/abci/types"
+	tmtypes "github.com/tendermint/tendermint/abci/types"
 )
 
 func TestAccountApp(t *testing.T) {