diff --git a/packages/go-kosu/abci/app.go b/packages/go-kosu/abci/app.go index b778b930..0302ce87 100644 --- a/packages/go-kosu/abci/app.go +++ b/packages/go-kosu/abci/app.go @@ -13,8 +13,8 @@ import ( "github.com/tendermint/tendermint/config" cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" + db "github.com/tendermint/tm-db" "go-kosu/abci/types" "go-kosu/store" @@ -240,9 +240,9 @@ func (app *App) EndBlock(req abci.RequestEndBlock) abci.ResponseEndBlock { } // CheckTx . -func (app *App) CheckTx(req []byte) abci.ResponseCheckTx { +func (app *App) CheckTx(req abci.RequestCheckTx) abci.ResponseCheckTx { stx := &types.SignedTransaction{} - if err := types.DecodeTx(req, stx); err != nil { + if err := types.DecodeTx(req.Tx, stx); err != nil { return abci.ResponseCheckTx{Code: 1, Log: err.Error()} } tx := stx.Tx @@ -282,9 +282,9 @@ func (app *App) CheckTx(req []byte) abci.ResponseCheckTx { } // DeliverTx . -func (app *App) DeliverTx(req []byte) abci.ResponseDeliverTx { +func (app *App) DeliverTx(req abci.RequestDeliverTx) abci.ResponseDeliverTx { stx := &types.SignedTransaction{} - if err := types.DecodeTx(req, stx); err != nil { + if err := types.DecodeTx(req.Tx, stx); err != nil { return abci.ResponseDeliverTx{Code: 1, Info: err.Error()} } tx := stx.Tx diff --git a/packages/go-kosu/abci/app_test.go b/packages/go-kosu/abci/app_test.go index af34a3fa..88cce401 100644 --- a/packages/go-kosu/abci/app_test.go +++ b/packages/go-kosu/abci/app_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/db" tmtypes "github.com/tendermint/tendermint/types" + db "github.com/tendermint/tm-db" "go-kosu/abci/types" ) @@ -54,7 +54,7 @@ func TestCheckTxSignature(t *testing.T) { buf, err := types.EncodeTx(tx) require.NoError(t, err) - res := app.CheckTx(buf) + res := app.CheckTx(abci.RequestCheckTx{Tx: buf}) assert.True(t, res.IsErr()) assert.Contains(t, res.Log, "signature") } diff --git a/packages/go-kosu/abci/order.go b/packages/go-kosu/abci/order.go index 1f8e209b..3dc2b5a2 100644 --- a/packages/go-kosu/abci/order.go +++ b/packages/go-kosu/abci/order.go @@ -69,6 +69,8 @@ func (app *App) deliverOrderTx(tx *types.TransactionOrder) abci.ResponseDeliverT return abci.ResponseDeliverTx{ Code: 0, - Tags: NewTagsFromOrderInfo(orderID, posterAddress, poster.Limit), + Events: []abci.Event{ + {Type: "tags", Attributes: NewTagsFromOrderInfo(orderID, posterAddress, poster.Limit)}, + }, } } diff --git a/packages/go-kosu/abci/order_test.go b/packages/go-kosu/abci/order_test.go index 28b8c379..dd8fb607 100644 --- a/packages/go-kosu/abci/order_test.go +++ b/packages/go-kosu/abci/order_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/common" - "github.com/tendermint/tendermint/libs/db" + db "github.com/tendermint/tm-db" ) var testCases = []struct { @@ -60,7 +60,9 @@ func TestDeliverOrderTx(t *testing.T) { buf, err := types.EncodeTx(tx) require.NoError(t, err) - res := app.DeliverTx(buf) + res := app.DeliverTx( + abci.RequestDeliverTx{Tx: buf}, + ) t.Run("AssertCode", func(t *testing.T) { assert.Equal(t, uint32(1), res.Code, @@ -91,7 +93,9 @@ func TestDeliverOrderTx(t *testing.T) { buf, err := types.EncodeTx(tx) require.NoError(t, err) - res := app.DeliverTx(buf) + res := app.DeliverTx( + abci.RequestDeliverTx{Tx: buf}, + ) t.Run("AssertCode", func(t *testing.T) { assert.Equal(t, abci.CodeTypeOK, res.Code, @@ -114,7 +118,10 @@ func TestDeliverOrderTx(t *testing.T) { {Key: []byte("order.poster"), Value: expectedPoster.Bytes()}, {Key: []byte("poster.limit"), Value: []byte("33332")}, } - assert.Equal(t, expectedTags, res.Tags) + expectedEvents := []abci.Event{ + {Type: "tags", Attributes: expectedTags}, + } + assert.Equal(t, expectedEvents, res.Events) }) } } diff --git a/packages/go-kosu/abci/rebalance.go b/packages/go-kosu/abci/rebalance.go index 651b84c6..f309fa92 100644 --- a/packages/go-kosu/abci/rebalance.go +++ b/packages/go-kosu/abci/rebalance.go @@ -38,7 +38,9 @@ func (app *App) deliverRebalance(tx *types.TransactionRebalance) abci.ResponseDe return abci.ResponseDeliverTx{ Code: 0, - Tags: NewTagsFromRoundInfo(info), + Events: []abci.Event{ + {Type: "tags", Attributes: NewTagsFromRoundInfo(info)}, + }, } } diff --git a/packages/go-kosu/abci/rebalance_test.go b/packages/go-kosu/abci/rebalance_test.go index aaf22b4e..8ae4435f 100644 --- a/packages/go-kosu/abci/rebalance_test.go +++ b/packages/go-kosu/abci/rebalance_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/common" - "github.com/tendermint/tendermint/libs/db" + db "github.com/tendermint/tm-db" ) func TestDeliverRebalanceTx(t *testing.T) { @@ -35,7 +35,9 @@ func TestDeliverRebalanceTx(t *testing.T) { buf, err := types.EncodeTx(tx) require.NoError(t, err) - res := app.DeliverTx(buf) + res := app.DeliverTx( + abci.RequestDeliverTx{Tx: buf}, + ) t.Run("AssertCode", func(t *testing.T) { assert.Equal(t, abci.CodeTypeOK, res.Code, @@ -49,7 +51,10 @@ func TestDeliverRebalanceTx(t *testing.T) { {Key: []byte("round.start"), Value: []byte("100")}, {Key: []byte("round.end"), Value: []byte("110")}, } - assert.Equal(t, expectedTags, res.Tags) + expectedEvents := []abci.Event{ + {Type: "tags", Attributes: expectedTags}, + } + assert.Equal(t, expectedEvents, res.Events) }) } @@ -165,7 +170,7 @@ func deliverRebalance(t *testing.T, app *App, priv []byte, number, start, end ui buf, err := types.EncodeTx(tx) require.NoError(t, err) - res := app.DeliverTx(buf) + res := app.DeliverTx(abci.RequestDeliverTx{Tx: buf}) t.Run("AssertCode", func(t *testing.T) { assert.Equal(t, abci.CodeTypeOK, res.Code, diff --git a/packages/go-kosu/abci/witness_test.go b/packages/go-kosu/abci/witness_test.go index 14441c76..488b7da6 100644 --- a/packages/go-kosu/abci/witness_test.go +++ b/packages/go-kosu/abci/witness_test.go @@ -7,8 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/db" + db "github.com/tendermint/tm-db" ) func TestDeliverWitnessTx(t *testing.T) { @@ -39,7 +40,7 @@ func TestDeliverWitnessTx(t *testing.T) { buf, err := types.EncodeTx(tx) require.NoError(t, err) - res := app.DeliverTx(buf) + res := app.DeliverTx(abci.RequestDeliverTx{Tx: buf}) log.Printf("res = %+v\n", res) assert.EqualValues(t, 0, res.Code, res.Log) diff --git a/packages/go-kosu/cmd/kosud/main.go b/packages/go-kosu/cmd/kosud/main.go index df50f3c7..8b7a4bef 100644 --- a/packages/go-kosu/cmd/kosud/main.go +++ b/packages/go-kosu/cmd/kosud/main.go @@ -11,8 +11,8 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" + db "github.com/tendermint/tm-db" "go-kosu/abci" "go-kosu/rpc" @@ -32,16 +32,12 @@ type Config struct { Web3 string } -func newDB(dir string, debug bool) (db.DB, error) { +func newDB(dir string) (db.DB, error) { gdb, err := db.NewGoLevelDB(dbName, dir) if err != nil { return nil, err } - if debug { - return db.NewDebugDB("db", gdb), nil - } - return gdb, nil } @@ -69,7 +65,7 @@ func startWitness(ctx context.Context, app *abci.App, ethAddr string, logger log } func run(cfg *Config) error { - db, err := newDB(cfg.Home, cfg.Debug) + db, err := newDB(cfg.Home) if err != nil { return err } diff --git a/packages/go-kosu/go.mod b/packages/go-kosu/go.mod index 3cca2d18..f8fd81fb 100644 --- a/packages/go-kosu/go.mod +++ b/packages/go-kosu/go.mod @@ -3,41 +3,41 @@ module go-kosu go 1.12 require ( + bou.ke/monkey v1.0.1 // indirect github.com/allegro/bigcache v1.2.0 // indirect github.com/aristanetworks/goarista v0.0.0-20190409235741-55bc7be9dd31 // indirect github.com/btcsuite/btcd v0.0.0-20190427004231-96897255fd17 // indirect github.com/cespare/cp v1.1.1 // indirect - github.com/cosmos/cosmos-sdk v0.35.0 + github.com/cosmos/cosmos-sdk v0.37.0 github.com/deckarep/golang-set v1.7.1 // indirect github.com/edsrzf/mmap-go v1.0.0 // indirect github.com/ethereum/go-ethereum v1.8.27 github.com/fjl/memsize v0.0.0-20180929194037-2a09253e352a // indirect + github.com/go-logfmt/logfmt v0.4.0 // indirect github.com/gogo/protobuf v1.2.1 github.com/golang/protobuf v1.3.2 - github.com/google/gofuzz v1.0.0 // indirect github.com/hashicorp/golang-lru v0.5.1 // indirect github.com/huin/goupnp v1.0.0 // indirect github.com/jackpal/go-nat-pmp v1.0.1 // indirect github.com/karalabe/hid v0.0.0-20181128192157-d815e0c1a2e2 // indirect github.com/mattn/go-colorable v0.1.1 // indirect github.com/mattn/go-isatty v0.0.7 // indirect + github.com/otiai10/copy v0.0.0-20180813032824-7e9a647135a1 // indirect + github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95 // indirect + github.com/otiai10/mint v1.2.3 // indirect github.com/pborman/uuid v1.2.0 // indirect github.com/prometheus/common v0.2.0 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect github.com/rjeczalik/notify v0.9.2 // indirect github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a - github.com/spf13/cobra v0.0.3 + github.com/spf13/cobra v0.0.5 github.com/spf13/viper v1.3.2 github.com/stretchr/testify v1.3.0 - github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 // indirect - github.com/tendermint/iavl v0.12.2 // indirect - github.com/tendermint/tendermint v0.31.5 + github.com/tendermint/tendermint v0.32.2 + github.com/tendermint/tm-db v0.1.1 github.com/tidwall/gjson v1.3.0 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 - golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect golang.org/x/tools v0.0.0-20190703212419-2214986f1668 // indirect - google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2 // indirect - google.golang.org/grpc v1.22.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/urfave/cli.v1 v1.20.0 // indirect ) diff --git a/packages/go-kosu/go.sum b/packages/go-kosu/go.sum index 46eafc48..9a2329b1 100644 --- a/packages/go-kosu/go.sum +++ b/packages/go-kosu/go.sum @@ -36,11 +36,29 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cosmos/cosmos-sdk v0.33.2 h1:lX3Tm9UcQyOeCW3MhtJ7WfO+t443kfeIpACCTql+XKE= +github.com/cosmos/cosmos-sdk v0.33.2/go.mod h1:JrX/JpJunJQXBI5PEX2zELHMFzQr/159jDjIhesOh2c= +github.com/cosmos/cosmos-sdk v0.34.0-rc0/go.mod h1:aLgIheIE6TNKv6nyUhMjLwS4QHntAcEzgZzJBINvTds= +github.com/cosmos/cosmos-sdk v0.34.0-rc1/go.mod h1:aLgIheIE6TNKv6nyUhMjLwS4QHntAcEzgZzJBINvTds= +github.com/cosmos/cosmos-sdk v0.34.0-rc2/go.mod h1:aLgIheIE6TNKv6nyUhMjLwS4QHntAcEzgZzJBINvTds= +github.com/cosmos/cosmos-sdk v0.34.0/go.mod h1:a0NaOtHsrPNIS+uIbIeCuPINqUjgE4AVLfxFCMpBN6A= +github.com/cosmos/cosmos-sdk v0.34.1/go.mod h1:a0NaOtHsrPNIS+uIbIeCuPINqUjgE4AVLfxFCMpBN6A= +github.com/cosmos/cosmos-sdk v0.34.2/go.mod h1:a0NaOtHsrPNIS+uIbIeCuPINqUjgE4AVLfxFCMpBN6A= +github.com/cosmos/cosmos-sdk v0.34.3/go.mod h1:a0NaOtHsrPNIS+uIbIeCuPINqUjgE4AVLfxFCMpBN6A= +github.com/cosmos/cosmos-sdk v0.34.4/go.mod h1:a0NaOtHsrPNIS+uIbIeCuPINqUjgE4AVLfxFCMpBN6A= +github.com/cosmos/cosmos-sdk v0.34.5/go.mod h1:ruF+G4D7hRf34uzZQvf/SIja9fsIThU5D7GirwTMQ9I= +github.com/cosmos/cosmos-sdk v0.34.6/go.mod h1:ruF+G4D7hRf34uzZQvf/SIja9fsIThU5D7GirwTMQ9I= +github.com/cosmos/cosmos-sdk v0.34.7/go.mod h1:ruF+G4D7hRf34uzZQvf/SIja9fsIThU5D7GirwTMQ9I= github.com/cosmos/cosmos-sdk v0.35.0 h1:EPeie1aKHwnXtTzKggvabG7aAPN+DDmju2xquvjFwao= github.com/cosmos/cosmos-sdk v0.35.0/go.mod h1:ruF+G4D7hRf34uzZQvf/SIja9fsIThU5D7GirwTMQ9I= +github.com/cosmos/cosmos-sdk v0.37.0 h1:S2I3NDGN2wqfGlY5KqkAHTpfezjhgeqDxrCxhlhd528= +github.com/cosmos/cosmos-sdk v0.37.0/go.mod h1:3b/k/Zd+YDuttSmEJdNkxga1H5EIiDUhSYeErAHQN7A= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= +github.com/cosmos/ledger-cosmos-go v0.9.11/go.mod h1:RWldjvUf4Hfi46ti/8etBH3eQ2rOqqz2hstdzROQSHo= github.com/cosmos/ledger-cosmos-go v0.10.3/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= +github.com/cosmos/ledger-go v0.9.1/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -49,6 +67,7 @@ github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9r github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/etcd-io/bbolt v1.3.2/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/ethereum/go-ethereum v1.8.27 h1:d+gkiLaBDk5fn3Pe/xNVaMrB/ozI+AUB2IlVBp29IrY= github.com/ethereum/go-ethereum v1.8.27/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= @@ -73,7 +92,9 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= @@ -121,6 +142,7 @@ github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/libp2p/go-buffer-pool v0.0.1 h1:9Rrn/H46cXjaA2HQ5Y8lyhOS1NhTkZ4yuEs2r3Eechg= github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -132,6 +154,7 @@ github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -170,6 +193,7 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190227231451-bbced9601137 h1:3l8oligPtjd4JuM+OZ+U8sjtwFGJs98cdWsqs6QZRWs= github.com/prometheus/procfs v0.0.0-20190227231451-bbced9601137/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/rakyll/statik v0.1.4/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= +github.com/rakyll/statik v0.1.5/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -177,6 +201,7 @@ github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= @@ -193,6 +218,8 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= @@ -214,16 +241,27 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7bnBzGhf7BbIv9loSFQcieWWYIjLqcAw= github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA= github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= +github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.14.1 h1:o2WudxNfdLNBwMyl2dqOJxiro5rfrEaU0Ugs6offJMk= github.com/tendermint/go-amino v0.14.1/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso= +github.com/tendermint/go-amino v0.15.0 h1:TC4e66P59W7ML9+bxio17CPKnxW3nKIRAYskntMAoRk= +github.com/tendermint/go-amino v0.15.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tendermint/iavl v0.12.1/go.mod h1:EoKMMv++tDOL5qKKVnoIqtVPshRrEPeJ0WsgDOLAauM= github.com/tendermint/iavl v0.12.2 h1:Ls5p5VINCM1HRT9g5Vvs2zmDOCU/CCIvIHzd/pZ8P0E= github.com/tendermint/iavl v0.12.2/go.mod h1:EoKMMv++tDOL5qKKVnoIqtVPshRrEPeJ0WsgDOLAauM= +github.com/tendermint/iavl v0.12.4 h1:hd1woxUGISKkfUWBA4mmmTwOua6PQZTJM/F0FDrmMV8= +github.com/tendermint/iavl v0.12.4/go.mod h1:8LHakzt8/0G3/I8FUU0ReNx98S/EP6eyPJkAUvEXT/o= +github.com/tendermint/tendermint v0.31.2-0.20190822092307-7b2d018f847e h1:dZ4wM7fa5KDV6nGVsXtQ0Gzl/njc/m1UeC37g9NprZw= github.com/tendermint/tendermint v0.31.2-0.20190822092307-7b2d018f847e/go.mod h1:ZK2c29jl1QRYznIRyRWRDsmm1yvtPzBRT00x4t1JToY= +github.com/tendermint/tendermint v0.31.2-0.20190823081126-c475f25786b5/go.mod h1:ZK2c29jl1QRYznIRyRWRDsmm1yvtPzBRT00x4t1JToY= github.com/tendermint/tendermint v0.31.5 h1:vTet8tCq3B9/J9Yo11dNZ8pOB7NtSy++bVSfkP4KzR4= github.com/tendermint/tendermint v0.31.5/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc= github.com/tendermint/tendermint v0.32.1 h1:J8ddXMbCmG6GZjdCl/N1wgdXDU9uO91J2Y5CA9xYfGo= +github.com/tendermint/tendermint v0.32.1/go.mod h1:jmPDAKuNkev9793/ivn/fTBnfpA9mGBww8MPRNPNxnU= +github.com/tendermint/tendermint v0.32.2 h1:FvZWdksfDg/65vKKr5Lgo57keARFnmhrUEXHwyrV1QY= +github.com/tendermint/tendermint v0.32.2/go.mod h1:NwMyx58S8VJ7tEpFKqRVlVWKO9N9zjTHu+Dx96VsnOE= github.com/tendermint/tendermint v0.32.3 h1:GEnWpGQ795h5oTFNbfBLsY0LW/CW2j6p6HtiYNfxsgg= +github.com/tendermint/tm-db v0.1.1 h1:G3Xezy3sOk9+ekhjZ/kjArYIs1SmwV+1OUgNkj7RgV0= github.com/tendermint/tm-db v0.1.1/go.mod h1:0cPKWu2Mou3IlxecH+MEUSYc1Ch537alLe6CpFrKzgw= github.com/tidwall/gjson v1.3.0 h1:kfpsw1W3trbg4Xm6doUtqSl9+LhLB6qJ9PkltVAQZYs= github.com/tidwall/gjson v1.3.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= @@ -238,7 +276,9 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -260,6 +300,7 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -278,14 +319,17 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190703212419-2214986f1668 h1:3LJOYcj2ObWSZJXX21oGIIPv5SaOoi5JkzQTWnCXRhg= golang.org/x/tools v0.0.0-20190703212419-2214986f1668/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2 h1:67iHsV9djwGdZpdZNbLuQj6FOzCaZe3w+vhLjn5AcFA= google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= diff --git a/packages/go-kosu/rpc/rpc_test.go b/packages/go-kosu/rpc/rpc_test.go index eacf9fa6..627e3fc2 100644 --- a/packages/go-kosu/rpc/rpc_test.go +++ b/packages/go-kosu/rpc/rpc_test.go @@ -13,7 +13,7 @@ import ( "go-kosu/abci/types" "go-kosu/tests" - "github.com/tendermint/tendermint/libs/db" + db "github.com/tendermint/tm-db" ) func waitForNewBlock(t *testing.T, client *rpc.Client) { diff --git a/packages/go-kosu/rpc/service.go b/packages/go-kosu/rpc/service.go index 4b7ab73b..77b1d888 100644 --- a/packages/go-kosu/rpc/service.go +++ b/packages/go-kosu/rpc/service.go @@ -323,7 +323,7 @@ for { ``` */ func (s *Service) NewOrders(ctx context.Context) (*rpc.Subscription, error) { - query := "tm.event='Tx' AND tx.type='order'" + query := "tm.event='Tx' AND tags.tx.type='order'" return s.subscribeTM(ctx, query) } @@ -409,7 +409,7 @@ for { */ func (s *Service) NewRebalances(ctx context.Context) (*rpc.Subscription, error) { - query := "tm.event='Tx' AND tx.type='rebalance'" + query := "tm.event='Tx' AND tags.tx.type='rebalance'" return s.subscribeTM(ctx, query) } diff --git a/packages/go-kosu/store/cosmos/store.go b/packages/go-kosu/store/cosmos/store.go index bd11dce3..5bb54a94 100644 --- a/packages/go-kosu/store/cosmos/store.go +++ b/packages/go-kosu/store/cosmos/store.go @@ -4,7 +4,7 @@ import ( "encoding/hex" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/db" + db "github.com/tendermint/tm-db" cosmos "github.com/cosmos/cosmos-sdk/store" "github.com/cosmos/cosmos-sdk/store/rootmulti" diff --git a/packages/go-kosu/store/cosmos/store_test.go b/packages/go-kosu/store/cosmos/store_test.go index 7cf734ad..7eacf388 100644 --- a/packages/go-kosu/store/cosmos/store_test.go +++ b/packages/go-kosu/store/cosmos/store_test.go @@ -6,7 +6,7 @@ import ( "go-kosu/store" "go-kosu/store/storetest" - "github.com/tendermint/tendermint/libs/db" + db "github.com/tendermint/tm-db" ) func TestCosmosStore(t *testing.T) { diff --git a/packages/go-kosu/testnet/node0/config/config.toml b/packages/go-kosu/testnet/node0/config/config.toml index e526129c..ed86a799 100644 --- a/packages/go-kosu/testnet/node0/config/config.toml +++ b/packages/go-kosu/testnet/node0/config/config.toml @@ -15,8 +15,8 @@ moniker = "g480" # and verifying their commits fast_sync = true -# Database backend: leveldb | memdb | cleveldb -db_backend = "leveldb" +# Database backend: goleveldb | memdb | cleveldb +db_backend = "goleveldb" # Database directory db_dir = "data" diff --git a/packages/go-kosu/testnet/node1/config/config.toml b/packages/go-kosu/testnet/node1/config/config.toml index 7e593093..019f6106 100644 --- a/packages/go-kosu/testnet/node1/config/config.toml +++ b/packages/go-kosu/testnet/node1/config/config.toml @@ -15,8 +15,8 @@ moniker = "g480" # and verifying their commits fast_sync = true -# Database backend: leveldb | memdb | cleveldb -db_backend = "leveldb" +# Database backend: goleveldb | memdb | cleveldb +db_backend = "goleveldb" # Database directory db_dir = "data" diff --git a/packages/go-kosu/testnet/node2/config/config.toml b/packages/go-kosu/testnet/node2/config/config.toml index 7e593093..019f6106 100644 --- a/packages/go-kosu/testnet/node2/config/config.toml +++ b/packages/go-kosu/testnet/node2/config/config.toml @@ -15,8 +15,8 @@ moniker = "g480" # and verifying their commits fast_sync = true -# Database backend: leveldb | memdb | cleveldb -db_backend = "leveldb" +# Database backend: goleveldb | memdb | cleveldb +db_backend = "goleveldb" # Database directory db_dir = "data" diff --git a/packages/go-kosu/testnet/node3/config/config.toml b/packages/go-kosu/testnet/node3/config/config.toml index 7e593093..019f6106 100644 --- a/packages/go-kosu/testnet/node3/config/config.toml +++ b/packages/go-kosu/testnet/node3/config/config.toml @@ -15,8 +15,8 @@ moniker = "g480" # and verifying their commits fast_sync = true -# Database backend: leveldb | memdb | cleveldb -db_backend = "leveldb" +# Database backend: goleveldb | memdb | cleveldb +db_backend = "goleveldb" # Database directory db_dir = "data" diff --git a/packages/go-kosu/tests/support.go b/packages/go-kosu/tests/support.go index df05b000..79f111db 100644 --- a/packages/go-kosu/tests/support.go +++ b/packages/go-kosu/tests/support.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" + db "github.com/tendermint/tm-db" "go-kosu/abci" ) diff --git a/packages/go-kosu/witness/witness.go b/packages/go-kosu/witness/witness.go index 7831b593..b16baa90 100644 --- a/packages/go-kosu/witness/witness.go +++ b/packages/go-kosu/witness/witness.go @@ -3,6 +3,7 @@ package witness import ( "context" "encoding/hex" + "fmt" "os" "sync" @@ -104,18 +105,22 @@ func (w *Witness) Start(ctx context.Context) error { func (w *Witness) subscribe(ctx context.Context) error { // Subscribe to rebalance events and synchronize - sub, _, err := w.client.Subscribe(ctx, "tm.event = 'Tx' AND tx.type = 'rebalance'") + sub, _, err := w.client.Subscribe(ctx, "tm.event = 'Tx' AND tags.tx.type = 'rebalance'") if err != nil { return err } go func() { for e := range sub { - info, err := abci.NewRoundInfoFromTags(e.Tags) - if err != nil { - w.log.Error("subscribe: invalid tags", "err", err) - continue - } + fmt.Printf("e.Events = %+v\n", e.Events) + /* + info, err := abci.NewRoundInfoFromTags(e.Events["tags"]) + if err != nil { + w.log.Error("subscribe: invalid tags", "err", err) + continue + } + */ + info := &types.RoundInfo{} // TODO: validate that n == this.round + 1 w.roundMutex.Lock()