diff --git a/abci/client/client.go b/abci/client/client.go
index 329b00aa52..c5afa771e2 100644
--- a/abci/client/client.go
+++ b/abci/client/client.go
@@ -6,9 +6,9 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 const (
diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go
index 459dfaf9a7..91e848f7bb 100644
--- a/abci/client/grpc_client.go
+++ b/abci/client/grpc_client.go
@@ -11,10 +11,10 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 // A gRPC client.
diff --git a/abci/client/local_client.go b/abci/client/local_client.go
index 1002c64e81..ecaa2e8300 100644
--- a/abci/client/local_client.go
+++ b/abci/client/local_client.go
@@ -3,9 +3,9 @@ package abciclient
 import (
 	"context"
 
-	types "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
+	types "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 // NOTE: use defer to unlock mutex because Application might panic (e.g., in
diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go
index e8789c1bc8..984e97ef7e 100644
--- a/abci/client/mocks/client.go
+++ b/abci/client/mocks/client.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	types "github.com/dashpay/tenderdash/abci/types"
 	mock "github.com/stretchr/testify/mock"
-	types "github.com/tendermint/tendermint/abci/types"
 )
 
 // Client is an autogenerated mock type for the Client type
diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go
index 3867845e85..26adc2318f 100644
--- a/abci/client/socket_client.go
+++ b/abci/client/socket_client.go
@@ -12,10 +12,10 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 // This is goroutine-safe, but users should beware that the application in
diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go
index f5c0f62e96..6680a8aefe 100644
--- a/abci/cmd/abci-cli/abci-cli.go
+++ b/abci/cmd/abci-cli/abci-cli.go
@@ -15,17 +15,16 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/version"
-
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/abci/server"
-	servertest "github.com/tendermint/tendermint/abci/tests/server"
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/proto/tendermint/crypto"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/abci/server"
+	servertest "github.com/dashpay/tenderdash/abci/tests/server"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 // client is a global variable so it can be reused by the console
diff --git a/abci/example/counter/counter.go b/abci/example/counter/counter.go
index a2b56bb407..293e828f64 100644
--- a/abci/example/counter/counter.go
+++ b/abci/example/counter/counter.go
@@ -5,10 +5,10 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/types"
-	tmcrypto "github.com/tendermint/tendermint/crypto"
-	tmtypes "github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	"github.com/dashpay/tenderdash/abci/types"
+	tmcrypto "github.com/dashpay/tenderdash/crypto"
+	tmtypes "github.com/dashpay/tenderdash/types"
 )
 
 type Application struct {
diff --git a/abci/example/example_test.go b/abci/example/example_test.go
index 54b6506528..d1f38df68d 100644
--- a/abci/example/example_test.go
+++ b/abci/example/example_test.go
@@ -14,14 +14,13 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abciserver "github.com/tendermint/tendermint/abci/server"
-	"github.com/tendermint/tendermint/abci/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abciserver "github.com/dashpay/tenderdash/abci/server"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
 )
 
 func init() {
diff --git a/abci/example/kvstore/config.go b/abci/example/kvstore/config.go
index abd56d751e..4edebf81a1 100644
--- a/abci/example/kvstore/config.go
+++ b/abci/example/kvstore/config.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/encoding"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/encoding"
 )
 
 // Config allows for the setting of high level parameters for running the e2e Application
diff --git a/abci/example/kvstore/helpers_test.go b/abci/example/kvstore/helpers_test.go
index fe3ec1c825..6fe1208a7c 100644
--- a/abci/example/kvstore/helpers_test.go
+++ b/abci/example/kvstore/helpers_test.go
@@ -1,10 +1,10 @@
 package kvstore
 
 import (
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash/llmq"
-	tmtypes "github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	tmtypes "github.com/dashpay/tenderdash/types"
 )
 
 // RandValidatorSetUpdate returns a list of cnt validators for initializing
diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
index d5f0f63c37..41e9c2e52d 100644
--- a/abci/example/kvstore/kvstore.go
+++ b/abci/example/kvstore/kvstore.go
@@ -16,15 +16,15 @@ import (
 	"github.com/gogo/protobuf/proto"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/abci/example/code"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	types1 "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 const ProtocolVersion uint64 = 0x12345678
diff --git a/abci/example/kvstore/kvstore_test.go b/abci/example/kvstore/kvstore_test.go
index caee1a4a4c..0041c0e4ff 100644
--- a/abci/example/kvstore/kvstore_test.go
+++ b/abci/example/kvstore/kvstore_test.go
@@ -12,17 +12,17 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/code"
-	abciserver "github.com/tendermint/tendermint/abci/server"
-	"github.com/tendermint/tendermint/abci/types"
-	tmcrypto "github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	tmtypes "github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	abciserver "github.com/dashpay/tenderdash/abci/server"
+	"github.com/dashpay/tenderdash/abci/types"
+	tmcrypto "github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	tmtypes "github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 const (
diff --git a/abci/example/kvstore/snapshots.go b/abci/example/kvstore/snapshots.go
index 375ef89771..13eb2ebb2f 100644
--- a/abci/example/kvstore/snapshots.go
+++ b/abci/example/kvstore/snapshots.go
@@ -12,10 +12,10 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/ds"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/ds"
 )
 
 const (
diff --git a/abci/example/kvstore/state.go b/abci/example/kvstore/state.go
index 0c32913c5a..fc4b2321c8 100644
--- a/abci/example/kvstore/state.go
+++ b/abci/example/kvstore/state.go
@@ -8,10 +8,10 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	types1 "github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	types1 "github.com/dashpay/tenderdash/types"
 )
 
 // State represents kvstore app state at some height.
diff --git a/abci/example/kvstore/state_test.go b/abci/example/kvstore/state_test.go
index 452db37171..e2ba12102d 100644
--- a/abci/example/kvstore/state_test.go
+++ b/abci/example/kvstore/state_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 func TestStateMarshalUnmarshal(t *testing.T) {
diff --git a/abci/example/kvstore/tx.go b/abci/example/kvstore/tx.go
index 12743afbb2..53a4b1987f 100644
--- a/abci/example/kvstore/tx.go
+++ b/abci/example/kvstore/tx.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tendermint/tendermint/abci/example/code"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // PrepareTxsFunc prepares transactions, possibly adding and/or removing some of them
diff --git a/abci/example/kvstore/verify.go b/abci/example/kvstore/verify.go
index 6ddad0002e..5e81aa18a1 100644
--- a/abci/example/kvstore/verify.go
+++ b/abci/example/kvstore/verify.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	types1 "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func (app *Application) verifyBlockCommit(qsd types.QuorumSignData, commit abci.CommitInfo) error {
diff --git a/abci/example/kvstore/verify_test.go b/abci/example/kvstore/verify_test.go
index 88b37268d0..cb381a9fc9 100644
--- a/abci/example/kvstore/verify_test.go
+++ b/abci/example/kvstore/verify_test.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestVerifyBlockCommit(t *testing.T) {
diff --git a/abci/server/grpc_server.go b/abci/server/grpc_server.go
index 9aab08fd49..00821a843c 100644
--- a/abci/server/grpc_server.go
+++ b/abci/server/grpc_server.go
@@ -6,10 +6,10 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 type GRPCServer struct {
diff --git a/abci/server/server.go b/abci/server/server.go
index 0e731d404d..738c2c25c7 100644
--- a/abci/server/server.go
+++ b/abci/server/server.go
@@ -10,9 +10,9 @@ package server
 import (
 	"fmt"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 func NewServer(logger log.Logger, protoAddr, transport string, app types.Application) (service.Service, error) {
diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go
index 4bd6aa7994..ac40a604bb 100644
--- a/abci/server/socket_server.go
+++ b/abci/server/socket_server.go
@@ -11,10 +11,10 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 // var maxNumberConnections = 2
diff --git a/abci/tests/benchmarks/parallel/parallel.go b/abci/tests/benchmarks/parallel/parallel.go
index fe213313d4..9fd6ca813f 100644
--- a/abci/tests/benchmarks/parallel/parallel.go
+++ b/abci/tests/benchmarks/parallel/parallel.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/tendermint/tendermint/abci/types"
-	tmnet "github.com/tendermint/tendermint/libs/net"
+	"github.com/dashpay/tenderdash/abci/types"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
 )
 
 func main() {
diff --git a/abci/tests/benchmarks/simple/simple.go b/abci/tests/benchmarks/simple/simple.go
index b18eaa580b..c7edf1231a 100644
--- a/abci/tests/benchmarks/simple/simple.go
+++ b/abci/tests/benchmarks/simple/simple.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"reflect"
 
-	"github.com/tendermint/tendermint/abci/types"
-	tmnet "github.com/tendermint/tendermint/libs/net"
+	"github.com/dashpay/tenderdash/abci/types"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
 )
 
 func main() {
diff --git a/abci/tests/client_server_test.go b/abci/tests/client_server_test.go
index 15c1db2ecb..f95c124e5b 100644
--- a/abci/tests/client_server_test.go
+++ b/abci/tests/client_server_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abciclientent "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abciserver "github.com/tendermint/tendermint/abci/server"
-	"github.com/tendermint/tendermint/libs/log"
+	abciclientent "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abciserver "github.com/dashpay/tenderdash/abci/server"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func TestClientServerNoAddrPrefix(t *testing.T) {
diff --git a/abci/tests/server/client.go b/abci/tests/server/client.go
index f3a40c242a..162f1a0007 100644
--- a/abci/tests/server/client.go
+++ b/abci/tests/server/client.go
@@ -6,11 +6,11 @@ import (
 	"errors"
 	"fmt"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash/llmq"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func InitChain(ctx context.Context, client abciclient.Client) error {
diff --git a/abci/types/application.go b/abci/types/application.go
index 7c83022258..19b52612f3 100644
--- a/abci/types/application.go
+++ b/abci/types/application.go
@@ -3,7 +3,7 @@ package types
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 // StateSyncer is an interface that handles the state sync protocol
diff --git a/abci/types/messages.go b/abci/types/messages.go
index bfcd392b38..4a749fc83a 100644
--- a/abci/types/messages.go
+++ b/abci/types/messages.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
 )
 
 const (
diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go
index 404d552225..7e79f1d353 100644
--- a/abci/types/messages_test.go
+++ b/abci/types/messages_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func TestMarshalJSON(t *testing.T) {
diff --git a/abci/types/mocks/application.go b/abci/types/mocks/application.go
index 980f15febb..e7767821d9 100644
--- a/abci/types/mocks/application.go
+++ b/abci/types/mocks/application.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	types "github.com/dashpay/tenderdash/abci/types"
 	mock "github.com/stretchr/testify/mock"
-	types "github.com/tendermint/tendermint/abci/types"
 )
 
 // Application is an autogenerated mock type for the Application type
diff --git a/abci/types/types.go b/abci/types/types.go
index f3e26886b8..3d82902597 100644
--- a/abci/types/types.go
+++ b/abci/types/types.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/gogo/protobuf/jsonpb"
 
-	"github.com/tendermint/tendermint/crypto"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go
index 024e6774f7..5b4fd87a45 100644
--- a/abci/types/types.pb.go
+++ b/abci/types/types.pb.go
@@ -6,13 +6,13 @@ package types
 import (
 	context "context"
 	fmt "fmt"
+	crypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
+	version "github.com/dashpay/tenderdash/proto/tendermint/version"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	types1 "github.com/tendermint/tendermint/proto/tendermint/types"
-	version "github.com/tendermint/tendermint/proto/tendermint/version"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -4275,233 +4275,234 @@ func init() {
 func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) }
 
 var fileDescriptor_252557cfdd89a31a = []byte{
-	// 3616 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5b, 0x4d, 0x70, 0x1b, 0x57,
-	0x72, 0xc6, 0xe0, 0x1f, 0x8d, 0x5f, 0x3e, 0x52, 0x12, 0x04, 0x49, 0x24, 0x3d, 0x8a, 0x2d, 0x59,
-	0xb6, 0x49, 0x5b, 0x8a, 0x2d, 0x3b, 0x76, 0x92, 0x02, 0x41, 0x28, 0xa0, 0x44, 0x91, 0xf4, 0x10,
-	0xa4, 0xcb, 0x71, 0xec, 0xa9, 0x21, 0xf0, 0x48, 0x8c, 0x05, 0x60, 0xc6, 0x33, 0x03, 0x0a, 0xf4,
-	0x35, 0x71, 0x0e, 0x3e, 0xf9, 0x96, 0x93, 0x8f, 0x39, 0xe6, 0x92, 0x53, 0x2a, 0x87, 0xa4, 0xf6,
-	0xe6, 0xad, 0xbd, 0xf8, 0xb8, 0x97, 0xd5, 0xba, 0xe4, 0xcb, 0xd6, 0xde, 0xf6, 0xb4, 0xb7, 0xad,
-	0xad, 0xf7, 0x33, 0xbf, 0x98, 0xc1, 0x8f, 0xe5, 0xaa, 0xad, 0xbd, 0xe1, 0xf5, 0xeb, 0xee, 0x79,
-	0x3f, 0xfd, 0xba, 0xfb, 0x7d, 0xfd, 0x00, 0xd7, 0x2c, 0x3c, 0xec, 0x62, 0x63, 0xa0, 0x0e, 0xad,
-	0x4d, 0xe5, 0xa4, 0xa3, 0x6e, 0x5a, 0x17, 0x3a, 0x36, 0x37, 0x74, 0x43, 0xb3, 0x34, 0x54, 0x76,
-	0x3b, 0x37, 0x48, 0x67, 0xed, 0x86, 0x87, 0xbb, 0x63, 0x5c, 0xe8, 0x96, 0xb6, 0xa9, 0x1b, 0x9a,
-	0x76, 0xca, 0xf8, 0x6b, 0x5e, 0x65, 0x54, 0xcf, 0x66, 0x57, 0x31, 0x7b, 0xbc, 0xf3, 0xfa, 0x44,
-	0xe7, 0x49, 0x5f, 0xeb, 0x3c, 0x89, 0xec, 0xf5, 0x0c, 0xc4, 0xd7, 0xcb, 0xbf, 0xfb, 0x04, 0x5f,
-	0xd8, 0xbd, 0x37, 0x26, 0x64, 0x75, 0xc5, 0x50, 0x06, 0x76, 0xf7, 0xaa, 0xa7, 0xfb, 0x1c, 0x1b,
-	0xa6, 0xaa, 0x0d, 0x7d, 0xca, 0xd7, 0xce, 0x34, 0xed, 0xac, 0x8f, 0x37, 0x69, 0xeb, 0x64, 0x74,
-	0xba, 0x69, 0xa9, 0x03, 0x6c, 0x5a, 0xca, 0x40, 0xe7, 0x0c, 0x2b, 0x67, 0xda, 0x99, 0x46, 0x7f,
-	0x6e, 0x92, 0x5f, 0x8c, 0x2a, 0x7e, 0x95, 0x83, 0x8c, 0x84, 0xbf, 0x18, 0x61, 0xd3, 0x42, 0x77,
-	0x21, 0x89, 0x3b, 0x3d, 0xad, 0x2a, 0xac, 0x0b, 0xb7, 0xf3, 0x77, 0xaf, 0x6f, 0x04, 0xd6, 0x6d,
-	0x83, 0xf3, 0x35, 0x3b, 0x3d, 0xad, 0x15, 0x93, 0x28, 0x2f, 0x7a, 0x1b, 0x52, 0xa7, 0xfd, 0x91,
-	0xd9, 0xab, 0xc6, 0xa9, 0xd0, 0x8d, 0x28, 0xa1, 0x07, 0x84, 0xa9, 0x15, 0x93, 0x18, 0x37, 0xf9,
-	0x94, 0x3a, 0x3c, 0xd5, 0xaa, 0x89, 0xe9, 0x9f, 0xda, 0x19, 0x9e, 0xd2, 0x4f, 0x11, 0x5e, 0xb4,
-	0x05, 0xa0, 0x0e, 0x55, 0x4b, 0xee, 0xf4, 0x14, 0x75, 0x58, 0x4d, 0x52, 0xc9, 0x97, 0xa2, 0x25,
-	0x55, 0xab, 0x41, 0x18, 0x5b, 0x31, 0x29, 0xa7, 0xda, 0x0d, 0x32, 0xdc, 0x2f, 0x46, 0xd8, 0xb8,
-	0xa8, 0xa6, 0xa6, 0x0f, 0xf7, 0x43, 0xc2, 0x44, 0x86, 0x4b, 0xb9, 0xd1, 0x07, 0x90, 0xed, 0xf4,
-	0x70, 0xe7, 0x89, 0x6c, 0x8d, 0xab, 0x19, 0x2a, 0xb9, 0x16, 0x25, 0xd9, 0x20, 0x7c, 0xed, 0x71,
-	0x2b, 0x26, 0x65, 0x3a, 0xec, 0x27, 0xda, 0x83, 0x52, 0x5f, 0x35, 0x2d, 0xd9, 0x1c, 0x2a, 0xba,
-	0xd9, 0xd3, 0x2c, 0xb3, 0x9a, 0xa7, 0x3a, 0x5e, 0x8e, 0xd2, 0xb1, 0xab, 0x9a, 0xd6, 0xa1, 0xcd,
-	0xdc, 0x8a, 0x49, 0xc5, 0xbe, 0x97, 0x40, 0xf4, 0x69, 0xa7, 0xa7, 0xd8, 0x70, 0x14, 0x56, 0x0b,
-	0xd3, 0xf5, 0xed, 0x13, 0x6e, 0x5b, 0x9e, 0xe8, 0xd3, 0xbc, 0x04, 0xf4, 0x09, 0x2c, 0xf7, 0x35,
-	0xa5, 0xeb, 0xa8, 0x93, 0x3b, 0xbd, 0xd1, 0xf0, 0x49, 0xb5, 0x48, 0x95, 0xbe, 0x1a, 0x39, 0x48,
-	0x4d, 0xe9, 0xda, 0x2a, 0x1a, 0x44, 0xa0, 0x15, 0x93, 0x96, 0xfa, 0x41, 0x22, 0xfa, 0x0c, 0x56,
-	0x14, 0x5d, 0xef, 0x5f, 0x04, 0xb5, 0x97, 0xa8, 0xf6, 0x3b, 0x51, 0xda, 0xeb, 0x44, 0x26, 0xa8,
-	0x1e, 0x29, 0x13, 0x54, 0xd4, 0x86, 0x8a, 0x6e, 0x60, 0x5d, 0x31, 0xb0, 0xac, 0x1b, 0x9a, 0xae,
-	0x99, 0x4a, 0xbf, 0x5a, 0xa6, 0xba, 0x6f, 0x45, 0xe9, 0x3e, 0x60, 0xfc, 0x07, 0x9c, 0xbd, 0x15,
-	0x93, 0xca, 0xba, 0x9f, 0xc4, 0xb4, 0x6a, 0x1d, 0x6c, 0x9a, 0xae, 0xd6, 0xca, 0x2c, 0xad, 0x94,
-	0xdf, 0xaf, 0xd5, 0x47, 0x42, 0x4d, 0xc8, 0xe3, 0x31, 0x11, 0x97, 0xcf, 0x35, 0x0b, 0x57, 0x97,
-	0xa8, 0x42, 0x31, 0xf2, 0x9c, 0x51, 0xd6, 0x63, 0xcd, 0xc2, 0xad, 0x98, 0x04, 0xd8, 0x69, 0x21,
-	0x05, 0x2e, 0x9d, 0x63, 0x43, 0x3d, 0xbd, 0xa0, 0x6a, 0x64, 0xda, 0x43, 0xfc, 0x41, 0x15, 0x51,
-	0x85, 0xaf, 0x45, 0x29, 0x3c, 0xa6, 0x42, 0x44, 0x45, 0xd3, 0x16, 0x69, 0xc5, 0xa4, 0xe5, 0xf3,
-	0x49, 0x32, 0x31, 0xb1, 0x53, 0x75, 0xa8, 0xf4, 0xd5, 0x2f, 0xb1, 0x4c, 0x1d, 0x5c, 0x75, 0x79,
-	0xba, 0x89, 0x3d, 0xe0, 0xdc, 0x5b, 0x84, 0x99, 0x98, 0xd8, 0xa9, 0x97, 0xb0, 0x95, 0x81, 0xd4,
-	0xb9, 0xd2, 0x1f, 0xe1, 0x87, 0xc9, 0x6c, 0xba, 0x92, 0x79, 0x98, 0xcc, 0x66, 0x2b, 0xb9, 0x87,
-	0xc9, 0x6c, 0xae, 0x02, 0x0f, 0x93, 0x59, 0xa8, 0xe4, 0xc5, 0x5b, 0x90, 0xf7, 0xb8, 0x17, 0x54,
-	0x85, 0xcc, 0x00, 0x9b, 0xa6, 0x72, 0x86, 0xa9, 0x37, 0xca, 0x49, 0x76, 0x53, 0x2c, 0x41, 0xc1,
-	0xeb, 0x52, 0xc4, 0x6f, 0x04, 0x47, 0x92, 0x78, 0x0b, 0x22, 0xc9, 0xdd, 0xa3, 0x2d, 0xc9, 0x9b,
-	0xe8, 0x26, 0x14, 0xe9, 0x54, 0x64, 0xbb, 0x9f, 0xb8, 0xac, 0xa4, 0x54, 0xa0, 0xc4, 0x63, 0xce,
-	0xb4, 0x06, 0x79, 0xfd, 0xae, 0xee, 0xb0, 0x24, 0x28, 0x0b, 0xe8, 0x77, 0x75, 0x9b, 0xe1, 0x25,
-	0x28, 0x90, 0x79, 0x3b, 0x1c, 0x49, 0xfa, 0x91, 0x3c, 0xa1, 0x71, 0x16, 0xf1, 0xdf, 0x12, 0x50,
-	0x09, 0xba, 0x21, 0xf4, 0x2e, 0x24, 0x89, 0x47, 0xe6, 0xce, 0xb5, 0xb6, 0xc1, 0xdc, 0xf5, 0x86,
-	0xed, 0xae, 0x37, 0xda, 0xb6, 0xbb, 0xde, 0xca, 0x7e, 0xf7, 0x6c, 0x2d, 0xf6, 0xcd, 0x6f, 0xd7,
-	0x04, 0x89, 0x4a, 0xa0, 0xab, 0xc4, 0xf9, 0x28, 0xea, 0x50, 0x56, 0xbb, 0x74, 0xc8, 0x39, 0xe2,
-	0x59, 0x14, 0x75, 0xb8, 0xd3, 0x45, 0xbb, 0x50, 0xe9, 0x68, 0x43, 0x13, 0x0f, 0xcd, 0x91, 0x29,
-	0xb3, 0x70, 0xc1, 0x5d, 0xaa, 0xcf, 0x31, 0xb2, 0x38, 0xd1, 0xb0, 0x39, 0x0f, 0x28, 0xa3, 0x54,
-	0xee, 0xf8, 0x09, 0x68, 0x0f, 0x8a, 0xe7, 0x4a, 0x5f, 0xed, 0x2a, 0x96, 0x66, 0xc8, 0x26, 0xb6,
-	0xb8, 0x8f, 0xbd, 0x39, 0xb1, 0xe7, 0xc7, 0x36, 0xd7, 0x21, 0xb6, 0x8e, 0xf4, 0xae, 0x62, 0xe1,
-	0xad, 0xe4, 0x77, 0xcf, 0xd6, 0x04, 0xa9, 0x70, 0xee, 0xe9, 0x41, 0xaf, 0x40, 0x59, 0xd1, 0x75,
-	0xd9, 0xb4, 0x14, 0x0b, 0xcb, 0x27, 0x17, 0x16, 0x36, 0xa9, 0xdb, 0x2d, 0x48, 0x45, 0x45, 0xd7,
-	0x0f, 0x09, 0x75, 0x8b, 0x10, 0xd1, 0xcb, 0x50, 0x22, 0x1e, 0x5a, 0x55, 0xfa, 0x72, 0x0f, 0xab,
-	0x67, 0x3d, 0xab, 0x9a, 0x5e, 0x17, 0x6e, 0x27, 0xa4, 0x22, 0xa7, 0xb6, 0x28, 0x11, 0x6d, 0xc0,
-	0xb2, 0xcd, 0xd6, 0xd1, 0x0c, 0x6c, 0xf3, 0x12, 0x7f, 0x5c, 0x94, 0x96, 0x78, 0x57, 0x43, 0x33,
-	0x30, 0xe3, 0x17, 0xbb, 0x8e, 0xa5, 0x50, 0x6f, 0x8e, 0x10, 0x24, 0xbb, 0x8a, 0xa5, 0xd0, 0x1d,
-	0x28, 0x48, 0xf4, 0x37, 0xa1, 0xe9, 0x8a, 0xd5, 0xe3, 0xeb, 0x4a, 0x7f, 0xa3, 0xcb, 0x90, 0xe6,
-	0xaa, 0x13, 0x74, 0x18, 0xbc, 0x85, 0x56, 0x20, 0xa5, 0x1b, 0xda, 0x39, 0xa6, 0xcb, 0x92, 0x95,
-	0x58, 0x43, 0x94, 0xa0, 0xe4, 0xf7, 0xfc, 0xa8, 0x04, 0x71, 0x6b, 0xcc, 0xbf, 0x12, 0xb7, 0xc6,
-	0xe8, 0x4d, 0x48, 0x92, 0x0d, 0xa0, 0xdf, 0x28, 0x85, 0xc4, 0x3a, 0x2e, 0xd7, 0xbe, 0xd0, 0xb1,
-	0x44, 0x39, 0xc5, 0xcb, 0xb0, 0x12, 0x16, 0x09, 0xc4, 0x9e, 0x43, 0xf7, 0x79, 0x74, 0xf4, 0x36,
-	0x64, 0x9d, 0x50, 0xc0, 0xec, 0xeb, 0xea, 0xc4, 0x57, 0x6c, 0x66, 0xc9, 0x61, 0x25, 0x86, 0x45,
-	0xf6, 0xa7, 0xa7, 0xf0, 0xf0, 0x5d, 0x90, 0x32, 0x8a, 0xae, 0xb7, 0x14, 0xb3, 0x27, 0x9e, 0x41,
-	0x35, 0xca, 0xcd, 0x7b, 0xd6, 0x47, 0xa0, 0xa7, 0xc3, 0x5e, 0x1f, 0xcf, 0xc9, 0x8b, 0xd3, 0x3d,
-	0x71, 0x4e, 0x1e, 0xb5, 0xe0, 0xd1, 0xf0, 0x09, 0xb1, 0xe0, 0x04, 0xfb, 0x10, 0x6d, 0xef, 0x74,
-	0xc5, 0x2e, 0x5c, 0x8d, 0xf4, 0xf8, 0x3e, 0x39, 0xc1, 0x27, 0x47, 0x36, 0x83, 0xc5, 0x11, 0x36,
-	0x70, 0xd6, 0x20, 0x43, 0x33, 0xe9, 0xbc, 0xe9, 0x67, 0x72, 0x12, 0x6f, 0x89, 0x7f, 0x48, 0xc2,
-	0xe5, 0x70, 0xe7, 0x8f, 0xd6, 0xa1, 0x30, 0x50, 0xc6, 0xb2, 0x35, 0xe6, 0x16, 0x2a, 0xd0, 0x3d,
-	0x87, 0x81, 0x32, 0x6e, 0x8f, 0x99, 0x79, 0x56, 0x20, 0x61, 0x8d, 0xcd, 0x6a, 0x7c, 0x3d, 0x71,
-	0xbb, 0x20, 0x91, 0x9f, 0xe8, 0x31, 0x2c, 0xf5, 0xb5, 0x8e, 0xd2, 0x97, 0xfb, 0x8a, 0x69, 0xc9,
-	0x1d, 0x6d, 0x30, 0x50, 0x2d, 0x7e, 0xee, 0xae, 0x4d, 0x6e, 0x2f, 0xed, 0x26, 0xbe, 0x89, 0x1e,
-	0x92, 0x98, 0x54, 0xa6, 0xb2, 0xbb, 0x8a, 0x69, 0xb1, 0x2e, 0xb4, 0x0d, 0xf9, 0x81, 0x6a, 0x9e,
-	0xe0, 0x9e, 0x72, 0xae, 0x6a, 0x46, 0x35, 0xb9, 0x9e, 0x08, 0xcd, 0x89, 0x1e, 0xbb, 0x3c, 0x5c,
-	0x93, 0x57, 0xcc, 0xb3, 0x2d, 0x29, 0x9f, 0xd9, 0xda, 0x8e, 0x27, 0xbd, 0xb0, 0xe3, 0x79, 0x13,
-	0x56, 0x86, 0x78, 0x6c, 0xc9, 0xce, 0xa1, 0x36, 0x99, 0xad, 0x64, 0xe8, 0x92, 0x23, 0xd2, 0xe7,
-	0x78, 0x02, 0x93, 0x98, 0x0d, 0xd9, 0x15, 0x43, 0x1b, 0x0d, 0xbb, 0xd5, 0xec, 0xba, 0x70, 0x3b,
-	0x25, 0xb1, 0x06, 0xba, 0x0f, 0x55, 0x7a, 0x60, 0x99, 0x17, 0x23, 0xde, 0x16, 0x77, 0xed, 0xd3,
-	0x9b, 0xa3, 0x96, 0x72, 0x89, 0xf4, 0x53, 0x3f, 0xb9, 0x4b, 0x7b, 0xf9, 0x89, 0xdf, 0x84, 0x15,
-	0x16, 0x7d, 0xb1, 0x41, 0xc2, 0x30, 0xd9, 0x24, 0x3a, 0x00, 0xa0, 0x03, 0x58, 0xb2, 0xfb, 0x0e,
-	0x0c, 0xad, 0x3d, 0xa6, 0xdf, 0x7f, 0xd3, 0x11, 0xe8, 0xca, 0xc4, 0xb4, 0x6d, 0x7b, 0xcc, 0x53,
-	0x43, 0x45, 0x76, 0x5f, 0x5d, 0x77, 0xdc, 0xf9, 0x7d, 0xd7, 0x68, 0x0b, 0x93, 0x29, 0x21, 0xef,
-	0x72, 0x5d, 0xa7, 0x6b, 0xd3, 0x6b, 0x90, 0xff, 0x62, 0xa4, 0x19, 0xa3, 0x01, 0x1b, 0x52, 0x91,
-	0x0e, 0x09, 0x18, 0x89, 0x1e, 0xa1, 0xff, 0x4f, 0x79, 0x6c, 0xce, 0x9f, 0x07, 0x70, 0x8b, 0x12,
-	0x5c, 0x8b, 0x3a, 0xf4, 0x0c, 0xdc, 0x6b, 0x54, 0xf1, 0x79, 0x8d, 0xca, 0x99, 0x5b, 0xb4, 0x5d,
-	0x25, 0x7e, 0x9a, 0x5d, 0x21, 0x48, 0xd2, 0x19, 0x26, 0x99, 0xdb, 0x24, 0xbf, 0x23, 0x6d, 0xcd,
-	0xd9, 0xff, 0xb4, 0x77, 0xff, 0x6d, 0x0b, 0xcc, 0xfc, 0x6c, 0x16, 0x98, 0x8d, 0xb4, 0xc0, 0x9f,
-	0x6c, 0x6b, 0x6d, 0xb8, 0x1c, 0x10, 0x94, 0x47, 0x34, 0xb4, 0x51, 0x6b, 0x0b, 0x24, 0xfc, 0x76,
-	0x40, 0xf5, 0x28, 0x92, 0x96, 0x7d, 0x7a, 0x59, 0x58, 0x8c, 0xb4, 0xe0, 0xfc, 0xa2, 0x16, 0x5c,
-	0x98, 0xc7, 0x82, 0x8b, 0x2f, 0x62, 0xc1, 0xa5, 0x09, 0x0b, 0x3e, 0x82, 0xa5, 0x89, 0x54, 0xd4,
-	0x31, 0x07, 0x21, 0xd4, 0x1c, 0xe2, 0xe1, 0xe6, 0x90, 0xf0, 0x98, 0x83, 0xf8, 0x83, 0x00, 0xb5,
-	0xe8, 0x8c, 0x34, 0xf4, 0x03, 0x6f, 0xc1, 0x25, 0x37, 0x33, 0xf1, 0xae, 0x23, 0xf3, 0xfe, 0xc8,
-	0xe9, 0x74, 0x17, 0x72, 0x4a, 0x14, 0x67, 0x63, 0x4a, 0x7a, 0x4d, 0xf4, 0x31, 0x94, 0xfd, 0xb9,
-	0x34, 0x49, 0x55, 0xc8, 0x71, 0xf9, 0x9b, 0x89, 0xe3, 0xe2, 0xae, 0x85, 0x33, 0x66, 0xa9, 0x74,
-	0xee, 0x6d, 0x9a, 0xe2, 0xaf, 0xe2, 0x4e, 0xa4, 0xf6, 0x25, 0xc6, 0xe8, 0x3d, 0x48, 0xf3, 0x93,
-	0x2d, 0xcc, 0x7b, 0xb2, 0xb9, 0x40, 0xf0, 0x34, 0xc7, 0x5f, 0xec, 0x34, 0x27, 0x42, 0xb7, 0x2f,
-	0x19, 0xbe, 0x54, 0x29, 0xef, 0x52, 0xbd, 0x01, 0x29, 0x76, 0x23, 0x60, 0x01, 0xe5, 0xca, 0xe4,
-	0xb9, 0xa0, 0x53, 0x95, 0x18, 0x17, 0xaa, 0x43, 0x96, 0x65, 0xdd, 0x6a, 0x97, 0x3b, 0x80, 0xab,
-	0x11, 0x12, 0x3b, 0xdb, 0x5b, 0xf9, 0xe7, 0xcf, 0xd6, 0x32, 0xbc, 0x21, 0x65, 0xa8, 0xdc, 0x4e,
-	0x57, 0xfc, 0x45, 0x0e, 0xb2, 0x12, 0x36, 0x75, 0x62, 0xc2, 0x68, 0x0b, 0x72, 0x78, 0xdc, 0xc1,
-	0xba, 0x65, 0x67, 0xf8, 0xe1, 0x37, 0x28, 0xc6, 0xdd, 0xb4, 0x39, 0x5b, 0x31, 0xc9, 0x15, 0x43,
-	0xf7, 0x38, 0xd0, 0x11, 0x8d, 0x59, 0x70, 0x71, 0x2f, 0xd2, 0xf1, 0x8e, 0x8d, 0x74, 0xb0, 0x40,
-	0xbf, 0x1a, 0x29, 0x15, 0x80, 0x3a, 0xee, 0x71, 0xa8, 0x23, 0x39, 0xe3, 0x63, 0x3e, 0xac, 0xa3,
-	0xe1, 0xc3, 0x3a, 0x52, 0x33, 0xa6, 0x19, 0x01, 0x76, 0xbc, 0x63, 0x83, 0x1d, 0xe9, 0x19, 0x23,
-	0x0e, 0xa0, 0x1d, 0x7f, 0x3f, 0x81, 0x76, 0xac, 0x47, 0x8a, 0x86, 0xc0, 0x1d, 0xfb, 0x13, 0x70,
-	0x47, 0x96, 0x2a, 0x79, 0x25, 0x52, 0xc9, 0x0c, 0xbc, 0x63, 0x7f, 0x02, 0xef, 0xc8, 0xcd, 0x50,
-	0x38, 0x03, 0xf0, 0xf8, 0x97, 0x70, 0xc0, 0x03, 0x22, 0x21, 0x09, 0x3e, 0xcc, 0xf9, 0x10, 0x0f,
-	0x39, 0x02, 0xf1, 0xc8, 0x47, 0xde, 0xce, 0x99, 0xfa, 0xb9, 0x21, 0x8f, 0xa3, 0x10, 0xc8, 0x83,
-	0x25, 0x2f, 0xb7, 0x23, 0x95, 0xcf, 0x81, 0x79, 0x1c, 0x85, 0x60, 0x1e, 0xc5, 0x99, 0x6a, 0x67,
-	0x82, 0x1e, 0x0f, 0xfc, 0xa0, 0x47, 0x29, 0xe2, 0x4e, 0xe9, 0x1e, 0xd9, 0x08, 0xd4, 0xe3, 0x24,
-	0x0a, 0xf5, 0x60, 0x68, 0xcf, 0xeb, 0x91, 0x1a, 0x17, 0x80, 0x3d, 0xf6, 0x27, 0x60, 0x8f, 0xca,
-	0x0c, 0x4b, 0x9b, 0x13, 0xf7, 0x10, 0x5f, 0x25, 0xb1, 0x34, 0xe0, 0x94, 0x88, 0x83, 0xc5, 0x86,
-	0xa1, 0x19, 0x1c, 0xa9, 0x60, 0x0d, 0xf1, 0x36, 0xb9, 0xb7, 0xba, 0x0e, 0x68, 0x0a, 0x16, 0x52,
-	0x86, 0xa2, 0xcf, 0xe9, 0x88, 0xff, 0x23, 0xb8, 0xb2, 0x14, 0x0d, 0xf1, 0xde, 0x79, 0x73, 0xfc,
-	0xce, 0x1b, 0xb8, 0xa7, 0xe5, 0x7c, 0x19, 0x81, 0x37, 0xe7, 0xe0, 0xe0, 0x87, 0xe2, 0xe6, 0x1a,
-	0x77, 0x60, 0x89, 0x66, 0xa7, 0xcc, 0xa3, 0xfb, 0x82, 0x46, 0x99, 0x74, 0xb0, 0x55, 0x60, 0xd1,
-	0xe3, 0x0d, 0x58, 0xf6, 0xf0, 0x3a, 0x17, 0x4d, 0x86, 0x00, 0x54, 0x1c, 0xee, 0x3a, 0xbf, 0x71,
-	0xfe, 0x2e, 0xee, 0xae, 0x90, 0x8b, 0x9a, 0x84, 0x01, 0x1c, 0xc2, 0x4f, 0x06, 0x38, 0xa2, 0x2f,
-	0xbc, 0xe8, 0x13, 0x58, 0xf1, 0x61, 0x1f, 0x76, 0xf2, 0x97, 0x58, 0x0c, 0x02, 0x89, 0x79, 0x72,
-	0x11, 0xa7, 0x07, 0x7d, 0x0a, 0xd7, 0x68, 0x1a, 0x1b, 0x91, 0x60, 0x26, 0xe7, 0x4b, 0x30, 0xaf,
-	0x10, 0x1d, 0x8d, 0x90, 0x24, 0x33, 0x02, 0x18, 0x49, 0x45, 0x01, 0x23, 0x7f, 0x14, 0x5c, 0xbb,
-	0x71, 0xa0, 0x91, 0x8e, 0xd6, 0x65, 0xf6, 0x55, 0x94, 0xe8, 0x6f, 0x72, 0x49, 0xe9, 0x6b, 0x67,
-	0xdc, 0x44, 0xc8, 0x4f, 0xc2, 0xe5, 0x80, 0xf6, 0x39, 0x1e, 0xa8, 0x56, 0x20, 0xa5, 0x0e, 0xbb,
-	0x78, 0xcc, 0xad, 0x80, 0x35, 0x88, 0xec, 0x13, 0x7c, 0xc1, 0xf7, 0x9a, 0xfc, 0x24, 0x7c, 0xf4,
-	0x20, 0xd0, 0x58, 0x54, 0x90, 0x58, 0x03, 0xbd, 0x0b, 0x39, 0x5a, 0x79, 0x91, 0x35, 0xdd, 0xe4,
-	0xa1, 0xc6, 0x97, 0x11, 0xb1, 0x2a, 0xc9, 0xc6, 0x01, 0xe1, 0xd9, 0xd7, 0x4d, 0x29, 0xab, 0xf3,
-	0x5f, 0x9e, 0x9c, 0x25, 0xeb, 0xcb, 0x59, 0xae, 0x43, 0x8e, 0x8c, 0xde, 0xd4, 0x95, 0x0e, 0xa6,
-	0x61, 0x22, 0x27, 0xb9, 0x04, 0xf1, 0xff, 0x04, 0x28, 0x07, 0x22, 0x57, 0xe8, 0xdc, 0xed, 0x63,
-	0x13, 0xf7, 0x43, 0x45, 0x13, 0xb3, 0xbf, 0x01, 0x70, 0xa6, 0x98, 0xf2, 0x53, 0x65, 0x68, 0xe1,
-	0x2e, 0x5f, 0x82, 0xdc, 0x99, 0x62, 0x7e, 0x44, 0x09, 0xfe, 0xc1, 0xa4, 0x02, 0x83, 0xf1, 0x80,
-	0x15, 0x69, 0x2f, 0x58, 0x81, 0x6a, 0x90, 0xd5, 0x0d, 0x55, 0x33, 0x54, 0xeb, 0x82, 0xae, 0x49,
-	0x42, 0x72, 0xda, 0xe2, 0x01, 0x5c, 0x0a, 0x0d, 0x9a, 0xe8, 0x3e, 0xe4, 0xdc, 0x78, 0x2b, 0xd0,
-	0xdc, 0x70, 0x0a, 0x06, 0xe4, 0xf2, 0x92, 0x25, 0xb9, 0x14, 0x1a, 0x36, 0x51, 0x13, 0xd2, 0x06,
-	0x36, 0x47, 0x7d, 0x96, 0xab, 0x96, 0xee, 0xbe, 0x31, 0x5f, 0xb8, 0x25, 0xd4, 0x51, 0xdf, 0x92,
-	0xb8, 0xb0, 0xf8, 0x19, 0xa4, 0x19, 0x05, 0xe5, 0x21, 0x73, 0xb4, 0xf7, 0x68, 0x6f, 0xff, 0xa3,
-	0xbd, 0x4a, 0x0c, 0x01, 0xa4, 0xeb, 0x8d, 0x46, 0xf3, 0xa0, 0x5d, 0x11, 0x50, 0x0e, 0x52, 0xf5,
-	0xad, 0x7d, 0xa9, 0x5d, 0x89, 0x13, 0xb2, 0xd4, 0x7c, 0xd8, 0x6c, 0xb4, 0x2b, 0x09, 0xb4, 0x04,
-	0x45, 0xf6, 0x5b, 0x7e, 0xb0, 0x2f, 0x3d, 0xae, 0xb7, 0x2b, 0x49, 0x0f, 0xe9, 0xb0, 0xb9, 0xb7,
-	0xdd, 0x94, 0x2a, 0x29, 0xf1, 0x2d, 0xb8, 0x1a, 0x19, 0xa0, 0x5d, 0x98, 0x48, 0xf0, 0xc0, 0x44,
-	0xe2, 0xf7, 0x71, 0x72, 0x03, 0x89, 0x8a, 0xba, 0xe8, 0x61, 0x60, 0xe2, 0x77, 0x17, 0x08, 0xd9,
-	0x81, 0xd9, 0xa3, 0x97, 0xa1, 0x64, 0xe0, 0x53, 0x6c, 0x75, 0x7a, 0x2c, 0x0b, 0xb0, 0x71, 0xa4,
-	0x22, 0xa7, 0x52, 0x21, 0x93, 0xb1, 0x7d, 0x8e, 0x3b, 0x96, 0xcc, 0x8c, 0xc0, 0xa4, 0xb7, 0xf5,
-	0x1c, 0x61, 0x23, 0xd4, 0x43, 0x46, 0x24, 0x0e, 0x9a, 0x39, 0x12, 0xa6, 0x2a, 0x49, 0x55, 0x01,
-	0xf5, 0x0b, 0x94, 0x22, 0x3e, 0x5d, 0x68, 0xb1, 0x73, 0x90, 0x92, 0x9a, 0x6d, 0xe9, 0xe3, 0x4a,
-	0x02, 0x21, 0x28, 0xd1, 0x9f, 0xf2, 0xe1, 0x5e, 0xfd, 0xe0, 0xb0, 0xb5, 0x4f, 0x16, 0x7b, 0x19,
-	0xca, 0xf6, 0x62, 0xdb, 0xc4, 0x14, 0xba, 0x04, 0x4b, 0x8d, 0xfd, 0xc7, 0x07, 0xbb, 0xcd, 0x76,
-	0xd3, 0x25, 0xa7, 0xc5, 0xff, 0x4d, 0xc0, 0x95, 0x88, 0x5c, 0x03, 0xbd, 0x0b, 0x60, 0x8d, 0x65,
-	0x03, 0x77, 0x34, 0xa3, 0x1b, 0x6d, 0x9c, 0xed, 0xb1, 0x44, 0x39, 0xa4, 0x9c, 0xc5, 0x7f, 0x4d,
-	0x75, 0xd8, 0x1f, 0x70, 0xa5, 0x64, 0xb2, 0x26, 0xc7, 0x36, 0x6e, 0x84, 0x5c, 0xd6, 0x70, 0x87,
-	0x28, 0xa6, 0x7b, 0x42, 0x15, 0x53, 0x7e, 0xf4, 0x31, 0x5c, 0x09, 0xc4, 0x15, 0xee, 0x8c, 0xcd,
-	0xb0, 0xc2, 0x62, 0x78, 0x78, 0xb9, 0xe4, 0x0f, 0x2f, 0xcc, 0x19, 0x9b, 0x53, 0x80, 0x84, 0xd4,
-	0x0b, 0x00, 0x09, 0x51, 0xf1, 0x29, 0xbd, 0x28, 0x44, 0x1f, 0x12, 0x9f, 0xc4, 0xff, 0xf6, 0x6d,
-	0x9e, 0x3f, 0x7d, 0xdb, 0x87, 0xb4, 0x69, 0x29, 0xd6, 0xc8, 0xe4, 0x87, 0xe1, 0xfe, 0xbc, 0xb9,
-	0xe0, 0x86, 0xfd, 0xe3, 0x90, 0x8a, 0x4b, 0x5c, 0xcd, 0x5f, 0xe5, 0x9e, 0x46, 0xad, 0x7e, 0xea,
-	0xe7, 0x58, 0xfd, 0xb7, 0xa1, 0xe4, 0x5f, 0xaa, 0xe8, 0xb3, 0xeb, 0x7a, 0xc7, 0xb8, 0xd8, 0x87,
-	0xe5, 0x10, 0x28, 0x02, 0xdd, 0xe7, 0xd5, 0x06, 0xb6, 0x5b, 0x37, 0x27, 0xa7, 0xec, 0x63, 0x77,
-	0x8b, 0x0e, 0x24, 0x58, 0xb9, 0x39, 0x35, 0xdb, 0x18, 0x97, 0x20, 0x76, 0x00, 0x4d, 0x66, 0xe8,
-	0x61, 0xb0, 0x89, 0xf0, 0x02, 0xb0, 0xc9, 0x7f, 0x0a, 0x70, 0x6d, 0x4a, 0xd6, 0x8e, 0x3e, 0x0c,
-	0xd8, 0xe2, 0x7b, 0x8b, 0xe4, 0xfc, 0x1b, 0x8c, 0xe6, 0xb7, 0x46, 0xf1, 0x1e, 0x14, 0xbc, 0xf4,
-	0xf9, 0x96, 0xfe, 0xdf, 0x3d, 0x31, 0xd3, 0x8f, 0xef, 0xb4, 0x20, 0x8d, 0xcf, 0xf1, 0xd0, 0x89,
-	0xc1, 0x97, 0x27, 0xd7, 0x81, 0x74, 0x6f, 0x55, 0x49, 0xae, 0xf8, 0xfb, 0x67, 0x6b, 0x15, 0xc6,
-	0xfd, 0xba, 0x36, 0x50, 0x2d, 0x3c, 0xd0, 0xad, 0x0b, 0x89, 0xcb, 0xa3, 0x9b, 0x50, 0x34, 0xb0,
-	0x45, 0x5c, 0x88, 0x0f, 0x5a, 0x2b, 0x30, 0x22, 0xcf, 0xe4, 0x7e, 0x29, 0x00, 0xb8, 0x80, 0x91,
-	0x0b, 0xd8, 0x08, 0x5e, 0xc0, 0x26, 0x80, 0xf3, 0xc5, 0x83, 0x38, 0x1f, 0xba, 0x05, 0x65, 0x96,
-	0xa4, 0x9b, 0xea, 0xd9, 0x50, 0xb1, 0x46, 0x06, 0xe6, 0xf0, 0x50, 0x89, 0x92, 0x0f, 0x6d, 0x2a,
-	0xfa, 0x04, 0xae, 0x5a, 0x3d, 0x03, 0x9b, 0x3d, 0xad, 0xdf, 0x95, 0x83, 0x1b, 0xcf, 0xca, 0x16,
-	0x6b, 0x33, 0x0c, 0x4e, 0xba, 0xe2, 0x68, 0x38, 0xf6, 0x6f, 0xfe, 0x97, 0x90, 0xa2, 0x6b, 0x43,
-	0x12, 0x2d, 0xc7, 0x82, 0x73, 0xdc, 0x38, 0x3f, 0x05, 0x50, 0x2c, 0xcb, 0x50, 0x4f, 0x46, 0xe4,
-	0x38, 0xc7, 0x27, 0x3f, 0xe5, 0xae, 0x6d, 0xdd, 0xe6, 0xdb, 0xba, 0xce, 0x17, 0x79, 0xc5, 0x15,
-	0xf5, 0x2c, 0xb4, 0x47, 0xa1, 0xb8, 0x07, 0x25, 0xbf, 0xac, 0x9d, 0xc1, 0xb2, 0x31, 0xf8, 0x33,
-	0x58, 0x96, 0x11, 0xf3, 0x0c, 0xd6, 0xc9, 0x7f, 0x13, 0xac, 0x28, 0x48, 0x1b, 0xe2, 0x9f, 0x04,
-	0x28, 0x78, 0xdd, 0xd4, 0xdc, 0x49, 0x26, 0x4f, 0xba, 0x13, 0x93, 0x49, 0x77, 0x32, 0x32, 0xed,
-	0x4c, 0x05, 0xd3, 0xce, 0xab, 0x90, 0x25, 0xdd, 0x23, 0x13, 0x77, 0x79, 0x25, 0x35, 0x73, 0xa6,
-	0x98, 0x47, 0x26, 0xee, 0x7a, 0xec, 0x33, 0xf3, 0x82, 0xf6, 0xe9, 0xcb, 0x6d, 0xb3, 0xc1, 0x44,
-	0xfb, 0x2b, 0x01, 0xb2, 0xce, 0xe4, 0xfd, 0x05, 0x43, 0x1f, 0xbe, 0xc8, 0xd6, 0x8e, 0x95, 0x0b,
-	0xf9, 0xdd, 0x81, 0x95, 0x4f, 0x13, 0x4e, 0xf9, 0xf4, 0x7d, 0x27, 0x1b, 0x8b, 0x42, 0xd0, 0xbc,
-	0x2b, 0x6d, 0x83, 0xa6, 0x3c, 0xf9, 0xfc, 0x0f, 0x3e, 0x0e, 0x92, 0x4e, 0xa0, 0xbf, 0x83, 0xb4,
-	0xd2, 0x71, 0x70, 0xc3, 0x52, 0x08, 0xa0, 0x66, 0xb3, 0x6e, 0xb4, 0xc7, 0x75, 0xca, 0x29, 0x71,
-	0x09, 0x3e, 0xaa, 0xb8, 0x3d, 0x2a, 0xf1, 0x1f, 0x89, 0x5e, 0xc6, 0xe3, 0xf7, 0x19, 0x25, 0x80,
-	0xa3, 0xbd, 0xc7, 0xfb, 0xdb, 0x3b, 0x0f, 0x76, 0x9a, 0xdb, 0x3c, 0xdd, 0xda, 0xde, 0x6e, 0x6e,
-	0x57, 0xe2, 0x84, 0x4f, 0x6a, 0x3e, 0xde, 0x3f, 0x6e, 0x6e, 0x57, 0x12, 0x62, 0x1d, 0x72, 0x4e,
-	0x94, 0xa0, 0xa5, 0x65, 0xed, 0x29, 0x36, 0xf8, 0x02, 0xb1, 0x06, 0x5a, 0x85, 0xfc, 0x24, 0xd6,
-	0x4d, 0x2e, 0x4c, 0x0c, 0xe2, 0x16, 0xff, 0x4b, 0x80, 0xb2, 0xa3, 0x83, 0xe7, 0x09, 0xef, 0x43,
-	0x46, 0x1f, 0x9d, 0xc8, 0xb6, 0xed, 0x06, 0x10, 0x62, 0xfb, 0x3e, 0x35, 0x3a, 0xe9, 0xab, 0x9d,
-	0x47, 0xf8, 0x82, 0x47, 0xa5, 0xb4, 0x3e, 0x3a, 0x79, 0xc4, 0x4c, 0x9c, 0x0d, 0x23, 0x3e, 0x65,
-	0x18, 0x89, 0xc0, 0x30, 0xd0, 0x2d, 0x28, 0x0c, 0xb5, 0x2e, 0x96, 0x95, 0x6e, 0xd7, 0xc0, 0x26,
-	0x0b, 0xb6, 0x39, 0xae, 0x39, 0x4f, 0x7a, 0xea, 0xac, 0x43, 0xfc, 0x41, 0x00, 0x34, 0x19, 0x19,
-	0xd1, 0x21, 0x2c, 0xb9, 0xc1, 0xd5, 0x8e, 0xd8, 0xcc, 0x7d, 0xae, 0x47, 0x47, 0x56, 0xdf, 0xa5,
-	0xbb, 0x72, 0xee, 0x27, 0x93, 0x2c, 0x6c, 0xc5, 0x75, 0x55, 0x3a, 0x9d, 0x2f, 0x5d, 0x94, 0xf8,
-	0x9c, 0x8b, 0x12, 0x93, 0x90, 0x23, 0xef, 0xf4, 0x04, 0x5d, 0x69, 0x62, 0xa2, 0x64, 0xa2, 0x43,
-	0xb5, 0x3d, 0x21, 0xc6, 0xe7, 0x19, 0x35, 0x24, 0xe1, 0x45, 0x86, 0x24, 0xde, 0x83, 0xca, 0x87,
-	0xce, 0xf7, 0xf9, 0x97, 0x02, 0xc3, 0x14, 0x26, 0x86, 0x79, 0x0e, 0x59, 0xe2, 0x7d, 0x69, 0xd0,
-	0xf8, 0x07, 0xc8, 0x39, 0xab, 0xe7, 0xbc, 0x4e, 0x89, 0x5c, 0x76, 0x3e, 0x12, 0x57, 0x04, 0xdd,
-	0x81, 0x25, 0x12, 0x37, 0xec, 0xc2, 0x25, 0x83, 0xcd, 0xe2, 0xd4, 0x1b, 0x96, 0x59, 0xc7, 0xae,
-	0x8d, 0xf5, 0x90, 0x00, 0x5f, 0x61, 0x89, 0x00, 0xee, 0xfe, 0x25, 0x06, 0x40, 0xee, 0x59, 0x01,
-	0xf4, 0x90, 0xed, 0x61, 0xd1, 0x97, 0x89, 0x88, 0xff, 0x1a, 0x87, 0xbc, 0xa7, 0x90, 0x82, 0xfe,
-	0xd6, 0x97, 0x54, 0xad, 0x4f, 0x2b, 0xba, 0x78, 0x32, 0x2a, 0xdf, 0xc4, 0xe2, 0x8b, 0x4f, 0x2c,
-	0xaa, 0x84, 0x65, 0xd7, 0x53, 0x93, 0x0b, 0xd7, 0x53, 0x5f, 0x07, 0x64, 0x69, 0x96, 0xd2, 0x27,
-	0xc1, 0x5b, 0x1d, 0x9e, 0xc9, 0xec, 0xb4, 0xb3, 0x00, 0x52, 0xa1, 0x3d, 0xc7, 0xb4, 0xe3, 0x80,
-	0xd0, 0xc5, 0x3e, 0x64, 0x1d, 0x30, 0x60, 0xf1, 0x47, 0x1f, 0x61, 0x75, 0xe3, 0x1a, 0x64, 0x07,
-	0xd8, 0x52, 0x68, 0xd8, 0x63, 0xe0, 0x90, 0xd3, 0xbe, 0xf3, 0x1e, 0xe4, 0x3d, 0x2f, 0x61, 0x48,
-	0x24, 0xdc, 0x6b, 0x7e, 0x54, 0x89, 0xd5, 0x32, 0x5f, 0x7f, 0xbb, 0x9e, 0xd8, 0xc3, 0x4f, 0xc9,
-	0xa7, 0xa4, 0x66, 0xa3, 0xd5, 0x6c, 0x3c, 0xaa, 0x08, 0xb5, 0xfc, 0xd7, 0xdf, 0xae, 0x67, 0x24,
-	0x4c, 0x6b, 0x0e, 0x77, 0x1e, 0x41, 0x39, 0xb0, 0x03, 0x7e, 0x9f, 0x8c, 0xa0, 0xb4, 0x7d, 0x74,
-	0xb0, 0xbb, 0xd3, 0xa8, 0xb7, 0x9b, 0xf2, 0xf1, 0x7e, 0xbb, 0x59, 0x11, 0xd0, 0x15, 0x58, 0xde,
-	0xdd, 0xf9, 0xa7, 0x56, 0x5b, 0x6e, 0xec, 0xee, 0x34, 0xf7, 0xda, 0x72, 0xbd, 0xdd, 0xae, 0x37,
-	0x1e, 0x55, 0xe2, 0x77, 0x7f, 0x03, 0x50, 0xae, 0x6f, 0x35, 0x76, 0xc8, 0xdd, 0x5e, 0xed, 0x28,
-	0xd4, 0xc3, 0x37, 0x20, 0x49, 0xa1, 0xd8, 0xa9, 0x6f, 0x62, 0x6b, 0xd3, 0x0b, 0x49, 0xe8, 0x01,
-	0xa4, 0x28, 0x4a, 0x8b, 0xa6, 0x3f, 0x92, 0xad, 0xcd, 0xa8, 0x2c, 0x91, 0xc1, 0xd0, 0x73, 0x33,
-	0xf5, 0xd5, 0x6c, 0x6d, 0x7a, 0xa1, 0x09, 0xed, 0x42, 0xc6, 0x06, 0xc0, 0x66, 0x3d, 0x65, 0xad,
-	0xcd, 0xac, 0xfe, 0x90, 0xa9, 0x31, 0x20, 0x71, 0xfa, 0x83, 0xda, 0xda, 0x8c, 0x12, 0x14, 0x92,
-	0x20, 0xe7, 0x62, 0xbf, 0xb3, 0xdf, 0xf6, 0xd6, 0xe6, 0x28, 0x89, 0xa1, 0xcf, 0xa0, 0xe8, 0x87,
-	0xca, 0xe6, 0x7b, 0x76, 0x5b, 0x9b, 0xb3, 0x5c, 0x45, 0xf4, 0xfb, 0x71, 0xb3, 0xf9, 0x9e, 0xe1,
-	0xd6, 0xe6, 0xac, 0x5e, 0xa1, 0xcf, 0x61, 0x69, 0x12, 0xd7, 0x9a, 0xff, 0x55, 0x6e, 0x6d, 0x81,
-	0x7a, 0x16, 0x1a, 0x00, 0x0a, 0xc1, 0xc3, 0x16, 0x78, 0xa4, 0x5b, 0x5b, 0xa4, 0xbc, 0x85, 0xba,
-	0x50, 0x0e, 0x62, 0x45, 0xf3, 0x3e, 0xda, 0xad, 0xcd, 0x5d, 0xea, 0x62, 0x5f, 0xf1, 0x83, 0x1a,
-	0xf3, 0x3e, 0xe2, 0xad, 0xcd, 0x5d, 0xf9, 0x42, 0x47, 0x00, 0x9e, 0x8b, 0xf1, 0x1c, 0x8f, 0x7a,
-	0x6b, 0xf3, 0xd4, 0xc0, 0x90, 0x0e, 0xcb, 0x61, 0x37, 0xe1, 0x45, 0xde, 0xf8, 0xd6, 0x16, 0x2a,
-	0x8d, 0x11, 0x7b, 0xf6, 0xdf, 0x69, 0xe7, 0x7b, 0xf3, 0x5b, 0x9b, 0xb3, 0x46, 0xb6, 0xd5, 0xfc,
-	0xee, 0xf9, 0xaa, 0xf0, 0xfd, 0xf3, 0x55, 0xe1, 0x87, 0xe7, 0xab, 0xc2, 0x37, 0x3f, 0xae, 0xc6,
-	0xbe, 0xff, 0x71, 0x35, 0xf6, 0xeb, 0x1f, 0x57, 0x63, 0xff, 0xfc, 0xda, 0x99, 0x6a, 0xf5, 0x46,
-	0x27, 0x1b, 0x1d, 0x6d, 0xb0, 0xe9, 0xfd, 0x33, 0x44, 0xd8, 0x7f, 0x3b, 0x4e, 0xd2, 0x34, 0xdc,
-	0xdd, 0xfb, 0x73, 0x00, 0x00, 0x00, 0xff, 0xff, 0x25, 0x24, 0x2d, 0xe9, 0xfb, 0x31, 0x00, 0x00,
+	// 3618 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5b, 0x3d, 0x70, 0x1b, 0xd7,
+	0xf1, 0xc7, 0xe1, 0x1b, 0x8b, 0x4f, 0x3e, 0x52, 0x12, 0x04, 0x49, 0x24, 0x7d, 0xfa, 0xdb, 0x92,
+	0xf5, 0xb7, 0x49, 0x5b, 0x8a, 0x2d, 0x3b, 0x76, 0x92, 0x01, 0x41, 0x28, 0xa0, 0x44, 0x91, 0xf4,
+	0x11, 0xa4, 0xc7, 0x71, 0xec, 0x9b, 0x23, 0xf0, 0x08, 0x9c, 0x05, 0xe0, 0xce, 0x77, 0x07, 0x0a,
+	0x74, 0x9b, 0x38, 0x85, 0x2b, 0x77, 0xa9, 0x5c, 0xa6, 0x4c, 0x93, 0x2a, 0x93, 0x22, 0x99, 0x74,
+	0xce, 0xa4, 0x71, 0x99, 0x26, 0x8a, 0x47, 0x6e, 0x32, 0xe9, 0x52, 0xa5, 0xcb, 0x64, 0xde, 0xc7,
+	0x7d, 0x02, 0x87, 0x0f, 0xcb, 0x33, 0x99, 0x74, 0x78, 0xfb, 0x76, 0xf7, 0xde, 0xc7, 0xbe, 0xdd,
+	0x7d, 0xbf, 0x7d, 0x80, 0x2b, 0x16, 0x1e, 0xb4, 0xb1, 0xd1, 0x57, 0x07, 0xd6, 0xa6, 0x72, 0xd2,
+	0x52, 0x37, 0xad, 0x73, 0x1d, 0x9b, 0x1b, 0xba, 0xa1, 0x59, 0x1a, 0x2a, 0xba, 0x9d, 0x1b, 0xa4,
+	0xb3, 0x72, 0xcd, 0xc3, 0xdd, 0x32, 0xce, 0x75, 0x4b, 0xdb, 0xd4, 0x0d, 0x4d, 0x3b, 0x65, 0xfc,
+	0x15, 0xaf, 0x32, 0xaa, 0x67, 0xb3, 0xad, 0x98, 0x5d, 0xde, 0x79, 0x75, 0xac, 0xf3, 0xa4, 0xa7,
+	0xb5, 0x1e, 0x85, 0xf6, 0x7a, 0x06, 0xe2, 0xeb, 0xe5, 0xdf, 0x7d, 0x84, 0xcf, 0xed, 0xde, 0x6b,
+	0x63, 0xb2, 0xba, 0x62, 0x28, 0x7d, 0xbb, 0x7b, 0xd5, 0xd3, 0x7d, 0x86, 0x0d, 0x53, 0xd5, 0x06,
+	0x3e, 0xe5, 0x6b, 0x1d, 0x4d, 0xeb, 0xf4, 0xf0, 0x26, 0x6d, 0x9d, 0x0c, 0x4f, 0x37, 0x2d, 0xb5,
+	0x8f, 0x4d, 0x4b, 0xe9, 0xeb, 0x9c, 0x61, 0xa5, 0xa3, 0x75, 0x34, 0xfa, 0x73, 0x93, 0xfc, 0x62,
+	0x54, 0xf1, 0xd3, 0x0c, 0xa4, 0x24, 0xfc, 0xf1, 0x10, 0x9b, 0x16, 0xba, 0x0d, 0x71, 0xdc, 0xea,
+	0x6a, 0x65, 0x61, 0x5d, 0xb8, 0x99, 0xbd, 0x7d, 0x75, 0x23, 0xb0, 0x6e, 0x1b, 0x9c, 0xaf, 0xde,
+	0xea, 0x6a, 0x8d, 0x88, 0x44, 0x79, 0xd1, 0x6b, 0x90, 0x38, 0xed, 0x0d, 0xcd, 0x6e, 0x39, 0x4a,
+	0x85, 0xae, 0x85, 0x09, 0xdd, 0x23, 0x4c, 0x8d, 0x88, 0xc4, 0xb8, 0xc9, 0xa7, 0xd4, 0xc1, 0xa9,
+	0x56, 0x8e, 0x4d, 0xff, 0xd4, 0xce, 0xe0, 0x94, 0x7e, 0x8a, 0xf0, 0xa2, 0x2d, 0x00, 0x75, 0xa0,
+	0x5a, 0x72, 0xab, 0xab, 0xa8, 0x83, 0x72, 0x9c, 0x4a, 0x3e, 0x17, 0x2e, 0xa9, 0x5a, 0x35, 0xc2,
+	0xd8, 0x88, 0x48, 0x19, 0xd5, 0x6e, 0x90, 0xe1, 0x7e, 0x3c, 0xc4, 0xc6, 0x79, 0x39, 0x31, 0x7d,
+	0xb8, 0xef, 0x10, 0x26, 0x32, 0x5c, 0xca, 0x8d, 0xde, 0x86, 0x74, 0xab, 0x8b, 0x5b, 0x8f, 0x64,
+	0x6b, 0x54, 0x4e, 0x51, 0xc9, 0xb5, 0x30, 0xc9, 0x1a, 0xe1, 0x6b, 0x8e, 0x1a, 0x11, 0x29, 0xd5,
+	0x62, 0x3f, 0xd1, 0x1e, 0x14, 0x7a, 0xaa, 0x69, 0xc9, 0xe6, 0x40, 0xd1, 0xcd, 0xae, 0x66, 0x99,
+	0xe5, 0x2c, 0xd5, 0xf1, 0x7c, 0x98, 0x8e, 0x5d, 0xd5, 0xb4, 0x0e, 0x6d, 0xe6, 0x46, 0x44, 0xca,
+	0xf7, 0xbc, 0x04, 0xa2, 0x4f, 0x3b, 0x3d, 0xc5, 0x86, 0xa3, 0xb0, 0x9c, 0x9b, 0xae, 0x6f, 0x9f,
+	0x70, 0xdb, 0xf2, 0x44, 0x9f, 0xe6, 0x25, 0xa0, 0xf7, 0x61, 0xb9, 0xa7, 0x29, 0x6d, 0x47, 0x9d,
+	0xdc, 0xea, 0x0e, 0x07, 0x8f, 0xca, 0x79, 0xaa, 0xf4, 0xc5, 0xd0, 0x41, 0x6a, 0x4a, 0xdb, 0x56,
+	0x51, 0x23, 0x02, 0x8d, 0x88, 0xb4, 0xd4, 0x0b, 0x12, 0xd1, 0x87, 0xb0, 0xa2, 0xe8, 0x7a, 0xef,
+	0x3c, 0xa8, 0xbd, 0x40, 0xb5, 0xdf, 0x0a, 0xd3, 0x5e, 0x25, 0x32, 0x41, 0xf5, 0x48, 0x19, 0xa3,
+	0xa2, 0x26, 0x94, 0x74, 0x03, 0xeb, 0x8a, 0x81, 0x65, 0xdd, 0xd0, 0x74, 0xcd, 0x54, 0x7a, 0xe5,
+	0x22, 0xd5, 0x7d, 0x23, 0x4c, 0xf7, 0x01, 0xe3, 0x3f, 0xe0, 0xec, 0x8d, 0x88, 0x54, 0xd4, 0xfd,
+	0x24, 0xa6, 0x55, 0x6b, 0x61, 0xd3, 0x74, 0xb5, 0x96, 0x66, 0x69, 0xa5, 0xfc, 0x7e, 0xad, 0x3e,
+	0x12, 0xaa, 0x43, 0x16, 0x8f, 0x88, 0xb8, 0x7c, 0xa6, 0x59, 0xb8, 0xbc, 0x44, 0x15, 0x8a, 0xa1,
+	0xe7, 0x8c, 0xb2, 0x1e, 0x6b, 0x16, 0x6e, 0x44, 0x24, 0xc0, 0x4e, 0x0b, 0x29, 0x70, 0xe1, 0x0c,
+	0x1b, 0xea, 0xe9, 0x39, 0x55, 0x23, 0xd3, 0x1e, 0xe2, 0x0f, 0xca, 0x88, 0x2a, 0xfc, 0xff, 0x30,
+	0x85, 0xc7, 0x54, 0x88, 0xa8, 0xa8, 0xdb, 0x22, 0x8d, 0x88, 0xb4, 0x7c, 0x36, 0x4e, 0x26, 0x26,
+	0x76, 0xaa, 0x0e, 0x94, 0x9e, 0xfa, 0x09, 0x96, 0xa9, 0x83, 0x2b, 0x2f, 0x4f, 0x37, 0xb1, 0x7b,
+	0x9c, 0x7b, 0x8b, 0x30, 0x13, 0x13, 0x3b, 0xf5, 0x12, 0xb6, 0x52, 0x90, 0x38, 0x53, 0x7a, 0x43,
+	0x7c, 0x3f, 0x9e, 0x4e, 0x96, 0x52, 0xf7, 0xe3, 0xe9, 0x74, 0x29, 0x73, 0x3f, 0x9e, 0xce, 0x94,
+	0xe0, 0x7e, 0x3c, 0x0d, 0xa5, 0xac, 0x78, 0x03, 0xb2, 0x1e, 0xf7, 0x82, 0xca, 0x90, 0xea, 0x63,
+	0xd3, 0x54, 0x3a, 0x98, 0x7a, 0xa3, 0x8c, 0x64, 0x37, 0xc5, 0x02, 0xe4, 0xbc, 0x2e, 0x45, 0xfc,
+	0x5c, 0x70, 0x24, 0x89, 0xb7, 0x20, 0x92, 0xdc, 0x3d, 0xda, 0x92, 0xbc, 0x89, 0xae, 0x43, 0x9e,
+	0x4e, 0x45, 0xb6, 0xfb, 0x89, 0xcb, 0x8a, 0x4b, 0x39, 0x4a, 0x3c, 0xe6, 0x4c, 0x6b, 0x90, 0xd5,
+	0x6f, 0xeb, 0x0e, 0x4b, 0x8c, 0xb2, 0x80, 0x7e, 0x5b, 0xb7, 0x19, 0x9e, 0x83, 0x1c, 0x99, 0xb7,
+	0xc3, 0x11, 0xa7, 0x1f, 0xc9, 0x12, 0x1a, 0x67, 0x11, 0x7f, 0x1e, 0x83, 0x52, 0xd0, 0x0d, 0xa1,
+	0x37, 0x20, 0x4e, 0x3c, 0x32, 0x77, 0xae, 0x95, 0x0d, 0xe6, 0xae, 0x37, 0x6c, 0x77, 0xbd, 0xd1,
+	0xb4, 0xdd, 0xf5, 0x56, 0xfa, 0xcb, 0x27, 0x6b, 0x91, 0xcf, 0xff, 0xb6, 0x26, 0x48, 0x54, 0x02,
+	0x5d, 0x26, 0xce, 0x47, 0x51, 0x07, 0xb2, 0xda, 0xa6, 0x43, 0xce, 0x10, 0xcf, 0xa2, 0xa8, 0x83,
+	0x9d, 0x36, 0xda, 0x85, 0x52, 0x4b, 0x1b, 0x98, 0x78, 0x60, 0x0e, 0x4d, 0x99, 0x85, 0x0b, 0xee,
+	0x52, 0x7d, 0x8e, 0x91, 0xc5, 0x89, 0x9a, 0xcd, 0x79, 0x40, 0x19, 0xa5, 0x62, 0xcb, 0x4f, 0x40,
+	0x7b, 0x90, 0x3f, 0x53, 0x7a, 0x6a, 0x5b, 0xb1, 0x34, 0x43, 0x36, 0xb1, 0xc5, 0x7d, 0xec, 0xf5,
+	0xb1, 0x3d, 0x3f, 0xb6, 0xb9, 0x0e, 0xb1, 0x75, 0xa4, 0xb7, 0x15, 0x0b, 0x6f, 0xc5, 0xbf, 0x7c,
+	0xb2, 0x26, 0x48, 0xb9, 0x33, 0x4f, 0x0f, 0x7a, 0x01, 0x8a, 0x8a, 0xae, 0xcb, 0xa6, 0xa5, 0x58,
+	0x58, 0x3e, 0x39, 0xb7, 0xb0, 0x49, 0xdd, 0x6e, 0x4e, 0xca, 0x2b, 0xba, 0x7e, 0x48, 0xa8, 0x5b,
+	0x84, 0x88, 0x9e, 0x87, 0x02, 0xf1, 0xd0, 0xaa, 0xd2, 0x93, 0xbb, 0x58, 0xed, 0x74, 0xad, 0x72,
+	0x72, 0x5d, 0xb8, 0x19, 0x93, 0xf2, 0x9c, 0xda, 0xa0, 0x44, 0xb4, 0x01, 0xcb, 0x36, 0x5b, 0x4b,
+	0x33, 0xb0, 0xcd, 0x4b, 0xfc, 0x71, 0x5e, 0x5a, 0xe2, 0x5d, 0x35, 0xcd, 0xc0, 0x8c, 0x5f, 0x6c,
+	0x3b, 0x96, 0x42, 0xbd, 0x39, 0x42, 0x10, 0x6f, 0x2b, 0x96, 0x42, 0x77, 0x20, 0x27, 0xd1, 0xdf,
+	0x84, 0xa6, 0x2b, 0x56, 0x97, 0xaf, 0x2b, 0xfd, 0x8d, 0x2e, 0x42, 0x92, 0xab, 0x8e, 0xd1, 0x61,
+	0xf0, 0x16, 0x5a, 0x81, 0x84, 0x6e, 0x68, 0x67, 0x98, 0x2e, 0x4b, 0x5a, 0x62, 0x0d, 0x51, 0x82,
+	0x82, 0xdf, 0xf3, 0xa3, 0x02, 0x44, 0xad, 0x11, 0xff, 0x4a, 0xd4, 0x1a, 0xa1, 0x57, 0x20, 0x4e,
+	0x36, 0x80, 0x7e, 0xa3, 0x30, 0x21, 0xd6, 0x71, 0xb9, 0xe6, 0xb9, 0x8e, 0x25, 0xca, 0x29, 0x5e,
+	0x84, 0x95, 0x49, 0x91, 0x40, 0xec, 0x3a, 0x74, 0x9f, 0x47, 0x47, 0xaf, 0x41, 0xda, 0x09, 0x05,
+	0xcc, 0xbe, 0x2e, 0x8f, 0x7d, 0xc5, 0x66, 0x96, 0x1c, 0x56, 0x62, 0x58, 0x64, 0x7f, 0xba, 0x0a,
+	0x0f, 0xdf, 0x39, 0x29, 0xa5, 0xe8, 0x7a, 0x43, 0x31, 0xbb, 0x62, 0x07, 0xca, 0x61, 0x6e, 0xde,
+	0xb3, 0x3e, 0x02, 0x3d, 0x1d, 0xf6, 0xfa, 0x78, 0x4e, 0x5e, 0x94, 0xee, 0x89, 0x73, 0xf2, 0xa8,
+	0x05, 0x0f, 0x07, 0x8f, 0x88, 0x05, 0xc7, 0xd8, 0x87, 0x68, 0x7b, 0xa7, 0x2d, 0xb6, 0xe1, 0x72,
+	0xa8, 0xc7, 0xf7, 0xc9, 0x09, 0x3e, 0x39, 0xb2, 0x19, 0x2c, 0x8e, 0xb0, 0x81, 0xb3, 0x06, 0x19,
+	0x9a, 0x49, 0xe7, 0x4d, 0x3f, 0x93, 0x91, 0x78, 0x4b, 0xfc, 0x67, 0x1c, 0x2e, 0x4e, 0x76, 0xfe,
+	0x68, 0x1d, 0x72, 0x7d, 0x65, 0x24, 0x5b, 0x23, 0x6e, 0xa1, 0x02, 0xdd, 0x73, 0xe8, 0x2b, 0xa3,
+	0xe6, 0x88, 0x99, 0x67, 0x09, 0x62, 0xd6, 0xc8, 0x2c, 0x47, 0xd7, 0x63, 0x37, 0x73, 0x12, 0xf9,
+	0x89, 0x1e, 0xc2, 0x52, 0x4f, 0x6b, 0x29, 0x3d, 0xb9, 0xa7, 0x98, 0x96, 0xdc, 0xd2, 0xfa, 0x7d,
+	0xd5, 0xe2, 0xe7, 0xee, 0xca, 0xf8, 0xf6, 0xd2, 0x6e, 0xe2, 0x9b, 0xe8, 0x21, 0x89, 0x48, 0x45,
+	0x2a, 0xbb, 0xab, 0x98, 0x16, 0xeb, 0x42, 0xdb, 0x90, 0xed, 0xab, 0xe6, 0x09, 0xee, 0x2a, 0x67,
+	0xaa, 0x66, 0x94, 0xe3, 0xeb, 0xb1, 0x89, 0x39, 0xd1, 0x43, 0x97, 0x87, 0x6b, 0xf2, 0x8a, 0x79,
+	0xb6, 0x25, 0xe1, 0x33, 0x5b, 0xdb, 0xf1, 0x24, 0x17, 0x76, 0x3c, 0xaf, 0xc0, 0xca, 0x00, 0x8f,
+	0x2c, 0xd9, 0x39, 0xd4, 0x26, 0xb3, 0x95, 0x14, 0x5d, 0x72, 0x44, 0xfa, 0x1c, 0x4f, 0x60, 0x12,
+	0xb3, 0x21, 0xbb, 0x62, 0x68, 0xc3, 0x41, 0xbb, 0x9c, 0x5e, 0x17, 0x6e, 0x26, 0x24, 0xd6, 0x40,
+	0x77, 0xa1, 0x4c, 0x0f, 0x2c, 0xf3, 0x62, 0xc4, 0xdb, 0xe2, 0xb6, 0x7d, 0x7a, 0x33, 0xd4, 0x52,
+	0x2e, 0x90, 0x7e, 0xea, 0x27, 0x77, 0x69, 0x2f, 0x3f, 0xf1, 0x9b, 0xb0, 0xc2, 0xa2, 0x2f, 0x36,
+	0x48, 0x18, 0x26, 0x9b, 0x44, 0x07, 0x00, 0x74, 0x00, 0x4b, 0x76, 0xdf, 0x81, 0xa1, 0x35, 0x47,
+	0xf4, 0xfb, 0xaf, 0x38, 0x02, 0x6d, 0x99, 0x98, 0xb6, 0x6d, 0x8f, 0x59, 0x6a, 0xa8, 0xc8, 0xee,
+	0xab, 0xea, 0x8e, 0x3b, 0xbf, 0xeb, 0x1a, 0x6d, 0x6e, 0x3c, 0x25, 0xe4, 0x5d, 0xae, 0xeb, 0x74,
+	0x6d, 0x7a, 0x0d, 0xb2, 0x1f, 0x0f, 0x35, 0x63, 0xd8, 0x67, 0x43, 0xca, 0xd3, 0x21, 0x01, 0x23,
+	0xd1, 0x23, 0xf4, 0x87, 0x84, 0xc7, 0xe6, 0xfc, 0x79, 0x00, 0xb7, 0x28, 0xc1, 0xb5, 0xa8, 0x43,
+	0xcf, 0xc0, 0xbd, 0x46, 0x15, 0x9d, 0xd7, 0xa8, 0x9c, 0xb9, 0x85, 0xdb, 0x55, 0xec, 0xdb, 0xd9,
+	0x15, 0x82, 0x38, 0x9d, 0x61, 0x9c, 0xb9, 0x4d, 0xf2, 0x3b, 0xd4, 0xd6, 0x9c, 0xfd, 0x4f, 0x7a,
+	0xf7, 0xdf, 0xb6, 0xc0, 0xd4, 0x77, 0x66, 0x81, 0xe9, 0x50, 0x0b, 0xfc, 0xd6, 0xb6, 0xd6, 0x84,
+	0x8b, 0x01, 0x41, 0x79, 0x48, 0x43, 0x1b, 0xb5, 0xb6, 0x40, 0xc2, 0x6f, 0x07, 0x54, 0x8f, 0x22,
+	0x69, 0xd9, 0xa7, 0x97, 0x85, 0xc5, 0x50, 0x0b, 0xce, 0x2e, 0x6a, 0xc1, 0xb9, 0x79, 0x2c, 0x38,
+	0xff, 0x2c, 0x16, 0x5c, 0x18, 0xb3, 0xe0, 0x23, 0x58, 0x1a, 0x4b, 0x45, 0x1d, 0x73, 0x10, 0x26,
+	0x9a, 0x43, 0x74, 0xb2, 0x39, 0xc4, 0x3c, 0xe6, 0x20, 0x7e, 0x2d, 0x40, 0x25, 0x3c, 0x23, 0x9d,
+	0xf8, 0x81, 0x57, 0xe1, 0x82, 0x9b, 0x99, 0x78, 0xd7, 0x91, 0x79, 0x7f, 0xe4, 0x74, 0xba, 0x0b,
+	0x39, 0x25, 0x8a, 0xb3, 0x31, 0xc5, 0xbd, 0x26, 0xfa, 0x10, 0x8a, 0xfe, 0x5c, 0x9a, 0xa4, 0x2a,
+	0xe4, 0xb8, 0xfc, 0xdf, 0xd8, 0x71, 0x71, 0xd7, 0xc2, 0x19, 0xb3, 0x54, 0x38, 0xf3, 0x36, 0x4d,
+	0xf1, 0xcf, 0x51, 0x27, 0x52, 0xfb, 0x12, 0x63, 0xf4, 0x26, 0x24, 0xf9, 0xc9, 0x16, 0xe6, 0x3d,
+	0xd9, 0x5c, 0x20, 0x78, 0x9a, 0xa3, 0xcf, 0x76, 0x9a, 0x63, 0x13, 0xb7, 0x2f, 0x3e, 0x79, 0xa9,
+	0x12, 0xde, 0xa5, 0x7a, 0x19, 0x12, 0xec, 0x46, 0xc0, 0x02, 0xca, 0xa5, 0xf1, 0x73, 0x41, 0xa7,
+	0x2a, 0x31, 0x2e, 0x54, 0x85, 0x34, 0xcb, 0xba, 0xd5, 0x36, 0x77, 0x00, 0x97, 0x43, 0x24, 0x76,
+	0xb6, 0xb7, 0xb2, 0x4f, 0x9f, 0xac, 0xa5, 0x78, 0x43, 0x4a, 0x51, 0xb9, 0x9d, 0xb6, 0xf8, 0xc7,
+	0x0c, 0xa4, 0x25, 0x6c, 0xea, 0xc4, 0x84, 0xd1, 0x16, 0x64, 0xf0, 0xa8, 0x85, 0x75, 0xcb, 0xce,
+	0xf0, 0x27, 0xdf, 0xa0, 0x18, 0x77, 0xdd, 0xe6, 0x6c, 0x44, 0x24, 0x57, 0x0c, 0xdd, 0xe1, 0x40,
+	0x47, 0x38, 0x66, 0xc1, 0xc5, 0xbd, 0x48, 0xc7, 0xeb, 0x36, 0xd2, 0xc1, 0x02, 0xfd, 0x6a, 0xa8,
+	0x54, 0x00, 0xea, 0xb8, 0xc3, 0xa1, 0x8e, 0xf8, 0x8c, 0x8f, 0xf9, 0xb0, 0x8e, 0x9a, 0x0f, 0xeb,
+	0x48, 0xcc, 0x98, 0x66, 0x08, 0xd8, 0xf1, 0xba, 0x0d, 0x76, 0x24, 0x67, 0x8c, 0x38, 0x80, 0x76,
+	0xfc, 0x60, 0x0c, 0xed, 0x58, 0x0f, 0x15, 0x9d, 0x00, 0x77, 0xec, 0x8f, 0xc1, 0x1d, 0x69, 0xaa,
+	0xe4, 0x85, 0x50, 0x25, 0x33, 0xf0, 0x8e, 0xfd, 0x31, 0xbc, 0x23, 0x33, 0x43, 0xe1, 0x0c, 0xc0,
+	0xe3, 0xa7, 0x93, 0x01, 0x0f, 0x08, 0x85, 0x24, 0xf8, 0x30, 0xe7, 0x43, 0x3c, 0xe4, 0x10, 0xc4,
+	0x23, 0x1b, 0x7a, 0x3b, 0x67, 0xea, 0xe7, 0x86, 0x3c, 0x8e, 0x26, 0x40, 0x1e, 0x2c, 0x79, 0xb9,
+	0x19, 0xaa, 0x7c, 0x0e, 0xcc, 0xe3, 0x68, 0x02, 0xe6, 0x91, 0x9f, 0xa9, 0x76, 0x26, 0xe8, 0x71,
+	0xcf, 0x0f, 0x7a, 0x14, 0x42, 0xee, 0x94, 0xee, 0x91, 0x0d, 0x41, 0x3d, 0x4e, 0xc2, 0x50, 0x0f,
+	0x86, 0xf6, 0xbc, 0x14, 0xaa, 0x71, 0x01, 0xd8, 0x63, 0x7f, 0x0c, 0xf6, 0x28, 0xcd, 0xb0, 0xb4,
+	0x39, 0x71, 0x0f, 0xf1, 0x45, 0x12, 0x4b, 0x03, 0x4e, 0x89, 0x38, 0x58, 0x6c, 0x18, 0x9a, 0xc1,
+	0x91, 0x0a, 0xd6, 0x10, 0x6f, 0x92, 0x7b, 0xab, 0xeb, 0x80, 0xa6, 0x60, 0x21, 0x45, 0xc8, 0xfb,
+	0x9c, 0x8e, 0xf8, 0x5b, 0xc1, 0x95, 0xa5, 0x68, 0x88, 0xf7, 0xce, 0x9b, 0xe1, 0x77, 0xde, 0xc0,
+	0x3d, 0x2d, 0xe3, 0xcb, 0x08, 0xbc, 0x39, 0x07, 0x07, 0x3f, 0x14, 0x37, 0xd7, 0xb8, 0x05, 0x4b,
+	0x34, 0x3b, 0x65, 0x1e, 0xdd, 0x17, 0x34, 0x8a, 0xa4, 0x83, 0xad, 0x02, 0x8b, 0x1e, 0x2f, 0xc3,
+	0xb2, 0x87, 0xd7, 0xb9, 0x68, 0x32, 0x04, 0xa0, 0xe4, 0x70, 0x57, 0xf9, 0x8d, 0xf3, 0xef, 0x51,
+	0x77, 0x85, 0x5c, 0xd4, 0x64, 0x12, 0xc0, 0x21, 0x7c, 0x6b, 0x80, 0x23, 0xfc, 0xc2, 0x8b, 0xde,
+	0x87, 0x15, 0x1f, 0xf6, 0x61, 0x27, 0x7f, 0xb1, 0xc5, 0x20, 0x90, 0x88, 0x27, 0x17, 0x71, 0x7a,
+	0xd0, 0x07, 0x70, 0x85, 0xa6, 0xb1, 0x21, 0x09, 0x66, 0x7c, 0xbe, 0x04, 0xf3, 0x12, 0xd1, 0x51,
+	0x9b, 0x90, 0x64, 0x86, 0x00, 0x23, 0x89, 0x30, 0x60, 0xe4, 0x5f, 0x82, 0x6b, 0x37, 0x0e, 0x34,
+	0xd2, 0xd2, 0xda, 0xcc, 0xbe, 0xf2, 0x12, 0xfd, 0x4d, 0x2e, 0x29, 0x3d, 0xad, 0xc3, 0x4d, 0x84,
+	0xfc, 0x24, 0x5c, 0x0e, 0x68, 0x9f, 0xe1, 0x81, 0x6a, 0x05, 0x12, 0xea, 0xa0, 0x8d, 0x47, 0xdc,
+	0x0a, 0x58, 0x83, 0xc8, 0x3e, 0xc2, 0xe7, 0x7c, 0xaf, 0xc9, 0x4f, 0xc2, 0x47, 0x0f, 0x02, 0x8d,
+	0x45, 0x39, 0x89, 0x35, 0xd0, 0x1b, 0x90, 0xa1, 0x95, 0x17, 0x59, 0xd3, 0x4d, 0x1e, 0x6a, 0x7c,
+	0x19, 0x11, 0xab, 0x92, 0x6c, 0x1c, 0x10, 0x9e, 0x7d, 0xdd, 0x94, 0xd2, 0x3a, 0xff, 0xe5, 0xc9,
+	0x59, 0xd2, 0xbe, 0x9c, 0xe5, 0x2a, 0x64, 0xc8, 0xe8, 0x4d, 0x5d, 0x69, 0x61, 0x1a, 0x26, 0x32,
+	0x92, 0x4b, 0x10, 0x7f, 0x2f, 0x40, 0x31, 0x10, 0xb9, 0x26, 0xce, 0xdd, 0x3e, 0x36, 0x51, 0x3f,
+	0x54, 0x34, 0x36, 0xfb, 0x6b, 0x00, 0x1d, 0xc5, 0x94, 0x1f, 0x2b, 0x03, 0x0b, 0xb7, 0xf9, 0x12,
+	0x64, 0x3a, 0x8a, 0xf9, 0x2e, 0x25, 0xf8, 0x07, 0x93, 0x08, 0x0c, 0xc6, 0x03, 0x56, 0x24, 0xbd,
+	0x60, 0x05, 0xaa, 0x40, 0x5a, 0x37, 0x54, 0xcd, 0x50, 0xad, 0x73, 0xba, 0x26, 0x31, 0xc9, 0x69,
+	0x8b, 0x07, 0x70, 0x61, 0x62, 0xd0, 0x44, 0x77, 0x21, 0xe3, 0xc6, 0x5b, 0x81, 0xe6, 0x86, 0x53,
+	0x30, 0x20, 0x97, 0x97, 0x2c, 0xc9, 0x85, 0x89, 0x61, 0x13, 0xd5, 0x21, 0x69, 0x60, 0x73, 0xd8,
+	0x63, 0xb9, 0x6a, 0xe1, 0xf6, 0xcb, 0xf3, 0x85, 0x5b, 0x42, 0x1d, 0xf6, 0x2c, 0x89, 0x0b, 0x8b,
+	0x1f, 0x42, 0x92, 0x51, 0x50, 0x16, 0x52, 0x47, 0x7b, 0x0f, 0xf6, 0xf6, 0xdf, 0xdd, 0x2b, 0x45,
+	0x10, 0x40, 0xb2, 0x5a, 0xab, 0xd5, 0x0f, 0x9a, 0x25, 0x01, 0x65, 0x20, 0x51, 0xdd, 0xda, 0x97,
+	0x9a, 0xa5, 0x28, 0x21, 0x4b, 0xf5, 0xfb, 0xf5, 0x5a, 0xb3, 0x14, 0x43, 0x4b, 0x90, 0x67, 0xbf,
+	0xe5, 0x7b, 0xfb, 0xd2, 0xc3, 0x6a, 0xb3, 0x14, 0xf7, 0x90, 0x0e, 0xeb, 0x7b, 0xdb, 0x75, 0xa9,
+	0x94, 0x10, 0x5f, 0x85, 0xcb, 0xa1, 0x01, 0xda, 0x85, 0x89, 0x04, 0x0f, 0x4c, 0x24, 0x7e, 0x15,
+	0x25, 0x37, 0x90, 0xb0, 0xa8, 0x8b, 0xee, 0x07, 0x26, 0x7e, 0x7b, 0x81, 0x90, 0x1d, 0x98, 0x3d,
+	0x7a, 0x1e, 0x0a, 0x06, 0x3e, 0xc5, 0x56, 0xab, 0xcb, 0xb2, 0x00, 0x1b, 0x47, 0xca, 0x73, 0x2a,
+	0x15, 0x32, 0x19, 0xdb, 0x47, 0xb8, 0x65, 0xc9, 0xcc, 0x08, 0x4c, 0x7a, 0x5b, 0xcf, 0x10, 0x36,
+	0x42, 0x3d, 0x64, 0x44, 0xe2, 0xa0, 0x99, 0x23, 0x61, 0xaa, 0xe2, 0x54, 0x15, 0x50, 0xbf, 0x40,
+	0x29, 0xe2, 0xe3, 0x85, 0x16, 0x3b, 0x03, 0x09, 0xa9, 0xde, 0x94, 0xde, 0x2b, 0xc5, 0x10, 0x82,
+	0x02, 0xfd, 0x29, 0x1f, 0xee, 0x55, 0x0f, 0x0e, 0x1b, 0xfb, 0x64, 0xb1, 0x97, 0xa1, 0x68, 0x2f,
+	0xb6, 0x4d, 0x4c, 0xa0, 0x0b, 0xb0, 0x54, 0xdb, 0x7f, 0x78, 0xb0, 0x5b, 0x6f, 0xd6, 0x5d, 0x72,
+	0x52, 0xfc, 0x5d, 0x0c, 0x2e, 0x85, 0xe4, 0x1a, 0xe8, 0x0d, 0x00, 0x6b, 0x24, 0x1b, 0xb8, 0xa5,
+	0x19, 0xed, 0x70, 0xe3, 0x6c, 0x8e, 0x24, 0xca, 0x21, 0x65, 0x2c, 0xfe, 0x6b, 0xaa, 0xc3, 0x7e,
+	0x9b, 0x2b, 0x25, 0x93, 0x35, 0x39, 0xb6, 0x71, 0x6d, 0xc2, 0x65, 0x0d, 0xb7, 0x88, 0x62, 0xba,
+	0x27, 0x54, 0x31, 0xe5, 0x47, 0xef, 0xc1, 0xa5, 0x40, 0x5c, 0xe1, 0xce, 0xd8, 0x9c, 0x54, 0x58,
+	0x9c, 0x1c, 0x5e, 0x2e, 0xf8, 0xc3, 0x0b, 0x73, 0xc6, 0xe6, 0x14, 0x20, 0x21, 0xf1, 0x0c, 0x40,
+	0x42, 0x58, 0x7c, 0x4a, 0x2e, 0x0a, 0xd1, 0x4f, 0x88, 0x4f, 0xe2, 0x6f, 0x7c, 0x9b, 0xe7, 0x4f,
+	0xdf, 0xf6, 0x21, 0x69, 0x5a, 0x8a, 0x35, 0x34, 0xf9, 0x61, 0xb8, 0x3b, 0x6f, 0x2e, 0xb8, 0x61,
+	0xff, 0x38, 0xa4, 0xe2, 0x12, 0x57, 0xf3, 0x3f, 0xb9, 0xa7, 0x61, 0xab, 0x9f, 0xf8, 0x2e, 0x56,
+	0xff, 0x35, 0x28, 0xf8, 0x97, 0x2a, 0xfc, 0xec, 0xba, 0xde, 0x31, 0x2a, 0xf6, 0x60, 0x79, 0x02,
+	0x14, 0x81, 0xee, 0xf2, 0x6a, 0x03, 0xdb, 0xad, 0xeb, 0xe3, 0x53, 0xf6, 0xb1, 0xbb, 0x45, 0x07,
+	0x12, 0xac, 0xdc, 0x9c, 0x9a, 0x6d, 0x8c, 0x4b, 0x10, 0x5b, 0x80, 0xc6, 0x33, 0xf4, 0x49, 0xb0,
+	0x89, 0xf0, 0x0c, 0xb0, 0xc9, 0xaf, 0x04, 0xb8, 0x32, 0x25, 0x6b, 0x47, 0xef, 0x04, 0x6c, 0xf1,
+	0xcd, 0x45, 0x72, 0xfe, 0x0d, 0x46, 0xf3, 0x5b, 0xa3, 0x78, 0x07, 0x72, 0x5e, 0xfa, 0x7c, 0x4b,
+	0xff, 0x0b, 0x4f, 0xcc, 0xf4, 0xe3, 0x3b, 0x0d, 0x48, 0xe2, 0x33, 0x3c, 0x70, 0x62, 0xf0, 0xc5,
+	0xf1, 0x75, 0x20, 0xdd, 0x5b, 0x65, 0x92, 0x2b, 0xfe, 0xe3, 0xc9, 0x5a, 0x89, 0x71, 0xbf, 0xa4,
+	0xf5, 0x55, 0x0b, 0xf7, 0x75, 0xeb, 0x5c, 0xe2, 0xf2, 0xe8, 0x3a, 0xe4, 0x0d, 0x6c, 0x11, 0x17,
+	0xe2, 0x83, 0xd6, 0x72, 0x8c, 0xc8, 0x33, 0xb9, 0x3f, 0x09, 0x00, 0x2e, 0x60, 0xe4, 0x02, 0x36,
+	0x82, 0x17, 0xb0, 0x09, 0xe0, 0x7c, 0xd1, 0x20, 0xce, 0x87, 0x6e, 0x40, 0x91, 0x25, 0xe9, 0xa6,
+	0xda, 0x19, 0x28, 0xd6, 0xd0, 0xc0, 0x1c, 0x1e, 0x2a, 0x50, 0xf2, 0xa1, 0x4d, 0x45, 0xef, 0xc3,
+	0x65, 0xab, 0x6b, 0x60, 0xb3, 0xab, 0xf5, 0xda, 0x72, 0x70, 0xe3, 0x59, 0xd9, 0x62, 0x6d, 0x86,
+	0xc1, 0x49, 0x97, 0x1c, 0x0d, 0xc7, 0xfe, 0xcd, 0xff, 0x04, 0x12, 0x74, 0x6d, 0x48, 0xa2, 0xe5,
+	0x58, 0x70, 0x86, 0x1b, 0xe7, 0x07, 0x00, 0x8a, 0x65, 0x19, 0xea, 0xc9, 0x90, 0x1c, 0xe7, 0xe8,
+	0xf8, 0xa7, 0xdc, 0xb5, 0xad, 0xda, 0x7c, 0x5b, 0x57, 0xf9, 0x22, 0xaf, 0xb8, 0xa2, 0x9e, 0x85,
+	0xf6, 0x28, 0x14, 0xf7, 0xa0, 0xe0, 0x97, 0xb5, 0x33, 0x58, 0x36, 0x06, 0x7f, 0x06, 0xcb, 0x32,
+	0x62, 0x9e, 0xc1, 0x3a, 0xf9, 0x6f, 0x8c, 0x15, 0x05, 0x69, 0x43, 0xfc, 0xb7, 0x00, 0x39, 0xaf,
+	0x9b, 0x9a, 0x3b, 0xc9, 0xe4, 0x49, 0x77, 0x6c, 0x3c, 0xe9, 0x8e, 0x87, 0xa6, 0x9d, 0x89, 0x60,
+	0xda, 0x79, 0x19, 0xd2, 0xa4, 0x7b, 0x68, 0xe2, 0x36, 0xaf, 0xa4, 0xa6, 0x3a, 0x8a, 0x79, 0x64,
+	0xe2, 0xb6, 0xc7, 0x3e, 0x53, 0xcf, 0x68, 0x9f, 0xbe, 0xdc, 0x36, 0x1d, 0x4c, 0xb4, 0x3f, 0x15,
+	0x20, 0xed, 0x4c, 0xde, 0x5f, 0x30, 0xf4, 0xe1, 0x8b, 0x6c, 0xed, 0x58, 0xb9, 0x90, 0xdf, 0x1d,
+	0x58, 0xf9, 0x34, 0xe6, 0x94, 0x4f, 0xdf, 0x72, 0xb2, 0xb1, 0x30, 0x04, 0xcd, 0xbb, 0xd2, 0x36,
+	0x68, 0xca, 0x93, 0xcf, 0x5f, 0xf2, 0x71, 0x90, 0x74, 0x02, 0x7d, 0x1f, 0x92, 0x4a, 0xcb, 0xc1,
+	0x0d, 0x0b, 0x13, 0x00, 0x35, 0x9b, 0x75, 0xa3, 0x39, 0xaa, 0x52, 0x4e, 0x89, 0x4b, 0xf0, 0x51,
+	0x45, 0xed, 0x51, 0x89, 0x3f, 0x22, 0x7a, 0x19, 0x8f, 0xdf, 0x67, 0x14, 0x00, 0x8e, 0xf6, 0x1e,
+	0xee, 0x6f, 0xef, 0xdc, 0xdb, 0xa9, 0x6f, 0xf3, 0x74, 0x6b, 0x7b, 0xbb, 0xbe, 0x5d, 0x8a, 0x12,
+	0x3e, 0xa9, 0xfe, 0x70, 0xff, 0xb8, 0xbe, 0x5d, 0x8a, 0x89, 0x55, 0xc8, 0x38, 0x51, 0x82, 0x96,
+	0x96, 0xb5, 0xc7, 0xd8, 0xe0, 0x0b, 0xc4, 0x1a, 0x68, 0x15, 0xb2, 0xe3, 0x58, 0x37, 0xb9, 0x30,
+	0x31, 0x88, 0x5b, 0xfc, 0xb5, 0x00, 0x45, 0x47, 0x07, 0xcf, 0x13, 0xde, 0x82, 0x94, 0x3e, 0x3c,
+	0x91, 0x6d, 0xdb, 0x0d, 0x20, 0xc4, 0xf6, 0x7d, 0x6a, 0x78, 0xd2, 0x53, 0x5b, 0x0f, 0xf0, 0x39,
+	0x8f, 0x4a, 0x49, 0x7d, 0x78, 0xf2, 0x80, 0x99, 0x38, 0x1b, 0x46, 0x74, 0xca, 0x30, 0x62, 0x81,
+	0x61, 0xa0, 0x1b, 0x90, 0x1b, 0x68, 0x6d, 0x2c, 0x2b, 0xed, 0xb6, 0x81, 0x4d, 0x16, 0x6c, 0x33,
+	0x5c, 0x73, 0x96, 0xf4, 0x54, 0x59, 0x87, 0xf8, 0xb5, 0x00, 0x68, 0x3c, 0x32, 0xa2, 0x43, 0x58,
+	0x72, 0x83, 0xab, 0x1d, 0xb1, 0x99, 0xfb, 0x5c, 0x0f, 0x8f, 0xac, 0xbe, 0x4b, 0x77, 0xe9, 0xcc,
+	0x4f, 0x26, 0x59, 0xd8, 0x8a, 0xeb, 0xaa, 0x74, 0x3a, 0x5f, 0xba, 0x28, 0xd1, 0x39, 0x17, 0x25,
+	0x22, 0x21, 0x47, 0xde, 0xe9, 0x09, 0xba, 0xd2, 0xd8, 0x58, 0xc9, 0x44, 0x87, 0x72, 0x73, 0x4c,
+	0x8c, 0xcf, 0x33, 0x6c, 0x48, 0xc2, 0xb3, 0x0c, 0x49, 0xbc, 0x03, 0xa5, 0x77, 0x9c, 0xef, 0xf3,
+	0x2f, 0x05, 0x86, 0x29, 0x8c, 0x0d, 0xf3, 0x0c, 0xd2, 0xc4, 0xfb, 0xd2, 0xa0, 0xf1, 0x43, 0xc8,
+	0x38, 0xab, 0xe7, 0xbc, 0x4e, 0x09, 0x5d, 0x76, 0x3e, 0x12, 0x57, 0x04, 0xdd, 0x82, 0x25, 0x12,
+	0x37, 0xec, 0xc2, 0x25, 0x83, 0xcd, 0xa2, 0xd4, 0x1b, 0x16, 0x59, 0xc7, 0xae, 0x8d, 0xf5, 0x90,
+	0x00, 0x5f, 0x62, 0x89, 0x00, 0x6e, 0xff, 0x37, 0x06, 0x40, 0xee, 0x59, 0x01, 0xf4, 0x90, 0xed,
+	0x61, 0xde, 0x97, 0x89, 0x88, 0x3f, 0x8b, 0x42, 0xd6, 0x53, 0x48, 0x41, 0xdf, 0xf3, 0x25, 0x55,
+	0xeb, 0xd3, 0x8a, 0x2e, 0x9e, 0x8c, 0xca, 0x37, 0xb1, 0xe8, 0xe2, 0x13, 0x0b, 0x2b, 0x61, 0xd9,
+	0xf5, 0xd4, 0xf8, 0xc2, 0xf5, 0xd4, 0x97, 0x00, 0x59, 0x9a, 0xa5, 0xf4, 0x48, 0xf0, 0x56, 0x07,
+	0x1d, 0x99, 0x9d, 0x76, 0x16, 0x40, 0x4a, 0xb4, 0xe7, 0x98, 0x76, 0x1c, 0x10, 0xba, 0xd8, 0x83,
+	0xb4, 0x03, 0x06, 0x2c, 0xfe, 0xe8, 0x63, 0x52, 0xdd, 0xb8, 0x02, 0xe9, 0x3e, 0xb6, 0x14, 0x1a,
+	0xf6, 0x18, 0x38, 0xe4, 0xb4, 0x6f, 0xbd, 0x09, 0x59, 0xcf, 0x4b, 0x18, 0x12, 0x09, 0xf7, 0xea,
+	0xef, 0x96, 0x22, 0x95, 0xd4, 0x67, 0x5f, 0xac, 0xc7, 0xf6, 0xf0, 0x63, 0xf2, 0x29, 0xa9, 0x5e,
+	0x6b, 0xd4, 0x6b, 0x0f, 0x4a, 0x42, 0x25, 0xfb, 0xd9, 0x17, 0xeb, 0x29, 0x09, 0xd3, 0x9a, 0xc3,
+	0xad, 0x07, 0x50, 0x0c, 0xec, 0x80, 0xdf, 0x27, 0x23, 0x28, 0x6c, 0x1f, 0x1d, 0xec, 0xee, 0xd4,
+	0xaa, 0xcd, 0xba, 0x7c, 0xbc, 0xdf, 0xac, 0x97, 0x04, 0x74, 0x09, 0x96, 0x77, 0x77, 0x7e, 0xdc,
+	0x68, 0xca, 0xb5, 0xdd, 0x9d, 0xfa, 0x5e, 0x53, 0xae, 0x36, 0x9b, 0xd5, 0xda, 0x83, 0x52, 0xf4,
+	0xf6, 0x5f, 0x01, 0x8a, 0xd5, 0xad, 0xda, 0x0e, 0xb9, 0xdb, 0xab, 0x2d, 0x85, 0x7a, 0xf8, 0x1a,
+	0xc4, 0x29, 0x14, 0x3b, 0xf5, 0x4d, 0x6c, 0x65, 0x7a, 0x21, 0x09, 0xdd, 0x83, 0x04, 0x45, 0x69,
+	0xd1, 0xf4, 0x47, 0xb2, 0x95, 0x19, 0x95, 0x25, 0x32, 0x18, 0x7a, 0x6e, 0xa6, 0xbe, 0x9a, 0xad,
+	0x4c, 0x2f, 0x34, 0xa1, 0x5d, 0x48, 0xd9, 0x00, 0xd8, 0xac, 0xa7, 0xac, 0x95, 0x99, 0xd5, 0x1f,
+	0x32, 0x35, 0x06, 0x24, 0x4e, 0x7f, 0x50, 0x5b, 0x99, 0x51, 0x82, 0x42, 0x12, 0x64, 0x5c, 0xec,
+	0x77, 0xf6, 0xdb, 0xde, 0xca, 0x1c, 0x25, 0x31, 0xf4, 0x21, 0xe4, 0xfd, 0x50, 0xd9, 0x7c, 0xcf,
+	0x6e, 0x2b, 0x73, 0x96, 0xab, 0x88, 0x7e, 0x3f, 0x6e, 0x36, 0xdf, 0x33, 0xdc, 0xca, 0x9c, 0xd5,
+	0x2b, 0xf4, 0x11, 0x2c, 0x8d, 0xe3, 0x5a, 0xf3, 0xbf, 0xca, 0xad, 0x2c, 0x50, 0xcf, 0x42, 0x7d,
+	0x40, 0x13, 0xf0, 0xb0, 0x05, 0x1e, 0xe9, 0x56, 0x16, 0x29, 0x6f, 0xa1, 0x36, 0x14, 0x83, 0x58,
+	0xd1, 0xbc, 0x8f, 0x76, 0x2b, 0x73, 0x97, 0xba, 0xd8, 0x57, 0xfc, 0xa0, 0xc6, 0xbc, 0x8f, 0x78,
+	0x2b, 0x73, 0x57, 0xbe, 0xd0, 0x11, 0x80, 0xe7, 0x62, 0x3c, 0xc7, 0xa3, 0xde, 0xca, 0x3c, 0x35,
+	0x30, 0xa4, 0xc3, 0xf2, 0xa4, 0x9b, 0xf0, 0x22, 0x6f, 0x7c, 0x2b, 0x0b, 0x95, 0xc6, 0x88, 0x3d,
+	0xfb, 0xef, 0xb4, 0xf3, 0xbd, 0xf9, 0xad, 0xcc, 0x59, 0x23, 0xdb, 0xda, 0xfa, 0xf2, 0xe9, 0xaa,
+	0xf0, 0xd5, 0xd3, 0x55, 0xe1, 0xeb, 0xa7, 0xab, 0xc2, 0xe7, 0xdf, 0xac, 0x46, 0xbe, 0xfa, 0x66,
+	0x35, 0xf2, 0x97, 0x6f, 0x56, 0x23, 0x3f, 0xb9, 0xd9, 0x51, 0xad, 0xee, 0xf0, 0x64, 0xa3, 0xa5,
+	0xf5, 0xe9, 0x5f, 0x2e, 0x74, 0xe5, 0x7c, 0x93, 0xe9, 0x24, 0x2d, 0xcf, 0x1f, 0x3b, 0x4e, 0x92,
+	0x34, 0xd6, 0xdd, 0xf9, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x2e, 0x77, 0x7c, 0xf8, 0x31,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/abci/types/types_test.go b/abci/types/types_test.go
index bd8695d4f0..b55ffe8bec 100644
--- a/abci/types/types_test.go
+++ b/abci/types/types_test.go
@@ -7,9 +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/merkle"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestHashAndProveResults(t *testing.T) {
diff --git a/abci/types/validator_set_update.go b/abci/types/validator_set_update.go
index dfb56fc878..dbdcc9c3cf 100644
--- a/abci/types/validator_set_update.go
+++ b/abci/types/validator_set_update.go
@@ -1,9 +1,9 @@
 package types
 
 import (
-	"github.com/tendermint/tendermint/crypto"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/dash/llmq"
+	"github.com/dashpay/tenderdash/crypto"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/dash/llmq"
 )
 
 // QuorumOptionFunc is an option function for quorum config
diff --git a/cmd/abcidump/cmd/capture.go b/cmd/abcidump/cmd/capture.go
index c1ab558d3f..f05d359efe 100644
--- a/cmd/abcidump/cmd/capture.go
+++ b/cmd/abcidump/cmd/capture.go
@@ -11,8 +11,8 @@ import (
 	"github.com/google/gopacket/pcap"
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/cmd/abcidump/parser"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/cmd/abcidump/parser"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 const (
diff --git a/cmd/abcidump/cmd/cbor_test.go b/cmd/abcidump/cmd/cbor_test.go
index 3200c50e9b..1e9f2fad86 100644
--- a/cmd/abcidump/cmd/cbor_test.go
+++ b/cmd/abcidump/cmd/cbor_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func TestCborBase64(t *testing.T) {
diff --git a/cmd/abcidump/cmd/parse.go b/cmd/abcidump/cmd/parse.go
index 2505ef61cd..7739a7967a 100644
--- a/cmd/abcidump/cmd/parse.go
+++ b/cmd/abcidump/cmd/parse.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/cmd/abcidump/parser"
+	"github.com/dashpay/tenderdash/cmd/abcidump/parser"
 )
 
 const (
diff --git a/cmd/abcidump/cmd/parse_test.go b/cmd/abcidump/cmd/parse_test.go
index aaf25ca43c..9e5ee5e839 100644
--- a/cmd/abcidump/cmd/parse_test.go
+++ b/cmd/abcidump/cmd/parse_test.go
@@ -11,10 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/types"
-
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func TestParse(t *testing.T) {
diff --git a/cmd/abcidump/cmd/rootcmd.go b/cmd/abcidump/cmd/rootcmd.go
index 90ea6f0ab2..872400a0cd 100644
--- a/cmd/abcidump/cmd/rootcmd.go
+++ b/cmd/abcidump/cmd/rootcmd.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 var logger log.Logger
diff --git a/cmd/abcidump/main.go b/cmd/abcidump/main.go
index 2347e7ba76..2e60a40b25 100644
--- a/cmd/abcidump/main.go
+++ b/cmd/abcidump/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/tendermint/tendermint/cmd/abcidump/cmd"
+	"github.com/dashpay/tenderdash/cmd/abcidump/cmd"
 )
 
 func main() {
diff --git a/cmd/abcidump/parser/parser.go b/cmd/abcidump/parser/parser.go
index 3de891a2c5..e29e8b15ed 100644
--- a/cmd/abcidump/parser/parser.go
+++ b/cmd/abcidump/parser/parser.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gogo/protobuf/jsonpb"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/abci/types"
+	"github.com/dashpay/tenderdash/abci/types"
 )
 
 // Parser reads protobuf data from In, parses it and writes to Out in JSON format
diff --git a/cmd/abcidump/parser/parser_test.go b/cmd/abcidump/parser/parser_test.go
index 36f29eee74..871a63ecb7 100644
--- a/cmd/abcidump/parser/parser_test.go
+++ b/cmd/abcidump/parser/parser_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/types"
+	"github.com/dashpay/tenderdash/abci/types"
 )
 
 func TestParser(t *testing.T) {
diff --git a/cmd/abcidump/parser/types.go b/cmd/abcidump/parser/types.go
index 6d84aa65c0..15fb4447ff 100644
--- a/cmd/abcidump/parser/types.go
+++ b/cmd/abcidump/parser/types.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	protoAbci "github.com/tendermint/tendermint/abci/types"
-	protoP2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
+	protoAbci "github.com/dashpay/tenderdash/abci/types"
+	protoP2p "github.com/dashpay/tenderdash/proto/tendermint/p2p"
 )
 
 // ensure we have some dependencies compiled in
diff --git a/cmd/priv_val_server/main.go b/cmd/priv_val_server/main.go
index 9014221450..0866830269 100644
--- a/cmd/priv_val_server/main.go
+++ b/cmd/priv_val_server/main.go
@@ -19,11 +19,11 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/privval"
-	grpcprivval "github.com/tendermint/tendermint/privval/grpc"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/privval"
+	grpcprivval "github.com/dashpay/tenderdash/privval/grpc"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
 )
 
 var (
diff --git a/cmd/tenderdash/commands/compact.go b/cmd/tenderdash/commands/compact.go
index 56f4998470..93903f3dad 100644
--- a/cmd/tenderdash/commands/compact.go
+++ b/cmd/tenderdash/commands/compact.go
@@ -11,8 +11,8 @@ import (
 	"github.com/syndtr/goleveldb/leveldb/opt"
 	"github.com/syndtr/goleveldb/leveldb/util"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func MakeCompactDBCommand(cfg *config.Config, logger log.Logger) *cobra.Command {
@@ -20,8 +20,8 @@ func MakeCompactDBCommand(cfg *config.Config, logger log.Logger) *cobra.Command
 		Use:   "experimental-compact-goleveldb",
 		Short: "force compacts the tendermint storage engine (only GoLevelDB supported)",
 		Long: `
-This is a temporary utility command that performs a force compaction on the state 
-and blockstores to reduce disk space for a pruning node. This should only be run 
+This is a temporary utility command that performs a force compaction on the state
+and blockstores to reduce disk space for a pruning node. This should only be run
 once the node has stopped. This command will likely be omitted in the future after
 the planned refactor to the storage engine.
 
diff --git a/cmd/tenderdash/commands/debug/debug.go b/cmd/tenderdash/commands/debug/debug.go
index 7fd5b030f7..284dc7776e 100644
--- a/cmd/tenderdash/commands/debug/debug.go
+++ b/cmd/tenderdash/commands/debug/debug.go
@@ -3,7 +3,7 @@ package debug
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 const (
diff --git a/cmd/tenderdash/commands/debug/dump.go b/cmd/tenderdash/commands/debug/dump.go
index d84f6e10aa..4797b33b49 100644
--- a/cmd/tenderdash/commands/debug/dump.go
+++ b/cmd/tenderdash/commands/debug/dump.go
@@ -11,10 +11,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/cli"
-	"github.com/tendermint/tendermint/libs/log"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/cli"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
 )
 
 func getDumpCmd(logger log.Logger) *cobra.Command {
diff --git a/cmd/tenderdash/commands/debug/kill.go b/cmd/tenderdash/commands/debug/kill.go
index 7755817a63..c137475a98 100644
--- a/cmd/tenderdash/commands/debug/kill.go
+++ b/cmd/tenderdash/commands/debug/kill.go
@@ -13,10 +13,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/cli"
-	"github.com/tendermint/tendermint/libs/log"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/cli"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
 )
 
 func getKillCmd(logger log.Logger) *cobra.Command {
diff --git a/cmd/tenderdash/commands/debug/util.go b/cmd/tenderdash/commands/debug/util.go
index 24626207f5..4bc169b4fa 100644
--- a/cmd/tenderdash/commands/debug/util.go
+++ b/cmd/tenderdash/commands/debug/util.go
@@ -9,8 +9,8 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/tendermint/tendermint/config"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
+	"github.com/dashpay/tenderdash/config"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
 )
 
 // dumpStatus gets node status state dump from the Tendermint RPC and writes it
diff --git a/cmd/tenderdash/commands/gen_node_key.go b/cmd/tenderdash/commands/gen_node_key.go
index dbd22d19cd..3141662058 100644
--- a/cmd/tenderdash/commands/gen_node_key.go
+++ b/cmd/tenderdash/commands/gen_node_key.go
@@ -14,10 +14,10 @@ import (
 	"github.com/tyler-smith/go-bip39"
 	"golang.org/x/term"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
@@ -39,7 +39,7 @@ func MakeGenNodeKeyCommand(*config.Config, log.Logger) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "gen-node-key",
 		Short: "Generate a new node key for this node and print its ID",
-		Long: `Generate a new node key for this node and print its ID. 
+		Long: `Generate a new node key for this node and print its ID.
 Note that the key is not saved to disk.
 
 Node key can be generated randomly (default) or derived from BIP39 mnemonic phrase.
diff --git a/cmd/tenderdash/commands/gen_node_key_test.go b/cmd/tenderdash/commands/gen_node_key_test.go
index 7ad8e99983..196b280a76 100644
--- a/cmd/tenderdash/commands/gen_node_key_test.go
+++ b/cmd/tenderdash/commands/gen_node_key_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestGenNodeKeyFromPem(t *testing.T) {
diff --git a/cmd/tenderdash/commands/gen_validator.go b/cmd/tenderdash/commands/gen_validator.go
index bbe09e9127..23214e38b7 100644
--- a/cmd/tenderdash/commands/gen_validator.go
+++ b/cmd/tenderdash/commands/gen_validator.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/privval"
+	"github.com/dashpay/tenderdash/privval"
 )
 
 // MakeGenValidatorCommand allows the generation of a keypair for a
diff --git a/cmd/tenderdash/commands/init.go b/cmd/tenderdash/commands/init.go
index 30443599ca..9cd4b28640 100644
--- a/cmd/tenderdash/commands/init.go
+++ b/cmd/tenderdash/commands/init.go
@@ -8,13 +8,13 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/privval"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type nodeConfig struct {
diff --git a/cmd/tenderdash/commands/inspect.go b/cmd/tenderdash/commands/inspect.go
index 9c12ef5cf6..84bbb1e18f 100644
--- a/cmd/tenderdash/commands/inspect.go
+++ b/cmd/tenderdash/commands/inspect.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/inspect"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/inspect"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 // InspectCmd constructs the command to start an inspect server.
diff --git a/cmd/tenderdash/commands/key_migrate.go b/cmd/tenderdash/commands/key_migrate.go
index 88b9dfe715..cf20d76a02 100644
--- a/cmd/tenderdash/commands/key_migrate.go
+++ b/cmd/tenderdash/commands/key_migrate.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/scripts/keymigrate"
-	"github.com/tendermint/tendermint/scripts/scmigrate"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/scripts/keymigrate"
+	"github.com/dashpay/tenderdash/scripts/scmigrate"
 )
 
 func MakeKeyMigrateCommand(conf *config.Config, logger log.Logger) *cobra.Command {
diff --git a/cmd/tenderdash/commands/light.go b/cmd/tenderdash/commands/light.go
index 9ebff8e275..acbe7ac21b 100644
--- a/cmd/tenderdash/commands/light.go
+++ b/cmd/tenderdash/commands/light.go
@@ -14,14 +14,14 @@ import (
 	"github.com/spf13/cobra"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/config"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	lproxy "github.com/tendermint/tendermint/light/proxy"
-	lrpc "github.com/tendermint/tendermint/light/rpc"
-	dbs "github.com/tendermint/tendermint/light/store/db"
-	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
+	"github.com/dashpay/tenderdash/config"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	lproxy "github.com/dashpay/tenderdash/light/proxy"
+	lrpc "github.com/dashpay/tenderdash/light/rpc"
+	dbs "github.com/dashpay/tenderdash/light/store/db"
+	rpcserver "github.com/dashpay/tenderdash/rpc/jsonrpc/server"
 )
 
 // LightCmd constructs the base command called when invoked without any subcommands.
diff --git a/cmd/tenderdash/commands/reindex_event.go b/cmd/tenderdash/commands/reindex_event.go
index 797819449f..961a60e635 100644
--- a/cmd/tenderdash/commands/reindex_event.go
+++ b/cmd/tenderdash/commands/reindex_event.go
@@ -9,18 +9,18 @@ import (
 	"github.com/spf13/cobra"
 	dbm "github.com/tendermint/tm-db"
 
-	abcitypes "github.com/tendermint/tendermint/abci/types"
-	tmcfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/libs/progressbar"
-	"github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink/kv"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink/psql"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/os"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	abcitypes "github.com/dashpay/tenderdash/abci/types"
+	tmcfg "github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/libs/progressbar"
+	"github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink/kv"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink/psql"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/os"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/cmd/tenderdash/commands/reindex_event_test.go b/cmd/tenderdash/commands/reindex_event_test.go
index e88d4fb009..37f58d9529 100644
--- a/cmd/tenderdash/commands/reindex_event_test.go
+++ b/cmd/tenderdash/commands/reindex_event_test.go
@@ -10,13 +10,13 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abcitypes "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	abcitypes "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/proto/tendermint/state"
+	"github.com/dashpay/tenderdash/types"
 
 	_ "github.com/lib/pq" // for the psql sink
 )
diff --git a/cmd/tenderdash/commands/replay.go b/cmd/tenderdash/commands/replay.go
index fb6f19e55d..57059ae975 100644
--- a/cmd/tenderdash/commands/replay.go
+++ b/cmd/tenderdash/commands/replay.go
@@ -3,9 +3,9 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 // MakeReplayCommand constructs a command to replay messages from the WAL into consensus.
diff --git a/cmd/tenderdash/commands/reset.go b/cmd/tenderdash/commands/reset.go
index 38beffb629..a8c491dcfe 100644
--- a/cmd/tenderdash/commands/reset.go
+++ b/cmd/tenderdash/commands/reset.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	"github.com/dashpay/tenderdash/privval"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // MakeResetCommand constructs a command that removes the database of
diff --git a/cmd/tenderdash/commands/reset_test.go b/cmd/tenderdash/commands/reset_test.go
index fd3963e885..673afd772c 100644
--- a/cmd/tenderdash/commands/reset_test.go
+++ b/cmd/tenderdash/commands/reset_test.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	cfg "github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/privval"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func Test_ResetAll(t *testing.T) {
diff --git a/cmd/tenderdash/commands/rollback.go b/cmd/tenderdash/commands/rollback.go
index a604341783..1dd88ccb6e 100644
--- a/cmd/tenderdash/commands/rollback.go
+++ b/cmd/tenderdash/commands/rollback.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/state"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/state"
 )
 
 func MakeRollbackStateCommand(conf *config.Config) *cobra.Command {
diff --git a/cmd/tenderdash/commands/rollback_test.go b/cmd/tenderdash/commands/rollback_test.go
index 55817cc9c4..00294a403a 100644
--- a/cmd/tenderdash/commands/rollback_test.go
+++ b/cmd/tenderdash/commands/rollback_test.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/cmd/tenderdash/commands"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/rpc/client/local"
-	rpctest "github.com/tendermint/tendermint/rpc/test"
-	e2e "github.com/tendermint/tendermint/test/e2e/app"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/cmd/tenderdash/commands"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/rpc/client/local"
+	rpctest "github.com/dashpay/tenderdash/rpc/test"
+	e2e "github.com/dashpay/tenderdash/test/e2e/app"
 )
 
 func TestRollbackIntegration(t *testing.T) {
diff --git a/cmd/tenderdash/commands/root.go b/cmd/tenderdash/commands/root.go
index fdee638bcb..2c2b2bff84 100644
--- a/cmd/tenderdash/commands/root.go
+++ b/cmd/tenderdash/commands/root.go
@@ -9,9 +9,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/cli"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/cli"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 const ctxTimeout = 4 * time.Second
diff --git a/cmd/tenderdash/commands/root_test.go b/cmd/tenderdash/commands/root_test.go
index a4f4fb08d5..f3719220cd 100644
--- a/cmd/tenderdash/commands/root_test.go
+++ b/cmd/tenderdash/commands/root_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/cli"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
+	cfg "github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/cli"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
 )
 
 // writeConfigVals writes a toml file with the given values.
diff --git a/cmd/tenderdash/commands/run_node.go b/cmd/tenderdash/commands/run_node.go
index d5a47e84af..8abe55755c 100644
--- a/cmd/tenderdash/commands/run_node.go
+++ b/cmd/tenderdash/commands/run_node.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
+	cfg "github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 var (
diff --git a/cmd/tenderdash/commands/show_node_id.go b/cmd/tenderdash/commands/show_node_id.go
index ffc6c4d5e0..d9e381d1b0 100644
--- a/cmd/tenderdash/commands/show_node_id.go
+++ b/cmd/tenderdash/commands/show_node_id.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
+	"github.com/dashpay/tenderdash/config"
 )
 
 // MakeShowNodeIDCommand constructs a command to dump the node ID to stdout.
diff --git a/cmd/tenderdash/commands/show_validator.go b/cmd/tenderdash/commands/show_validator.go
index 548b2a3c51..67a2be4cb6 100644
--- a/cmd/tenderdash/commands/show_validator.go
+++ b/cmd/tenderdash/commands/show_validator.go
@@ -6,14 +6,14 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	"github.com/tendermint/tendermint/privval"
-	tmgrpc "github.com/tendermint/tendermint/privval/grpc"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	"github.com/dashpay/tenderdash/privval"
+	tmgrpc "github.com/dashpay/tenderdash/privval/grpc"
 )
 
 // MakeShowValidatorCommand constructs a command to show the validator info.
diff --git a/cmd/tenderdash/commands/testnet.go b/cmd/tenderdash/commands/testnet.go
index 8b1dbaebab..3906f740dc 100644
--- a/cmd/tenderdash/commands/testnet.go
+++ b/cmd/tenderdash/commands/testnet.go
@@ -8,18 +8,17 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/tendermint/tendermint/crypto"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	cfg "github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/privval"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/cmd/tenderdash/commands/version.go b/cmd/tenderdash/commands/version.go
index 4927ea1348..71c504b00d 100644
--- a/cmd/tenderdash/commands/version.go
+++ b/cmd/tenderdash/commands/version.go
@@ -6,7 +6,7 @@ import (
 	"github.com/sasha-s/go-deadlock"
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/version"
 )
 
 // VersionCmd ...
diff --git a/cmd/tenderdash/main.go b/cmd/tenderdash/main.go
index fb879c3446..6ab26dc628 100644
--- a/cmd/tenderdash/main.go
+++ b/cmd/tenderdash/main.go
@@ -6,12 +6,12 @@ import (
 	"io"
 	"os"
 
-	"github.com/tendermint/tendermint/cmd/tenderdash/commands"
-	"github.com/tendermint/tendermint/cmd/tenderdash/commands/debug"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/cli"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/node"
+	"github.com/dashpay/tenderdash/cmd/tenderdash/commands"
+	"github.com/dashpay/tenderdash/cmd/tenderdash/commands/debug"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/cli"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/node"
 )
 
 func main() {
diff --git a/config/config.go b/config/config.go
index cc7265f2f9..985236acef 100644
--- a/config/config.go
+++ b/config/config.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/config/db.go b/config/db.go
index bbc2869446..19874b1dab 100644
--- a/config/db.go
+++ b/config/db.go
@@ -5,8 +5,8 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 // ServiceProvider takes a config and a logger and returns a ready to go Node.
diff --git a/config/toml.go b/config/toml.go
index bfb1f9e43e..d3e7aa2eca 100644
--- a/config/toml.go
+++ b/config/toml.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 // defaultDirPerm is the default permissions used when creating directories.
diff --git a/crypto/batch/batch.go b/crypto/batch/batch.go
index 465aeffef4..cdbf535bbf 100644
--- a/crypto/batch/batch.go
+++ b/crypto/batch/batch.go
@@ -1,8 +1,8 @@
 package batch
 
 import (
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
 )
 
 // CreateBatchVerifier checks if a key type implements the batch verifier interface.
diff --git a/crypto/bls12381/bench_test.go b/crypto/bls12381/bench_test.go
index 4544aa5373..46fbf08093 100644
--- a/crypto/bls12381/bench_test.go
+++ b/crypto/bls12381/bench_test.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/internal/benchmarking"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/internal/benchmarking"
 )
 
 func BenchmarkKeyGeneration(b *testing.B) {
diff --git a/crypto/bls12381/bls12381.go b/crypto/bls12381/bls12381.go
index b09cd837c5..f9bb042dd9 100644
--- a/crypto/bls12381/bls12381.go
+++ b/crypto/bls12381/bls12381.go
@@ -10,10 +10,10 @@ import (
 	"io"
 
 	bls "github.com/dashpay/bls-signatures/go-bindings"
-	"github.com/tendermint/tendermint/internal/jsontypes"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 //-------------------------------------
diff --git a/crypto/bls12381/bls12381_test.go b/crypto/bls12381/bls12381_test.go
index 14d9eae588..8a05069ba0 100644
--- a/crypto/bls12381/bls12381_test.go
+++ b/crypto/bls12381/bls12381_test.go
@@ -9,8 +9,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 func TestSignAndValidateBLS12381(t *testing.T) {
diff --git a/crypto/crypto.go b/crypto/crypto.go
index c7631cd937..48a51193b7 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 const (
@@ -205,7 +205,7 @@ type HexStringer interface {
 }
 
 // BatchVerifier If a new key type implements batch verification,
-// the key type must be registered in github.com/tendermint/tendermint/crypto/batch
+// the key type must be registered in github.com/dashpay/tenderdash/crypto/batch
 type BatchVerifier interface {
 	// Add appends an entry into the BatchVerifier.
 	Add(key PubKey, message, signature []byte) error
diff --git a/crypto/ed25519/bench_test.go b/crypto/ed25519/bench_test.go
index 49fcd15041..ece3518759 100644
--- a/crypto/ed25519/bench_test.go
+++ b/crypto/ed25519/bench_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/internal/benchmarking"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/internal/benchmarking"
 )
 
 func BenchmarkKeyGeneration(b *testing.B) {
diff --git a/crypto/ed25519/ed25519.go b/crypto/ed25519/ed25519.go
index d865a38503..9e45e98972 100644
--- a/crypto/ed25519/ed25519.go
+++ b/crypto/ed25519/ed25519.go
@@ -15,8 +15,8 @@ import (
 	"github.com/oasisprotocol/curve25519-voi/primitives/ed25519"
 	"github.com/oasisprotocol/curve25519-voi/primitives/ed25519/extra/cache"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/jsontypes"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
 )
 
 //-------------------------------------
diff --git a/crypto/ed25519/ed25519_test.go b/crypto/ed25519/ed25519_test.go
index 4aa107dcb0..a854059cc8 100644
--- a/crypto/ed25519/ed25519_test.go
+++ b/crypto/ed25519/ed25519_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 func TestSignAndValidateEd25519(t *testing.T) {
diff --git a/crypto/encoding/codec.go b/crypto/encoding/codec.go
index 8ca540ecd2..9d6cabd861 100644
--- a/crypto/encoding/codec.go
+++ b/crypto/encoding/codec.go
@@ -3,13 +3,12 @@ package encoding
 import (
 	"fmt"
 
-	"github.com/tendermint/tendermint/crypto/bls12381"
-
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/secp256k1"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/secp256k1"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	cryptoproto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 )
 
 func init() {
diff --git a/crypto/internal/benchmarking/bench.go b/crypto/internal/benchmarking/bench.go
index aae0720f50..37e6f23389 100644
--- a/crypto/internal/benchmarking/bench.go
+++ b/crypto/internal/benchmarking/bench.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 // The code in this file is adapted from agl/ed25519.
diff --git a/crypto/merkle/hash.go b/crypto/merkle/hash.go
index 0bb5448d71..42deb46b70 100644
--- a/crypto/merkle/hash.go
+++ b/crypto/merkle/hash.go
@@ -3,7 +3,7 @@ package merkle
 import (
 	"hash"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 // TODO: make these have a large predefined capacity
diff --git a/crypto/merkle/proof.go b/crypto/merkle/proof.go
index 226e24b9d5..8dce4774b3 100644
--- a/crypto/merkle/proof.go
+++ b/crypto/merkle/proof.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
+	tmcrypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 )
 
 const (
diff --git a/crypto/merkle/proof_op.go b/crypto/merkle/proof_op.go
index 038037cf53..bbdfe756bc 100644
--- a/crypto/merkle/proof_op.go
+++ b/crypto/merkle/proof_op.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
+	tmcrypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 )
 
 //----------------------------------------
diff --git a/crypto/merkle/proof_test.go b/crypto/merkle/proof_test.go
index 02866de931..5c6cddccf9 100644
--- a/crypto/merkle/proof_test.go
+++ b/crypto/merkle/proof_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 	goanimo "github.com/tendermint/go-amino"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
+	tmcrypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 )
 
 const ProofOpDomino = "test:domino"
diff --git a/crypto/merkle/proof_value.go b/crypto/merkle/proof_value.go
index 2379b8858a..1d1aca2b8a 100644
--- a/crypto/merkle/proof_value.go
+++ b/crypto/merkle/proof_value.go
@@ -5,7 +5,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 
-	tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
+	tmcrypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 )
 
 const ProofOpValue = "simple:v"
diff --git a/crypto/merkle/rfc6962_test.go b/crypto/merkle/rfc6962_test.go
index 443656c175..4e9dbaf4e3 100644
--- a/crypto/merkle/rfc6962_test.go
+++ b/crypto/merkle/rfc6962_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 func TestRFC6962Hasher(t *testing.T) {
diff --git a/crypto/merkle/tree_test.go b/crypto/merkle/tree_test.go
index 72b260178f..384749c6a5 100644
--- a/crypto/merkle/tree_test.go
+++ b/crypto/merkle/tree_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	ctest "github.com/tendermint/tendermint/internal/libs/test"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/crypto"
+	ctest "github.com/dashpay/tenderdash/internal/libs/test"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 type testItem []byte
diff --git a/crypto/random_test.go b/crypto/random_test.go
index 34f7372fe2..67b6af3f3b 100644
--- a/crypto/random_test.go
+++ b/crypto/random_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 // the purpose of this test is primarily to ensure that the randomness
diff --git a/crypto/secp256k1/secp256k1.go b/crypto/secp256k1/secp256k1.go
index 1655472028..1827a126f8 100644
--- a/crypto/secp256k1/secp256k1.go
+++ b/crypto/secp256k1/secp256k1.go
@@ -13,8 +13,8 @@ import (
 
 	secp256k1 "github.com/btcsuite/btcd/btcec"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/jsontypes"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
 
 	// necessary for Bitcoin address format
 	"golang.org/x/crypto/ripemd160" //nolint:staticcheck
diff --git a/crypto/secp256k1/secp256k1_test.go b/crypto/secp256k1/secp256k1_test.go
index 6cd53704c5..0ee45013f9 100644
--- a/crypto/secp256k1/secp256k1_test.go
+++ b/crypto/secp256k1/secp256k1_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/secp256k1"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/secp256k1"
 )
 
 type keyData struct {
diff --git a/dash/context.go b/dash/context.go
index 7547a29ba2..370a65136b 100644
--- a/dash/context.go
+++ b/dash/context.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 type contextKey string
diff --git a/dash/core/client.go b/dash/core/client.go
index b3cd0f051a..0ea829798c 100644
--- a/dash/core/client.go
+++ b/dash/core/client.go
@@ -6,9 +6,9 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	rpc "github.com/dashpay/dashd-go/rpcclient"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 const ModuleName = "rpcclient"
diff --git a/dash/core/mock.go b/dash/core/mock.go
index 0adb1c8094..e396f646a7 100644
--- a/dash/core/mock.go
+++ b/dash/core/mock.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // MockClient is an implementation of a mock core-server
diff --git a/dash/llmq/iter.go b/dash/llmq/iter.go
index 0423879758..e94d5d23a7 100644
--- a/dash/llmq/iter.go
+++ b/dash/llmq/iter.go
@@ -1,6 +1,6 @@
 package llmq
 
-import "github.com/tendermint/tendermint/crypto"
+import "github.com/dashpay/tenderdash/crypto"
 
 // Iter creates and returns LLMQ iterator
 func (l *Data) Iter() *Iter {
diff --git a/dash/llmq/llmq.go b/dash/llmq/llmq.go
index 13fb0813ad..19ee0ec23d 100644
--- a/dash/llmq/llmq.go
+++ b/dash/llmq/llmq.go
@@ -11,8 +11,8 @@ import (
 	bls "github.com/dashpay/bls-signatures/go-bindings"
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
 )
 
 var (
diff --git a/dash/llmq/llmq_test.go b/dash/llmq/llmq_test.go
index c84c7f5e84..25827eea10 100644
--- a/dash/llmq/llmq_test.go
+++ b/dash/llmq/llmq_test.go
@@ -9,8 +9,9 @@ import (
 
 	bls "github.com/dashpay/bls-signatures/go-bindings"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
+
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
 )
 
 const defaultSeedSource = 999
diff --git a/dash/quorum/mock/dash_dialer.go b/dash/quorum/mock/dash_dialer.go
index 4c8ca2d49a..9a94ea73bd 100644
--- a/dash/quorum/mock/dash_dialer.go
+++ b/dash/quorum/mock/dash_dialer.go
@@ -6,8 +6,8 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/dash/quorum/mock/test_helpers.go b/dash/quorum/mock/test_helpers.go
index ee9e2aab08..0710d32ab3 100644
--- a/dash/quorum/mock/test_helpers.go
+++ b/dash/quorum/mock/test_helpers.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // NewNodeAddress generates a string that is accepted as validator address.
diff --git a/dash/quorum/nodeid_resolver.go b/dash/quorum/nodeid_resolver.go
index e9ad714451..a86954e90f 100644
--- a/dash/quorum/nodeid_resolver.go
+++ b/dash/quorum/nodeid_resolver.go
@@ -5,9 +5,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/conn"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/conn"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/dash/quorum/nodeid_resolver_test.go b/dash/quorum/nodeid_resolver_test.go
index 49d1d9a64a..287d93f078 100644
--- a/dash/quorum/nodeid_resolver_test.go
+++ b/dash/quorum/nodeid_resolver_test.go
@@ -7,8 +7,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/types"
+
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // TestNewValidator checks if new validator can be created with some validator address, and then the address can be
diff --git a/dash/quorum/selectpeers/dip6.go b/dash/quorum/selectpeers/dip6.go
index 2999bc7328..01a0b8ff1b 100644
--- a/dash/quorum/selectpeers/dip6.go
+++ b/dash/quorum/selectpeers/dip6.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // minValidators is a minimum number of validators needed in order to execute the selection
diff --git a/dash/quorum/selectpeers/dip6_test.go b/dash/quorum/selectpeers/dip6_test.go
index 791ae26059..2491eb3e0d 100644
--- a/dash/quorum/selectpeers/dip6_test.go
+++ b/dash/quorum/selectpeers/dip6_test.go
@@ -5,9 +5,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tendermint/dash/quorum/mock"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+
+	"github.com/dashpay/tenderdash/dash/quorum/mock"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/dash/quorum/selectpeers/sortable_validator.go b/dash/quorum/selectpeers/sortable_validator.go
index 35ff19f8f8..602a918308 100644
--- a/dash/quorum/selectpeers/sortable_validator.go
+++ b/dash/quorum/selectpeers/sortable_validator.go
@@ -3,9 +3,9 @@ package selectpeers
 import (
 	"bytes"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // sortableValidator is a `types.Validator` which can generate SortKey(), as specified in DIP-6
diff --git a/dash/quorum/selectpeers/sortable_validator_test.go b/dash/quorum/selectpeers/sortable_validator_test.go
index 943154b507..108d6134c0 100644
--- a/dash/quorum/selectpeers/sortable_validator_test.go
+++ b/dash/quorum/selectpeers/sortable_validator_test.go
@@ -4,10 +4,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash/quorum/mock"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash/quorum/mock"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Test_sortableValidator_SortKey checks if the sortableValidatorList.Index() works correctly
diff --git a/dash/quorum/selectpeers/sorted_validator_list.go b/dash/quorum/selectpeers/sorted_validator_list.go
index 5bdfb6a8b8..09455d3f17 100644
--- a/dash/quorum/selectpeers/sorted_validator_list.go
+++ b/dash/quorum/selectpeers/sorted_validator_list.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"sort"
 
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // sortedValidatorList is a list of sortableValidators that are sorted by `sortableValidator.SortKey()`
diff --git a/dash/quorum/selectpeers/sorted_validator_list_test.go b/dash/quorum/selectpeers/sorted_validator_list_test.go
index 36e90d6e52..972efc5577 100644
--- a/dash/quorum/selectpeers/sorted_validator_list_test.go
+++ b/dash/quorum/selectpeers/sorted_validator_list_test.go
@@ -4,7 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tendermint/dash/quorum/mock"
+
+	"github.com/dashpay/tenderdash/dash/quorum/mock"
 )
 
 // Test_sortableValidatorList_Index checks if the sortableValidatorList.Index() works correctly
diff --git a/dash/quorum/selectpeers/validatorselector.go b/dash/quorum/selectpeers/validatorselector.go
index a0887d039a..f83f19eab1 100644
--- a/dash/quorum/selectpeers/validatorselector.go
+++ b/dash/quorum/selectpeers/validatorselector.go
@@ -1,6 +1,6 @@
 package selectpeers
 
-import "github.com/tendermint/tendermint/types"
+import "github.com/dashpay/tenderdash/types"
 
 // ValidatorSelector represents an algorithm that chooses some validators from provided list
 type ValidatorSelector interface {
diff --git a/dash/quorum/utils.go b/dash/quorum/utils.go
index 35cee87d84..21f7a46ee8 100644
--- a/dash/quorum/utils.go
+++ b/dash/quorum/utils.go
@@ -1,8 +1,8 @@
 package quorum
 
 import (
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // nodeAddress converts ValidatorAddress to a NodeAddress object
diff --git a/dash/quorum/validator_conn_executor.go b/dash/quorum/validator_conn_executor.go
index 4c54a43931..ffad0b475b 100644
--- a/dash/quorum/validator_conn_executor.go
+++ b/dash/quorum/validator_conn_executor.go
@@ -10,15 +10,15 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash/quorum/selectpeers"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/p2p"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash/quorum/selectpeers"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/dash/quorum/validator_conn_executor_test.go b/dash/quorum/validator_conn_executor_test.go
index 2966466544..e5fb35705c 100644
--- a/dash/quorum/validator_conn_executor_test.go
+++ b/dash/quorum/validator_conn_executor_test.go
@@ -11,23 +11,23 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/dash/quorum/mock"
-	"github.com/tendermint/tendermint/dash/quorum/selectpeers"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/mempool/mocks"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/proxy"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/dash/quorum/mock"
+	"github.com/dashpay/tenderdash/dash/quorum/selectpeers"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/mempool/mocks"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/dash/quorum/validator_map.go b/dash/quorum/validator_map.go
index ca9d1da40a..5ca6829807 100644
--- a/dash/quorum/validator_map.go
+++ b/dash/quorum/validator_map.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // validatorMapIndexType represents data that is used to index `validatorMap` elements
diff --git a/dash/quorum/validator_map_test.go b/dash/quorum/validator_map_test.go
index 76c196b8d2..38a3debc47 100644
--- a/dash/quorum/validator_map_test.go
+++ b/dash/quorum/validator_map_test.go
@@ -3,9 +3,9 @@ package quorum
 import (
 	"testing"
 
+	"github.com/dashpay/tenderdash/dash/quorum/mock"
+	"github.com/dashpay/tenderdash/types"
 	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tendermint/dash/quorum/mock"
-	"github.com/tendermint/tendermint/types"
 )
 
 func Test_validatorMap_String(t *testing.T) {
diff --git a/go.mod b/go.mod
index 0fcaebb7f4..f0e423c3c2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/tendermint/tendermint
+module github.com/dashpay/tenderdash
 
 go 1.19
 
@@ -18,7 +18,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.2
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/golangci/golangci-lint v1.47.2
+	github.com/golangci/golangci-lint v1.48.0
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/gopacket v1.1.19
 	github.com/google/orderedcode v0.0.1
@@ -47,7 +47,7 @@ require (
 )
 
 require (
-	github.com/bufbuild/buf v1.4.0
+	github.com/bufbuild/buf v1.7.0
 	github.com/creachadair/atomicfile v0.2.6
 	github.com/creachadair/taskgroup v0.3.2
 	github.com/go-pkgz/jrpc v0.2.0
@@ -60,17 +60,34 @@ require (
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
 	github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
 	github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
+	github.com/bufbuild/connect-go v0.2.0 // indirect
+	github.com/containerd/containerd v1.6.6 // indirect
+	github.com/containerd/typeurl v1.0.2 // indirect
 	github.com/dashpay/dashd-go/btcutil v1.2.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
 	github.com/didip/tollbooth/v6 v6.0.1 // indirect
 	github.com/didip/tollbooth_chi v0.0.0-20200524181329-8b84cd7183d9 // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
+	github.com/docker/docker v20.10.17+incompatible // indirect
+	github.com/go-chi/chi/v5 v5.0.7 // indirect
 	github.com/go-chi/render v1.0.1 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-pkgz/expirable-cache v0.0.3 // indirect
 	github.com/go-pkgz/rest v1.5.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/moby/buildkit v0.10.3 // indirect
+	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/sashamelentyev/usestdlibvars v1.8.0 // indirect
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0 // indirect
+	go.opentelemetry.io/otel v1.8.0 // indirect
+	go.opentelemetry.io/otel/trace v1.8.0 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b // indirect
 )
@@ -82,13 +99,13 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/DataDog/zstd v1.4.1 // indirect
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
-	github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0 // indirect
+	github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.2 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
 	github.com/alexkohler/prealloc v1.0.0 // indirect
-	github.com/alingse/asasalint v0.0.10 // indirect
+	github.com/alingse/asasalint v0.0.11 // indirect
 	github.com/ashanbrown/forbidigo v1.3.0 // indirect
 	github.com/ashanbrown/makezero v1.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -104,7 +121,7 @@ require (
 	github.com/charithe/durationcheck v0.0.9 // indirect
 	github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/daixiang0/gci v0.4.3 // indirect
+	github.com/daixiang0/gci v0.6.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/denis-tingaikin/go-header v0.4.3 // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
@@ -115,7 +132,6 @@ require (
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/esimonov/ifshort v1.0.4 // indirect
 	github.com/ettle/strcase v0.1.1 // indirect
-	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
 	github.com/firefart/nonamedreturns v1.0.4 // indirect
@@ -141,14 +157,13 @@ require (
 	github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
 	github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
 	github.com/golangci/misspell v0.3.5 // indirect
-	github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
+	github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
 	github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
 	github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
 	github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
 	github.com/gostaticanalysis/comment v1.4.2 // indirect
 	github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
 	github.com/gostaticanalysis/nilerr v0.1.1 // indirect
-	github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-version v1.6.0 // indirect
@@ -158,12 +173,12 @@ require (
 	github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect
 	github.com/jgautheron/goconst v1.5.1 // indirect
 	github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f // indirect
-	github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753 // indirect
+	github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b // indirect
 	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
 	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/julz/importas v0.1.0 // indirect
-	github.com/kisielk/errcheck v1.6.1 // indirect
+	github.com/kisielk/errcheck v1.6.2 // indirect
 	github.com/kisielk/gotool v1.0.0 // indirect
 	github.com/klauspost/compress v1.15.10 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
@@ -192,7 +207,7 @@ require (
 	github.com/nishanths/predeclared v0.2.2 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
 	github.com/opencontainers/runc v1.1.3 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
@@ -209,14 +224,14 @@ require (
 	github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
 	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/ryancurrah/gomodguard v1.2.3 // indirect
+	github.com/ryancurrah/gomodguard v1.2.4 // indirect
 	github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
 	github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
 	github.com/securego/gosec/v2 v2.12.0 // indirect
 	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/sivchari/containedctx v1.0.2 // indirect
-	github.com/sivchari/nosnakecase v1.5.0 // indirect
+	github.com/sivchari/nosnakecase v1.7.0 // indirect
 	github.com/sivchari/tenv v1.7.0 // indirect
 	github.com/sonatard/noctx v0.0.1 // indirect
 	github.com/sourcegraph/go-diff v0.6.1 // indirect
@@ -240,7 +255,7 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yagipy/maintidx v1.0.0 // indirect
 	github.com/yeya24/promlinter v0.2.0 // indirect
-	gitlab.com/bosi/decorder v0.2.2 // indirect
+	gitlab.com/bosi/decorder v0.2.3 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.opencensus.io v0.23.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
@@ -256,7 +271,7 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	honnef.co/go/tools v0.3.2 // indirect
+	honnef.co/go/tools v0.3.3 // indirect
 	mvdan.cc/gofumpt v0.3.1 // indirect
 	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
 	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
@@ -270,8 +285,7 @@ require (
 	github.com/sasha-s/go-deadlock v0.3.1
 	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
 	github.com/tendermint/go-amino v0.16.0
+	github.com/tendermint/tendermint v0.34.21
 	github.com/tyler-smith/go-bip39 v1.1.0
 	golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
 )
-
-replace github.com/tendermint/tendermint => ./
diff --git a/go.sum b/go.sum
index a8a10a935f..7e4ff6ecb6 100644
--- a/go.sum
+++ b/go.sum
@@ -21,12 +21,14 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
+cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
@@ -59,8 +61,8 @@ github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM=
 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
-github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0 h1:V9xVvhKbLt7unNEGAruK1xXglyc668Pq3Xx0MNTNqpo=
-github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.0/go.mod h1:n/vLeA7V+QY84iYAGwMkkUUp9ooeuftMEvaDrSVch+Q=
+github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.2 h1:DGdS4FlsdM6OkluXOhgkvwx05ZjD3Idm9WqtYnOmSuY=
+github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.2/go.mod h1:xj0D2jwLdp6tOKLheyZCsfL0nz8DaicmJxSwj3VcHtY=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -86,8 +88,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw=
 github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
-github.com/alingse/asasalint v0.0.10 h1:qqGPDTV0ff0tWHN/nnIlSdjlU/EwRPaUY4SfpE1rnms=
-github.com/alingse/asasalint v0.0.10/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
+github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
+github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
 github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
@@ -131,8 +133,10 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
-github.com/bufbuild/buf v1.4.0 h1:GqE3a8CMmcFvWPzuY3Mahf9Kf3S9XgZ/ORpfYFzO+90=
-github.com/bufbuild/buf v1.4.0/go.mod h1:mwHG7klTHnX+rM/ym8LXGl7vYpVmnwT96xWoRB4H5QI=
+github.com/bufbuild/buf v1.7.0 h1:uWRjhIXcrWkzIkA5TqXGyJbF51VW54QJsQZ3nwaes5Q=
+github.com/bufbuild/buf v1.7.0/go.mod h1:Go40fMAF46PnPLC7jJgTQhAI95pmC0+VtxFKVC0qLq0=
+github.com/bufbuild/connect-go v0.2.0 h1:WuMI/jLiJIhysHWvLWlxRozV67mGjCOUuDSl/lkDVic=
+github.com/bufbuild/connect-go v0.2.0/go.mod h1:4efZ2eXFENwd4p7tuLaL9m0qtTsCOzuBvrohvRGevDM=
 github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY=
 github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
@@ -163,8 +167,12 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0=
+github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
+github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY=
+github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s=
 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=
@@ -188,9 +196,11 @@ github.com/creachadair/tomledit v0.0.23 h1:ohYJjMsxwzj4dDzKaBWFbWH5J+3LO/8CYnlVY
 github.com/creachadair/tomledit v0.0.23/go.mod h1:cIu/4x5L855oSRejIqr+WRFh+mv9g4fWLiUFaApYn/Y=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/daixiang0/gci v0.4.3 h1:wf7x0xRjQqTlA2dzHTI0A/xPyp7VcBatBG9nwGatwbQ=
-github.com/daixiang0/gci v0.4.3/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c=
+github.com/daixiang0/gci v0.6.2 h1:TXCP5RqjE/UupXO+p33MEhqdv7QxjKGw5MVkt9ATiMs=
+github.com/daixiang0/gci v0.6.2/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c=
 github.com/dashpay/bls-signatures/go-bindings v0.0.0-20230207105415-06df92693ac8 h1:v4K3CiDoFY1gjcWL/scRcwzyjBwh8TVG3ek8cWolK1g=
 github.com/dashpay/bls-signatures/go-bindings v0.0.0-20230207105415-06df92693ac8/go.mod h1:auvGS60NBZ+a21aCCQh366PdsjDvHinsCvl28VrYPu4=
 github.com/dashpay/dashd-go v0.24.0 h1:doC8GW2/ygu5JPCvYHQLx6TNza0TPcCR5rXUUS9CxY8=
@@ -223,7 +233,10 @@ github.com/didip/tollbooth/v6 v6.0.1/go.mod h1:j2pKs+JQ5PvU/K4jFnrnwntrmfUbYLJE5
 github.com/didip/tollbooth_chi v0.0.0-20200524181329-8b84cd7183d9 h1:gTh8fKuI/yLqQtZEPlDX3ZGsiTPZIe0ADHsxXSbwO1I=
 github.com/didip/tollbooth_chi v0.0.0-20200524181329-8b84cd7183d9/go.mod h1:YWyIfq3y4ArRfWZ9XksmuusP+7Mad+T0iFZ0kv0XG/M=
 github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M=
+github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
+github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE=
+github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -247,7 +260,6 @@ github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw=
 github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY=
 github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0=
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
-github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
 github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
@@ -274,6 +286,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
 github.com/go-chi/chi v4.1.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
 github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
+github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
 github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
 github.com/go-critic/go-critic v0.6.3 h1:abibh5XYBTASawfTQ0rA7dVtQT+6KzpGqb/J+DxRDaw=
@@ -287,10 +301,18 @@ github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
 github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
+github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
+github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-pkgz/expirable-cache v0.0.3 h1:rTh6qNPp78z0bQE6HDhXBHUwqnV9i09Vm6dksJLXQDc=
 github.com/go-pkgz/expirable-cache v0.0.3/go.mod h1:+IauqN00R2FqNRLCLA+X5YljQJrwB179PfiAoMPlTlQ=
 github.com/go-pkgz/jrpc v0.2.0 h1:CLy/eZyekjraVrxZV18N2R1mYLMJ/nWrgdfyIOGPY/E=
@@ -383,16 +405,16 @@ github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6
 github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ=
 github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks=
 github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
-github.com/golangci/golangci-lint v1.47.2 h1:qvMDVv49Hrx3PSEXZ0bD/yhwSbhsOihQjFYCKieegIw=
-github.com/golangci/golangci-lint v1.47.2/go.mod h1:lpS2pjBZtRyXewUcOY7yUL3K4KfpoWz072yRN8AuhHg=
+github.com/golangci/golangci-lint v1.48.0 h1:hRiBNk9iRqdAKMa06ntfEiLyza1/3IE9rHLNJaek4a8=
+github.com/golangci/golangci-lint v1.48.0/go.mod h1:5N+oxduCho+7yuccW69upg/O7cxjfR/d+IQeiNxGmKM=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg=
 github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA=
 github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o=
 github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo=
 github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA=
-github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 h1:SgM7GDZTxtTTQPU84heOxy34iG5Du7F2jcoZnvp+fXI=
-github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY=
+github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ=
+github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs=
 github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys=
 github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -416,8 +438,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -475,7 +497,6 @@ github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW
 github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M=
 github.com/gostaticanalysis/testutil v0.4.0 h1:nhdCmubdmDF6VEatUNjgUZBJKWRqugoISdUv3PPQgHY=
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI=
-github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI=
@@ -523,8 +544,8 @@ github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f h1:BNuUg9k2EiJm
 github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q=
 github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4=
 github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E=
-github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753 h1:uFlcJKZPLQd7rmOY/RrvBuUaYmAFnlFHKLivhO6cOy8=
-github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI=
+github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98=
+github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI=
 github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs=
 github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c=
 github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48=
@@ -557,8 +578,8 @@ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/errcheck v1.6.1 h1:cErYo+J4SmEjdXZrVXGwLJCE2sB06s23LpkcyWNrT+s=
-github.com/kisielk/errcheck v1.6.1/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
+github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c=
+github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
 github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
@@ -649,8 +670,11 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/buildkit v0.10.3 h1:/dGykD8FW+H4p++q5+KqKEo6gAkYKyBQHdawdjVwVAU=
+github.com/moby/buildkit v0.10.3/go.mod h1:jxeOuly98l9gWHai0Ojrbnczrk/rf+o9/JqNhY+UCSo=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc=
+github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -659,6 +683,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4=
 github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k=
+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8=
 github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s=
 github.com/mroth/weightedrand v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6YyI=
@@ -709,8 +735,8 @@ github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
-github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec=
+github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w=
 github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
@@ -803,14 +829,16 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryancurrah/gomodguard v1.2.3 h1:ww2fsjqocGCAFamzvv/b8IsRduuHHeK2MHTcTxZTQX8=
-github.com/ryancurrah/gomodguard v1.2.3/go.mod h1:rYbA/4Tg5c54mV1sv4sQTP5WOPBcoLtnBZ7/TEhXAbg=
+github.com/ryancurrah/gomodguard v1.2.4 h1:CpMSDKan0LtNGGhPrvupAoLeObRFjND8/tU1rEOtBp4=
+github.com/ryancurrah/gomodguard v1.2.4/go.mod h1:+Kem4VjWwvFpUJRJSwa16s1tBJe+vbv02+naTow2f6M=
 github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw=
 github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA=
 github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA=
 github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
 github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
 github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
+github.com/sashamelentyev/usestdlibvars v1.8.0 h1:QnWP9IOEuRyYKH+IG0LlQIjuJlc0rfdo4K3/Zh3WRMw=
+github.com/sashamelentyev/usestdlibvars v1.8.0/go.mod h1:BFt7b5mSVHaaa26ZupiNRV2ODViQBxZZVhtAxAJRrjs=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/securego/gosec/v2 v2.12.0 h1:CQWdW7ATFpvLSohMVsajscfyHJ5rsGmEXmsNcsDNmAg=
 github.com/securego/gosec/v2 v2.12.0/go.mod h1:iTpT+eKTw59bSgklBHlSnH5O2tNygHMDxfvMubA4i7I=
@@ -824,12 +852,13 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI=
 github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw=
-github.com/sivchari/nosnakecase v1.5.0 h1:ZBvAu1H3uteN0KQ0IsLpIFOwYgPEhKLyv2ahrVkub6M=
-github.com/sivchari/nosnakecase v1.5.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY=
+github.com/sivchari/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8=
+github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY=
 github.com/sivchari/tenv v1.7.0 h1:d4laZMBK6jpe5PWepxlV9S+LC0yXqvYHiq8E6ceoVVE=
 github.com/sivchari/tenv v1.7.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg=
 github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa h1:YJfZp12Z3AFhSBeXOlv4BO55RMwPn2NoQeDsrdWnBtY=
@@ -895,6 +924,8 @@ github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzH
 github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8=
 github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E=
 github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME=
+github.com/tendermint/tendermint v0.34.21 h1:UiGGnBFHVrZhoQVQ7EfwSOLuCtarqCSsRf8VrklqB7s=
+github.com/tendermint/tendermint v0.34.21/go.mod h1:XDvfg6U7grcFTDx7VkzxnhazQ/bspGJAn4DZ6DcLLjQ=
 github.com/tendermint/tm-db v0.6.6 h1:EzhaOfR0bdKyATqcd5PNeyeq8r+V4bRPHBfyFdD9kGM=
 github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI=
 github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA=
@@ -950,8 +981,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-gitlab.com/bosi/decorder v0.2.2 h1:LRfb3lP6mZWjUzpMOCLTVjcnl/SqZWBWmKNqQvMocQs=
-gitlab.com/bosi/decorder v0.2.2/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE=
+gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0=
+gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
@@ -966,6 +997,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0 h1:z6rnla1Asjzn0FrhohzIbDi4bxbtc6EMmQ7f5ZPn+pA=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI=
+go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg=
+go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
+go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY=
+go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1108,6 +1145,7 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE=
 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=
@@ -1202,6 +1240,7 @@ golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1245,6 +1284,7 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -1351,6 +1391,7 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -1475,6 +1516,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
+gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1482,8 +1525,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.3.2 h1:ytYb4rOqyp1TSa2EPvNVwtPQJctSELKaMyLfqNP4+34=
-honnef.co/go/tools v0.3.2/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw=
+honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA=
+honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw=
 mvdan.cc/gofumpt v0.3.1 h1:avhhrOmv0IuvQVK7fvwV91oFSGAk5/6Po8GXTzICeu8=
 mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
diff --git a/internal/blocksync/applier.go b/internal/blocksync/applier.go
index 528efd8d51..1fe63d0de3 100644
--- a/internal/blocksync/applier.go
+++ b/internal/blocksync/applier.go
@@ -6,10 +6,10 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/consensus"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type (
diff --git a/internal/blocksync/applier_test.go b/internal/blocksync/applier_test.go
index 382a76f4d2..a7f57b832d 100644
--- a/internal/blocksync/applier_test.go
+++ b/internal/blocksync/applier_test.go
@@ -9,11 +9,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	statefactory "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	statefactory "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestBlockApplierApply(t *testing.T) {
diff --git a/internal/blocksync/block_fetch_job.go b/internal/blocksync/block_fetch_job.go
index fbab35034f..9701f151d9 100644
--- a/internal/blocksync/block_fetch_job.go
+++ b/internal/blocksync/block_fetch_job.go
@@ -6,10 +6,10 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/workerpool"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/workerpool"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type (
diff --git a/internal/blocksync/block_fetch_job_test.go b/internal/blocksync/block_fetch_job_test.go
index 8ae9a76a15..16af32b27e 100644
--- a/internal/blocksync/block_fetch_job_test.go
+++ b/internal/blocksync/block_fetch_job_test.go
@@ -10,16 +10,16 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/internal/p2p/client/mocks"
-	statefactory "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/promise"
-	"github.com/tendermint/tendermint/libs/workerpool"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/internal/p2p/client/mocks"
+	statefactory "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/promise"
+	"github.com/dashpay/tenderdash/libs/workerpool"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type BlockFetchJobTestSuite struct {
diff --git a/internal/blocksync/mocks/block_client.go b/internal/blocksync/mocks/block_client.go
index 9f4ef98e5f..bdf95bee04 100644
--- a/internal/blocksync/mocks/block_client.go
+++ b/internal/blocksync/mocks/block_client.go
@@ -5,13 +5,11 @@ package mocks
 import (
 	context "context"
 
-	blocksync "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-
 	mock "github.com/stretchr/testify/mock"
 
-	promise "github.com/tendermint/tendermint/libs/promise"
-
-	types "github.com/tendermint/tendermint/types"
+	promise "github.com/dashpay/tenderdash/libs/promise"
+	blocksync "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // BlockClient is an autogenerated mock type for the BlockClient type
diff --git a/internal/blocksync/msgs.go b/internal/blocksync/msgs.go
index 9613dd2bad..d54174cc9e 100644
--- a/internal/blocksync/msgs.go
+++ b/internal/blocksync/msgs.go
@@ -1,8 +1,8 @@
 package blocksync
 
 import (
-	p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	p2pproto "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/blocksync/p2p_msg_handler.go b/internal/blocksync/p2p_msg_handler.go
index eac2a603e2..babb5966de 100644
--- a/internal/blocksync/p2p_msg_handler.go
+++ b/internal/blocksync/p2p_msg_handler.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
 )
 
 type (
diff --git a/internal/blocksync/p2p_msg_handler_test.go b/internal/blocksync/p2p_msg_handler_test.go
index 993a1ab5c8..2e85d1c1e0 100644
--- a/internal/blocksync/p2p_msg_handler_test.go
+++ b/internal/blocksync/p2p_msg_handler_test.go
@@ -10,15 +10,15 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	p2pmocks "github.com/tendermint/tendermint/internal/p2p/mocks"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	"github.com/tendermint/tendermint/libs/log"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	p2pmocks "github.com/dashpay/tenderdash/internal/p2p/mocks"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/libs/log"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type BlockP2PMessageHandlerTestSuite struct {
diff --git a/internal/blocksync/peer_store.go b/internal/blocksync/peer_store.go
index 6bdb246141..2ec26cbb1b 100644
--- a/internal/blocksync/peer_store.go
+++ b/internal/blocksync/peer_store.go
@@ -7,9 +7,9 @@ import (
 
 	"golang.org/x/exp/constraints"
 
-	"github.com/tendermint/tendermint/internal/libs/flowrate"
-	"github.com/tendermint/tendermint/libs/store"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/libs/flowrate"
+	"github.com/dashpay/tenderdash/libs/store"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type (
diff --git a/internal/blocksync/peer_store_test.go b/internal/blocksync/peer_store_test.go
index 9251d17e8f..a954b604ca 100644
--- a/internal/blocksync/peer_store_test.go
+++ b/internal/blocksync/peer_store_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/libs/flowrate"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/libs/flowrate"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestInMemPeerStoreBasicOperations(t *testing.T) {
diff --git a/internal/blocksync/reactor.go b/internal/blocksync/reactor.go
index afb51c3fba..822550f165 100644
--- a/internal/blocksync/reactor.go
+++ b/internal/blocksync/reactor.go
@@ -7,17 +7,17 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ service.Service = (*Reactor)(nil)
diff --git a/internal/blocksync/reactor_test.go b/internal/blocksync/reactor_test.go
index 6054fecbbc..a882b2e2a4 100644
--- a/internal/blocksync/reactor_test.go
+++ b/internal/blocksync/reactor_test.go
@@ -12,22 +12,22 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	mpmocks "github.com/tendermint/tendermint/internal/mempool/mocks"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/internal/p2p/p2ptest"
-	"github.com/tendermint/tendermint/internal/proxy"
-	sm "github.com/tendermint/tendermint/internal/state"
-	sf "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	mpmocks "github.com/dashpay/tenderdash/internal/mempool/mocks"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/internal/p2p/p2ptest"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	sf "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type reactorTestSuite struct {
diff --git a/internal/blocksync/synchronizer.go b/internal/blocksync/synchronizer.go
index f10c4716f8..f035fd56b4 100644
--- a/internal/blocksync/synchronizer.go
+++ b/internal/blocksync/synchronizer.go
@@ -10,13 +10,13 @@ import (
 	"github.com/jonboulle/clockwork"
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/libs/workerpool"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/libs/workerpool"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 /*
diff --git a/internal/blocksync/synchronizer_test.go b/internal/blocksync/synchronizer_test.go
index b4fb653511..8c9c544c10 100644
--- a/internal/blocksync/synchronizer_test.go
+++ b/internal/blocksync/synchronizer_test.go
@@ -14,18 +14,18 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	clientmocks "github.com/tendermint/tendermint/internal/p2p/client/mocks"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	statefactory "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/promise"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/libs/workerpool"
-	"github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	clientmocks "github.com/dashpay/tenderdash/internal/p2p/client/mocks"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	statefactory "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/promise"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/libs/workerpool"
+	"github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 type SynchronizerTestSuite struct {
diff --git a/internal/consensus/block_executor.go b/internal/consensus/block_executor.go
index 762586afad..69783a3c8a 100644
--- a/internal/consensus/block_executor.go
+++ b/internal/consensus/block_executor.go
@@ -6,11 +6,12 @@ import (
 	"fmt"
 
 	sync "github.com/sasha-s/go-deadlock"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type blockExecutor struct {
diff --git a/internal/consensus/block_executor_test.go b/internal/consensus/block_executor_test.go
index 2e89c565e6..842d0495cf 100644
--- a/internal/consensus/block_executor_test.go
+++ b/internal/consensus/block_executor_test.go
@@ -10,14 +10,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/crypto"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	smmocks "github.com/tendermint/tendermint/internal/state/mocks"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/types/mocks"
+	"github.com/dashpay/tenderdash/crypto"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	smmocks "github.com/dashpay/tenderdash/internal/state/mocks"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/types/mocks"
 )
 
 type BockExecutorTestSuite struct {
diff --git a/internal/consensus/byzantine_test.go b/internal/consensus/byzantine_test.go
index 62e211d6c3..79ec408e07 100644
--- a/internal/consensus/byzantine_test.go
+++ b/internal/consensus/byzantine_test.go
@@ -13,21 +13,21 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/evidence"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/p2p"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/evidence"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Byzantine node sends two different prevotes (nil and blockID) to the same
diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go
index 15ed677fa7..807dbea5d0 100644
--- a/internal/consensus/common_test.go
+++ b/internal/consensus/common_test.go
@@ -19,27 +19,27 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/dash/llmq"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/mempool"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/consensus/core_chainlock_test.go b/internal/consensus/core_chainlock_test.go
index 80d485e2f5..227d40bf56 100644
--- a/internal/consensus/core_chainlock_test.go
+++ b/internal/consensus/core_chainlock_test.go
@@ -13,12 +13,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/counter"
-	abci "github.com/tendermint/tendermint/abci/types"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/counter"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestValidProposalChainLocks(t *testing.T) {
diff --git a/internal/consensus/event_publisher.go b/internal/consensus/event_publisher.go
index 6356185eee..411ddd5824 100644
--- a/internal/consensus/event_publisher.go
+++ b/internal/consensus/event_publisher.go
@@ -1,11 +1,11 @@
 package consensus
 
 import (
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // EventPublisher is event message sender to event-bus and event-switch
diff --git a/internal/consensus/gossip_handlers.go b/internal/consensus/gossip_handlers.go
index 49c7db2054..d9bddb8c8c 100644
--- a/internal/consensus/gossip_handlers.go
+++ b/internal/consensus/gossip_handlers.go
@@ -3,9 +3,9 @@ package consensus
 import (
 	"context"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func queryMaj23GossipHandler(ps *PeerState, gossiper Gossiper) gossipHandlerFunc {
diff --git a/internal/consensus/gossip_handlers_test.go b/internal/consensus/gossip_handlers_test.go
index 5983e2895f..efacd73674 100644
--- a/internal/consensus/gossip_handlers_test.go
+++ b/internal/consensus/gossip_handlers_test.go
@@ -9,15 +9,15 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/consensus/mocks"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	statemocks "github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/consensus/mocks"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	statemocks "github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type GossipHandlerTestSuite struct {
diff --git a/internal/consensus/gossip_msg_sender.go b/internal/consensus/gossip_msg_sender.go
index 3e6ee648f9..21a544a92a 100644
--- a/internal/consensus/gossip_msg_sender.go
+++ b/internal/consensus/gossip_msg_sender.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/consensus/gossip_msg_sender_test.go b/internal/consensus/gossip_msg_sender_test.go
index 9e7d6f0e39..15684d9520 100644
--- a/internal/consensus/gossip_msg_sender_test.go
+++ b/internal/consensus/gossip_msg_sender_test.go
@@ -8,12 +8,12 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/mocks"
-	"github.com/tendermint/tendermint/libs/log"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/mocks"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestP2PMsgSender_Send(t *testing.T) {
diff --git a/internal/consensus/gossip_peer_worker.go b/internal/consensus/gossip_peer_worker.go
index 524b16dd14..f4c12d177d 100644
--- a/internal/consensus/gossip_peer_worker.go
+++ b/internal/consensus/gossip_peer_worker.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/jonboulle/clockwork"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type gossipHandlerFunc func(ctx context.Context, appState StateData)
diff --git a/internal/consensus/gossip_peer_worker_test.go b/internal/consensus/gossip_peer_worker_test.go
index 95b744c4f9..23edd6b80c 100644
--- a/internal/consensus/gossip_peer_worker_test.go
+++ b/internal/consensus/gossip_peer_worker_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func TestPeerGossipWorker(t *testing.T) {
diff --git a/internal/consensus/gossiper.go b/internal/consensus/gossiper.go
index 8e14bb3022..0221e2d7a9 100644
--- a/internal/consensus/gossiper.go
+++ b/internal/consensus/gossiper.go
@@ -9,12 +9,12 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/hashicorp/go-multierror"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Gossiper is the interface that wraps the methods needed to gossip a state between connected peers
diff --git a/internal/consensus/gossiper_test.go b/internal/consensus/gossiper_test.go
index 00bcb0fe42..09d0cd9347 100644
--- a/internal/consensus/gossiper_test.go
+++ b/internal/consensus/gossiper_test.go
@@ -10,17 +10,17 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/crypto"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/p2p"
-	p2pmocks "github.com/tendermint/tendermint/internal/p2p/mocks"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	p2pmocks "github.com/dashpay/tenderdash/internal/p2p/mocks"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type GossiperSuiteTest struct {
diff --git a/internal/consensus/helper_test.go b/internal/consensus/helper_test.go
index 135e4a037d..7864364a45 100644
--- a/internal/consensus/helper_test.go
+++ b/internal/consensus/helper_test.go
@@ -7,21 +7,21 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/proxy"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type nodeGen struct {
diff --git a/internal/consensus/invalid_test.go b/internal/consensus/invalid_test.go
index 5ec265c654..679bbedde9 100644
--- a/internal/consensus/invalid_test.go
+++ b/internal/consensus/invalid_test.go
@@ -11,14 +11,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestReactorInvalidPrecommit(t *testing.T) {
diff --git a/internal/consensus/mempool_test.go b/internal/consensus/mempool_test.go
index e3af7caf49..a3f75e729e 100644
--- a/internal/consensus/mempool_test.go
+++ b/internal/consensus/mempool_test.go
@@ -13,16 +13,16 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/abci/example/code"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/mempool"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // for testing
diff --git a/internal/consensus/metrics.go b/internal/consensus/metrics.go
index bdf0eb412c..2ffe67920b 100644
--- a/internal/consensus/metrics.go
+++ b/internal/consensus/metrics.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/go-kit/kit/metrics"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/consensus/mock_test.go b/internal/consensus/mock_test.go
index a5dd87f9d2..3857e95063 100644
--- a/internal/consensus/mock_test.go
+++ b/internal/consensus/mock_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type mockConstructorTesting interface {
diff --git a/internal/consensus/mocks/fast_sync_reactor.go b/internal/consensus/mocks/fast_sync_reactor.go
index 06886de27b..ea4907e268 100644
--- a/internal/consensus/mocks/fast_sync_reactor.go
+++ b/internal/consensus/mocks/fast_sync_reactor.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	mock "github.com/stretchr/testify/mock"
 
-	state "github.com/tendermint/tendermint/internal/state"
+	state "github.com/dashpay/tenderdash/internal/state"
 
 	time "time"
 )
diff --git a/internal/consensus/mocks/gossiper.go b/internal/consensus/mocks/gossiper.go
index b61f289f0e..b2f91225a9 100644
--- a/internal/consensus/mocks/gossiper.go
+++ b/internal/consensus/mocks/gossiper.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	types "github.com/dashpay/tenderdash/internal/consensus/types"
 	mock "github.com/stretchr/testify/mock"
-	types "github.com/tendermint/tendermint/internal/consensus/types"
 )
 
 // Gossiper is an autogenerated mock type for the Gossiper type
diff --git a/internal/consensus/msg_handlers.go b/internal/consensus/msg_handlers.go
index b4473bfc72..0d3e637904 100644
--- a/internal/consensus/msg_handlers.go
+++ b/internal/consensus/msg_handlers.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type msgInfoDispatcher struct {
diff --git a/internal/consensus/msg_queue.go b/internal/consensus/msg_queue.go
index dfc9a3fc4c..7fe524e789 100644
--- a/internal/consensus/msg_queue.go
+++ b/internal/consensus/msg_queue.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/types"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type msgEnvelope struct {
diff --git a/internal/consensus/msg_queue_test.go b/internal/consensus/msg_queue_test.go
index d0bafa575f..0507e10c39 100644
--- a/internal/consensus/msg_queue_test.go
+++ b/internal/consensus/msg_queue_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestChanQueue(t *testing.T) {
diff --git a/internal/consensus/msgs.go b/internal/consensus/msgs.go
index b69af6d4c8..bde6a81353 100644
--- a/internal/consensus/msgs.go
+++ b/internal/consensus/msgs.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	"github.com/tendermint/tendermint/libs/bits"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	"github.com/dashpay/tenderdash/libs/bits"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Message defines an interface that the consensus domain types implement. When
diff --git a/internal/consensus/msgs_test.go b/internal/consensus/msgs_test.go
index e68b15e3c4..73b5a1dede 100644
--- a/internal/consensus/msgs_test.go
+++ b/internal/consensus/msgs_test.go
@@ -12,17 +12,17 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/bits"
-	"github.com/tendermint/tendermint/libs/bytes"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/bits"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestMsgToProto(t *testing.T) {
diff --git a/internal/consensus/pbts_test.go b/internal/consensus/pbts_test.go
index aaabbcfe1d..203fc32f46 100644
--- a/internal/consensus/pbts_test.go
+++ b/internal/consensus/pbts_test.go
@@ -11,15 +11,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/consensus/peer_state.go b/internal/consensus/peer_state.go
index b343b75979..ffcb697ca5 100644
--- a/internal/consensus/peer_state.go
+++ b/internal/consensus/peer_state.go
@@ -11,11 +11,11 @@ import (
 
 	"github.com/rs/zerolog"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/bits"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/bits"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/consensus/peer_state_test.go b/internal/consensus/peer_state_test.go
index 97be569ff0..9c4b6fdcbc 100644
--- a/internal/consensus/peer_state_test.go
+++ b/internal/consensus/peer_state_test.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func peerStateSetup(h, r, v int) *PeerState {
diff --git a/internal/consensus/proposal_updater.go b/internal/consensus/proposal_updater.go
index 3950fbbf02..727a125f90 100644
--- a/internal/consensus/proposal_updater.go
+++ b/internal/consensus/proposal_updater.go
@@ -1,8 +1,8 @@
 package consensus
 
 import (
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type proposalUpdater struct {
diff --git a/internal/consensus/reactor.go b/internal/consensus/reactor.go
index b99a2281c7..12e22f798d 100644
--- a/internal/consensus/reactor.go
+++ b/internal/consensus/reactor.go
@@ -11,18 +11,18 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/internal/p2p"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/bits"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/bits"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go
index 3f10ad6025..fde234c87a 100644
--- a/internal/consensus/reactor_test.go
+++ b/internal/consensus/reactor_test.go
@@ -15,25 +15,25 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/dash/llmq"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/p2ptest"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	sm "github.com/tendermint/tendermint/internal/state"
-	statemocks "github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/p2ptest"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	statemocks "github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/consensus/replay.go b/internal/consensus/replay.go
index 4f45b8cbe7..f905500d95 100644
--- a/internal/consensus/replay.go
+++ b/internal/consensus/replay.go
@@ -10,13 +10,13 @@ import (
 	"reflect"
 	"time"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/proxy"
-	sm "github.com/tendermint/tendermint/internal/state"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var crc32c = crc32.MakeTable(crc32.Castagnoli)
diff --git a/internal/consensus/replay_file.go b/internal/consensus/replay_file.go
index eacf22081c..0c13b4dd27 100644
--- a/internal/consensus/replay_file.go
+++ b/internal/consensus/replay_file.go
@@ -12,14 +12,14 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/proxy"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/consensus/replay_stubs.go b/internal/consensus/replay_stubs.go
index d2188a4388..e02fc9e728 100644
--- a/internal/consensus/replay_stubs.go
+++ b/internal/consensus/replay_stubs.go
@@ -3,14 +3,14 @@ package consensus
 import (
 	"context"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/libs/clist"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/proxy"
-	"github.com/tendermint/tendermint/libs/log"
-	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/libs/clist"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/internal/consensus/replay_test.go b/internal/consensus/replay_test.go
index ceb4480f6f..a82fe66731 100644
--- a/internal/consensus/replay_test.go
+++ b/internal/consensus/replay_test.go
@@ -19,25 +19,25 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/proxy"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	sm "github.com/tendermint/tendermint/internal/state"
-	sf "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/store"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	sf "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/store"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // These tests ensure we can always recover from failure at any part of the consensus process.
diff --git a/internal/consensus/replayer.go b/internal/consensus/replayer.go
index 5e796a2b21..1ccdad0e0d 100644
--- a/internal/consensus/replayer.go
+++ b/internal/consensus/replayer.go
@@ -4,15 +4,15 @@ import (
 	"context"
 	"fmt"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // NewReplayBlockExecutor returns a new instance of state.BlockExecutor configured for BlockReplayer
diff --git a/internal/consensus/replayer_test.go b/internal/consensus/replayer_test.go
index 0606c3b0ef..06605849aa 100644
--- a/internal/consensus/replayer_test.go
+++ b/internal/consensus/replayer_test.go
@@ -8,17 +8,17 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/proxy"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtypes "github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtypes "github.com/dashpay/tenderdash/types"
 )
 
 func TestBlockReplayerReplay(t *testing.T) {
diff --git a/internal/consensus/round_scheduler.go b/internal/consensus/round_scheduler.go
index 984c245304..f26732abb2 100644
--- a/internal/consensus/round_scheduler.go
+++ b/internal/consensus/round_scheduler.go
@@ -3,8 +3,8 @@ package consensus
 import (
 	"time"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	tmtime "github.com/tendermint/tendermint/libs/time"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
 )
 
 type roundScheduler struct {
diff --git a/internal/consensus/state.go b/internal/consensus/state.go
index 0fa433b01d..81e1036756 100644
--- a/internal/consensus/state.go
+++ b/internal/consensus/state.go
@@ -11,18 +11,18 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/config"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	"github.com/tendermint/tendermint/internal/libs/autofile"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	"github.com/tendermint/tendermint/libs/service"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	"github.com/dashpay/tenderdash/internal/libs/autofile"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // consensus events
diff --git a/internal/consensus/state_add_commit.go b/internal/consensus/state_add_commit.go
index fb5180009c..17981f909f 100644
--- a/internal/consensus/state_add_commit.go
+++ b/internal/consensus/state_add_commit.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type AddCommitEvent struct {
diff --git a/internal/consensus/state_add_prop_block.go b/internal/consensus/state_add_prop_block.go
index 945282ec03..b123ba9cb9 100644
--- a/internal/consensus/state_add_prop_block.go
+++ b/internal/consensus/state_add_prop_block.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type AddProposalBlockPartEvent struct {
diff --git a/internal/consensus/state_add_vote.go b/internal/consensus/state_add_vote.go
index c7e55ab0ac..dd835c9ff8 100644
--- a/internal/consensus/state_add_vote.go
+++ b/internal/consensus/state_add_vote.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"errors"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type (
diff --git a/internal/consensus/state_add_vote_test.go b/internal/consensus/state_add_vote_test.go
index 1c1b14a1ed..c1caff2734 100644
--- a/internal/consensus/state_add_vote_test.go
+++ b/internal/consensus/state_add_vote_test.go
@@ -8,17 +8,17 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/tendermint/tendermint/types"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type AddVoteTestSuite struct {
diff --git a/internal/consensus/state_apply_commit.go b/internal/consensus/state_apply_commit.go
index 68c104cf23..4fa2d9ad61 100644
--- a/internal/consensus/state_apply_commit.go
+++ b/internal/consensus/state_apply_commit.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type ApplyCommitEvent struct {
diff --git a/internal/consensus/state_controller.go b/internal/consensus/state_controller.go
index 62b717f312..6a303d91ac 100644
--- a/internal/consensus/state_controller.go
+++ b/internal/consensus/state_controller.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/eventemitter"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
 )
 
 // EventType is an integer representation of a transition event
diff --git a/internal/consensus/state_data.go b/internal/consensus/state_data.go
index e4591b70de..589f1bec37 100644
--- a/internal/consensus/state_data.go
+++ b/internal/consensus/state_data.go
@@ -7,13 +7,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/tendermint/tendermint/config"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/consensus/state_data_test.go b/internal/consensus/state_data_test.go
index 55678f4d35..09824c9bfa 100644
--- a/internal/consensus/state_data_test.go
+++ b/internal/consensus/state_data_test.go
@@ -5,11 +5,11 @@ import (
 	"testing"
 	"time"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestIsValidForPrevote(t *testing.T) {
diff --git a/internal/consensus/state_enter_commit.go b/internal/consensus/state_enter_commit.go
index fc8daa194b..d210b6377e 100644
--- a/internal/consensus/state_enter_commit.go
+++ b/internal/consensus/state_enter_commit.go
@@ -3,9 +3,9 @@ package consensus
 import (
 	"context"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
 )
 
 type EnterCommitEvent struct {
diff --git a/internal/consensus/state_enter_new_round.go b/internal/consensus/state_enter_new_round.go
index f0049b6884..dcc23afeb8 100644
--- a/internal/consensus/state_enter_new_round.go
+++ b/internal/consensus/state_enter_new_round.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/tendermint/tendermint/config"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
+	"github.com/dashpay/tenderdash/config"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
 )
 
 // EnterNewRoundEvent ...
diff --git a/internal/consensus/state_enter_precommit.go b/internal/consensus/state_enter_precommit.go
index 75c306e811..8834850666 100644
--- a/internal/consensus/state_enter_precommit.go
+++ b/internal/consensus/state_enter_precommit.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type EnterPrecommitEvent struct {
diff --git a/internal/consensus/state_enter_prevote.go b/internal/consensus/state_enter_prevote.go
index cc1a0dd1ac..e57559e093 100644
--- a/internal/consensus/state_enter_prevote.go
+++ b/internal/consensus/state_enter_prevote.go
@@ -3,8 +3,8 @@ package consensus
 import (
 	"context"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type EnterPrevoteEvent struct {
diff --git a/internal/consensus/state_enter_propose.go b/internal/consensus/state_enter_propose.go
index 5c5e15df17..5def6c122c 100644
--- a/internal/consensus/state_enter_propose.go
+++ b/internal/consensus/state_enter_propose.go
@@ -3,10 +3,10 @@ package consensus
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/dash"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
+	"github.com/dashpay/tenderdash/dash"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
 )
 
 type EnterProposeEvent struct {
diff --git a/internal/consensus/state_enter_wait.go b/internal/consensus/state_enter_wait.go
index 95951d47be..c938b89742 100644
--- a/internal/consensus/state_enter_wait.go
+++ b/internal/consensus/state_enter_wait.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type EnterPrecommitWaitEvent struct {
diff --git a/internal/consensus/state_prevoter.go b/internal/consensus/state_prevoter.go
index b68f1c2e05..c9ac3e686a 100644
--- a/internal/consensus/state_prevoter.go
+++ b/internal/consensus/state_prevoter.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"time"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type Prevoter interface {
diff --git a/internal/consensus/state_prevoter_test.go b/internal/consensus/state_prevoter_test.go
index 091f81d6e5..efd8f7ee07 100644
--- a/internal/consensus/state_prevoter_test.go
+++ b/internal/consensus/state_prevoter_test.go
@@ -9,15 +9,15 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type PrevoterTestSuite struct {
diff --git a/internal/consensus/state_proposaler.go b/internal/consensus/state_proposaler.go
index 8c8b40cbfb..69db2a01b3 100644
--- a/internal/consensus/state_proposaler.go
+++ b/internal/consensus/state_proposaler.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"time"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Proposaler is used to set and create a proposal
diff --git a/internal/consensus/state_proposaler_test.go b/internal/consensus/state_proposaler_test.go
index e9c4e58cde..9d98ddf956 100644
--- a/internal/consensus/state_proposaler_test.go
+++ b/internal/consensus/state_proposaler_test.go
@@ -9,14 +9,14 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type ProposalerTestSuite struct {
diff --git a/internal/consensus/state_test.go b/internal/consensus/state_test.go
index 9800fb6481..2c3587b114 100644
--- a/internal/consensus/state_test.go
+++ b/internal/consensus/state_test.go
@@ -12,25 +12,25 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	abcimocks "github.com/tendermint/tendermint/abci/types/mocks"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/mempool"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
-	sf "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmevents "github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	abcimocks "github.com/dashpay/tenderdash/abci/types/mocks"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
+	sf "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmevents "github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 /*
diff --git a/internal/consensus/state_try_add_commit.go b/internal/consensus/state_try_add_commit.go
index 4fb7474677..b141c78dd6 100644
--- a/internal/consensus/state_try_add_commit.go
+++ b/internal/consensus/state_try_add_commit.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/tendermint/tendermint/dash"
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/dash"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type TryAddCommitEvent struct {
diff --git a/internal/consensus/state_try_finalize_commit.go b/internal/consensus/state_try_finalize_commit.go
index bdd1097cf8..ea449d6b20 100644
--- a/internal/consensus/state_try_finalize_commit.go
+++ b/internal/consensus/state_try_finalize_commit.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type TryFinalizeCommitEvent struct {
diff --git a/internal/consensus/ticker.go b/internal/consensus/ticker.go
index 2594f96aaa..3e8f5eb9a9 100644
--- a/internal/consensus/ticker.go
+++ b/internal/consensus/ticker.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 var (
diff --git a/internal/consensus/types/height_vote_set.go b/internal/consensus/types/height_vote_set.go
index 34112ac847..2730f41c42 100644
--- a/internal/consensus/types/height_vote_set.go
+++ b/internal/consensus/types/height_vote_set.go
@@ -8,9 +8,9 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type RoundVoteSet struct {
diff --git a/internal/consensus/types/height_vote_set_test.go b/internal/consensus/types/height_vote_set_test.go
index 4e43a9599e..19223279b3 100644
--- a/internal/consensus/types/height_vote_set_test.go
+++ b/internal/consensus/types/height_vote_set_test.go
@@ -7,11 +7,11 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestPeerCatchupRounds(t *testing.T) {
diff --git a/internal/consensus/types/peer_round_state.go b/internal/consensus/types/peer_round_state.go
index 1de9c8d7b2..e5e2e3e6fb 100644
--- a/internal/consensus/types/peer_round_state.go
+++ b/internal/consensus/types/peer_round_state.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/tendermint/tendermint/libs/bits"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/bits"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/internal/consensus/types/peer_round_state_test.go b/internal/consensus/types/peer_round_state_test.go
index 6d76750a76..cbd59d6d45 100644
--- a/internal/consensus/types/peer_round_state_test.go
+++ b/internal/consensus/types/peer_round_state_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/bits"
+	"github.com/dashpay/tenderdash/libs/bits"
 )
 
 func TestCopy(t *testing.T) {
diff --git a/internal/consensus/types/round_state.go b/internal/consensus/types/round_state.go
index 1eef19644e..a1150b2741 100644
--- a/internal/consensus/types/round_state.go
+++ b/internal/consensus/types/round_state.go
@@ -6,10 +6,10 @@ import (
 	"strconv"
 	"time"
 
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/bytes"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	"github.com/tendermint/tendermint/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/internal/consensus/types/types.go b/internal/consensus/types/types.go
index b2bd40fc8e..55dbb373db 100644
--- a/internal/consensus/types/types.go
+++ b/internal/consensus/types/types.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // ProposalSetter updates a proposal for the round if all conditions are met
diff --git a/internal/consensus/vote_signer.go b/internal/consensus/vote_signer.go
index 727dd405ac..54b0877d09 100644
--- a/internal/consensus/vote_signer.go
+++ b/internal/consensus/vote_signer.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"time"
 
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/eventemitter"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/eventemitter"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // voteSigner provides the ability to sign and add a vote
diff --git a/internal/consensus/vote_signer_test.go b/internal/consensus/vote_signer_test.go
index 43ca8582cd..c9b2369691 100644
--- a/internal/consensus/vote_signer_test.go
+++ b/internal/consensus/vote_signer_test.go
@@ -10,14 +10,14 @@ import (
 
 	bls "github.com/dashpay/bls-signatures/go-bindings"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestVoteSigner_signAddVote(t *testing.T) {
diff --git a/internal/consensus/wal.go b/internal/consensus/wal.go
index 94f9483c74..b615058bb1 100644
--- a/internal/consensus/wal.go
+++ b/internal/consensus/wal.go
@@ -12,13 +12,13 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	auto "github.com/tendermint/tendermint/internal/libs/autofile"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	"github.com/tendermint/tendermint/libs/service"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	auto "github.com/dashpay/tenderdash/internal/libs/autofile"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
 )
 
 const (
diff --git a/internal/consensus/wal_generator_test.go b/internal/consensus/wal_generator_test.go
index 8d73ba4652..15a1a9d9c6 100644
--- a/internal/consensus/wal_generator_test.go
+++ b/internal/consensus/wal_generator_test.go
@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
 )
 
 // WALGenerateNBlocks generates a consensus WAL. It does this by
diff --git a/internal/consensus/wal_iter.go b/internal/consensus/wal_iter.go
index bbe45aa769..5e52b11e87 100644
--- a/internal/consensus/wal_iter.go
+++ b/internal/consensus/wal_iter.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io"
 
-	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/types"
+	cstypes "github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type walIter interface {
diff --git a/internal/consensus/wal_iter_test.go b/internal/consensus/wal_iter_test.go
index d6550c26ba..74e7d05fa5 100644
--- a/internal/consensus/wal_iter_test.go
+++ b/internal/consensus/wal_iter_test.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/consensus/types"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	tmtypes "github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/consensus/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	tmtypes "github.com/dashpay/tenderdash/types"
 )
 
 func TestWalIter_Next(t *testing.T) {
diff --git a/internal/consensus/wal_test.go b/internal/consensus/wal_test.go
index 77fb3f7a3f..cdc703da21 100644
--- a/internal/consensus/wal_test.go
+++ b/internal/consensus/wal_test.go
@@ -13,13 +13,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	"github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/libs/autofile"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmtypes "github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/internal/consensus/types"
+	"github.com/dashpay/tenderdash/internal/libs/autofile"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmtypes "github.com/dashpay/tenderdash/types"
 )
 
 const walTestFlushInterval = 100 * time.Millisecond
diff --git a/internal/eventbus/event_bus.go b/internal/eventbus/event_bus.go
index 0743b04b09..05dbdcbc82 100644
--- a/internal/eventbus/event_bus.go
+++ b/internal/eventbus/event_bus.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"strings"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Subscription is a proxy interface for a pubsub Subscription.
diff --git a/internal/eventbus/event_bus_test.go b/internal/eventbus/event_bus_test.go
index d1899d4019..c0d5b3bb79 100644
--- a/internal/eventbus/event_bus_test.go
+++ b/internal/eventbus/event_bus_test.go
@@ -11,14 +11,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestEventBusPublishEventTx(t *testing.T) {
diff --git a/internal/eventlog/cursor/cursor_test.go b/internal/eventlog/cursor/cursor_test.go
index 31701ddf79..fc3947d7a1 100644
--- a/internal/eventlog/cursor/cursor_test.go
+++ b/internal/eventlog/cursor/cursor_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/tendermint/tendermint/internal/eventlog/cursor"
+	"github.com/dashpay/tenderdash/internal/eventlog/cursor"
 )
 
 func mustParse(t *testing.T, s string) cursor.Cursor {
diff --git a/internal/eventlog/eventlog.go b/internal/eventlog/eventlog.go
index eb8f08b7ff..a778186e77 100644
--- a/internal/eventlog/eventlog.go
+++ b/internal/eventlog/eventlog.go
@@ -13,8 +13,8 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/eventlog/cursor"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/eventlog/cursor"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // A Log is a reverse time-ordered log of events in a sliding window of time
diff --git a/internal/eventlog/eventlog_test.go b/internal/eventlog/eventlog_test.go
index c90fce7ed0..8344b1ebaf 100644
--- a/internal/eventlog/eventlog_test.go
+++ b/internal/eventlog/eventlog_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/fortytw2/leaktest"
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/tendermint/tendermint/internal/eventlog"
-	"github.com/tendermint/tendermint/internal/eventlog/cursor"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/eventlog"
+	"github.com/dashpay/tenderdash/internal/eventlog/cursor"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // fakeTime is a fake clock to use to control cursor assignment.
diff --git a/internal/eventlog/item.go b/internal/eventlog/item.go
index f1f43b46d0..8d834b289e 100644
--- a/internal/eventlog/item.go
+++ b/internal/eventlog/item.go
@@ -3,9 +3,9 @@ package eventlog
 import (
 	"strings"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/eventlog/cursor"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/eventlog/cursor"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Cached constants for the pieces of reserved event names.
diff --git a/internal/evidence/mocks/block_store.go b/internal/evidence/mocks/block_store.go
index bb8d8e1a4c..344c2f7992 100644
--- a/internal/evidence/mocks/block_store.go
+++ b/internal/evidence/mocks/block_store.go
@@ -3,8 +3,8 @@
 package mocks
 
 import (
+	types "github.com/dashpay/tenderdash/types"
 	mock "github.com/stretchr/testify/mock"
-	types "github.com/tendermint/tendermint/types"
 )
 
 // BlockStore is an autogenerated mock type for the BlockStore type
diff --git a/internal/evidence/pool.go b/internal/evidence/pool.go
index 117c002819..bf8f607ffc 100644
--- a/internal/evidence/pool.go
+++ b/internal/evidence/pool.go
@@ -15,12 +15,12 @@ import (
 	"github.com/google/orderedcode"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/internal/eventbus"
-	clist "github.com/tendermint/tendermint/internal/libs/clist"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	clist "github.com/dashpay/tenderdash/internal/libs/clist"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // key prefixes
diff --git a/internal/evidence/pool_test.go b/internal/evidence/pool_test.go
index 378be22e67..1669a47146 100644
--- a/internal/evidence/pool_test.go
+++ b/internal/evidence/pool_test.go
@@ -11,18 +11,18 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/evidence"
-	"github.com/tendermint/tendermint/internal/evidence/mocks"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
-	sm "github.com/tendermint/tendermint/internal/state"
-	smmocks "github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/evidence"
+	"github.com/dashpay/tenderdash/internal/evidence/mocks"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	smmocks "github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 const evidenceChainID = "test_chain"
diff --git a/internal/evidence/reactor.go b/internal/evidence/reactor.go
index e59b951aeb..79478761f8 100644
--- a/internal/evidence/reactor.go
+++ b/internal/evidence/reactor.go
@@ -8,12 +8,12 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	clist "github.com/tendermint/tendermint/internal/libs/clist"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	clist "github.com/dashpay/tenderdash/internal/libs/clist"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ service.Service = (*Reactor)(nil)
diff --git a/internal/evidence/reactor_test.go b/internal/evidence/reactor_test.go
index 5c39ff0adf..5fb858511c 100644
--- a/internal/evidence/reactor_test.go
+++ b/internal/evidence/reactor_test.go
@@ -16,17 +16,17 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/evidence"
-	"github.com/tendermint/tendermint/internal/evidence/mocks"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/p2ptest"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/evidence"
+	"github.com/dashpay/tenderdash/internal/evidence/mocks"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/p2ptest"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/evidence/services.go b/internal/evidence/services.go
index 473999b217..c71783a273 100644
--- a/internal/evidence/services.go
+++ b/internal/evidence/services.go
@@ -1,7 +1,7 @@
 package evidence
 
 import (
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //go:generate ../../scripts/mockery_generate.sh BlockStore
diff --git a/internal/evidence/verify.go b/internal/evidence/verify.go
index 58c4c4a2d3..8e4d7998dc 100644
--- a/internal/evidence/verify.go
+++ b/internal/evidence/verify.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // verify verifies the evidence fully by checking:
diff --git a/internal/evidence/verify_test.go b/internal/evidence/verify_test.go
index 43c093b05d..39e678f51c 100644
--- a/internal/evidence/verify_test.go
+++ b/internal/evidence/verify_test.go
@@ -10,15 +10,15 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/evidence"
-	"github.com/tendermint/tendermint/internal/evidence/mocks"
-	sm "github.com/tendermint/tendermint/internal/state"
-	smmocks "github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/evidence"
+	"github.com/dashpay/tenderdash/internal/evidence/mocks"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	smmocks "github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type voteData struct {
diff --git a/internal/inspect/inspect.go b/internal/inspect/inspect.go
index 573b63f406..4db926bdb3 100644
--- a/internal/inspect/inspect.go
+++ b/internal/inspect/inspect.go
@@ -7,17 +7,17 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/inspect/rpc"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	rpccore "github.com/tendermint/tendermint/internal/rpc/core"
-	"github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/inspect/rpc"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	rpccore "github.com/dashpay/tenderdash/internal/rpc/core"
+	"github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 
 	"golang.org/x/sync/errgroup"
 )
diff --git a/internal/inspect/inspect_test.go b/internal/inspect/inspect_test.go
index 8159285d24..f5e7fcdb1b 100644
--- a/internal/inspect/inspect_test.go
+++ b/internal/inspect/inspect_test.go
@@ -16,17 +16,17 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	abcitypes "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/inspect"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	indexermocks "github.com/tendermint/tendermint/internal/state/indexer/mocks"
-	statemocks "github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/proto/tendermint/state"
-	httpclient "github.com/tendermint/tendermint/rpc/client/http"
-	"github.com/tendermint/tendermint/types"
+	abcitypes "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/inspect"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	indexermocks "github.com/dashpay/tenderdash/internal/state/indexer/mocks"
+	statemocks "github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/proto/tendermint/state"
+	httpclient "github.com/dashpay/tenderdash/rpc/client/http"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestInspectConstructor(t *testing.T) {
diff --git a/internal/inspect/rpc/rpc.go b/internal/inspect/rpc/rpc.go
index d706168346..16a9dc53c5 100644
--- a/internal/inspect/rpc/rpc.go
+++ b/internal/inspect/rpc/rpc.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/rs/cors"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/internal/rpc/core"
-	"github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/rpc/jsonrpc/server"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/internal/rpc/core"
+	"github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/rpc/jsonrpc/server"
 )
 
 // Server defines parameters for running an Inspector rpc server.
diff --git a/internal/jsontypes/jsontypes_test.go b/internal/jsontypes/jsontypes_test.go
index 223e25c343..8e666cebbf 100644
--- a/internal/jsontypes/jsontypes_test.go
+++ b/internal/jsontypes/jsontypes_test.go
@@ -3,7 +3,7 @@ package jsontypes_test
 import (
 	"testing"
 
-	"github.com/tendermint/tendermint/internal/jsontypes"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
 )
 
 type testPtrType struct {
diff --git a/internal/libs/autofile/autofile.go b/internal/libs/autofile/autofile.go
index c51480f4d7..7f2dcc0ee8 100644
--- a/internal/libs/autofile/autofile.go
+++ b/internal/libs/autofile/autofile.go
@@ -12,7 +12,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 /* AutoFile usage
diff --git a/internal/libs/autofile/cmd/logjack.go b/internal/libs/autofile/cmd/logjack.go
index c3c4665038..d1bacbbb71 100644
--- a/internal/libs/autofile/cmd/logjack.go
+++ b/internal/libs/autofile/cmd/logjack.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"syscall"
 
-	auto "github.com/tendermint/tendermint/internal/libs/autofile"
-	"github.com/tendermint/tendermint/libs/log"
+	auto "github.com/dashpay/tenderdash/internal/libs/autofile"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 const Version = "0.0.1"
diff --git a/internal/libs/autofile/group.go b/internal/libs/autofile/group.go
index 34097c1953..fbc77fde01 100644
--- a/internal/libs/autofile/group.go
+++ b/internal/libs/autofile/group.go
@@ -15,8 +15,8 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 const (
diff --git a/internal/libs/autofile/group_test.go b/internal/libs/autofile/group_test.go
index 4f5e346c2a..337e36f729 100644
--- a/internal/libs/autofile/group_test.go
+++ b/internal/libs/autofile/group_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 func createTestGroupWithHeadSizeLimit(ctx context.Context, t *testing.T, logger log.Logger, headSizeLimit int64) *Group {
diff --git a/internal/libs/clist/clist_property_test.go b/internal/libs/clist/clist_property_test.go
index cdc173ee53..b33ab21aa3 100644
--- a/internal/libs/clist/clist_property_test.go
+++ b/internal/libs/clist/clist_property_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"pgregory.net/rapid"
 
-	"github.com/tendermint/tendermint/internal/libs/clist"
+	"github.com/dashpay/tenderdash/internal/libs/clist"
 )
 
 func TestCListProperties(t *testing.T) {
diff --git a/internal/libs/confix/confix.go b/internal/libs/confix/confix.go
index a9449fa228..872964fcc8 100644
--- a/internal/libs/confix/confix.go
+++ b/internal/libs/confix/confix.go
@@ -16,7 +16,7 @@ import (
 	"github.com/creachadair/tomledit/transform"
 	"github.com/spf13/viper"
 
-	"github.com/tendermint/tendermint/config"
+	"github.com/dashpay/tenderdash/config"
 )
 
 // Upgrade reads the configuration file at configPath and applies any
diff --git a/internal/libs/confix/confix_test.go b/internal/libs/confix/confix_test.go
index dc0042fe59..4ef1574d3e 100644
--- a/internal/libs/confix/confix_test.go
+++ b/internal/libs/confix/confix_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/creachadair/tomledit"
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/tendermint/tendermint/internal/libs/confix"
+	"github.com/dashpay/tenderdash/internal/libs/confix"
 )
 
 func mustParseConfig(t *testing.T, path string) *tomledit.Document {
diff --git a/internal/libs/protoio/io_test.go b/internal/libs/protoio/io_test.go
index 4420ad7863..4c57005e47 100644
--- a/internal/libs/protoio/io_test.go
+++ b/internal/libs/protoio/io_test.go
@@ -41,7 +41,7 @@ import (
 	"github.com/gogo/protobuf/test"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
 )
 
 func iotest(t *testing.T, writer protoio.WriteCloser, reader protoio.ReadCloser) error {
diff --git a/internal/libs/protoio/writer_test.go b/internal/libs/protoio/writer_test.go
index 520bac1f6b..d1a3a8cee0 100644
--- a/internal/libs/protoio/writer_test.go
+++ b/internal/libs/protoio/writer_test.go
@@ -6,10 +6,10 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func aVote(t testing.TB) *types.Vote {
diff --git a/internal/libs/strings/string.go b/internal/libs/strings/string.go
index 067f31ffc3..fb5b1c7856 100644
--- a/internal/libs/strings/string.go
+++ b/internal/libs/strings/string.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 type lazyStringf struct {
diff --git a/internal/libs/sync/waker_test.go b/internal/libs/sync/waker_test.go
index b63dc5eb1f..ed99d96e77 100644
--- a/internal/libs/sync/waker_test.go
+++ b/internal/libs/sync/waker_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	tmsync "github.com/tendermint/tendermint/internal/libs/sync"
+	tmsync "github.com/dashpay/tenderdash/internal/libs/sync"
 )
 
 func TestWaker(t *testing.T) {
diff --git a/internal/libs/tempfile/tempfile_test.go b/internal/libs/tempfile/tempfile_test.go
index aee540c591..7e984b85a5 100644
--- a/internal/libs/tempfile/tempfile_test.go
+++ b/internal/libs/tempfile/tempfile_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 func TestWriteFileAtomic(t *testing.T) {
diff --git a/internal/mempool/cache.go b/internal/mempool/cache.go
index 140ea9791b..7dfbff2b47 100644
--- a/internal/mempool/cache.go
+++ b/internal/mempool/cache.go
@@ -5,7 +5,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // TxCache defines an interface for raw transaction caching in a mempool.
diff --git a/internal/mempool/ids.go b/internal/mempool/ids.go
index 28867023ae..74ca28001b 100644
--- a/internal/mempool/ids.go
+++ b/internal/mempool/ids.go
@@ -5,7 +5,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type IDs struct {
diff --git a/internal/mempool/ids_test.go b/internal/mempool/ids_test.go
index 6601706bcd..42fb4412ab 100644
--- a/internal/mempool/ids_test.go
+++ b/internal/mempool/ids_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestMempoolIDsBasic(t *testing.T) {
diff --git a/internal/mempool/mempool.go b/internal/mempool/mempool.go
index c885351076..e75707e306 100644
--- a/internal/mempool/mempool.go
+++ b/internal/mempool/mempool.go
@@ -8,17 +8,16 @@ import (
 	"sync/atomic"
 	"time"
 
-	sync "github.com/sasha-s/go-deadlock"
-
 	"github.com/creachadair/taskgroup"
+	sync "github.com/sasha-s/go-deadlock"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/libs/clist"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/libs/clist"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ Mempool = (*TxMempool)(nil)
diff --git a/internal/mempool/mempool_bench_test.go b/internal/mempool/mempool_bench_test.go
index e4d84a700a..bf79d32598 100644
--- a/internal/mempool/mempool_bench_test.go
+++ b/internal/mempool/mempool_bench_test.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/libs/log"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func BenchmarkTxMempool_CheckTx(b *testing.B) {
diff --git a/internal/mempool/mempool_test.go b/internal/mempool/mempool_test.go
index 50b6f73c84..61796affa6 100644
--- a/internal/mempool/mempool_test.go
+++ b/internal/mempool/mempool_test.go
@@ -18,13 +18,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // application extends the KV store application by overriding CheckTx to provide
diff --git a/internal/mempool/mocks/mempool.go b/internal/mempool/mocks/mempool.go
index e069c07c28..890e3d7b41 100644
--- a/internal/mempool/mocks/mempool.go
+++ b/internal/mempool/mocks/mempool.go
@@ -5,13 +5,13 @@ package mocks
 import (
 	context "context"
 
-	abcitypes "github.com/tendermint/tendermint/abci/types"
+	abcitypes "github.com/dashpay/tenderdash/abci/types"
 
-	mempool "github.com/tendermint/tendermint/internal/mempool"
+	mempool "github.com/dashpay/tenderdash/internal/mempool"
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // Mempool is an autogenerated mock type for the Mempool type
diff --git a/internal/mempool/p2p_msg_handler.go b/internal/mempool/p2p_msg_handler.go
index de44b8782b..c93fc6177d 100644
--- a/internal/mempool/p2p_msg_handler.go
+++ b/internal/mempool/p2p_msg_handler.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/libs/log"
-	protomem "github.com/tendermint/tendermint/proto/tendermint/mempool"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/libs/log"
+	protomem "github.com/dashpay/tenderdash/proto/tendermint/mempool"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type (
diff --git a/internal/mempool/p2p_msg_handler_test.go b/internal/mempool/p2p_msg_handler_test.go
index 02b2d8ea0f..b9d39793bf 100644
--- a/internal/mempool/p2p_msg_handler_test.go
+++ b/internal/mempool/p2p_msg_handler_test.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	abcitypes "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/p2p"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	"github.com/tendermint/tendermint/libs/log"
-	protomem "github.com/tendermint/tendermint/proto/tendermint/mempool"
-	"github.com/tendermint/tendermint/types"
+	abcitypes "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/libs/log"
+	protomem "github.com/dashpay/tenderdash/proto/tendermint/mempool"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestMempoolP2PMessageHandler(t *testing.T) {
diff --git a/internal/mempool/reactor.go b/internal/mempool/reactor.go
index 91ad7aad6c..6794e8a62a 100644
--- a/internal/mempool/reactor.go
+++ b/internal/mempool/reactor.go
@@ -6,14 +6,14 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/libs/clist"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/libs/clist"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/mempool/reactor_test.go b/internal/mempool/reactor_test.go
index df34c33293..6ebbdae2ca 100644
--- a/internal/mempool/reactor_test.go
+++ b/internal/mempool/reactor_test.go
@@ -13,15 +13,15 @@ import (
 	sync "github.com/sasha-s/go-deadlock"
 	"github.com/stretchr/testify/require"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/p2ptest"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/p2ptest"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type reactorTestSuite struct {
diff --git a/internal/mempool/tx.go b/internal/mempool/tx.go
index eef2d283c3..e27b19905e 100644
--- a/internal/mempool/tx.go
+++ b/internal/mempool/tx.go
@@ -5,7 +5,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // TxInfo are parameters that get passed when attempting to add a tx to the
diff --git a/internal/mempool/types.go b/internal/mempool/types.go
index d4e552c96f..28b3dc7f34 100644
--- a/internal/mempool/types.go
+++ b/internal/mempool/types.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"math"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/p2p/address.go b/internal/p2p/address.go
index 0f4066fafd..45224f506f 100644
--- a/internal/p2p/address.go
+++ b/internal/p2p/address.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/p2p/address_test.go b/internal/p2p/address_test.go
index bd1dda75cb..f8c0572d73 100644
--- a/internal/p2p/address_test.go
+++ b/internal/p2p/address_test.go
@@ -7,9 +7,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/types"
+
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestNewNodeID(t *testing.T) {
diff --git a/internal/p2p/channel.go b/internal/p2p/channel.go
index 3a416001f9..9e8cb3283d 100644
--- a/internal/p2p/channel.go
+++ b/internal/p2p/channel.go
@@ -13,8 +13,8 @@ import (
 	"github.com/rs/zerolog"
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Envelope contains a message with sender/receiver routing info.
diff --git a/internal/p2p/channel_params.go b/internal/p2p/channel_params.go
index 888127cf27..8a0aa8418b 100644
--- a/internal/p2p/channel_params.go
+++ b/internal/p2p/channel_params.go
@@ -5,14 +5,14 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/proto/tendermint/consensus"
-	"github.com/tendermint/tendermint/proto/tendermint/mempool"
-	p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/proto/tendermint/statesync"
-	prototypes "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	"github.com/dashpay/tenderdash/proto/tendermint/mempool"
+	p2pproto "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	prototypes "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/p2p/client/chanstore.go b/internal/p2p/client/chanstore.go
index 59e8657b08..e49c3994f4 100644
--- a/internal/p2p/client/chanstore.go
+++ b/internal/p2p/client/chanstore.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/tendermint/tendermint/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p"
 )
 
 type (
diff --git a/internal/p2p/client/client.go b/internal/p2p/client/client.go
index 2c30caaec9..fffc4a36df 100644
--- a/internal/p2p/client/client.go
+++ b/internal/p2p/client/client.go
@@ -15,13 +15,13 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/jonboulle/clockwork"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/promise"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	protomem "github.com/tendermint/tendermint/proto/tendermint/mempool"
-	"github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/promise"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	protomem "github.com/dashpay/tenderdash/proto/tendermint/mempool"
+	"github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // These attributes should use as a key in Envelope.Attributes map
diff --git a/internal/p2p/client/client_test.go b/internal/p2p/client/client_test.go
index c401ebaabb..5a02123db0 100644
--- a/internal/p2p/client/client_test.go
+++ b/internal/p2p/client/client_test.go
@@ -14,12 +14,12 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/mocks"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/mocks"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const testChannelID = 0x1
diff --git a/internal/p2p/client/consumer.go b/internal/p2p/client/consumer.go
index 3308c4e158..6038737d7b 100644
--- a/internal/p2p/client/consumer.go
+++ b/internal/p2p/client/consumer.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 var (
diff --git a/internal/p2p/client/consumer_test.go b/internal/p2p/client/consumer_test.go
index 328db810b5..cfacda0267 100644
--- a/internal/p2p/client/consumer_test.go
+++ b/internal/p2p/client/consumer_test.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/mock"
-	"github.com/tendermint/tendermint/libs/log"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
+	"github.com/dashpay/tenderdash/libs/log"
+	bcproto "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
 )
 
 func TestErrorLoggerP2PMessageHandler(t *testing.T) {
diff --git a/internal/p2p/client/mocks/block_client.go b/internal/p2p/client/mocks/block_client.go
index 2960e66e1f..b094d38ccb 100644
--- a/internal/p2p/client/mocks/block_client.go
+++ b/internal/p2p/client/mocks/block_client.go
@@ -3,15 +3,15 @@
 package mocks
 
 import (
-	blocksync "github.com/tendermint/tendermint/proto/tendermint/blocksync"
+	blocksync "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
 
 	context "context"
 
 	mock "github.com/stretchr/testify/mock"
 
-	promise "github.com/tendermint/tendermint/libs/promise"
+	promise "github.com/dashpay/tenderdash/libs/promise"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // BlockClient is an autogenerated mock type for the BlockClient type
diff --git a/internal/p2p/client/mocks/snapshot_client.go b/internal/p2p/client/mocks/snapshot_client.go
index af0b42fc34..e2eb8d643d 100644
--- a/internal/p2p/client/mocks/snapshot_client.go
+++ b/internal/p2p/client/mocks/snapshot_client.go
@@ -5,12 +5,12 @@ package mocks
 import (
 	context "context"
 
+	promise "github.com/dashpay/tenderdash/libs/promise"
 	mock "github.com/stretchr/testify/mock"
-	promise "github.com/tendermint/tendermint/libs/promise"
 
-	statesync "github.com/tendermint/tendermint/proto/tendermint/statesync"
+	statesync "github.com/dashpay/tenderdash/proto/tendermint/statesync"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // SnapshotClient is an autogenerated mock type for the SnapshotClient type
diff --git a/internal/p2p/conn/connection.go b/internal/p2p/conn/connection.go
index 824788efd0..1ecdd1a4dc 100644
--- a/internal/p2p/conn/connection.go
+++ b/internal/p2p/conn/connection.go
@@ -17,13 +17,13 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/internal/libs/flowrate"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	"github.com/tendermint/tendermint/internal/libs/timer"
-	"github.com/tendermint/tendermint/libs/log"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	"github.com/tendermint/tendermint/libs/service"
-	tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/internal/libs/flowrate"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/internal/libs/timer"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmp2p "github.com/dashpay/tenderdash/proto/tendermint/p2p"
 )
 
 const (
@@ -534,7 +534,7 @@ FOR_LOOP:
 		switch pkt := packet.Sum.(type) {
 		case *tmp2p.Packet_PacketPing:
 			// TODO: prevent abuse, as they cause flush()'s.
-			// https://github.com/tendermint/tendermint/issues/1190
+			// https://github.com/dashpay/tenderdash/issues/1190
 			select {
 			case c.pong <- struct{}{}:
 			default:
@@ -643,7 +643,7 @@ type channel struct {
 	// Exponential moving average.
 	// This field must be accessed atomically.
 	// It is first in the struct to ensure correct alignment.
-	// See https://github.com/tendermint/tendermint/issues/7000.
+	// See https://github.com/dashpay/tenderdash/issues/7000.
 	recentlySent int64
 
 	conn          *MConnection
diff --git a/internal/p2p/conn/connection_test.go b/internal/p2p/conn/connection_test.go
index 578bc3ef2d..55c2460c65 100644
--- a/internal/p2p/conn/connection_test.go
+++ b/internal/p2p/conn/connection_test.go
@@ -15,11 +15,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmp2p "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const maxPingPongPacketSize = 1024 // bytes
@@ -289,7 +289,7 @@ func TestMConnectionMultiplePings(t *testing.T) {
 	t.Cleanup(waitAll(mconn))
 
 	// sending 3 pings in a row (abuse)
-	// see https://github.com/tendermint/tendermint/issues/1190
+	// see https://github.com/dashpay/tenderdash/issues/1190
 	protoReader := protoio.NewDelimitedReader(server, maxPingPongPacketSize)
 	protoWriter := protoio.NewDelimitedWriter(server)
 	var pkt tmp2p.Packet
diff --git a/internal/p2p/conn/evil_secret_connection_test.go b/internal/p2p/conn/evil_secret_connection_test.go
index fe213959c4..08d426e9bd 100644
--- a/internal/p2p/conn/evil_secret_connection_test.go
+++ b/internal/p2p/conn/evil_secret_connection_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/crypto/chacha20poly1305"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmp2p "github.com/dashpay/tenderdash/proto/tendermint/p2p"
 )
 
 type buffer struct {
diff --git a/internal/p2p/conn/secret_connection.go b/internal/p2p/conn/secret_connection.go
index 54a1903bbf..caf3150528 100644
--- a/internal/p2p/conn/secret_connection.go
+++ b/internal/p2p/conn/secret_connection.go
@@ -23,12 +23,12 @@ import (
 	"golang.org/x/crypto/hkdf"
 	"golang.org/x/crypto/nacl/box"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/internal/libs/async"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/internal/libs/async"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmp2p "github.com/dashpay/tenderdash/proto/tendermint/p2p"
 )
 
 // 4 + 1024 == 1028 total frame size
diff --git a/internal/p2p/conn/secret_connection_test.go b/internal/p2p/conn/secret_connection_test.go
index a29d9aaf84..1c544354da 100644
--- a/internal/p2p/conn/secret_connection_test.go
+++ b/internal/p2p/conn/secret_connection_test.go
@@ -19,10 +19,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/libs/async"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/libs/async"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 // Run go test -update from within this module
diff --git a/internal/p2p/dash_dialer.go b/internal/p2p/dash_dialer.go
index e787626a24..64d70ecff3 100644
--- a/internal/p2p/dash_dialer.go
+++ b/internal/p2p/dash_dialer.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/p2p/errors.go b/internal/p2p/errors.go
index d4df287926..9e1ad2d05c 100644
--- a/internal/p2p/errors.go
+++ b/internal/p2p/errors.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // ErrFilterTimeout indicates that a filter operation timed out.
diff --git a/internal/p2p/metrics_test.go b/internal/p2p/metrics_test.go
index 98523fe822..e9404dd722 100644
--- a/internal/p2p/metrics_test.go
+++ b/internal/p2p/metrics_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/tendermint/tendermint/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/proto/tendermint/p2p"
 )
 
 func TestValueToMetricsLabel(t *testing.T) {
diff --git a/internal/p2p/mocks/channel.go b/internal/p2p/mocks/channel.go
index ca8c03b052..ebee0c7670 100644
--- a/internal/p2p/mocks/channel.go
+++ b/internal/p2p/mocks/channel.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	p2p "github.com/dashpay/tenderdash/internal/p2p"
 	mock "github.com/stretchr/testify/mock"
-	p2p "github.com/tendermint/tendermint/internal/p2p"
 )
 
 // Channel is an autogenerated mock type for the Channel type
diff --git a/internal/p2p/mocks/connection.go b/internal/p2p/mocks/connection.go
index 82430b2f7a..447bb925ab 100644
--- a/internal/p2p/mocks/connection.go
+++ b/internal/p2p/mocks/connection.go
@@ -5,17 +5,17 @@ package mocks
 import (
 	context "context"
 
-	conn "github.com/tendermint/tendermint/internal/p2p/conn"
+	conn "github.com/dashpay/tenderdash/internal/p2p/conn"
 
-	crypto "github.com/tendermint/tendermint/crypto"
+	crypto "github.com/dashpay/tenderdash/crypto"
 
 	mock "github.com/stretchr/testify/mock"
 
-	p2p "github.com/tendermint/tendermint/internal/p2p"
+	p2p "github.com/dashpay/tenderdash/internal/p2p"
 
 	time "time"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // Connection is an autogenerated mock type for the Connection type
diff --git a/internal/p2p/mocks/transport.go b/internal/p2p/mocks/transport.go
index 3398b21c69..0901d27c84 100644
--- a/internal/p2p/mocks/transport.go
+++ b/internal/p2p/mocks/transport.go
@@ -5,11 +5,11 @@ package mocks
 import (
 	context "context"
 
-	conn "github.com/tendermint/tendermint/internal/p2p/conn"
+	conn "github.com/dashpay/tenderdash/internal/p2p/conn"
 
 	mock "github.com/stretchr/testify/mock"
 
-	p2p "github.com/tendermint/tendermint/internal/p2p"
+	p2p "github.com/dashpay/tenderdash/internal/p2p"
 )
 
 // Transport is an autogenerated mock type for the Transport type
diff --git a/internal/p2p/p2p_test.go b/internal/p2p/p2p_test.go
index f2fde10e34..97a008d025 100644
--- a/internal/p2p/p2p_test.go
+++ b/internal/p2p/p2p_test.go
@@ -1,10 +1,10 @@
 package p2p_test
 
 import (
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Common setup for P2P tests.
diff --git a/internal/p2p/p2ptest/network.go b/internal/p2p/p2ptest/network.go
index b8ea7bcd2a..5c0163ab0f 100644
--- a/internal/p2p/p2ptest/network.go
+++ b/internal/p2p/p2ptest/network.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/p2p"
-	p2pclient "github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	p2pclient "github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Network sets up an in-memory network that can be used for high-level P2P
diff --git a/internal/p2p/p2ptest/require.go b/internal/p2p/p2ptest/require.go
index 50358e2c0b..af49bc18eb 100644
--- a/internal/p2p/p2ptest/require.go
+++ b/internal/p2p/p2ptest/require.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // RequireEmpty requires that the given channel is empty.
diff --git a/internal/p2p/p2ptest/util.go b/internal/p2p/p2ptest/util.go
index 43fc16d286..2483dee0bb 100644
--- a/internal/p2p/p2ptest/util.go
+++ b/internal/p2p/p2ptest/util.go
@@ -1,8 +1,8 @@
 package p2ptest
 
 import (
-	"github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Message is a simple message containing a string-typed Value field.
diff --git a/internal/p2p/peermanager.go b/internal/p2p/peermanager.go
index a0f7de5a92..e38b7751b1 100644
--- a/internal/p2p/peermanager.go
+++ b/internal/p2p/peermanager.go
@@ -17,10 +17,10 @@ import (
 	sync "github.com/sasha-s/go-deadlock"
 	dbm "github.com/tendermint/tm-db"
 
-	tmsync "github.com/tendermint/tendermint/internal/libs/sync"
-	"github.com/tendermint/tendermint/libs/log"
-	p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	tmsync "github.com/dashpay/tenderdash/internal/libs/sync"
+	"github.com/dashpay/tenderdash/libs/log"
+	p2pproto "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/p2p/peermanager_scoring_test.go b/internal/p2p/peermanager_scoring_test.go
index 717123b173..0ca50775cc 100644
--- a/internal/p2p/peermanager_scoring_test.go
+++ b/internal/p2p/peermanager_scoring_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestPeerScoring(t *testing.T) {
diff --git a/internal/p2p/peermanager_test.go b/internal/p2p/peermanager_test.go
index a2f8d5452c..7440c4a929 100644
--- a/internal/p2p/peermanager_test.go
+++ b/internal/p2p/peermanager_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // FIXME: We should probably have some randomized property-based tests for the
diff --git a/internal/p2p/pex/reactor.go b/internal/p2p/pex/reactor.go
index 758f5ef520..79bfada9bc 100644
--- a/internal/p2p/pex/reactor.go
+++ b/internal/p2p/pex/reactor.go
@@ -7,12 +7,12 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/conn"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/conn"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	p2pproto "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/p2p/pex/reactor_test.go b/internal/p2p/pex/reactor_test.go
index 005587ef90..cd66af1421 100644
--- a/internal/p2p/pex/reactor_test.go
+++ b/internal/p2p/pex/reactor_test.go
@@ -11,14 +11,14 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/p2ptest"
-	"github.com/tendermint/tendermint/internal/p2p/pex"
-	"github.com/tendermint/tendermint/libs/log"
-	p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/p2ptest"
+	"github.com/dashpay/tenderdash/internal/p2p/pex"
+	"github.com/dashpay/tenderdash/libs/log"
+	p2pproto "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/p2p/pqueue.go b/internal/p2p/pqueue.go
index 4ebbe1e102..350c38ce0b 100644
--- a/internal/p2p/pqueue.go
+++ b/internal/p2p/pqueue.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 // pqEnvelope defines a wrapper around an Envelope with priority to be inserted
diff --git a/internal/p2p/pqueue_test.go b/internal/p2p/pqueue_test.go
index d1057ac7e2..3e1594d79c 100644
--- a/internal/p2p/pqueue_test.go
+++ b/internal/p2p/pqueue_test.go
@@ -7,7 +7,7 @@ import (
 
 	gogotypes "github.com/gogo/protobuf/types"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type testMessage = gogotypes.StringValue
diff --git a/internal/p2p/router.go b/internal/p2p/router.go
index 1649f80601..7adc3d0dfa 100644
--- a/internal/p2p/router.go
+++ b/internal/p2p/router.go
@@ -13,12 +13,12 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const queueBufferDefault = 32
diff --git a/internal/p2p/router_filter_test.go b/internal/p2p/router_filter_test.go
index 217be8d322..e0aea8cfa7 100644
--- a/internal/p2p/router_filter_test.go
+++ b/internal/p2p/router_filter_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func TestConnectionFiltering(t *testing.T) {
diff --git a/internal/p2p/router_init_test.go b/internal/p2p/router_init_test.go
index 20c3cb6dc9..f316c23bde 100644
--- a/internal/p2p/router_init_test.go
+++ b/internal/p2p/router_init_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestRouter_ConstructQueueFactory(t *testing.T) {
diff --git a/internal/p2p/router_test.go b/internal/p2p/router_test.go
index 8a16c9750b..37aa4e2c76 100644
--- a/internal/p2p/router_test.go
+++ b/internal/p2p/router_test.go
@@ -16,13 +16,13 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/mocks"
-	"github.com/tendermint/tendermint/internal/p2p/p2ptest"
-	"github.com/tendermint/tendermint/libs/log"
-	p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/mocks"
+	"github.com/dashpay/tenderdash/internal/p2p/p2ptest"
+	"github.com/dashpay/tenderdash/libs/log"
+	p2pproto "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func echoReactor(ctx context.Context, channel p2p.Channel) {
diff --git a/internal/p2p/transport.go b/internal/p2p/transport.go
index da67cacaf7..1caaecbdb1 100644
--- a/internal/p2p/transport.go
+++ b/internal/p2p/transport.go
@@ -7,8 +7,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //go:generate ../../scripts/mockery_generate.sh Transport|Connection
diff --git a/internal/p2p/transport_mconn.go b/internal/p2p/transport_mconn.go
index 07a9f6adcb..7d4b3d046f 100644
--- a/internal/p2p/transport_mconn.go
+++ b/internal/p2p/transport_mconn.go
@@ -11,15 +11,14 @@ import (
 	"time"
 
 	sync "github.com/sasha-s/go-deadlock"
-
 	"golang.org/x/net/netutil"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	"github.com/tendermint/tendermint/internal/p2p/conn"
-	"github.com/tendermint/tendermint/libs/log"
-	p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/internal/p2p/conn"
+	"github.com/dashpay/tenderdash/libs/log"
+	p2pproto "github.com/dashpay/tenderdash/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/p2p/transport_mconn_test.go b/internal/p2p/transport_mconn_test.go
index 6fafd01aeb..3cbcac3dc3 100644
--- a/internal/p2p/transport_mconn_test.go
+++ b/internal/p2p/transport_mconn_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/fortytw2/leaktest"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/conn"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/conn"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 // Transports are mainly tested by common tests in transport_test.go, we
diff --git a/internal/p2p/transport_memory.go b/internal/p2p/transport_memory.go
index 6bdc9506be..c4c5873a99 100644
--- a/internal/p2p/transport_memory.go
+++ b/internal/p2p/transport_memory.go
@@ -10,9 +10,9 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/p2p/transport_memory_test.go b/internal/p2p/transport_memory_test.go
index 33d96cdb84..2d5a759ab5 100644
--- a/internal/p2p/transport_memory_test.go
+++ b/internal/p2p/transport_memory_test.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Transports are mainly tested by common tests in transport_test.go, we
diff --git a/internal/p2p/transport_test.go b/internal/p2p/transport_test.go
index d58c23955b..d22dbb9e28 100644
--- a/internal/p2p/transport_test.go
+++ b/internal/p2p/transport_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // transportFactory is used to set up transports for tests.
diff --git a/internal/p2p/types.go b/internal/p2p/types.go
index bee99a4fe6..882ea9e02a 100644
--- a/internal/p2p/types.go
+++ b/internal/p2p/types.go
@@ -1,7 +1,7 @@
 package p2p
 
 import (
-	"github.com/tendermint/tendermint/internal/p2p/conn"
+	"github.com/dashpay/tenderdash/internal/p2p/conn"
 )
 
 type ChannelDescriptor = conn.ChannelDescriptor
diff --git a/internal/proxy/client.go b/internal/proxy/client.go
index 60af994933..4ed8395759 100644
--- a/internal/proxy/client.go
+++ b/internal/proxy/client.go
@@ -9,12 +9,12 @@ import (
 
 	"github.com/go-kit/kit/metrics"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	e2e "github.com/tendermint/tendermint/test/e2e/app"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	e2e "github.com/dashpay/tenderdash/test/e2e/app"
 )
 
 // ClientFactory returns a client object, which will create a local
diff --git a/internal/proxy/client_test.go b/internal/proxy/client_test.go
index 9fb321ae73..700ee47a65 100644
--- a/internal/proxy/client_test.go
+++ b/internal/proxy/client_test.go
@@ -16,13 +16,13 @@ import (
 
 	"gotest.tools/assert"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abcimocks "github.com/tendermint/tendermint/abci/client/mocks"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/abci/server"
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abcimocks "github.com/dashpay/tenderdash/abci/client/mocks"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/abci/server"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 //----------------------------------------
diff --git a/internal/proxy/mocks/app_conn_mempool.go b/internal/proxy/mocks/app_conn_mempool.go
index fd5acef7d8..67a1f7e382 100644
--- a/internal/proxy/mocks/app_conn_mempool.go
+++ b/internal/proxy/mocks/app_conn_mempool.go
@@ -7,7 +7,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/abci/types"
+	types "github.com/dashpay/tenderdash/abci/types"
 )
 
 // AppConnMempool is an autogenerated mock type for the AppConnMempool type
diff --git a/internal/proxy/mocks/app_conn_query.go b/internal/proxy/mocks/app_conn_query.go
index e515cb784e..996bc2eef2 100644
--- a/internal/proxy/mocks/app_conn_query.go
+++ b/internal/proxy/mocks/app_conn_query.go
@@ -7,7 +7,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/abci/types"
+	types "github.com/dashpay/tenderdash/abci/types"
 )
 
 // AppConnQuery is an autogenerated mock type for the AppConnQuery type
diff --git a/internal/proxy/mocks/app_conn_snapshot.go b/internal/proxy/mocks/app_conn_snapshot.go
index 0b3f06ad70..4b438e16a5 100644
--- a/internal/proxy/mocks/app_conn_snapshot.go
+++ b/internal/proxy/mocks/app_conn_snapshot.go
@@ -7,7 +7,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/abci/types"
+	types "github.com/dashpay/tenderdash/abci/types"
 )
 
 // AppConnSnapshot is an autogenerated mock type for the AppConnSnapshot type
diff --git a/internal/proxy/version.go b/internal/proxy/version.go
index 1107570285..b3ab1898b1 100644
--- a/internal/proxy/version.go
+++ b/internal/proxy/version.go
@@ -1,8 +1,8 @@
 package proxy
 
 import (
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/version"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 // RequestInfo contains all the information for sending
diff --git a/internal/pubsub/example_test.go b/internal/pubsub/example_test.go
index c4b5dc5c94..17fa950294 100644
--- a/internal/pubsub/example_test.go
+++ b/internal/pubsub/example_test.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/libs/log"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func TestExample(t *testing.T) {
diff --git a/internal/pubsub/pubsub.go b/internal/pubsub/pubsub.go
index f2317e00e5..063aba5681 100644
--- a/internal/pubsub/pubsub.go
+++ b/internal/pubsub/pubsub.go
@@ -40,11 +40,11 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/pubsub/pubsub_test.go b/internal/pubsub/pubsub_test.go
index e366977b54..ca4a8432b8 100644
--- a/internal/pubsub/pubsub_test.go
+++ b/internal/pubsub/pubsub_test.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/pubsub/query/bench_test.go b/internal/pubsub/query/bench_test.go
index 0916e9c8af..008898f34b 100644
--- a/internal/pubsub/query/bench_test.go
+++ b/internal/pubsub/query/bench_test.go
@@ -3,8 +3,8 @@ package query_test
 import (
 	"testing"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
 )
 
 const testQuery = `tm.events.type='NewBlock' AND abci.account.name='Igor'`
diff --git a/internal/pubsub/query/query.go b/internal/pubsub/query/query.go
index cba494729a..db954fa82e 100644
--- a/internal/pubsub/query/query.go
+++ b/internal/pubsub/query/query.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query/syntax"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query/syntax"
 )
 
 // All is a query that matches all events.
diff --git a/internal/pubsub/query/query_test.go b/internal/pubsub/query/query_test.go
index f6affb2d92..d6ec236d92 100644
--- a/internal/pubsub/query/query_test.go
+++ b/internal/pubsub/query/query_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/pubsub/query/syntax"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/pubsub/query/syntax"
 )
 
 // Example events from the OpenAPI documentation:
diff --git a/internal/pubsub/query/syntax/syntax_test.go b/internal/pubsub/query/syntax/syntax_test.go
index ac0473beb1..03b80becde 100644
--- a/internal/pubsub/query/syntax/syntax_test.go
+++ b/internal/pubsub/query/syntax/syntax_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/tendermint/tendermint/internal/pubsub/query/syntax"
+	"github.com/dashpay/tenderdash/internal/pubsub/query/syntax"
 )
 
 func TestScanner(t *testing.T) {
diff --git a/internal/pubsub/subindex.go b/internal/pubsub/subindex.go
index eadb193af2..b22072cde6 100644
--- a/internal/pubsub/subindex.go
+++ b/internal/pubsub/subindex.go
@@ -1,9 +1,9 @@
 package pubsub
 
 import (
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // An item to be published to subscribers.
diff --git a/internal/pubsub/subscription.go b/internal/pubsub/subscription.go
index fd1a239296..fd8c7cee58 100644
--- a/internal/pubsub/subscription.go
+++ b/internal/pubsub/subscription.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/google/uuid"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/libs/queue"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/libs/queue"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/rpc/core/abci.go b/internal/rpc/core/abci.go
index fa45c6b456..5de75ea5ee 100644
--- a/internal/rpc/core/abci.go
+++ b/internal/rpc/core/abci.go
@@ -3,9 +3,9 @@ package core
 import (
 	"context"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/proxy"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // ABCIQuery queries the application for some information.
diff --git a/internal/rpc/core/blocks.go b/internal/rpc/core/blocks.go
index 3eabb3636d..85e6f79903 100644
--- a/internal/rpc/core/blocks.go
+++ b/internal/rpc/core/blocks.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"sort"
 
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // BlockchainInfo gets block headers for minHeight <= height <= maxHeight.
diff --git a/internal/rpc/core/blocks_test.go b/internal/rpc/core/blocks_test.go
index 3cb810e72d..3138210e28 100644
--- a/internal/rpc/core/blocks_test.go
+++ b/internal/rpc/core/blocks_test.go
@@ -10,11 +10,11 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/proto/tendermint/state"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 func TestBlockchainInfo(t *testing.T) {
diff --git a/internal/rpc/core/consensus.go b/internal/rpc/core/consensus.go
index 8de2612f7d..ecacb6f1c0 100644
--- a/internal/rpc/core/consensus.go
+++ b/internal/rpc/core/consensus.go
@@ -3,9 +3,9 @@ package core
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/libs"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/libs"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // Validators gets the validator set at the given block height.
diff --git a/internal/rpc/core/dev.go b/internal/rpc/core/dev.go
index 702413ab89..8d6b099ec7 100644
--- a/internal/rpc/core/dev.go
+++ b/internal/rpc/core/dev.go
@@ -3,7 +3,7 @@ package core
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // UnsafeFlushMempool removes all transactions from the mempool.
diff --git a/internal/rpc/core/env.go b/internal/rpc/core/env.go
index ab46003a04..fd16d667d4 100644
--- a/internal/rpc/core/env.go
+++ b/internal/rpc/core/env.go
@@ -11,25 +11,25 @@ import (
 
 	"github.com/rs/cors"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/blocksync"
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/eventlog"
-	"github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/p2p"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/statesync"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/blocksync"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/eventlog"
+	"github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/statesync"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpcserver "github.com/dashpay/tenderdash/rpc/jsonrpc/server"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
@@ -227,7 +227,7 @@ func (env *Environment) StartService(ctx context.Context, conf *config.Config) (
 	cfg.MaxOpenConnections = conf.RPC.MaxOpenConnections
 	// If necessary adjust global WriteTimeout to ensure it's greater than
 	// TimeoutBroadcastTxCommit.
-	// See https://github.com/tendermint/tendermint/issues/3435
+	// See https://github.com/dashpay/tenderdash/issues/3435
 	// Note we don't need to adjust anything if the timeout is already unlimited.
 	if cfg.WriteTimeout > 0 && cfg.WriteTimeout <= conf.RPC.TimeoutBroadcastTxCommit {
 		cfg.WriteTimeout = conf.RPC.TimeoutBroadcastTxCommit + 1*time.Second
diff --git a/internal/rpc/core/events.go b/internal/rpc/core/events.go
index 3f289bfa70..023d45a2d7 100644
--- a/internal/rpc/core/events.go
+++ b/internal/rpc/core/events.go
@@ -6,13 +6,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/internal/eventlog"
-	"github.com/tendermint/tendermint/internal/eventlog/cursor"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/internal/eventlog"
+	"github.com/dashpay/tenderdash/internal/eventlog/cursor"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 const (
diff --git a/internal/rpc/core/evidence.go b/internal/rpc/core/evidence.go
index 5de93d2c2b..f87e5ec162 100644
--- a/internal/rpc/core/evidence.go
+++ b/internal/rpc/core/evidence.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // BroadcastEvidence broadcasts evidence of the misbehavior.
diff --git a/internal/rpc/core/health.go b/internal/rpc/core/health.go
index c55aa58dca..438f994859 100644
--- a/internal/rpc/core/health.go
+++ b/internal/rpc/core/health.go
@@ -3,7 +3,7 @@ package core
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // Health gets node health. Returns empty result (200 OK) on success, no
diff --git a/internal/rpc/core/mempool.go b/internal/rpc/core/mempool.go
index a5c22195f5..adfd86176f 100644
--- a/internal/rpc/core/mempool.go
+++ b/internal/rpc/core/mempool.go
@@ -7,11 +7,11 @@ import (
 	"math/rand"
 	"time"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/internal/rpc/core/net.go b/internal/rpc/core/net.go
index b18f1e2fc5..3914ecb85e 100644
--- a/internal/rpc/core/net.go
+++ b/internal/rpc/core/net.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // NetInfo returns network info.
diff --git a/internal/rpc/core/routes.go b/internal/rpc/core/routes.go
index 107b0e226d..49c493e1fa 100644
--- a/internal/rpc/core/routes.go
+++ b/internal/rpc/core/routes.go
@@ -3,8 +3,8 @@ package core
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpc "github.com/tendermint/tendermint/rpc/jsonrpc/server"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpc "github.com/dashpay/tenderdash/rpc/jsonrpc/server"
 )
 
 // TODO: better system than "unsafe" prefix
diff --git a/internal/rpc/core/status.go b/internal/rpc/core/status.go
index 9086c71feb..c83cb30f86 100644
--- a/internal/rpc/core/status.go
+++ b/internal/rpc/core/status.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Status returns Tendermint status including node info, pubkey, latest block
diff --git a/internal/rpc/core/tx.go b/internal/rpc/core/tx.go
index cd643b8441..1258ae41ee 100644
--- a/internal/rpc/core/tx.go
+++ b/internal/rpc/core/tx.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"sort"
 
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Tx allows you to query the transaction results. `nil` could mean the
diff --git a/internal/state/current_round_state.go b/internal/state/current_round_state.go
index 046680a383..b88ed95a59 100644
--- a/internal/state/current_round_state.go
+++ b/internal/state/current_round_state.go
@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"fmt"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmtypes "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmtypes "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/state/events.go b/internal/state/events.go
index d20c689dc6..50c55e1ee6 100644
--- a/internal/state/events.go
+++ b/internal/state/events.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-multierror"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/types"
+
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // EventSet is a set of events that are published immediately after the block is committed.
diff --git a/internal/state/events_test.go b/internal/state/events_test.go
index 77078a1c21..14e9486b95 100644
--- a/internal/state/events_test.go
+++ b/internal/state/events_test.go
@@ -6,9 +6,10 @@ import (
 
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/types/mocks"
+
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/types/mocks"
 )
 
 type mockEvidence struct{ types.Evidence }
diff --git a/internal/state/execution.go b/internal/state/execution.go
index fbc1aaaa13..359d9aedc6 100644
--- a/internal/state/execution.go
+++ b/internal/state/execution.go
@@ -9,14 +9,14 @@ import (
 	"fmt"
 	"time"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/libs/log"
-	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/internal/state/execution_test.go b/internal/state/execution_test.go
index 7f3f2c34c1..cdcdbf2bb4 100644
--- a/internal/state/execution_test.go
+++ b/internal/state/execution_test.go
@@ -13,27 +13,27 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abciclientmocks "github.com/tendermint/tendermint/abci/client/mocks"
-	abci "github.com/tendermint/tendermint/abci/types"
-	abcimocks "github.com/tendermint/tendermint/abci/types/mocks"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	mpmocks "github.com/tendermint/tendermint/internal/mempool/mocks"
-	"github.com/tendermint/tendermint/internal/proxy"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	sf "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/rand"
-	tmtypes "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abciclientmocks "github.com/dashpay/tenderdash/abci/client/mocks"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	abcimocks "github.com/dashpay/tenderdash/abci/types/mocks"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	mpmocks "github.com/dashpay/tenderdash/internal/mempool/mocks"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	sf "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/rand"
+	tmtypes "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/state/export_test.go b/internal/state/export_test.go
index 5f41108653..d99b509777 100644
--- a/internal/state/export_test.go
+++ b/internal/state/export_test.go
@@ -1,8 +1,8 @@
 package state
 
 import (
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // ValidateValidatorUpdates is an alias for validateValidatorUpdates exported
diff --git a/internal/state/helpers_test.go b/internal/state/helpers_test.go
index 51d0e7ba63..699f855b56 100644
--- a/internal/state/helpers_test.go
+++ b/internal/state/helpers_test.go
@@ -9,14 +9,14 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	sm "github.com/tendermint/tendermint/internal/state"
-	sf "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	sf "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/state/indexer/block/kv/kv.go b/internal/state/indexer/block/kv/kv.go
index 1b9a3120b9..ccba695093 100644
--- a/internal/state/indexer/block/kv/kv.go
+++ b/internal/state/indexer/block/kv/kv.go
@@ -11,11 +11,11 @@ import (
 	"github.com/google/orderedcode"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/pubsub/query/syntax"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/pubsub/query/syntax"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ indexer.BlockIndexer = (*BlockerIndexer)(nil)
diff --git a/internal/state/indexer/block/kv/kv_test.go b/internal/state/indexer/block/kv/kv_test.go
index 0bca43848b..20cda5a82c 100644
--- a/internal/state/indexer/block/kv/kv_test.go
+++ b/internal/state/indexer/block/kv/kv_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	blockidxkv "github.com/tendermint/tendermint/internal/state/indexer/block/kv"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	blockidxkv "github.com/dashpay/tenderdash/internal/state/indexer/block/kv"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestBlockIndexer(t *testing.T) {
diff --git a/internal/state/indexer/block/kv/util.go b/internal/state/indexer/block/kv/util.go
index fd68462739..57b841d370 100644
--- a/internal/state/indexer/block/kv/util.go
+++ b/internal/state/indexer/block/kv/util.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/google/orderedcode"
 
-	"github.com/tendermint/tendermint/internal/pubsub/query/syntax"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query/syntax"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func intInSlice(a int, list []int) bool {
diff --git a/internal/state/indexer/block/null/null.go b/internal/state/indexer/block/null/null.go
index 7d5453848e..e864490aa4 100644
--- a/internal/state/indexer/block/null/null.go
+++ b/internal/state/indexer/block/null/null.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ indexer.BlockIndexer = (*BlockerIndexer)(nil)
diff --git a/internal/state/indexer/eventsink.go b/internal/state/indexer/eventsink.go
index 9b4d6f5614..1aa1882c84 100644
--- a/internal/state/indexer/eventsink.go
+++ b/internal/state/indexer/eventsink.go
@@ -3,9 +3,9 @@ package indexer
 import (
 	"context"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type EventSinkType string
diff --git a/internal/state/indexer/indexer.go b/internal/state/indexer/indexer.go
index 7ff6733db3..6a366833b0 100644
--- a/internal/state/indexer/indexer.go
+++ b/internal/state/indexer/indexer.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // TxIndexer interface defines methods to index and search transactions.
diff --git a/internal/state/indexer/indexer_service.go b/internal/state/indexer/indexer_service.go
index d6db82806a..8a857aba2c 100644
--- a/internal/state/indexer/indexer_service.go
+++ b/internal/state/indexer/indexer_service.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"time"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Service connects event bus, transaction and block indexers together in
diff --git a/internal/state/indexer/indexer_service_test.go b/internal/state/indexer/indexer_service_test.go
index 6dc1bdf504..b3a3843a75 100644
--- a/internal/state/indexer/indexer_service_test.go
+++ b/internal/state/indexer/indexer_service_test.go
@@ -15,13 +15,13 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink/kv"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink/psql"
-	tmlog "github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink/kv"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink/psql"
+	tmlog "github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 
 	// Register the Postgre database driver.
 	_ "github.com/lib/pq"
diff --git a/internal/state/indexer/mocks/event_sink.go b/internal/state/indexer/mocks/event_sink.go
index 86a5b31432..45d3f22c8a 100644
--- a/internal/state/indexer/mocks/event_sink.go
+++ b/internal/state/indexer/mocks/event_sink.go
@@ -5,14 +5,14 @@ package mocks
 import (
 	context "context"
 
+	indexer "github.com/dashpay/tenderdash/internal/state/indexer"
 	mock "github.com/stretchr/testify/mock"
-	indexer "github.com/tendermint/tendermint/internal/state/indexer"
 
-	query "github.com/tendermint/tendermint/internal/pubsub/query"
+	query "github.com/dashpay/tenderdash/internal/pubsub/query"
 
-	tenderminttypes "github.com/tendermint/tendermint/types"
+	tenderdashtypes "github.com/dashpay/tenderdash/types"
 
-	types "github.com/tendermint/tendermint/abci/types"
+	types "github.com/dashpay/tenderdash/abci/types"
 )
 
 // EventSink is an autogenerated mock type for the EventSink type
@@ -71,11 +71,11 @@ func (_m *EventSink) HasBlock(_a0 int64) (bool, error) {
 }
 
 // IndexBlockEvents provides a mock function with given fields: _a0
-func (_m *EventSink) IndexBlockEvents(_a0 tenderminttypes.EventDataNewBlockHeader) error {
+func (_m *EventSink) IndexBlockEvents(_a0 tenderdashtypes.EventDataNewBlockHeader) error {
 	ret := _m.Called(_a0)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(tenderminttypes.EventDataNewBlockHeader) error); ok {
+	if rf, ok := ret.Get(0).(func(tenderdashtypes.EventDataNewBlockHeader) error); ok {
 		r0 = rf(_a0)
 	} else {
 		r0 = ret.Error(0)
diff --git a/internal/state/indexer/query_range.go b/internal/state/indexer/query_range.go
index ff54cd32b8..e160b9f8e3 100644
--- a/internal/state/indexer/query_range.go
+++ b/internal/state/indexer/query_range.go
@@ -3,7 +3,7 @@ package indexer
 import (
 	"time"
 
-	"github.com/tendermint/tendermint/internal/pubsub/query/syntax"
+	"github.com/dashpay/tenderdash/internal/pubsub/query/syntax"
 )
 
 // QueryRanges defines a mapping between a composite event key and a QueryRange.
diff --git a/internal/state/indexer/sink/kv/kv.go b/internal/state/indexer/sink/kv/kv.go
index 10282fd340..688841097a 100644
--- a/internal/state/indexer/sink/kv/kv.go
+++ b/internal/state/indexer/sink/kv/kv.go
@@ -5,12 +5,12 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	kvb "github.com/tendermint/tendermint/internal/state/indexer/block/kv"
-	kvt "github.com/tendermint/tendermint/internal/state/indexer/tx/kv"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	kvb "github.com/dashpay/tenderdash/internal/state/indexer/block/kv"
+	kvt "github.com/dashpay/tenderdash/internal/state/indexer/tx/kv"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ indexer.EventSink = (*EventSink)(nil)
diff --git a/internal/state/indexer/sink/kv/kv_test.go b/internal/state/indexer/sink/kv/kv_test.go
index d4b110f4ae..690e9d5be0 100644
--- a/internal/state/indexer/sink/kv/kv_test.go
+++ b/internal/state/indexer/sink/kv/kv_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	kvtx "github.com/tendermint/tendermint/internal/state/indexer/tx/kv"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	kvtx "github.com/dashpay/tenderdash/internal/state/indexer/tx/kv"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestType(t *testing.T) {
diff --git a/internal/state/indexer/sink/null/null.go b/internal/state/indexer/sink/null/null.go
index c436bdf0f1..6632eeb8f5 100644
--- a/internal/state/indexer/sink/null/null.go
+++ b/internal/state/indexer/sink/null/null.go
@@ -3,10 +3,10 @@ package null
 import (
 	"context"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ indexer.EventSink = (*EventSink)(nil)
diff --git a/internal/state/indexer/sink/null/null_test.go b/internal/state/indexer/sink/null/null_test.go
index 9af66027f6..c6cdc6c6e0 100644
--- a/internal/state/indexer/sink/null/null_test.go
+++ b/internal/state/indexer/sink/null/null_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestNullEventSink(t *testing.T) {
diff --git a/internal/state/indexer/sink/psql/psql.go b/internal/state/indexer/sink/psql/psql.go
index 57f5e5c3d6..9d8c68761f 100644
--- a/internal/state/indexer/sink/psql/psql.go
+++ b/internal/state/indexer/sink/psql/psql.go
@@ -10,10 +10,11 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/jsonpb"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/types"
+
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/state/indexer/sink/psql/psql_test.go b/internal/state/indexer/sink/psql/psql_test.go
index 0ef9218d28..17c457530e 100644
--- a/internal/state/indexer/sink/psql/psql_test.go
+++ b/internal/state/indexer/sink/psql/psql_test.go
@@ -19,10 +19,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/types"
 
 	// Register the Postgres database driver.
 	_ "github.com/lib/pq"
diff --git a/internal/state/indexer/sink/sink.go b/internal/state/indexer/sink/sink.go
index cae861416c..1bc6d4cc92 100644
--- a/internal/state/indexer/sink/sink.go
+++ b/internal/state/indexer/sink/sink.go
@@ -4,11 +4,11 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink/kv"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink/null"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink/psql"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink/kv"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink/null"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink/psql"
 )
 
 // EventSinksFromConfig constructs a slice of indexer.EventSink using the provided
diff --git a/internal/state/indexer/tx/kv/kv.go b/internal/state/indexer/tx/kv/kv.go
index ef362425bd..d9e93f2c8a 100644
--- a/internal/state/indexer/tx/kv/kv.go
+++ b/internal/state/indexer/tx/kv/kv.go
@@ -11,11 +11,11 @@ import (
 	"github.com/google/orderedcode"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/pubsub/query/syntax"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/pubsub/query/syntax"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var _ indexer.TxIndexer = (*TxIndex)(nil)
diff --git a/internal/state/indexer/tx/kv/kv_bench_test.go b/internal/state/indexer/tx/kv/kv_bench_test.go
index 7007d5bb5b..c0e4d89ae7 100644
--- a/internal/state/indexer/tx/kv/kv_bench_test.go
+++ b/internal/state/indexer/tx/kv/kv_bench_test.go
@@ -8,9 +8,9 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func BenchmarkTxSearch(b *testing.B) {
diff --git a/internal/state/indexer/tx/kv/kv_test.go b/internal/state/indexer/tx/kv/kv_test.go
index 8004c0f27e..79f8b32173 100644
--- a/internal/state/indexer/tx/kv/kv_test.go
+++ b/internal/state/indexer/tx/kv/kv_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestTxIndex(t *testing.T) {
diff --git a/internal/state/indexer/tx/null/null.go b/internal/state/indexer/tx/null/null.go
index dea5d570f8..d6a1be056f 100644
--- a/internal/state/indexer/tx/null/null.go
+++ b/internal/state/indexer/tx/null/null.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	"github.com/tendermint/tendermint/internal/state/indexer"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
 )
 
 var _ indexer.TxIndexer = (*TxIndex)(nil)
diff --git a/internal/state/mocks/block_store.go b/internal/state/mocks/block_store.go
index 6dc0ce7d06..f4a0636d78 100644
--- a/internal/state/mocks/block_store.go
+++ b/internal/state/mocks/block_store.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // BlockStore is an autogenerated mock type for the BlockStore type
diff --git a/internal/state/mocks/event_sink.go b/internal/state/mocks/event_sink.go
index 9f2d2daf3c..6d2d679432 100644
--- a/internal/state/mocks/event_sink.go
+++ b/internal/state/mocks/event_sink.go
@@ -7,13 +7,13 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	indexer "github.com/tendermint/tendermint/internal/state/indexer"
+	indexer "github.com/dashpay/tenderdash/internal/state/indexer"
 
-	query "github.com/tendermint/tendermint/internal/pubsub/query"
+	query "github.com/dashpay/tenderdash/internal/pubsub/query"
 
-	tenderminttypes "github.com/tendermint/tendermint/types"
+	tenderminttypes "github.com/dashpay/tenderdash/types"
 
-	types "github.com/tendermint/tendermint/abci/types"
+	types "github.com/dashpay/tenderdash/abci/types"
 )
 
 // EventSink is an autogenerated mock type for the EventSink type
diff --git a/internal/state/mocks/evidence_pool.go b/internal/state/mocks/evidence_pool.go
index c7cc9dcca6..162d1035d3 100644
--- a/internal/state/mocks/evidence_pool.go
+++ b/internal/state/mocks/evidence_pool.go
@@ -5,10 +5,10 @@ package mocks
 import (
 	context "context"
 
+	state "github.com/dashpay/tenderdash/internal/state"
 	mock "github.com/stretchr/testify/mock"
-	state "github.com/tendermint/tendermint/internal/state"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // EvidencePool is an autogenerated mock type for the EvidencePool type
diff --git a/internal/state/mocks/executor.go b/internal/state/mocks/executor.go
index b102fb36e1..daa92ee0dc 100644
--- a/internal/state/mocks/executor.go
+++ b/internal/state/mocks/executor.go
@@ -5,10 +5,10 @@ package mocks
 import (
 	context "context"
 
+	state "github.com/dashpay/tenderdash/internal/state"
 	mock "github.com/stretchr/testify/mock"
-	state "github.com/tendermint/tendermint/internal/state"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // Executor is an autogenerated mock type for the Executor type
diff --git a/internal/state/mocks/store.go b/internal/state/mocks/store.go
index 6d51274f9a..8f8fc65857 100644
--- a/internal/state/mocks/store.go
+++ b/internal/state/mocks/store.go
@@ -3,11 +3,12 @@
 package mocks
 
 import (
+	state "github.com/dashpay/tenderdash/internal/state"
 	mock "github.com/stretchr/testify/mock"
-	state "github.com/tendermint/tendermint/internal/state"
-	tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state"
 
-	types "github.com/tendermint/tendermint/types"
+	tendermintstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // Store is an autogenerated mock type for the Store type
diff --git a/internal/state/rollback.go b/internal/state/rollback.go
index 9818b8da22..5f077c70b1 100644
--- a/internal/state/rollback.go
+++ b/internal/state/rollback.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/version"
 )
 
 // Rollback overwrites the current Tendermint state (height n) with the most
diff --git a/internal/state/rollback_test.go b/internal/state/rollback_test.go
index 02c939f56d..4ca126c110 100644
--- a/internal/state/rollback_test.go
+++ b/internal/state/rollback_test.go
@@ -6,11 +6,11 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 func TestRollback(t *testing.T) {
diff --git a/internal/state/services.go b/internal/state/services.go
index c8f4ffe5ee..ad104641dc 100644
--- a/internal/state/services.go
+++ b/internal/state/services.go
@@ -3,7 +3,7 @@ package state
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //------------------------------------------------------
diff --git a/internal/state/state.go b/internal/state/state.go
index 8a9fd03c7b..0b7b994d5b 100644
--- a/internal/state/state.go
+++ b/internal/state/state.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/dash"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	tmversion "github.com/tendermint/tendermint/proto/tendermint/version"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/dash"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+	tmversion "github.com/dashpay/tenderdash/proto/tendermint/version"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/internal/state/state_test.go b/internal/state/state_test.go
index 128994c877..5c2e05056d 100644
--- a/internal/state/state_test.go
+++ b/internal/state/state_test.go
@@ -12,18 +12,18 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/dash/llmq"
-	sm "github.com/tendermint/tendermint/internal/state"
-	statefactory "github.com/tendermint/tendermint/internal/state/test/factory"
-	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	statefactory "github.com/dashpay/tenderdash/internal/state/test/factory"
+	tmstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // setupTestCase does setup common to all test cases.
diff --git a/internal/state/store.go b/internal/state/store.go
index 56549e10b2..0c97f9af30 100644
--- a/internal/state/store.go
+++ b/internal/state/store.go
@@ -9,11 +9,11 @@ import (
 	"github.com/google/orderedcode"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/state/store_test.go b/internal/state/store_test.go
index 6d38a9131d..153fa4bd7b 100644
--- a/internal/state/store_test.go
+++ b/internal/state/store_test.go
@@ -10,13 +10,13 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	sm "github.com/tendermint/tendermint/internal/state"
-	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	tmstate "github.com/dashpay/tenderdash/proto/tendermint/state"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/state/test/factory/block.go b/internal/state/test/factory/block.go
index d17330a79d..d6ff4f237a 100644
--- a/internal/state/test/factory/block.go
+++ b/internal/state/test/factory/block.go
@@ -9,11 +9,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func MakeBlocks(ctx context.Context, t *testing.T, n int, state *sm.State, privVals []types.PrivValidator, proposedAppVersion uint64) []*types.Block {
diff --git a/internal/state/tx_filter.go b/internal/state/tx_filter.go
index f0ba76a1ad..4b1afd8d87 100644
--- a/internal/state/tx_filter.go
+++ b/internal/state/tx_filter.go
@@ -5,9 +5,9 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func cachingStateFetcher(store Store) func() (State, error) {
diff --git a/internal/state/tx_filter_test.go b/internal/state/tx_filter_test.go
index 7df56d2f01..bec5162434 100644
--- a/internal/state/tx_filter_test.go
+++ b/internal/state/tx_filter_test.go
@@ -4,14 +4,13 @@ import (
 	"strconv"
 	"testing"
 
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestTxFilter(t *testing.T) {
diff --git a/internal/state/validation.go b/internal/state/validation.go
index 76d236533d..ceb0884f6b 100644
--- a/internal/state/validation.go
+++ b/internal/state/validation.go
@@ -5,11 +5,10 @@ import (
 	"errors"
 	"fmt"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //-----------------------------------------------------
diff --git a/internal/state/validation_test.go b/internal/state/validation_test.go
index 950c7ff18b..281ac4eb7e 100644
--- a/internal/state/validation_test.go
+++ b/internal/state/validation_test.go
@@ -12,21 +12,21 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	mpmocks "github.com/tendermint/tendermint/internal/mempool/mocks"
-	"github.com/tendermint/tendermint/internal/proxy"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/mocks"
-	statefactory "github.com/tendermint/tendermint/internal/state/test/factory"
-	"github.com/tendermint/tendermint/internal/store"
-	testfactory "github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	mpmocks "github.com/dashpay/tenderdash/internal/mempool/mocks"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/mocks"
+	statefactory "github.com/dashpay/tenderdash/internal/state/test/factory"
+	"github.com/dashpay/tenderdash/internal/store"
+	testfactory "github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const validationTestsStopHeight int64 = 10
diff --git a/internal/statesync/block_queue.go b/internal/statesync/block_queue.go
index 123ff89c91..04ff84f6fd 100644
--- a/internal/statesync/block_queue.go
+++ b/internal/statesync/block_queue.go
@@ -7,7 +7,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type lightBlockResponse struct {
diff --git a/internal/statesync/block_queue_test.go b/internal/statesync/block_queue_test.go
index 64c1216804..5b3d0bc05b 100644
--- a/internal/statesync/block_queue_test.go
+++ b/internal/statesync/block_queue_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/statesync/chunks.go b/internal/statesync/chunks.go
index 2a49bceb88..bd9d23e880 100644
--- a/internal/statesync/chunks.go
+++ b/internal/statesync/chunks.go
@@ -9,8 +9,8 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // errDone is returned by chunkQueue.Next() when all chunks have been returned.
diff --git a/internal/statesync/chunks_test.go b/internal/statesync/chunks_test.go
index eae4040120..0ecb01946e 100644
--- a/internal/statesync/chunks_test.go
+++ b/internal/statesync/chunks_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/bytes"
 )
 
 type ChunkQueueTestSuite struct {
diff --git a/internal/statesync/dispatcher.go b/internal/statesync/dispatcher.go
index 3a7fef5dd1..5ded294ca1 100644
--- a/internal/statesync/dispatcher.go
+++ b/internal/statesync/dispatcher.go
@@ -8,12 +8,12 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light/provider"
-	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light/provider"
+	ssproto "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/statesync/dispatcher_test.go b/internal/statesync/dispatcher_test.go
index 88add1e06b..b80884e7ab 100644
--- a/internal/statesync/dispatcher_test.go
+++ b/internal/statesync/dispatcher_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	ssproto "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type channelInternal struct {
diff --git a/internal/statesync/mocks/state_provider.go b/internal/statesync/mocks/state_provider.go
index acd99f42cf..b4301dffcb 100644
--- a/internal/statesync/mocks/state_provider.go
+++ b/internal/statesync/mocks/state_provider.go
@@ -5,13 +5,13 @@ package mocks
 import (
 	context "context"
 
-	bytes "github.com/tendermint/tendermint/libs/bytes"
+	bytes "github.com/dashpay/tenderdash/libs/bytes"
 
 	mock "github.com/stretchr/testify/mock"
 
-	state "github.com/tendermint/tendermint/internal/state"
+	state "github.com/dashpay/tenderdash/internal/state"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // StateProvider is an autogenerated mock type for the StateProvider type
diff --git a/internal/statesync/peer.go b/internal/statesync/peer.go
index f15e3fe1f9..bc53201de1 100644
--- a/internal/statesync/peer.go
+++ b/internal/statesync/peer.go
@@ -3,11 +3,11 @@ package statesync
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/store"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/store"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type (
diff --git a/internal/statesync/peer_test.go b/internal/statesync/peer_test.go
index 184361821d..23d6d0d7f8 100644
--- a/internal/statesync/peer_test.go
+++ b/internal/statesync/peer_test.go
@@ -5,11 +5,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client/mocks"
-	"github.com/tendermint/tendermint/libs/log"
-	peerMocks "github.com/tendermint/tendermint/libs/store/mocks"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client/mocks"
+	"github.com/dashpay/tenderdash/libs/log"
+	peerMocks "github.com/dashpay/tenderdash/libs/store/mocks"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestPeerSubscriberBasic(t *testing.T) {
diff --git a/internal/statesync/reactor.go b/internal/statesync/reactor.go
index bd7bf59d91..d1b64b329a 100644
--- a/internal/statesync/reactor.go
+++ b/internal/statesync/reactor.go
@@ -12,20 +12,20 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/p2p"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/light/provider"
-	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/light/provider"
+	ssproto "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/internal/statesync/reactor_test.go b/internal/statesync/reactor_test.go
index dcee612c6b..17a6895c1a 100644
--- a/internal/statesync/reactor_test.go
+++ b/internal/statesync/reactor_test.go
@@ -16,22 +16,22 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	clientmocks "github.com/tendermint/tendermint/abci/client/mocks"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/proxy"
-	smmocks "github.com/tendermint/tendermint/internal/state/mocks"
-	"github.com/tendermint/tendermint/internal/statesync/mocks"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light/provider"
-	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	clientmocks "github.com/dashpay/tenderdash/abci/client/mocks"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	smmocks "github.com/dashpay/tenderdash/internal/state/mocks"
+	"github.com/dashpay/tenderdash/internal/statesync/mocks"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light/provider"
+	ssproto "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/statesync/repo.go b/internal/statesync/repo.go
index 857faecf42..fa5fb4084d 100644
--- a/internal/statesync/repo.go
+++ b/internal/statesync/repo.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"sort"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // LightBlockRepository is a repository for light blocks
diff --git a/internal/statesync/repo_test.go b/internal/statesync/repo_test.go
index 1284e3d6b2..9376e449ff 100644
--- a/internal/statesync/repo_test.go
+++ b/internal/statesync/repo_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	clientmocks "github.com/tendermint/tendermint/abci/client/mocks"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
+	clientmocks "github.com/dashpay/tenderdash/abci/client/mocks"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type snapshotRepositoryTestSuite struct {
diff --git a/internal/statesync/snapshots.go b/internal/statesync/snapshots.go
index 255b30fbe8..e7fad3c3a2 100644
--- a/internal/statesync/snapshots.go
+++ b/internal/statesync/snapshots.go
@@ -9,8 +9,8 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // snapshotKey is a snapshot key used for lookups.
diff --git a/internal/statesync/snapshots_test.go b/internal/statesync/snapshots_test.go
index 76b94396f7..fd2d37da81 100644
--- a/internal/statesync/snapshots_test.go
+++ b/internal/statesync/snapshots_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestSnapshot_Key(t *testing.T) {
diff --git a/internal/statesync/stateprovider.go b/internal/statesync/stateprovider.go
index 85cf42e814..2d98e82c51 100644
--- a/internal/statesync/stateprovider.go
+++ b/internal/statesync/stateprovider.go
@@ -12,20 +12,20 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/internal/p2p"
-	sm "github.com/tendermint/tendermint/internal/state"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	lightprovider "github.com/tendermint/tendermint/light/provider"
-	lighthttp "github.com/tendermint/tendermint/light/provider/http"
-	lightrpc "github.com/tendermint/tendermint/light/rpc"
-	lightdb "github.com/tendermint/tendermint/light/store/db"
-	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	lightprovider "github.com/dashpay/tenderdash/light/provider"
+	lighthttp "github.com/dashpay/tenderdash/light/provider/http"
+	lightrpc "github.com/dashpay/tenderdash/light/rpc"
+	lightdb "github.com/dashpay/tenderdash/light/store/db"
+	ssproto "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 //go:generate ../../scripts/mockery_generate.sh StateProvider
diff --git a/internal/statesync/syncer.go b/internal/statesync/syncer.go
index d9f3f086d5..24ce2eb0a6 100644
--- a/internal/statesync/syncer.go
+++ b/internal/statesync/syncer.go
@@ -9,16 +9,16 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/proxy"
-	sm "github.com/tendermint/tendermint/internal/state"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	ssproto "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/internal/statesync/syncer_test.go b/internal/statesync/syncer_test.go
index e3850fe43e..e5934608a1 100644
--- a/internal/statesync/syncer_test.go
+++ b/internal/statesync/syncer_test.go
@@ -9,18 +9,18 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	clientmocks "github.com/tendermint/tendermint/abci/client/mocks"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/proxy"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/statesync/mocks"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	clientmocks "github.com/dashpay/tenderdash/abci/client/mocks"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/statesync/mocks"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	ssproto "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 type SyncerTestSuite struct {
diff --git a/internal/store/store.go b/internal/store/store.go
index f023a7ab4c..04d3d8ccdc 100644
--- a/internal/store/store.go
+++ b/internal/store/store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/google/orderedcode"
 	dbm "github.com/tendermint/tm-db"
 
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 /*
diff --git a/internal/store/store_test.go b/internal/store/store_test.go
index 58101f06b7..1b03e7ef25 100644
--- a/internal/store/store_test.go
+++ b/internal/store/store_test.go
@@ -13,16 +13,16 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/test/factory"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/test/factory"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 // make a Commit with a single vote containing just the height and a timestamp
diff --git a/internal/test/factory/block.go b/internal/test/factory/block.go
index f483df7457..13a1f8e8f1 100644
--- a/internal/test/factory/block.go
+++ b/internal/test/factory/block.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 const (
diff --git a/internal/test/factory/commit.go b/internal/test/factory/commit.go
index 720b8e8245..80c52ea7e8 100644
--- a/internal/test/factory/commit.go
+++ b/internal/test/factory/commit.go
@@ -3,8 +3,8 @@ package factory
 import (
 	"context"
 
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func MakeCommit(
diff --git a/internal/test/factory/factory_test.go b/internal/test/factory/factory_test.go
index 6cdc2aed96..aa21964188 100644
--- a/internal/test/factory/factory_test.go
+++ b/internal/test/factory/factory_test.go
@@ -3,7 +3,7 @@ package factory
 import (
 	"testing"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestMakeHeader(t *testing.T) {
diff --git a/internal/test/factory/genesis.go b/internal/test/factory/genesis.go
index d57522ce93..899c654162 100644
--- a/internal/test/factory/genesis.go
+++ b/internal/test/factory/genesis.go
@@ -3,10 +3,10 @@ package factory
 import (
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/bytes"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // MinimalGenesisDoc generates a minimal working genesis doc.
diff --git a/internal/test/factory/p2p.go b/internal/test/factory/p2p.go
index e2edcba6a4..ed5afba6bf 100644
--- a/internal/test/factory/p2p.go
+++ b/internal/test/factory/p2p.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // NodeID returns a valid NodeID based on an inputted string
diff --git a/internal/test/factory/params.go b/internal/test/factory/params.go
index 1dda2b4092..dcbe137a2e 100644
--- a/internal/test/factory/params.go
+++ b/internal/test/factory/params.go
@@ -3,7 +3,7 @@ package factory
 import (
 	"time"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // ConsensusParams returns a default set of ConsensusParams that are suitable
diff --git a/internal/test/factory/tx.go b/internal/test/factory/tx.go
index a252222f41..c544312440 100644
--- a/internal/test/factory/tx.go
+++ b/internal/test/factory/tx.go
@@ -1,8 +1,8 @@
 package factory
 
 import (
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func MakeNTxs(height, n int64) types.Txs {
diff --git a/internal/test/factory/validator_set.go b/internal/test/factory/validator_set.go
index 710723a0a8..45ccddcd63 100644
--- a/internal/test/factory/validator_set.go
+++ b/internal/test/factory/validator_set.go
@@ -3,10 +3,10 @@ package factory
 import (
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // MockValidatorSet returns static validator set with 2 validators and 2 private keys
diff --git a/internal/test/factory/vote.go b/internal/test/factory/vote.go
index b4f69fe84a..40c0a33c40 100644
--- a/internal/test/factory/vote.go
+++ b/internal/test/factory/vote.go
@@ -3,8 +3,8 @@ package factory
 import (
 	"context"
 
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func MakeVote(
diff --git a/libs/bits/bit_array.go b/libs/bits/bit_array.go
index 442aae7501..5083a36d59 100644
--- a/libs/bits/bit_array.go
+++ b/libs/bits/bit_array.go
@@ -11,8 +11,8 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmprotobits "github.com/tendermint/tendermint/proto/tendermint/libs/bits"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmprotobits "github.com/dashpay/tenderdash/proto/tendermint/libs/bits"
 )
 
 // BitArray is a thread-safe implementation of a bit array.
diff --git a/libs/bits/bit_array_test.go b/libs/bits/bit_array_test.go
index e4bf45c387..fb7af5dd16 100644
--- a/libs/bits/bit_array_test.go
+++ b/libs/bits/bit_array_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmprotobits "github.com/tendermint/tendermint/proto/tendermint/libs/bits"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmprotobits "github.com/dashpay/tenderdash/proto/tendermint/libs/bits"
 )
 
 func randBitArray(bits int) *BitArray {
diff --git a/libs/eventemitter/emitter.go b/libs/eventemitter/emitter.go
index 263bb72349..3cd1476229 100644
--- a/libs/eventemitter/emitter.go
+++ b/libs/eventemitter/emitter.go
@@ -3,7 +3,7 @@ package eventemitter
 import (
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 // ListenerFunc is a type function of an event listener
diff --git a/libs/log/default_test.go b/libs/log/default_test.go
index 6ea723c519..5d828a5444 100644
--- a/libs/log/default_test.go
+++ b/libs/log/default_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func TestNewDefaultLogger(t *testing.T) {
diff --git a/libs/os/os_test.go b/libs/os/os_test.go
index ca7050156d..28bf73ce90 100644
--- a/libs/os/os_test.go
+++ b/libs/os/os_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	tmos "github.com/tendermint/tendermint/libs/os"
+	tmos "github.com/dashpay/tenderdash/libs/os"
 )
 
 func TestCopyFile(t *testing.T) {
diff --git a/libs/promise/promise_test.go b/libs/promise/promise_test.go
index 907e8d2929..2062c06c0d 100644
--- a/libs/promise/promise_test.go
+++ b/libs/promise/promise_test.go
@@ -9,7 +9,7 @@ import (
 	sync "github.com/sasha-s/go-deadlock"
 	"github.com/stretchr/testify/require"
 
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
 )
 
 func TestPromise(t *testing.T) {
diff --git a/libs/service/service.go b/libs/service/service.go
index 431cafe06a..43d2fa3133 100644
--- a/libs/service/service.go
+++ b/libs/service/service.go
@@ -6,7 +6,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 var (
diff --git a/libs/service/service_test.go b/libs/service/service_test.go
index 9c8c18c7f8..548b8861b3 100644
--- a/libs/service/service_test.go
+++ b/libs/service/service_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type testService struct {
diff --git a/libs/store/mocks/store.go b/libs/store/mocks/store.go
index 50722fe4ba..aa0d3779b8 100644
--- a/libs/store/mocks/store.go
+++ b/libs/store/mocks/store.go
@@ -3,8 +3,8 @@
 package mocks
 
 import (
+	store "github.com/dashpay/tenderdash/libs/store"
 	mock "github.com/stretchr/testify/mock"
-	store "github.com/tendermint/tendermint/libs/store"
 )
 
 // Store is an autogenerated mock type for the Store type
diff --git a/libs/store/store.go b/libs/store/store.go
index c3f7f08bb8..d57d7d2361 100644
--- a/libs/store/store.go
+++ b/libs/store/store.go
@@ -3,8 +3,8 @@
 package store
 
 import (
+	"github.com/dashpay/tenderdash/libs/ds"
 	sync "github.com/sasha-s/go-deadlock"
-	"github.com/tendermint/tendermint/libs/ds"
 )
 
 type (
diff --git a/libs/workerpool/worker.go b/libs/workerpool/worker.go
index f304cc4ded..c706deaa1c 100644
--- a/libs/workerpool/worker.go
+++ b/libs/workerpool/worker.go
@@ -3,7 +3,7 @@ package workerpool
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 type worker struct {
diff --git a/libs/workerpool/worker_pool.go b/libs/workerpool/worker_pool.go
index bbe3b1ea9a..97312ab776 100644
--- a/libs/workerpool/worker_pool.go
+++ b/libs/workerpool/worker_pool.go
@@ -7,7 +7,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 var (
diff --git a/libs/workerpool/worker_pool_test.go b/libs/workerpool/worker_pool_test.go
index ee3b9e3374..62dbe1664c 100644
--- a/libs/workerpool/worker_pool_test.go
+++ b/libs/workerpool/worker_pool_test.go
@@ -10,7 +10,7 @@ import (
 	sync "github.com/sasha-s/go-deadlock"
 	"github.com/stretchr/testify/require"
 
-	tmrequire "github.com/tendermint/tendermint/internal/test/require"
+	tmrequire "github.com/dashpay/tenderdash/internal/test/require"
 )
 
 func TestWorkerPool_Basic(t *testing.T) {
diff --git a/light/client.go b/light/client.go
index e37da257f6..d31157f51e 100644
--- a/light/client.go
+++ b/light/client.go
@@ -10,13 +10,13 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/crypto"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light/provider"
-	"github.com/tendermint/tendermint/light/store"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light/provider"
+	"github.com/dashpay/tenderdash/light/store"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type mode byte
diff --git a/light/client_benchmark_test.go b/light/client_benchmark_test.go
index e05f943e37..d4fbf86fc5 100644
--- a/light/client_benchmark_test.go
+++ b/light/client_benchmark_test.go
@@ -8,12 +8,12 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	"github.com/tendermint/tendermint/light/provider"
-	dbs "github.com/tendermint/tendermint/light/store/db"
-	"github.com/tendermint/tendermint/types"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	"github.com/dashpay/tenderdash/light/provider"
+	dbs "github.com/dashpay/tenderdash/light/store/db"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // NOTE: block is produced every minute. Make sure the verification time
diff --git a/light/client_test.go b/light/client_test.go
index 852c9cbbbe..34daf19e03 100644
--- a/light/client_test.go
+++ b/light/client_test.go
@@ -14,13 +14,13 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	"github.com/tendermint/tendermint/light/provider"
-	provider_mocks "github.com/tendermint/tendermint/light/provider/mocks"
-	dbs "github.com/tendermint/tendermint/light/store/db"
-	"github.com/tendermint/tendermint/types"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	"github.com/dashpay/tenderdash/light/provider"
+	provider_mocks "github.com/dashpay/tenderdash/light/provider/mocks"
+	dbs "github.com/dashpay/tenderdash/light/store/db"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/light/detector.go b/light/detector.go
index 78d148b749..e5464be9d6 100644
--- a/light/detector.go
+++ b/light/detector.go
@@ -6,8 +6,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/tendermint/tendermint/light/provider"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/light/provider"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // compareNewHeaderWithWitness takes the verified header from the primary and compares it with a
diff --git a/light/errors.go b/light/errors.go
index 8ceed4b76d..a1465e6471 100644
--- a/light/errors.go
+++ b/light/errors.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // ErrOldHeaderExpired means the old (trusted) header has expired according to
diff --git a/light/example_test.go b/light/example_test.go
index ae452f1c77..55e9a33164 100644
--- a/light/example_test.go
+++ b/light/example_test.go
@@ -9,15 +9,14 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/privval"
-
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	httpp "github.com/tendermint/tendermint/light/provider/http"
-	dbs "github.com/tendermint/tendermint/light/store/db"
-	rpctest "github.com/tendermint/tendermint/rpc/test"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	httpp "github.com/dashpay/tenderdash/light/provider/http"
+	dbs "github.com/dashpay/tenderdash/light/store/db"
+	"github.com/dashpay/tenderdash/privval"
+	rpctest "github.com/dashpay/tenderdash/rpc/test"
 )
 
 // Manually getting light blocks and verifying them.
diff --git a/light/helpers_test.go b/light/helpers_test.go
index 2d703c2135..4b68cfc953 100644
--- a/light/helpers_test.go
+++ b/light/helpers_test.go
@@ -8,11 +8,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	provider_mocks "github.com/tendermint/tendermint/light/provider/mocks"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/crypto"
+	provider_mocks "github.com/dashpay/tenderdash/light/provider/mocks"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 // privKeys is a helper type for testing.
diff --git a/light/light_test.go b/light/light_test.go
index a906a9582d..e54a220a1f 100644
--- a/light/light_test.go
+++ b/light/light_test.go
@@ -10,16 +10,16 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	"github.com/tendermint/tendermint/light/provider"
-	httpp "github.com/tendermint/tendermint/light/provider/http"
-	dbs "github.com/tendermint/tendermint/light/store/db"
-	"github.com/tendermint/tendermint/privval"
-	rpctest "github.com/tendermint/tendermint/rpc/test"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	"github.com/dashpay/tenderdash/light/provider"
+	httpp "github.com/dashpay/tenderdash/light/provider/http"
+	dbs "github.com/dashpay/tenderdash/light/store/db"
+	"github.com/dashpay/tenderdash/privval"
+	rpctest "github.com/dashpay/tenderdash/rpc/test"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // NOTE: these are ports of the tests from example_test.go but
diff --git a/light/provider/http/http.go b/light/provider/http/http.go
index f65262b420..546d2334d4 100644
--- a/light/provider/http/http.go
+++ b/light/provider/http/http.go
@@ -11,14 +11,13 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-
-	"github.com/tendermint/tendermint/light/provider"
-	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/light/provider"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var defaultOptions = Options{
diff --git a/light/provider/http/http_test.go b/light/provider/http/http_test.go
index fc69274900..a62c52444e 100644
--- a/light/provider/http/http_test.go
+++ b/light/provider/http/http_test.go
@@ -10,15 +10,15 @@ import (
 	testify "github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/light/provider"
-	lighthttp "github.com/tendermint/tendermint/light/provider/http"
-	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	rpcmock "github.com/tendermint/tendermint/rpc/client/mocks"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpctest "github.com/tendermint/tendermint/rpc/test"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/light/provider"
+	lighthttp "github.com/dashpay/tenderdash/light/provider/http"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	rpcmock "github.com/dashpay/tenderdash/rpc/client/mocks"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpctest "github.com/dashpay/tenderdash/rpc/test"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestNewProvider(t *testing.T) {
diff --git a/light/provider/mocks/provider.go b/light/provider/mocks/provider.go
index 3a71108e40..93042ab3dc 100644
--- a/light/provider/mocks/provider.go
+++ b/light/provider/mocks/provider.go
@@ -7,7 +7,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // Provider is an autogenerated mock type for the Provider type
diff --git a/light/provider/provider.go b/light/provider/provider.go
index d1b3304daa..31204f6a45 100644
--- a/light/provider/provider.go
+++ b/light/provider/provider.go
@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //go:generate ../../scripts/mockery_generate.sh Provider
diff --git a/light/proxy/proxy.go b/light/proxy/proxy.go
index 6e7a5ff2a6..bea109e490 100644
--- a/light/proxy/proxy.go
+++ b/light/proxy/proxy.go
@@ -6,13 +6,13 @@ import (
 	"net"
 	"net/http"
 
-	tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
-	rpccore "github.com/tendermint/tendermint/internal/rpc/core"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/light"
-	lrpc "github.com/tendermint/tendermint/light/rpc"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
+	tmpubsub "github.com/dashpay/tenderdash/internal/pubsub"
+	rpccore "github.com/dashpay/tenderdash/internal/rpc/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/light"
+	lrpc "github.com/dashpay/tenderdash/light/rpc"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	rpcserver "github.com/dashpay/tenderdash/rpc/jsonrpc/server"
 )
 
 // A Proxy defines parameters for running an HTTP server proxy.
diff --git a/light/proxy/routes.go b/light/proxy/routes.go
index df8b5f9dba..e00091dc70 100644
--- a/light/proxy/routes.go
+++ b/light/proxy/routes.go
@@ -3,9 +3,9 @@ package proxy
 import (
 	"context"
 
-	lrpc "github.com/tendermint/tendermint/light/rpc"
-	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	lrpc "github.com/dashpay/tenderdash/light/rpc"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // proxyService wraps a light RPC client to export the RPC service interfaces.
diff --git a/light/rpc/client.go b/light/rpc/client.go
index 9c6df91bf2..af282d6fa6 100644
--- a/light/rpc/client.go
+++ b/light/rpc/client.go
@@ -10,19 +10,18 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/libs"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	service "github.com/tendermint/tendermint/libs/service"
-	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/libs"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	service "github.com/dashpay/tenderdash/libs/service"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // KeyPathFunc builds a merkle path out of the given path and key.
diff --git a/light/rpc/mocks/light_client.go b/light/rpc/mocks/light_client.go
index 0212394edd..deb22f7d2a 100644
--- a/light/rpc/mocks/light_client.go
+++ b/light/rpc/mocks/light_client.go
@@ -9,7 +9,7 @@ import (
 
 	time "time"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // LightClient is an autogenerated mock type for the LightClient type
diff --git a/light/setup.go b/light/setup.go
index a6c3e6703b..9733802e0b 100644
--- a/light/setup.go
+++ b/light/setup.go
@@ -3,10 +3,10 @@ package light
 import (
 	"context"
 
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/light/provider"
-	"github.com/tendermint/tendermint/light/provider/http"
-	"github.com/tendermint/tendermint/light/store"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/light/provider"
+	"github.com/dashpay/tenderdash/light/provider/http"
+	"github.com/dashpay/tenderdash/light/store"
 )
 
 // NewHTTPClient initiates an instance of a light client using HTTP addresses
diff --git a/light/store/db/db.go b/light/store/db/db.go
index c72898f140..30b3a50026 100644
--- a/light/store/db/db.go
+++ b/light/store/db/db.go
@@ -9,9 +9,9 @@ import (
 	"github.com/google/orderedcode"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/light/store"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/light/store"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // key prefixes
diff --git a/light/store/db/db_test.go b/light/store/db/db_test.go
index e1d8c8be28..a0742c5af6 100644
--- a/light/store/db/db_test.go
+++ b/light/store/db/db_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/crypto"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 func TestLast_FirstLightBlockHeight(t *testing.T) {
diff --git a/light/store/store.go b/light/store/store.go
index a4991f0cc6..019e255ff3 100644
--- a/light/store/store.go
+++ b/light/store/store.go
@@ -1,6 +1,6 @@
 package store
 
-import "github.com/tendermint/tendermint/types"
+import "github.com/dashpay/tenderdash/types"
 
 // Store is anything that can persistently store headers.
 type Store interface {
diff --git a/node/node.go b/node/node.go
index 2257781765..b46ec76b08 100644
--- a/node/node.go
+++ b/node/node.go
@@ -9,35 +9,35 @@ import (
 	"strings"
 	"time"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash"
-	"github.com/tendermint/tendermint/dash/core"
-	dashquorum "github.com/tendermint/tendermint/dash/quorum"
-	"github.com/tendermint/tendermint/internal/blocksync"
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/eventlog"
-	"github.com/tendermint/tendermint/internal/evidence"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/p2p"
-	p2pclient "github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/internal/p2p/pex"
-	"github.com/tendermint/tendermint/internal/proxy"
-	rpccore "github.com/tendermint/tendermint/internal/rpc/core"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink"
-	"github.com/tendermint/tendermint/internal/statesync"
-	"github.com/tendermint/tendermint/internal/store"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash"
+	"github.com/dashpay/tenderdash/dash/core"
+	dashquorum "github.com/dashpay/tenderdash/dash/quorum"
+	"github.com/dashpay/tenderdash/internal/blocksync"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/eventlog"
+	"github.com/dashpay/tenderdash/internal/evidence"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	p2pclient "github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/internal/p2p/pex"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	rpccore "github.com/dashpay/tenderdash/internal/rpc/core"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink"
+	"github.com/dashpay/tenderdash/internal/statesync"
+	"github.com/dashpay/tenderdash/internal/store"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/privval"
+	"github.com/dashpay/tenderdash/types"
 
 	_ "net/http/pprof" //nolint: gosec // securely exposed on separate, optional port
 
@@ -410,7 +410,7 @@ func makeNode(
 	// Set up state sync reactor, and schedule a sync if requested.
 	// FIXME The way we do phased startups (e.g. replay -> block sync -> consensus) is very messy,
 	// we should clean this whole thing up. See:
-	// https://github.com/tendermint/tendermint/issues/4644
+	// https://github.com/dashpay/tenderdash/issues/4644
 	node.services = append(node.services, statesync.NewReactor(
 		genDoc.ChainID,
 		genDoc.InitialHeight,
diff --git a/node/node_test.go b/node/node_test.go
index 9c6930b2d8..4376202e41 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -15,29 +15,29 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/dash/quorum"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/evidence"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/proxy"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/state/indexer/sink"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/libs/service"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/dash/quorum"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/evidence"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/state/indexer/sink"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/privval"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestNodeStartStop(t *testing.T) {
diff --git a/node/public.go b/node/public.go
index 66b7492700..db1b80530a 100644
--- a/node/public.go
+++ b/node/public.go
@@ -5,11 +5,11 @@ import (
 	"context"
 	"fmt"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/types"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // NewDefault constructs a tendermint node service for use in go
diff --git a/node/seed.go b/node/seed.go
index e0023c9c5f..9142fedee2 100644
--- a/node/seed.go
+++ b/node/seed.go
@@ -7,14 +7,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/pex"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/pex"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type seedNodeImpl struct {
diff --git a/node/setup.go b/node/setup.go
index aba51f7a8b..970a4373fa 100644
--- a/node/setup.go
+++ b/node/setup.go
@@ -12,30 +12,30 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	dbm "github.com/tendermint/tm-db"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/evidence"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/internal/p2p/client"
-	"github.com/tendermint/tendermint/internal/p2p/conn"
-	"github.com/tendermint/tendermint/internal/p2p/pex"
-	sm "github.com/tendermint/tendermint/internal/state"
-	"github.com/tendermint/tendermint/internal/state/indexer"
-	"github.com/tendermint/tendermint/internal/statesync"
-	"github.com/tendermint/tendermint/internal/store"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/privval"
-	tmgrpc "github.com/tendermint/tendermint/privval/grpc"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/evidence"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/internal/p2p/client"
+	"github.com/dashpay/tenderdash/internal/p2p/conn"
+	"github.com/dashpay/tenderdash/internal/p2p/pex"
+	sm "github.com/dashpay/tenderdash/internal/state"
+	"github.com/dashpay/tenderdash/internal/state/indexer"
+	"github.com/dashpay/tenderdash/internal/statesync"
+	"github.com/dashpay/tenderdash/internal/store"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/privval"
+	tmgrpc "github.com/dashpay/tenderdash/privval/grpc"
+	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 
 	"net/http"
 	_ "net/http/pprof" //nolint: gosec // securely exposed on separate, optional port
diff --git a/privval/dash_consensus_key.go b/privval/dash_consensus_key.go
index 96a1a5ba20..5eb6a909d3 100644
--- a/privval/dash_consensus_key.go
+++ b/privval/dash_consensus_key.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	tmcrypto "github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	tmcrypto "github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 type dashConsensusPrivateKey struct {
diff --git a/privval/dash_core_mock_signer_server.go b/privval/dash_core_mock_signer_server.go
index 4ba7c51d0f..a096320dff 100644
--- a/privval/dash_core_mock_signer_server.go
+++ b/privval/dash_core_mock_signer_server.go
@@ -3,8 +3,8 @@ package privval
 import (
 	"github.com/go-pkgz/jrpc"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type DashCoreMockSignerServer struct {
diff --git a/privval/dash_core_signer_client.go b/privval/dash_core_signer_client.go
index 8a5627f434..56185952b4 100644
--- a/privval/dash_core_signer_client.go
+++ b/privval/dash_core_signer_client.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // DashPrivValidator is a PrivValidator that uses Dash-specific logic
diff --git a/privval/file.go b/privval/file.go
index 9842328ace..3f6492841f 100644
--- a/privval/file.go
+++ b/privval/file.go
@@ -10,19 +10,18 @@ import (
 	"os"
 	"strconv"
 
-	sync "github.com/sasha-s/go-deadlock"
-
 	"github.com/dashpay/dashd-go/btcjson"
+	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/internal/libs/tempfile"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/internal/libs/tempfile"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmos "github.com/dashpay/tenderdash/libs/os"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // TODO: type ?
diff --git a/privval/file_test.go b/privval/file_test.go
index fd33c2e014..2a89fa1925 100644
--- a/privval/file_test.go
+++ b/privval/file_test.go
@@ -14,13 +14,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestGenLoadValidator(t *testing.T) {
diff --git a/privval/grpc/client.go b/privval/grpc/client.go
index 851b6840ac..7a031f3680 100644
--- a/privval/grpc/client.go
+++ b/privval/grpc/client.go
@@ -9,13 +9,13 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/status"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // SignerClient implements PrivValidator.
diff --git a/privval/grpc/client_test.go b/privval/grpc/client_test.go
index 31f9cf6a3b..9b3fca568d 100644
--- a/privval/grpc/client_test.go
+++ b/privval/grpc/client_test.go
@@ -13,13 +13,13 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/test/bufconn"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmgrpc "github.com/tendermint/tendermint/privval/grpc"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmgrpc "github.com/dashpay/tenderdash/privval/grpc"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const chainID = "chain-id"
diff --git a/privval/grpc/server.go b/privval/grpc/server.go
index 9e911a27dc..928f031691 100644
--- a/privval/grpc/server.go
+++ b/privval/grpc/server.go
@@ -7,11 +7,11 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/libs/log"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/libs/log"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // SignerServer implements PrivValidatorAPIServer 9generated via protobuf services)
diff --git a/privval/grpc/server_test.go b/privval/grpc/server_test.go
index fcfe78f3cd..219134e15c 100644
--- a/privval/grpc/server_test.go
+++ b/privval/grpc/server_test.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmgrpc "github.com/tendermint/tendermint/privval/grpc"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmgrpc "github.com/dashpay/tenderdash/privval/grpc"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const ChainID = "123"
diff --git a/privval/grpc/util.go b/privval/grpc/util.go
index a3ea6c532d..46b0ba12de 100644
--- a/privval/grpc/util.go
+++ b/privval/grpc/util.go
@@ -15,9 +15,9 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/keepalive"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
 )
 
 // DefaultDialOptions constructs a list of grpc dial options
diff --git a/privval/msgs.go b/privval/msgs.go
index 1480ce7c87..b0056ad4ba 100644
--- a/privval/msgs.go
+++ b/privval/msgs.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
 )
 
 // TODO: Add ChainIDRequest
diff --git a/privval/msgs_test.go b/privval/msgs_test.go
index 296b7e83db..bbb4d5f339 100644
--- a/privval/msgs_test.go
+++ b/privval/msgs_test.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	privproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	cryptoproto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	privproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var stamp = time.Date(2019, 10, 13, 16, 14, 44, 0, time.UTC)
diff --git a/privval/retry_signer_client.go b/privval/retry_signer_client.go
index 20128d259c..c3590f85fd 100644
--- a/privval/retry_signer_client.go
+++ b/privval/retry_signer_client.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // RetrySignerClient wraps SignerClient adding retry for each operation (except
diff --git a/privval/secret_connection.go b/privval/secret_connection.go
index ba651d7553..2c69517a39 100644
--- a/privval/secret_connection.go
+++ b/privval/secret_connection.go
@@ -23,12 +23,12 @@ import (
 	"golang.org/x/crypto/hkdf"
 	"golang.org/x/crypto/nacl/box"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/internal/libs/async"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmprivval "github.com/tendermint/tendermint/proto/tendermint/privval"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/internal/libs/async"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmprivval "github.com/dashpay/tenderdash/proto/tendermint/privval"
 )
 
 // This code has been duplicated from p2p/conn prior to the P2P refactor.
diff --git a/privval/signer_client.go b/privval/signer_client.go
index ab6baeaf97..8b5a74c80f 100644
--- a/privval/signer_client.go
+++ b/privval/signer_client.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/encoding"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/encoding"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // SignerClient implements PrivValidator.
diff --git a/privval/signer_client_test.go b/privval/signer_client_test.go
index 994b5fc0f5..73496b82fd 100644
--- a/privval/signer_client_test.go
+++ b/privval/signer_client_test.go
@@ -11,13 +11,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	cryptoproto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type signerTestCase struct {
diff --git a/privval/signer_dialer_endpoint.go b/privval/signer_dialer_endpoint.go
index b291a7ef5e..e68c45e37a 100644
--- a/privval/signer_dialer_endpoint.go
+++ b/privval/signer_dialer_endpoint.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
 )
 
 const (
diff --git a/privval/signer_endpoint.go b/privval/signer_endpoint.go
index 8795268c42..96ae1f5564 100644
--- a/privval/signer_endpoint.go
+++ b/privval/signer_endpoint.go
@@ -8,10 +8,10 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
 )
 
 const (
diff --git a/privval/signer_listener_endpoint.go b/privval/signer_listener_endpoint.go
index bb6104dfc5..fd1b40dd62 100644
--- a/privval/signer_listener_endpoint.go
+++ b/privval/signer_listener_endpoint.go
@@ -8,9 +8,9 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
 )
 
 // SignerListenerEndpointOption sets an optional parameter on the SignerListenerEndpoint.
diff --git a/privval/signer_listener_endpoint_test.go b/privval/signer_listener_endpoint_test.go
index 6049c62450..42a818528d 100644
--- a/privval/signer_listener_endpoint_test.go
+++ b/privval/signer_listener_endpoint_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/privval/signer_requestHandler.go b/privval/signer_requestHandler.go
index 636f946731..5431e17c7c 100644
--- a/privval/signer_requestHandler.go
+++ b/privval/signer_requestHandler.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/crypto"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	cryptoproto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func DefaultValidationRequestHandler(
diff --git a/privval/signer_server.go b/privval/signer_server.go
index 2de8b68274..20554332f3 100644
--- a/privval/signer_server.go
+++ b/privval/signer_server.go
@@ -6,9 +6,9 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/service"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/service"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // ValidationRequestHandlerFunc handles different remoteSigner requests
diff --git a/privval/socket_dialers.go b/privval/socket_dialers.go
index 9be84e02d7..befb0ab45e 100644
--- a/privval/socket_dialers.go
+++ b/privval/socket_dialers.go
@@ -5,8 +5,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmnet "github.com/tendermint/tendermint/libs/net"
+	"github.com/dashpay/tenderdash/crypto"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
 )
 
 // Socket errors.
diff --git a/privval/socket_dialers_test.go b/privval/socket_dialers_test.go
index 7ec8fe30f6..4e7100f7c4 100644
--- a/privval/socket_dialers_test.go
+++ b/privval/socket_dialers_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	tmnet "github.com/tendermint/tendermint/libs/net"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
 )
 
 // getFreeLocalhostAddrPort returns a free localhost:port address
diff --git a/privval/socket_listeners.go b/privval/socket_listeners.go
index 1ae95634a4..3e5ab7c56c 100644
--- a/privval/socket_listeners.go
+++ b/privval/socket_listeners.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
 )
 
 const (
diff --git a/privval/socket_listeners_test.go b/privval/socket_listeners_test.go
index e91d111d00..02a959bca7 100644
--- a/privval/socket_listeners_test.go
+++ b/privval/socket_listeners_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
 )
 
 //-------------------------------------------
diff --git a/privval/utils.go b/privval/utils.go
index a2cbbf5014..5b51da4f19 100644
--- a/privval/utils.go
+++ b/privval/utils.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
 )
 
 // IsConnTimeout returns a boolean indicating whether the error is known to
diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto
index 0c72d7d4c9..e5d66e39f6 100644
--- a/proto/tendermint/abci/types.proto
+++ b/proto/tendermint/abci/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.abci;
 
-option go_package = "github.com/tendermint/tendermint/abci/types";
+option go_package = "github.com/dashpay/tenderdash/abci/types";
 
 import "tendermint/crypto/proof.proto";
 import "tendermint/types/dash.proto";
diff --git a/proto/tendermint/blocksync/types.pb.go b/proto/tendermint/blocksync/types.pb.go
index acb1317365..b969b4abd4 100644
--- a/proto/tendermint/blocksync/types.pb.go
+++ b/proto/tendermint/blocksync/types.pb.go
@@ -5,8 +5,8 @@ package blocksync
 
 import (
 	fmt "fmt"
+	types "github.com/dashpay/tenderdash/proto/tendermint/types"
 	proto "github.com/gogo/protobuf/proto"
-	types "github.com/tendermint/tendermint/proto/tendermint/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -268,7 +268,7 @@ func init() {
 func init() { proto.RegisterFile("tendermint/blocksync/types.proto", fileDescriptor_19b397c236e0fa07) }
 
 var fileDescriptor_19b397c236e0fa07 = []byte{
-	// 267 bytes of a gzipped FileDescriptorProto
+	// 275 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0xca, 0xc9, 0x4f, 0xce, 0x2e, 0xae, 0xcc, 0x4b,
 	0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, 0xa8,
@@ -281,11 +281,12 @@ var fileDescriptor_19b397c236e0fa07 = []byte{
 	0xe4, 0xfc, 0xdc, 0xdc, 0xcc, 0x12, 0x09, 0x26, 0xb0, 0x7a, 0x09, 0x4c, 0xf5, 0xce, 0x60, 0xf9,
 	0x20, 0xa8, 0x3a, 0x25, 0x7e, 0x2e, 0xde, 0xe0, 0x92, 0xc4, 0x92, 0xd2, 0x62, 0xa8, 0x2f, 0x94,
 	0x6c, 0xb8, 0xf8, 0x60, 0x02, 0xf8, 0x1d, 0x2b, 0x24, 0xc4, 0xc5, 0x92, 0x94, 0x58, 0x9c, 0x0a,
-	0xb6, 0x8a, 0x39, 0x08, 0xcc, 0x76, 0x0a, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6,
+	0xb6, 0x8a, 0x39, 0x08, 0xcc, 0x76, 0x0a, 0x3a, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6,
 	0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39,
-	0x86, 0x28, 0xeb, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xe4, 0x60,
-	0x45, 0x30, 0xc1, 0xa1, 0xaa, 0x8f, 0x2d, 0x22, 0x93, 0xd8, 0xc0, 0x72, 0xc6, 0x80, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x73, 0xe1, 0x09, 0xcb, 0xe7, 0x01, 0x00, 0x00,
+	0x86, 0x28, 0x8b, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0x94, 0xc4,
+	0xe2, 0x8c, 0x82, 0xc4, 0x4a, 0x7d, 0x88, 0xe3, 0x40, 0x3c, 0x7d, 0x70, 0x90, 0xea, 0x63, 0x8b,
+	0xc5, 0x24, 0x36, 0xb0, 0x9c, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x3d, 0xc3, 0xea, 0xe4,
+	0x01, 0x00, 0x00,
 }
 
 func (m *BlockRequest) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/blocksync/types.proto b/proto/tendermint/blocksync/types.proto
index 457b52284f..3b229350d0 100644
--- a/proto/tendermint/blocksync/types.proto
+++ b/proto/tendermint/blocksync/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.blocksync;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/blocksync";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/blocksync";
 
 import "tendermint/types/block.proto";
 import "tendermint/types/types.proto";
diff --git a/proto/tendermint/consensus/message_test.go b/proto/tendermint/consensus/message_test.go
index 21c3c4faa0..8c1a2c9a97 100644
--- a/proto/tendermint/consensus/message_test.go
+++ b/proto/tendermint/consensus/message_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func TestHasVoteVector(t *testing.T) {
diff --git a/proto/tendermint/consensus/types.pb.go b/proto/tendermint/consensus/types.pb.go
index 859ddabc70..076ffe4a37 100644
--- a/proto/tendermint/consensus/types.pb.go
+++ b/proto/tendermint/consensus/types.pb.go
@@ -5,10 +5,10 @@ package consensus
 
 import (
 	fmt "fmt"
+	bits "github.com/dashpay/tenderdash/proto/tendermint/libs/bits"
+	types "github.com/dashpay/tenderdash/proto/tendermint/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	bits "github.com/tendermint/tendermint/proto/tendermint/libs/bits"
-	types "github.com/tendermint/tendermint/proto/tendermint/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -930,65 +930,65 @@ func init() {
 func init() { proto.RegisterFile("tendermint/consensus/types.proto", fileDescriptor_81a22d2efc008981) }
 
 var fileDescriptor_81a22d2efc008981 = []byte{
-	// 914 bytes of a gzipped FileDescriptorProto
+	// 920 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x6e, 0x23, 0x45,
 	0x10, 0x9e, 0x21, 0xfe, 0xad, 0xc9, 0x0f, 0xb4, 0xb2, 0x2b, 0x13, 0x16, 0x27, 0x0c, 0x97, 0x08,
-	0x21, 0x7b, 0xe5, 0x48, 0x20, 0x02, 0x12, 0x60, 0x7e, 0x76, 0x76, 0xb5, 0xd9, 0xb5, 0xc6, 0xcb,
-	0x0a, 0x71, 0x19, 0x8d, 0x3d, 0x2d, 0xbb, 0x59, 0x7b, 0x7a, 0x34, 0xdd, 0x49, 0xc8, 0x95, 0x27,
-	0xe0, 0x01, 0x78, 0x0d, 0x24, 0x1e, 0x61, 0x8f, 0x7b, 0xe4, 0xb4, 0x42, 0xc9, 0x0b, 0x20, 0x21,
-	0xee, 0xa8, 0xab, 0xdb, 0xe3, 0x0e, 0x99, 0x04, 0x7c, 0x41, 0xda, 0xdb, 0xcc, 0x54, 0xd5, 0xd7,
-	0x55, 0x5f, 0x55, 0x7d, 0x3d, 0xb0, 0x27, 0x69, 0x9a, 0xd0, 0x7c, 0xce, 0x52, 0xd9, 0x1d, 0xf3,
-	0x54, 0xd0, 0x54, 0x1c, 0x8b, 0xae, 0x3c, 0xcb, 0xa8, 0xe8, 0x64, 0x39, 0x97, 0x9c, 0x6c, 0x2f,
-	0x3d, 0x3a, 0x85, 0xc7, 0xce, 0xf6, 0x84, 0x4f, 0x38, 0x3a, 0x74, 0xd5, 0x93, 0xf6, 0xdd, 0xb9,
-	0x63, 0xa1, 0x21, 0x86, 0x8d, 0xb4, 0x63, 0x9f, 0x35, 0x63, 0x23, 0xd1, 0x1d, 0x31, 0x79, 0xc9,
-	0xc3, 0xff, 0xc5, 0x85, 0xf5, 0x47, 0xf4, 0x34, 0xe4, 0xc7, 0x69, 0x32, 0x94, 0x34, 0x23, 0xb7,
-	0xa1, 0x36, 0xa5, 0x6c, 0x32, 0x95, 0x2d, 0x77, 0xcf, 0xdd, 0x5f, 0x0b, 0xcd, 0x1b, 0xd9, 0x86,
-	0x6a, 0xae, 0x9c, 0x5a, 0xaf, 0xed, 0xb9, 0xfb, 0xd5, 0x50, 0xbf, 0x10, 0x02, 0x15, 0x21, 0x69,
-	0xd6, 0x5a, 0xdb, 0x73, 0xf7, 0x37, 0x42, 0x7c, 0x26, 0x1f, 0x42, 0x4b, 0xd0, 0x31, 0x4f, 0x13,
-	0x11, 0x09, 0x96, 0x8e, 0x69, 0x24, 0x64, 0x9c, 0xcb, 0x48, 0xb2, 0x39, 0x6d, 0x55, 0x10, 0xf3,
-	0x96, 0xb1, 0x0f, 0x95, 0x79, 0xa8, 0xac, 0x4f, 0xd8, 0x9c, 0x92, 0xf7, 0xe0, 0x8d, 0x59, 0x2c,
-	0x64, 0x34, 0xe6, 0xf3, 0x39, 0x93, 0x91, 0x3e, 0xae, 0x8a, 0xc7, 0x6d, 0x29, 0xc3, 0x17, 0xf8,
-	0x1d, 0x53, 0xf5, 0xff, 0x72, 0x61, 0xe3, 0x11, 0x3d, 0x7d, 0x1a, 0xcf, 0x58, 0xd2, 0x9f, 0xf1,
-	0xf1, 0xb3, 0x15, 0x13, 0xff, 0x16, 0x6e, 0x8d, 0x54, 0x58, 0x94, 0xa9, 0xdc, 0x04, 0x95, 0xd1,
-	0x94, 0xc6, 0x09, 0xcd, 0xb1, 0x12, 0xaf, 0xb7, 0xdb, 0xb1, 0x7a, 0xa0, 0xf9, 0x1a, 0xc4, 0xb9,
-	0x1c, 0x52, 0x19, 0xa0, 0x5b, 0xbf, 0xf2, 0xfc, 0xe5, 0xae, 0x13, 0x12, 0xc4, 0xb8, 0x64, 0x21,
-	0x9f, 0x82, 0xb7, 0x44, 0x16, 0x58, 0xb1, 0xd7, 0x6b, 0xdb, 0x78, 0xaa, 0x13, 0x1d, 0xd5, 0x89,
-	0x4e, 0x9f, 0xc9, 0xcf, 0xf3, 0x3c, 0x3e, 0x0b, 0xa1, 0x00, 0x12, 0xe4, 0x2d, 0x68, 0x32, 0x61,
-	0x48, 0xc0, 0xf2, 0x1b, 0x61, 0x83, 0x09, 0x5d, 0xbc, 0x1f, 0x40, 0x63, 0x90, 0xf3, 0x8c, 0x8b,
-	0x78, 0x46, 0x3e, 0x81, 0x46, 0x66, 0x9e, 0xb1, 0x66, 0xaf, 0xb7, 0x53, 0x92, 0xb6, 0xf1, 0x30,
-	0x19, 0x17, 0x11, 0xfe, 0xcf, 0x2e, 0x78, 0x0b, 0xe3, 0xe0, 0xf1, 0xc3, 0x6b, 0xf9, 0x7b, 0x1f,
-	0xc8, 0x22, 0x26, 0xca, 0xf8, 0x2c, 0xb2, 0xc9, 0x7c, 0x7d, 0x61, 0x19, 0xf0, 0x19, 0xf6, 0x85,
-	0xdc, 0x83, 0x75, 0xdb, 0xdb, 0xd0, 0xf9, 0x2f, 0xe5, 0x9b, 0xdc, 0x3c, 0x0b, 0xcd, 0x7f, 0x06,
-	0xcd, 0xfe, 0x82, 0x93, 0x15, 0x7b, 0x7b, 0x17, 0x2a, 0x8a, 0x7b, 0x73, 0xf6, 0xed, 0xf2, 0x56,
-	0x9a, 0x33, 0xd1, 0xd3, 0xef, 0x41, 0xe5, 0x29, 0x97, 0x6a, 0x02, 0x2b, 0x27, 0x5c, 0x52, 0xc3,
-	0x66, 0x49, 0xa4, 0xf2, 0x0a, 0xd1, 0xc7, 0xff, 0xd1, 0x85, 0x7a, 0x10, 0x0b, 0x8c, 0x5b, 0x2d,
-	0xbf, 0x03, 0xa8, 0x28, 0x34, 0xcc, 0x6f, 0xb3, 0x6c, 0xd4, 0x86, 0x6c, 0x92, 0xd2, 0xe4, 0x48,
-	0x4c, 0x9e, 0x9c, 0x65, 0x34, 0x44, 0x67, 0x05, 0xc5, 0xd2, 0x84, 0xfe, 0x80, 0x03, 0x55, 0x0d,
-	0xf5, 0x8b, 0x7f, 0x08, 0x35, 0x3d, 0x18, 0xe4, 0x2e, 0xd4, 0xcc, 0xc8, 0xe8, 0xe4, 0x5b, 0x57,
-	0x61, 0xcd, 0xfe, 0x18, 0x3f, 0xff, 0x23, 0x68, 0x06, 0xb1, 0x99, 0xab, 0xd5, 0x2a, 0xf0, 0x7f,
-	0x75, 0x61, 0x5d, 0x15, 0x3e, 0xa4, 0xf2, 0x28, 0xfe, 0xbe, 0x77, 0xf0, 0x7f, 0x10, 0xf0, 0x15,
-	0x34, 0xf4, 0x5e, 0xb1, 0xc4, 0x2c, 0xd5, 0x9b, 0x57, 0x03, 0x71, 0x64, 0xee, 0x7f, 0xd9, 0xdf,
-	0x52, 0xcd, 0x3d, 0x7f, 0xb9, 0x5b, 0x37, 0x1f, 0xc2, 0x3a, 0xc6, 0xde, 0x4f, 0xfc, 0x3f, 0x5d,
-	0xf0, 0x4c, 0xea, 0x7d, 0x26, 0xc5, 0xab, 0x93, 0x39, 0x39, 0x84, 0xaa, 0x1a, 0x3c, 0x81, 0x9a,
-	0xf0, 0x5f, 0x77, 0x4a, 0x87, 0xf8, 0x7f, 0x54, 0xa1, 0x7e, 0x44, 0x85, 0x88, 0x27, 0x94, 0x3c,
-	0x80, 0xcd, 0x94, 0x9e, 0xea, 0x3d, 0x8e, 0x50, 0xbd, 0xf5, 0xc4, 0xf8, 0x9d, 0xb2, 0x7b, 0xa7,
-	0x63, 0xdf, 0x0e, 0x81, 0x13, 0xae, 0xa7, 0xf6, 0x6d, 0x71, 0x04, 0x5b, 0x0a, 0xeb, 0x44, 0xc9,
-	0x70, 0x84, 0x89, 0x22, 0x5f, 0x5e, 0xef, 0xdd, 0x6b, 0xc1, 0x96, 0x92, 0x1d, 0x38, 0xe1, 0x46,
-	0x7a, 0x49, 0xc3, 0x6d, 0x45, 0x2b, 0x51, 0x8e, 0x25, 0xce, 0x42, 0xb8, 0x02, 0x4b, 0xd1, 0xc8,
-	0xd7, 0xff, 0xd0, 0x1e, 0xcd, 0xf5, 0x3b, 0x37, 0x23, 0x0c, 0x1e, 0x3f, 0x0c, 0x2e, 0x4b, 0x0f,
-	0xf9, 0x0c, 0x60, 0xa9, 0xe0, 0x86, 0xed, 0xdd, 0x72, 0x94, 0x42, 0xa2, 0x02, 0x27, 0x6c, 0x16,
-	0x1a, 0xae, 0x14, 0x08, 0x75, 0xa4, 0x76, 0x55, 0x95, 0x97, 0xb1, 0x6a, 0x0a, 0x03, 0x47, 0xab,
-	0x09, 0x39, 0x84, 0xc6, 0x34, 0x16, 0x11, 0x46, 0xd5, 0x31, 0xea, 0xed, 0xf2, 0x28, 0x23, 0x39,
-	0x81, 0x13, 0xd6, 0xa7, 0x46, 0x7d, 0x1e, 0xc0, 0xa6, 0x8a, 0xc3, 0x5b, 0x6c, 0xae, 0xd6, 0xb1,
-	0xd5, 0xb8, 0xa9, 0xa1, 0xf6, 0xe2, 0xaa, 0x86, 0x9e, 0xd8, 0x8b, 0x7c, 0x0f, 0x36, 0x0a, 0x2c,
-	0x35, 0x4f, 0xad, 0xe6, 0x4d, 0x24, 0x5a, 0x8b, 0xa4, 0x48, 0x3c, 0xb1, 0xf6, 0xea, 0x83, 0x42,
-	0x8f, 0x00, 0x11, 0xee, 0x94, 0x23, 0x68, 0xf9, 0x09, 0x9c, 0x85, 0x2a, 0x29, 0xf2, 0x15, 0x11,
-	0x26, 0xd6, 0xbb, 0x89, 0xfc, 0x42, 0xbd, 0x14, 0xf9, 0xd3, 0xc5, 0x4b, 0xbf, 0x0a, 0x6b, 0xe2,
-	0x78, 0xde, 0xff, 0xe6, 0xf9, 0x79, 0xdb, 0x7d, 0x71, 0xde, 0x76, 0x7f, 0x3f, 0x6f, 0xbb, 0x3f,
-	0x5d, 0xb4, 0x9d, 0x17, 0x17, 0x6d, 0xe7, 0xb7, 0x8b, 0xb6, 0xf3, 0xdd, 0xc7, 0x13, 0x26, 0xa7,
-	0xc7, 0xa3, 0xce, 0x98, 0xcf, 0xbb, 0xf6, 0xef, 0xd3, 0xf2, 0x51, 0xff, 0x66, 0x95, 0xfd, 0xa8,
-	0x8d, 0x6a, 0x68, 0x3b, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xb1, 0x2b, 0x7f, 0xc7, 0x09,
-	0x00, 0x00,
+	0x21, 0x7b, 0xe5, 0x48, 0xfc, 0x44, 0x48, 0x80, 0xf9, 0xd9, 0xd9, 0xd5, 0x66, 0xd7, 0x6a, 0xaf,
+	0x56, 0x88, 0xcb, 0x68, 0xec, 0x69, 0xd9, 0xcd, 0xda, 0xd3, 0xa3, 0xe9, 0x4e, 0x42, 0xae, 0x3c,
+	0x01, 0x0f, 0xc0, 0x6b, 0x20, 0xf1, 0x08, 0x7b, 0xdc, 0x23, 0xa7, 0x15, 0x4a, 0x5e, 0x00, 0x09,
+	0x71, 0x47, 0x5d, 0xdd, 0xb6, 0x3b, 0x64, 0x36, 0x90, 0x0b, 0x12, 0xb7, 0x69, 0x57, 0xd5, 0xd7,
+	0x55, 0x5f, 0x55, 0x7d, 0x6d, 0xd8, 0x53, 0x2c, 0x4b, 0x59, 0x31, 0xe7, 0x99, 0xea, 0x8e, 0x45,
+	0x26, 0x59, 0x26, 0x8f, 0x65, 0x57, 0x9d, 0xe5, 0x4c, 0x76, 0xf2, 0x42, 0x28, 0x41, 0xb6, 0x57,
+	0x1e, 0x9d, 0xa5, 0xc7, 0xce, 0xf6, 0x44, 0x4c, 0x04, 0x3a, 0x74, 0xf5, 0x97, 0xf1, 0xdd, 0xb9,
+	0xe3, 0xa0, 0x21, 0x86, 0x8b, 0xb4, 0xe3, 0xde, 0x35, 0xe3, 0x23, 0xd9, 0x1d, 0x71, 0x75, 0xc9,
+	0x23, 0xfc, 0xd9, 0x87, 0xf5, 0x47, 0xec, 0x94, 0x8a, 0xe3, 0x2c, 0x1d, 0x2a, 0x96, 0x93, 0xdb,
+	0x50, 0x9b, 0x32, 0x3e, 0x99, 0xaa, 0x96, 0xbf, 0xe7, 0xef, 0xaf, 0x51, 0x7b, 0x22, 0xdb, 0x50,
+	0x2d, 0xb4, 0x53, 0xeb, 0xb5, 0x3d, 0x7f, 0xbf, 0x4a, 0xcd, 0x81, 0x10, 0xa8, 0x48, 0xc5, 0xf2,
+	0xd6, 0xda, 0x9e, 0xbf, 0xbf, 0x41, 0xf1, 0x9b, 0x7c, 0x08, 0x2d, 0xc9, 0xc6, 0x22, 0x4b, 0x65,
+	0x2c, 0x79, 0x36, 0x66, 0xb1, 0x54, 0x49, 0xa1, 0x62, 0xc5, 0xe7, 0xac, 0x55, 0x41, 0xcc, 0x5b,
+	0xd6, 0x3e, 0xd4, 0xe6, 0xa1, 0xb6, 0x3e, 0xe1, 0x73, 0x46, 0xde, 0x83, 0x37, 0x66, 0x89, 0x54,
+	0xf1, 0x58, 0xcc, 0xe7, 0x5c, 0xc5, 0xe6, 0xba, 0x2a, 0x5e, 0xb7, 0xa5, 0x0d, 0x5f, 0xe0, 0xef,
+	0x98, 0x6a, 0xf8, 0xa7, 0x0f, 0x1b, 0x8f, 0xd8, 0xe9, 0xd3, 0x64, 0xc6, 0xd3, 0xfe, 0x4c, 0x8c,
+	0x9f, 0xdd, 0x30, 0xf1, 0x6f, 0xe0, 0xd6, 0x48, 0x87, 0xc5, 0xb9, 0xce, 0x4d, 0x32, 0x15, 0x4f,
+	0x59, 0x92, 0xb2, 0x02, 0x2b, 0x09, 0x7a, 0xbb, 0x1d, 0xa7, 0x07, 0x86, 0xaf, 0x41, 0x52, 0xa8,
+	0x21, 0x53, 0x11, 0xba, 0xf5, 0x2b, 0xcf, 0x5f, 0xee, 0x7a, 0x94, 0x20, 0xc6, 0x25, 0x0b, 0xf9,
+	0x14, 0x82, 0x15, 0xb2, 0xc4, 0x8a, 0x83, 0x5e, 0xdb, 0xc5, 0xd3, 0x9d, 0xe8, 0xe8, 0x4e, 0x74,
+	0xfa, 0x5c, 0x7d, 0x5e, 0x14, 0xc9, 0x19, 0x85, 0x25, 0x90, 0x24, 0x6f, 0x41, 0x93, 0x4b, 0x4b,
+	0x02, 0x96, 0xdf, 0xa0, 0x0d, 0x2e, 0x4d, 0xf1, 0x61, 0x04, 0x8d, 0x41, 0x21, 0x72, 0x21, 0x93,
+	0x19, 0xf9, 0x04, 0x1a, 0xb9, 0xfd, 0xc6, 0x9a, 0x83, 0xde, 0x4e, 0x49, 0xda, 0xd6, 0xc3, 0x66,
+	0xbc, 0x8c, 0x08, 0x7f, 0xf2, 0x21, 0x58, 0x18, 0x07, 0x8f, 0x1f, 0xbe, 0x92, 0xbf, 0xf7, 0x81,
+	0x2c, 0x62, 0xe2, 0x5c, 0xcc, 0x62, 0x97, 0xcc, 0xd7, 0x17, 0x96, 0x81, 0x98, 0x61, 0x5f, 0xc8,
+	0x3d, 0x58, 0x77, 0xbd, 0x2d, 0x9d, 0xff, 0x50, 0xbe, 0xcd, 0x2d, 0x70, 0xd0, 0xc2, 0x67, 0xd0,
+	0xec, 0x2f, 0x38, 0xb9, 0x61, 0x6f, 0xef, 0x42, 0x45, 0x73, 0x6f, 0xef, 0xbe, 0x5d, 0xde, 0x4a,
+	0x7b, 0x27, 0x7a, 0x86, 0x3d, 0xa8, 0x3c, 0x15, 0x4a, 0x4f, 0x60, 0xe5, 0x44, 0x28, 0x66, 0xd9,
+	0x2c, 0x89, 0xd4, 0x5e, 0x14, 0x7d, 0xc2, 0x1f, 0x7c, 0xa8, 0x47, 0x89, 0xc4, 0xb8, 0x9b, 0xe5,
+	0x77, 0x00, 0x15, 0x8d, 0x86, 0xf9, 0x6d, 0x96, 0x8d, 0xda, 0x90, 0x4f, 0x32, 0x96, 0x1e, 0xc9,
+	0xc9, 0x93, 0xb3, 0x9c, 0x51, 0x74, 0xd6, 0x50, 0x3c, 0x4b, 0xd9, 0xf7, 0x38, 0x50, 0x55, 0x6a,
+	0x0e, 0xe1, 0x21, 0xd4, 0xcc, 0x60, 0x90, 0xbb, 0x50, 0xb3, 0x23, 0x63, 0x92, 0x6f, 0x5d, 0x85,
+	0xb5, 0xfb, 0x63, 0xfd, 0xc2, 0x8f, 0xa1, 0x19, 0x25, 0x76, 0xae, 0x6e, 0x56, 0x41, 0xf8, 0x8b,
+	0x0f, 0xeb, 0xba, 0xf0, 0x21, 0x53, 0x47, 0xc9, 0x77, 0xbd, 0x83, 0xff, 0x82, 0x80, 0xaf, 0xa0,
+	0x61, 0xf6, 0x8a, 0xa7, 0x76, 0xa9, 0xde, 0xbc, 0x1a, 0x88, 0x23, 0x73, 0xff, 0xcb, 0xfe, 0x96,
+	0x6e, 0xee, 0xf9, 0xcb, 0xdd, 0xba, 0xfd, 0x81, 0xd6, 0x31, 0xf6, 0x7e, 0x1a, 0xfe, 0xe1, 0x43,
+	0x60, 0x53, 0xef, 0x73, 0x25, 0xff, 0x3f, 0x99, 0x93, 0x43, 0xa8, 0xea, 0xc1, 0x93, 0xa8, 0x09,
+	0xff, 0x76, 0xa7, 0x4c, 0x48, 0xf8, 0x7b, 0x15, 0xea, 0x47, 0x4c, 0xca, 0x64, 0xc2, 0xc8, 0x03,
+	0xd8, 0xcc, 0xd8, 0xa9, 0xd9, 0xe3, 0x18, 0xd5, 0xdb, 0x4c, 0x4c, 0xd8, 0x29, 0x7b, 0x77, 0x3a,
+	0xee, 0xeb, 0x10, 0x79, 0x74, 0x3d, 0x73, 0x5f, 0x8b, 0x23, 0xd8, 0xd2, 0x58, 0x27, 0x5a, 0x86,
+	0x63, 0x4c, 0x14, 0xf9, 0x0a, 0x7a, 0xef, 0xbe, 0x12, 0x6c, 0x25, 0xd9, 0x91, 0x47, 0x37, 0xb2,
+	0x4b, 0x1a, 0xee, 0x2a, 0x5a, 0x89, 0x72, 0xac, 0x70, 0x16, 0xc2, 0x15, 0x39, 0x8a, 0x46, 0xbe,
+	0xfe, 0x9b, 0xf6, 0x18, 0xae, 0xdf, 0xb9, 0x1e, 0x61, 0xf0, 0xf8, 0x61, 0x74, 0x59, 0x7a, 0xc8,
+	0x67, 0x00, 0x2b, 0x05, 0xb7, 0x6c, 0xef, 0x96, 0xa3, 0x2c, 0x25, 0x2a, 0xf2, 0x68, 0x73, 0xa9,
+	0xe1, 0x5a, 0x81, 0x50, 0x47, 0x6a, 0x57, 0x55, 0x79, 0x15, 0xab, 0xa7, 0x30, 0xf2, 0x8c, 0x9a,
+	0x90, 0x43, 0x68, 0x4c, 0x13, 0x19, 0x63, 0x54, 0x1d, 0xa3, 0xde, 0x2e, 0x8f, 0xb2, 0x92, 0x13,
+	0x79, 0xb4, 0x3e, 0xb5, 0xea, 0xf3, 0x00, 0x36, 0x75, 0x1c, 0xbe, 0x62, 0x73, 0xbd, 0x8e, 0xad,
+	0xc6, 0x75, 0x0d, 0x75, 0x17, 0x57, 0x37, 0xf4, 0xc4, 0x5d, 0xe4, 0x7b, 0xb0, 0xb1, 0xc4, 0xd2,
+	0xf3, 0xd4, 0x6a, 0x5e, 0x47, 0xa2, 0xb3, 0x48, 0x9a, 0xc4, 0x13, 0x67, 0xaf, 0x3e, 0x58, 0xea,
+	0x11, 0x20, 0xc2, 0x9d, 0x72, 0x04, 0x23, 0x3f, 0x91, 0xb7, 0x50, 0x25, 0x4d, 0xbe, 0x26, 0xc2,
+	0xc6, 0x06, 0xd7, 0x91, 0xbf, 0x54, 0x2f, 0x4d, 0xfe, 0x74, 0x71, 0xe8, 0x57, 0x61, 0x4d, 0x1e,
+	0xcf, 0xfb, 0xf4, 0xf9, 0x79, 0xdb, 0x7f, 0x71, 0xde, 0xf6, 0x7f, 0x3b, 0x6f, 0xfb, 0x3f, 0x5e,
+	0xb4, 0xbd, 0x17, 0x17, 0x6d, 0xef, 0xd7, 0x8b, 0xb6, 0xf7, 0xed, 0x47, 0x13, 0xae, 0xa6, 0xc7,
+	0xa3, 0xce, 0x58, 0xcc, 0xbb, 0x69, 0x22, 0xa7, 0x79, 0x72, 0xd6, 0x35, 0x17, 0xe8, 0x53, 0xd7,
+	0xfc, 0xc7, 0x2a, 0xfb, 0x97, 0x36, 0xaa, 0xa1, 0xed, 0xe0, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x45, 0xea, 0xd4, 0x6b, 0xc4, 0x09, 0x00, 0x00,
 }
 
 func (m *NewRoundStep) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/consensus/types.proto b/proto/tendermint/consensus/types.proto
index 034cf503dd..1ade2d0a27 100644
--- a/proto/tendermint/consensus/types.proto
+++ b/proto/tendermint/consensus/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.consensus;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/consensus";
 
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
diff --git a/proto/tendermint/consensus/wal.pb.go b/proto/tendermint/consensus/wal.pb.go
index fd80819cd0..c4722100f2 100644
--- a/proto/tendermint/consensus/wal.pb.go
+++ b/proto/tendermint/consensus/wal.pb.go
@@ -5,12 +5,12 @@ package consensus
 
 import (
 	fmt "fmt"
+	types "github.com/dashpay/tenderdash/proto/tendermint/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	_ "github.com/golang/protobuf/ptypes/duration"
-	types "github.com/tendermint/tendermint/proto/tendermint/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -372,41 +372,42 @@ func init() {
 func init() { proto.RegisterFile("tendermint/consensus/wal.proto", fileDescriptor_ed0b60c2d348ab09) }
 
 var fileDescriptor_ed0b60c2d348ab09 = []byte{
-	// 539 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xdd, 0x8a, 0xd3, 0x40,
-	0x14, 0xce, 0x6c, 0xff, 0x4f, 0x15, 0x21, 0x96, 0xa5, 0x16, 0x36, 0x8d, 0x5d, 0x84, 0x5e, 0x25,
-	0xb0, 0x22, 0x88, 0x5e, 0xa8, 0xa5, 0x2b, 0x2d, 0xb8, 0x20, 0xe3, 0x8a, 0x20, 0x42, 0x48, 0x37,
-	0xa7, 0x69, 0x60, 0x33, 0x53, 0x32, 0x13, 0xc5, 0x2b, 0x5f, 0xa1, 0x97, 0xbe, 0x89, 0xaf, 0xb0,
-	0x97, 0x7b, 0xe9, 0xd5, 0x2a, 0xed, 0x8b, 0x48, 0x66, 0xd2, 0x36, 0xb8, 0xd9, 0xbb, 0x39, 0x73,
-	0xbe, 0x73, 0xbe, 0x73, 0xbe, 0x6f, 0x06, 0x2c, 0x89, 0x2c, 0xc0, 0x24, 0x8e, 0x98, 0x74, 0x2f,
-	0x38, 0x13, 0xc8, 0x44, 0x2a, 0xdc, 0x6f, 0xfe, 0xa5, 0xb3, 0x4c, 0xb8, 0xe4, 0x66, 0x67, 0x9f,
-	0x77, 0x76, 0xf9, 0x5e, 0x27, 0xe4, 0x21, 0x57, 0x00, 0x37, 0x3b, 0x69, 0x6c, 0xcf, 0x2e, 0xed,
-	0x25, 0xbf, 0x2f, 0x51, 0xe4, 0x88, 0xa3, 0x02, 0x42, 0xdd, 0xbb, 0xf8, 0x15, 0x99, 0xdc, 0xa6,
-	0xad, 0x90, 0xf3, 0xf0, 0x12, 0x5d, 0x15, 0xcd, 0xd2, 0xb9, 0x1b, 0xa4, 0x89, 0x2f, 0x23, 0xce,
-	0xf2, 0x7c, 0xff, 0xff, 0xbc, 0x8c, 0x62, 0x14, 0xd2, 0x8f, 0x97, 0x1a, 0x30, 0x40, 0x68, 0x9c,
-	0x89, 0x70, 0xca, 0xe6, 0xdc, 0x7c, 0x06, 0x95, 0x58, 0x84, 0x5d, 0x62, 0x93, 0x61, 0xfb, 0xe4,
-	0xc8, 0x29, 0x5b, 0xc3, 0x39, 0x43, 0x21, 0xfc, 0x10, 0x47, 0xd5, 0xab, 0x9b, 0xbe, 0x41, 0x33,
-	0xbc, 0x79, 0x0c, 0x8d, 0x25, 0x62, 0xe2, 0x45, 0x41, 0xf7, 0xc0, 0x26, 0xc3, 0xd6, 0x08, 0xd6,
-	0x37, 0xfd, 0xfa, 0x7b, 0xc4, 0x64, 0x3a, 0xa6, 0xf5, 0x2c, 0x35, 0x0d, 0x06, 0x2b, 0x02, 0xed,
-	0xf3, 0x28, 0x46, 0x9e, 0x4a, 0xc5, 0xf5, 0x0a, 0x9a, 0xdb, 0x49, 0x73, 0xc2, 0x47, 0x8e, 0x1e,
-	0xd5, 0xd9, 0x8e, 0xea, 0x8c, 0x73, 0xc0, 0xa8, 0x99, 0x91, 0xfd, 0xfc, 0xd3, 0x27, 0x74, 0x57,
-	0x64, 0x1e, 0x42, 0x7d, 0x81, 0x51, 0xb8, 0x90, 0x8a, 0xb4, 0x42, 0xf3, 0xc8, 0xec, 0x40, 0x2d,
-	0xe1, 0x29, 0x0b, 0xba, 0x15, 0x9b, 0x0c, 0x6b, 0x54, 0x07, 0xa6, 0x09, 0x55, 0x21, 0x71, 0xd9,
-	0xad, 0xda, 0x64, 0x78, 0x9f, 0xaa, 0xf3, 0xe0, 0x18, 0x5a, 0xa7, 0x2c, 0x98, 0xe8, 0xb2, 0x7d,
-	0x3b, 0x52, 0x6c, 0x37, 0xf8, 0x75, 0x00, 0xf0, 0xe9, 0xcd, 0xbb, 0x7c, 0x6d, 0xf3, 0x0b, 0x1c,
-	0x2a, 0xf9, 0xbd, 0xc0, 0x97, 0xbe, 0xa7, 0x7a, 0x7b, 0x42, 0xfa, 0x12, 0xf3, 0x25, 0x9e, 0x14,
-	0x55, 0xd3, 0x36, 0x9e, 0x66, 0xf8, 0xb1, 0x2f, 0x7d, 0x9a, 0xa1, 0x3f, 0x64, 0xe0, 0x89, 0x41,
-	0x1f, 0xe2, 0xed, 0x6b, 0xf3, 0x05, 0x34, 0x63, 0x11, 0x7a, 0x11, 0x9b, 0x73, 0xb5, 0xd5, 0xdd,
-	0x2e, 0x68, 0xc7, 0x26, 0x06, 0x6d, 0xc4, 0xb9, 0x79, 0x6f, 0xe1, 0x9e, 0xd4, 0xfa, 0xea, 0xfa,
-	0x8a, 0xaa, 0x7f, 0x5c, 0x5e, 0x5f, 0x70, 0x62, 0x62, 0xd0, 0xb6, 0x2c, 0x18, 0xf3, 0x1a, 0x00,
-	0x59, 0xe0, 0xe5, 0x62, 0x54, 0x55, 0x97, 0x7e, 0x79, 0x97, 0x9d, 0x7a, 0x13, 0x83, 0xb6, 0x70,
-	0x1b, 0x8c, 0x6a, 0x50, 0x11, 0x69, 0x3c, 0xf8, 0x01, 0x0f, 0x32, 0x9a, 0xa0, 0xa0, 0xde, 0x73,
-	0xa8, 0x66, 0x54, 0xb9, 0x56, 0xbd, 0x5b, 0x86, 0x9f, 0x6f, 0xdf, 0xa6, 0x76, 0x7c, 0x95, 0x39,
-	0xae, 0x2a, 0xcc, 0x13, 0xfd, 0x34, 0xb5, 0x28, 0x76, 0xf9, 0x38, 0x7b, 0x22, 0xf5, 0x2e, 0x47,
-	0x1f, 0xaf, 0xd6, 0x16, 0xb9, 0x5e, 0x5b, 0xe4, 0xef, 0xda, 0x22, 0xab, 0x8d, 0x65, 0x5c, 0x6f,
-	0x2c, 0xe3, 0xf7, 0xc6, 0x32, 0x3e, 0xbf, 0x0c, 0x23, 0xb9, 0x48, 0x67, 0xce, 0x05, 0x8f, 0xdd,
-	0xe2, 0xf7, 0xda, 0x1f, 0xf5, 0x47, 0x2d, 0xfb, 0x9c, 0xb3, 0xba, 0xca, 0x3d, 0xfd, 0x17, 0x00,
-	0x00, 0xff, 0xff, 0x0b, 0xad, 0x1c, 0x1b, 0x07, 0x04, 0x00, 0x00,
+	// 547 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xdf, 0x6a, 0xdb, 0x3e,
+	0x14, 0xb6, 0x9a, 0x34, 0x7f, 0x94, 0xdf, 0x8f, 0x81, 0x17, 0x4a, 0x16, 0xa8, 0xe3, 0xa5, 0x0c,
+	0x72, 0x65, 0x43, 0xc7, 0xa0, 0xec, 0x66, 0x5b, 0x48, 0x47, 0x02, 0x2b, 0x0c, 0xad, 0x30, 0x18,
+	0x03, 0xa3, 0xd4, 0x27, 0x8e, 0xa1, 0x96, 0x8c, 0x25, 0x6f, 0xf4, 0x6a, 0xaf, 0x90, 0xcb, 0xbd,
+	0xc9, 0x5e, 0xa1, 0x97, 0xbd, 0xdc, 0x55, 0x37, 0x92, 0x17, 0x19, 0x92, 0x9c, 0xc4, 0xac, 0xde,
+	0x9d, 0x8e, 0xce, 0x77, 0xce, 0x77, 0xce, 0xf7, 0x49, 0xd8, 0x91, 0xc0, 0x42, 0xc8, 0x92, 0x98,
+	0x49, 0xff, 0x8a, 0x33, 0x01, 0x4c, 0xe4, 0xc2, 0xff, 0x4a, 0xaf, 0xbd, 0x34, 0xe3, 0x92, 0xdb,
+	0xdd, 0x7d, 0xde, 0xdb, 0xe5, 0xfb, 0xdd, 0x88, 0x47, 0x5c, 0x03, 0x7c, 0x75, 0x32, 0xd8, 0xbe,
+	0x5b, 0xd9, 0x4b, 0xde, 0xa4, 0x20, 0x0a, 0xc4, 0x71, 0x09, 0xa1, 0xef, 0x7d, 0xf8, 0x02, 0x4c,
+	0x6e, 0xd3, 0x4e, 0xc4, 0x79, 0x74, 0x0d, 0xbe, 0x8e, 0xe6, 0xf9, 0xc2, 0x0f, 0xf3, 0x8c, 0xca,
+	0x98, 0xb3, 0x22, 0x3f, 0xf8, 0x3b, 0x2f, 0xe3, 0x04, 0x84, 0xa4, 0x49, 0x6a, 0x00, 0x43, 0xc0,
+	0xcd, 0x0b, 0x11, 0xcd, 0xd8, 0x82, 0xdb, 0x2f, 0x70, 0x2d, 0x11, 0x51, 0x0f, 0xb9, 0x68, 0xd4,
+	0x39, 0x3d, 0xf6, 0xaa, 0xd6, 0xf0, 0x2e, 0x40, 0x08, 0x1a, 0xc1, 0xb8, 0x7e, 0x7b, 0x3f, 0xb0,
+	0x88, 0xc2, 0xdb, 0x27, 0xb8, 0x99, 0x02, 0x64, 0x41, 0x1c, 0xf6, 0x0e, 0x5c, 0x34, 0x6a, 0x8f,
+	0xf1, 0xfa, 0x7e, 0xd0, 0x78, 0x0f, 0x90, 0xcd, 0x26, 0xa4, 0xa1, 0x52, 0xb3, 0x70, 0xb8, 0x42,
+	0xb8, 0x73, 0x19, 0x27, 0xc0, 0x73, 0xa9, 0xb9, 0x5e, 0xe1, 0xd6, 0x76, 0xd2, 0x82, 0xf0, 0x89,
+	0x67, 0x46, 0xf5, 0xb6, 0xa3, 0x7a, 0x93, 0x02, 0x30, 0x6e, 0x29, 0xb2, 0xef, 0xbf, 0x06, 0x88,
+	0xec, 0x8a, 0xec, 0x23, 0xdc, 0x58, 0x42, 0x1c, 0x2d, 0xa5, 0x26, 0xad, 0x91, 0x22, 0xb2, 0xbb,
+	0xf8, 0x30, 0xe3, 0x39, 0x0b, 0x7b, 0x35, 0x17, 0x8d, 0x0e, 0x89, 0x09, 0x6c, 0x1b, 0xd7, 0x85,
+	0x84, 0xb4, 0x57, 0x77, 0xd1, 0xe8, 0x7f, 0xa2, 0xcf, 0xc3, 0x13, 0xdc, 0x3e, 0x67, 0xe1, 0xd4,
+	0x94, 0xed, 0xdb, 0xa1, 0x72, 0xbb, 0xe1, 0x8f, 0x03, 0x8c, 0x3f, 0xbe, 0x79, 0x57, 0xac, 0x6d,
+	0x7f, 0xc6, 0x47, 0x5a, 0xfe, 0x20, 0xa4, 0x92, 0x06, 0xba, 0x77, 0x20, 0x24, 0x95, 0x50, 0x2c,
+	0xf1, 0xac, 0xac, 0x9a, 0xb1, 0xf1, 0x5c, 0xe1, 0x27, 0x54, 0x52, 0xa2, 0xd0, 0x1f, 0x14, 0x78,
+	0x6a, 0x91, 0xc7, 0xf0, 0xf0, 0xda, 0x7e, 0x89, 0x5b, 0x89, 0x88, 0x82, 0x98, 0x2d, 0xb8, 0xde,
+	0xea, 0xdf, 0x2e, 0x18, 0xc7, 0xa6, 0x16, 0x69, 0x26, 0x85, 0x79, 0x6f, 0xf1, 0x7f, 0xd2, 0xe8,
+	0x6b, 0xea, 0x6b, 0xba, 0xfe, 0x69, 0x75, 0x7d, 0xc9, 0x89, 0xa9, 0x45, 0x3a, 0xb2, 0x64, 0xcc,
+	0x6b, 0x8c, 0x81, 0x85, 0x41, 0x21, 0x46, 0x5d, 0x77, 0x19, 0x54, 0x77, 0xd9, 0xa9, 0x37, 0xb5,
+	0x48, 0x1b, 0xb6, 0xc1, 0xf8, 0x10, 0xd7, 0x44, 0x9e, 0x0c, 0xbf, 0xe1, 0x47, 0x8a, 0x26, 0x2c,
+	0xa9, 0x77, 0x86, 0xeb, 0x8a, 0xaa, 0xd0, 0xaa, 0xff, 0xc0, 0xf0, 0xcb, 0xed, 0xdb, 0x34, 0x8e,
+	0xaf, 0x94, 0xe3, 0xba, 0xc2, 0x3e, 0x35, 0x4f, 0xd3, 0x88, 0xe2, 0x56, 0x8f, 0xb3, 0x27, 0xd2,
+	0xef, 0x72, 0x4c, 0x6e, 0xd7, 0x0e, 0xba, 0x5b, 0x3b, 0xe8, 0xf7, 0xda, 0x41, 0xab, 0x8d, 0x63,
+	0xdd, 0x6d, 0x1c, 0xeb, 0xe7, 0xc6, 0xb1, 0x3e, 0x9d, 0x45, 0xb1, 0x5c, 0xe6, 0x73, 0xef, 0x8a,
+	0x27, 0x7e, 0x48, 0xc5, 0x32, 0xa5, 0x37, 0xbe, 0x69, 0xa9, 0x22, 0xf3, 0x57, 0xfc, 0xaa, 0x9f,
+	0x39, 0x6f, 0xe8, 0xdc, 0xf3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0x48, 0x0d, 0x5a, 0x04,
+	0x04, 0x00, 0x00,
 }
 
 func (m *MsgInfo) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/consensus/wal.proto b/proto/tendermint/consensus/wal.proto
index 44afa2c0c3..e2adeb0b27 100644
--- a/proto/tendermint/consensus/wal.proto
+++ b/proto/tendermint/consensus/wal.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.consensus;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/consensus";
 
 import "gogoproto/gogo.proto";
 import "tendermint/consensus/types.proto";
diff --git a/proto/tendermint/crypto/keys.pb.go b/proto/tendermint/crypto/keys.pb.go
index 35b568c62a..f1b862ea75 100644
--- a/proto/tendermint/crypto/keys.pb.go
+++ b/proto/tendermint/crypto/keys.pb.go
@@ -133,7 +133,7 @@ func init() {
 func init() { proto.RegisterFile("tendermint/crypto/keys.proto", fileDescriptor_cb048658b234868c) }
 
 var fileDescriptor_cb048658b234868c = []byte{
-	// 217 bytes of a gzipped FileDescriptorProto
+	// 225 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x4e,
 	0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x44, 0xc8, 0xea, 0x41, 0x64, 0xa5,
@@ -143,11 +143,12 @@ var fileDescriptor_cb048658b234868c = []byte{
 	0x8e, 0x8b, 0xb3, 0x38, 0x35, 0xb9, 0xc0, 0xc8, 0xd4, 0x2c, 0xdb, 0x50, 0x82, 0x09, 0x2a, 0x8b,
 	0x10, 0x12, 0x92, 0xe1, 0xe2, 0x48, 0xca, 0x29, 0x36, 0x34, 0x32, 0xb6, 0x30, 0x94, 0x60, 0x86,
 	0x4a, 0xc3, 0x45, 0xac, 0x38, 0x5e, 0x2c, 0x90, 0x67, 0x7c, 0xb1, 0x50, 0x9e, 0xd1, 0x89, 0x95,
-	0x8b, 0xb9, 0xb8, 0x34, 0xd7, 0x29, 0xe8, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f,
+	0x8b, 0xb9, 0xb8, 0x34, 0xd7, 0xc9, 0xff, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f,
 	0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18,
-	0xa2, 0x2c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x91, 0xfc, 0x88,
-	0xc4, 0x84, 0x78, 0x02, 0xc3, 0xff, 0x49, 0x6c, 0x60, 0x09, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x95, 0x99, 0x37, 0xba, 0x1b, 0x01, 0x00, 0x00,
+	0xa2, 0x4c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x53, 0x12, 0x8b,
+	0x33, 0x0a, 0x12, 0x2b, 0xf5, 0x21, 0xbe, 0x01, 0xf1, 0xf4, 0x21, 0x3e, 0xc0, 0xf0, 0x7c, 0x12,
+	0x1b, 0x58, 0xc2, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x91, 0xb6, 0x11, 0x18, 0x01, 0x00,
+	0x00,
 }
 
 func (this *PublicKey) Compare(that interface{}) int {
diff --git a/proto/tendermint/crypto/keys.proto b/proto/tendermint/crypto/keys.proto
index e9228e38dc..9b4b64df3c 100644
--- a/proto/tendermint/crypto/keys.proto
+++ b/proto/tendermint/crypto/keys.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.crypto;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/crypto";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/tendermint/crypto/proof.pb.go b/proto/tendermint/crypto/proof.pb.go
index 82fb943fcd..5ece1e5579 100644
--- a/proto/tendermint/crypto/proof.pb.go
+++ b/proto/tendermint/crypto/proof.pb.go
@@ -324,29 +324,30 @@ func init() {
 func init() { proto.RegisterFile("tendermint/crypto/proof.proto", fileDescriptor_6b60b6ba2ab5b856) }
 
 var fileDescriptor_6b60b6ba2ab5b856 = []byte{
-	// 351 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbb, 0x4e, 0xc3, 0x30,
-	0x14, 0x4d, 0xea, 0xf4, 0x75, 0xdb, 0x01, 0xac, 0x0a, 0x45, 0x45, 0x84, 0x28, 0x53, 0xa6, 0x44,
-	0x2a, 0x0b, 0x13, 0x43, 0x61, 0x40, 0x30, 0x14, 0x79, 0x60, 0x60, 0x41, 0x6e, 0xeb, 0x36, 0x11,
-	0x6d, 0x6c, 0x25, 0x8e, 0x44, 0xff, 0x82, 0xcf, 0xea, 0xd8, 0x91, 0x09, 0xa1, 0xf6, 0x47, 0x90,
-	0xed, 0xa0, 0x16, 0x55, 0x6c, 0xe7, 0x71, 0x7d, 0x7c, 0xac, 0x6b, 0xb8, 0x90, 0x2c, 0x9b, 0xb2,
-	0x7c, 0x99, 0x66, 0x32, 0x9e, 0xe4, 0x2b, 0x21, 0x79, 0x2c, 0x72, 0xce, 0x67, 0x91, 0xc8, 0xb9,
-	0xe4, 0xf8, 0x74, 0x6f, 0x47, 0xc6, 0xee, 0xf7, 0xe6, 0x7c, 0xce, 0xb5, 0x1b, 0x2b, 0x64, 0x06,
-	0x83, 0x19, 0xd4, 0x9f, 0xd4, 0x39, 0xdc, 0x83, 0xba, 0xe4, 0x92, 0x2e, 0x5c, 0xdb, 0xb7, 0x43,
-	0x44, 0x0c, 0x51, 0x6a, 0x9a, 0x4d, 0xd9, 0xbb, 0x5b, 0x33, 0xaa, 0x26, 0xf8, 0x1c, 0xda, 0x0b,
-	0x46, 0x67, 0xaf, 0x09, 0x2d, 0x12, 0x17, 0xf9, 0x76, 0xd8, 0x25, 0x2d, 0x25, 0xdc, 0xd3, 0x22,
-	0x51, 0x47, 0x68, 0x99, 0xc9, 0xc2, 0x75, 0x7c, 0x14, 0x76, 0x89, 0x21, 0xc1, 0x23, 0x34, 0x9f,
-	0xe9, 0xa2, 0x64, 0x23, 0x81, 0x4f, 0x00, 0xbd, 0xb1, 0x95, 0xbe, 0xa7, 0x4b, 0x14, 0xc4, 0x11,
-	0xd4, 0x75, 0x79, 0x7d, 0x4b, 0x67, 0xe0, 0x46, 0x47, 0xed, 0x23, 0x5d, 0x92, 0x98, 0xb1, 0xe0,
-	0x01, 0x5a, 0x77, 0x7c, 0x99, 0x66, 0xfc, 0x6f, 0x5a, 0xdb, 0xa4, 0xe9, 0xce, 0xa2, 0x94, 0x3a,
-	0xad, 0x4d, 0x0c, 0xc1, 0x67, 0xd0, 0xe0, 0xa5, 0x54, 0x32, 0xd2, 0x72, 0xc5, 0x82, 0x5b, 0x68,
-	0xea, 0xec, 0x91, 0xc0, 0x18, 0x1c, 0xb9, 0x12, 0xac, 0xca, 0xd2, 0xf8, 0x37, 0xbe, 0xb6, 0x2f,
-	0x8b, 0xc1, 0x99, 0x52, 0x49, 0xab, 0x77, 0x6b, 0x1c, 0xdc, 0x40, 0xab, 0x0a, 0x29, 0xf0, 0x00,
-	0x10, 0x17, 0x85, 0x6b, 0xfb, 0x28, 0xec, 0x0c, 0xfa, 0xff, 0x3d, 0x65, 0x24, 0x86, 0xce, 0xfa,
-	0xeb, 0xd2, 0x22, 0x6a, 0x78, 0x48, 0xd6, 0x5b, 0xcf, 0xde, 0x6c, 0x3d, 0xfb, 0x7b, 0xeb, 0xd9,
-	0x1f, 0x3b, 0xcf, 0xda, 0xec, 0x3c, 0xeb, 0x73, 0xe7, 0x59, 0x2f, 0xd7, 0xf3, 0x54, 0x26, 0xe5,
-	0x38, 0x9a, 0xf0, 0x65, 0x7c, 0xb0, 0xf2, 0x03, 0x68, 0x56, 0x7a, 0xf4, 0x1d, 0xc6, 0x0d, 0x6d,
-	0x5c, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0x43, 0x5d, 0xb9, 0x45, 0x2a, 0x02, 0x00, 0x00,
+	// 357 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xbd, 0x4e, 0xc3, 0x30,
+	0x14, 0x85, 0x93, 0x26, 0xfd, 0xbb, 0xed, 0x00, 0x56, 0x85, 0xa2, 0x22, 0x42, 0x94, 0x29, 0x53,
+	0x22, 0x15, 0xb1, 0x32, 0x14, 0x06, 0x04, 0x43, 0x90, 0x07, 0x06, 0x16, 0xe4, 0x36, 0x6e, 0x13,
+	0xd1, 0xc6, 0x56, 0xe2, 0x48, 0xe4, 0x2d, 0x78, 0xac, 0x8e, 0x1d, 0x99, 0x10, 0x6a, 0x5f, 0x04,
+	0xd9, 0x0e, 0xaa, 0x50, 0xc5, 0x76, 0xcf, 0x39, 0xd7, 0x9f, 0x8f, 0x95, 0xc0, 0x85, 0xa0, 0x79,
+	0x42, 0x8b, 0x75, 0x96, 0x8b, 0x68, 0x5e, 0xd4, 0x5c, 0xb0, 0x88, 0x17, 0x8c, 0x2d, 0x42, 0x5e,
+	0x30, 0xc1, 0xd0, 0xe9, 0x21, 0x0e, 0x75, 0x3c, 0x1e, 0x2d, 0xd9, 0x92, 0xa9, 0x34, 0x92, 0x93,
+	0x5e, 0xf4, 0x17, 0xd0, 0x7e, 0x92, 0xe7, 0xd0, 0x08, 0xda, 0x82, 0x09, 0xb2, 0x72, 0x4c, 0xcf,
+	0x0c, 0x2c, 0xac, 0x85, 0x74, 0xb3, 0x3c, 0xa1, 0xef, 0x4e, 0x4b, 0xbb, 0x4a, 0xa0, 0x73, 0xe8,
+	0xaf, 0x28, 0x59, 0xbc, 0xa6, 0xa4, 0x4c, 0x1d, 0xcb, 0x33, 0x83, 0x21, 0xee, 0x49, 0xe3, 0x9e,
+	0x94, 0xa9, 0x3c, 0x42, 0xaa, 0x5c, 0x94, 0x8e, 0xed, 0x59, 0xc1, 0x10, 0x6b, 0xe1, 0x3f, 0x42,
+	0xf7, 0x99, 0xac, 0x2a, 0x1a, 0x73, 0x74, 0x02, 0xd6, 0x1b, 0xad, 0xd5, 0x3d, 0x43, 0x2c, 0x47,
+	0x14, 0x42, 0x5b, 0x95, 0x57, 0xb7, 0x0c, 0x26, 0x4e, 0x78, 0xd4, 0x3e, 0x54, 0x25, 0xb1, 0x5e,
+	0xf3, 0x1f, 0xa0, 0x77, 0xc7, 0xd6, 0x59, 0xce, 0xfe, 0xd2, 0xfa, 0x9a, 0xa6, 0x3a, 0xf3, 0x4a,
+	0x28, 0x5a, 0x1f, 0x6b, 0x81, 0xce, 0xa0, 0xc3, 0x2a, 0x21, 0x6d, 0x4b, 0xd9, 0x8d, 0xf2, 0x6f,
+	0xa1, 0xab, 0xd8, 0x31, 0x47, 0x08, 0x6c, 0x51, 0x73, 0xda, 0xb0, 0xd4, 0xfc, 0x8b, 0x6f, 0x1d,
+	0xca, 0x22, 0xb0, 0x13, 0x22, 0x48, 0xf3, 0x6e, 0x35, 0xfb, 0x37, 0xd0, 0x6b, 0x20, 0x25, 0x9a,
+	0x80, 0xc5, 0x78, 0xe9, 0x98, 0x9e, 0x15, 0x0c, 0x26, 0xe3, 0xff, 0x9e, 0x12, 0xf3, 0xa9, 0xbd,
+	0xf9, 0xba, 0x34, 0xb0, 0x5c, 0x9e, 0xc6, 0x9b, 0x9d, 0x6b, 0x6e, 0x77, 0xae, 0xf9, 0xbd, 0x73,
+	0xcd, 0x8f, 0xbd, 0x6b, 0x6c, 0xf7, 0xae, 0xf1, 0xb9, 0x77, 0x8d, 0x97, 0xeb, 0x65, 0x26, 0xd2,
+	0x6a, 0x16, 0xce, 0xd9, 0x3a, 0x4a, 0x48, 0x99, 0x72, 0x52, 0x47, 0x1a, 0x29, 0x55, 0xa4, 0xbf,
+	0xe7, 0xd1, 0xbf, 0x30, 0xeb, 0xa8, 0xe0, 0xea, 0x27, 0x00, 0x00, 0xff, 0xff, 0x91, 0x1f, 0xd8,
+	0x7b, 0x27, 0x02, 0x00, 0x00,
 }
 
 func (m *Proof) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/crypto/proof.proto b/proto/tendermint/crypto/proof.proto
index 975df76853..36a5acf084 100644
--- a/proto/tendermint/crypto/proof.proto
+++ b/proto/tendermint/crypto/proof.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.crypto;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/crypto";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/tendermint/libs/bits/types.pb.go b/proto/tendermint/libs/bits/types.pb.go
index c0ebcb9760..29bb8e901d 100644
--- a/proto/tendermint/libs/bits/types.pb.go
+++ b/proto/tendermint/libs/bits/types.pb.go
@@ -81,18 +81,18 @@ func init() {
 func init() { proto.RegisterFile("tendermint/libs/bits/types.proto", fileDescriptor_e91ab2672920d7d4) }
 
 var fileDescriptor_e91ab2672920d7d4 = []byte{
-	// 168 bytes of a gzipped FileDescriptorProto
+	// 176 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, 0x4f, 0xca, 0x2c, 0x29,
 	0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, 0xa8,
 	0xd0, 0x03, 0xa9, 0xd0, 0x03, 0xa9, 0x50, 0x32, 0xe1, 0xe2, 0x70, 0xca, 0x2c, 0x71, 0x2c, 0x2a,
 	0x4a, 0xac, 0x14, 0x12, 0xe2, 0x62, 0x01, 0x89, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0x81,
 	0xd9, 0x42, 0x22, 0x5c, 0xac, 0xa9, 0x39, 0xa9, 0xb9, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0x2c,
-	0x41, 0x10, 0x8e, 0x53, 0xe8, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24,
+	0x41, 0x10, 0x8e, 0x53, 0xd0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24,
 	0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59,
-	0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x39, 0x09, 0x89, 0x09,
-	0x76, 0x8d, 0x3e, 0x36, 0xe7, 0x26, 0xb1, 0x81, 0xe5, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0x5b, 0x0c, 0xe3, 0x3e, 0xcd, 0x00, 0x00, 0x00,
+	0xa4, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0x24, 0x16, 0x67, 0x14,
+	0x24, 0x56, 0xea, 0x43, 0x2c, 0x06, 0xf1, 0xf4, 0xc1, 0x4e, 0xd1, 0xc7, 0xe6, 0xd6, 0x24, 0x36,
+	0xb0, 0x9c, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x08, 0x27, 0x9d, 0xca, 0x00, 0x00, 0x00,
 }
 
 func (m *BitArray) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/libs/bits/types.proto b/proto/tendermint/libs/bits/types.proto
index 3111d113a5..48ab07aa9f 100644
--- a/proto/tendermint/libs/bits/types.proto
+++ b/proto/tendermint/libs/bits/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.libs.bits;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/libs/bits";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/libs/bits";
 
 message BitArray {
   int64           bits  = 1;
diff --git a/proto/tendermint/mempool/types.pb.go b/proto/tendermint/mempool/types.pb.go
index c3a80bcde6..ab074c9c35 100644
--- a/proto/tendermint/mempool/types.pb.go
+++ b/proto/tendermint/mempool/types.pb.go
@@ -73,16 +73,17 @@ func init() {
 func init() { proto.RegisterFile("tendermint/mempool/types.proto", fileDescriptor_2af51926fdbcbc05) }
 
 var fileDescriptor_2af51926fdbcbc05 = []byte{
-	// 141 bytes of a gzipped FileDescriptorProto
+	// 149 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0x4d, 0xcd, 0x2d, 0xc8, 0xcf, 0xcf, 0xd1, 0x2f,
 	0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41,
 	0xe5, 0x95, 0xc4, 0xb9, 0x98, 0x43, 0x2a, 0x8a, 0x85, 0x04, 0xb8, 0x98, 0x4b, 0x2a, 0x8a, 0x25,
-	0x18, 0x15, 0x98, 0x35, 0x78, 0x82, 0x40, 0x4c, 0xa7, 0xe0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c,
+	0x18, 0x15, 0x98, 0x35, 0x78, 0x82, 0x40, 0x4c, 0xa7, 0x80, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c,
 	0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e,
-	0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5,
-	0x47, 0xb2, 0x11, 0x89, 0x09, 0xb6, 0x4e, 0x1f, 0xd3, 0x35, 0x49, 0x6c, 0x60, 0x19, 0x63, 0x40,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0x57, 0x8e, 0xa7, 0xaa, 0x00, 0x00, 0x00,
+	0x3c, 0x96, 0x63, 0x88, 0x32, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5,
+	0x4f, 0x49, 0x2c, 0xce, 0x28, 0x48, 0xac, 0xd4, 0x87, 0x98, 0x0c, 0xe2, 0xe9, 0x83, 0xed, 0xd2,
+	0xc7, 0x74, 0x4a, 0x12, 0x1b, 0x58, 0xc6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x67, 0x13,
+	0xf0, 0xa7, 0x00, 0x00, 0x00,
 }
 
 func (m *Txs) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/mempool/types.proto b/proto/tendermint/mempool/types.proto
index fff3e93e56..0bddaea436 100644
--- a/proto/tendermint/mempool/types.proto
+++ b/proto/tendermint/mempool/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.mempool;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/mempool";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/mempool";
 
 message Txs {
   repeated bytes txs = 1;
diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/tendermint/p2p/conn.pb.go
index 16ee463a6a..3a2727cd08 100644
--- a/proto/tendermint/p2p/conn.pb.go
+++ b/proto/tendermint/p2p/conn.pb.go
@@ -5,9 +5,9 @@ package p2p
 
 import (
 	fmt "fmt"
+	crypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -318,32 +318,32 @@ func init() {
 func init() { proto.RegisterFile("tendermint/p2p/conn.proto", fileDescriptor_22474b5527c8fa9f) }
 
 var fileDescriptor_22474b5527c8fa9f = []byte{
-	// 395 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x3d, 0x8f, 0xd3, 0x40,
-	0x10, 0xf5, 0xe2, 0xbb, 0x1c, 0x99, 0x84, 0x13, 0x5a, 0x51, 0x24, 0xd1, 0xc9, 0x89, 0x5c, 0xa5,
-	0x40, 0xb6, 0x64, 0x44, 0x03, 0xa2, 0xc0, 0x7c, 0x88, 0xd3, 0x29, 0xba, 0xc8, 0x74, 0x34, 0x96,
-	0x3f, 0x96, 0xf5, 0x2a, 0xe7, 0xdd, 0x55, 0x76, 0x5d, 0xf8, 0x5f, 0xf0, 0xb3, 0x8e, 0xee, 0x4a,
-	0xaa, 0x08, 0x39, 0x7f, 0x04, 0x79, 0x1d, 0x88, 0x23, 0x71, 0xdd, 0x7b, 0x33, 0xf3, 0xe6, 0x43,
-	0xf3, 0x60, 0xaa, 0x09, 0xcf, 0xc9, 0xb6, 0x64, 0x5c, 0xfb, 0x32, 0x90, 0x7e, 0x26, 0x38, 0xf7,
-	0xe4, 0x56, 0x68, 0x81, 0x2f, 0x8f, 0x29, 0x4f, 0x06, 0x72, 0xf6, 0x82, 0x0a, 0x2a, 0x4c, 0xca,
-	0x6f, 0x51, 0x57, 0x35, 0xbb, 0xea, 0x35, 0xc8, 0xb6, 0xb5, 0xd4, 0xc2, 0xdf, 0x90, 0x5a, 0x75,
-	0x59, 0x77, 0x0c, 0xb0, 0x4e, 0xb2, 0x0d, 0xd1, 0x6b, 0xc6, 0x69, 0x8f, 0x09, 0x4e, 0xdd, 0x02,
-	0x86, 0x1d, 0x5b, 0x29, 0x8a, 0x5f, 0x02, 0x64, 0x45, 0xc2, 0x39, 0xb9, 0x8b, 0x59, 0x3e, 0x41,
-	0x0b, 0xb4, 0x3c, 0x0f, 0x9f, 0x35, 0xbb, 0xf9, 0xf0, 0x43, 0x17, 0xbd, 0xfe, 0x18, 0x0d, 0x0f,
-	0x05, 0xd7, 0x39, 0x9e, 0x82, 0x4d, 0xc4, 0xf7, 0xc9, 0x93, 0x05, 0x5a, 0x3e, 0x0d, 0x2f, 0x9a,
-	0xdd, 0xdc, 0xfe, 0x74, 0xfb, 0x39, 0x6a, 0x63, 0x18, 0xc3, 0x59, 0x9e, 0xe8, 0x64, 0x62, 0x2f,
-	0xd0, 0x72, 0x1c, 0x19, 0xec, 0xfe, 0x44, 0x30, 0xe8, 0x46, 0xe1, 0x77, 0x30, 0x92, 0x06, 0xc5,
-	0x92, 0x71, 0x6a, 0x06, 0x8d, 0x82, 0x99, 0x77, 0x7a, 0xaa, 0x77, 0xdc, 0xf9, 0x8b, 0x15, 0x81,
-	0xfc, 0xc7, 0xfa, 0x72, 0xc1, 0xa9, 0x59, 0xe0, 0x71, 0xb9, 0x38, 0x91, 0x0b, 0x4e, 0xf1, 0x1b,
-	0x38, 0xb0, 0xb8, 0x54, 0xd4, 0xac, 0x38, 0x0a, 0xa6, 0xff, 0x57, 0xaf, 0x54, 0x2b, 0x1e, 0xca,
-	0xbf, 0x24, 0x3c, 0x07, 0x5b, 0x55, 0xa5, 0x1b, 0xc3, 0xe5, 0xfb, 0x4a, 0x17, 0x5f, 0x19, 0x5d,
-	0x11, 0xa5, 0x12, 0x4a, 0xf0, 0x5b, 0xb8, 0x90, 0x55, 0x1a, 0x6f, 0x48, 0x7d, 0x38, 0xe7, 0xaa,
-	0xdf, 0xb1, 0xfb, 0x89, 0xb7, 0xae, 0xd2, 0x3b, 0x96, 0xdd, 0x90, 0x3a, 0x3c, 0xbb, 0xdf, 0xcd,
-	0xad, 0x68, 0x20, 0xab, 0xf4, 0x86, 0xd4, 0xf8, 0x39, 0xd8, 0x8a, 0x75, 0x87, 0x8c, 0xa3, 0x16,
-	0x86, 0xb7, 0xf7, 0x8d, 0x83, 0x1e, 0x1a, 0x07, 0xfd, 0x6e, 0x1c, 0xf4, 0x63, 0xef, 0x58, 0x0f,
-	0x7b, 0xc7, 0xfa, 0xb5, 0x77, 0xac, 0x6f, 0xaf, 0x29, 0xd3, 0x45, 0x95, 0x7a, 0x99, 0x28, 0xfd,
-	0xde, 0xd7, 0xfb, 0x0e, 0x32, 0xee, 0x38, 0xb5, 0x54, 0x3a, 0x30, 0xd1, 0x57, 0x7f, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0x30, 0xfd, 0xb2, 0x8d, 0x6b, 0x02, 0x00, 0x00,
+	// 399 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcb, 0x8e, 0xd3, 0x30,
+	0x14, 0x86, 0x63, 0x32, 0xd3, 0x21, 0xa7, 0x65, 0x84, 0x2c, 0x16, 0x6d, 0x35, 0x4a, 0xab, 0xac,
+	0xba, 0x40, 0x89, 0x14, 0x76, 0x20, 0x16, 0x84, 0x8b, 0x18, 0x0d, 0x15, 0x55, 0xd8, 0xb1, 0x89,
+	0x72, 0x31, 0x8e, 0xd5, 0x89, 0x6d, 0xd5, 0xce, 0x22, 0x6f, 0xc1, 0x63, 0x0d, 0xbb, 0x59, 0xb2,
+	0xaa, 0x50, 0xfa, 0x22, 0x28, 0x71, 0x61, 0x52, 0x09, 0x76, 0xff, 0x77, 0x8e, 0xff, 0x73, 0x91,
+	0x0f, 0xcc, 0x34, 0xe1, 0x05, 0xd9, 0x55, 0x8c, 0xeb, 0x40, 0x86, 0x32, 0xc8, 0x05, 0xe7, 0xbe,
+	0xdc, 0x09, 0x2d, 0xf0, 0xe5, 0x43, 0xca, 0x97, 0xa1, 0x9c, 0x3f, 0xa3, 0x82, 0x8a, 0x3e, 0x15,
+	0x74, 0xca, 0xbc, 0x9a, 0x5f, 0x0d, 0x0a, 0xe4, 0xbb, 0x46, 0x6a, 0x11, 0x6c, 0x49, 0xa3, 0x4c,
+	0xd6, 0x9b, 0x00, 0x6c, 0xd2, 0x7c, 0x4b, 0xf4, 0x86, 0x71, 0x3a, 0x20, 0xc1, 0xa9, 0x57, 0x82,
+	0x63, 0x68, 0xad, 0x28, 0x7e, 0x0e, 0x90, 0x97, 0x29, 0xe7, 0xe4, 0x36, 0x61, 0xc5, 0x14, 0x2d,
+	0xd1, 0xea, 0x3c, 0x7a, 0xd2, 0xee, 0x17, 0xce, 0x5b, 0x13, 0xbd, 0x7e, 0x17, 0x3b, 0xc7, 0x07,
+	0xd7, 0x05, 0x9e, 0x81, 0x4d, 0xc4, 0xb7, 0xe9, 0xa3, 0x25, 0x5a, 0x3d, 0x8e, 0x2e, 0xda, 0xfd,
+	0xc2, 0x7e, 0xff, 0xf9, 0x43, 0xdc, 0xc5, 0x30, 0x86, 0xb3, 0x22, 0xd5, 0xe9, 0xd4, 0x5e, 0xa2,
+	0xd5, 0x24, 0xee, 0xb5, 0xf7, 0x03, 0xc1, 0xc8, 0xb4, 0xc2, 0xaf, 0x61, 0x2c, 0x7b, 0x95, 0x48,
+	0xc6, 0x69, 0xdf, 0x68, 0x1c, 0xce, 0xfd, 0xd3, 0x55, 0xfd, 0x87, 0x99, 0x3f, 0x5a, 0x31, 0xc8,
+	0xbf, 0x34, 0xb4, 0x0b, 0x4e, 0xfb, 0x01, 0xfe, 0x6f, 0x17, 0x27, 0x76, 0xc1, 0x29, 0x7e, 0x09,
+	0x47, 0x4a, 0x2a, 0x45, 0xfb, 0x11, 0xc7, 0xe1, 0xec, 0xdf, 0xee, 0xb5, 0xea, 0xcc, 0x8e, 0xfc,
+	0x03, 0xd1, 0x39, 0xd8, 0xaa, 0xae, 0xbc, 0x04, 0x2e, 0xdf, 0xd4, 0xba, 0xfc, 0xc2, 0xe8, 0x9a,
+	0x28, 0x95, 0x52, 0x82, 0x5f, 0xc1, 0x85, 0xac, 0xb3, 0x64, 0x4b, 0x9a, 0xe3, 0x3a, 0x57, 0xc3,
+	0x8a, 0xe6, 0x4f, 0xfc, 0x4d, 0x9d, 0xdd, 0xb2, 0xfc, 0x86, 0x34, 0xd1, 0xd9, 0xdd, 0x7e, 0x61,
+	0xc5, 0x23, 0x59, 0x67, 0x37, 0xa4, 0xc1, 0x4f, 0xc1, 0x56, 0xcc, 0x2c, 0x32, 0x89, 0x3b, 0x19,
+	0x7d, 0xba, 0x6b, 0x5d, 0x74, 0xdf, 0xba, 0xe8, 0x57, 0xeb, 0xa2, 0xef, 0x07, 0xd7, 0xba, 0x3f,
+	0xb8, 0xd6, 0xcf, 0x83, 0x6b, 0x7d, 0x0d, 0x29, 0xd3, 0x65, 0x9d, 0xf9, 0xb9, 0xa8, 0x82, 0x22,
+	0x55, 0xa5, 0x4c, 0x9b, 0xc0, 0x74, 0xea, 0x28, 0x30, 0xa7, 0x71, 0x7a, 0x4f, 0xd9, 0xa8, 0x8f,
+	0xbe, 0xf8, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xa5, 0x2b, 0x72, 0x68, 0x02, 0x00, 0x00,
 }
 
 func (m *PacketPing) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/p2p/conn.proto b/proto/tendermint/p2p/conn.proto
index b12de6c827..82cd0161ac 100644
--- a/proto/tendermint/p2p/conn.proto
+++ b/proto/tendermint/p2p/conn.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.p2p;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/p2p";
 
 import "gogoproto/gogo.proto";
 import "tendermint/crypto/keys.proto";
diff --git a/proto/tendermint/p2p/envelope.go b/proto/tendermint/p2p/envelope.go
index 11a8b9a076..de9d60414f 100644
--- a/proto/tendermint/p2p/envelope.go
+++ b/proto/tendermint/p2p/envelope.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/proto/tendermint/consensus"
-	"github.com/tendermint/tendermint/proto/tendermint/mempool"
-	"github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	"github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	"github.com/dashpay/tenderdash/proto/tendermint/mempool"
+	"github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	"github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/proto/tendermint/p2p/pex.pb.go b/proto/tendermint/p2p/pex.pb.go
index 4f7bf0a2df..750596fa0a 100644
--- a/proto/tendermint/p2p/pex.pb.go
+++ b/proto/tendermint/p2p/pex.pb.go
@@ -156,7 +156,7 @@ func init() {
 func init() { proto.RegisterFile("tendermint/p2p/pex.proto", fileDescriptor_81c2f011fd13be57) }
 
 var fileDescriptor_81c2f011fd13be57 = []byte{
-	// 220 bytes of a gzipped FileDescriptorProto
+	// 228 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, 0xd0, 0x2b,
 	0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x43, 0xc8, 0xe8, 0x15, 0x18, 0x15, 0x48, 0x89, 0xa4, 0xe7,
@@ -166,11 +166,12 @@ var fileDescriptor_81c2f011fd13be57 = []byte{
 	0x4a, 0x3c, 0x60, 0x85, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5, 0x25, 0x4a, 0xbe, 0x5c, 0xdc, 0x60,
 	0x5e, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0x90, 0x1d, 0x17, 0x67, 0x22, 0xc4, 0x88, 0xd4, 0x62,
 	0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x29, 0x3d, 0x54, 0xfb, 0xf5, 0x10, 0xd6, 0x38, 0xb1,
-	0x9c, 0xb8, 0x27, 0xcf, 0x10, 0x84, 0xd0, 0xe2, 0xe4, 0x7f, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47,
+	0x9c, 0xb8, 0x27, 0xcf, 0x10, 0x84, 0xd0, 0xe2, 0xe4, 0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47,
 	0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d,
-	0xc7, 0x72, 0x0c, 0x51, 0xa6, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa,
-	0x48, 0x5e, 0x45, 0xf6, 0x35, 0xd8, 0x4b, 0xa8, 0xc1, 0x90, 0xc4, 0x06, 0x16, 0x35, 0x06, 0x04,
-	0x00, 0x00, 0xff, 0xff, 0xe7, 0x5b, 0xe7, 0x33, 0x1f, 0x01, 0x00, 0x00,
+	0xc7, 0x72, 0x0c, 0x51, 0x46, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa,
+	0x29, 0x89, 0xc5, 0x19, 0x05, 0x89, 0x95, 0xfa, 0x10, 0x83, 0x41, 0x3c, 0x7d, 0x88, 0x7f, 0x50,
+	0xc3, 0x20, 0x89, 0x0d, 0x2c, 0x6a, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x25, 0xe4, 0x91,
+	0x1c, 0x01, 0x00, 0x00,
 }
 
 func (m *PexAddress) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/p2p/pex.proto b/proto/tendermint/p2p/pex.proto
index 04e17256c8..dcc8367d1c 100644
--- a/proto/tendermint/p2p/pex.proto
+++ b/proto/tendermint/p2p/pex.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.p2p;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/p2p";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/tendermint/p2p/types.pb.go b/proto/tendermint/p2p/types.pb.go
index 937d2b1427..14aeefe3cb 100644
--- a/proto/tendermint/p2p/types.pb.go
+++ b/proto/tendermint/p2p/types.pb.go
@@ -5,15 +5,15 @@ package p2p
 
 import (
 	fmt "fmt"
+	blocksync "github.com/dashpay/tenderdash/proto/tendermint/blocksync"
+	consensus "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	mempool "github.com/dashpay/tenderdash/proto/tendermint/mempool"
+	statesync "github.com/dashpay/tenderdash/proto/tendermint/statesync"
+	types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	blocksync "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	consensus "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	mempool "github.com/tendermint/tendermint/proto/tendermint/mempool"
-	statesync "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	types1 "github.com/tendermint/tendermint/proto/tendermint/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -899,97 +899,97 @@ func init() {
 func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) }
 
 var fileDescriptor_c8a29e659aeca578 = []byte{
-	// 1433 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0x4b, 0x6f, 0xdb, 0xc6,
-	0x16, 0x96, 0xe4, 0x97, 0x74, 0x64, 0x59, 0xf6, 0xc4, 0x37, 0x61, 0x9c, 0x44, 0xf2, 0x75, 0xee,
-	0xc3, 0xb8, 0x0b, 0xe9, 0x42, 0x41, 0x8b, 0x34, 0x68, 0x80, 0x44, 0x8e, 0x13, 0xb9, 0x70, 0x62,
-	0x81, 0x76, 0x83, 0xbe, 0x00, 0x82, 0x22, 0xc7, 0x26, 0x6b, 0x6a, 0x66, 0xca, 0x19, 0x29, 0xf2,
-	0xbf, 0xc8, 0xcf, 0xca, 0xa2, 0x8b, 0x2c, 0xbb, 0x72, 0x0b, 0x67, 0xd1, 0x45, 0xfb, 0x23, 0x8a,
-	0x19, 0x0e, 0x1f, 0xa2, 0x5c, 0x25, 0xbb, 0x39, 0x67, 0xbe, 0xef, 0xd3, 0x99, 0xef, 0x1c, 0x0d,
-	0x49, 0xd8, 0x12, 0x98, 0xb8, 0x38, 0x1c, 0xfa, 0x44, 0xb4, 0x59, 0x87, 0xb5, 0xc5, 0x05, 0xc3,
-	0xbc, 0xc5, 0x42, 0x2a, 0x28, 0x5a, 0x4b, 0xf7, 0x5a, 0xac, 0xc3, 0xb6, 0x36, 0xcf, 0xe8, 0x19,
-	0x55, 0x5b, 0x6d, 0xb9, 0x8a, 0x50, 0x5b, 0xdb, 0x19, 0x85, 0x41, 0x40, 0x9d, 0x73, 0x7e, 0x41,
-	0x9c, 0xac, 0xce, 0x14, 0xc2, 0xa1, 0x84, 0x63, 0xc2, 0x47, 0xfc, 0x6f, 0x11, 0x5c, 0xd8, 0x02,
-	0xcf, 0x68, 0x34, 0x33, 0x08, 0x95, 0x6f, 0xe3, 0xb1, 0xef, 0x62, 0xe2, 0x60, 0x0d, 0x68, 0x64,
-	0x00, 0x43, 0x3c, 0x64, 0x94, 0x06, 0x53, 0x02, 0x46, 0xee, 0xa0, 0x0c, 0x4f, 0x62, 0xe9, 0x33,
-	0x4a, 0xcf, 0x02, 0xdc, 0x56, 0xd1, 0x60, 0x74, 0xda, 0x16, 0xfe, 0x10, 0x73, 0x61, 0x0f, 0x59,
-	0x04, 0xd8, 0x39, 0x81, 0x7a, 0x5f, 0x2e, 0x1c, 0x1a, 0xbc, 0xc6, 0x21, 0xf7, 0x29, 0x41, 0xb7,
-	0x61, 0x81, 0x75, 0x98, 0x51, 0xdc, 0x2e, 0xee, 0x2e, 0x76, 0x57, 0xae, 0x2e, 0x9b, 0x0b, 0xfd,
-	0x4e, 0xdf, 0x94, 0x39, 0xb4, 0x09, 0x4b, 0xca, 0x06, 0xa3, 0x24, 0x37, 0xcd, 0x28, 0x40, 0xeb,
-	0xb0, 0x60, 0x33, 0x66, 0x2c, 0xa8, 0x9c, 0x5c, 0xee, 0xfc, 0x5e, 0x82, 0xf2, 0x2b, 0xea, 0xe2,
-	0x03, 0x72, 0x4a, 0x51, 0x1f, 0xd6, 0x99, 0xfe, 0x09, 0x6b, 0x1c, 0xfd, 0x86, 0x12, 0xaf, 0x76,
-	0x9a, 0xad, 0xe9, 0x2e, 0xb4, 0x72, 0xa5, 0x74, 0x17, 0xdf, 0x5d, 0x36, 0x0b, 0x66, 0x9d, 0xe5,
-	0x2a, 0xbc, 0x0f, 0x2b, 0x84, 0xba, 0xd8, 0xf2, 0x5d, 0x55, 0x48, 0xa5, 0x0b, 0x57, 0x97, 0xcd,
-	0x65, 0xf5, 0x83, 0xcf, 0xcc, 0x65, 0xb9, 0x75, 0xe0, 0xa2, 0x26, 0x54, 0x03, 0x9f, 0x0b, 0x4c,
-	0x2c, 0xdb, 0x75, 0x43, 0x55, 0x5d, 0xc5, 0x84, 0x28, 0xf5, 0xd4, 0x75, 0x43, 0x64, 0xc0, 0x0a,
-	0xc1, 0xe2, 0x0d, 0x0d, 0xcf, 0x8d, 0x45, 0xb5, 0x19, 0x87, 0x72, 0x27, 0x2e, 0x74, 0x29, 0xda,
-	0xd1, 0x21, 0xda, 0x82, 0xb2, 0xe3, 0xd9, 0x84, 0xe0, 0x80, 0x1b, 0xcb, 0xdb, 0xc5, 0xdd, 0x55,
-	0x33, 0x89, 0x25, 0x6b, 0x48, 0x89, 0x7f, 0x8e, 0x43, 0x63, 0x25, 0x62, 0xe9, 0x10, 0x7d, 0x01,
-	0x4b, 0x54, 0x78, 0x38, 0x34, 0xca, 0xea, 0xd8, 0xf7, 0xf2, 0xc7, 0x8e, 0xad, 0x3a, 0x92, 0x20,
-	0x7d, 0xe8, 0x88, 0x81, 0x1a, 0x50, 0x65, 0x21, 0xb5, 0xc4, 0xc4, 0xf2, 0x6c, 0xee, 0x19, 0x15,
-	0xf5, 0x9b, 0x15, 0x16, 0xd2, 0x93, 0x49, 0xcf, 0xe6, 0xde, 0xce, 0xf7, 0x50, 0x9b, 0x62, 0xa3,
-	0xdb, 0x50, 0x16, 0x13, 0xcb, 0x27, 0x2e, 0x9e, 0x28, 0x97, 0x2b, 0xe6, 0x8a, 0x98, 0x1c, 0xc8,
-	0x10, 0xb5, 0xa1, 0x1a, 0x32, 0x47, 0xd9, 0x81, 0x39, 0xd7, 0xd6, 0xad, 0x5d, 0x5d, 0x36, 0xc1,
-	0xec, 0xef, 0x3d, 0x8d, 0xb2, 0x26, 0x84, 0xcc, 0xd1, 0xeb, 0x9d, 0x3f, 0x8a, 0x50, 0xee, 0x63,
-	0x1c, 0xaa, 0x36, 0xde, 0x84, 0x92, 0xef, 0x46, 0x92, 0xdd, 0xe5, 0xab, 0xcb, 0x66, 0xe9, 0xe0,
-	0x99, 0x59, 0xf2, 0x5d, 0xd4, 0x85, 0x55, 0xad, 0x68, 0xf9, 0xe4, 0x94, 0x1a, 0xa5, 0xed, 0x85,
-	0x6b, 0x5b, 0x8b, 0x71, 0xa8, 0x75, 0xa5, 0x9c, 0x59, 0xb5, 0xd3, 0x00, 0xbd, 0x80, 0xb5, 0xc0,
-	0xe6, 0xc2, 0x72, 0x28, 0x21, 0xd8, 0x11, 0xd8, 0x55, 0xed, 0xaa, 0x76, 0xb6, 0x5a, 0xd1, 0xfc,
-	0xb6, 0xe2, 0xf9, 0x6d, 0x9d, 0xc4, 0xf3, 0xdb, 0x5d, 0x7c, 0xfb, 0x6b, 0xb3, 0x68, 0xd6, 0x24,
-	0x6f, 0x2f, 0xa6, 0xc9, 0xfe, 0xf8, 0xc4, 0x76, 0x84, 0x3f, 0xc6, 0xaa, 0xa9, 0x65, 0x33, 0x89,
-	0xf3, 0x56, 0x2e, 0xe5, 0xad, 0xfc, 0xb3, 0x08, 0xf5, 0x5c, 0x95, 0xb2, 0xa7, 0xb1, 0x5d, 0xda,
-	0x4c, 0x1d, 0xa2, 0x43, 0xd8, 0x50, 0x25, 0xbb, 0xbe, 0x1d, 0x58, 0x7c, 0xe4, 0x38, 0xb1, 0xa5,
-	0x9f, 0x52, 0x75, 0x5d, 0x52, 0x9f, 0xf9, 0x76, 0x70, 0x1c, 0x11, 0xa7, 0xd5, 0x4e, 0x6d, 0x3f,
-	0x18, 0x85, 0xf8, 0x93, 0x3d, 0x48, 0xd4, 0x9e, 0x47, 0x44, 0x74, 0x1f, 0x6a, 0x59, 0x21, 0xae,
-	0xac, 0xa8, 0x99, 0xab, 0x6e, 0x8a, 0xe1, 0x3b, 0x77, 0x61, 0x71, 0xdf, 0xf1, 0xa8, 0xfc, 0x4f,
-	0x8f, 0xed, 0x60, 0x84, 0xf5, 0x01, 0xa3, 0x60, 0xe7, 0xe7, 0x0d, 0x28, 0xef, 0x93, 0x31, 0x0e,
-	0x28, 0xc3, 0xa8, 0x07, 0x60, 0x0b, 0x11, 0xfa, 0x83, 0x91, 0xc0, 0xd2, 0x08, 0xd9, 0xe0, 0xdd,
-	0x7c, 0x83, 0x63, 0x74, 0xeb, 0x69, 0x02, 0xdd, 0x27, 0x22, 0xbc, 0x30, 0x33, 0x5c, 0xf4, 0x3f,
-	0x58, 0xc4, 0x8e, 0x47, 0xb5, 0x51, 0x9b, 0x33, 0x1a, 0x8e, 0x47, 0x7b, 0x05, 0x53, 0x61, 0xd0,
-	0x63, 0xa8, 0x32, 0x3c, 0xb1, 0x42, 0xfc, 0xd3, 0x08, 0x73, 0x91, 0xb8, 0x31, 0x33, 0x57, 0x13,
-	0x33, 0x42, 0xf4, 0x0a, 0x26, 0xb0, 0x24, 0x42, 0x4f, 0x60, 0x35, 0xa2, 0x73, 0x26, 0xef, 0x65,
-	0xe5, 0x41, 0xb5, 0x73, 0xe7, 0x5a, 0x7e, 0x04, 0xe9, 0x15, 0xcc, 0x2a, 0x4b, 0x43, 0xf4, 0x10,
-	0xca, 0xf1, 0x45, 0xac, 0xa6, 0x25, 0xf7, 0xeb, 0xd1, 0x0d, 0xbc, 0xaf, 0x11, 0xbd, 0x82, 0x99,
-	0xa0, 0xd1, 0x23, 0xa8, 0xea, 0x7b, 0xda, 0x12, 0x93, 0xe8, 0xa6, 0xa8, 0x76, 0x6e, 0x65, 0xc9,
-	0x7a, 0xbb, 0x75, 0x32, 0xe1, 0xb2, 0x6e, 0x1d, 0x9e, 0x4c, 0x38, 0x3a, 0x80, 0x9a, 0xba, 0x56,
-	0x93, 0x83, 0xaf, 0x28, 0xf6, 0x4e, 0x96, 0x9d, 0x3c, 0x8b, 0x5a, 0x5d, 0xb9, 0x4a, 0x0d, 0x58,
-	0x1d, 0x64, 0x62, 0x74, 0x0c, 0x1b, 0x84, 0x5a, 0xb1, 0x9a, 0xf6, 0x21, 0xba, 0x83, 0xfe, 0x7d,
-	0xbd, 0xdc, 0x2b, 0xaa, 0x05, 0x13, 0x47, 0xea, 0x64, 0x3a, 0x85, 0x0e, 0x61, 0x2d, 0xa7, 0x58,
-	0x51, 0x8a, 0xf7, 0xe7, 0x16, 0x98, 0xe8, 0xd5, 0x06, 0x79, 0x35, 0xf9, 0x50, 0x1c, 0xf1, 0xe4,
-	0xb8, 0x30, 0x4f, 0xed, 0x58, 0x61, 0xd3, 0xf3, 0xd6, 0x78, 0x36, 0x81, 0x8e, 0xa0, 0x9e, 0xa8,
-	0xe9, 0xe2, 0xaa, 0x4a, 0xee, 0x5f, 0xf3, 0xe5, 0x92, 0xea, 0xd6, 0xf8, 0x54, 0x06, 0x7d, 0x0d,
-	0x1b, 0x9c, 0xd8, 0x8c, 0x7b, 0x54, 0xa4, 0x15, 0xae, 0x2a, 0xc9, 0xff, 0x64, 0x25, 0x93, 0x07,
-	0x7b, 0xeb, 0x38, 0x86, 0xa7, 0x45, 0xae, 0xf3, 0x5c, 0x0e, 0x7d, 0x03, 0x28, 0x2b, 0xab, 0x4b,
-	0xad, 0x29, 0xdd, 0xff, 0x7e, 0x54, 0x37, 0xa9, 0x76, 0x83, 0xe7, 0x93, 0x72, 0x7a, 0x1c, 0x6f,
-	0x44, 0xd2, 0xe9, 0x59, 0x9b, 0x9d, 0x9e, 0x54, 0x74, 0x4f, 0x42, 0x33, 0xd3, 0xe3, 0x64, 0x62,
-	0xd9, 0x9a, 0x58, 0x4a, 0x17, 0x58, 0x9f, 0x6d, 0xcd, 0x8c, 0x56, 0xda, 0x68, 0x27, 0x9b, 0x40,
-	0xdf, 0xc2, 0x8d, 0xc0, 0x3f, 0xf3, 0x84, 0x35, 0x3d, 0xdc, 0xeb, 0xf3, 0xce, 0x7c, 0x28, 0x09,
-	0xb9, 0x09, 0xdf, 0x08, 0xf2, 0x49, 0xf4, 0x03, 0x6c, 0x4e, 0x4b, 0xeb, 0x72, 0x37, 0x94, 0xf6,
-	0xee, 0xc7, 0xb5, 0x93, 0x9a, 0x51, 0x30, 0x93, 0x95, 0x36, 0x30, 0x3b, 0xb4, 0x87, 0x69, 0xff,
-	0xd1, 0x3c, 0x1b, 0xfa, 0x0a, 0x9b, 0x99, 0x50, 0x96, 0x4d, 0xc8, 0x09, 0x4d, 0xd4, 0x74, 0x99,
-	0x37, 0x66, 0x27, 0x74, 0x56, 0x2e, 0x9d, 0x50, 0x36, 0x95, 0x41, 0x5f, 0xc1, 0x1a, 0xc1, 0x6f,
-	0xac, 0x90, 0x8e, 0x88, 0x6b, 0x71, 0x81, 0x99, 0xb1, 0x39, 0xdb, 0xf1, 0xe4, 0xcd, 0xb4, 0xf5,
-	0x0a, 0xbf, 0x31, 0x25, 0xf4, 0x58, 0x60, 0x26, 0x3b, 0x4e, 0x32, 0x31, 0x7a, 0x09, 0x75, 0xa9,
-	0x35, 0xb6, 0x03, 0xdf, 0x8d, 0xcc, 0x34, 0xfe, 0x31, 0x7b, 0xd6, 0x29, 0xb1, 0xd7, 0x12, 0xab,
-	0x0c, 0x93, 0x67, 0x25, 0xd9, 0x04, 0xfa, 0x12, 0xca, 0x2c, 0xa4, 0x8c, 0x72, 0x3b, 0x30, 0x6e,
-	0x2a, 0x9d, 0xc6, 0xf5, 0x3a, 0x7d, 0x8d, 0x92, 0x77, 0x68, 0xcc, 0x40, 0xcf, 0x61, 0x35, 0x5e,
-	0x5b, 0x8c, 0x06, 0xc6, 0x2d, 0xa5, 0xf0, 0xcf, 0xf9, 0x0a, 0xfd, 0xa3, 0x43, 0x75, 0x8b, 0xc7,
-	0x21, 0x0d, 0xd0, 0x13, 0x80, 0x68, 0x2e, 0x98, 0x1d, 0x0a, 0xc3, 0x98, 0x7d, 0xf1, 0x4c, 0x55,
-	0x54, 0xd9, 0x7d, 0x3b, 0x94, 0x7d, 0xab, 0x0c, 0xe2, 0x00, 0xfd, 0x1f, 0x16, 0xc7, 0x54, 0x60,
-	0xe3, 0xf6, 0xec, 0x33, 0x20, 0xe5, 0xbe, 0xa6, 0x42, 0xb6, 0x47, 0x21, 0xd1, 0x23, 0x28, 0x7b,
-	0x36, 0xb7, 0x14, 0x6b, 0x6b, 0xf6, 0x9d, 0x2f, 0x65, 0xf5, 0x6c, 0xae, 0x89, 0x2b, 0x5e, 0xb4,
-	0x94, 0x0d, 0x95, 0x3c, 0x8b, 0x63, 0x61, 0x0d, 0xed, 0x1f, 0x3b, 0x0f, 0x8c, 0x3b, 0xf3, 0x1a,
-	0x2a, 0x39, 0xc7, 0x58, 0xbc, 0x94, 0x48, 0xd9, 0xd0, 0x71, 0x26, 0x46, 0x2f, 0xa0, 0x96, 0x68,
-	0x0d, 0x7c, 0xc1, 0x8d, 0xbb, 0xf3, 0x4c, 0xd4, 0x52, 0x5d, 0x5f, 0xc8, 0x67, 0x52, 0x75, 0x9c,
-	0x86, 0xe8, 0x73, 0x58, 0x76, 0xe8, 0x70, 0xe8, 0x0b, 0xe3, 0x9e, 0x52, 0xb8, 0x7b, 0xbd, 0xc2,
-	0x9e, 0xc2, 0xf4, 0x0a, 0xa6, 0x46, 0x4b, 0xf3, 0xa5, 0x11, 0x9a, 0xdb, 0x98, 0x67, 0x7e, 0xcf,
-	0xe6, 0x09, 0xbd, 0xe2, 0xc5, 0xc1, 0xd6, 0x63, 0xa8, 0xe7, 0x5e, 0x28, 0xe4, 0xf7, 0xc6, 0x39,
-	0xbe, 0xd0, 0xef, 0x2b, 0x72, 0x99, 0xbe, 0xc3, 0x94, 0x32, 0xef, 0x30, 0x8f, 0x4a, 0x0f, 0x8b,
-	0xdd, 0x25, 0x58, 0xe0, 0xa3, 0x61, 0xf7, 0xe8, 0xdd, 0x55, 0xa3, 0xf8, 0xfe, 0xaa, 0x51, 0xfc,
-	0xed, 0xaa, 0x51, 0x7c, 0xfb, 0xa1, 0x51, 0x78, 0xff, 0xa1, 0x51, 0xf8, 0xe5, 0x43, 0xa3, 0xf0,
-	0xdd, 0x67, 0x67, 0xbe, 0xf0, 0x46, 0x83, 0x96, 0x43, 0x87, 0xed, 0xec, 0x77, 0x58, 0xe6, 0x8b,
-	0x4a, 0x7d, 0x15, 0x4e, 0x7f, 0x62, 0x0d, 0x96, 0x55, 0xf6, 0xc1, 0x5f, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0x67, 0xb5, 0x6a, 0x42, 0x64, 0x0e, 0x00, 0x00,
+	// 1436 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0x4b, 0x6f, 0xdb, 0x46,
+	0x17, 0x95, 0xe4, 0x97, 0x74, 0x65, 0x59, 0xf6, 0xc4, 0x5f, 0xc2, 0x38, 0x89, 0xe4, 0xcf, 0xe9,
+	0xc3, 0xe8, 0x42, 0x2a, 0x14, 0xa0, 0x48, 0x83, 0x06, 0x48, 0xe4, 0x38, 0x91, 0x0b, 0x27, 0x11,
+	0x68, 0x37, 0xe8, 0x0b, 0x20, 0x28, 0x72, 0x6c, 0xb2, 0xa6, 0x66, 0xa6, 0x9c, 0x91, 0x22, 0xff,
+	0x8b, 0xfc, 0xac, 0x2c, 0xba, 0xc8, 0xb2, 0x2b, 0xb7, 0x70, 0x16, 0x5d, 0xb4, 0x3f, 0xa2, 0x98,
+	0xe1, 0xf0, 0x21, 0xca, 0x55, 0xb2, 0x9b, 0x7b, 0xe7, 0x9c, 0xc3, 0x3b, 0xe7, 0x5e, 0x0d, 0x29,
+	0xd8, 0x12, 0x98, 0xb8, 0x38, 0x1c, 0xfa, 0x44, 0xb4, 0x59, 0x87, 0xb5, 0xc5, 0x39, 0xc3, 0xbc,
+	0xc5, 0x42, 0x2a, 0x28, 0x5a, 0x4b, 0xf7, 0x5a, 0xac, 0xc3, 0xb6, 0x36, 0x4f, 0xe9, 0x29, 0x55,
+	0x5b, 0x6d, 0xb9, 0x8a, 0x50, 0x5b, 0xdb, 0x19, 0x85, 0x41, 0x40, 0x9d, 0x33, 0x7e, 0x4e, 0x9c,
+	0xac, 0xce, 0x14, 0xc2, 0xa1, 0x84, 0x63, 0xc2, 0x47, 0xfc, 0x3f, 0x11, 0x5c, 0xd8, 0x02, 0xcf,
+	0x68, 0x34, 0x33, 0x08, 0x95, 0x6f, 0xe3, 0xb1, 0xef, 0x62, 0xe2, 0x60, 0x0d, 0x68, 0x64, 0x00,
+	0x43, 0x3c, 0x64, 0x94, 0x06, 0x53, 0x02, 0x46, 0xee, 0xa0, 0x0c, 0x4f, 0x62, 0xe9, 0x53, 0x4a,
+	0x4f, 0x03, 0xdc, 0x56, 0xd1, 0x60, 0x74, 0xd2, 0x16, 0xfe, 0x10, 0x73, 0x61, 0x0f, 0x59, 0x04,
+	0xd8, 0x39, 0x86, 0x7a, 0x5f, 0x2e, 0x1c, 0x1a, 0xbc, 0xc2, 0x21, 0xf7, 0x29, 0x41, 0x37, 0x61,
+	0x81, 0x75, 0x98, 0x51, 0xdc, 0x2e, 0xee, 0x2e, 0x76, 0x57, 0x2e, 0x2f, 0x9a, 0x0b, 0xfd, 0x4e,
+	0xdf, 0x94, 0x39, 0xb4, 0x09, 0x4b, 0xca, 0x06, 0xa3, 0x24, 0x37, 0xcd, 0x28, 0x40, 0xeb, 0xb0,
+	0x60, 0x33, 0x66, 0x2c, 0xa8, 0x9c, 0x5c, 0xee, 0xfc, 0x55, 0x82, 0xf2, 0x0b, 0xea, 0xe2, 0x03,
+	0x72, 0x42, 0x51, 0x1f, 0xd6, 0x99, 0x7e, 0x84, 0x35, 0x8e, 0x9e, 0xa1, 0xc4, 0xab, 0x9d, 0x66,
+	0x6b, 0xba, 0x0b, 0xad, 0x5c, 0x29, 0xdd, 0xc5, 0xb7, 0x17, 0xcd, 0x82, 0x59, 0x67, 0xb9, 0x0a,
+	0xef, 0xc2, 0x0a, 0xa1, 0x2e, 0xb6, 0x7c, 0x57, 0x15, 0x52, 0xe9, 0xc2, 0xe5, 0x45, 0x73, 0x59,
+	0x3d, 0xf0, 0x89, 0xb9, 0x2c, 0xb7, 0x0e, 0x5c, 0xd4, 0x84, 0x6a, 0xe0, 0x73, 0x81, 0x89, 0x65,
+	0xbb, 0x6e, 0xa8, 0xaa, 0xab, 0x98, 0x10, 0xa5, 0x1e, 0xbb, 0x6e, 0x88, 0x0c, 0x58, 0x21, 0x58,
+	0xbc, 0xa6, 0xe1, 0x99, 0xb1, 0xa8, 0x36, 0xe3, 0x50, 0xee, 0xc4, 0x85, 0x2e, 0x45, 0x3b, 0x3a,
+	0x44, 0x5b, 0x50, 0x76, 0x3c, 0x9b, 0x10, 0x1c, 0x70, 0x63, 0x79, 0xbb, 0xb8, 0xbb, 0x6a, 0x26,
+	0xb1, 0x64, 0x0d, 0x29, 0xf1, 0xcf, 0x70, 0x68, 0xac, 0x44, 0x2c, 0x1d, 0xa2, 0xaf, 0x61, 0x89,
+	0x0a, 0x0f, 0x87, 0x46, 0x59, 0x1d, 0xfb, 0x4e, 0xfe, 0xd8, 0xb1, 0x55, 0x2f, 0x25, 0x48, 0x1f,
+	0x3a, 0x62, 0xa0, 0x06, 0x54, 0x59, 0x48, 0x2d, 0x31, 0xb1, 0x3c, 0x9b, 0x7b, 0x46, 0x45, 0x3d,
+	0xb3, 0xc2, 0x42, 0x7a, 0x3c, 0xe9, 0xd9, 0xdc, 0xdb, 0xf9, 0x09, 0x6a, 0x53, 0x6c, 0x74, 0x13,
+	0xca, 0x62, 0x62, 0xf9, 0xc4, 0xc5, 0x13, 0xe5, 0x72, 0xc5, 0x5c, 0x11, 0x93, 0x03, 0x19, 0xa2,
+	0x36, 0x54, 0x43, 0xe6, 0x28, 0x3b, 0x30, 0xe7, 0xda, 0xba, 0xb5, 0xcb, 0x8b, 0x26, 0x98, 0xfd,
+	0xbd, 0xc7, 0x51, 0xd6, 0x84, 0x90, 0x39, 0x7a, 0xbd, 0xf3, 0x77, 0x11, 0xca, 0x7d, 0x8c, 0x43,
+	0xd5, 0xc6, 0xeb, 0x50, 0xf2, 0xdd, 0x48, 0xb2, 0xbb, 0x7c, 0x79, 0xd1, 0x2c, 0x1d, 0x3c, 0x31,
+	0x4b, 0xbe, 0x8b, 0xba, 0xb0, 0xaa, 0x15, 0x2d, 0x9f, 0x9c, 0x50, 0xa3, 0xb4, 0xbd, 0x70, 0x65,
+	0x6b, 0x31, 0x0e, 0xb5, 0xae, 0x94, 0x33, 0xab, 0x76, 0x1a, 0xa0, 0x67, 0xb0, 0x16, 0xd8, 0x5c,
+	0x58, 0x0e, 0x25, 0x04, 0x3b, 0x02, 0xbb, 0xaa, 0x5d, 0xd5, 0xce, 0x56, 0x2b, 0x9a, 0xdf, 0x56,
+	0x3c, 0xbf, 0xad, 0xe3, 0x78, 0x7e, 0xbb, 0x8b, 0x6f, 0xfe, 0x68, 0x16, 0xcd, 0x9a, 0xe4, 0xed,
+	0xc5, 0x34, 0xd9, 0x1f, 0x9f, 0xd8, 0x8e, 0xf0, 0xc7, 0x58, 0x35, 0xb5, 0x6c, 0x26, 0x71, 0xde,
+	0xca, 0xa5, 0xbc, 0x95, 0xff, 0x14, 0xa1, 0x9e, 0xab, 0x52, 0xf6, 0x34, 0xb6, 0x4b, 0x9b, 0xa9,
+	0x43, 0x74, 0x08, 0x1b, 0xaa, 0x64, 0xd7, 0xb7, 0x03, 0x8b, 0x8f, 0x1c, 0x27, 0xb6, 0xf4, 0x63,
+	0xaa, 0xae, 0x4b, 0xea, 0x13, 0xdf, 0x0e, 0x8e, 0x22, 0xe2, 0xb4, 0xda, 0x89, 0xed, 0x07, 0xa3,
+	0x10, 0x7f, 0xb4, 0x07, 0x89, 0xda, 0xd3, 0x88, 0x88, 0xee, 0x42, 0x2d, 0x2b, 0xc4, 0x95, 0x15,
+	0x35, 0x73, 0xd5, 0x4d, 0x31, 0x7c, 0xe7, 0x36, 0x2c, 0xee, 0x3b, 0x1e, 0x95, 0xbf, 0xe9, 0xb1,
+	0x1d, 0x8c, 0xb0, 0x3e, 0x60, 0x14, 0xec, 0xfc, 0xb6, 0x01, 0xe5, 0x7d, 0x32, 0xc6, 0x01, 0x65,
+	0x18, 0xf5, 0x00, 0x6c, 0x21, 0x42, 0x7f, 0x30, 0x12, 0x58, 0x1a, 0x21, 0x1b, 0xbc, 0x9b, 0x6f,
+	0x70, 0x8c, 0x6e, 0x3d, 0x4e, 0xa0, 0xfb, 0x44, 0x84, 0xe7, 0x66, 0x86, 0x8b, 0xbe, 0x80, 0x45,
+	0xec, 0x78, 0x54, 0x1b, 0xb5, 0x39, 0xa3, 0xe1, 0x78, 0xb4, 0x57, 0x30, 0x15, 0x06, 0x3d, 0x84,
+	0x2a, 0xc3, 0x13, 0x2b, 0xc4, 0xbf, 0x8e, 0x30, 0x17, 0x89, 0x1b, 0x33, 0x73, 0x35, 0x31, 0x23,
+	0x44, 0xaf, 0x60, 0x02, 0x4b, 0x22, 0xf4, 0x08, 0x56, 0x23, 0x3a, 0x67, 0xf2, 0x5e, 0x56, 0x1e,
+	0x54, 0x3b, 0xb7, 0xae, 0xe4, 0x47, 0x90, 0x5e, 0xc1, 0xac, 0xb2, 0x34, 0x44, 0xf7, 0xa1, 0x1c,
+	0x5f, 0xc4, 0x6a, 0x5a, 0x72, 0x4f, 0x8f, 0x6e, 0xe0, 0x7d, 0x8d, 0xe8, 0x15, 0xcc, 0x04, 0x8d,
+	0x1e, 0x40, 0x55, 0xdf, 0xd3, 0x96, 0x98, 0x44, 0x37, 0x45, 0xb5, 0x73, 0x23, 0x4b, 0xd6, 0xdb,
+	0xad, 0xe3, 0x09, 0x97, 0x75, 0xeb, 0xf0, 0x78, 0xc2, 0xd1, 0x01, 0xd4, 0xd4, 0xb5, 0x9a, 0x1c,
+	0x7c, 0x45, 0xb1, 0x77, 0xb2, 0xec, 0xe4, 0x5d, 0xd4, 0xea, 0xca, 0x55, 0x6a, 0xc0, 0xea, 0x20,
+	0x13, 0xa3, 0x23, 0xd8, 0x20, 0xd4, 0x8a, 0xd5, 0xb4, 0x0f, 0xd1, 0x1d, 0xf4, 0xe9, 0xd5, 0x72,
+	0x2f, 0xa8, 0x16, 0x4c, 0x1c, 0xa9, 0x93, 0xe9, 0x14, 0x3a, 0x84, 0xb5, 0x9c, 0x62, 0x45, 0x29,
+	0xde, 0x9d, 0x5b, 0x60, 0xa2, 0x57, 0x1b, 0xe4, 0xd5, 0xe4, 0x4b, 0x71, 0xc4, 0x93, 0xe3, 0xc2,
+	0x3c, 0xb5, 0x23, 0x85, 0x4d, 0xcf, 0x5b, 0xe3, 0xd9, 0x04, 0x7a, 0x09, 0xf5, 0x44, 0x4d, 0x17,
+	0x57, 0x55, 0x72, 0x9f, 0xcc, 0x97, 0x4b, 0xaa, 0x5b, 0xe3, 0x53, 0x19, 0xf4, 0x1d, 0x6c, 0x70,
+	0x62, 0x33, 0xee, 0x51, 0x91, 0x56, 0xb8, 0xaa, 0x24, 0x3f, 0xcb, 0x4a, 0x26, 0x2f, 0xf6, 0xd6,
+	0x51, 0x0c, 0x4f, 0x8b, 0x5c, 0xe7, 0xb9, 0x1c, 0xfa, 0x1e, 0x50, 0x56, 0x56, 0x97, 0x5a, 0x53,
+	0xba, 0x9f, 0x7f, 0x50, 0x37, 0xa9, 0x76, 0x83, 0xe7, 0x93, 0x72, 0x7a, 0x1c, 0x6f, 0x44, 0xd2,
+	0xe9, 0x59, 0x9b, 0x9d, 0x9e, 0x54, 0x74, 0x4f, 0x42, 0x33, 0xd3, 0xe3, 0x64, 0x62, 0xd9, 0x9a,
+	0x58, 0x4a, 0x17, 0x58, 0x9f, 0x6d, 0xcd, 0x8c, 0x56, 0xda, 0x68, 0x27, 0x9b, 0x40, 0x3f, 0xc0,
+	0xb5, 0xc0, 0x3f, 0xf5, 0x84, 0x35, 0x3d, 0xdc, 0xeb, 0xf3, 0xce, 0x7c, 0x28, 0x09, 0xb9, 0x09,
+	0xdf, 0x08, 0xf2, 0x49, 0xf4, 0x33, 0x6c, 0x4e, 0x4b, 0xeb, 0x72, 0x37, 0x94, 0xf6, 0xee, 0x87,
+	0xb5, 0x93, 0x9a, 0x51, 0x30, 0x93, 0x95, 0x36, 0x30, 0x3b, 0xb4, 0x87, 0x69, 0xff, 0xd1, 0x3c,
+	0x1b, 0xfa, 0x0a, 0x9b, 0x99, 0x50, 0x96, 0x4d, 0xc8, 0x09, 0x4d, 0xd4, 0x74, 0x99, 0xd7, 0x66,
+	0x27, 0x74, 0x56, 0x2e, 0x9d, 0x50, 0x36, 0x95, 0x41, 0xdf, 0xc2, 0x1a, 0xc1, 0xaf, 0xad, 0x90,
+	0x8e, 0x88, 0x6b, 0x71, 0x81, 0x99, 0xb1, 0x39, 0xdb, 0xf1, 0xe4, 0xcb, 0xb4, 0xf5, 0x02, 0xbf,
+	0x36, 0x25, 0xf4, 0x48, 0x60, 0x26, 0x3b, 0x4e, 0x32, 0x31, 0x7a, 0x0e, 0x75, 0xa9, 0x35, 0xb6,
+	0x03, 0xdf, 0x8d, 0xcc, 0x34, 0xfe, 0x37, 0x7b, 0xd6, 0x29, 0xb1, 0x57, 0x12, 0xab, 0x0c, 0x93,
+	0x67, 0x25, 0xd9, 0x04, 0xfa, 0x06, 0xca, 0x2c, 0xa4, 0x8c, 0x72, 0x3b, 0x30, 0xae, 0x2b, 0x9d,
+	0xc6, 0xd5, 0x3a, 0x7d, 0x8d, 0x92, 0x77, 0x68, 0xcc, 0x40, 0x4f, 0x61, 0x35, 0x5e, 0x5b, 0x8c,
+	0x06, 0xc6, 0x0d, 0xa5, 0xf0, 0xff, 0xf9, 0x0a, 0xfd, 0x97, 0x87, 0xea, 0x16, 0x8f, 0x43, 0x1a,
+	0xa0, 0x47, 0x00, 0xd1, 0x5c, 0x30, 0x3b, 0x14, 0x86, 0x31, 0xfb, 0xe1, 0x99, 0xaa, 0xa8, 0xb2,
+	0xfb, 0x76, 0x28, 0xfb, 0x56, 0x19, 0xc4, 0x01, 0xfa, 0x12, 0x16, 0xc7, 0x54, 0x60, 0xe3, 0xe6,
+	0xec, 0x3b, 0x20, 0xe5, 0xbe, 0xa2, 0x42, 0xb6, 0x47, 0x21, 0xd1, 0x03, 0x28, 0x7b, 0x36, 0xb7,
+	0x14, 0x6b, 0x6b, 0xf6, 0x9b, 0x2f, 0x65, 0xf5, 0x6c, 0xae, 0x89, 0x2b, 0x5e, 0xb4, 0x94, 0x0d,
+	0x95, 0x3c, 0x8b, 0x63, 0x61, 0x0d, 0xed, 0x5f, 0x3a, 0xf7, 0x8c, 0x5b, 0xf3, 0x1a, 0x2a, 0x39,
+	0x47, 0x58, 0x3c, 0x97, 0x48, 0xd9, 0xd0, 0x71, 0x26, 0x46, 0xcf, 0xa0, 0x96, 0x68, 0x0d, 0x7c,
+	0xc1, 0x8d, 0xdb, 0xf3, 0x4c, 0xd4, 0x52, 0x5d, 0x5f, 0xc8, 0x77, 0x52, 0x75, 0x9c, 0x86, 0xe8,
+	0x2b, 0x58, 0x76, 0xe8, 0x70, 0xe8, 0x0b, 0xe3, 0x8e, 0x52, 0xb8, 0x7d, 0xb5, 0xc2, 0x9e, 0xc2,
+	0xf4, 0x0a, 0xa6, 0x46, 0x4b, 0xf3, 0xa5, 0x11, 0x9a, 0xdb, 0x98, 0x67, 0x7e, 0xcf, 0xe6, 0x09,
+	0xbd, 0xe2, 0xc5, 0xc1, 0xd6, 0x43, 0xa8, 0xe7, 0x3e, 0x28, 0xe4, 0xff, 0x8d, 0x33, 0x7c, 0xae,
+	0xbf, 0x57, 0xe4, 0x32, 0xfd, 0x86, 0x29, 0x65, 0xbe, 0x61, 0x1e, 0x94, 0xee, 0x17, 0xbb, 0x4b,
+	0xb0, 0xc0, 0x47, 0xc3, 0xee, 0xe1, 0xdb, 0xcb, 0x46, 0xf1, 0xdd, 0x65, 0xa3, 0xf8, 0xe7, 0x65,
+	0xa3, 0xf8, 0xe6, 0x7d, 0xa3, 0xf0, 0xee, 0x7d, 0xa3, 0xf0, 0xfb, 0xfb, 0x46, 0xe1, 0xc7, 0xce,
+	0xa9, 0x2f, 0xbc, 0xd1, 0xa0, 0xe5, 0xd0, 0x61, 0xdb, 0xb5, 0xb9, 0xc7, 0xec, 0xf3, 0x76, 0x54,
+	0x9f, 0x8c, 0xa2, 0x3f, 0x4e, 0xed, 0xe9, 0xff, 0x57, 0x83, 0x65, 0x95, 0xbd, 0xf7, 0x6f, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x5d, 0xf9, 0xc2, 0xa1, 0x61, 0x0e, 0x00, 0x00,
 }
 
 func (m *ProtocolVersion) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/p2p/types.proto b/proto/tendermint/p2p/types.proto
index 5c8d2fa7ce..9baa663eca 100644
--- a/proto/tendermint/p2p/types.proto
+++ b/proto/tendermint/p2p/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.p2p;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/p2p";
 
 import "gogoproto/gogo.proto";
 import "tendermint/blocksync/types.proto";
diff --git a/proto/tendermint/privval/service.pb.go b/proto/tendermint/privval/service.pb.go
index 59ace7536a..7b0d696549 100644
--- a/proto/tendermint/privval/service.pb.go
+++ b/proto/tendermint/privval/service.pb.go
@@ -27,26 +27,27 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 func init() { proto.RegisterFile("tendermint/privval/service.proto", fileDescriptor_7afe74f9f46d3dc9) }
 
 var fileDescriptor_7afe74f9f46d3dc9 = []byte{
-	// 304 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x4a, 0xc3, 0x40,
-	0x14, 0x85, 0x5b, 0x04, 0xd1, 0xa1, 0x0b, 0x99, 0x65, 0x17, 0x83, 0xff, 0x42, 0x85, 0x04, 0x74,
-	0xe5, 0x52, 0x37, 0x55, 0xdc, 0x84, 0xb6, 0x54, 0xd0, 0x55, 0x7e, 0x2e, 0xcd, 0x40, 0x92, 0x1b,
-	0x67, 0x6e, 0x82, 0x7d, 0x0b, 0x1f, 0xcb, 0x65, 0x97, 0x2e, 0x25, 0x79, 0x01, 0x1f, 0x41, 0x6a,
-	0x32, 0x54, 0x6d, 0xa2, 0x6e, 0xe7, 0x7c, 0xe7, 0x3b, 0xb3, 0xb8, 0x6c, 0x97, 0x20, 0x09, 0x40,
-	0xc5, 0x32, 0x21, 0x3b, 0x55, 0x32, 0xcf, 0xdd, 0xc8, 0xd6, 0xa0, 0x72, 0xe9, 0x83, 0x95, 0x2a,
-	0x24, 0xe4, 0x7c, 0x45, 0x58, 0x35, 0xd1, 0x17, 0x0d, 0x2d, 0x9a, 0xa7, 0xa0, 0xab, 0xce, 0xd9,
-	0xfb, 0x06, 0xdb, 0x71, 0x94, 0xcc, 0xa7, 0x6e, 0x24, 0x03, 0x97, 0x50, 0x5d, 0x3a, 0x37, 0x7c,
-	0xc4, 0xb6, 0x87, 0x40, 0x4e, 0xe6, 0xdd, 0xc2, 0x9c, 0xef, 0x59, 0xeb, 0x5a, 0xab, 0xca, 0x46,
-	0xf0, 0x98, 0x81, 0xa6, 0xfe, 0xfe, 0x6f, 0x88, 0x4e, 0x31, 0xd1, 0xc0, 0x1f, 0x58, 0x6f, 0xe9,
-	0x54, 0x38, 0x79, 0xba, 0x76, 0x75, 0xc8, 0x0f, 0x1b, 0x3b, 0x26, 0x36, 0xe6, 0xa3, 0x3f, 0xa8,
-	0x5a, 0x1e, 0x33, 0x3e, 0x04, 0x9a, 0x84, 0x0a, 0x74, 0x88, 0x51, 0x50, 0xff, 0x7c, 0xd0, 0x54,
-	0xfe, 0x01, 0x99, 0xa1, 0xd3, 0x7f, 0xb1, 0xf5, 0xdc, 0x1d, 0xdb, 0x1a, 0xcb, 0x59, 0x32, 0x45,
-	0x02, 0x7e, 0xd0, 0x54, 0x34, 0xa9, 0xb1, 0x1f, 0xb7, 0x41, 0x10, 0x54, 0x58, 0x2d, 0xf6, 0x59,
-	0x6f, 0xf9, 0xea, 0x28, 0x4c, 0x51, 0xbb, 0x11, 0x3f, 0x69, 0xeb, 0x19, 0xc2, 0x0c, 0x0c, 0xda,
-	0x07, 0x56, 0x68, 0x35, 0x72, 0x35, 0x7e, 0x29, 0x44, 0x77, 0x51, 0x88, 0xee, 0x5b, 0x21, 0xba,
-	0xcf, 0xa5, 0xe8, 0x2c, 0x4a, 0xd1, 0x79, 0x2d, 0x45, 0xe7, 0xfe, 0x62, 0x26, 0x29, 0xcc, 0x3c,
-	0xcb, 0xc7, 0xd8, 0xfe, 0x72, 0x37, 0xdf, 0x4e, 0x08, 0x09, 0xed, 0xf5, 0x9b, 0xf2, 0x36, 0x3f,
-	0x93, 0xf3, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd8, 0xfe, 0xa1, 0xc7, 0xa6, 0x02, 0x00, 0x00,
+	// 309 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4f, 0x4b, 0xc3, 0x30,
+	0x18, 0xc6, 0x57, 0x04, 0xd1, 0xb0, 0x83, 0xe4, 0xb8, 0x43, 0xf0, 0xbf, 0x30, 0xa1, 0x01, 0x05,
+	0xef, 0x7a, 0x99, 0xe2, 0xa5, 0xcc, 0x31, 0x41, 0x4f, 0x69, 0xfb, 0xb2, 0x06, 0xda, 0x26, 0x26,
+	0x69, 0xb1, 0xdf, 0xc2, 0x8f, 0xe5, 0x71, 0x47, 0x8f, 0xd2, 0x7e, 0x01, 0x3f, 0x82, 0x74, 0x6d,
+	0x18, 0xb8, 0x56, 0x3d, 0xb6, 0xcf, 0xef, 0xf9, 0x3d, 0x39, 0xbc, 0x68, 0xdf, 0x40, 0x1a, 0x82,
+	0x4a, 0x78, 0x6a, 0xa8, 0x54, 0x3c, 0xcf, 0x59, 0x4c, 0x35, 0xa8, 0x9c, 0x07, 0xe0, 0x4a, 0x25,
+	0x8c, 0xc0, 0x78, 0x4d, 0xb8, 0x2d, 0x31, 0x22, 0x1d, 0x2d, 0x53, 0x48, 0xd0, 0x4d, 0xe7, 0xe2,
+	0x6b, 0x0b, 0xed, 0x79, 0x8a, 0xe7, 0x73, 0x16, 0xf3, 0x90, 0x19, 0xa1, 0xae, 0xbd, 0x3b, 0x3c,
+	0x45, 0xbb, 0x13, 0x30, 0x5e, 0xe6, 0xdf, 0x43, 0x81, 0x0f, 0xdc, 0x4d, 0xad, 0xdb, 0x64, 0x53,
+	0x78, 0xc9, 0x40, 0x9b, 0xd1, 0xe1, 0x6f, 0x88, 0x96, 0x22, 0xd5, 0x80, 0x9f, 0xd1, 0xb0, 0x76,
+	0x2a, 0x31, 0x7b, 0xbd, 0x65, 0x3a, 0xc2, 0xc7, 0x9d, 0x1d, 0x1b, 0x5b, 0xf3, 0xc9, 0x1f, 0x54,
+	0x2b, 0x4f, 0x10, 0x9e, 0x80, 0x99, 0x45, 0x0a, 0x74, 0x24, 0xe2, 0xb0, 0x7d, 0xf9, 0xb8, 0xab,
+	0xfc, 0x03, 0xb2, 0x43, 0xe7, 0xff, 0x62, 0xdb, 0xb9, 0x47, 0xb4, 0xf3, 0xc0, 0x17, 0xe9, 0x5c,
+	0x18, 0xc0, 0x47, 0x5d, 0x45, 0x9b, 0x5a, 0xfb, 0x69, 0x1f, 0x04, 0x61, 0x83, 0xb5, 0xe2, 0x00,
+	0x0d, 0xeb, 0xbf, 0x9e, 0x12, 0x52, 0x68, 0x16, 0xe3, 0xb3, 0xbe, 0x9e, 0x25, 0xec, 0xc0, 0xb8,
+	0x7f, 0x60, 0x8d, 0x36, 0x23, 0x37, 0xde, 0x7b, 0x49, 0x9c, 0x65, 0x49, 0x9c, 0xcf, 0x92, 0x38,
+	0x6f, 0x15, 0x19, 0x2c, 0x2b, 0x32, 0xf8, 0xa8, 0xc8, 0xe0, 0xe9, 0x6a, 0xc1, 0x4d, 0x94, 0xf9,
+	0x6e, 0x20, 0x12, 0x1a, 0x32, 0x1d, 0x49, 0x56, 0xd0, 0xc6, 0x5b, 0x7f, 0xd1, 0xd5, 0xc5, 0xd0,
+	0xcd, 0x83, 0xf2, 0xb7, 0x57, 0xc9, 0xe5, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0x56, 0xac,
+	0x80, 0xa3, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/tendermint/privval/service.proto b/proto/tendermint/privval/service.proto
index 4ceac5695a..07f2fc55e1 100644
--- a/proto/tendermint/privval/service.proto
+++ b/proto/tendermint/privval/service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 package tendermint.privval;
-option  go_package = "github.com/tendermint/tendermint/proto/tendermint/privval";
+option  go_package = "github.com/dashpay/tenderdash/proto/tendermint/privval";
 
 import "tendermint/privval/types.proto";
 
diff --git a/proto/tendermint/privval/types.pb.go b/proto/tendermint/privval/types.pb.go
index 540d82d094..7074783799 100644
--- a/proto/tendermint/privval/types.pb.go
+++ b/proto/tendermint/privval/types.pb.go
@@ -5,10 +5,10 @@ package privval
 
 import (
 	fmt "fmt"
+	crypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	types "github.com/dashpay/tenderdash/proto/tendermint/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	types "github.com/tendermint/tendermint/proto/tendermint/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -1034,68 +1034,68 @@ func init() {
 func init() { proto.RegisterFile("tendermint/privval/types.proto", fileDescriptor_cb4e437a5328cf9c) }
 
 var fileDescriptor_cb4e437a5328cf9c = []byte{
-	// 971 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xdd, 0x6e, 0xe3, 0x44,
-	0x14, 0xb6, 0x37, 0x49, 0x7f, 0x4e, 0xd2, 0x34, 0x9d, 0x96, 0x36, 0x8d, 0x96, 0xb4, 0x84, 0xbf,
-	0x55, 0x11, 0x09, 0x5a, 0x24, 0x24, 0xb4, 0xdc, 0x6c, 0x5b, 0x0b, 0x47, 0xd1, 0x26, 0x61, 0xe2,
-	0xb2, 0xab, 0x95, 0x90, 0x95, 0x9f, 0xc1, 0x31, 0xdb, 0x78, 0x66, 0x3d, 0x76, 0xb5, 0xb9, 0xe6,
-	0x8e, 0x2b, 0xa4, 0xbd, 0xe3, 0x09, 0x10, 0x4f, 0xc0, 0x23, 0xec, 0xe5, 0x5e, 0x72, 0x85, 0x50,
-	0xfb, 0x22, 0xc8, 0xe3, 0x89, 0xe3, 0xc4, 0x0e, 0x2c, 0x2a, 0x88, 0x3b, 0xcf, 0x39, 0x33, 0xdf,
-	0xf9, 0x7c, 0xbe, 0x73, 0x66, 0x0e, 0x54, 0x3d, 0xe2, 0x8c, 0x88, 0x3b, 0xb1, 0x1d, 0xaf, 0xc1,
-	0x5c, 0xfb, 0xea, 0xaa, 0x7f, 0xd9, 0xf0, 0xa6, 0x8c, 0xf0, 0x3a, 0x73, 0xa9, 0x47, 0x11, 0x9a,
-	0xfb, 0xeb, 0xd2, 0x5f, 0xb9, 0x1b, 0x3b, 0x33, 0x74, 0xa7, 0xcc, 0xa3, 0x8d, 0x67, 0x64, 0x2a,
-	0x4f, 0x2c, 0x78, 0x05, 0x52, 0x1c, 0xaf, 0xb2, 0x67, 0x51, 0x8b, 0x8a, 0xcf, 0x46, 0xf0, 0x15,
-	0x5a, 0x6b, 0x4d, 0xd8, 0xc1, 0x64, 0x42, 0x3d, 0xd2, 0xb3, 0x2d, 0x87, 0xb8, 0x9a, 0xeb, 0x52,
-	0x17, 0x21, 0xc8, 0x0e, 0xe9, 0x88, 0x94, 0xd5, 0x63, 0xf5, 0x5e, 0x0e, 0x8b, 0x6f, 0x74, 0x0c,
-	0xf9, 0x11, 0xe1, 0x43, 0xd7, 0x66, 0x9e, 0x4d, 0x9d, 0xf2, 0x9d, 0x63, 0xf5, 0xde, 0x26, 0x8e,
-	0x9b, 0x6a, 0x2d, 0xd8, 0xea, 0xfa, 0x83, 0x16, 0x99, 0x62, 0xf2, 0xdc, 0x27, 0xdc, 0x43, 0x87,
-	0xb0, 0x31, 0x1c, 0xf7, 0x6d, 0xc7, 0xb4, 0x47, 0x02, 0x6a, 0x13, 0xaf, 0x8b, 0x75, 0x73, 0x84,
-	0x8e, 0x20, 0xff, 0xdc, 0xa7, 0xae, 0x3f, 0x31, 0xc7, 0x7d, 0x3e, 0x16, 0x68, 0x05, 0x0c, 0xa1,
-	0x49, 0xef, 0xf3, 0x71, 0xcd, 0x80, 0x7d, 0x63, 0xec, 0x12, 0x3e, 0xa6, 0x97, 0xa3, 0x7f, 0x0f,
-	0xf5, 0x63, 0x28, 0x75, 0x5d, 0x6a, 0xbc, 0x08, 0x16, 0x7f, 0x8f, 0x57, 0xfb, 0x41, 0x85, 0xe2,
-	0x2c, 0x38, 0x67, 0xd4, 0xe1, 0x04, 0x3d, 0x80, 0x75, 0xe6, 0x0f, 0xcc, 0x67, 0x64, 0x2a, 0x36,
-	0xe7, 0xef, 0xdf, 0xad, 0xc7, 0x74, 0x0a, 0x35, 0xa9, 0x77, 0xfd, 0xc1, 0xa5, 0x3d, 0x6c, 0x91,
-	0xe9, 0x69, 0xf6, 0xd5, 0xef, 0x47, 0x0a, 0x5e, 0x63, 0x02, 0x04, 0x3d, 0x80, 0x1c, 0x09, 0x12,
-	0x2c, 0x98, 0xe5, 0xef, 0xbf, 0x5f, 0x4f, 0x4a, 0x5c, 0x4f, 0xa8, 0x81, 0xc3, 0x33, 0xb5, 0x97,
-	0x2a, 0x1c, 0x24, 0x52, 0xf2, 0xbf, 0xb3, 0x62, 0xb0, 0x13, 0xcb, 0xa8, 0xa4, 0x53, 0x85, 0x3c,
-	0x73, 0xa9, 0xe9, 0xbd, 0x08, 0x75, 0x50, 0x85, 0x0e, 0x9b, 0x6c, 0xb6, 0xef, 0x76, 0x11, 0x7f,
-	0x52, 0x61, 0x3b, 0x30, 0x7f, 0x4d, 0x3d, 0x32, 0xd3, 0xf0, 0x04, 0xb2, 0x57, 0xd4, 0x23, 0xf2,
-	0xe7, 0xf7, 0xe3, 0x78, 0x61, 0x0b, 0x88, 0xcd, 0x62, 0xcf, 0x82, 0xde, 0x77, 0x56, 0xd5, 0x4f,
-	0x70, 0xaa, 0x9c, 0x11, 0xe5, 0x2f, 0xeb, 0xc7, 0x98, 0x32, 0xb2, 0x5c, 0x60, 0xd9, 0x44, 0x81,
-	0x7d, 0xaf, 0x02, 0x12, 0x9c, 0x47, 0x21, 0x3d, 0x99, 0x90, 0x4f, 0xde, 0x84, 0x9f, 0x94, 0x25,
-	0x64, 0x79, 0xab, 0x14, 0xfd, 0xa2, 0xc2, 0x6e, 0x60, 0xee, 0xba, 0x94, 0x51, 0xde, 0xbf, 0x9c,
-	0xa5, 0xe9, 0x33, 0xd8, 0x60, 0xd2, 0x24, 0xa9, 0x54, 0x92, 0x54, 0xa2, 0x43, 0xd1, 0xde, 0xff,
-	0x36, 0x65, 0x2f, 0x55, 0xd8, 0x0f, 0x53, 0x36, 0xa7, 0x2b, 0xd3, 0xf6, 0xc5, 0x3f, 0xe1, 0x2b,
-	0xd3, 0x37, 0x67, 0x7d, 0xab, 0x14, 0x6e, 0x41, 0xbe, 0x6b, 0x3b, 0x96, 0xcc, 0x5c, 0xad, 0x08,
-	0x85, 0x70, 0x19, 0x32, 0xab, 0xfd, 0xba, 0x01, 0xeb, 0x8f, 0x08, 0xe7, 0x7d, 0x8b, 0xa0, 0x16,
-	0x6c, 0xcb, 0xe6, 0x33, 0xdd, 0x70, 0xbb, 0x24, 0xfb, 0x4e, 0x5a, 0xc4, 0x85, 0xcb, 0x4c, 0x57,
-	0xf0, 0x16, 0x5b, 0xb8, 0xdd, 0xda, 0x50, 0x9a, 0x83, 0x85, 0xc1, 0x24, 0xff, 0xda, 0x5f, 0xa1,
-	0x85, 0x3b, 0x75, 0x05, 0x17, 0xd9, 0xe2, 0xcd, 0xf0, 0x15, 0xec, 0x70, 0xdb, 0x72, 0xcc, 0xa0,
-	0xa8, 0x22, 0x7a, 0x19, 0x01, 0xf8, 0x6e, 0x1a, 0xe0, 0x52, 0x67, 0xe9, 0x0a, 0xde, 0xe6, 0x4b,
-	0xcd, 0xf6, 0x14, 0xf6, 0xb8, 0xd0, 0x6b, 0x06, 0x2a, 0x69, 0x66, 0x05, 0xea, 0x07, 0xab, 0x50,
-	0x17, 0x5b, 0x42, 0x57, 0x30, 0xe2, 0xc9, 0x46, 0xf9, 0x06, 0xde, 0x12, 0x74, 0x67, 0x22, 0x46,
-	0x94, 0x73, 0x02, 0xfc, 0xc3, 0x55, 0xe0, 0x4b, 0x95, 0xae, 0x2b, 0x78, 0x97, 0xa7, 0x34, 0xc0,
-	0xb7, 0x50, 0x96, 0xd4, 0x63, 0x01, 0x24, 0xfd, 0x35, 0x11, 0xe1, 0x64, 0x35, 0xfd, 0xe5, 0xf2,
-	0xd4, 0x15, 0xbc, 0xcf, 0xd3, 0x0b, 0xf7, 0x1c, 0x0a, 0xcc, 0x76, 0xac, 0x88, 0xfd, 0xba, 0xc0,
-	0x3e, 0x4a, 0x55, 0x70, 0x5e, 0x65, 0xba, 0x82, 0xf3, 0x6c, 0xbe, 0x44, 0x5f, 0xc2, 0x96, 0x44,
-	0x91, 0x14, 0x37, 0x04, 0xcc, 0xf1, 0x6a, 0x98, 0x88, 0x58, 0x81, 0xc5, 0xd6, 0xe8, 0x02, 0x76,
-	0x63, 0xf7, 0x71, 0xc4, 0x6a, 0x53, 0xc0, 0xbd, 0x97, 0x0a, 0xb7, 0xf4, 0x4a, 0xea, 0x0a, 0x2e,
-	0xb1, 0xe5, 0x97, 0xf3, 0x09, 0xec, 0x2d, 0xc2, 0x4a, 0x9a, 0xb0, 0xba, 0xdf, 0x12, 0x6f, 0x85,
-	0xae, 0xe0, 0x1d, 0x96, 0x78, 0x40, 0x2c, 0x38, 0xf4, 0x66, 0x4f, 0x9d, 0xb9, 0xdc, 0x5c, 0xf9,
-	0xd5, 0x42, 0xa5, 0x8f, 0x0c, 0x81, 0x50, 0x5e, 0xfa, 0x30, 0xf1, 0x1d, 0x54, 0xd2, 0x02, 0xc9,
-	0x1f, 0x29, 0x88, 0x48, 0x1f, 0xbd, 0x51, 0xa4, 0xe8, 0x77, 0x0e, 0xbc, 0x74, 0xd7, 0x69, 0x0e,
-	0x32, 0xdc, 0x9f, 0xd4, 0x4c, 0x28, 0x3e, 0xf4, 0xbd, 0x71, 0xcf, 0xb6, 0x66, 0x17, 0xc8, 0xad,
-	0x5e, 0xef, 0x12, 0x64, 0xb8, 0x6d, 0xc9, 0x59, 0x27, 0xf8, 0x3c, 0xf9, 0x59, 0x85, 0x35, 0x71,
-	0x97, 0x71, 0x84, 0xa0, 0xa8, 0x61, 0xdc, 0xc1, 0x3d, 0xf3, 0xa2, 0xdd, 0x6a, 0x77, 0x1e, 0xb7,
-	0x4b, 0x0a, 0xaa, 0x42, 0x25, 0xb2, 0x69, 0x4f, 0xba, 0xda, 0x99, 0xa1, 0x9d, 0x9b, 0x58, 0xeb,
-	0x75, 0x3b, 0xed, 0x9e, 0x56, 0x52, 0x51, 0x19, 0xf6, 0xa4, 0xbf, 0xdd, 0x31, 0xcf, 0x3a, 0xed,
-	0xb6, 0x76, 0x66, 0x34, 0x3b, 0xed, 0xd2, 0x1d, 0xf4, 0x36, 0x1c, 0x4a, 0xcf, 0xdc, 0x6c, 0x1a,
-	0xcd, 0x47, 0x5a, 0xe7, 0xc2, 0x28, 0x65, 0xd0, 0x01, 0xec, 0x4a, 0x37, 0xd6, 0x1e, 0x9e, 0x47,
-	0x8e, 0x6c, 0x0c, 0xf1, 0x31, 0x6e, 0x1a, 0x5a, 0xe4, 0xc9, 0x9d, 0xf6, 0x5e, 0x5d, 0x57, 0xd5,
-	0xd7, 0xd7, 0x55, 0xf5, 0x8f, 0xeb, 0xaa, 0xfa, 0xe3, 0x4d, 0x55, 0x79, 0x7d, 0x53, 0x55, 0x7e,
-	0xbb, 0xa9, 0x2a, 0x4f, 0x3f, 0xb7, 0x6c, 0x6f, 0xec, 0x0f, 0xea, 0x43, 0x3a, 0x69, 0xc4, 0xc7,
-	0xda, 0xf8, 0xcc, 0x1c, 0x8c, 0xb2, 0xc9, 0x21, 0x7a, 0xb0, 0x26, 0x3c, 0x9f, 0xfe, 0x19, 0x00,
-	0x00, 0xff, 0xff, 0x20, 0x29, 0xf7, 0xf6, 0x61, 0x0b, 0x00, 0x00,
+	// 976 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcd, 0x6e, 0xdb, 0x46,
+	0x10, 0x26, 0x23, 0xc9, 0x3f, 0x23, 0x59, 0x96, 0xd7, 0xae, 0x2d, 0x0b, 0xa9, 0xec, 0xaa, 0x7f,
+	0x81, 0x8b, 0x4a, 0x45, 0x0a, 0xe4, 0x92, 0x5e, 0x62, 0x9b, 0x28, 0x05, 0x21, 0x92, 0xba, 0x92,
+	0x9b, 0x20, 0x40, 0x41, 0xe8, 0x67, 0x4b, 0xb2, 0xb1, 0xb8, 0x1b, 0x2e, 0x69, 0x44, 0xe7, 0xde,
+	0x7a, 0x2a, 0x90, 0x5b, 0x9f, 0xa0, 0xe8, 0x13, 0xf4, 0x11, 0x72, 0xcc, 0xb1, 0xa7, 0xa2, 0xb0,
+	0x5f, 0xa4, 0xe0, 0x72, 0x45, 0x51, 0x22, 0xd5, 0xa6, 0x70, 0x8b, 0xde, 0xb8, 0x33, 0xb3, 0xdf,
+	0x7c, 0x9c, 0x6f, 0x66, 0x77, 0xa1, 0xea, 0x11, 0x67, 0x4c, 0xdc, 0x89, 0xed, 0x78, 0x0d, 0xe6,
+	0xda, 0x57, 0x57, 0x83, 0xcb, 0x86, 0x37, 0x65, 0x84, 0xd7, 0x99, 0x4b, 0x3d, 0x8a, 0xd0, 0xdc,
+	0x5f, 0x97, 0xfe, 0xca, 0xdd, 0xd8, 0x9e, 0x91, 0x3b, 0x65, 0x1e, 0x6d, 0x3c, 0x27, 0x53, 0xb9,
+	0x63, 0xc1, 0x2b, 0x90, 0xe2, 0x78, 0x95, 0x3d, 0x93, 0x9a, 0x54, 0x7c, 0x36, 0x82, 0xaf, 0xd0,
+	0x5a, 0x6b, 0xc2, 0x0e, 0x26, 0x13, 0xea, 0x91, 0x9e, 0x6d, 0x3a, 0xc4, 0xd5, 0x5c, 0x97, 0xba,
+	0x08, 0x41, 0x76, 0x44, 0xc7, 0xa4, 0xac, 0x1e, 0xab, 0xf7, 0x72, 0x58, 0x7c, 0xa3, 0x63, 0xc8,
+	0x8f, 0x09, 0x1f, 0xb9, 0x36, 0xf3, 0x6c, 0xea, 0x94, 0xef, 0x1c, 0xab, 0xf7, 0x36, 0x71, 0xdc,
+	0x54, 0x6b, 0xc1, 0x56, 0xd7, 0x1f, 0xb6, 0xc8, 0x14, 0x93, 0x17, 0x3e, 0xe1, 0x1e, 0x3a, 0x84,
+	0x8d, 0x91, 0x35, 0xb0, 0x1d, 0xc3, 0x1e, 0x0b, 0xa8, 0x4d, 0xbc, 0x2e, 0xd6, 0xcd, 0x31, 0x3a,
+	0x82, 0xfc, 0x0b, 0x9f, 0xba, 0xfe, 0xc4, 0xb0, 0x06, 0xdc, 0x12, 0x68, 0x05, 0x0c, 0xa1, 0x49,
+	0x1f, 0x70, 0xab, 0xd6, 0x87, 0xfd, 0xbe, 0xe5, 0x12, 0x6e, 0xd1, 0xcb, 0xf1, 0xbf, 0x87, 0xfa,
+	0x29, 0x94, 0xba, 0x2e, 0xed, 0xbf, 0x0c, 0x16, 0x7f, 0x8f, 0x57, 0xfb, 0x41, 0x85, 0xe2, 0x2c,
+	0x39, 0x67, 0xd4, 0xe1, 0x04, 0x3d, 0x84, 0x75, 0xe6, 0x0f, 0x8d, 0xe7, 0x64, 0x2a, 0x82, 0xf3,
+	0xf7, 0xef, 0xd6, 0x63, 0x3a, 0x85, 0x9a, 0xd4, 0xbb, 0xfe, 0xf0, 0xd2, 0x1e, 0xb5, 0xc8, 0xf4,
+	0x34, 0xfb, 0xfa, 0xf7, 0x23, 0x05, 0xaf, 0x31, 0x01, 0x82, 0x1e, 0x42, 0x8e, 0x04, 0x05, 0x16,
+	0xcc, 0xf2, 0xf7, 0x3f, 0xac, 0x27, 0x25, 0xae, 0x27, 0xd4, 0xc0, 0xe1, 0x9e, 0xda, 0x2b, 0x15,
+	0x0e, 0x12, 0x25, 0xf9, 0xdf, 0x59, 0x31, 0xd8, 0x89, 0x55, 0x54, 0xd2, 0xa9, 0x42, 0x9e, 0xb9,
+	0xd4, 0xf0, 0x5e, 0x86, 0x3a, 0xa8, 0x42, 0x87, 0x4d, 0x36, 0x8b, 0xbb, 0x5d, 0xc6, 0x9f, 0x54,
+	0xd8, 0x0e, 0xcc, 0x5f, 0x53, 0x8f, 0xcc, 0x34, 0x3c, 0x81, 0xec, 0x15, 0xf5, 0x88, 0xfc, 0xf9,
+	0xfd, 0x38, 0x5e, 0x38, 0x02, 0x22, 0x58, 0xc4, 0x2c, 0xe8, 0x7d, 0x67, 0x55, 0xff, 0x04, 0xbb,
+	0xca, 0x19, 0xd1, 0xfe, 0xb2, 0x7f, 0xfa, 0x53, 0x46, 0x96, 0x1b, 0x2c, 0x9b, 0x68, 0xb0, 0xef,
+	0x55, 0x40, 0x82, 0xf3, 0x38, 0xa4, 0x27, 0x0b, 0xf2, 0xd9, 0xdb, 0xf0, 0x93, 0xb2, 0x84, 0x2c,
+	0x6f, 0x55, 0xa2, 0x5f, 0x54, 0xd8, 0x0d, 0xcc, 0x5d, 0x97, 0x32, 0xca, 0x07, 0x97, 0xb3, 0x32,
+	0x3d, 0x80, 0x0d, 0x26, 0x4d, 0x92, 0x4a, 0x25, 0x49, 0x25, 0xda, 0x14, 0xc5, 0xfe, 0xb7, 0x25,
+	0x7b, 0xa5, 0xc2, 0x7e, 0x58, 0xb2, 0x39, 0x5d, 0x59, 0xb6, 0x2f, 0xfe, 0x09, 0x5f, 0x59, 0xbe,
+	0x39, 0xeb, 0x5b, 0x95, 0x70, 0x0b, 0xf2, 0x5d, 0xdb, 0x31, 0x65, 0xe5, 0x6a, 0x45, 0x28, 0x84,
+	0xcb, 0x90, 0x59, 0xed, 0xd7, 0x0d, 0x58, 0x7f, 0x4c, 0x38, 0x1f, 0x98, 0x04, 0xb5, 0x60, 0x5b,
+	0x0e, 0x9f, 0xe1, 0x86, 0xe1, 0x92, 0xec, 0x7b, 0x69, 0x19, 0x17, 0x0e, 0x33, 0x5d, 0xc1, 0x5b,
+	0x6c, 0xe1, 0x74, 0x6b, 0x43, 0x69, 0x0e, 0x16, 0x26, 0x93, 0xfc, 0x6b, 0x7f, 0x85, 0x16, 0x46,
+	0xea, 0x0a, 0x2e, 0xb2, 0xc5, 0x93, 0xe1, 0x2b, 0xd8, 0xe1, 0xb6, 0xe9, 0x18, 0x41, 0x53, 0x45,
+	0xf4, 0x32, 0x02, 0xf0, 0xfd, 0x34, 0xc0, 0xa5, 0xc9, 0xd2, 0x15, 0xbc, 0xcd, 0x97, 0x86, 0xed,
+	0x19, 0xec, 0x71, 0xa1, 0xd7, 0x0c, 0x54, 0xd2, 0xcc, 0x0a, 0xd4, 0x8f, 0x56, 0xa1, 0x2e, 0x8e,
+	0x84, 0xae, 0x60, 0xc4, 0x93, 0x83, 0xf2, 0x0d, 0xbc, 0x23, 0xe8, 0xce, 0x44, 0x8c, 0x28, 0xe7,
+	0x04, 0xf8, 0xc7, 0xab, 0xc0, 0x97, 0x3a, 0x5d, 0x57, 0xf0, 0x2e, 0x4f, 0x19, 0x80, 0x6f, 0xa1,
+	0x2c, 0xa9, 0xc7, 0x12, 0x48, 0xfa, 0x6b, 0x22, 0xc3, 0xc9, 0x6a, 0xfa, 0xcb, 0xed, 0xa9, 0x2b,
+	0x78, 0x9f, 0xa7, 0x37, 0xee, 0x39, 0x14, 0x98, 0xed, 0x98, 0x11, 0xfb, 0x75, 0x81, 0x7d, 0x94,
+	0xaa, 0xe0, 0xbc, 0xcb, 0x74, 0x05, 0xe7, 0xd9, 0x7c, 0x89, 0xbe, 0x84, 0x2d, 0x89, 0x22, 0x29,
+	0x6e, 0x08, 0x98, 0xe3, 0xd5, 0x30, 0x11, 0xb1, 0x02, 0x8b, 0xad, 0xd1, 0x05, 0xec, 0xc6, 0xce,
+	0xe3, 0x88, 0xd5, 0xa6, 0x80, 0xfb, 0x20, 0x15, 0x6e, 0xe9, 0x96, 0xd4, 0x15, 0x5c, 0x62, 0xcb,
+	0x37, 0xe7, 0x53, 0xd8, 0x5b, 0x84, 0x95, 0x34, 0x61, 0xf5, 0xbc, 0x25, 0xee, 0x0a, 0x5d, 0xc1,
+	0x3b, 0x2c, 0x71, 0x81, 0x98, 0x70, 0xe8, 0xcd, 0xae, 0x3a, 0x63, 0x79, 0xb8, 0xf2, 0xab, 0x85,
+	0x4a, 0x7f, 0x32, 0x04, 0x42, 0x79, 0xe9, 0x8f, 0x89, 0xef, 0xa0, 0x92, 0x96, 0x48, 0xfe, 0x48,
+	0x41, 0x64, 0xfa, 0xe4, 0xad, 0x32, 0x45, 0xbf, 0x73, 0xe0, 0xa5, 0xbb, 0x4e, 0x73, 0x90, 0xe1,
+	0xfe, 0xa4, 0x66, 0x40, 0xf1, 0x91, 0xef, 0x59, 0x3d, 0xdb, 0x9c, 0x1d, 0x20, 0xb7, 0xba, 0xbd,
+	0x4b, 0x90, 0xe1, 0xb6, 0x29, 0xdf, 0x3a, 0xc1, 0xe7, 0xc9, 0xcf, 0x2a, 0xac, 0x89, 0xb3, 0x8c,
+	0x23, 0x04, 0x45, 0x0d, 0xe3, 0x0e, 0xee, 0x19, 0x17, 0xed, 0x56, 0xbb, 0xf3, 0xa4, 0x5d, 0x52,
+	0x50, 0x15, 0x2a, 0x91, 0x4d, 0x7b, 0xda, 0xd5, 0xce, 0xfa, 0xda, 0xb9, 0x81, 0xb5, 0x5e, 0xb7,
+	0xd3, 0xee, 0x69, 0x25, 0x15, 0x95, 0x61, 0x4f, 0xfa, 0xdb, 0x1d, 0xe3, 0xac, 0xd3, 0x6e, 0x6b,
+	0x67, 0xfd, 0x66, 0xa7, 0x5d, 0xba, 0x83, 0xde, 0x85, 0x43, 0xe9, 0x99, 0x9b, 0x8d, 0x7e, 0xf3,
+	0xb1, 0xd6, 0xb9, 0xe8, 0x97, 0x32, 0xe8, 0x00, 0x76, 0xa5, 0x1b, 0x6b, 0x8f, 0xce, 0x23, 0x47,
+	0x36, 0x86, 0xf8, 0x04, 0x37, 0xfb, 0x5a, 0xe4, 0xc9, 0x9d, 0x76, 0x5f, 0x5f, 0x57, 0xd5, 0x37,
+	0xd7, 0x55, 0xf5, 0x8f, 0xeb, 0xaa, 0xfa, 0xe3, 0x4d, 0x55, 0x79, 0x73, 0x53, 0x55, 0x7e, 0xbb,
+	0xa9, 0x2a, 0xcf, 0x1e, 0x98, 0xb6, 0x67, 0xf9, 0xc3, 0xfa, 0x88, 0x4e, 0x1a, 0xe3, 0x01, 0xb7,
+	0xd8, 0x60, 0xda, 0x08, 0x8b, 0x12, 0xac, 0x1a, 0xe1, 0x3b, 0x36, 0xf9, 0x82, 0x1e, 0xae, 0x09,
+	0xcf, 0xe7, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x39, 0x39, 0xd0, 0xeb, 0x5e, 0x0b, 0x00, 0x00,
 }
 
 func (m *RemoteSignerError) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/privval/types.proto b/proto/tendermint/privval/types.proto
index 205899ae41..11ec14b39f 100644
--- a/proto/tendermint/privval/types.proto
+++ b/proto/tendermint/privval/types.proto
@@ -5,7 +5,7 @@ import "tendermint/crypto/keys.proto";
 import "tendermint/types/types.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/privval";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/privval";
 
 enum Errors {
   ERRORS_UNKNOWN             = 0;
diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go
index c4b931f04b..69ed892f8c 100644
--- a/proto/tendermint/state/types.pb.go
+++ b/proto/tendermint/state/types.pb.go
@@ -5,13 +5,13 @@ package state
 
 import (
 	fmt "fmt"
+	types "github.com/dashpay/tenderdash/abci/types"
+	types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
+	version "github.com/dashpay/tenderdash/proto/tendermint/version"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	types "github.com/tendermint/tendermint/abci/types"
-	types1 "github.com/tendermint/tendermint/proto/tendermint/types"
-	version "github.com/tendermint/tendermint/proto/tendermint/version"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -421,57 +421,57 @@ func init() {
 func init() { proto.RegisterFile("tendermint/state/types.proto", fileDescriptor_ccfacf933f22bf93) }
 
 var fileDescriptor_ccfacf933f22bf93 = []byte{
-	// 797 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0xe3, 0x36,
-	0x18, 0xb5, 0x9a, 0x1f, 0xb6, 0xe9, 0xc8, 0x4e, 0x98, 0x0c, 0x8a, 0xd3, 0xc8, 0xae, 0xdb, 0x06,
-	0x46, 0x07, 0x19, 0x68, 0x87, 0xa2, 0x4b, 0x81, 0xd8, 0x41, 0x1b, 0xa3, 0x69, 0x91, 0x2a, 0x45,
-	0x86, 0x2e, 0x02, 0x2d, 0xd1, 0x96, 0x50, 0x59, 0x14, 0x44, 0x3a, 0x6d, 0x6f, 0xbf, 0x3d, 0xeb,
-	0xfd, 0x1d, 0x37, 0xdf, 0x9e, 0x31, 0xe3, 0x4d, 0xb9, 0x83, 0xf3, 0x8f, 0x1c, 0x44, 0x52, 0x12,
-	0x65, 0xe7, 0x80, 0x1c, 0x6e, 0x33, 0xbf, 0xf7, 0xbe, 0xc7, 0xe7, 0x8f, 0xef, 0x83, 0xc0, 0x97,
-	0x0c, 0x47, 0x1e, 0x4e, 0xe6, 0x41, 0xc4, 0x06, 0x94, 0x21, 0x86, 0x07, 0xec, 0xff, 0x18, 0x53,
-	0x2b, 0x4e, 0x08, 0x23, 0x70, 0xb7, 0x40, 0x2d, 0x8e, 0xb6, 0x0f, 0x66, 0x64, 0x46, 0x38, 0x38,
-	0x48, 0x7f, 0x09, 0x5e, 0xfb, 0x48, 0x51, 0x41, 0x13, 0x37, 0x50, 0x45, 0xda, 0xea, 0x15, 0xbc,
-	0x5e, 0x42, 0x8f, 0xd6, 0x50, 0x0f, 0x51, 0x5f, 0x82, 0xdd, 0x35, 0xf0, 0x06, 0x85, 0x81, 0x87,
-	0x18, 0x49, 0x24, 0xe3, 0x78, 0x8d, 0x11, 0xa3, 0x04, 0xcd, 0x33, 0x75, 0x53, 0x81, 0x6f, 0x70,
-	0x42, 0x03, 0x12, 0x95, 0x6e, 0xef, 0xcc, 0x08, 0x99, 0x85, 0x78, 0xc0, 0x4f, 0x93, 0xc5, 0x74,
-	0xc0, 0x82, 0x39, 0xa6, 0x0c, 0xcd, 0x63, 0x41, 0xe8, 0xbd, 0xd6, 0x80, 0x7e, 0x3a, 0x1c, 0x8d,
-	0x6d, 0x4c, 0x63, 0x12, 0x51, 0x4c, 0xe1, 0x15, 0xd8, 0x8d, 0x13, 0xe2, 0x62, 0x4a, 0x9d, 0x38,
-	0x21, 0x31, 0xa1, 0x28, 0x34, 0xb4, 0xae, 0xd6, 0x6f, 0x7c, 0xdf, 0xb7, 0x94, 0x71, 0xa5, 0x63,
-	0xb0, 0xb2, 0xae, 0x4b, 0xd1, 0x70, 0x29, 0xf9, 0x76, 0x2b, 0x2e, 0x17, 0xe0, 0xef, 0xa0, 0x39,
-	0x0d, 0x22, 0x14, 0x06, 0x2f, 0xb0, 0x33, 0x09, 0x89, 0xfb, 0x8f, 0xf1, 0x05, 0x97, 0x3c, 0xf9,
-	0xa8, 0xe4, 0x2f, 0x92, 0x3e, 0x4c, 0xd9, 0xb6, 0x3e, 0x55, 0x8f, 0xbd, 0x97, 0x1a, 0x68, 0x5e,
-	0x67, 0x93, 0xa2, 0xe3, 0x68, 0x4a, 0xe0, 0x08, 0xe8, 0xf9, 0xec, 0x1c, 0x8a, 0x99, 0xf4, 0x6c,
-	0xaa, 0x17, 0x88, 0xc9, 0xe4, 0x8d, 0x57, 0x98, 0xd9, 0x3b, 0x37, 0xca, 0x09, 0x5a, 0x60, 0x3f,
-	0x44, 0x94, 0x39, 0x3e, 0x0e, 0x66, 0x3e, 0x73, 0x5c, 0x1f, 0x45, 0x33, 0xec, 0x71, 0xaf, 0x1b,
-	0xf6, 0x5e, 0x0a, 0x9d, 0x73, 0x64, 0x24, 0x80, 0xde, 0x2b, 0x0d, 0xec, 0x8f, 0x52, 0xb7, 0x11,
-	0x5d, 0xd0, 0x4b, 0xfe, 0x30, 0xdc, 0x8c, 0x0d, 0x76, 0xdd, 0xac, 0xec, 0x88, 0x07, 0x93, 0x7e,
-	0xbe, 0x5a, 0xf7, 0xb3, 0x22, 0x30, 0xdc, 0xbc, 0x7b, 0xe8, 0x54, 0xec, 0x96, 0x5b, 0x2e, 0x7f,
-	0xb2, 0x37, 0x1f, 0x54, 0xaf, 0x45, 0x22, 0xe0, 0x29, 0xa8, 0xe7, 0x6a, 0xd2, 0xc7, 0xb1, 0xea,
-	0x43, 0x26, 0xa7, 0x70, 0x22, 0x3d, 0x14, 0x5d, 0xb0, 0x0d, 0x6a, 0x94, 0x4c, 0xd9, 0xbf, 0x28,
-	0xc1, 0xfc, 0xca, 0xba, 0x9d, 0x9f, 0x7b, 0x6f, 0xaa, 0x60, 0xeb, 0x2a, 0xdd, 0x1e, 0xf8, 0x13,
-	0xa8, 0x4a, 0x2d, 0x79, 0xcd, 0xa1, 0xb5, 0xba, 0x61, 0x96, 0x34, 0x25, 0xaf, 0xc8, 0xf8, 0xf0,
-	0x04, 0xd4, 0x5c, 0x1f, 0x05, 0x91, 0x13, 0x88, 0xff, 0x54, 0x1f, 0x36, 0x96, 0x0f, 0x9d, 0xea,
-	0x28, 0xad, 0x8d, 0xcf, 0xec, 0x2a, 0x07, 0xc7, 0x1e, 0xfc, 0x16, 0x34, 0x83, 0x28, 0x60, 0x01,
-	0x0a, 0xe5, 0x24, 0x8c, 0x0d, 0x3e, 0x01, 0x5d, 0x56, 0xc5, 0x10, 0xe0, 0x77, 0x80, 0x8f, 0x44,
-	0x84, 0x2d, 0x63, 0x6e, 0x72, 0x66, 0x2b, 0x05, 0x78, 0x8e, 0x24, 0xd7, 0x06, 0xba, 0xc2, 0x0d,
-	0x3c, 0x63, 0x6b, 0xdd, 0xbb, 0x78, 0x2a, 0xde, 0x35, 0x3e, 0x1b, 0xee, 0xa7, 0xde, 0x97, 0x0f,
-	0x9d, 0xc6, 0x45, 0x26, 0x35, 0x3e, 0xb3, 0x1b, 0xb9, 0xee, 0xd8, 0x83, 0x17, 0xa0, 0xa5, 0x68,
-	0xa6, 0x5b, 0x67, 0x6c, 0x73, 0xd5, 0xb6, 0x25, 0x56, 0xd2, 0xca, 0x56, 0xd2, 0xfa, 0x2b, 0x5b,
-	0xc9, 0x61, 0x2d, 0x95, 0xbd, 0x7d, 0xd7, 0xd1, 0x6c, 0x3d, 0xd7, 0x4a, 0x51, 0xf8, 0x33, 0x00,
-	0x79, 0x4e, 0xa9, 0x51, 0x7d, 0x56, 0xb2, 0x95, 0x0e, 0xf8, 0xab, 0x74, 0xa3, 0x88, 0xd4, 0x9e,
-	0x25, 0xd2, 0x4c, 0xdb, 0x8a, 0x4d, 0x83, 0x23, 0x60, 0xaa, 0x21, 0x2c, 0xf4, 0xf2, 0x3c, 0xd6,
-	0xf9, 0x8c, 0x8f, 0x8a, 0x3c, 0x16, 0xdd, 0x32, 0x99, 0x4f, 0x6e, 0x07, 0xf8, 0xcc, 0xed, 0xf8,
-	0x03, 0x7c, 0x53, 0xda, 0x8e, 0x15, 0xfd, 0xdc, 0x5e, 0x83, 0xdb, 0xeb, 0x2a, 0xeb, 0x52, 0x16,
-	0xca, 0x3c, 0x66, 0xf9, 0x49, 0x30, 0x5d, 0x84, 0x8c, 0x3a, 0x3e, 0xa2, 0xbe, 0xb1, 0xd3, 0xd5,
-	0xfa, 0x3b, 0x22, 0x3f, 0xb6, 0xa8, 0x9f, 0x23, 0xea, 0xc3, 0x43, 0x50, 0x43, 0x71, 0x2c, 0x28,
-	0x3a, 0xa7, 0x54, 0x51, 0x1c, 0x73, 0xe8, 0x37, 0xf0, 0x35, 0x97, 0x71, 0x49, 0x82, 0x1d, 0x91,
-	0xef, 0xf4, 0x51, 0xb1, 0x57, 0x0e, 0x66, 0xb3, 0xab, 0xf5, 0x75, 0x9b, 0x8f, 0x76, 0x44, 0x12,
-	0xcc, 0x43, 0x7f, 0xc1, 0x79, 0x6a, 0x4e, 0xaf, 0xc1, 0x41, 0x84, 0xff, 0x5b, 0x13, 0x33, 0x5a,
-	0x7c, 0x76, 0x9d, 0xa7, 0x66, 0xa7, 0x68, 0xf1, 0xc9, 0x69, 0xf6, 0x5e, 0x2a, 0x51, 0x06, 0xfe,
-	0xbc, 0x5b, 0x9a, 0xda, 0xfd, 0xd2, 0xd4, 0xde, 0x2f, 0x4d, 0xed, 0xf6, 0xd1, 0xac, 0xdc, 0x3f,
-	0x9a, 0x95, 0xb7, 0x8f, 0x66, 0xe5, 0xef, 0x1f, 0x67, 0x01, 0xf3, 0x17, 0x13, 0xcb, 0x25, 0xf3,
-	0x81, 0xfa, 0x21, 0x2a, 0x7e, 0x8a, 0x4f, 0xe5, 0xea, 0x47, 0x76, 0xb2, 0xcd, 0xeb, 0x3f, 0x7c,
-	0x08, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x22, 0xe7, 0xc7, 0x7f, 0x07, 0x00, 0x00,
+	// 799 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x3f, 0x6f, 0xfb, 0x44,
+	0x18, 0x8e, 0xf9, 0xb5, 0x4d, 0x72, 0xa9, 0x93, 0xf6, 0xda, 0xc1, 0x4d, 0xa9, 0x13, 0x02, 0x54,
+	0x11, 0x83, 0x23, 0x01, 0x0b, 0x0b, 0x52, 0x93, 0x0a, 0x1a, 0x51, 0xaa, 0xca, 0x45, 0x1d, 0x58,
+	0xac, 0x8b, 0x7d, 0x89, 0x2d, 0x1c, 0x9f, 0xe5, 0xbb, 0x14, 0xca, 0xce, 0xde, 0x95, 0xcf, 0xc1,
+	0xcc, 0xde, 0xb1, 0x23, 0x53, 0x41, 0xe9, 0x17, 0x41, 0xf7, 0xc7, 0xce, 0x39, 0x29, 0x52, 0xd1,
+	0x6f, 0xcb, 0xbd, 0xcf, 0xf3, 0x3e, 0xf7, 0xe4, 0xbd, 0xe7, 0x95, 0xc1, 0x87, 0x0c, 0x27, 0x01,
+	0xce, 0xe6, 0x51, 0xc2, 0x06, 0x94, 0x21, 0x86, 0x07, 0xec, 0x3e, 0xc5, 0xd4, 0x49, 0x33, 0xc2,
+	0x08, 0xdc, 0x5b, 0xa1, 0x8e, 0x40, 0xdb, 0x87, 0x33, 0x32, 0x23, 0x02, 0x1c, 0xf0, 0x5f, 0x92,
+	0xd7, 0x3e, 0xd6, 0x54, 0xd0, 0xc4, 0x8f, 0x74, 0x91, 0xb6, 0x7e, 0x85, 0xa8, 0x97, 0xd0, 0xe3,
+	0x0d, 0x34, 0x40, 0x34, 0x54, 0x60, 0x77, 0x03, 0xbc, 0x43, 0x71, 0x14, 0x20, 0x46, 0x32, 0xc5,
+	0x38, 0xd9, 0x60, 0xa4, 0x28, 0x43, 0xf3, 0x5c, 0xdd, 0xd6, 0xe0, 0x3b, 0x9c, 0xd1, 0x88, 0x24,
+	0xa5, 0xdb, 0x3b, 0x33, 0x42, 0x66, 0x31, 0x1e, 0x88, 0xd3, 0x64, 0x31, 0x1d, 0xb0, 0x68, 0x8e,
+	0x29, 0x43, 0xf3, 0x54, 0x12, 0x7a, 0x7f, 0x18, 0xc0, 0x3c, 0x1b, 0x8e, 0xc6, 0x2e, 0xa6, 0x29,
+	0x49, 0x28, 0xa6, 0xf0, 0x06, 0xec, 0xa5, 0x19, 0xf1, 0x31, 0xa5, 0x5e, 0x9a, 0x91, 0x94, 0x50,
+	0x14, 0x5b, 0x46, 0xd7, 0xe8, 0x37, 0x3e, 0xef, 0x3b, 0xda, 0xb8, 0xf8, 0x18, 0x9c, 0xbc, 0xeb,
+	0x5a, 0x36, 0x5c, 0x2b, 0xbe, 0xdb, 0x4a, 0xcb, 0x05, 0xf8, 0x3d, 0x68, 0x4e, 0xa3, 0x04, 0xc5,
+	0xd1, 0xaf, 0xd8, 0x9b, 0xc4, 0xc4, 0xff, 0xc9, 0xfa, 0x40, 0x48, 0x9e, 0xfe, 0xa7, 0xe4, 0x37,
+	0x8a, 0x3e, 0xe4, 0x6c, 0xd7, 0x9c, 0xea, 0xc7, 0xde, 0x6f, 0x06, 0x68, 0xde, 0xe6, 0x93, 0xa2,
+	0xe3, 0x64, 0x4a, 0xe0, 0x08, 0x98, 0xc5, 0xec, 0x3c, 0x8a, 0x99, 0xf2, 0x6c, 0xeb, 0x17, 0xc8,
+	0xc9, 0x14, 0x8d, 0x37, 0x98, 0xb9, 0xbb, 0x77, 0xda, 0x09, 0x3a, 0xe0, 0x20, 0x46, 0x94, 0x79,
+	0x21, 0x8e, 0x66, 0x21, 0xf3, 0xfc, 0x10, 0x25, 0x33, 0x1c, 0x08, 0xaf, 0xef, 0xdc, 0x7d, 0x0e,
+	0x5d, 0x08, 0x64, 0x24, 0x81, 0xde, 0xef, 0x06, 0x38, 0x18, 0x71, 0xb7, 0x09, 0x5d, 0xd0, 0x6b,
+	0xf1, 0x30, 0xc2, 0x8c, 0x0b, 0xf6, 0xfc, 0xbc, 0xec, 0xc9, 0x07, 0x53, 0x7e, 0x3e, 0xda, 0xf4,
+	0xb3, 0x26, 0x30, 0xdc, 0x7a, 0x7c, 0xee, 0x54, 0xdc, 0x96, 0x5f, 0x2e, 0xff, 0x6f, 0x6f, 0x21,
+	0xa8, 0xde, 0xca, 0x44, 0xc0, 0x33, 0x50, 0x2f, 0xd4, 0x94, 0x8f, 0x13, 0xdd, 0x87, 0x4a, 0xce,
+	0xca, 0x89, 0xf2, 0xb0, 0xea, 0x82, 0x6d, 0x50, 0xa3, 0x64, 0xca, 0x7e, 0x46, 0x19, 0x16, 0x57,
+	0xd6, 0xdd, 0xe2, 0xdc, 0xfb, 0xb3, 0x0a, 0xb6, 0x6f, 0xf8, 0xf6, 0xc0, 0xaf, 0x40, 0x55, 0x69,
+	0xa9, 0x6b, 0x8e, 0x9c, 0xf5, 0x0d, 0x73, 0x94, 0x29, 0x75, 0x45, 0xce, 0x87, 0xa7, 0xa0, 0xe6,
+	0x87, 0x28, 0x4a, 0xbc, 0x48, 0xfe, 0xa7, 0xfa, 0xb0, 0xb1, 0x7c, 0xee, 0x54, 0x47, 0xbc, 0x36,
+	0x3e, 0x77, 0xab, 0x02, 0x1c, 0x07, 0xf0, 0x53, 0xd0, 0x8c, 0x92, 0x88, 0x45, 0x28, 0x56, 0x93,
+	0xb0, 0xde, 0x89, 0x09, 0x98, 0xaa, 0x2a, 0x87, 0x00, 0x3f, 0x03, 0x62, 0x24, 0x32, 0x6c, 0x39,
+	0x73, 0x4b, 0x30, 0x5b, 0x1c, 0x10, 0x39, 0x52, 0x5c, 0x17, 0x98, 0x1a, 0x37, 0x0a, 0xac, 0xed,
+	0x4d, 0xef, 0xf2, 0xa9, 0x44, 0xd7, 0xf8, 0x7c, 0x78, 0xc0, 0xbd, 0x2f, 0x9f, 0x3b, 0x8d, 0xcb,
+	0x5c, 0x6a, 0x7c, 0xee, 0x36, 0x0a, 0xdd, 0x71, 0x00, 0x2f, 0x41, 0x4b, 0xd3, 0xe4, 0x5b, 0x67,
+	0xed, 0x08, 0xd5, 0xb6, 0x23, 0x57, 0xd2, 0xc9, 0x57, 0xd2, 0xf9, 0x21, 0x5f, 0xc9, 0x61, 0x8d,
+	0xcb, 0x3e, 0xfc, 0xdd, 0x31, 0x5c, 0xb3, 0xd0, 0xe2, 0x28, 0xfc, 0x1a, 0x80, 0x22, 0xa7, 0xd4,
+	0xaa, 0xbe, 0x29, 0xd9, 0x5a, 0x07, 0xfc, 0x56, 0xb9, 0xd1, 0x44, 0x6a, 0x6f, 0x12, 0x69, 0xf2,
+	0xb6, 0xd5, 0xa6, 0xc1, 0x11, 0xb0, 0xf5, 0x10, 0xae, 0xf4, 0x8a, 0x3c, 0xd6, 0xc5, 0x8c, 0x8f,
+	0x57, 0x79, 0x5c, 0x75, 0xab, 0x64, 0xbe, 0xba, 0x1d, 0xe0, 0x3d, 0xb7, 0xe3, 0x0a, 0x7c, 0x52,
+	0xda, 0x8e, 0x35, 0xfd, 0xc2, 0x5e, 0x43, 0xd8, 0xeb, 0x6a, 0xeb, 0x52, 0x16, 0xca, 0x3d, 0xe6,
+	0xf9, 0xc9, 0x30, 0x5d, 0xc4, 0x8c, 0x7a, 0x21, 0xa2, 0xa1, 0xb5, 0xdb, 0x35, 0xfa, 0xbb, 0x32,
+	0x3f, 0xae, 0xac, 0x5f, 0x20, 0x1a, 0xc2, 0x23, 0x50, 0x43, 0x69, 0x2a, 0x29, 0xa6, 0xa0, 0x54,
+	0x51, 0x9a, 0x0a, 0xe8, 0x3b, 0xf0, 0xb1, 0x90, 0xf1, 0x49, 0x86, 0x3d, 0x99, 0x6f, 0xfe, 0xa8,
+	0x38, 0x28, 0x07, 0xb3, 0xd9, 0x35, 0xfa, 0xa6, 0x2b, 0x46, 0x3b, 0x22, 0x19, 0x16, 0xa1, 0xbf,
+	0x14, 0x3c, 0x3d, 0xa7, 0xb7, 0xe0, 0x30, 0xc1, 0xbf, 0x6c, 0x88, 0x59, 0x2d, 0x31, 0xbb, 0xce,
+	0x6b, 0xb3, 0xd3, 0xb4, 0xc4, 0xe4, 0x0c, 0x77, 0x9f, 0x4b, 0x94, 0x81, 0xab, 0xc7, 0xa5, 0x6d,
+	0x3c, 0x2d, 0x6d, 0xe3, 0x9f, 0xa5, 0x6d, 0x3c, 0xbc, 0xd8, 0x95, 0xa7, 0x17, 0xbb, 0xf2, 0xd7,
+	0x8b, 0x5d, 0xf9, 0xf1, 0xcb, 0x59, 0xc4, 0xc2, 0xc5, 0xc4, 0xf1, 0xc9, 0x5c, 0x7c, 0xb6, 0x52,
+	0x74, 0x3f, 0x90, 0xb7, 0xf0, 0x93, 0xfc, 0xaa, 0x0c, 0xd6, 0xbf, 0xb0, 0x93, 0x1d, 0x51, 0xff,
+	0xe2, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x72, 0x4b, 0x4a, 0xb6, 0x7c, 0x07, 0x00, 0x00,
 }
 
 func (m *ABCIResponses) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/state/types.proto b/proto/tendermint/state/types.proto
index f104881401..5445ac9922 100644
--- a/proto/tendermint/state/types.proto
+++ b/proto/tendermint/state/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.state;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/state";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/state";
 
 import "gogoproto/gogo.proto";
 import "tendermint/abci/types.proto";
diff --git a/proto/tendermint/statesync/types.pb.go b/proto/tendermint/statesync/types.pb.go
index 16e03447ec..bac29edb94 100644
--- a/proto/tendermint/statesync/types.pb.go
+++ b/proto/tendermint/statesync/types.pb.go
@@ -5,9 +5,9 @@ package statesync
 
 import (
 	fmt "fmt"
+	types "github.com/dashpay/tenderdash/proto/tendermint/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	types "github.com/tendermint/tendermint/proto/tendermint/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -462,34 +462,34 @@ func init() {
 func init() { proto.RegisterFile("tendermint/statesync/types.proto", fileDescriptor_a1c2869546ca7914) }
 
 var fileDescriptor_a1c2869546ca7914 = []byte{
-	// 418 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xc1, 0xaa, 0xd3, 0x40,
-	0x14, 0xcd, 0x68, 0xde, 0x7b, 0xe5, 0xf6, 0x55, 0x5f, 0x87, 0x22, 0x31, 0xd4, 0x18, 0xb3, 0x31,
-	0x20, 0x24, 0x50, 0x97, 0xe2, 0xa6, 0x5d, 0x09, 0x2e, 0x24, 0xc5, 0x8d, 0x2e, 0xca, 0x34, 0x19,
-	0x92, 0x60, 0x33, 0x13, 0x33, 0x13, 0xa1, 0xe0, 0x27, 0xb8, 0xf0, 0xb3, 0xba, 0xec, 0xd2, 0x95,
-	0x48, 0xfb, 0x23, 0x92, 0x49, 0xd2, 0x06, 0xeb, 0xa3, 0xd0, 0xdd, 0x3d, 0x67, 0xce, 0x9c, 0x7b,
-	0xef, 0x70, 0x06, 0x6c, 0x49, 0x59, 0x44, 0x8b, 0x2c, 0x65, 0xd2, 0x17, 0x92, 0x48, 0x2a, 0xd6,
-	0x2c, 0xf4, 0xe5, 0x3a, 0xa7, 0xc2, 0xcb, 0x0b, 0x2e, 0x39, 0x1e, 0x1d, 0x15, 0xde, 0x41, 0x61,
-	0x8e, 0x62, 0x1e, 0x73, 0x25, 0xf0, 0xab, 0xaa, 0xd6, 0x9a, 0xe3, 0x8e, 0x9b, 0xf2, 0xe8, 0x3a,
-	0x99, 0xcf, 0x4e, 0x4e, 0x73, 0x52, 0x90, 0xac, 0x39, 0x76, 0x30, 0xdc, 0xcd, 0x19, 0xc9, 0x45,
-	0xc2, 0xa5, 0x08, 0xe8, 0xd7, 0x92, 0x0a, 0xe9, 0x94, 0x30, 0xec, 0x70, 0x22, 0xe7, 0x4c, 0x50,
-	0xfc, 0x04, 0xae, 0x13, 0x9a, 0xc6, 0x89, 0x34, 0x90, 0x8d, 0x5c, 0x3d, 0x68, 0x10, 0x36, 0xe0,
-	0xe6, 0x1b, 0x2d, 0x44, 0xca, 0x99, 0xf1, 0xc0, 0x46, 0xee, 0x20, 0x68, 0x21, 0xc6, 0xa0, 0x27,
-	0x44, 0x24, 0xc6, 0x43, 0x1b, 0xb9, 0xb7, 0x81, 0xaa, 0xb1, 0x09, 0xbd, 0x8c, 0x4a, 0x12, 0x11,
-	0x49, 0x0c, 0x5d, 0xf1, 0x07, 0xec, 0x7c, 0x86, 0xdb, 0x59, 0x52, 0xb2, 0x2f, 0xcd, 0x18, 0x17,
-	0x74, 0x7c, 0x0a, 0xbd, 0xb0, 0x72, 0x58, 0xa4, 0x51, 0xd3, 0xf5, 0x46, 0xe1, 0x77, 0x91, 0xf3,
-	0x03, 0xc1, 0xa0, 0x71, 0xbf, 0x78, 0xa1, 0xfb, 0xed, 0xf1, 0x08, 0xae, 0x54, 0xd9, 0x2c, 0x55,
-	0x83, 0xca, 0x2a, 0x4b, 0x85, 0x48, 0x59, 0x6c, 0x5c, 0xd9, 0xc8, 0xed, 0x05, 0x2d, 0x74, 0x5e,
-	0xc1, 0xf0, 0x7d, 0xd5, 0x6d, 0xba, 0xe2, 0xe1, 0xb9, 0x85, 0x9d, 0x39, 0xe0, 0xae, 0xb8, 0x99,
-	0xff, 0x2d, 0xf4, 0x57, 0x15, 0xbb, 0x58, 0x56, 0xb4, 0xba, 0xd2, 0x9f, 0x8c, 0xbd, 0x4e, 0x70,
-	0xea, 0x18, 0x74, 0xae, 0xc2, 0xea, 0x50, 0x3b, 0x2f, 0x61, 0xf0, 0x41, 0x05, 0xe1, 0x5c, 0xf7,
-	0xef, 0xf0, 0xa8, 0x15, 0x9e, 0x79, 0xb9, 0x00, 0xee, 0xc2, 0x4a, 0xc0, 0x44, 0x29, 0x16, 0x75,
-	0xca, 0xd4, 0x13, 0xf6, 0x27, 0x2f, 0x4e, 0xc7, 0x9a, 0xb5, 0xca, 0xda, 0x7c, 0xaa, 0x6f, 0x7e,
-	0x3f, 0xd7, 0x82, 0xc7, 0xe1, 0x3f, 0xf4, 0xc7, 0xcd, 0xce, 0x42, 0xdb, 0x9d, 0x85, 0xfe, 0xec,
-	0x2c, 0xf4, 0x73, 0x6f, 0x69, 0xdb, 0xbd, 0xa5, 0xfd, 0xda, 0x5b, 0xda, 0xa7, 0x37, 0x71, 0x2a,
-	0x93, 0x72, 0xe9, 0x85, 0x3c, 0xf3, 0xbb, 0x19, 0x3f, 0x96, 0xf5, 0x4f, 0xf9, 0xdf, 0x5f, 0x5b,
-	0x5e, 0xab, 0xb3, 0xd7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc2, 0xc9, 0x7f, 0x18, 0x8a, 0x03,
-	0x00, 0x00,
+	// 424 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x41, 0x6b, 0xd4, 0x40,
+	0x14, 0xce, 0x68, 0xda, 0x2e, 0x6f, 0xbb, 0xda, 0x0e, 0x8b, 0xc4, 0x50, 0x63, 0xcc, 0xc5, 0x80,
+	0x90, 0x40, 0xbd, 0x78, 0xf1, 0xd2, 0x9e, 0x04, 0x0f, 0x32, 0xbd, 0xe9, 0x61, 0x99, 0x4d, 0x86,
+	0x4c, 0x70, 0x33, 0x13, 0x33, 0x13, 0x61, 0xc1, 0x9f, 0xe0, 0xc1, 0x9f, 0xd5, 0x63, 0x8f, 0x9e,
+	0x44, 0x76, 0xff, 0x88, 0xcc, 0x24, 0x59, 0x83, 0xb5, 0x2c, 0xf4, 0xf6, 0xbe, 0x6f, 0xbe, 0xf9,
+	0xbe, 0xf7, 0x86, 0x37, 0x10, 0x6a, 0x26, 0x72, 0xd6, 0x54, 0xa5, 0xd0, 0xa9, 0xd2, 0x54, 0x33,
+	0xb5, 0x16, 0x59, 0xaa, 0xd7, 0x35, 0x53, 0x49, 0xdd, 0x48, 0x2d, 0xf1, 0xfc, 0xaf, 0x22, 0xd9,
+	0x29, 0xfc, 0x79, 0x21, 0x0b, 0x69, 0x05, 0xa9, 0xa9, 0x3a, 0xad, 0x7f, 0x36, 0x72, 0xb3, 0x1e,
+	0x63, 0x27, 0xff, 0xd9, 0xad, 0xd3, 0x9a, 0x36, 0xb4, 0xea, 0x8f, 0x23, 0x0c, 0x27, 0x57, 0x82,
+	0xd6, 0x8a, 0x4b, 0xad, 0x08, 0xfb, 0xd2, 0x32, 0xa5, 0xa3, 0x16, 0x4e, 0x47, 0x9c, 0xaa, 0xa5,
+	0x50, 0x0c, 0x3f, 0x81, 0x43, 0xce, 0xca, 0x82, 0x6b, 0x0f, 0x85, 0x28, 0x76, 0x49, 0x8f, 0xb0,
+	0x07, 0x47, 0x5f, 0x59, 0xa3, 0x4a, 0x29, 0xbc, 0x07, 0x21, 0x8a, 0x67, 0x64, 0x80, 0x18, 0x83,
+	0xcb, 0xa9, 0xe2, 0xde, 0xc3, 0x10, 0xc5, 0xc7, 0xc4, 0xd6, 0xd8, 0x87, 0x49, 0xc5, 0x34, 0xcd,
+	0xa9, 0xa6, 0x9e, 0x6b, 0xf9, 0x1d, 0x8e, 0x3e, 0xc1, 0xf1, 0x25, 0x6f, 0xc5, 0xe7, 0xbe, 0x8d,
+	0x7b, 0x24, 0x3e, 0x85, 0x49, 0x66, 0x1c, 0x16, 0x65, 0xde, 0xa7, 0x1e, 0x59, 0xfc, 0x2e, 0x8f,
+	0xbe, 0x23, 0x98, 0xf5, 0xee, 0xf7, 0x1e, 0xe8, 0x6e, 0x7b, 0x3c, 0x87, 0x03, 0x5b, 0xf6, 0x43,
+	0x75, 0xc0, 0x58, 0x55, 0xa5, 0x52, 0xa5, 0x28, 0xbc, 0x83, 0x10, 0xc5, 0x13, 0x32, 0xc0, 0xe8,
+	0x15, 0x9c, 0xbe, 0x37, 0x69, 0x17, 0x2b, 0x99, 0xed, 0x1b, 0x38, 0xba, 0x02, 0x3c, 0x16, 0xf7,
+	0xfd, 0xbf, 0x85, 0xe9, 0xca, 0xb0, 0x8b, 0xa5, 0xa1, 0xed, 0x95, 0xe9, 0xf9, 0x59, 0x32, 0x5a,
+	0x9c, 0x6e, 0x0d, 0x46, 0x57, 0x61, 0xb5, 0xab, 0xa3, 0x97, 0x30, 0xfb, 0x60, 0x17, 0x61, 0x5f,
+	0xfa, 0x37, 0x78, 0x34, 0x08, 0xf7, 0xbc, 0x1c, 0x81, 0x93, 0xcc, 0x08, 0x84, 0x6a, 0xd5, 0xa2,
+	0xdb, 0x32, 0xfb, 0x84, 0xd3, 0xf3, 0x17, 0xb7, 0xdb, 0xba, 0x1c, 0x94, 0x9d, 0xf9, 0x85, 0x7b,
+	0xfd, 0xeb, 0xb9, 0x43, 0x1e, 0x67, 0xff, 0xd0, 0xe4, 0x7a, 0x13, 0xa0, 0x9b, 0x4d, 0x80, 0x7e,
+	0x6f, 0x02, 0xf4, 0x63, 0x1b, 0x38, 0x37, 0xdb, 0xc0, 0xf9, 0xb9, 0x0d, 0x9c, 0x8f, 0x6f, 0x8a,
+	0x52, 0xf3, 0x76, 0x99, 0x64, 0xb2, 0x4a, 0x73, 0xaa, 0x78, 0x4d, 0xd7, 0x69, 0x97, 0x62, 0x50,
+	0xda, 0x7d, 0x93, 0xff, 0x7d, 0xb4, 0xe5, 0xa1, 0x3d, 0x7b, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff,
+	0x53, 0xde, 0xda, 0xe0, 0x87, 0x03, 0x00, 0x00,
 }
 
 func (m *SnapshotsRequest) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/statesync/types.proto b/proto/tendermint/statesync/types.proto
index 764595cc2a..fa18b6e350 100644
--- a/proto/tendermint/statesync/types.proto
+++ b/proto/tendermint/statesync/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.statesync;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/statesync";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/statesync";
 
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
diff --git a/proto/tendermint/types/block.pb.go b/proto/tendermint/types/block.pb.go
index 4018535261..915151f4da 100644
--- a/proto/tendermint/types/block.pb.go
+++ b/proto/tendermint/types/block.pb.go
@@ -106,27 +106,27 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/block.proto", fileDescriptor_70840e82f4357ab1) }
 
 var fileDescriptor_70840e82f4357ab1 = []byte{
-	// 313 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x4b, 0xc3, 0x30,
-	0x14, 0xc7, 0x9b, 0xb9, 0x0d, 0xc9, 0x10, 0x25, 0x88, 0x84, 0x29, 0x99, 0x78, 0xf2, 0xd4, 0x8a,
-	0x82, 0xe2, 0x4d, 0x36, 0x05, 0x0f, 0xf3, 0xe0, 0x8e, 0x5e, 0x4a, 0x9a, 0x86, 0x36, 0x6c, 0x6d,
-	0x46, 0x1b, 0x05, 0xbf, 0x85, 0x5f, 0xc8, 0xfb, 0x8e, 0x3b, 0x7a, 0x12, 0x69, 0xbf, 0x88, 0xf4,
-	0x35, 0x3a, 0x5d, 0xf5, 0x52, 0x1e, 0xef, 0xf7, 0xff, 0x95, 0x7f, 0x78, 0xf8, 0xc0, 0xc8, 0x34,
-	0x94, 0x59, 0xa2, 0x52, 0xe3, 0x99, 0xe7, 0xb9, 0xcc, 0xbd, 0x60, 0xa6, 0xc5, 0xd4, 0x9d, 0x67,
-	0xda, 0x68, 0xb2, 0xb3, 0xa2, 0x2e, 0xd0, 0xfe, 0x6e, 0xa4, 0x23, 0x0d, 0xd0, 0xab, 0xa6, 0x3a,
-	0xd7, 0x6f, 0xfe, 0x05, 0xbe, 0x96, 0xee, 0x37, 0x68, 0xc8, 0xf3, 0xd8, 0xc2, 0x41, 0x03, 0xca,
-	0x27, 0x15, 0xca, 0x54, 0xc8, 0x3a, 0x70, 0xf4, 0xda, 0xc2, 0x9d, 0x61, 0xd5, 0x89, 0x9c, 0xe3,
-	0x6e, 0x2c, 0x79, 0x28, 0x33, 0x8a, 0x0e, 0xd1, 0x71, 0xef, 0x94, 0xba, 0xeb, 0xf5, 0xdc, 0x5b,
-	0xe0, 0xc3, 0xf6, 0xe2, 0x7d, 0xe0, 0x4c, 0x6c, 0x9a, 0x9c, 0xe0, 0x76, 0xc8, 0x0d, 0xa7, 0x2d,
-	0xb0, 0xf6, 0x9a, 0xd6, 0x35, 0x37, 0xdc, 0x3a, 0x90, 0x24, 0x57, 0x78, 0xf3, 0xab, 0x05, 0xdd,
-	0x00, 0x8b, 0x35, 0xad, 0x1b, 0x9b, 0x18, 0xab, 0xdc, 0x58, 0xfb, 0xdb, 0x22, 0x97, 0xb8, 0x37,
-	0xe3, 0xb9, 0xf1, 0x85, 0x4e, 0x12, 0x65, 0x68, 0xfb, 0xbf, 0xc2, 0x23, 0xe0, 0x13, 0x5c, 0x85,
-	0xeb, 0x99, 0xdc, 0xe1, 0x6d, 0xa1, 0x33, 0xe9, 0x8b, 0x98, 0xab, 0xd4, 0xaf, 0x5e, 0x4e, 0x3b,
-	0xa0, 0x0f, 0xfe, 0xd2, 0x33, 0x39, 0xaa, 0x72, 0x63, 0x2d, 0xa6, 0x50, 0x02, 0x4d, 0xb6, 0xc4,
-	0xaf, 0xe5, 0xfd, 0xa2, 0x60, 0x68, 0x59, 0x30, 0xf4, 0x51, 0x30, 0xf4, 0x52, 0x32, 0x67, 0x59,
-	0x32, 0xe7, 0xad, 0x64, 0xce, 0xc3, 0x45, 0xa4, 0x4c, 0xfc, 0x18, 0xb8, 0x42, 0x27, 0xde, 0xcf,
-	0x2b, 0xac, 0xc6, 0xfa, 0xd0, 0xeb, 0x17, 0x0a, 0xba, 0xb0, 0x3f, 0xfb, 0x0c, 0x00, 0x00, 0xff,
-	0xff, 0xa7, 0xb1, 0x4c, 0xad, 0x3d, 0x02, 0x00, 0x00,
+	// 319 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x4b, 0xf3, 0x30,
+	0x18, 0xc7, 0x9b, 0xbd, 0xdb, 0x78, 0xc9, 0x10, 0x25, 0x88, 0x84, 0x29, 0x99, 0x78, 0xf2, 0xd4,
+	0x8a, 0x8a, 0xe0, 0x4d, 0x36, 0x05, 0x0f, 0xd3, 0xc3, 0x8e, 0x5e, 0x46, 0x96, 0x86, 0x36, 0x6c,
+	0x6d, 0x4a, 0x1b, 0x85, 0x7d, 0x0b, 0xbf, 0x90, 0xf7, 0x1d, 0x77, 0xf4, 0x24, 0xd2, 0x7e, 0x11,
+	0xc9, 0xd3, 0xa8, 0xb8, 0xea, 0xa5, 0xa4, 0xcf, 0xef, 0xff, 0x6b, 0xff, 0xe1, 0xc1, 0x07, 0x46,
+	0xa6, 0xa1, 0xcc, 0x13, 0x95, 0x9a, 0xc0, 0x2c, 0x33, 0x59, 0x04, 0xb3, 0x85, 0x16, 0x73, 0x3f,
+	0xcb, 0xb5, 0xd1, 0x64, 0xe7, 0x9b, 0xfa, 0x40, 0xfb, 0xbb, 0x91, 0x8e, 0x34, 0xc0, 0xc0, 0x9e,
+	0xea, 0x5c, 0xbf, 0xf9, 0x15, 0x78, 0x3a, 0xba, 0xdf, 0xa0, 0x21, 0x2f, 0x62, 0x07, 0x07, 0x0d,
+	0x28, 0x9f, 0x54, 0x28, 0x53, 0x21, 0xeb, 0xc0, 0xd1, 0x4b, 0x0b, 0x77, 0x86, 0xb6, 0x13, 0xb9,
+	0xc0, 0xdd, 0x58, 0xf2, 0x50, 0xe6, 0x14, 0x1d, 0xa2, 0xe3, 0xde, 0x29, 0xf5, 0x37, 0xeb, 0xf9,
+	0xb7, 0xc0, 0x87, 0xed, 0xd5, 0xdb, 0xc0, 0x9b, 0xb8, 0x34, 0x39, 0xc1, 0xed, 0x90, 0x1b, 0x4e,
+	0x5b, 0x60, 0xed, 0x35, 0xad, 0x6b, 0x6e, 0xb8, 0x73, 0x20, 0x49, 0xae, 0xf0, 0xff, 0xcf, 0x16,
+	0xf4, 0x1f, 0x58, 0xac, 0x69, 0xdd, 0xb8, 0xc4, 0x58, 0x15, 0xc6, 0xd9, 0x5f, 0x16, 0xb9, 0xc4,
+	0xbd, 0x05, 0x2f, 0xcc, 0x54, 0xe8, 0x24, 0x51, 0x86, 0xb6, 0xff, 0x2a, 0x3c, 0x02, 0x3e, 0xc1,
+	0x36, 0x5c, 0x9f, 0xc9, 0x1d, 0xde, 0x16, 0x3a, 0x97, 0x53, 0x11, 0x73, 0x95, 0x4e, 0xed, 0xcd,
+	0x69, 0x07, 0xf4, 0xc1, 0x6f, 0x7a, 0x2e, 0x47, 0x36, 0x37, 0xd6, 0x62, 0x0e, 0x25, 0xd0, 0x64,
+	0x4b, 0xfc, 0x18, 0xde, 0xaf, 0x4a, 0x86, 0xd6, 0x25, 0x43, 0xef, 0x25, 0x43, 0xcf, 0x15, 0xf3,
+	0xd6, 0x15, 0xf3, 0x5e, 0x2b, 0xe6, 0x3d, 0x9c, 0x47, 0xca, 0xc4, 0x8f, 0x33, 0x5f, 0xe8, 0x04,
+	0x36, 0x92, 0xf1, 0x65, 0x50, 0xff, 0xc1, 0xbe, 0x05, 0xf5, 0x96, 0x37, 0xd7, 0x33, 0xeb, 0xc2,
+	0xfc, 0xec, 0x23, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x40, 0x9d, 0x2a, 0x3a, 0x02, 0x00, 0x00,
 }
 
 func (m *Block) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/types/block.proto b/proto/tendermint/types/block.proto
index bcd9e8a93c..bcb111dbbd 100644
--- a/proto/tendermint/types/block.proto
+++ b/proto/tendermint/types/block.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
diff --git a/proto/tendermint/types/canonical.go b/proto/tendermint/types/canonical.go
index 281abb8089..57042ce27f 100644
--- a/proto/tendermint/types/canonical.go
+++ b/proto/tendermint/types/canonical.go
@@ -1,8 +1,8 @@
 package types
 
 import (
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
 )
 
 func (c CanonicalBlockID) signBytes() ([]byte, error) {
diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go
index 97615fd677..62114e67d9 100644
--- a/proto/tendermint/types/canonical.pb.go
+++ b/proto/tendermint/types/canonical.pb.go
@@ -382,43 +382,43 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) }
 
 var fileDescriptor_8d1a1a84ff7267ed = []byte{
-	// 568 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0xcd, 0xa4, 0xf9, 0x71, 0xa6, 0xc9, 0xf7, 0x85, 0x51, 0x55, 0x85, 0x50, 0xd9, 0x91, 0x91,
-	0x22, 0xb3, 0xb1, 0xa5, 0x76, 0xd1, 0xbd, 0x0b, 0x12, 0x41, 0x20, 0x2a, 0xa7, 0x74, 0xc1, 0x26,
-	0x9a, 0xd8, 0x83, 0x6d, 0xe1, 0x78, 0x2c, 0x7b, 0x22, 0xd1, 0x0d, 0xcf, 0xd0, 0xc7, 0xe1, 0x11,
-	0xba, 0xec, 0xb2, 0x6c, 0x02, 0x72, 0x76, 0x3c, 0x05, 0x9a, 0xf1, 0x2f, 0x0d, 0x54, 0x62, 0xc3,
-	0x26, 0xba, 0xf7, 0x9e, 0x33, 0x77, 0xce, 0x3d, 0x37, 0x1e, 0x38, 0x61, 0x24, 0x74, 0x48, 0xbc,
-	0xf2, 0x43, 0x66, 0xb0, 0xab, 0x88, 0x24, 0x86, 0x8d, 0x43, 0x1a, 0xfa, 0x36, 0x0e, 0xf4, 0x28,
-	0xa6, 0x8c, 0xa2, 0x61, 0xc5, 0xd0, 0x05, 0x63, 0x7c, 0xe0, 0x52, 0x97, 0x0a, 0xd0, 0xe0, 0x51,
-	0xc6, 0x1b, 0x1f, 0xed, 0x74, 0x12, 0xbf, 0x39, 0xfa, 0x64, 0x07, 0x75, 0x70, 0xe2, 0xe5, 0xa0,
-	0xe2, 0x52, 0xea, 0x06, 0xc4, 0x10, 0xd9, 0x72, 0xfd, 0xc1, 0x60, 0xfe, 0x8a, 0x24, 0x0c, 0xaf,
-	0xa2, 0x8c, 0xa0, 0x7e, 0x86, 0xc3, 0xb3, 0x42, 0x96, 0x19, 0x50, 0xfb, 0xe3, 0xec, 0x39, 0x42,
-	0xb0, 0xe5, 0xe1, 0xc4, 0x1b, 0x81, 0x09, 0xd0, 0xfa, 0x96, 0x88, 0xd1, 0x25, 0xfc, 0x3f, 0xc2,
-	0x31, 0x5b, 0x24, 0x84, 0x2d, 0x3c, 0x82, 0x1d, 0x12, 0x8f, 0x9a, 0x13, 0xa0, 0xed, 0x1f, 0x6b,
-	0xfa, 0xfd, 0x29, 0xf4, 0xb2, 0xe1, 0x39, 0x8e, 0xd9, 0x9c, 0xb0, 0x97, 0x82, 0x6f, 0xb6, 0x6e,
-	0x36, 0x4a, 0xc3, 0x1a, 0x44, 0xf5, 0xa2, 0x6a, 0xc2, 0xc3, 0xdf, 0xd3, 0xd1, 0x01, 0x6c, 0x33,
-	0xca, 0x70, 0x20, 0x64, 0x0c, 0xac, 0x2c, 0x29, 0xb5, 0x35, 0x2b, 0x6d, 0xea, 0xd7, 0x26, 0x7c,
-	0x54, 0x35, 0x89, 0x69, 0x44, 0x13, 0x1c, 0xa0, 0x13, 0xd8, 0xe2, 0x72, 0xc4, 0xf1, 0xff, 0x8e,
-	0x95, 0x5d, 0x99, 0x73, 0xdf, 0x0d, 0x89, 0xf3, 0x26, 0x71, 0x2f, 0xae, 0x22, 0x62, 0x09, 0x32,
-	0x3a, 0x84, 0x1d, 0x8f, 0xf8, 0xae, 0xc7, 0xc4, 0x05, 0x43, 0x2b, 0xcf, 0xb8, 0x98, 0x98, 0xae,
-	0x43, 0x67, 0xb4, 0x27, 0xca, 0x59, 0x82, 0x9e, 0xc1, 0x5e, 0x44, 0x83, 0x45, 0x86, 0xb4, 0x26,
-	0x40, 0xdb, 0x33, 0xfb, 0xe9, 0x46, 0x91, 0xce, 0xdf, 0xbe, 0xb6, 0x78, 0xcd, 0x92, 0x22, 0x1a,
-	0x88, 0x08, 0xbd, 0x82, 0xd2, 0x92, 0xdb, 0xbb, 0xf0, 0x9d, 0x51, 0x5b, 0x18, 0xa7, 0x3e, 0x60,
-	0x5c, 0xbe, 0x09, 0x73, 0x3f, 0xdd, 0x28, 0xdd, 0x3c, 0xb1, 0xba, 0xa2, 0xc1, 0xcc, 0x41, 0x26,
-	0xec, 0x95, 0x6b, 0x1c, 0x75, 0x44, 0xb3, 0xb1, 0x9e, 0x2d, 0x5a, 0x2f, 0x16, 0xad, 0x5f, 0x14,
-	0x0c, 0x53, 0xe2, 0xbe, 0x5f, 0x7f, 0x53, 0x80, 0x55, 0x1d, 0x43, 0x53, 0x28, 0xd9, 0x1e, 0xf6,
-	0x43, 0xae, 0xa7, 0x3b, 0x01, 0x5a, 0x2f, 0xbb, 0xeb, 0x8c, 0xd7, 0xf8, 0x5d, 0x02, 0x9c, 0x39,
-	0xea, 0x0f, 0x00, 0x07, 0xa5, 0xac, 0x4b, 0xca, 0xc8, 0xbf, 0xf0, 0x75, 0x5a, 0x33, 0x8b, 0xdb,
-	0xda, 0xff, 0x83, 0x11, 0x53, 0x28, 0x25, 0x0c, 0x33, 0x52, 0x98, 0x9a, 0xf3, 0xe6, 0xbc, 0xc6,
-	0x79, 0x02, 0xcc, 0x78, 0xe5, 0xb0, 0xf6, 0x03, 0xc3, 0x7e, 0x01, 0xb5, 0x7f, 0x23, 0x1f, 0xf6,
-	0xc5, 0x27, 0x46, 0xc2, 0xc4, 0xa7, 0x21, 0x3a, 0x82, 0x3d, 0x52, 0x24, 0xf9, 0x87, 0x51, 0x15,
-	0xfe, 0x72, 0xbc, 0xc7, 0x35, 0x39, 0x7c, 0xbc, 0x5e, 0xa9, 0x00, 0x9d, 0xe6, 0xe6, 0xb6, 0x85,
-	0xb9, 0x4f, 0x77, 0xcd, 0xfd, 0x45, 0x55, 0x65, 0xb0, 0xf9, 0xee, 0x26, 0x95, 0xc1, 0x6d, 0x2a,
-	0x83, 0xbb, 0x54, 0x06, 0xdf, 0x53, 0x19, 0x5c, 0x6f, 0xe5, 0xc6, 0xed, 0x56, 0x6e, 0xdc, 0x6d,
-	0xe5, 0xc6, 0xfb, 0x53, 0xd7, 0x67, 0xde, 0x7a, 0xa9, 0xdb, 0x74, 0x65, 0xd4, 0x9f, 0x8b, 0x2a,
-	0xcc, 0x1e, 0x9d, 0xfb, 0x4f, 0xc9, 0xb2, 0x23, 0xea, 0x27, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff,
-	0x27, 0xae, 0x20, 0x03, 0xcd, 0x04, 0x00, 0x00,
+	// 572 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
+	0x18, 0xcc, 0xb6, 0xf9, 0x71, 0xb6, 0x09, 0x84, 0x55, 0x55, 0x85, 0x50, 0xd9, 0x51, 0x90, 0xa2,
+	0x70, 0xb1, 0xa5, 0x16, 0x89, 0xbb, 0x0b, 0x12, 0x41, 0x20, 0x2a, 0xa7, 0xea, 0x81, 0x4b, 0xb4,
+	0xb1, 0x17, 0xdb, 0xc2, 0xf1, 0x5a, 0xf6, 0x46, 0x22, 0x17, 0x9e, 0xa1, 0x8f, 0xc3, 0x23, 0xf4,
+	0xd8, 0x63, 0xb9, 0x04, 0xe4, 0xdc, 0x78, 0x0a, 0xb4, 0x9f, 0x1d, 0x3b, 0x34, 0x50, 0x89, 0x0b,
+	0x97, 0x68, 0xbf, 0x99, 0xd9, 0x6f, 0xe7, 0x9b, 0x8d, 0x17, 0xf7, 0x05, 0x0b, 0x1d, 0x16, 0xcf,
+	0xfd, 0x50, 0x18, 0x62, 0x19, 0xb1, 0xc4, 0xb0, 0x69, 0xc8, 0x43, 0xdf, 0xa6, 0x81, 0x1e, 0xc5,
+	0x5c, 0x70, 0xd2, 0x29, 0x15, 0x3a, 0x28, 0x7a, 0x87, 0x2e, 0x77, 0x39, 0x90, 0x86, 0x5c, 0x65,
+	0xba, 0xde, 0xf1, 0x4e, 0x27, 0xf8, 0xcd, 0xd9, 0x27, 0x3b, 0xac, 0x43, 0x13, 0x2f, 0x27, 0x35,
+	0x97, 0x73, 0x37, 0x60, 0x06, 0x54, 0xb3, 0xc5, 0x47, 0x43, 0xf8, 0x73, 0x96, 0x08, 0x3a, 0x8f,
+	0x32, 0xc1, 0xe0, 0x0b, 0xee, 0x9c, 0x6d, 0x6c, 0x99, 0x01, 0xb7, 0x3f, 0x8d, 0x5f, 0x12, 0x82,
+	0xab, 0x1e, 0x4d, 0xbc, 0x2e, 0xea, 0xa3, 0x51, 0xcb, 0x82, 0x35, 0xb9, 0xc4, 0x0f, 0x23, 0x1a,
+	0x8b, 0x69, 0xc2, 0xc4, 0xd4, 0x63, 0xd4, 0x61, 0x71, 0x77, 0xaf, 0x8f, 0x46, 0x07, 0x27, 0x23,
+	0xfd, 0xee, 0x14, 0x7a, 0xd1, 0xf0, 0x9c, 0xc6, 0x62, 0xc2, 0xc4, 0x6b, 0xd0, 0x9b, 0xd5, 0xeb,
+	0x95, 0x56, 0xb1, 0xda, 0xd1, 0x36, 0x38, 0x30, 0xf1, 0xd1, 0x9f, 0xe5, 0xe4, 0x10, 0xd7, 0x04,
+	0x17, 0x34, 0x00, 0x1b, 0x6d, 0x2b, 0x2b, 0x0a, 0x6f, 0x7b, 0xa5, 0xb7, 0xc1, 0xb7, 0x3d, 0xfc,
+	0xa8, 0x6c, 0x12, 0xf3, 0x88, 0x27, 0x34, 0x20, 0xa7, 0xb8, 0x2a, 0xed, 0xc0, 0xf6, 0x07, 0x27,
+	0xda, 0xae, 0xcd, 0x89, 0xef, 0x86, 0xcc, 0x79, 0x97, 0xb8, 0x17, 0xcb, 0x88, 0x59, 0x20, 0x26,
+	0x47, 0xb8, 0xee, 0x31, 0xdf, 0xf5, 0x04, 0x1c, 0xd0, 0xb1, 0xf2, 0x4a, 0x9a, 0x89, 0xf9, 0x22,
+	0x74, 0xba, 0xfb, 0x00, 0x67, 0x05, 0x79, 0x86, 0x9b, 0x11, 0x0f, 0xa6, 0x19, 0x53, 0xed, 0xa3,
+	0xd1, 0xbe, 0xd9, 0x4a, 0x57, 0x9a, 0x72, 0xfe, 0xfe, 0xad, 0x25, 0x31, 0x4b, 0x89, 0x78, 0x00,
+	0x2b, 0xf2, 0x06, 0x2b, 0x33, 0x19, 0xef, 0xd4, 0x77, 0xba, 0x35, 0x08, 0x6e, 0x70, 0x4f, 0x70,
+	0xf9, 0x4d, 0x98, 0x07, 0xe9, 0x4a, 0x6b, 0xe4, 0x85, 0xd5, 0x80, 0x06, 0x63, 0x87, 0x98, 0xb8,
+	0x59, 0x5c, 0x63, 0xb7, 0x0e, 0xcd, 0x7a, 0x7a, 0x76, 0xd1, 0xfa, 0xe6, 0xa2, 0xf5, 0x8b, 0x8d,
+	0xc2, 0x54, 0x64, 0xee, 0x57, 0xdf, 0x35, 0x64, 0x95, 0xdb, 0xc8, 0x10, 0x2b, 0xb6, 0x47, 0xfd,
+	0x50, 0xfa, 0x69, 0xf4, 0xd1, 0xa8, 0x99, 0x9d, 0x75, 0x26, 0x31, 0x79, 0x16, 0x90, 0x63, 0x67,
+	0xf0, 0x13, 0xe1, 0x76, 0x61, 0xeb, 0x92, 0x0b, 0xf6, 0x3f, 0x72, 0x1d, 0x6e, 0x85, 0x25, 0x63,
+	0x6d, 0xfd, 0x25, 0x88, 0x21, 0x56, 0x12, 0x41, 0x05, 0xdb, 0x84, 0x9a, 0xeb, 0x26, 0x12, 0x93,
+	0x3a, 0x20, 0x33, 0x5d, 0x31, 0xac, 0x7d, 0xcf, 0xb0, 0x5f, 0xd1, 0xd6, 0xbf, 0x51, 0x0e, 0xfb,
+	0xea, 0xb3, 0x60, 0x61, 0xe2, 0xf3, 0x90, 0x1c, 0xe3, 0x26, 0xdb, 0x14, 0xf9, 0x87, 0x51, 0x02,
+	0xff, 0x38, 0xde, 0xe3, 0x2d, 0x3b, 0x72, 0xbc, 0x66, 0xe1, 0x80, 0xbc, 0xc8, 0xc3, 0xad, 0x41,
+	0xb8, 0x4f, 0x77, 0xc3, 0xfd, 0xcd, 0x55, 0x19, 0xb0, 0x69, 0x5d, 0xa7, 0x2a, 0xba, 0x49, 0x55,
+	0x74, 0x9b, 0xaa, 0xe8, 0x47, 0xaa, 0xa2, 0xab, 0xb5, 0x5a, 0xb9, 0x59, 0xab, 0x95, 0xdb, 0xb5,
+	0x5a, 0xf9, 0xf0, 0xdc, 0xf5, 0x85, 0xb7, 0x98, 0xe9, 0x36, 0x9f, 0xc3, 0xeb, 0x10, 0xd1, 0xa5,
+	0x91, 0xb5, 0x96, 0x55, 0xf6, 0x3a, 0x18, 0x77, 0xdf, 0x91, 0x59, 0x1d, 0xf0, 0xd3, 0x5f, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0x6c, 0x81, 0xf7, 0xae, 0xca, 0x04, 0x00, 0x00,
 }
 
 func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto
index a8724a17a0..c88923b7a5 100644
--- a/proto/tendermint/types/canonical.proto
+++ b/proto/tendermint/types/canonical.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package                       = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package                       = "github.com/dashpay/tenderdash/proto/tendermint/types";
 option (gogoproto.stable_marshaler_all) = true;
 
 import "gogoproto/gogo.proto";
diff --git a/proto/tendermint/types/dash.pb.go b/proto/tendermint/types/dash.pb.go
index b75988719e..661526d33a 100644
--- a/proto/tendermint/types/dash.pb.go
+++ b/proto/tendermint/types/dash.pb.go
@@ -181,7 +181,7 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/dash.proto", fileDescriptor_098b09a14a95d15e) }
 
 var fileDescriptor_098b09a14a95d15e = []byte{
-	// 326 bytes of a gzipped FileDescriptorProto
+	// 332 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x49, 0x2c,
 	0xce, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0x48, 0xea, 0x81, 0x25, 0xa5, 0x44,
@@ -198,11 +198,11 @@ var fileDescriptor_098b09a14a95d15e = []byte{
 	0x0c, 0x75, 0x10, 0x42, 0x00, 0xbf, 0x63, 0xb4, 0xcc, 0xb9, 0x04, 0x31, 0x8c, 0x15, 0xe2, 0xe6,
 	0x62, 0x77, 0x71, 0x75, 0x73, 0x0c, 0xf5, 0x09, 0x11, 0x60, 0x10, 0x12, 0xe5, 0x12, 0x0c, 0xf1,
 	0x08, 0x72, 0x0d, 0xf6, 0xf0, 0xf7, 0x71, 0x89, 0x0f, 0x72, 0x75, 0xf6, 0x0f, 0x73, 0x0d, 0x12,
-	0x60, 0x74, 0x0a, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18,
-	0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xf3, 0xf4,
-	0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xe4, 0x38, 0x43, 0x30, 0x21, 0xd1,
-	0x82, 0x1e, 0x9f, 0x49, 0x6c, 0x60, 0x71, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0x0c,
-	0x0c, 0xeb, 0xea, 0x01, 0x00, 0x00,
+	0x60, 0x74, 0xf2, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18,
+	0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x93, 0xf4,
+	0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x70, 0x14, 0x15, 0x24, 0x56, 0xea, 0x43,
+	0xfc, 0x02, 0xe2, 0xe9, 0x43, 0xe2, 0x04, 0x3d, 0x32, 0x93, 0xd8, 0xc0, 0xe2, 0xc6, 0x80, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x57, 0xe9, 0x12, 0xcd, 0xe7, 0x01, 0x00, 0x00,
 }
 
 func (this *CoreChainLock) Equal(that interface{}) bool {
diff --git a/proto/tendermint/types/dash.proto b/proto/tendermint/types/dash.proto
index ad9f558ce5..237c3ed768 100644
--- a/proto/tendermint/types/dash.proto
+++ b/proto/tendermint/types/dash.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/tendermint/types/events.pb.go b/proto/tendermint/types/events.pb.go
index a9aa26a799..0dc9c69941 100644
--- a/proto/tendermint/types/events.pb.go
+++ b/proto/tendermint/types/events.pb.go
@@ -89,7 +89,7 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/events.proto", fileDescriptor_72cfafd446dedf7c) }
 
 var fileDescriptor_72cfafd446dedf7c = []byte{
-	// 189 bytes of a gzipped FileDescriptorProto
+	// 198 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x2d, 0x4b,
 	0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0x48, 0xeb, 0x81, 0xa5,
@@ -97,11 +97,12 @@ var fileDescriptor_72cfafd446dedf7c = []byte{
 	0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0xc4, 0xb8, 0xd8, 0x32, 0x52, 0x33, 0xd3, 0x33, 0x4a, 0x24,
 	0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xa0, 0x3c, 0x21, 0x11, 0x2e, 0xd6, 0x22, 0x90, 0x2a, 0x09,
 	0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x08, 0x47, 0x48, 0x88, 0x8b, 0xa5, 0xb8, 0x24, 0xb5, 0x40,
-	0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0x0a, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2,
+	0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0xf2, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2,
 	0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1,
-	0xc6, 0x63, 0x39, 0x86, 0x28, 0xf3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c,
-	0x7d, 0x64, 0xe7, 0x22, 0x98, 0x60, 0xc7, 0xea, 0xa3, 0x7b, 0x25, 0x89, 0x0d, 0x2c, 0x6e, 0x0c,
-	0x08, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xe9, 0x14, 0x02, 0xe5, 0x00, 0x00, 0x00,
+	0xc6, 0x63, 0x39, 0x86, 0x28, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c,
+	0xfd, 0x94, 0xc4, 0xe2, 0x8c, 0x82, 0xc4, 0x4a, 0x7d, 0x88, 0xbb, 0x40, 0x3c, 0x7d, 0xb0, 0x4b,
+	0xf5, 0xd1, 0xfd, 0x91, 0xc4, 0x06, 0x16, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x86, 0x61,
+	0x58, 0x54, 0xe2, 0x00, 0x00, 0x00,
 }
 
 func (m *EventDataRoundState) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/types/events.proto b/proto/tendermint/types/events.proto
index a1e5cc498d..f823b7f958 100644
--- a/proto/tendermint/types/events.proto
+++ b/proto/tendermint/types/events.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/types";
 
 message EventDataRoundState {
   int64  height = 1;
diff --git a/proto/tendermint/types/evidence.pb.go b/proto/tendermint/types/evidence.pb.go
index d791c7b967..741a8bd40d 100644
--- a/proto/tendermint/types/evidence.pb.go
+++ b/proto/tendermint/types/evidence.pb.go
@@ -230,31 +230,32 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/evidence.proto", fileDescriptor_6825fabc78e0a168) }
 
 var fileDescriptor_6825fabc78e0a168 = []byte{
-	// 383 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4e, 0xea, 0x40,
-	0x14, 0xc6, 0x5b, 0x0a, 0x84, 0x3b, 0xf7, 0xe6, 0x5e, 0xd2, 0x5c, 0xb4, 0x21, 0xa6, 0x25, 0x6c,
-	0x60, 0xa1, 0xd3, 0x44, 0x17, 0x6e, 0xdc, 0xd8, 0x68, 0xe2, 0x82, 0x85, 0x36, 0x86, 0x85, 0x1b,
-	0x32, 0xa5, 0x63, 0x9d, 0xa4, 0xed, 0x34, 0xed, 0x29, 0xc6, 0xb7, 0xe0, 0xb1, 0x58, 0xb2, 0x74,
-	0xa5, 0x06, 0x5e, 0xc4, 0x74, 0xfa, 0x07, 0x02, 0x24, 0x6e, 0x9a, 0xe9, 0xf9, 0x7e, 0xe7, 0x7c,
-	0x67, 0xce, 0x1c, 0x64, 0x00, 0x0d, 0x5d, 0x1a, 0x07, 0x2c, 0x04, 0x13, 0xde, 0x22, 0x9a, 0x98,
-	0x74, 0xc6, 0x5c, 0x1a, 0x4e, 0x29, 0x8e, 0x62, 0x0e, 0x5c, 0x6d, 0x6f, 0x00, 0x2c, 0x80, 0xee,
-	0x7f, 0x8f, 0x7b, 0x5c, 0x88, 0x66, 0x76, 0xca, 0xb9, 0xae, 0xe1, 0x71, 0xee, 0xf9, 0xd4, 0x14,
-	0x7f, 0x4e, 0xfa, 0x6c, 0x02, 0x0b, 0x68, 0x02, 0x24, 0x88, 0x0a, 0xe0, 0x64, 0xcf, 0x49, 0x7c,
-	0x73, 0xb5, 0x0f, 0xa8, 0x75, 0x5b, 0x18, 0xab, 0x04, 0x1d, 0xbb, 0x69, 0xe4, 0xb3, 0x29, 0x01,
-	0x3a, 0x99, 0x71, 0xa0, 0x93, 0xb2, 0x27, 0x4d, 0xee, 0xc9, 0xc3, 0xdf, 0xe7, 0x03, 0xbc, 0xdb,
-	0x14, 0xbe, 0x29, 0x13, 0xc6, 0x1c, 0x68, 0x59, 0xe9, 0x4e, 0xb2, 0x3b, 0xee, 0x21, 0xc1, 0x6a,
-	0x20, 0x25, 0x49, 0x83, 0xfe, 0xbc, 0x86, 0x3a, 0x07, 0x33, 0xd5, 0x33, 0xd4, 0x14, 0xce, 0xa4,
-	0xb0, 0x3c, 0xda, 0xb7, 0xcc, 0x78, 0xbb, 0x91, 0x51, 0xd7, 0x15, 0xee, 0x68, 0xb5, 0x9f, 0x71,
-	0x4b, 0x3d, 0x45, 0x2a, 0x70, 0x20, 0x7e, 0x76, 0x3b, 0x16, 0x7a, 0x93, 0x88, 0xbf, 0xd2, 0x58,
-	0x53, 0x7a, 0xf2, 0x50, 0xb1, 0xdb, 0x42, 0x19, 0x0b, 0xe1, 0x3e, 0x8b, 0xab, 0x03, 0xf4, 0x6f,
-	0x46, 0x7c, 0xe6, 0x12, 0xe0, 0x71, 0x81, 0xd6, 0x05, 0xfa, 0xb7, 0x0a, 0xe7, 0xa0, 0x85, 0x7e,
-	0x55, 0x53, 0xd7, 0x1a, 0xa2, 0x91, 0x2e, 0xce, 0xdf, 0x05, 0x97, 0xef, 0x82, 0x1f, 0x4b, 0xc2,
-	0x6a, 0x2d, 0x3e, 0x0c, 0x69, 0xfe, 0x69, 0xc8, 0xf6, 0x26, 0xad, 0x3f, 0x42, 0x7f, 0xca, 0x21,
-	0x8c, 0x58, 0x02, 0xea, 0x15, 0x6a, 0x6d, 0x4d, 0x5f, 0x11, 0x25, 0xf7, 0xee, 0x56, 0xcd, 0xb5,
-	0x9e, 0x95, 0xb4, 0xab, 0x0c, 0xeb, 0x61, 0xb1, 0xd2, 0xe5, 0xe5, 0x4a, 0x97, 0xbf, 0x56, 0xba,
-	0x3c, 0x5f, 0xeb, 0xd2, 0x72, 0xad, 0x4b, 0xef, 0x6b, 0x5d, 0x7a, 0xba, 0xf4, 0x18, 0xbc, 0xa4,
-	0x0e, 0x9e, 0xf2, 0xc0, 0xdc, 0xde, 0x8c, 0xcd, 0x31, 0x5f, 0xb1, 0xdd, 0xad, 0x71, 0x9a, 0x22,
-	0x7e, 0xf1, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x36, 0x45, 0x0d, 0x06, 0xba, 0x02, 0x00, 0x00,
+	// 386 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4a, 0xc3, 0x40,
+	0x10, 0xc6, 0x93, 0xa6, 0x2d, 0x75, 0x15, 0x2d, 0xc1, 0x6a, 0x28, 0x92, 0x94, 0x5e, 0xda, 0x83,
+	0xee, 0x82, 0x7a, 0xf4, 0x62, 0x50, 0xf0, 0x50, 0x44, 0x82, 0xf4, 0xe0, 0xa5, 0x6c, 0x9a, 0x35,
+	0x5d, 0x48, 0xb2, 0x21, 0xd9, 0x54, 0xfa, 0x16, 0x7d, 0xac, 0x1e, 0x7b, 0xf4, 0xa4, 0xd2, 0xbe,
+	0x88, 0x64, 0xf3, 0xa7, 0xd2, 0x16, 0xbc, 0x84, 0xec, 0x7c, 0xbf, 0x99, 0x6f, 0x76, 0x76, 0x80,
+	0xc1, 0x49, 0xe0, 0x90, 0xc8, 0xa7, 0x01, 0x47, 0x7c, 0x16, 0x92, 0x18, 0x91, 0x29, 0x75, 0x48,
+	0x30, 0x26, 0x30, 0x8c, 0x18, 0x67, 0x6a, 0x73, 0x03, 0x40, 0x01, 0xb4, 0x4f, 0x5d, 0xe6, 0x32,
+	0x21, 0xa2, 0xf4, 0x2f, 0xe3, 0xda, 0x86, 0xcb, 0x98, 0xeb, 0x11, 0x24, 0x4e, 0x76, 0xf2, 0x8e,
+	0x38, 0xf5, 0x49, 0xcc, 0xb1, 0x1f, 0xe6, 0xc0, 0xc5, 0x8e, 0x93, 0xf8, 0x66, 0x6a, 0x97, 0x83,
+	0xc6, 0x63, 0x6e, 0xac, 0x62, 0x70, 0xee, 0x24, 0xa1, 0x47, 0xc7, 0x98, 0x93, 0xd1, 0x94, 0x71,
+	0x32, 0x2a, 0x7a, 0xd2, 0xe4, 0x8e, 0xdc, 0x3f, 0xbc, 0xee, 0xc1, 0xed, 0xa6, 0xe0, 0x43, 0x91,
+	0x30, 0x64, 0x9c, 0x14, 0x95, 0x9e, 0x24, 0xab, 0xe5, 0xec, 0x13, 0xcc, 0x1a, 0x50, 0xe2, 0xc4,
+	0xef, 0xce, 0x2b, 0xa0, 0xb5, 0x37, 0x53, 0xbd, 0x02, 0x75, 0xe1, 0x8c, 0x73, 0xcb, 0xb3, 0x5d,
+	0xcb, 0x94, 0xb7, 0x6a, 0x29, 0x75, 0x5f, 0xe2, 0xb6, 0x56, 0xf9, 0x1f, 0x37, 0xd5, 0x4b, 0xa0,
+	0x72, 0xc6, 0xb1, 0x97, 0xde, 0x8e, 0x06, 0xee, 0x28, 0x64, 0x1f, 0x24, 0xd2, 0x94, 0x8e, 0xdc,
+	0x57, 0xac, 0xa6, 0x50, 0x86, 0x42, 0x78, 0x49, 0xe3, 0x6a, 0x0f, 0x9c, 0x4c, 0xb1, 0x47, 0x1d,
+	0xcc, 0x59, 0x94, 0xa3, 0x55, 0x81, 0x1e, 0x97, 0xe1, 0x0c, 0x34, 0xc1, 0x41, 0x39, 0x75, 0xad,
+	0x26, 0x1a, 0x69, 0xc3, 0xec, 0x5d, 0x60, 0xf1, 0x2e, 0xf0, 0xb5, 0x20, 0xcc, 0xc6, 0xe2, 0xcb,
+	0x90, 0xe6, 0xdf, 0x86, 0x6c, 0x6d, 0xd2, 0xba, 0x03, 0x70, 0x54, 0x0c, 0x61, 0x40, 0x63, 0xae,
+	0xde, 0x81, 0xc6, 0x9f, 0xe9, 0x2b, 0xa2, 0xe4, 0xce, 0xdd, 0xca, 0xb9, 0x56, 0xd3, 0x92, 0x56,
+	0x99, 0x61, 0x3e, 0x2f, 0x56, 0xba, 0xbc, 0x5c, 0xe9, 0xf2, 0xcf, 0x4a, 0x97, 0xe7, 0x6b, 0x5d,
+	0x5a, 0xae, 0x75, 0xe9, 0x73, 0xad, 0x4b, 0x6f, 0xb7, 0x2e, 0xe5, 0x93, 0xc4, 0x86, 0x63, 0xe6,
+	0x23, 0x07, 0xc7, 0x93, 0x10, 0xcf, 0x50, 0x56, 0x37, 0x3d, 0x65, 0x6b, 0x84, 0xb6, 0x57, 0xc6,
+	0xae, 0x8b, 0xf8, 0xcd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xdf, 0x62, 0x23, 0xb7, 0x02,
+	0x00, 0x00,
 }
 
 func (m *Evidence) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/types/evidence.proto b/proto/tendermint/types/evidence.proto
index b09ae65715..00fcf75929 100644
--- a/proto/tendermint/types/evidence.proto
+++ b/proto/tendermint/types/evidence.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/tendermint/types/params.pb.go b/proto/tendermint/types/params.pb.go
index 0eb30849b9..1d48708289 100644
--- a/proto/tendermint/types/params.pb.go
+++ b/proto/tendermint/types/params.pb.go
@@ -636,53 +636,53 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/params.proto", fileDescriptor_e12598271a686f57) }
 
 var fileDescriptor_e12598271a686f57 = []byte{
-	// 723 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xdf, 0x6e, 0xd3, 0x30,
-	0x14, 0xc6, 0x9b, 0xb5, 0xeb, 0xda, 0xd3, 0x75, 0x9d, 0x0c, 0x88, 0x30, 0x58, 0x3a, 0x72, 0x81,
-	0x26, 0x4d, 0x4a, 0xa7, 0x4d, 0x68, 0x42, 0xe2, 0x8f, 0xd6, 0x16, 0x01, 0x42, 0x43, 0x28, 0x0c,
-	0x2e, 0x76, 0x13, 0x39, 0xa9, 0x49, 0xa3, 0x35, 0x71, 0x14, 0x27, 0x55, 0xf3, 0x16, 0x5c, 0x21,
-	0x1e, 0x01, 0x6e, 0x78, 0x8e, 0x5d, 0xee, 0x92, 0x2b, 0x40, 0xdd, 0x1b, 0xf0, 0x04, 0xc8, 0x8e,
-	0xb3, 0xae, 0x1d, 0x63, 0xbd, 0x8a, 0xe3, 0xf3, 0xfd, 0x7c, 0xe2, 0xef, 0x9c, 0xd8, 0xb0, 0x1e,
-	0x93, 0xa0, 0x47, 0x22, 0xdf, 0x0b, 0xe2, 0x56, 0x9c, 0x86, 0x84, 0xb5, 0x42, 0x1c, 0x61, 0x9f,
-	0x19, 0x61, 0x44, 0x63, 0x8a, 0x56, 0x27, 0x61, 0x43, 0x84, 0xd7, 0x6e, 0xba, 0xd4, 0xa5, 0x22,
-	0xd8, 0xe2, 0xa3, 0x4c, 0xb7, 0xa6, 0xb9, 0x94, 0xba, 0x03, 0xd2, 0x12, 0x6f, 0x76, 0xf2, 0xb1,
-	0xd5, 0x4b, 0x22, 0x1c, 0x7b, 0x34, 0xc8, 0xe2, 0xfa, 0xf7, 0x22, 0x34, 0x3a, 0x34, 0x60, 0x24,
-	0x60, 0x09, 0x7b, 0x2b, 0x32, 0xa0, 0x5d, 0x58, 0xb4, 0x07, 0xd4, 0x39, 0x56, 0x95, 0x0d, 0x65,
-	0xb3, 0xb6, 0xb3, 0x6e, 0xcc, 0xe6, 0x32, 0xda, 0x3c, 0x9c, 0xa9, 0xcd, 0x4c, 0x8b, 0x1e, 0x43,
-	0x85, 0x0c, 0xbd, 0x1e, 0x09, 0x1c, 0xa2, 0x2e, 0x08, 0x6e, 0xe3, 0x32, 0xf7, 0x5c, 0x2a, 0x24,
-	0x7a, 0x4e, 0xa0, 0x67, 0x50, 0x1d, 0xe2, 0x81, 0xd7, 0xc3, 0x31, 0x8d, 0xd4, 0xa2, 0xc0, 0xef,
-	0x5f, 0xc6, 0x3f, 0xe4, 0x12, 0xc9, 0x4f, 0x18, 0xf4, 0x08, 0x96, 0x86, 0x24, 0x62, 0x1e, 0x0d,
-	0xd4, 0x92, 0xc0, 0x9b, 0xff, 0xc0, 0x33, 0x81, 0x84, 0x73, 0x3d, 0xcf, 0xcd, 0xd2, 0xc0, 0xe9,
-	0x47, 0x34, 0x48, 0xd5, 0xc5, 0xab, 0x72, 0xbf, 0xcb, 0x25, 0x79, 0xee, 0x73, 0x86, 0xe7, 0x8e,
-	0x3d, 0x9f, 0xd0, 0x24, 0x56, 0xcb, 0x57, 0xe5, 0x3e, 0xcc, 0x04, 0x79, 0x6e, 0xa9, 0x47, 0xdb,
-	0x50, 0xc2, 0xb6, 0xe3, 0xa9, 0x4b, 0x82, 0xbb, 0x77, 0x99, 0xdb, 0x6f, 0x77, 0x5e, 0x49, 0x48,
-	0x28, 0xf5, 0x0e, 0xd4, 0x2e, 0xb8, 0x8f, 0xee, 0x42, 0xd5, 0xc7, 0x23, 0xcb, 0x4e, 0x63, 0xc2,
-	0x44, 0xbd, 0x8a, 0x66, 0xc5, 0xc7, 0xa3, 0x36, 0x7f, 0x47, 0xb7, 0x61, 0x89, 0x07, 0x5d, 0xcc,
-	0x44, 0x49, 0x8a, 0x66, 0xd9, 0xc7, 0xa3, 0x17, 0x98, 0xe9, 0xdf, 0x14, 0x58, 0x99, 0xae, 0x05,
-	0xda, 0x02, 0xc4, 0xb5, 0xd8, 0x25, 0x56, 0x90, 0xf8, 0x96, 0x28, 0x6a, 0xbe, 0x62, 0xc3, 0xc7,
-	0xa3, 0x7d, 0x97, 0xbc, 0x49, 0x7c, 0x91, 0x9a, 0xa1, 0x03, 0x58, 0xcd, 0xc5, 0x79, 0x3f, 0xc9,
-	0xa2, 0xdf, 0x31, 0xb2, 0x86, 0x33, 0xf2, 0x86, 0x33, 0xba, 0x52, 0xd0, 0xae, 0x9c, 0xfc, 0x6c,
-	0x16, 0xbe, 0xfc, 0x6a, 0x2a, 0xe6, 0x4a, 0xb6, 0x5e, 0x1e, 0x99, 0xde, 0x44, 0x71, 0x7a, 0x13,
-	0xfa, 0x43, 0x68, 0xcc, 0xd4, 0x1d, 0xe9, 0x50, 0x0f, 0x13, 0xdb, 0x3a, 0x26, 0xa9, 0x25, 0x5c,
-	0x52, 0x95, 0x8d, 0xe2, 0x66, 0xd5, 0xac, 0x85, 0x89, 0xfd, 0x9a, 0xa4, 0x87, 0x7c, 0x4a, 0xdf,
-	0x86, 0xfa, 0x54, 0xbd, 0x51, 0x13, 0x6a, 0x38, 0x0c, 0xad, 0xbc, 0x4b, 0xf8, 0xce, 0x4a, 0x26,
-	0xe0, 0x30, 0x94, 0x32, 0xfd, 0x08, 0x96, 0x5f, 0x62, 0xd6, 0x27, 0x3d, 0x09, 0x3c, 0x80, 0x86,
-	0x70, 0xc1, 0x9a, 0x35, 0xb8, 0x2e, 0xa6, 0x0f, 0x72, 0x97, 0x75, 0xa8, 0x4f, 0x74, 0x13, 0xaf,
-	0x6b, 0xb9, 0x8a, 0x1b, 0xfe, 0x59, 0x81, 0xc6, 0x4c, 0x07, 0xa1, 0x2e, 0xd4, 0x7d, 0xc2, 0x98,
-	0x30, 0x91, 0x0c, 0x70, 0x2a, 0x7f, 0xb7, 0xff, 0x38, 0x58, 0x12, 0xee, 0x2d, 0x4b, 0xaa, 0xcb,
-	0x21, 0xf4, 0x04, 0xaa, 0x61, 0x44, 0x1c, 0x8f, 0xcd, 0x55, 0x83, 0x6c, 0x85, 0x09, 0xa1, 0xff,
-	0x59, 0x80, 0xfa, 0x54, 0x6f, 0xf2, 0x6e, 0x0e, 0x23, 0x1a, 0x52, 0x46, 0xe6, 0xfd, 0xa0, 0x5c,
-	0xcf, 0x77, 0x24, 0x87, 0x7c, 0x47, 0x31, 0x9e, 0xf7, 0x7b, 0x96, 0x25, 0xd5, 0xe5, 0x10, 0xda,
-	0x85, 0xd2, 0x90, 0xc6, 0x44, 0x1e, 0x03, 0xd7, 0xc2, 0x42, 0x8c, 0x9e, 0x02, 0xf0, 0xa7, 0xcc,
-	0x5b, 0x9a, 0xd3, 0x07, 0x8e, 0x64, 0x49, 0xf7, 0xa0, 0xec, 0x50, 0xdf, 0xf7, 0x62, 0x79, 0x02,
-	0x5c, 0xcb, 0x4a, 0x39, 0xda, 0x81, 0x5b, 0x76, 0x1a, 0x62, 0xc6, 0xac, 0x6c, 0xc2, 0xba, 0x78,
-	0x14, 0x54, 0xcc, 0x1b, 0x59, 0xb0, 0x23, 0x62, 0xd2, 0x68, 0x7d, 0x0b, 0x60, 0xf2, 0x5f, 0xa3,
-	0x75, 0x80, 0x88, 0x38, 0x7d, 0xe2, 0x1c, 0x5b, 0xf1, 0x48, 0x78, 0x5e, 0x31, 0xab, 0x72, 0xe6,
-	0x70, 0xd4, 0x7e, 0xff, 0x75, 0xac, 0x29, 0x27, 0x63, 0x4d, 0x39, 0x1d, 0x6b, 0xca, 0xef, 0xb1,
-	0xa6, 0x7c, 0x3a, 0xd3, 0x0a, 0xa7, 0x67, 0x5a, 0xe1, 0xc7, 0x99, 0x56, 0x38, 0xda, 0x73, 0xbd,
-	0xb8, 0x9f, 0xd8, 0x86, 0x43, 0xfd, 0xd6, 0xc5, 0x1b, 0x63, 0x32, 0xcc, 0xae, 0x84, 0xd9, 0xdb,
-	0xc4, 0x2e, 0x8b, 0xf9, 0xdd, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x6f, 0x05, 0x4e, 0x68,
-	0x06, 0x00, 0x00,
+	// 731 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xcf, 0x6e, 0xd3, 0x4a,
+	0x14, 0xc6, 0xe3, 0x26, 0x4d, 0x93, 0x93, 0xa6, 0xa9, 0xe6, 0xde, 0xab, 0xeb, 0xdb, 0x4b, 0x9d,
+	0xe2, 0x05, 0xaa, 0x54, 0xc9, 0xae, 0x5a, 0x10, 0x42, 0xe2, 0x8f, 0x9a, 0x04, 0x01, 0x42, 0x45,
+	0xc8, 0x54, 0x2c, 0xba, 0xb1, 0xc6, 0xce, 0xe0, 0x58, 0x8d, 0x3d, 0x96, 0xc7, 0x8e, 0xe2, 0xb7,
+	0x60, 0x85, 0x78, 0x04, 0xd8, 0xf0, 0x1c, 0x5d, 0x76, 0xc9, 0x0a, 0x50, 0xfa, 0x06, 0x3c, 0x01,
+	0x9a, 0xf1, 0xb8, 0x69, 0x52, 0x4a, 0xb3, 0x8a, 0x3d, 0xe7, 0xfb, 0xf9, 0xf3, 0x7c, 0xe7, 0x78,
+	0x02, 0x9b, 0x09, 0x09, 0xfb, 0x24, 0x0e, 0xfc, 0x30, 0x31, 0x93, 0x2c, 0x22, 0xcc, 0x8c, 0x70,
+	0x8c, 0x03, 0x66, 0x44, 0x31, 0x4d, 0x28, 0x5a, 0x9f, 0x96, 0x0d, 0x51, 0xde, 0xf8, 0xdb, 0xa3,
+	0x1e, 0x15, 0x45, 0x93, 0x5f, 0xe5, 0xba, 0x0d, 0xcd, 0xa3, 0xd4, 0x1b, 0x12, 0x53, 0xdc, 0x39,
+	0xe9, 0x3b, 0xb3, 0x9f, 0xc6, 0x38, 0xf1, 0x69, 0x98, 0xd7, 0xf5, 0x2f, 0x65, 0x68, 0x75, 0x69,
+	0xc8, 0x48, 0xc8, 0x52, 0xf6, 0x5a, 0x38, 0xa0, 0x7d, 0x58, 0x76, 0x86, 0xd4, 0x3d, 0x51, 0x95,
+	0x2d, 0x65, 0xbb, 0xb1, 0xb7, 0x69, 0xcc, 0x7b, 0x19, 0x1d, 0x5e, 0xce, 0xd5, 0x56, 0xae, 0x45,
+	0x0f, 0xa1, 0x46, 0x46, 0x7e, 0x9f, 0x84, 0x2e, 0x51, 0x97, 0x04, 0xb7, 0x75, 0x95, 0x7b, 0x2a,
+	0x15, 0x12, 0xbd, 0x20, 0xd0, 0x13, 0xa8, 0x8f, 0xf0, 0xd0, 0xef, 0xe3, 0x84, 0xc6, 0x6a, 0x59,
+	0xe0, 0xb7, 0xaf, 0xe2, 0x6f, 0x0b, 0x89, 0xe4, 0xa7, 0x0c, 0x7a, 0x00, 0x2b, 0x23, 0x12, 0x33,
+	0x9f, 0x86, 0x6a, 0x45, 0xe0, 0xed, 0xdf, 0xe0, 0xb9, 0x40, 0xc2, 0x85, 0x9e, 0x7b, 0xb3, 0x2c,
+	0x74, 0x07, 0x31, 0x0d, 0x33, 0x75, 0xf9, 0x3a, 0xef, 0x37, 0x85, 0xa4, 0xf0, 0xbe, 0x60, 0xb8,
+	0x77, 0xe2, 0x07, 0x84, 0xa6, 0x89, 0x5a, 0xbd, 0xce, 0xfb, 0x28, 0x17, 0x14, 0xde, 0x52, 0x8f,
+	0x76, 0xa1, 0x82, 0x1d, 0xd7, 0x57, 0x57, 0x04, 0x77, 0xeb, 0x2a, 0x77, 0xd0, 0xe9, 0xbe, 0x90,
+	0x90, 0x50, 0xea, 0x5d, 0x68, 0x5c, 0x4a, 0x1f, 0xfd, 0x0f, 0xf5, 0x00, 0x8f, 0x6d, 0x27, 0x4b,
+	0x08, 0x13, 0xfd, 0x2a, 0x5b, 0xb5, 0x00, 0x8f, 0x3b, 0xfc, 0x1e, 0xfd, 0x0b, 0x2b, 0xbc, 0xe8,
+	0x61, 0x26, 0x5a, 0x52, 0xb6, 0xaa, 0x01, 0x1e, 0x3f, 0xc3, 0x4c, 0xff, 0xac, 0xc0, 0xda, 0x6c,
+	0x2f, 0xd0, 0x0e, 0x20, 0xae, 0xc5, 0x1e, 0xb1, 0xc3, 0x34, 0xb0, 0x45, 0x53, 0x8b, 0x27, 0xb6,
+	0x02, 0x3c, 0x3e, 0xf0, 0xc8, 0xab, 0x34, 0x10, 0xd6, 0x0c, 0x1d, 0xc2, 0x7a, 0x21, 0x2e, 0xe6,
+	0x49, 0x36, 0xfd, 0x3f, 0x23, 0x1f, 0x38, 0xa3, 0x18, 0x38, 0xa3, 0x27, 0x05, 0x9d, 0xda, 0xe9,
+	0xb7, 0x76, 0xe9, 0xe3, 0xf7, 0xb6, 0x62, 0xad, 0xe5, 0xcf, 0x2b, 0x2a, 0xb3, 0x9b, 0x28, 0xcf,
+	0x6e, 0x42, 0xbf, 0x07, 0xad, 0xb9, 0xbe, 0x23, 0x1d, 0x9a, 0x51, 0xea, 0xd8, 0x27, 0x24, 0xb3,
+	0x45, 0x4a, 0xaa, 0xb2, 0x55, 0xde, 0xae, 0x5b, 0x8d, 0x28, 0x75, 0x5e, 0x92, 0xec, 0x88, 0x2f,
+	0xe9, 0xbb, 0xd0, 0x9c, 0xe9, 0x37, 0x6a, 0x43, 0x03, 0x47, 0x91, 0x5d, 0x4c, 0x09, 0xdf, 0x59,
+	0xc5, 0x02, 0x1c, 0x45, 0x52, 0xa6, 0x1f, 0xc3, 0xea, 0x73, 0xcc, 0x06, 0xa4, 0x2f, 0x81, 0x3b,
+	0xd0, 0x12, 0x29, 0xd8, 0xf3, 0x01, 0x37, 0xc5, 0xf2, 0x61, 0x91, 0xb2, 0x0e, 0xcd, 0xa9, 0x6e,
+	0x9a, 0x75, 0xa3, 0x50, 0xf1, 0xc0, 0x3f, 0x28, 0xd0, 0x9a, 0x9b, 0x20, 0xd4, 0x83, 0x66, 0x40,
+	0x18, 0x13, 0x21, 0x92, 0x21, 0xce, 0xe4, 0xe7, 0xf6, 0x87, 0x04, 0x2b, 0x22, 0xbd, 0x55, 0x49,
+	0xf5, 0x38, 0x84, 0x1e, 0x41, 0x3d, 0x8a, 0x89, 0xeb, 0xb3, 0x85, 0x7a, 0x90, 0x3f, 0x61, 0x4a,
+	0xe8, 0x3f, 0x97, 0xa0, 0x39, 0x33, 0x9b, 0x7c, 0x9a, 0xa3, 0x98, 0x46, 0x94, 0x91, 0x45, 0x5f,
+	0xa8, 0xd0, 0xf3, 0x1d, 0xc9, 0x4b, 0xbe, 0xa3, 0x04, 0x2f, 0xfa, 0x3e, 0xab, 0x92, 0xea, 0x71,
+	0x08, 0xed, 0x43, 0x65, 0x44, 0x13, 0x22, 0x8f, 0x81, 0x1b, 0x61, 0x21, 0x46, 0x8f, 0x01, 0xf8,
+	0xaf, 0xf4, 0xad, 0x2c, 0x98, 0x03, 0x47, 0x72, 0xd3, 0xfb, 0x50, 0x75, 0x69, 0x10, 0xf8, 0x89,
+	0x3c, 0x01, 0x6e, 0x64, 0xa5, 0x1c, 0xed, 0xc1, 0x3f, 0x4e, 0x16, 0x61, 0xc6, 0xec, 0x7c, 0xc1,
+	0xbe, 0x7c, 0x14, 0xd4, 0xac, 0xbf, 0xf2, 0x62, 0x57, 0xd4, 0x64, 0xd0, 0xfa, 0x0e, 0xc0, 0xf4,
+	0xbb, 0x46, 0x9b, 0x00, 0x31, 0x71, 0x07, 0xc4, 0x3d, 0xb1, 0x93, 0xb1, 0xc8, 0xbc, 0x66, 0xd5,
+	0xe5, 0xca, 0xd1, 0xb8, 0x63, 0x7d, 0x9a, 0x68, 0xca, 0xe9, 0x44, 0x53, 0xce, 0x26, 0x9a, 0xf2,
+	0x63, 0xa2, 0x29, 0xef, 0xcf, 0xb5, 0xd2, 0xd9, 0xb9, 0x56, 0xfa, 0x7a, 0xae, 0x95, 0x8e, 0xef,
+	0x7a, 0x7e, 0x32, 0x48, 0x1d, 0xc3, 0xa5, 0x81, 0xd9, 0xc7, 0x6c, 0x10, 0xe1, 0xcc, 0xcc, 0x0f,
+	0x11, 0x7e, 0x97, 0x1f, 0xfb, 0xe6, 0xfc, 0x5f, 0x89, 0x53, 0x15, 0xeb, 0xfb, 0xbf, 0x02, 0x00,
+	0x00, 0xff, 0xff, 0xaa, 0x0f, 0x78, 0xde, 0x65, 0x06, 0x00, 0x00,
 }
 
 func (this *ConsensusParams) Equal(that interface{}) bool {
diff --git a/proto/tendermint/types/params.proto b/proto/tendermint/types/params.proto
index b8139b20be..302ca71971 100644
--- a/proto/tendermint/types/params.proto
+++ b/proto/tendermint/types/params.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
diff --git a/proto/tendermint/types/types.go b/proto/tendermint/types/types.go
index 7d96f13248..c32a9a1406 100644
--- a/proto/tendermint/types/types.go
+++ b/proto/tendermint/types/types.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 )
 
 // IsZero returns true when the object is a zero-value or nil
diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go
index 092e0c4da1..07ec7decc8 100644
--- a/proto/tendermint/types/types.pb.go
+++ b/proto/tendermint/types/types.pb.go
@@ -6,12 +6,12 @@ package types
 import (
 	encoding_binary "encoding/binary"
 	fmt "fmt"
+	crypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	version "github.com/dashpay/tenderdash/proto/tendermint/version"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	version "github.com/tendermint/tendermint/proto/tendermint/version"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -1150,106 +1150,106 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) }
 
 var fileDescriptor_d3a6e55e2345de56 = []byte{
-	// 1569 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0xc5,
-	0x17, 0xf7, 0xc6, 0xbf, 0x9f, 0x7f, 0xc4, 0xd9, 0x26, 0xad, 0xe3, 0xb6, 0xf6, 0x7e, 0xfd, 0x15,
-	0x34, 0x20, 0x70, 0x4a, 0x8b, 0x28, 0x54, 0xe2, 0x10, 0x3b, 0x69, 0x63, 0x35, 0x3f, 0xcc, 0xda,
-	0x0d, 0x02, 0x0e, 0xab, 0x8d, 0x77, 0x6a, 0x9b, 0xda, 0xbb, 0xcb, 0xee, 0x38, 0x38, 0x3d, 0x71,
-	0xa3, 0xca, 0xa9, 0x07, 0x84, 0x7a, 0x89, 0x44, 0x05, 0x07, 0xfe, 0x03, 0xee, 0x9c, 0x7a, 0xec,
-	0x0d, 0x0e, 0x28, 0xa0, 0xf4, 0x5f, 0xe0, 0x0c, 0x68, 0xde, 0xcc, 0xda, 0xeb, 0x1f, 0x0d, 0x55,
-	0x0f, 0x5c, 0xac, 0x9d, 0xf7, 0x3e, 0x6f, 0xe6, 0xbd, 0xcf, 0x7c, 0xde, 0xcc, 0x18, 0x2e, 0x51,
-	0x62, 0x1a, 0xc4, 0xe9, 0x75, 0x4c, 0xba, 0x4a, 0x0f, 0x6d, 0xe2, 0xf2, 0xdf, 0x92, 0xed, 0x58,
-	0xd4, 0x92, 0x33, 0x23, 0x6f, 0x09, 0xed, 0xb9, 0xc5, 0x96, 0xd5, 0xb2, 0xd0, 0xb9, 0xca, 0xbe,
-	0x38, 0x2e, 0x57, 0x68, 0x59, 0x56, 0xab, 0x4b, 0x56, 0x71, 0xb4, 0xdf, 0xbf, 0xb7, 0x4a, 0x3b,
-	0x3d, 0xe2, 0x52, 0xbd, 0x67, 0x0b, 0xc0, 0x65, 0xdf, 0x32, 0x4d, 0xe7, 0xd0, 0xa6, 0x16, 0xc3,
-	0x5a, 0xf7, 0x84, 0x3b, 0xef, 0x73, 0x1f, 0x10, 0xc7, 0xed, 0x58, 0xa6, 0x3f, 0x8f, 0xdc, 0xc5,
-	0xa9, 0x2c, 0x0d, 0xdd, 0x6d, 0x0b, 0xa7, 0x32, 0xe5, 0x3c, 0xd0, 0xbb, 0x1d, 0x43, 0xa7, 0x96,
-	0xc3, 0x11, 0xc5, 0x0f, 0x20, 0x55, 0xd3, 0x1d, 0x5a, 0x27, 0x74, 0x93, 0xe8, 0x06, 0x71, 0xe4,
-	0x45, 0x08, 0x53, 0x8b, 0xea, 0xdd, 0xac, 0xa4, 0x48, 0x2b, 0x29, 0x95, 0x0f, 0x64, 0x19, 0x42,
-	0x6d, 0xdd, 0x6d, 0x67, 0xe7, 0x14, 0x69, 0x25, 0xa9, 0xe2, 0x77, 0xb1, 0x0d, 0x21, 0x16, 0xca,
-	0x22, 0x3a, 0xa6, 0x41, 0x06, 0x5e, 0x04, 0x0e, 0x98, 0x75, 0xff, 0x90, 0x12, 0x57, 0x84, 0xf0,
-	0x81, 0xfc, 0x2e, 0x84, 0xb1, 0xb8, 0x6c, 0x50, 0x91, 0x56, 0x12, 0xd7, 0xb2, 0x25, 0x1f, 0x8b,
-	0xbc, 0xf8, 0x52, 0x8d, 0xf9, 0xcb, 0xa1, 0xa7, 0x27, 0x85, 0x80, 0xca, 0xc1, 0xc5, 0x6f, 0x24,
-	0x88, 0x96, 0xbb, 0x56, 0xf3, 0x7e, 0x75, 0x7d, 0x98, 0x89, 0x34, 0xca, 0x44, 0xde, 0x86, 0x79,
-	0x5b, 0x77, 0xa8, 0xe6, 0x12, 0xaa, 0xb5, 0xb1, 0x0c, 0x5c, 0x35, 0x71, 0xad, 0x50, 0x9a, 0xdc,
-	0xa5, 0xd2, 0x58, 0xb5, 0x62, 0x99, 0x94, 0x3d, 0x46, 0xc1, 0xeb, 0x10, 0x73, 0xa9, 0x4e, 0x89,
-	0xd6, 0x31, 0x30, 0xcf, 0x64, 0x39, 0x71, 0x7a, 0x52, 0x88, 0xd6, 0x99, 0xad, 0xba, 0xae, 0x46,
-	0xd1, 0x59, 0x35, 0x8a, 0x7f, 0x4a, 0xe0, 0x19, 0xe5, 0x55, 0x48, 0xe8, 0xb6, 0xad, 0x89, 0x1d,
-	0xc2, 0xec, 0x22, 0xe5, 0xf4, 0xe9, 0x49, 0x01, 0xd6, 0x6c, 0x7b, 0x8f, 0x5b, 0x55, 0xd0, 0x87,
-	0xdf, 0xf2, 0x79, 0x88, 0xb4, 0x49, 0xa7, 0xd5, 0xa6, 0x98, 0x6a, 0x44, 0x15, 0x23, 0xb6, 0x38,
-	0x9b, 0x08, 0x6b, 0xf4, 0x2d, 0xbe, 0x66, 0xdb, 0x9b, 0xba, 0xdb, 0x56, 0xa3, 0x3a, 0xff, 0x90,
-	0x55, 0xc8, 0x36, 0x2d, 0x87, 0x68, 0xcd, 0xb6, 0xde, 0x31, 0x35, 0x46, 0x0e, 0x31, 0x34, 0x31,
-	0x63, 0x48, 0x91, 0x56, 0xa2, 0xe5, 0xe5, 0xd3, 0x93, 0xc2, 0x52, 0xc5, 0x72, 0x48, 0x85, 0x41,
-	0xb6, 0x10, 0xb1, 0x89, 0x00, 0x75, 0xa9, 0x39, 0xcb, 0xcc, 0xb8, 0x65, 0xea, 0xcc, 0x86, 0x31,
-	0x23, 0xfc, 0xbe, 0x99, 0x79, 0xfc, 0x5d, 0x21, 0xf0, 0xf0, 0x49, 0x41, 0x7a, 0xfc, 0xa4, 0x20,
-	0x7d, 0xf5, 0x9b, 0x12, 0x28, 0xfe, 0x15, 0x86, 0x88, 0x60, 0xea, 0x43, 0x88, 0xfa, 0x2b, 0x4e,
-	0x5c, 0xbb, 0xec, 0x27, 0x5c, 0xb8, 0x4a, 0x15, 0xcb, 0x74, 0x89, 0xe9, 0xf6, 0x5d, 0x41, 0xb7,
-	0x17, 0xc3, 0x6a, 0xe5, 0xe9, 0x77, 0x0c, 0x64, 0x21, 0xce, 0x6b, 0xc5, 0xc4, 0x18, 0xd1, 0xe8,
-	0xac, 0x1a, 0x3e, 0xae, 0x18, 0x23, 0xc1, 0x21, 0x57, 0xef, 0x8b, 0x7c, 0x43, 0xb8, 0x76, 0xae,
-	0xc4, 0x5b, 0xad, 0xe4, 0xb5, 0x5a, 0xa9, 0xe1, 0xb5, 0x5a, 0x39, 0xc6, 0x16, 0x7e, 0xf4, 0x7b,
-	0x41, 0xe2, 0x55, 0xc9, 0x15, 0x48, 0x75, 0x75, 0x97, 0x6a, 0xfb, 0x8c, 0x38, 0xb6, 0x7c, 0x18,
-	0xa7, 0x58, 0x9e, 0xd6, 0x8b, 0xd0, 0x9d, 0x48, 0x3d, 0xc1, 0xa2, 0xb8, 0xc9, 0x90, 0x57, 0x20,
-	0x83, 0x93, 0x34, 0xad, 0x5e, 0xaf, 0x43, 0xf9, 0x96, 0x45, 0x50, 0x96, 0x69, 0x66, 0xaf, 0xa0,
-	0x19, 0x37, 0xeb, 0x22, 0xc4, 0x0d, 0x9d, 0xea, 0x1c, 0x12, 0x45, 0x48, 0x8c, 0x19, 0xd0, 0x79,
-	0x05, 0xe6, 0x87, 0x5d, 0xe9, 0x72, 0x48, 0x8c, 0xcf, 0x32, 0x32, 0x23, 0xf0, 0x2a, 0x2c, 0x9a,
-	0x64, 0x40, 0xb5, 0x49, 0x74, 0x1c, 0xd1, 0x32, 0xf3, 0xed, 0x8d, 0x47, 0xbc, 0x06, 0xe9, 0xa6,
-	0x47, 0x3e, 0xc7, 0x02, 0x62, 0x53, 0x43, 0x2b, 0xc2, 0x4a, 0x70, 0x0e, 0x27, 0x9e, 0xc0, 0x26,
-	0x10, 0xbb, 0xc0, 0x5c, 0x95, 0x31, 0xfc, 0xb2, 0x4f, 0xa3, 0x49, 0x04, 0x0d, 0x65, 0xf9, 0x3f,
-	0x48, 0x3a, 0xc4, 0xed, 0x77, 0xa9, 0x98, 0x23, 0x85, 0xee, 0x84, 0xb0, 0x21, 0xe4, 0xff, 0x90,
-	0x22, 0x07, 0x1d, 0x83, 0x98, 0x4d, 0xc2, 0x31, 0x69, 0xc4, 0x24, 0x3d, 0xa3, 0x57, 0xab, 0xed,
-	0x58, 0xb6, 0xe5, 0x12, 0x43, 0xf3, 0x37, 0xd6, 0xbc, 0x22, 0xad, 0x84, 0x54, 0xd9, 0xf3, 0x8d,
-	0x9a, 0x4b, 0x5e, 0x1d, 0x46, 0x38, 0x9a, 0xed, 0x58, 0x1a, 0x1d, 0xf0, 0xd9, 0x33, 0xbc, 0x0a,
-	0xcf, 0x57, 0x73, 0xac, 0xc6, 0x00, 0x97, 0xb8, 0x71, 0x46, 0x07, 0x2d, 0xe0, 0x51, 0x36, 0xbb,
-	0x4d, 0x8a, 0x59, 0x08, 0xad, 0xeb, 0x54, 0x97, 0x33, 0x10, 0xa4, 0x03, 0x37, 0x2b, 0x29, 0xc1,
-	0x95, 0xa4, 0xca, 0x3e, 0x8b, 0x7f, 0xcf, 0x41, 0x68, 0xcf, 0xa2, 0x44, 0xbe, 0x0e, 0x21, 0x26,
-	0x1f, 0xec, 0x8a, 0xf4, 0xac, 0x63, 0xa8, 0xde, 0x69, 0x99, 0xc4, 0xd8, 0x76, 0x5b, 0x8d, 0x43,
-	0x9b, 0xa8, 0x08, 0x9e, 0x38, 0x12, 0x46, 0x32, 0x5f, 0x84, 0xb0, 0x63, 0xf5, 0x4d, 0x7e, 0x18,
-	0x85, 0x55, 0x3e, 0x90, 0x37, 0x20, 0x36, 0x54, 0x6f, 0xe8, 0xdf, 0xd4, 0x3b, 0xcf, 0xd4, 0xcb,
-	0x7a, 0x4b, 0x18, 0xd4, 0xe8, 0xbe, 0x10, 0xf1, 0x3b, 0xb0, 0x34, 0xd4, 0xd3, 0x18, 0x6f, 0x61,
-	0xae, 0xaa, 0xa1, 0x73, 0x44, 0x9c, 0x5f, 0xb0, 0x1a, 0x3f, 0xfa, 0x23, 0x98, 0xd9, 0x48, 0xb0,
-	0x55, 0xbc, 0x03, 0xae, 0xc0, 0x3c, 0x4f, 0xd1, 0xed, 0xb4, 0x4c, 0x9d, 0xf6, 0x1d, 0x22, 0xc4,
-	0x9f, 0x46, 0x73, 0xdd, 0xb3, 0xca, 0x9b, 0x30, 0x7f, 0x60, 0x51, 0xa2, 0x91, 0x01, 0x25, 0x26,
-	0xdb, 0x4d, 0x37, 0x1b, 0x53, 0x82, 0xb3, 0x0f, 0x70, 0xc6, 0xef, 0x86, 0x87, 0x53, 0xd3, 0x07,
-	0xfe, 0xa1, 0x5b, 0xfc, 0x69, 0x0e, 0x22, 0xbc, 0xf1, 0x7c, 0x74, 0x4a, 0xb3, 0xe9, 0x9c, 0x7b,
-	0x11, 0x9d, 0xc1, 0x57, 0xa7, 0xb3, 0x00, 0x89, 0x2f, 0xfa, 0x96, 0xd3, 0xef, 0x71, 0x12, 0x43,
-	0x58, 0x2e, 0x70, 0x13, 0x92, 0x77, 0x13, 0x96, 0x69, 0xdb, 0x21, 0x6e, 0xdb, 0xea, 0x1a, 0xda,
-	0x24, 0x3b, 0x9c, 0xf3, 0x0b, 0x43, 0x40, 0x79, 0x9c, 0xa6, 0xcf, 0xfc, 0xb1, 0x93, 0x84, 0x45,
-	0x5e, 0x8e, 0xb0, 0xd1, 0xe4, 0x7b, 0xe3, 0xcc, 0xfd, 0x1c, 0x84, 0x58, 0x0d, 0x9b, 0x44, 0xef,
-	0xfe, 0x17, 0xfa, 0xbd, 0x08, 0x71, 0xdb, 0xea, 0x6a, 0xdc, 0x13, 0x42, 0x4f, 0xcc, 0xb6, 0xba,
-	0xea, 0xd4, 0x6e, 0x84, 0x5f, 0x7d, 0x37, 0xca, 0x10, 0x1f, 0x3e, 0xb7, 0x50, 0xa3, 0x2f, 0x7b,
-	0x4b, 0x8c, 0xc2, 0xe4, 0x4b, 0x10, 0x9f, 0x94, 0xef, 0xc8, 0x70, 0xe6, 0x21, 0x12, 0x3b, 0xe3,
-	0x10, 0x91, 0x1b, 0x70, 0x7e, 0x22, 0x50, 0xeb, 0xdb, 0x86, 0x4e, 0x09, 0x1e, 0xe7, 0x33, 0x37,
-	0x72, 0xec, 0x2e, 0x57, 0xcf, 0x8d, 0xcd, 0x7b, 0x17, 0x63, 0x8b, 0x0e, 0x24, 0xf9, 0xce, 0x88,
-	0x0b, 0xfa, 0x2a, 0xdb, 0x12, 0x7c, 0x10, 0x49, 0xd3, 0x0f, 0x2e, 0x3e, 0x2b, 0x47, 0xaa, 0x02,
-	0xc7, 0x22, 0xf8, 0x7d, 0x26, 0x9e, 0x50, 0xd9, 0x59, 0x79, 0x30, 0xbf, 0x2a, 0x70, 0xc5, 0x6f,
-	0x25, 0x80, 0x2d, 0x56, 0x13, 0xd2, 0xcf, 0xae, 0x56, 0x17, 0x53, 0xd0, 0xc6, 0x56, 0xce, 0xbf,
-	0x48, 0x43, 0x62, 0xfd, 0xa4, 0xeb, 0xcf, 0xbb, 0x02, 0xa9, 0xd1, 0x11, 0xe3, 0x12, 0x2f, 0x99,
-	0x19, 0x93, 0x0c, 0x6f, 0xbc, 0x3a, 0xa1, 0x6a, 0xf2, 0xc0, 0x37, 0x2a, 0x7e, 0x3d, 0x07, 0x71,
-	0xcc, 0x69, 0x9b, 0x50, 0x7d, 0x4c, 0x52, 0xd2, 0xab, 0x4b, 0xea, 0x32, 0x80, 0xd7, 0xb5, 0x0f,
-	0x88, 0x10, 0x7a, 0x5c, 0x1c, 0x67, 0x0f, 0x88, 0xfc, 0xde, 0x90, 0xf0, 0xe0, 0xd9, 0x84, 0x8b,
-	0x07, 0x85, 0x47, 0xfb, 0x05, 0x88, 0x9a, 0xfd, 0x9e, 0xc6, 0xee, 0x93, 0x10, 0x6f, 0x1e, 0xb3,
-	0xdf, 0x6b, 0x0c, 0xdc, 0x51, 0xf3, 0x84, 0xfd, 0xcd, 0xf3, 0x36, 0x9c, 0x6b, 0xeb, 0xae, 0x36,
-	0xa1, 0x20, 0x94, 0x78, 0x4c, 0xcd, 0xb4, 0x75, 0x77, 0x4c, 0x2b, 0xc5, 0xcf, 0x21, 0xda, 0x18,
-	0xe0, 0xc3, 0x9a, 0xb5, 0x9d, 0x63, 0x59, 0xe2, 0xb5, 0xc2, 0x1f, 0xd1, 0x31, 0x66, 0xc0, 0xc3,
-	0x49, 0x86, 0x10, 0x7b, 0x96, 0x78, 0xcf, 0x7c, 0xf6, 0x2d, 0x97, 0x5e, 0xf2, 0xc9, 0x2e, 0x1e,
-	0xeb, 0x6f, 0xfe, 0x22, 0x41, 0x42, 0xb0, 0x76, 0xab, 0xab, 0xb7, 0xd8, 0x05, 0x53, 0xde, 0xda,
-	0xad, 0xdc, 0xd1, 0xaa, 0xeb, 0xda, 0xad, 0xad, 0xb5, 0xdb, 0xda, 0xdd, 0x9d, 0x3b, 0x3b, 0xbb,
-	0x1f, 0xef, 0x64, 0x02, 0xb9, 0xf3, 0x47, 0xc7, 0x8a, 0xec, 0xc3, 0xde, 0x35, 0xef, 0x9b, 0xd6,
-	0x97, 0x78, 0x95, 0x8f, 0x87, 0xac, 0x95, 0xeb, 0x1b, 0x3b, 0x8d, 0x8c, 0x94, 0x5b, 0x3a, 0x3a,
-	0x56, 0x16, 0x7c, 0x11, 0x6b, 0xfb, 0x2e, 0x31, 0xe9, 0x74, 0x40, 0x65, 0x77, 0x7b, 0xbb, 0xda,
-	0xc8, 0xcc, 0x4d, 0x05, 0x88, 0xbb, 0xe1, 0x0d, 0x58, 0x18, 0x0f, 0xd8, 0xa9, 0x6e, 0x65, 0x82,
-	0x39, 0xf9, 0xe8, 0x58, 0x49, 0xfb, 0xd0, 0x3b, 0x9d, 0x6e, 0x2e, 0xf6, 0xf0, 0xfb, 0x7c, 0xe0,
-	0xc7, 0x1f, 0xf2, 0x12, 0xab, 0x2c, 0x35, 0x76, 0xee, 0xc9, 0x6f, 0xc1, 0x85, 0x7a, 0xf5, 0xf6,
-	0xce, 0xc6, 0xba, 0xb6, 0x5d, 0xbf, 0xad, 0x35, 0x3e, 0xa9, 0x6d, 0xf8, 0xaa, 0x9b, 0x3f, 0x3a,
-	0x56, 0x12, 0xa2, 0xa4, 0x17, 0xa1, 0x6b, 0xea, 0xc6, 0xde, 0x6e, 0x63, 0x23, 0x23, 0x71, 0x74,
-	0xcd, 0x21, 0xec, 0x58, 0x47, 0xf4, 0x55, 0x58, 0x9e, 0x81, 0x1e, 0x16, 0xb6, 0x70, 0x74, 0xac,
-	0xa4, 0x6a, 0x0e, 0xe1, 0x4d, 0x88, 0x11, 0x25, 0xc8, 0x4e, 0x47, 0xec, 0xd6, 0x76, 0xeb, 0x6b,
-	0x5b, 0x19, 0x25, 0x97, 0x39, 0x3a, 0x56, 0x92, 0xde, 0x01, 0xcf, 0xf0, 0xa3, 0xca, 0xca, 0x1f,
-	0x3d, 0x3d, 0xcd, 0x4b, 0xcf, 0x4e, 0xf3, 0xd2, 0x1f, 0xa7, 0x79, 0xe9, 0xd1, 0xf3, 0x7c, 0xe0,
-	0xd9, 0xf3, 0x7c, 0xe0, 0xd7, 0xe7, 0xf9, 0xc0, 0xa7, 0x37, 0x5a, 0x1d, 0xda, 0xee, 0xef, 0x97,
-	0x9a, 0x56, 0x6f, 0xd5, 0xff, 0x67, 0x72, 0xf4, 0xc9, 0xff, 0xf1, 0x4e, 0xfe, 0xd1, 0xdc, 0x8f,
-	0xa0, 0xfd, 0xfa, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x19, 0x2e, 0x00, 0x12, 0x46, 0x0f, 0x00,
-	0x00,
+	// 1572 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
+	0x14, 0xf7, 0xc6, 0xdf, 0xe3, 0x8f, 0x38, 0xdb, 0xa4, 0x75, 0xdc, 0xd6, 0x5e, 0x8c, 0xa0, 0x01,
+	0x81, 0x5d, 0xda, 0x8a, 0x8f, 0x4a, 0x1c, 0x62, 0x27, 0x6d, 0xac, 0x26, 0x8e, 0xb5, 0x76, 0x83,
+	0x80, 0xc3, 0x6a, 0xe3, 0x9d, 0xda, 0xa6, 0xf6, 0xce, 0xb2, 0x3b, 0x0e, 0x4e, 0x4f, 0xdc, 0xa8,
+	0x72, 0xea, 0x01, 0xa1, 0x5e, 0x22, 0x51, 0xc1, 0x81, 0xff, 0x80, 0x3b, 0xa7, 0x1e, 0x7b, 0x83,
+	0x03, 0x0a, 0x28, 0xfd, 0x17, 0x38, 0x03, 0x9a, 0x37, 0xb3, 0xf6, 0xae, 0xed, 0x86, 0xaa, 0x07,
+	0x2e, 0xd6, 0xce, 0x7b, 0xbf, 0x37, 0xf3, 0xde, 0x6f, 0x7e, 0x6f, 0x66, 0x8c, 0x2e, 0x51, 0x6c,
+	0x1a, 0xd8, 0x1e, 0xf4, 0x4c, 0x5a, 0xa6, 0x87, 0x16, 0x76, 0xf8, 0x6f, 0xc9, 0xb2, 0x09, 0x25,
+	0x72, 0x66, 0xe2, 0x2d, 0x81, 0x3d, 0xb7, 0xdc, 0x21, 0x1d, 0x02, 0xce, 0x32, 0xfb, 0xe2, 0xb8,
+	0x5c, 0xa1, 0x43, 0x48, 0xa7, 0x8f, 0xcb, 0x30, 0xda, 0x1f, 0xde, 0x2b, 0xd3, 0xde, 0x00, 0x3b,
+	0x54, 0x1f, 0x58, 0x02, 0x70, 0xd9, 0xb3, 0x4c, 0xdb, 0x3e, 0xb4, 0x28, 0x61, 0x58, 0x72, 0x4f,
+	0xb8, 0xf3, 0x1e, 0xf7, 0x01, 0xb6, 0x9d, 0x1e, 0x31, 0xbd, 0x79, 0xe4, 0x2e, 0xce, 0x64, 0x69,
+	0xe8, 0x4e, 0x57, 0x38, 0x95, 0x19, 0xe7, 0x81, 0xde, 0xef, 0x19, 0x3a, 0x25, 0x36, 0x47, 0x14,
+	0x3f, 0x42, 0xa9, 0x86, 0x6e, 0xd3, 0x26, 0xa6, 0x5b, 0x58, 0x37, 0xb0, 0x2d, 0x2f, 0xa3, 0x30,
+	0x25, 0x54, 0xef, 0x67, 0x25, 0x45, 0x5a, 0x4b, 0xa9, 0x7c, 0x20, 0xcb, 0x28, 0xd4, 0xd5, 0x9d,
+	0x6e, 0x76, 0x41, 0x91, 0xd6, 0x92, 0x2a, 0x7c, 0x17, 0xbb, 0x28, 0xc4, 0x42, 0x59, 0x44, 0xcf,
+	0x34, 0xf0, 0xc8, 0x8d, 0x80, 0x01, 0xb3, 0xee, 0x1f, 0x52, 0xec, 0x88, 0x10, 0x3e, 0x90, 0x6f,
+	0xa0, 0x30, 0x14, 0x97, 0x0d, 0x2a, 0xd2, 0x5a, 0xe2, 0x5a, 0xb6, 0xe4, 0x61, 0x91, 0x17, 0x5f,
+	0x6a, 0x30, 0x7f, 0x25, 0xf4, 0xf4, 0xa4, 0x10, 0x50, 0x39, 0xb8, 0xf8, 0xad, 0x84, 0xa2, 0x95,
+	0x3e, 0x69, 0xdf, 0xaf, 0x6d, 0x8c, 0x33, 0x91, 0x26, 0x99, 0xc8, 0x3b, 0x68, 0xd1, 0xd2, 0x6d,
+	0xaa, 0x39, 0x98, 0x6a, 0x5d, 0x28, 0x03, 0x56, 0x4d, 0x5c, 0x2b, 0x94, 0xa6, 0x77, 0xa9, 0xe4,
+	0xab, 0x56, 0x2c, 0x93, 0xb2, 0x7c, 0x14, 0xbc, 0x89, 0x62, 0x0e, 0xd5, 0x29, 0xd6, 0x7a, 0x06,
+	0xe4, 0x99, 0xac, 0x24, 0x4e, 0x4f, 0x0a, 0xd1, 0x26, 0xb3, 0xd5, 0x36, 0xd4, 0x28, 0x38, 0x6b,
+	0x46, 0xf1, 0x2f, 0x09, 0xb9, 0x46, 0xb9, 0x8c, 0x12, 0xba, 0x65, 0x69, 0x62, 0x87, 0x20, 0xbb,
+	0x48, 0x25, 0x7d, 0x7a, 0x52, 0x40, 0xeb, 0x96, 0xb5, 0xc7, 0xad, 0x2a, 0xd2, 0xc7, 0xdf, 0xf2,
+	0x79, 0x14, 0xe9, 0xe2, 0x5e, 0xa7, 0x4b, 0x21, 0xd5, 0x88, 0x2a, 0x46, 0x6c, 0x71, 0x36, 0x11,
+	0xd4, 0xe8, 0x59, 0x7c, 0xdd, 0xb2, 0xb6, 0x74, 0xa7, 0xab, 0x46, 0x75, 0xfe, 0x21, 0xab, 0x28,
+	0xdb, 0x26, 0x36, 0xd6, 0xda, 0x5d, 0xbd, 0x67, 0x6a, 0x8c, 0x1c, 0x6c, 0x68, 0x62, 0xc6, 0x90,
+	0x22, 0xad, 0x45, 0x2b, 0xab, 0xa7, 0x27, 0x85, 0x95, 0x2a, 0xb1, 0x71, 0x95, 0x41, 0xb6, 0x01,
+	0xb1, 0x05, 0x00, 0x75, 0xa5, 0x3d, 0xcf, 0xcc, 0xb8, 0x65, 0xea, 0xcc, 0x86, 0x21, 0x23, 0xf8,
+	0xbe, 0x99, 0x79, 0xfc, 0x7d, 0x21, 0xf0, 0xf0, 0x49, 0x41, 0x7a, 0xfc, 0xa4, 0x20, 0x7d, 0xfd,
+	0xbb, 0x12, 0x28, 0xfe, 0x1d, 0x46, 0x11, 0xc1, 0xd4, 0xc7, 0x28, 0xea, 0xad, 0x38, 0x71, 0xed,
+	0xb2, 0x97, 0x70, 0xe1, 0x2a, 0x55, 0x89, 0xe9, 0x60, 0xd3, 0x19, 0x3a, 0x82, 0x6e, 0x37, 0x86,
+	0xd5, 0xca, 0xd3, 0xef, 0x19, 0xc0, 0x42, 0x9c, 0xd7, 0x0a, 0x89, 0x31, 0xa2, 0xc1, 0x59, 0x33,
+	0x3c, 0x5c, 0x31, 0x46, 0x82, 0x63, 0xae, 0x3e, 0x14, 0xf9, 0x86, 0x60, 0xed, 0x5c, 0x89, 0xb7,
+	0x5a, 0xc9, 0x6d, 0xb5, 0x52, 0xcb, 0x6d, 0xb5, 0x4a, 0x8c, 0x2d, 0xfc, 0xe8, 0x8f, 0x82, 0xc4,
+	0xab, 0x92, 0xab, 0x28, 0xd5, 0xd7, 0x1d, 0xaa, 0xed, 0x33, 0xe2, 0xd8, 0xf2, 0x61, 0x98, 0x62,
+	0x75, 0x56, 0x2f, 0x42, 0x77, 0x22, 0xf5, 0x04, 0x8b, 0xe2, 0x26, 0x43, 0x5e, 0x43, 0x19, 0x98,
+	0xa4, 0x4d, 0x06, 0x83, 0x1e, 0xe5, 0x5b, 0x16, 0x01, 0x59, 0xa6, 0x99, 0xbd, 0x0a, 0x66, 0xd8,
+	0xac, 0x8b, 0x28, 0x6e, 0xe8, 0x54, 0xe7, 0x90, 0x28, 0x40, 0x62, 0xcc, 0x00, 0xce, 0x2b, 0x68,
+	0x71, 0xdc, 0x95, 0x0e, 0x87, 0xc4, 0xf8, 0x2c, 0x13, 0x33, 0x00, 0xaf, 0xa2, 0x65, 0x13, 0x8f,
+	0xa8, 0x36, 0x8d, 0x8e, 0x03, 0x5a, 0x66, 0xbe, 0x3d, 0x7f, 0xc4, 0x1b, 0x28, 0xdd, 0x76, 0xc9,
+	0xe7, 0x58, 0x04, 0xd8, 0xd4, 0xd8, 0x0a, 0xb0, 0x12, 0x3a, 0x07, 0x13, 0x4f, 0x61, 0x13, 0x80,
+	0x5d, 0x62, 0xae, 0xaa, 0x0f, 0xbf, 0xea, 0xd1, 0x68, 0x12, 0x40, 0x63, 0x59, 0xbe, 0x86, 0x92,
+	0x36, 0x76, 0x86, 0x7d, 0x2a, 0xe6, 0x48, 0x81, 0x3b, 0x21, 0x6c, 0x00, 0x79, 0x1d, 0xa5, 0xf0,
+	0x41, 0xcf, 0xc0, 0x66, 0x1b, 0x73, 0x4c, 0x1a, 0x30, 0x49, 0xd7, 0xe8, 0xd6, 0x6a, 0xd9, 0xc4,
+	0x22, 0x0e, 0x36, 0x34, 0x6f, 0x63, 0x2d, 0x2a, 0xd2, 0x5a, 0x48, 0x95, 0x5d, 0xdf, 0xa4, 0xb9,
+	0xe4, 0xf2, 0x38, 0xc2, 0xd6, 0x2c, 0x9b, 0x68, 0x74, 0xc4, 0x67, 0xcf, 0xf0, 0x2a, 0x5c, 0x5f,
+	0xc3, 0x26, 0xad, 0x11, 0x2c, 0xf1, 0xc1, 0x19, 0x1d, 0xb4, 0x04, 0x47, 0xd9, 0xfc, 0x36, 0x29,
+	0x66, 0x51, 0x68, 0x43, 0xa7, 0xba, 0x9c, 0x41, 0x41, 0x3a, 0x72, 0xb2, 0x92, 0x12, 0x5c, 0x4b,
+	0xaa, 0xec, 0xb3, 0xf8, 0xcf, 0x02, 0x0a, 0xed, 0x11, 0x8a, 0xe5, 0xeb, 0x28, 0xc4, 0xe4, 0x03,
+	0x5d, 0x91, 0x9e, 0x77, 0x0c, 0x35, 0x7b, 0x1d, 0x13, 0x1b, 0x3b, 0x4e, 0xa7, 0x75, 0x68, 0x61,
+	0x15, 0xc0, 0x53, 0x47, 0xc2, 0x44, 0xe6, 0xcb, 0x28, 0x6c, 0x93, 0xa1, 0xc9, 0x0f, 0xa3, 0xb0,
+	0xca, 0x07, 0xf2, 0x26, 0x8a, 0x8d, 0xd5, 0x1b, 0xfa, 0x2f, 0xf5, 0x2e, 0x32, 0xf5, 0xb2, 0xde,
+	0x12, 0x06, 0x35, 0xba, 0x2f, 0x44, 0xfc, 0x1e, 0x5a, 0x19, 0xeb, 0xc9, 0xc7, 0x5b, 0x98, 0xab,
+	0x6a, 0xec, 0x9c, 0x10, 0xe7, 0x15, 0xac, 0xc6, 0x8f, 0xfe, 0x08, 0x64, 0x36, 0x11, 0x6c, 0x0d,
+	0xee, 0x80, 0x2b, 0x68, 0x91, 0xa7, 0xe8, 0xf4, 0x3a, 0xa6, 0x4e, 0x87, 0x36, 0x16, 0xe2, 0x4f,
+	0x83, 0xb9, 0xe9, 0x5a, 0xe5, 0x2d, 0xb4, 0x78, 0x40, 0x28, 0xd6, 0xf0, 0x88, 0x62, 0x93, 0xed,
+	0xa6, 0x93, 0x8d, 0x29, 0xc1, 0xf9, 0x07, 0x38, 0xe3, 0x77, 0xd3, 0xc5, 0xa9, 0xe9, 0x03, 0xef,
+	0xd0, 0x29, 0xfe, 0xbc, 0x80, 0x22, 0xbc, 0xf1, 0x3c, 0x74, 0x4a, 0xf3, 0xe9, 0x5c, 0x78, 0x11,
+	0x9d, 0xc1, 0x57, 0xa7, 0xb3, 0x80, 0x12, 0x5f, 0x0e, 0x89, 0x3d, 0x1c, 0x70, 0x12, 0x43, 0x50,
+	0x2e, 0xe2, 0x26, 0x20, 0xef, 0x26, 0x5a, 0xa5, 0x5d, 0x1b, 0x3b, 0x5d, 0xd2, 0x37, 0xb4, 0x69,
+	0x76, 0x38, 0xe7, 0x17, 0xc6, 0x80, 0x8a, 0x9f, 0xa6, 0xcf, 0xbd, 0xb1, 0xd3, 0x84, 0x45, 0x5e,
+	0x8e, 0xb0, 0xc9, 0xe4, 0x7b, 0x7e, 0xe6, 0x7e, 0x09, 0xa2, 0x58, 0x03, 0x9a, 0x44, 0xef, 0xff,
+	0x1f, 0xfa, 0xbd, 0x88, 0xe2, 0x16, 0xe9, 0x6b, 0xdc, 0x13, 0x02, 0x4f, 0xcc, 0x22, 0x7d, 0x75,
+	0x66, 0x37, 0xc2, 0xaf, 0xbe, 0x1b, 0x15, 0x14, 0x1f, 0x3f, 0xb7, 0x40, 0xa3, 0x2f, 0x7b, 0x4b,
+	0x4c, 0xc2, 0xe4, 0x4b, 0x28, 0x3e, 0x2d, 0xdf, 0x89, 0xe1, 0xcc, 0x43, 0x24, 0x76, 0xc6, 0x21,
+	0x22, 0xb7, 0xd0, 0xf9, 0xa9, 0x40, 0x6d, 0x68, 0x19, 0x3a, 0xc5, 0x70, 0x9c, 0xcf, 0xdd, 0x48,
+	0xdf, 0x5d, 0xae, 0x9e, 0xf3, 0xcd, 0x7b, 0x17, 0x62, 0x8b, 0x36, 0x4a, 0xf2, 0x9d, 0x11, 0x17,
+	0xf4, 0x55, 0xb6, 0x25, 0xf0, 0x20, 0x92, 0x66, 0x1f, 0x5c, 0x7c, 0x56, 0x8e, 0x54, 0x05, 0x8e,
+	0x45, 0xf0, 0xfb, 0x4c, 0x3c, 0xa1, 0xb2, 0xf3, 0xf2, 0x60, 0x7e, 0x55, 0xe0, 0x8a, 0xdf, 0x49,
+	0x08, 0x6d, 0xb3, 0x9a, 0x80, 0x7e, 0x76, 0xb5, 0x3a, 0x90, 0x82, 0xe6, 0x5b, 0x39, 0xff, 0x22,
+	0x0d, 0x89, 0xf5, 0x93, 0x8e, 0x37, 0xef, 0x2a, 0x4a, 0x4d, 0x8e, 0x18, 0x07, 0xbb, 0xc9, 0xcc,
+	0x99, 0x64, 0x7c, 0xe3, 0x35, 0x31, 0x55, 0x93, 0x07, 0x9e, 0x51, 0xf1, 0x9b, 0x05, 0x14, 0x87,
+	0x9c, 0x76, 0x30, 0xd5, 0x7d, 0x92, 0x92, 0x5e, 0x5d, 0x52, 0x97, 0x11, 0x72, 0xbb, 0xf6, 0x01,
+	0x16, 0x42, 0x8f, 0x8b, 0xe3, 0xec, 0x01, 0x96, 0xdf, 0x1f, 0x13, 0x1e, 0x3c, 0x9b, 0x70, 0xf1,
+	0xa0, 0x70, 0x69, 0xbf, 0x80, 0xa2, 0xe6, 0x70, 0xa0, 0xb1, 0xfb, 0x24, 0xc4, 0x9b, 0xc7, 0x1c,
+	0x0e, 0x5a, 0x23, 0x67, 0xd2, 0x3c, 0x61, 0x6f, 0xf3, 0xbc, 0x8b, 0xce, 0x75, 0x75, 0x47, 0x9b,
+	0x52, 0x10, 0x48, 0x3c, 0xa6, 0x66, 0xba, 0xba, 0xe3, 0xd3, 0x4a, 0xf1, 0x0b, 0x14, 0x6d, 0x8d,
+	0xe0, 0x61, 0xcd, 0xda, 0xce, 0x26, 0x44, 0xbc, 0x56, 0xf8, 0x23, 0x3a, 0xc6, 0x0c, 0x70, 0x38,
+	0xc9, 0x28, 0xc4, 0x9e, 0x25, 0xee, 0x33, 0x9f, 0x7d, 0xcb, 0xa5, 0x97, 0x7c, 0xb2, 0x8b, 0xc7,
+	0xfa, 0xdb, 0xbf, 0x4a, 0x28, 0x21, 0x58, 0xbb, 0xd5, 0xd7, 0x3b, 0xec, 0x82, 0xa9, 0x6c, 0xef,
+	0x56, 0xef, 0x68, 0xb5, 0x0d, 0xed, 0xd6, 0xf6, 0xfa, 0x6d, 0xed, 0x6e, 0xfd, 0x4e, 0x7d, 0xf7,
+	0x93, 0x7a, 0x26, 0x90, 0x3b, 0x7f, 0x74, 0xac, 0xc8, 0x1e, 0xec, 0x5d, 0xf3, 0xbe, 0x49, 0xbe,
+	0x82, 0xab, 0xdc, 0x1f, 0xb2, 0x5e, 0x69, 0x6e, 0xd6, 0x5b, 0x19, 0x29, 0xb7, 0x72, 0x74, 0xac,
+	0x2c, 0x79, 0x22, 0xd6, 0xf7, 0x1d, 0x6c, 0xd2, 0xd9, 0x80, 0xea, 0xee, 0xce, 0x4e, 0xad, 0x95,
+	0x59, 0x98, 0x09, 0x10, 0x77, 0xc3, 0x5b, 0x68, 0xc9, 0x1f, 0x50, 0xaf, 0x6d, 0x67, 0x82, 0x39,
+	0xf9, 0xe8, 0x58, 0x49, 0x7b, 0xd0, 0xf5, 0x5e, 0x3f, 0x17, 0x7b, 0xf8, 0x43, 0x3e, 0xf0, 0xd3,
+	0x8f, 0x79, 0x89, 0x55, 0x96, 0xf2, 0x9d, 0x7b, 0xf2, 0x3b, 0xe8, 0x42, 0xb3, 0x76, 0xbb, 0xbe,
+	0xb9, 0xa1, 0xed, 0x34, 0x6f, 0x6b, 0xad, 0x4f, 0x1b, 0x9b, 0x9e, 0xea, 0x16, 0x8f, 0x8e, 0x95,
+	0x84, 0x28, 0xe9, 0x45, 0xe8, 0x86, 0xba, 0xb9, 0xb7, 0xdb, 0xda, 0xcc, 0x48, 0x1c, 0xdd, 0xb0,
+	0x31, 0x3b, 0xd6, 0x01, 0x7d, 0x15, 0xad, 0xce, 0x41, 0x8f, 0x0b, 0x5b, 0x3a, 0x3a, 0x56, 0x52,
+	0x0d, 0x1b, 0xf3, 0x26, 0x84, 0x88, 0x12, 0xca, 0xce, 0x46, 0xec, 0x36, 0x76, 0x9b, 0xeb, 0xdb,
+	0x19, 0x25, 0x97, 0x39, 0x3a, 0x56, 0x92, 0xee, 0x01, 0xcf, 0xf0, 0x93, 0xca, 0x2a, 0xf5, 0xa7,
+	0xa7, 0x79, 0xe9, 0xd9, 0x69, 0x5e, 0xfa, 0xf3, 0x34, 0x2f, 0x3d, 0x7a, 0x9e, 0x0f, 0x3c, 0x7b,
+	0x9e, 0x0f, 0xfc, 0xf6, 0x3c, 0x1f, 0xf8, 0xec, 0x46, 0xa7, 0x47, 0xbb, 0xc3, 0xfd, 0x52, 0x9b,
+	0x0c, 0xe0, 0x8f, 0xa5, 0xa5, 0x1f, 0x96, 0xb9, 0x00, 0xd8, 0x88, 0xff, 0xab, 0x2d, 0x4f, 0xff,
+	0xcb, 0xdc, 0x8f, 0x80, 0xfd, 0xfa, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xd9, 0x50, 0xe6,
+	0x43, 0x0f, 0x00, 0x00,
 }
 
 func (m *PartSetHeader) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto
index bba9c7d7b6..ea64fa29dc 100644
--- a/proto/tendermint/types/types.proto
+++ b/proto/tendermint/types/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/tendermint/types/types_test.go b/proto/tendermint/types/types_test.go
index b17844a135..117a4c0fe8 100644
--- a/proto/tendermint/types/types_test.go
+++ b/proto/tendermint/types/types_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	"github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	"github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
 )
 
 // TestVoteSignBytes checks if sign bytes are generated correctly.
diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go
index 08df629cd7..a37aacd837 100644
--- a/proto/tendermint/types/validator.pb.go
+++ b/proto/tendermint/types/validator.pb.go
@@ -5,9 +5,9 @@ package types
 
 import (
 	fmt "fmt"
+	crypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -253,37 +253,37 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/validator.proto", fileDescriptor_4e92274df03d3088) }
 
 var fileDescriptor_4e92274df03d3088 = []byte{
-	// 469 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x6a, 0xdb, 0x40,
-	0x14, 0xf4, 0xda, 0x8e, 0x13, 0x3f, 0xb9, 0x24, 0x5d, 0x72, 0x10, 0x69, 0x50, 0x14, 0x1f, 0x8a,
-	0xa0, 0x45, 0x82, 0x96, 0x92, 0x43, 0x4e, 0xcd, 0xa9, 0xd0, 0x8b, 0xab, 0x98, 0x1c, 0x7a, 0x11,
-	0x92, 0xb5, 0x58, 0xc2, 0xb2, 0xdf, 0x76, 0x77, 0xe5, 0x46, 0x7f, 0xd1, 0xcf, 0xca, 0x31, 0xc7,
-	0x42, 0xa1, 0x14, 0xfb, 0x0f, 0xfa, 0x05, 0x45, 0xab, 0x4a, 0x56, 0x73, 0x69, 0x72, 0x5b, 0x66,
-	0xe6, 0xed, 0xbc, 0x19, 0x78, 0x60, 0x2b, 0xb6, 0x8a, 0x99, 0x58, 0xa6, 0x2b, 0xe5, 0xa9, 0x82,
-	0x33, 0xe9, 0xad, 0xc3, 0x2c, 0x8d, 0x43, 0x85, 0xc2, 0xe5, 0x02, 0x15, 0xd2, 0xa3, 0x9d, 0xc2,
-	0xd5, 0x8a, 0x93, 0xe3, 0x39, 0xce, 0x51, 0x93, 0x5e, 0xf9, 0xaa, 0x74, 0x27, 0xa7, 0xad, 0x9f,
-	0x66, 0xa2, 0xe0, 0x0a, 0xbd, 0x05, 0x2b, 0x64, 0xc5, 0x8e, 0x7f, 0x77, 0x61, 0x74, 0x53, 0xff,
-	0x7c, 0xcd, 0x14, 0xbd, 0x04, 0x68, 0x9c, 0xa4, 0x49, 0xec, 0x9e, 0x63, 0xbc, 0x79, 0xe1, 0x3e,
-	0xf4, 0x72, 0x9b, 0x19, 0xbf, 0x25, 0xa7, 0x17, 0x70, 0xc0, 0x05, 0x72, 0x94, 0x4c, 0x98, 0x5d,
-	0x9b, 0xfc, 0x6f, 0xb4, 0x11, 0xd3, 0xd7, 0x40, 0x15, 0xaa, 0x30, 0x0b, 0xd6, 0xa8, 0xd2, 0xd5,
-	0x3c, 0xe0, 0xf8, 0x95, 0x09, 0xb3, 0x67, 0x13, 0xa7, 0xe7, 0x1f, 0x69, 0xe6, 0x46, 0x13, 0x93,
-	0x12, 0xa7, 0x53, 0x38, 0x56, 0x89, 0x60, 0x32, 0xc1, 0x2c, 0x0e, 0x78, 0x1e, 0x65, 0xe9, 0x2c,
-	0x58, 0xb0, 0xc2, 0xec, 0x6b, 0xcb, 0xd3, 0xb6, 0x65, 0x95, 0xd8, 0x9d, 0x68, 0xd1, 0x47, 0x56,
-	0x5c, 0xf5, 0xef, 0x7e, 0x9e, 0x75, 0x7c, 0xda, 0xcc, 0x37, 0x0c, 0x3d, 0x03, 0xe3, 0x4b, 0x8e,
-	0x22, 0x5f, 0x06, 0xe5, 0x9e, 0xe6, 0x9e, 0x4d, 0x9c, 0x3d, 0x1f, 0x2a, 0x68, 0x5a, 0x70, 0xd6,
-	0x12, 0x24, 0xa1, 0x4c, 0xcc, 0x81, 0x4d, 0x9c, 0x51, 0x2d, 0xf8, 0x10, 0xca, 0x84, 0xbe, 0x84,
-	0xc3, 0x24, 0x94, 0xad, 0x8d, 0xa4, 0xb9, 0x6f, 0x13, 0xe7, 0xc0, 0x7f, 0x96, 0x84, 0xb2, 0x31,
-	0x92, 0xe3, 0x1f, 0x04, 0x86, 0x4d, 0x0b, 0xf4, 0x12, 0xf6, 0x79, 0x1e, 0xe9, 0x00, 0xe4, 0x91,
-	0x01, 0x88, 0x3f, 0xe0, 0x79, 0x54, 0x2e, 0x7d, 0x0e, 0xa3, 0x7f, 0x2a, 0xeb, 0xea, 0xca, 0x8c,
-	0x75, 0xab, 0xad, 0x57, 0xf0, 0xbc, 0xee, 0x39, 0xe0, 0x22, 0x45, 0x91, 0xaa, 0xa2, 0xae, 0xb6,
-	0x26, 0x26, 0x7f, 0x71, 0x6a, 0x81, 0xc1, 0x05, 0x06, 0xea, 0xb6, 0xca, 0xd8, 0xd7, 0x19, 0x87,
-	0x5c, 0xe0, 0xf4, 0x56, 0x47, 0x3c, 0x87, 0xd1, 0x0a, 0x63, 0x16, 0x84, 0x71, 0x2c, 0x98, 0x94,
-	0xba, 0xa5, 0xa1, 0x6f, 0x94, 0xd8, 0xfb, 0x0a, 0x1a, 0x2f, 0xe0, 0xf0, 0x3a, 0x5d, 0xf2, 0x8c,
-	0xed, 0x22, 0xbe, 0x7b, 0x52, 0xc4, 0x27, 0x84, 0xbb, 0xfa, 0x74, 0xb7, 0xb1, 0xc8, 0xfd, 0xc6,
-	0x22, 0xbf, 0x36, 0x16, 0xf9, 0xb6, 0xb5, 0x3a, 0xf7, 0x5b, 0xab, 0xf3, 0x7d, 0x6b, 0x75, 0x3e,
-	0x5f, 0xcc, 0x53, 0x95, 0xe4, 0x91, 0x3b, 0xc3, 0xa5, 0xd7, 0x3e, 0xa6, 0xdd, 0xb3, 0x3a, 0x95,
-	0x87, 0x87, 0x16, 0x0d, 0x34, 0xfe, 0xf6, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, 0x5f, 0x53,
-	0x78, 0x83, 0x03, 0x00, 0x00,
+	// 475 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6a, 0xdb, 0x40,
+	0x18, 0xf4, 0xda, 0x8e, 0x13, 0xaf, 0x5c, 0x92, 0x2e, 0x39, 0x88, 0x34, 0x28, 0x8a, 0x0f, 0x45,
+	0xd0, 0x22, 0x41, 0x7f, 0xe8, 0x21, 0xa7, 0xe6, 0x54, 0x28, 0x14, 0xa3, 0x98, 0x1c, 0x7a, 0x11,
+	0x2b, 0x6b, 0xf1, 0x0a, 0xcb, 0xfe, 0xb6, 0xbb, 0x2b, 0x37, 0x7a, 0x8b, 0x3e, 0x56, 0x8e, 0x39,
+	0x16, 0x0a, 0xa5, 0xd8, 0x6f, 0xd0, 0x27, 0x28, 0x5a, 0x55, 0x8a, 0x9a, 0x4b, 0xe3, 0x9b, 0x34,
+	0x33, 0xdf, 0xce, 0x37, 0x03, 0x1f, 0x76, 0x35, 0x5b, 0x25, 0x4c, 0x2e, 0xd3, 0x95, 0x0e, 0x74,
+	0x21, 0x98, 0x0a, 0xd6, 0x34, 0x4b, 0x13, 0xaa, 0x41, 0xfa, 0x42, 0x82, 0x06, 0x72, 0x74, 0xaf,
+	0xf0, 0x8d, 0xe2, 0xe4, 0x78, 0x0e, 0x73, 0x30, 0x64, 0x50, 0x7e, 0x55, 0xba, 0x93, 0xd3, 0xd6,
+	0x4b, 0x33, 0x59, 0x08, 0x0d, 0xc1, 0x82, 0x15, 0xaa, 0x62, 0xc7, 0xbf, 0xbb, 0x78, 0x74, 0x5d,
+	0xbf, 0x7c, 0xc5, 0x34, 0xb9, 0xc0, 0xb8, 0x71, 0x52, 0x36, 0x72, 0x7b, 0x9e, 0xf5, 0xea, 0x99,
+	0xff, 0xd0, 0xcb, 0x6f, 0x66, 0xc2, 0x96, 0x9c, 0xbc, 0xc3, 0x07, 0x42, 0x82, 0x00, 0xc5, 0xa4,
+	0xdd, 0x75, 0xd1, 0xff, 0x46, 0x1b, 0x31, 0x79, 0x89, 0x89, 0x06, 0x4d, 0xb3, 0x68, 0x0d, 0x3a,
+	0x5d, 0xcd, 0x23, 0x01, 0x5f, 0x99, 0xb4, 0x7b, 0x2e, 0xf2, 0x7a, 0xe1, 0x91, 0x61, 0xae, 0x0d,
+	0x31, 0x29, 0x71, 0x32, 0xc5, 0xc7, 0x9a, 0x4b, 0xa6, 0x38, 0x64, 0x49, 0x24, 0xf2, 0x38, 0x4b,
+	0x67, 0xd1, 0x82, 0x15, 0x76, 0xdf, 0x58, 0x9e, 0xb6, 0x2d, 0xab, 0xc4, 0xfe, 0xc4, 0x88, 0x3e,
+	0xb2, 0xe2, 0xb2, 0x7f, 0xfb, 0xf3, 0xac, 0x13, 0x92, 0x66, 0xbe, 0x61, 0xc8, 0x19, 0xb6, 0xbe,
+	0xe4, 0x20, 0xf3, 0x65, 0x54, 0xee, 0x69, 0xef, 0xb9, 0xc8, 0xdb, 0x0b, 0x71, 0x05, 0x4d, 0x0b,
+	0xc1, 0x5a, 0x02, 0x4e, 0x15, 0xb7, 0x07, 0x2e, 0xf2, 0x46, 0xb5, 0xe0, 0x03, 0x55, 0x9c, 0x3c,
+	0xc7, 0x87, 0x9c, 0xaa, 0xd6, 0x46, 0xca, 0xde, 0x77, 0x91, 0x77, 0x10, 0x3e, 0xe1, 0x54, 0x35,
+	0x46, 0x6a, 0xfc, 0x03, 0xe1, 0x61, 0xd3, 0x02, 0xb9, 0xc0, 0xfb, 0x22, 0x8f, 0x4d, 0x00, 0xf4,
+	0xc8, 0x00, 0x28, 0x1c, 0x88, 0x3c, 0x2e, 0x97, 0x3e, 0xc7, 0xa3, 0x7f, 0x2a, 0xeb, 0x9a, 0xca,
+	0xac, 0x75, 0xab, 0xad, 0x17, 0xf8, 0x69, 0xdd, 0x73, 0x24, 0x64, 0x0a, 0x32, 0xd5, 0x45, 0x5d,
+	0x6d, 0x4d, 0x4c, 0xfe, 0xe2, 0xc4, 0xc1, 0x96, 0x90, 0x10, 0xe9, 0x9b, 0x2a, 0x63, 0xdf, 0x64,
+	0x1c, 0x0a, 0x09, 0xd3, 0x1b, 0x13, 0xf1, 0x1c, 0x8f, 0x56, 0x90, 0xb0, 0x88, 0x26, 0x89, 0x64,
+	0x4a, 0x99, 0x96, 0x86, 0xa1, 0x55, 0x62, 0xef, 0x2b, 0x68, 0xbc, 0xc0, 0x87, 0x57, 0xe9, 0x52,
+	0x64, 0xec, 0x3e, 0xe2, 0xdb, 0x9d, 0x22, 0xee, 0x10, 0xee, 0xf2, 0xd3, 0xed, 0xc6, 0x41, 0x77,
+	0x1b, 0x07, 0xfd, 0xda, 0x38, 0xe8, 0xdb, 0xd6, 0xe9, 0xdc, 0x6d, 0x9d, 0xce, 0xf7, 0xad, 0xd3,
+	0xf9, 0xfc, 0x66, 0x9e, 0x6a, 0x9e, 0xc7, 0xfe, 0x0c, 0x96, 0x41, 0x42, 0x15, 0x17, 0xb4, 0x08,
+	0x2a, 0xd3, 0xf2, 0x2f, 0xa8, 0xee, 0xe4, 0xe1, 0x95, 0xc5, 0x03, 0x83, 0xbf, 0xfe, 0x13, 0x00,
+	0x00, 0xff, 0xff, 0x84, 0xb2, 0x3f, 0xb9, 0x80, 0x03, 0x00, 0x00,
 }
 
 func (m *ValidatorSet) Marshal() (dAtA []byte, err error) {
diff --git a/proto/tendermint/types/validator.proto b/proto/tendermint/types/validator.proto
index 914278046a..9c0fe6ab17 100644
--- a/proto/tendermint/types/validator.proto
+++ b/proto/tendermint/types/validator.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 import "tendermint/crypto/keys.proto";
diff --git a/proto/tendermint/version/types.pb.go b/proto/tendermint/version/types.pb.go
index 76a94fd3c0..2d0162356b 100644
--- a/proto/tendermint/version/types.pb.go
+++ b/proto/tendermint/version/types.pb.go
@@ -85,7 +85,7 @@ func init() {
 func init() { proto.RegisterFile("tendermint/version/types.proto", fileDescriptor_f9b42966edc5edad) }
 
 var fileDescriptor_f9b42966edc5edad = []byte{
-	// 179 bytes of a gzipped FileDescriptorProto
+	// 188 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b,
 	0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0xd3, 0x2f,
 	0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41,
@@ -93,11 +93,11 @@ var fileDescriptor_f9b42966edc5edad = []byte{
 	0x17, 0xa7, 0x73, 0x7e, 0x5e, 0x71, 0x6a, 0x5e, 0x71, 0x69, 0xb1, 0x90, 0x08, 0x17, 0x6b, 0x52,
 	0x4e, 0x7e, 0x72, 0xb6, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x4b, 0x10, 0x84, 0x23, 0x24, 0xc0, 0xc5,
 	0x9c, 0x58, 0x50, 0x20, 0xc1, 0x04, 0x16, 0x03, 0x31, 0xad, 0x58, 0x5e, 0x2c, 0x90, 0x67, 0x74,
-	0x0a, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c,
-	0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xcb, 0xf4, 0xcc, 0x92,
-	0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x24, 0x97, 0x22, 0x31, 0x21, 0xee, 0xc0, 0xf4,
-	0x45, 0x12, 0x1b, 0x58, 0xc6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xf0, 0x65, 0xd2, 0xe2,
-	0x00, 0x00, 0x00,
+	0x0a, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c,
+	0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xb3, 0xf4, 0xcc, 0x92,
+	0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0x94, 0xc4, 0xe2, 0x8c, 0x82, 0xc4, 0x4a, 0x7d,
+	0x88, 0x8b, 0x40, 0x3c, 0x7d, 0x88, 0x23, 0x30, 0xbd, 0x90, 0xc4, 0x06, 0x96, 0x31, 0x06, 0x04,
+	0x00, 0x00, 0xff, 0xff, 0x7d, 0xcb, 0x13, 0xbb, 0xdf, 0x00, 0x00, 0x00,
 }
 
 func (this *Consensus) Equal(that interface{}) bool {
diff --git a/proto/tendermint/version/types.proto b/proto/tendermint/version/types.proto
index 37124dd4e7..5bcc0a4000 100644
--- a/proto/tendermint/version/types.proto
+++ b/proto/tendermint/version/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package tendermint.version;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/version";
+option go_package = "github.com/dashpay/tenderdash/proto/tendermint/version";
 
 import "gogoproto/gogo.proto";
 
diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go
index e59fcc83b1..e5f285253f 100644
--- a/rpc/client/event_test.go
+++ b/rpc/client/event_test.go
@@ -9,11 +9,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const waitForEventTimeout = 2 * time.Second
diff --git a/rpc/client/eventstream/eventstream.go b/rpc/client/eventstream/eventstream.go
index 59cfc8b5f0..807f3e8e59 100644
--- a/rpc/client/eventstream/eventstream.go
+++ b/rpc/client/eventstream/eventstream.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // Client is the subset of the RPC client interface consumed by Stream.
diff --git a/rpc/client/eventstream/eventstream_test.go b/rpc/client/eventstream/eventstream_test.go
index 8cd9df30f8..84813ea108 100644
--- a/rpc/client/eventstream/eventstream_test.go
+++ b/rpc/client/eventstream/eventstream_test.go
@@ -10,12 +10,12 @@ import (
 	"github.com/fortytw2/leaktest"
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/tendermint/tendermint/internal/eventlog"
-	"github.com/tendermint/tendermint/internal/eventlog/cursor"
-	rpccore "github.com/tendermint/tendermint/internal/rpc/core"
-	"github.com/tendermint/tendermint/rpc/client/eventstream"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/eventlog"
+	"github.com/dashpay/tenderdash/internal/eventlog/cursor"
+	rpccore "github.com/dashpay/tenderdash/internal/rpc/core"
+	"github.com/dashpay/tenderdash/rpc/client/eventstream"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestStream_filterOrder(t *testing.T) {
diff --git a/rpc/client/evidence_test.go b/rpc/client/evidence_test.go
index 0a1e9ae6a7..5789e6a648 100644
--- a/rpc/client/evidence_test.go
+++ b/rpc/client/evidence_test.go
@@ -8,12 +8,12 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func newEvidence(t *testing.T, val *privval.FilePV,
diff --git a/rpc/client/examples_test.go b/rpc/client/examples_test.go
index 7cb2f795af..d2deedd5fe 100644
--- a/rpc/client/examples_test.go
+++ b/rpc/client/examples_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpctest "github.com/tendermint/tendermint/rpc/test"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpctest "github.com/dashpay/tenderdash/rpc/test"
 )
 
 func TestHTTPSimple(t *testing.T) {
diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go
index 05694afff0..7c1b158f91 100644
--- a/rpc/client/helpers.go
+++ b/rpc/client/helpers.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Waiter is informed of current height, decided whether to quit early
diff --git a/rpc/client/helpers_test.go b/rpc/client/helpers_test.go
index eb13e8d77e..29891762c9 100644
--- a/rpc/client/helpers_test.go
+++ b/rpc/client/helpers_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/client/mock"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/client/mock"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 func TestWaitForHeight(t *testing.T) {
diff --git a/rpc/client/http/http.go b/rpc/client/http/http.go
index c8d7b0bdba..7708e96196 100644
--- a/rpc/client/http/http.go
+++ b/rpc/client/http/http.go
@@ -7,11 +7,11 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/bytes"
-	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	jsonrpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	jsonrpcclient "github.com/dashpay/tenderdash/rpc/jsonrpc/client"
+	"github.com/dashpay/tenderdash/types"
 )
 
 /*
diff --git a/rpc/client/http/ws.go b/rpc/client/http/ws.go
index a0128e845c..088beb2aae 100644
--- a/rpc/client/http/ws.go
+++ b/rpc/client/http/ws.go
@@ -9,11 +9,11 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/libs/log"
-	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	jsonrpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	jsonrpcclient "github.com/dashpay/tenderdash/rpc/jsonrpc/client"
 )
 
 // wsEvents is a wrapper around WSClient, which implements SubscriptionClient.
diff --git a/rpc/client/interface.go b/rpc/client/interface.go
index 169671fd61..7f011a828a 100644
--- a/rpc/client/interface.go
+++ b/rpc/client/interface.go
@@ -23,9 +23,9 @@ implementation.
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 //go:generate ../../scripts/mockery_generate.sh Client|RemoteClient
diff --git a/rpc/client/local/local.go b/rpc/client/local/local.go
index 6ed7cff684..bfcb39d590 100644
--- a/rpc/client/local/local.go
+++ b/rpc/client/local/local.go
@@ -6,15 +6,15 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/internal/eventbus"
-	"github.com/tendermint/tendermint/internal/pubsub"
-	"github.com/tendermint/tendermint/internal/pubsub/query"
-	rpccore "github.com/tendermint/tendermint/internal/rpc/core"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/eventbus"
+	"github.com/dashpay/tenderdash/internal/pubsub"
+	"github.com/dashpay/tenderdash/internal/pubsub/query"
+	rpccore "github.com/dashpay/tenderdash/internal/rpc/core"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 /*
diff --git a/rpc/client/main_test.go b/rpc/client/main_test.go
index 4749efee20..a8d4777949 100644
--- a/rpc/client/main_test.go
+++ b/rpc/client/main_test.go
@@ -7,11 +7,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	rpctest "github.com/tendermint/tendermint/rpc/test"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/service"
+	rpctest "github.com/dashpay/tenderdash/rpc/test"
 )
 
 func NodeSuite(ctx context.Context, t *testing.T, logger log.Logger) (service.Service, *config.Config) {
diff --git a/rpc/client/mock/abci.go b/rpc/client/mock/abci.go
index c692fe0da4..1bdbfe2d8c 100644
--- a/rpc/client/mock/abci.go
+++ b/rpc/client/mock/abci.go
@@ -3,13 +3,13 @@ package mock
 import (
 	"context"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/internal/proxy"
-	"github.com/tendermint/tendermint/libs/bytes"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/internal/proxy"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // ABCIApp will send all abci related request to the named app,
diff --git a/rpc/client/mock/abci_test.go b/rpc/client/mock/abci_test.go
index a10575abf9..deed35017e 100644
--- a/rpc/client/mock/abci_test.go
+++ b/rpc/client/mock/abci_test.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/client/mock"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/client/mock"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestABCIMock(t *testing.T) {
diff --git a/rpc/client/mock/client.go b/rpc/client/mock/client.go
index bca155f744..4c368ace44 100644
--- a/rpc/client/mock/client.go
+++ b/rpc/client/mock/client.go
@@ -18,11 +18,11 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/tendermint/tendermint/internal/rpc/core"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/rpc/core"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Client wraps arbitrary implementations of the various interfaces.
diff --git a/rpc/client/mock/status.go b/rpc/client/mock/status.go
index 22548e8911..1a446896e8 100644
--- a/rpc/client/mock/status.go
+++ b/rpc/client/mock/status.go
@@ -3,8 +3,8 @@ package mock
 import (
 	"context"
 
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/client"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // StatusMock returns the result specified by the Call
diff --git a/rpc/client/mock/status_test.go b/rpc/client/mock/status_test.go
index 9f250c53d4..7eb2b9ae14 100644
--- a/rpc/client/mock/status_test.go
+++ b/rpc/client/mock/status_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/rpc/client/mock"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/rpc/client/mock"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 func TestStatus(t *testing.T) {
diff --git a/rpc/client/mocks/abci_client.go b/rpc/client/mocks/abci_client.go
index 743a093ef5..fc06ed551d 100644
--- a/rpc/client/mocks/abci_client.go
+++ b/rpc/client/mocks/abci_client.go
@@ -3,16 +3,16 @@
 package mocks
 
 import (
-	bytes "github.com/tendermint/tendermint/libs/bytes"
-	client "github.com/tendermint/tendermint/rpc/client"
+	bytes "github.com/dashpay/tenderdash/libs/bytes"
+	client "github.com/dashpay/tenderdash/rpc/client"
 
 	context "context"
 
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // ABCIClient is an autogenerated mock type for the ABCIClient type
diff --git a/rpc/client/mocks/client.go b/rpc/client/mocks/client.go
index c76739cd79..22533b3666 100644
--- a/rpc/client/mocks/client.go
+++ b/rpc/client/mocks/client.go
@@ -3,16 +3,16 @@
 package mocks
 
 import (
-	bytes "github.com/tendermint/tendermint/libs/bytes"
-	client "github.com/tendermint/tendermint/rpc/client"
+	bytes "github.com/dashpay/tenderdash/libs/bytes"
+	client "github.com/dashpay/tenderdash/rpc/client"
 
 	context "context"
 
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // Client is an autogenerated mock type for the Client type
diff --git a/rpc/client/mocks/events_client.go b/rpc/client/mocks/events_client.go
index 35ac0a8bca..092e7b15e6 100644
--- a/rpc/client/mocks/events_client.go
+++ b/rpc/client/mocks/events_client.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 	mock "github.com/stretchr/testify/mock"
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
 )
 
 // EventsClient is an autogenerated mock type for the EventsClient type
diff --git a/rpc/client/mocks/evidence_client.go b/rpc/client/mocks/evidence_client.go
index 88905be0ca..1b7817a0f1 100644
--- a/rpc/client/mocks/evidence_client.go
+++ b/rpc/client/mocks/evidence_client.go
@@ -5,10 +5,10 @@ package mocks
 import (
 	context "context"
 
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 	mock "github.com/stretchr/testify/mock"
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // EvidenceClient is an autogenerated mock type for the EvidenceClient type
diff --git a/rpc/client/mocks/history_client.go b/rpc/client/mocks/history_client.go
index 5d6fb88b5f..280e1738a1 100644
--- a/rpc/client/mocks/history_client.go
+++ b/rpc/client/mocks/history_client.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 	mock "github.com/stretchr/testify/mock"
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
 )
 
 // HistoryClient is an autogenerated mock type for the HistoryClient type
diff --git a/rpc/client/mocks/mempool_client.go b/rpc/client/mocks/mempool_client.go
index 718acedf21..66c296e1fd 100644
--- a/rpc/client/mocks/mempool_client.go
+++ b/rpc/client/mocks/mempool_client.go
@@ -5,10 +5,10 @@ package mocks
 import (
 	context "context"
 
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 	mock "github.com/stretchr/testify/mock"
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // MempoolClient is an autogenerated mock type for the MempoolClient type
diff --git a/rpc/client/mocks/network_client.go b/rpc/client/mocks/network_client.go
index 8fc8564a58..f365a8a4c3 100644
--- a/rpc/client/mocks/network_client.go
+++ b/rpc/client/mocks/network_client.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 	mock "github.com/stretchr/testify/mock"
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
 )
 
 // NetworkClient is an autogenerated mock type for the NetworkClient type
diff --git a/rpc/client/mocks/remote_client.go b/rpc/client/mocks/remote_client.go
index 1df630e0db..a09c863c8f 100644
--- a/rpc/client/mocks/remote_client.go
+++ b/rpc/client/mocks/remote_client.go
@@ -3,16 +3,16 @@
 package mocks
 
 import (
-	bytes "github.com/tendermint/tendermint/libs/bytes"
-	client "github.com/tendermint/tendermint/rpc/client"
+	bytes "github.com/dashpay/tenderdash/libs/bytes"
+	client "github.com/dashpay/tenderdash/rpc/client"
 
 	context "context"
 
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // RemoteClient is an autogenerated mock type for the RemoteClient type
diff --git a/rpc/client/mocks/sign_client.go b/rpc/client/mocks/sign_client.go
index fbbe98632e..9d312d993d 100644
--- a/rpc/client/mocks/sign_client.go
+++ b/rpc/client/mocks/sign_client.go
@@ -3,11 +3,11 @@
 package mocks
 
 import (
-	bytes "github.com/tendermint/tendermint/libs/bytes"
+	bytes "github.com/dashpay/tenderdash/libs/bytes"
 
 	context "context"
 
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 
 	mock "github.com/stretchr/testify/mock"
 )
diff --git a/rpc/client/mocks/status_client.go b/rpc/client/mocks/status_client.go
index 0c476a1897..7094efff07 100644
--- a/rpc/client/mocks/status_client.go
+++ b/rpc/client/mocks/status_client.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 	mock "github.com/stretchr/testify/mock"
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
 )
 
 // StatusClient is an autogenerated mock type for the StatusClient type
diff --git a/rpc/client/mocks/subscription_client.go b/rpc/client/mocks/subscription_client.go
index 2ce0795a04..512da36df5 100644
--- a/rpc/client/mocks/subscription_client.go
+++ b/rpc/client/mocks/subscription_client.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	coretypes "github.com/dashpay/tenderdash/rpc/coretypes"
 	mock "github.com/stretchr/testify/mock"
-	coretypes "github.com/tendermint/tendermint/rpc/coretypes"
 )
 
 // SubscriptionClient is an autogenerated mock type for the SubscriptionClient type
diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go
index e35da5e889..7544c9f846 100644
--- a/rpc/client/rpc_test.go
+++ b/rpc/client/rpc_test.go
@@ -18,21 +18,20 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/privval"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/mempool"
-	rpccore "github.com/tendermint/tendermint/internal/rpc/core"
-	"github.com/tendermint/tendermint/libs/log"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/rpc/client"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	rpclocal "github.com/tendermint/tendermint/rpc/client/local"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	rpccore "github.com/dashpay/tenderdash/internal/rpc/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/privval"
+	"github.com/dashpay/tenderdash/rpc/client"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	rpclocal "github.com/dashpay/tenderdash/rpc/client/local"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpcclient "github.com/dashpay/tenderdash/rpc/jsonrpc/client"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func getHTTPClient(t *testing.T, logger log.Logger, conf *config.Config) *rpchttp.HTTP {
diff --git a/rpc/coretypes/requests.go b/rpc/coretypes/requests.go
index ed90a11655..18870f50f3 100644
--- a/rpc/coretypes/requests.go
+++ b/rpc/coretypes/requests.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type RequestSubscribe struct {
diff --git a/rpc/coretypes/responses.go b/rpc/coretypes/responses.go
index 04652b3c65..329e1dc397 100644
--- a/rpc/coretypes/responses.go
+++ b/rpc/coretypes/responses.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	"github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // List of standardized errors used across RPC
diff --git a/rpc/coretypes/responses_test.go b/rpc/coretypes/responses_test.go
index e1049cfa65..1ae6456207 100644
--- a/rpc/coretypes/responses_test.go
+++ b/rpc/coretypes/responses_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	pbcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	"github.com/tendermint/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	pbcrypto "github.com/dashpay/tenderdash/proto/tendermint/crypto"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestStatusIndexer(t *testing.T) {
diff --git a/rpc/jsonrpc/client/decode.go b/rpc/jsonrpc/client/decode.go
index 2babcf70c3..2b7da2d942 100644
--- a/rpc/jsonrpc/client/decode.go
+++ b/rpc/jsonrpc/client/decode.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 func unmarshalResponseBytes(responseBytes []byte, expectedID string, result interface{}) error {
diff --git a/rpc/jsonrpc/client/http_json_client.go b/rpc/jsonrpc/client/http_json_client.go
index 0fd81aaba7..d5d6ae8e3e 100644
--- a/rpc/jsonrpc/client/http_json_client.go
+++ b/rpc/jsonrpc/client/http_json_client.go
@@ -15,7 +15,7 @@ import (
 
 	sync "github.com/sasha-s/go-deadlock"
 
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 const (
diff --git a/rpc/jsonrpc/client/ws_client.go b/rpc/jsonrpc/client/ws_client.go
index 5df137f4aa..ed91fdec15 100644
--- a/rpc/jsonrpc/client/ws_client.go
+++ b/rpc/jsonrpc/client/ws_client.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 // wsOptions carries optional settings for a websocket connection.
diff --git a/rpc/jsonrpc/client/ws_client_test.go b/rpc/jsonrpc/client/ws_client_test.go
index ff8196d47c..663973cc9f 100644
--- a/rpc/jsonrpc/client/ws_client_test.go
+++ b/rpc/jsonrpc/client/ws_client_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 const wsCallTimeout = 5 * time.Second
diff --git a/rpc/jsonrpc/jsonrpc_test.go b/rpc/jsonrpc/jsonrpc_test.go
index 0586e3019f..b171de3cc3 100644
--- a/rpc/jsonrpc/jsonrpc_test.go
+++ b/rpc/jsonrpc/jsonrpc_test.go
@@ -16,10 +16,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/rpc/jsonrpc/client"
-	"github.com/tendermint/tendermint/rpc/jsonrpc/server"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/rpc/jsonrpc/client"
+	"github.com/dashpay/tenderdash/rpc/jsonrpc/server"
 )
 
 // Client and Server should work over tcp or unix sockets
diff --git a/rpc/jsonrpc/server/http_json_handler.go b/rpc/jsonrpc/server/http_json_handler.go
index 4f9e28faa8..9ff030e5ec 100644
--- a/rpc/jsonrpc/server/http_json_handler.go
+++ b/rpc/jsonrpc/server/http_json_handler.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 // HTTP + JSON handler
diff --git a/rpc/jsonrpc/server/http_json_handler_test.go b/rpc/jsonrpc/server/http_json_handler_test.go
index dd4a9d8e23..033b39d9ff 100644
--- a/rpc/jsonrpc/server/http_json_handler_test.go
+++ b/rpc/jsonrpc/server/http_json_handler_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 func testMux() *http.ServeMux {
diff --git a/rpc/jsonrpc/server/http_server.go b/rpc/jsonrpc/server/http_server.go
index fffc002f39..6d82f99980 100644
--- a/rpc/jsonrpc/server/http_server.go
+++ b/rpc/jsonrpc/server/http_server.go
@@ -14,8 +14,8 @@ import (
 
 	"golang.org/x/net/netutil"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 // Config is a RPC server configuration.
diff --git a/rpc/jsonrpc/server/http_server_test.go b/rpc/jsonrpc/server/http_server_test.go
index ac8f2886ec..646f120adc 100644
--- a/rpc/jsonrpc/server/http_server_test.go
+++ b/rpc/jsonrpc/server/http_server_test.go
@@ -18,8 +18,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 type sampleResult struct {
diff --git a/rpc/jsonrpc/server/http_uri_handler.go b/rpc/jsonrpc/server/http_uri_handler.go
index c755bbaf13..469c041009 100644
--- a/rpc/jsonrpc/server/http_uri_handler.go
+++ b/rpc/jsonrpc/server/http_uri_handler.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 // uriReqID is a placeholder ID used for GET requests, which do not receive a
diff --git a/rpc/jsonrpc/server/parse_test.go b/rpc/jsonrpc/server/parse_test.go
index 4a0e92ad13..c95cacf79f 100644
--- a/rpc/jsonrpc/server/parse_test.go
+++ b/rpc/jsonrpc/server/parse_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/bytes"
 )
 
 func TestParseJSONMap(t *testing.T) {
diff --git a/rpc/jsonrpc/server/rpc_func.go b/rpc/jsonrpc/server/rpc_func.go
index 818ebb42e1..677106414f 100644
--- a/rpc/jsonrpc/server/rpc_func.go
+++ b/rpc/jsonrpc/server/rpc_func.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 // DefaultRPCTimeout is the default context timeout for calls to any RPC method
diff --git a/rpc/jsonrpc/server/ws_handler.go b/rpc/jsonrpc/server/ws_handler.go
index 3a259757b9..bb897680e4 100644
--- a/rpc/jsonrpc/server/ws_handler.go
+++ b/rpc/jsonrpc/server/ws_handler.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 // WebSocket handler
diff --git a/rpc/jsonrpc/server/ws_handler_test.go b/rpc/jsonrpc/server/ws_handler_test.go
index ce1bcd9737..55ac0704eb 100644
--- a/rpc/jsonrpc/server/ws_handler_test.go
+++ b/rpc/jsonrpc/server/ws_handler_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 func TestWebsocketManagerHandler(t *testing.T) {
diff --git a/rpc/jsonrpc/test/main.go b/rpc/jsonrpc/test/main.go
index 2ed013c177..d1b5928981 100644
--- a/rpc/jsonrpc/test/main.go
+++ b/rpc/jsonrpc/test/main.go
@@ -9,8 +9,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpcserver "github.com/dashpay/tenderdash/rpc/jsonrpc/server"
 )
 
 var routes = map[string]*rpcserver.RPCFunc{
diff --git a/rpc/jsonrpc/types/types.go b/rpc/jsonrpc/types/types.go
index ded68bea2a..8e922b8f6d 100644
--- a/rpc/jsonrpc/types/types.go
+++ b/rpc/jsonrpc/types/types.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 // ErrorCode is the type of JSON-RPC error codes.
diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go
index c988cadb08..e2e64deabc 100644
--- a/rpc/test/helpers.go
+++ b/rpc/test/helpers.go
@@ -7,15 +7,15 @@ import (
 	"testing"
 	"time"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/node"
-	"github.com/tendermint/tendermint/rpc/coretypes"
-	rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/libs/service"
+	"github.com/dashpay/tenderdash/node"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
+	rpcclient "github.com/dashpay/tenderdash/rpc/jsonrpc/client"
 )
 
 // Options helps with specifying some parameters for our RPC testing for greater
diff --git a/scripts/confix/confix.go b/scripts/confix/confix.go
index 29c5bb7531..5f284ea2a4 100644
--- a/scripts/confix/confix.go
+++ b/scripts/confix/confix.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/tendermint/tendermint/internal/libs/confix"
+	"github.com/dashpay/tenderdash/internal/libs/confix"
 )
 
 func init() {
diff --git a/scripts/estream/estream.go b/scripts/estream/estream.go
index c37bc5ba75..0e05ccf623 100644
--- a/scripts/estream/estream.go
+++ b/scripts/estream/estream.go
@@ -12,9 +12,9 @@ import (
 	"os/signal"
 	"path/filepath"
 
-	"github.com/tendermint/tendermint/rpc/client/eventstream"
-	rpcclient "github.com/tendermint/tendermint/rpc/client/http"
-	"github.com/tendermint/tendermint/rpc/coretypes"
+	"github.com/dashpay/tenderdash/rpc/client/eventstream"
+	rpcclient "github.com/dashpay/tenderdash/rpc/client/http"
+	"github.com/dashpay/tenderdash/rpc/coretypes"
 )
 
 var (
diff --git a/scripts/json2wal/main.go b/scripts/json2wal/main.go
index e8d3fcf932..28d0591a51 100644
--- a/scripts/json2wal/main.go
+++ b/scripts/json2wal/main.go
@@ -15,8 +15,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/tendermint/tendermint/internal/consensus"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/internal/consensus"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func main() {
diff --git a/scripts/metricsgen/metricsdiff/metricsdiff_test.go b/scripts/metricsgen/metricsdiff/metricsdiff_test.go
index ec27ef1e9b..56e1add7f1 100644
--- a/scripts/metricsgen/metricsdiff/metricsdiff_test.go
+++ b/scripts/metricsgen/metricsdiff/metricsdiff_test.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
+	metricsdiff "github.com/dashpay/tenderdash/scripts/metricsgen/metricsdiff"
 	"github.com/stretchr/testify/require"
-	metricsdiff "github.com/tendermint/tendermint/scripts/metricsgen/metricsdiff"
 )
 
 func TestDiff(t *testing.T) {
diff --git a/scripts/metricsgen/metricsgen_test.go b/scripts/metricsgen/metricsgen_test.go
index f3c97854de..423417f3e4 100644
--- a/scripts/metricsgen/metricsgen_test.go
+++ b/scripts/metricsgen/metricsgen_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	metricsgen "github.com/tendermint/tendermint/scripts/metricsgen"
+	metricsgen "github.com/dashpay/tenderdash/scripts/metricsgen"
 )
 
 const testDataDir = "./testdata"
diff --git a/scripts/scmigrate/migrate.go b/scripts/scmigrate/migrate.go
index c8e1d94900..643dce671f 100644
--- a/scripts/scmigrate/migrate.go
+++ b/scripts/scmigrate/migrate.go
@@ -17,8 +17,8 @@ import (
 	"github.com/google/orderedcode"
 	dbm "github.com/tendermint/tm-db"
 
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 type toMigrate struct {
diff --git a/scripts/scmigrate/migrate_test.go b/scripts/scmigrate/migrate_test.go
index 900a15f857..3527e5d7af 100644
--- a/scripts/scmigrate/migrate_test.go
+++ b/scripts/scmigrate/migrate_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func appendRandomMigrations(in []toMigrate, num int) []toMigrate {
diff --git a/scripts/wal2json/main.go b/scripts/wal2json/main.go
index 7ee7561068..22da871e16 100644
--- a/scripts/wal2json/main.go
+++ b/scripts/wal2json/main.go
@@ -13,7 +13,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/tendermint/tendermint/internal/consensus"
+	"github.com/dashpay/tenderdash/internal/consensus"
 )
 
 func main() {
diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go
index bb6251b349..aa250c4dd9 100644
--- a/test/e2e/app/app.go
+++ b/test/e2e/app/app.go
@@ -14,12 +14,12 @@ import (
 	sync "github.com/sasha-s/go-deadlock"
 	db "github.com/tendermint/tm-db"
 
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	types1 "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/test/e2e/app/app_test.go b/test/e2e/app/app_test.go
index ff7f1e639b..a238be37b3 100644
--- a/test/e2e/app/app_test.go
+++ b/test/e2e/app/app_test.go
@@ -14,11 +14,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	tmtypes "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmtypes "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func newApp(t *testing.T) *Application {
diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go
index ce2f86c312..66143562cd 100644
--- a/test/e2e/generator/generate.go
+++ b/test/e2e/generator/generate.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 var (
diff --git a/test/e2e/generator/generate_test.go b/test/e2e/generator/generate_test.go
index 1edfa5fba3..55771c27d5 100644
--- a/test/e2e/generator/generate_test.go
+++ b/test/e2e/generator/generate_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
 )
 
 func TestGenerator(t *testing.T) {
diff --git a/test/e2e/generator/main.go b/test/e2e/generator/main.go
index a74fb0637e..d1349aa9bc 100644
--- a/test/e2e/generator/main.go
+++ b/test/e2e/generator/main.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/libs/log"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/libs/log"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
 )
 
 const (
diff --git a/test/e2e/node/config.go b/test/e2e/node/config.go
index b2e1b24ffe..8eb9ee74a7 100644
--- a/test/e2e/node/config.go
+++ b/test/e2e/node/config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
 )
 
 // Config is the application configuration.
diff --git a/test/e2e/node/main.go b/test/e2e/node/main.go
index 3cd3576963..caf90c2ac4 100644
--- a/test/e2e/node/main.go
+++ b/test/e2e/node/main.go
@@ -15,27 +15,27 @@ import (
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/abci/server"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/internal/p2p"
-	"github.com/tendermint/tendermint/libs/log"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/light"
-	lproxy "github.com/tendermint/tendermint/light/proxy"
-	lrpc "github.com/tendermint/tendermint/light/rpc"
-	dbs "github.com/tendermint/tendermint/light/store/db"
-	"github.com/tendermint/tendermint/node"
-	"github.com/tendermint/tendermint/privval"
-	grpcprivval "github.com/tendermint/tendermint/privval/grpc"
-	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
-	"github.com/tendermint/tendermint/test/e2e/app"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/mockcoreserver"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/abci/server"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/internal/p2p"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/light"
+	lproxy "github.com/dashpay/tenderdash/light/proxy"
+	lrpc "github.com/dashpay/tenderdash/light/rpc"
+	dbs "github.com/dashpay/tenderdash/light/store/db"
+	"github.com/dashpay/tenderdash/node"
+	"github.com/dashpay/tenderdash/privval"
+	grpcprivval "github.com/dashpay/tenderdash/privval/grpc"
+	privvalproto "github.com/dashpay/tenderdash/proto/tendermint/privval"
+	rpcserver "github.com/dashpay/tenderdash/rpc/jsonrpc/server"
+	"github.com/dashpay/tenderdash/test/e2e/app"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/mockcoreserver"
 )
 
 var (
diff --git a/test/e2e/pkg/infra/docker/compose.go b/test/e2e/pkg/infra/docker/compose.go
index 8291d73961..a9453d8609 100644
--- a/test/e2e/pkg/infra/docker/compose.go
+++ b/test/e2e/pkg/infra/docker/compose.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"text/template"
 
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
 )
 
 // makeDockerCompose generates a Docker Compose config for a testnet.
diff --git a/test/e2e/pkg/infra/docker/exec.go b/test/e2e/pkg/infra/docker/exec.go
index de0033e325..361c46308d 100644
--- a/test/e2e/pkg/infra/docker/exec.go
+++ b/test/e2e/pkg/infra/docker/exec.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"path/filepath"
 
-	"github.com/tendermint/tendermint/test/e2e/pkg/exec"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/exec"
 )
 
 // execCompose runs a Docker Compose command for a testnet.
diff --git a/test/e2e/pkg/infra/docker/infra.go b/test/e2e/pkg/infra/docker/infra.go
index 382576c91d..f0b0902c8c 100644
--- a/test/e2e/pkg/infra/docker/infra.go
+++ b/test/e2e/pkg/infra/docker/infra.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/tendermint/tendermint/libs/log"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/exec"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra"
+	"github.com/dashpay/tenderdash/libs/log"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/exec"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/infra"
 )
 
 // testnetInfra provides an API for provisioning and manipulating
diff --git a/test/e2e/pkg/infra/infra.go b/test/e2e/pkg/infra/infra.go
index 2fa7c5ad97..2cefa337e6 100644
--- a/test/e2e/pkg/infra/infra.go
+++ b/test/e2e/pkg/infra/infra.go
@@ -3,7 +3,7 @@ package infra
 import (
 	"context"
 
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
 )
 
 // TestnetInfra provides an API for manipulating the infrastructure of a
diff --git a/test/e2e/pkg/manifest.go b/test/e2e/pkg/manifest.go
index cc768f8784..9bd98e0a64 100644
--- a/test/e2e/pkg/manifest.go
+++ b/test/e2e/pkg/manifest.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
 )
 
 // Manifest represents a TOML testnet manifest.
diff --git a/test/e2e/pkg/mockcoreserver/core_server.go b/test/e2e/pkg/mockcoreserver/core_server.go
index ef26284e87..390dbfe773 100644
--- a/test/e2e/pkg/mockcoreserver/core_server.go
+++ b/test/e2e/pkg/mockcoreserver/core_server.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/privval"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/privval"
 )
 
 // CoreServer is an interface of a mock core-server
diff --git a/test/e2e/pkg/mockcoreserver/server_test.go b/test/e2e/pkg/mockcoreserver/server_test.go
index edcfb3ca41..2d75db66e3 100644
--- a/test/e2e/pkg/mockcoreserver/server_test.go
+++ b/test/e2e/pkg/mockcoreserver/server_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	dashcore "github.com/tendermint/tendermint/dash/core"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/privval"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	dashcore "github.com/dashpay/tenderdash/dash/core"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/privval"
 )
 
 func TestServer(t *testing.T) {
diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go
index 7e8cada563..6ec8295ea4 100644
--- a/test/e2e/pkg/testnet.go
+++ b/test/e2e/pkg/testnet.go
@@ -15,15 +15,15 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/secp256k1"
-	"github.com/tendermint/tendermint/dash/llmq"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/secp256k1"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/test/e2e/pkg/utils.go b/test/e2e/pkg/utils.go
index 9082dda487..5f58a1d0b0 100644
--- a/test/e2e/pkg/utils.go
+++ b/test/e2e/pkg/utils.go
@@ -7,8 +7,8 @@ import (
 	"math/rand"
 	"strconv"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash/llmq"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash/llmq"
 )
 
 // proTxHashGenerator generates pseudorandom proTxHash based on a seed.
diff --git a/test/e2e/runner/benchmark.go b/test/e2e/runner/benchmark.go
index 91c748ff73..d5f6ef553e 100644
--- a/test/e2e/runner/benchmark.go
+++ b/test/e2e/runner/benchmark.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Benchmark is a simple function for fetching, calculating and printing
diff --git a/test/e2e/runner/cleanup.go b/test/e2e/runner/cleanup.go
index 5332af29cb..547aabf220 100644
--- a/test/e2e/runner/cleanup.go
+++ b/test/e2e/runner/cleanup.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"os"
 
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/infra"
 )
 
 // Cleanup destroys all infrastructure and removes all generated testnet files.
diff --git a/test/e2e/runner/evidence.go b/test/e2e/runner/evidence.go
index bb5e4c35f7..84192cf2a1 100644
--- a/test/e2e/runner/evidence.go
+++ b/test/e2e/runner/evidence.go
@@ -10,16 +10,15 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/test/factory"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/privval"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/test/factory"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/privval"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // InjectEvidence takes a running testnet and generates an amount of valid
diff --git a/test/e2e/runner/load.go b/test/e2e/runner/load.go
index eac2d682af..2a5eba24d8 100644
--- a/test/e2e/runner/load.go
+++ b/test/e2e/runner/load.go
@@ -7,11 +7,11 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Load generates transactions against the network until the given context is
diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index 9a24f11417..e50b1eafd9 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/tendermint/libs/log"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra/docker"
+	"github.com/dashpay/tenderdash/libs/log"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/infra"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/infra/docker"
 )
 
 const randomSeed = 2308084734268
diff --git a/test/e2e/runner/perturb.go b/test/e2e/runner/perturb.go
index 76a209ea24..edc238cced 100644
--- a/test/e2e/runner/perturb.go
+++ b/test/e2e/runner/perturb.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpctypes "github.com/tendermint/tendermint/rpc/coretypes"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpctypes "github.com/dashpay/tenderdash/rpc/coretypes"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/infra"
 )
 
 // Perturbs a running testnet.
diff --git a/test/e2e/runner/rpc.go b/test/e2e/runner/rpc.go
index f3538cc057..02875d6902 100644
--- a/test/e2e/runner/rpc.go
+++ b/test/e2e/runner/rpc.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	rpctypes "github.com/tendermint/tendermint/rpc/coretypes"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	rpctypes "github.com/dashpay/tenderdash/rpc/coretypes"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/test/e2e/runner/setup.go b/test/e2e/runner/setup.go
index 63959b0a44..7e6a3ae23b 100644
--- a/test/e2e/runner/setup.go
+++ b/test/e2e/runner/setup.go
@@ -19,16 +19,16 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/libs/log"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/privval"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	"github.com/dashpay/tenderdash/privval"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/infra"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go
index 5d5c2e7a96..3b45597fb9 100644
--- a/test/e2e/runner/start.go
+++ b/test/e2e/runner/start.go
@@ -6,9 +6,9 @@ import (
 	"sort"
 	"time"
 
-	"github.com/tendermint/tendermint/libs/log"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra"
+	"github.com/dashpay/tenderdash/libs/log"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/infra"
 )
 
 func Start(ctx context.Context, logger log.Logger, testnet *e2e.Testnet, ti infra.TestnetInfra) error {
diff --git a/test/e2e/runner/test.go b/test/e2e/runner/test.go
index 3d680d910d..c44f58acd4 100644
--- a/test/e2e/runner/test.go
+++ b/test/e2e/runner/test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/exec"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/test/e2e/pkg/exec"
 )
 
 // Test runs test cases under tests/
diff --git a/test/e2e/runner/wait.go b/test/e2e/runner/wait.go
index b8e8d0d4de..eac337823b 100644
--- a/test/e2e/runner/wait.go
+++ b/test/e2e/runner/wait.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/tendermint/tendermint/libs/log"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/libs/log"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
 )
 
 // Wait waits for a number of blocks to be produced, and for all nodes to catch
diff --git a/test/e2e/tests/app_test.go b/test/e2e/tests/app_test.go
index 5560fbf4b3..7fe54e4f06 100644
--- a/test/e2e/tests/app_test.go
+++ b/test/e2e/tests/app_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/code"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/rpc/client/http"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/abci/example/code"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	"github.com/dashpay/tenderdash/rpc/client/http"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 const (
diff --git a/test/e2e/tests/block_test.go b/test/e2e/tests/block_test.go
index 3ecbd8c001..d900a8b4ab 100644
--- a/test/e2e/tests/block_test.go
+++ b/test/e2e/tests/block_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Tests that block headers are identical across nodes where present.
diff --git a/test/e2e/tests/e2e_test.go b/test/e2e/tests/e2e_test.go
index 56db285fb7..c8e72d0b68 100644
--- a/test/e2e/tests/e2e_test.go
+++ b/test/e2e/tests/e2e_test.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	rpctypes "github.com/tendermint/tendermint/rpc/coretypes"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	rpchttp "github.com/dashpay/tenderdash/rpc/client/http"
+	rpctypes "github.com/dashpay/tenderdash/rpc/coretypes"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func init() {
diff --git a/test/e2e/tests/net_test.go b/test/e2e/tests/net_test.go
index 43cab77e8a..194d3c68f3 100644
--- a/test/e2e/tests/net_test.go
+++ b/test/e2e/tests/net_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Tests that all nodes have peered with each other, regardless of discovery method.
diff --git a/test/e2e/tests/validator_test.go b/test/e2e/tests/validator_test.go
index 6e7da9d13d..23c4c2c3da 100644
--- a/test/e2e/tests/validator_test.go
+++ b/test/e2e/tests/validator_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	e2e "github.com/dashpay/tenderdash/test/e2e/pkg"
+	"github.com/dashpay/tenderdash/types"
 )
 
 // Tests that validator sets are available and correct according to
diff --git a/test/fuzz/tests/mempool_test.go b/test/fuzz/tests/mempool_test.go
index bd14d43b46..7e65a8f6fb 100644
--- a/test/fuzz/tests/mempool_test.go
+++ b/test/fuzz/tests/mempool_test.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	abciclient "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/kvstore"
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/libs/log"
+	abciclient "github.com/dashpay/tenderdash/abci/client"
+	"github.com/dashpay/tenderdash/abci/example/kvstore"
+	"github.com/dashpay/tenderdash/config"
+	"github.com/dashpay/tenderdash/internal/mempool"
+	"github.com/dashpay/tenderdash/libs/log"
 )
 
 func FuzzMempool(f *testing.F) {
diff --git a/test/fuzz/tests/p2p_secretconnection_test.go b/test/fuzz/tests/p2p_secretconnection_test.go
index 65f268a7bf..b3227847ff 100644
--- a/test/fuzz/tests/p2p_secretconnection_test.go
+++ b/test/fuzz/tests/p2p_secretconnection_test.go
@@ -9,9 +9,9 @@ import (
 	"log"
 	"testing"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/libs/async"
-	sc "github.com/tendermint/tendermint/internal/p2p/conn"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/libs/async"
+	sc "github.com/dashpay/tenderdash/internal/p2p/conn"
 )
 
 func FuzzP2PSecretConnection(f *testing.F) {
diff --git a/test/fuzz/tests/rpc_jsonrpc_server_test.go b/test/fuzz/tests/rpc_jsonrpc_server_test.go
index 67dee9ef28..e62d586865 100644
--- a/test/fuzz/tests/rpc_jsonrpc_server_test.go
+++ b/test/fuzz/tests/rpc_jsonrpc_server_test.go
@@ -11,9 +11,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/tendermint/tendermint/libs/log"
-	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
-	"github.com/tendermint/tendermint/rpc/jsonrpc/types"
+	"github.com/dashpay/tenderdash/libs/log"
+	rpcserver "github.com/dashpay/tenderdash/rpc/jsonrpc/server"
+	"github.com/dashpay/tenderdash/rpc/jsonrpc/types"
 )
 
 func FuzzRPCJSONRPCServer(f *testing.F) {
diff --git a/types/block.go b/types/block.go
index 5035e8b87e..df65dc7be3 100644
--- a/types/block.go
+++ b/types/block.go
@@ -18,14 +18,14 @@ import (
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/rs/zerolog"
 
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 const (
@@ -398,7 +398,7 @@ func MakeBlock(height int64, txs []Tx, lastCommit *Commit, evidence []Evidence)
 // NOTE: changes to the Header should be duplicated in:
 // - header.Hash()
 // - abci.Header
-// - https://github.com/tendermint/tendermint/blob/master/spec/core/data_structures.md
+// - https://github.com/dashpay/tenderdash/blob/master/spec/core/data_structures.md
 type Header struct {
 	// basic block info
 	Version               version.Consensus `json:"version"`
diff --git a/types/block_dash.go b/types/block_dash.go
index 5864735543..4af248c6b5 100644
--- a/types/block_dash.go
+++ b/types/block_dash.go
@@ -1,6 +1,6 @@
 package types
 
-import tmbytes "github.com/tendermint/tendermint/libs/bytes"
+import tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 
 // SetDashParams sets dash's some parameters to a block
 // this method should call if we need to provide specific dash data
diff --git a/types/block_meta.go b/types/block_meta.go
index 2a6d953475..f91a44a173 100644
--- a/types/block_meta.go
+++ b/types/block_meta.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // BlockMeta contains meta information.
diff --git a/types/block_meta_test.go b/types/block_meta_test.go
index 6379177bf0..600b5592c4 100644
--- a/types/block_meta_test.go
+++ b/types/block_meta_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/crypto"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 func TestBlockMeta_ToProto(t *testing.T) {
diff --git a/types/block_test.go b/types/block_test.go
index adb797e555..f9a4af6489 100644
--- a/types/block_test.go
+++ b/types/block_test.go
@@ -18,15 +18,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	tmversion "github.com/tendermint/tendermint/proto/tendermint/version"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
+	tmversion "github.com/dashpay/tenderdash/proto/tendermint/version"
+	"github.com/dashpay/tenderdash/version"
 )
 
 func TestMain(m *testing.M) {
diff --git a/types/canonical.go b/types/canonical.go
index dabca9da7f..e4c5d74f51 100644
--- a/types/canonical.go
+++ b/types/canonical.go
@@ -3,8 +3,8 @@ package types
 import (
 	"time"
 
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // Canonical* wraps the structs in types for amino encoding them for use in SignBytes / the Signable interface.
diff --git a/types/canonical_test.go b/types/canonical_test.go
index 97f50638d9..ab05d0b323 100644
--- a/types/canonical_test.go
+++ b/types/canonical_test.go
@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func TestCanonicalizeBlockID(t *testing.T) {
diff --git a/types/core_chainlock.go b/types/core_chainlock.go
index 431967d22b..b6c9d3b1c2 100644
--- a/types/core_chainlock.go
+++ b/types/core_chainlock.go
@@ -6,8 +6,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 type CoreChainLock struct {
diff --git a/types/encoding_helper.go b/types/encoding_helper.go
index d0a731499e..28a238793a 100644
--- a/types/encoding_helper.go
+++ b/types/encoding_helper.go
@@ -3,7 +3,7 @@ package types
 import (
 	gogotypes "github.com/gogo/protobuf/types"
 
-	"github.com/tendermint/tendermint/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/bytes"
 )
 
 // cdcEncode returns nil if the input is nil, otherwise returns
diff --git a/types/events.go b/types/events.go
index 29ba52b690..90568bbc92 100644
--- a/types/events.go
+++ b/types/events.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmquery "github.com/tendermint/tendermint/internal/pubsub/query"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmquery "github.com/dashpay/tenderdash/internal/pubsub/query"
 )
 
 // Reserved event types (alphabetically sorted).
diff --git a/types/evidence.go b/types/evidence.go
index ad782d747f..86e3f08631 100644
--- a/types/evidence.go
+++ b/types/evidence.go
@@ -11,13 +11,13 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // Evidence represents any provable malicious activity by a validator.
diff --git a/types/evidence_test.go b/types/evidence_test.go
index 62058bb845..edee9d7248 100644
--- a/types/evidence_test.go
+++ b/types/evidence_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 var defaultVoteTime = time.Date(2019, 1, 1, 0, 0, 0, 0, time.UTC)
diff --git a/types/generator.go b/types/generator.go
index 5ce8b00f1c..75c8f034f4 100644
--- a/types/generator.go
+++ b/types/generator.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"sort"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash/llmq"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash/llmq"
 )
 
 // RandValidatorSet returns a randomized validator set (size: +numValidators+),
diff --git a/types/genesis.go b/types/genesis.go
index bd6c8a8203..c98872fdd9 100644
--- a/types/genesis.go
+++ b/types/genesis.go
@@ -9,12 +9,12 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/types/genesis_test.go b/types/genesis_test.go
index 7e29b5e8dc..92a918f01d 100644
--- a/types/genesis_test.go
+++ b/types/genesis_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmtime "github.com/tendermint/tendermint/libs/time"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
 )
 
 func TestGenesisBad(t *testing.T) {
@@ -101,7 +101,7 @@ func TestGenesisBad(t *testing.T) {
 				"chain_id":"mychain",
 				"validator_quorum_threshold_public_key":{"type": "tendermint/PubKeyBLS12381","value":"F5BjXeh0DppqaxX7a3LzoWr6CXPZcZeba6VHYdbiUCxQ23b00mFD8FRZpCz9Ug1E"},
 				"validator_quorum_hash":"43FF39CC1F41B9FC63DFA5B1EDF3F0CA3AD5CAFAE4B12B4FE9263B08BB50C4CC",
-				"validator_quorum_type":100,				
+				"validator_quorum_type":100,
 				"validators":[{
 					"address": "A",
 					"pub_key":{"type":"tendermint/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="},
@@ -122,7 +122,7 @@ func TestGenesisBad(t *testing.T) {
 				"name":"",
 				"pro_tx_hash":"51BF39CC1F41B9FC63DFA5B1EDF3F0CA3AD5CAFAE4B12B4FE9263B08BB50C45F"
 			}],
-			"validator_quorum_type":100,			
+			"validator_quorum_type":100,
 			"validator_quorum_threshold_public_key":{
 				"type": "tendermint/PubKeyBLS12381",
 				"value":"F5BjXeh0DppqaxX7a3LzoWr6CXPZcZeba6VHYdbiUCxQ23b00mFD8FRZpCz9Ug1E"
diff --git a/types/light.go b/types/light.go
index 0197a41294..0fdec40355 100644
--- a/types/light.go
+++ b/types/light.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	tbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // Info about the status of the light client
diff --git a/types/light_test.go b/types/light_test.go
index 72a275bc4b..bcb1bad17f 100644
--- a/types/light_test.go
+++ b/types/light_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/version"
 )
 
 func TestLightBlockValidateBasic(t *testing.T) {
diff --git a/types/mocks/block_event_publisher.go b/types/mocks/block_event_publisher.go
index b9c4bcdc01..8cd1f3d266 100644
--- a/types/mocks/block_event_publisher.go
+++ b/types/mocks/block_event_publisher.go
@@ -3,8 +3,8 @@
 package mocks
 
 import (
+	types "github.com/dashpay/tenderdash/types"
 	mock "github.com/stretchr/testify/mock"
-	types "github.com/tendermint/tendermint/types"
 )
 
 // BlockEventPublisher is an autogenerated mock type for the BlockEventPublisher type
diff --git a/types/mocks/priv_validator.go b/types/mocks/priv_validator.go
index d1cfd55ff7..9f75bf3771 100644
--- a/types/mocks/priv_validator.go
+++ b/types/mocks/priv_validator.go
@@ -4,19 +4,19 @@ package mocks
 
 import (
 	btcjson "github.com/dashpay/dashd-go/btcjson"
-	bytes "github.com/tendermint/tendermint/libs/bytes"
+	bytes "github.com/dashpay/tenderdash/libs/bytes"
 
 	context "context"
 
-	crypto "github.com/tendermint/tendermint/crypto"
+	crypto "github.com/dashpay/tenderdash/crypto"
 
-	log "github.com/tendermint/tendermint/libs/log"
+	log "github.com/dashpay/tenderdash/libs/log"
 
 	mock "github.com/stretchr/testify/mock"
 
-	tenderminttypes "github.com/tendermint/tendermint/proto/tendermint/types"
+	tenderminttypes "github.com/dashpay/tenderdash/proto/tendermint/types"
 
-	types "github.com/tendermint/tendermint/types"
+	types "github.com/dashpay/tenderdash/types"
 )
 
 // PrivValidator is an autogenerated mock type for the PrivValidator type
diff --git a/types/node_id.go b/types/node_id.go
index a5db401598..e355a6f971 100644
--- a/types/node_id.go
+++ b/types/node_id.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 // NodeIDByteLength is the length of a crypto.Address. Currently only 20.
diff --git a/types/node_info.go b/types/node_info.go
index be6e3bebaa..eb3720f890 100644
--- a/types/node_info.go
+++ b/types/node_info.go
@@ -7,11 +7,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/tendermint/tendermint/crypto"
-
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
+	"github.com/dashpay/tenderdash/crypto"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmp2p "github.com/dashpay/tenderdash/proto/tendermint/p2p"
 )
 
 const (
diff --git a/types/node_info_test.go b/types/node_info_test.go
index f769d0255b..b600df5820 100644
--- a/types/node_info_test.go
+++ b/types/node_info_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	tmnet "github.com/tendermint/tendermint/libs/net"
-	"github.com/tendermint/tendermint/version"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	tmnet "github.com/dashpay/tenderdash/libs/net"
+	"github.com/dashpay/tenderdash/version"
 )
 
 const testCh = 0x01
diff --git a/types/node_key.go b/types/node_key.go
index 927e17065d..91fbe09b31 100644
--- a/types/node_key.go
+++ b/types/node_key.go
@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmos "github.com/tendermint/tendermint/libs/os"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmos "github.com/dashpay/tenderdash/libs/os"
 )
 
 //------------------------------------------------------------------------------
diff --git a/types/node_key_test.go b/types/node_key_test.go
index 0dea771eaf..c58d3220ab 100644
--- a/types/node_key_test.go
+++ b/types/node_key_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/dashpay/tenderdash/types"
 )
 
 func TestLoadOrGenNodeKey(t *testing.T) {
diff --git a/types/params.go b/types/params.go
index 66b4b7ae39..04ceda4693 100644
--- a/types/params.go
+++ b/types/params.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/secp256k1"
-	tmstrings "github.com/tendermint/tendermint/internal/libs/strings"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto/secp256k1"
+	tmstrings "github.com/dashpay/tenderdash/internal/libs/strings"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/types/params_test.go b/types/params_test.go
index 37a334bbb6..7e74c21315 100644
--- a/types/params_test.go
+++ b/types/params_test.go
@@ -7,7 +7,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 var (
diff --git a/types/part_set.go b/types/part_set.go
index 2f098c3217..044a68358c 100644
--- a/types/part_set.go
+++ b/types/part_set.go
@@ -7,15 +7,14 @@ import (
 	"fmt"
 	"io"
 
-	sync "github.com/sasha-s/go-deadlock"
-
 	"github.com/rs/zerolog"
+	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/crypto/merkle"
-	"github.com/tendermint/tendermint/libs/bits"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/libs/bits"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 var (
diff --git a/types/part_set_test.go b/types/part_set_test.go
index 760abe9224..04b342087f 100644
--- a/types/part_set_test.go
+++ b/types/part_set_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto/merkle"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 const (
diff --git a/types/priv_validator.go b/types/priv_validator.go
index e4b5056a07..723d21af69 100644
--- a/types/priv_validator.go
+++ b/types/priv_validator.go
@@ -10,15 +10,14 @@ import (
 	"fmt"
 	"strconv"
 
-	sync "github.com/sasha-s/go-deadlock"
-
 	"github.com/dashpay/dashd-go/btcjson"
+	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // PrivValidatorType defines the implementation types.
diff --git a/types/proposal.go b/types/proposal.go
index 4844ccb059..9525556a0b 100644
--- a/types/proposal.go
+++ b/types/proposal.go
@@ -11,11 +11,11 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/rs/zerolog"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 var (
@@ -107,7 +107,7 @@ func (p *Proposal) ValidateBasic() error {
 // localtime <= proposedBlockTime + MsgDelay + Precision
 //
 // For more information on the meaning of 'timely', see the proposer-based timestamp specification:
-// https://github.com/tendermint/tendermint/tree/master/spec/consensus/proposer-based-timestamp
+// https://github.com/dashpay/tenderdash/tree/master/spec/consensus/proposer-based-timestamp
 //
 // NOTE: by definition, at initial height, recvTime MUST be genesis time.
 func (p *Proposal) IsTimely(recvTime time.Time, sp SynchronyParams, round int32) bool {
diff --git a/types/proposal_test.go b/types/proposal_test.go
index 9a31ab51c1..a7f9d5ab9a 100644
--- a/types/proposal_test.go
+++ b/types/proposal_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func getTestProposal(t testing.TB) *Proposal {
diff --git a/types/protobuf.go b/types/protobuf.go
index 73d5d3c267..2bfa083b94 100644
--- a/types/protobuf.go
+++ b/types/protobuf.go
@@ -5,13 +5,13 @@ import (
 
 	"github.com/dashpay/dashd-go/btcjson"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/crypto/secp256k1"
-	crypto2 "github.com/tendermint/tendermint/proto/tendermint/crypto"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/crypto/secp256k1"
+	crypto2 "github.com/dashpay/tenderdash/proto/tendermint/crypto"
 )
 
 //-------------------------------------------------------
diff --git a/types/protobuf_test.go b/types/protobuf_test.go
index 7db7e6211b..4069c59d81 100644
--- a/types/protobuf_test.go
+++ b/types/protobuf_test.go
@@ -7,10 +7,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/encoding"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/encoding"
 )
 
 func TestABCIPubKey(t *testing.T) {
diff --git a/types/quorum.go b/types/quorum.go
index a8a66a86f7..5e0a5c7e67 100644
--- a/types/quorum.go
+++ b/types/quorum.go
@@ -3,9 +3,9 @@ package types
 import (
 	"fmt"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/libs/log"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // CommitSigns is used to combine threshold signatures and quorum-hash that were used
diff --git a/types/quorum_sign_data.go b/types/quorum_sign_data.go
index d090c0d2e0..9607131d6e 100644
--- a/types/quorum_sign_data.go
+++ b/types/quorum_sign_data.go
@@ -7,9 +7,9 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/rs/zerolog"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 var (
diff --git a/types/quorum_sign_data_test.go b/types/quorum_sign_data_test.go
index e6a56ba502..54467ab895 100644
--- a/types/quorum_sign_data_test.go
+++ b/types/quorum_sign_data_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func TestBlockRequestID(t *testing.T) {
diff --git a/types/signable.go b/types/signable.go
index b2af3b3733..2b379ed744 100644
--- a/types/signable.go
+++ b/types/signable.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	"github.com/tendermint/tendermint/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
 )
 
 const (
diff --git a/types/signed_msg_type.go b/types/signed_msg_type.go
index 4ab5685a76..fb9c8ac264 100644
--- a/types/signed_msg_type.go
+++ b/types/signed_msg_type.go
@@ -1,6 +1,6 @@
 package types
 
-import tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+import tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 
 // IsVoteTypeValid returns true if t is a valid vote type.
 func IsVoteTypeValid(t tmproto.SignedMsgType) bool {
diff --git a/types/signs_recoverer.go b/types/signs_recoverer.go
index 77a4088ba5..d9e7afdfa9 100644
--- a/types/signs_recoverer.go
+++ b/types/signs_recoverer.go
@@ -3,8 +3,8 @@ package types
 import (
 	"fmt"
 
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // SignsRecoverer is used to recover threshold block, state, and vote-extension signatures
diff --git a/types/signs_recoverer_test.go b/types/signs_recoverer_test.go
index 0df694e287..e805df56f8 100644
--- a/types/signs_recoverer_test.go
+++ b/types/signs_recoverer_test.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func TestSigsRecoverer(t *testing.T) {
diff --git a/types/test_util.go b/types/test_util.go
index 5ec6f47a8e..1f0ca2b7f7 100644
--- a/types/test_util.go
+++ b/types/test_util.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"math/rand"
 
-	"github.com/tendermint/tendermint/crypto"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmtime "github.com/dashpay/tenderdash/libs/time"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const StateIDVersion = 1
diff --git a/types/tx.go b/types/tx.go
index f815af80cb..6c5abb898a 100644
--- a/types/tx.go
+++ b/types/tx.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"sort"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // Tx is an arbitrary byte array.
diff --git a/types/tx_test.go b/types/tx_test.go
index 77afa1b23f..19bcdf18a6 100644
--- a/types/tx_test.go
+++ b/types/tx_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	ctest "github.com/tendermint/tendermint/internal/libs/test"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	ctest "github.com/dashpay/tenderdash/internal/libs/test"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func makeTxs(cnt, size int) Txs {
diff --git a/types/validation.go b/types/validation.go
index 7a1fd885da..0dfd8aceba 100644
--- a/types/validation.go
+++ b/types/validation.go
@@ -5,9 +5,9 @@ import (
 	"math/bits"
 	"time"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/crypto/ed25519"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/crypto/ed25519"
 )
 
 // ValidateHash returns an error if the hash is not empty, but its
diff --git a/types/validation_test.go b/types/validation_test.go
index 295e8d00c4..8f5809cd44 100644
--- a/types/validation_test.go
+++ b/types/validation_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // Check VerifyCommit
diff --git a/types/validator.go b/types/validator.go
index 426d0e0caf..9316f96b53 100644
--- a/types/validator.go
+++ b/types/validator.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	ce "github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/internal/jsontypes"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	ce "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/internal/jsontypes"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 // Validator Volatile state for each Validator
diff --git a/types/validator_address.go b/types/validator_address.go
index 3fb3b6faed..caa74ecd15 100644
--- a/types/validator_address.go
+++ b/types/validator_address.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	tmrand "github.com/tendermint/tendermint/libs/rand"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
 )
 
 var (
diff --git a/types/validator_address_test.go b/types/validator_address_test.go
index ea794715dc..7929000587 100644
--- a/types/validator_address_test.go
+++ b/types/validator_address_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/libs/rand"
+	"github.com/dashpay/tenderdash/libs/rand"
 )
 
 func TestValidatorAddress_String(t *testing.T) {
diff --git a/types/validator_set.go b/types/validator_set.go
index 4ffb469849..01e0cf2925 100644
--- a/types/validator_set.go
+++ b/types/validator_set.go
@@ -12,14 +12,14 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/rs/zerolog"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
-	"github.com/tendermint/tendermint/crypto/merkle"
-	"github.com/tendermint/tendermint/dash/llmq"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	cryptoenc "github.com/dashpay/tenderdash/crypto/encoding"
+	"github.com/dashpay/tenderdash/crypto/merkle"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/types/validator_set_test.go b/types/validator_set_test.go
index e9578e666e..bc31df9dd8 100644
--- a/types/validator_set_test.go
+++ b/types/validator_set_test.go
@@ -15,12 +15,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmmath "github.com/dashpay/tenderdash/libs/math"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func TestValidatorSetBasic(t *testing.T) {
diff --git a/types/validator_test.go b/types/validator_test.go
index fcb377b71a..72d9051100 100644
--- a/types/validator_test.go
+++ b/types/validator_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
+	"github.com/dashpay/tenderdash/crypto"
 )
 
 func TestValidatorProtoBuf(t *testing.T) {
diff --git a/types/vote.go b/types/vote.go
index a5901b3d3a..bf6b19c205 100644
--- a/types/vote.go
+++ b/types/vote.go
@@ -9,12 +9,12 @@ import (
 	"github.com/dashpay/dashd-go/btcjson"
 	"github.com/rs/zerolog"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/internal/libs/protoio"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/internal/libs/protoio"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmcons "github.com/dashpay/tenderdash/proto/tendermint/consensus"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/types/vote_dash.go b/types/vote_dash.go
index b8fc4363d8..aae8f430b8 100644
--- a/types/vote_dash.go
+++ b/types/vote_dash.go
@@ -1,6 +1,6 @@
 package types
 
-import tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+import tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 
 // PopulateSignsFromProto updates the signatures of the current Vote with values are taken from the Vote's protobuf
 func (vote *Vote) PopulateSignsFromProto(pv *tmproto.Vote) error {
diff --git a/types/vote_extension.go b/types/vote_extension.go
index 4ddcbb3fcf..dcce659a33 100644
--- a/types/vote_extension.go
+++ b/types/vote_extension.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	abci "github.com/dashpay/tenderdash/abci/types"
+	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 var (
diff --git a/types/vote_set.go b/types/vote_set.go
index 4f4782429a..103e86dcab 100644
--- a/types/vote_set.go
+++ b/types/vote_set.go
@@ -9,8 +9,8 @@ import (
 	"github.com/rs/zerolog"
 	sync "github.com/sasha-s/go-deadlock"
 
-	"github.com/tendermint/tendermint/libs/bits"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/libs/bits"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/types/vote_set_test.go b/types/vote_set_test.go
index 757c111f49..6be1275fde 100644
--- a/types/vote_set_test.go
+++ b/types/vote_set_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/dash/llmq"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/dash/llmq"
+	tmrand "github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 func TestVoteSet_AddVote_Good(t *testing.T) {
diff --git a/types/vote_test.go b/types/vote_test.go
index 573fcade17..0c05e9d502 100644
--- a/types/vote_test.go
+++ b/types/vote_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/bls12381"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/rand"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/dashpay/tenderdash/crypto"
+	"github.com/dashpay/tenderdash/crypto/bls12381"
+	"github.com/dashpay/tenderdash/libs/log"
+	"github.com/dashpay/tenderdash/libs/rand"
+	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
 )
 
 const (
diff --git a/version/version.go b/version/version.go
index c97f70e910..2c7c9e0543 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,6 +1,6 @@
 package version
 
-import tmversion "github.com/tendermint/tendermint/proto/tendermint/version"
+import tmversion "github.com/dashpay/tenderdash/proto/tendermint/version"
 
 var (
 	TMCoreSemVer = TMVersionDefault