From c2e1ab2d4a4955a64edfe4f955c3659dd4a0c32d Mon Sep 17 00:00:00 2001
From: Aleksandr Bezobchuk <alex@tendermint.com>
Date: Mon, 9 Jul 2018 14:24:19 -0400
Subject: [PATCH 1/2] Lock in versions of dependencies

---
 Gopkg.lock | 26 ++++++++------------------
 Gopkg.toml |  6 +++---
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 863d9d51..2a52ade0 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -11,23 +11,22 @@
   branch = "master"
   name = "github.com/btcsuite/btcd"
   packages = ["btcec"]
-  revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64"
+  revision = "fdfc19097e7ac6b57035062056f5b7b4638b8898"
 
 [[projects]]
   branch = "master"
   name = "github.com/btcsuite/btcutil"
   packages = ["bech32"]
-  revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
+  revision = "ab6388e0c60ae4834a1f57511e20c17b5f78be4b"
 
 [[projects]]
-  branch = "develop"
   name = "github.com/cosmos/cosmos-sdk"
   packages = [
     "store",
     "types",
     "wire"
   ]
-  revision = "08625633c62555cbd4ddc61238d35da520d942cb"
+  revision = "0d6f99d6d514916974a7cc1a7e4577c650e987e1"
 
 [[projects]]
   name = "github.com/davecgh/go-spew"
@@ -73,8 +72,8 @@
     "rpc",
     "trie"
   ]
-  revision = "dea1ce052a10cd7d401a5c04f83f371a06fe293c"
-  version = "v1.8.11"
+  revision = "37685930d953bcbe023f9bc65b135a8d8b8f1488"
+  version = "v1.8.12"
 
 [[projects]]
   name = "github.com/go-kit/kit"
@@ -179,7 +178,7 @@
     "leveldb/table",
     "leveldb/util"
   ]
-  revision = "0d5a0ceb10cf9ab89fdd744cc8c50a83134f6697"
+  revision = "c4c61651e9e37fa117f53c5a906d3b63090d8445"
 
 [[projects]]
   branch = "master"
@@ -221,15 +220,6 @@
   revision = "5923b6288fe8ce9581936ee97c2bf9cf9c02c2f4"
   version = "v0.22.0-rc2"
 
-[[projects]]
-  name = "github.com/tendermint/tmlibs"
-  packages = [
-    "common",
-    "db",
-    "log"
-  ]
-  revision = "692f1d86a6e2c0efa698fd1e4541b68c74ffaf38"
-
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
@@ -257,7 +247,7 @@
     "trace",
     "websocket"
   ]
-  revision = "ed29d75add3d7c4bf7ca65aac0c6df3d1420216f"
+  revision = "c21de06aaf072cea07f3a65d6970e5c7d8b6cd6d"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -336,6 +326,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "58fcc52223aba442a24118b546ef53abff5352bbdf306e652dee3106822bba50"
+  inputs-digest = "6bd7ad37cf8a53408eeb32265fbc699bf2cc4e7a15b0b98182bcebb5c887cea1"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index bcdf8cf6..4b2a42b5 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,15 +1,15 @@
 [[constraint]]
   name = "github.com/cosmos/cosmos-sdk"
-  # TODO: Replace with a stable tagged version
-  branch = "develop"
+  # TODO: Replace with a stable tagged version (issue: #3)
+  revision = "0d6f99d6d514916974a7cc1a7e4577c650e987e1"
 
 [[override]]
   name = "google.golang.org/genproto"
   revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200"
 
 [[constraint]]
-  version = "=0.22.0-rc2"
   name = "github.com/tendermint/tendermint"
+  version = "=0.22.0-rc2"
 
 [prune]
   go-tests = true

From 09d5888c2eb4499bfd7277f9c675a48e116d7b15 Mon Sep 17 00:00:00 2001
From: Aleksandr Bezobchuk <alex@tendermint.com>
Date: Mon, 9 Jul 2018 14:25:00 -0400
Subject: [PATCH 2/2] Fix import paths (replace ledgerwatch with cosmos)

---
 core/chain.go     | 2 +-
 main.go           | 6 +++---
 state/database.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/chain.go b/core/chain.go
index f8869507..741b6f2a 100644
--- a/core/chain.go
+++ b/core/chain.go
@@ -20,7 +20,7 @@ import (
 // NOTE: Ethermint will distribute the fees out to validators, so the structure
 // and functionality of this is a WIP and subject to change.
 type ChainContext struct {
-	Coinbase ethcommon.Address
+	Coinbase        ethcommon.Address
 	headersByNumber map[uint64]*ethtypes.Header
 }
 
diff --git a/main.go b/main.go
index c4ae31de..d61b2f52 100644
--- a/main.go
+++ b/main.go
@@ -11,6 +11,8 @@ import (
 	"io"
 	"os"
 
+	"github.com/cosmos/ethermint/core"
+	"github.com/cosmos/ethermint/state"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	ethmisc "github.com/ethereum/go-ethereum/consensus/misc"
 	ethcore "github.com/ethereum/go-ethereum/core"
@@ -19,8 +21,6 @@ import (
 	ethvm "github.com/ethereum/go-ethereum/core/vm"
 	ethparams "github.com/ethereum/go-ethereum/params"
 	ethrlp "github.com/ethereum/go-ethereum/rlp"
-	"github.com/ledgerwatch/ethermint/core"
-	"github.com/ledgerwatch/ethermint/state"
 	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
@@ -195,7 +195,7 @@ func main() {
 		}
 
 		n++
-		if (n%100) == 0 {
+		if (n % 100) == 0 {
 			fmt.Printf("processed %d blocks\n", n)
 		}
 		if n >= 1000 {
diff --git a/state/database.go b/state/database.go
index f309ed5b..b097621e 100644
--- a/state/database.go
+++ b/state/database.go
@@ -3,10 +3,10 @@ package state
 import (
 	"github.com/cosmos/cosmos-sdk/store"
 	"github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/ethermint/core"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	ethstate "github.com/ethereum/go-ethereum/core/state"
 	ethtrie "github.com/ethereum/go-ethereum/trie"
-	"github.com/ledgerwatch/ethermint/core"
 	dbm "github.com/tendermint/tendermint/libs/db"
 )