From 5254a4aa1d847181d373144c1a283b5205909dd4 Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@protonmail.ch>
Date: Tue, 29 May 2018 05:24:57 +0200
Subject: [PATCH] Dependency fix, try II

---
 Gopkg.lock          | 6 +++---
 Gopkg.toml          | 4 ++--
 client/tx/search.go | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 5fe7b1a876..e30a97fda3 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -276,8 +276,8 @@
 [[projects]]
   name = "github.com/tendermint/go-amino"
   packages = ["."]
-  revision = "3c22a7a539411f89a96738fcfa14c1027e24e5ec"
-  version = "0.9.10"
+  revision = "ed62928576cfcaf887209dc96142cd79cdfff389"
+  version = "0.9.9"
 
 [[projects]]
   name = "github.com/tendermint/go-crypto"
@@ -454,6 +454,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "dc095a5d071dc8e1d7c3fd1208efbbe7d3c09551ecef76fdfafcdcdd88a49f50"
+  inputs-digest = "5ec04e1fee08c36e90fd44ec2cdd217f41d80ef5b256fee07cf4030c6cdfd413"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 61d11f999b..ce6ecda982 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -62,9 +62,9 @@
 
 [[constraint]]
   name = "github.com/tendermint/go-amino"
-  version = "~0.9.9"
+  version = "=0.9.9"
 
-[[override]]
+[[constraint]]
   name = "github.com/tendermint/iavl"
   branch = "develop"
 
diff --git a/client/tx/search.go b/client/tx/search.go
index 672f29ff14..527661626a 100644
--- a/client/tx/search.go
+++ b/client/tx/search.go
@@ -61,12 +61,15 @@ func searchTx(ctx context.CoreContext, cdc *wire.Codec, tags []string) ([]byte,
 	}
 
 	prove := !viper.GetBool(client.FlagTrustNode)
-	txs, err := node.TxSearch(query, prove)
+	// TODO: take these as args
+	page := 0
+	perPage := 100
+	res, err := node.TxSearch(query, prove, page, perPage)
 	if err != nil {
 		return nil, err
 	}
 
-	info, err := formatTxResults(cdc, txs)
+	info, err := formatTxResults(cdc, res.Txs)
 	if err != nil {
 		return nil, err
 	}