diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100755 index 000000000..153610208 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,8 @@ +version: 2 + +defaults: &defaults + working_directory: /go/src/github.com/MinterTeam/minter-go-node + docker: + - image: circleci/golang:1.10.0 + environment: + GOBIN: /tmp/workspace/bin diff --git a/api/api.go b/api/api.go index f752da1d3..c1e106f9b 100644 --- a/api/api.go +++ b/api/api.go @@ -7,10 +7,10 @@ import ( "github.com/gorilla/mux" "github.com/rs/cors" + "github.com/MinterTeam/minter-go-node/cmd/utils" + "github.com/MinterTeam/minter-go-node/core/minter" "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/rpc/lib/client" - "minter/cmd/utils" - "minter/core/minter" "time" ) diff --git a/api/balance.go b/api/balance.go index 3aa35f595..ad55b3f1c 100644 --- a/api/balance.go +++ b/api/balance.go @@ -2,8 +2,8 @@ package api import ( "encoding/json" + "github.com/MinterTeam/minter-go-node/core/types" "github.com/gorilla/mux" - "minter/core/types" "net/http" ) diff --git a/api/balance_watcher.go b/api/balance_watcher.go index 5a99898f6..754d3a8d6 100644 --- a/api/balance_watcher.go +++ b/api/balance_watcher.go @@ -1,9 +1,9 @@ package api import ( + "github.com/MinterTeam/minter-go-node/core/state" "github.com/gorilla/websocket" "log" - "minter/core/state" "net/http" ) diff --git a/api/candidate.go b/api/candidate.go index afedf7695..d8f4d9e9f 100644 --- a/api/candidate.go +++ b/api/candidate.go @@ -3,9 +3,9 @@ package api import ( "encoding/json" "fmt" + "github.com/MinterTeam/minter-go-node/core/state" + "github.com/MinterTeam/minter-go-node/core/types" "github.com/gorilla/mux" - "minter/core/state" - "minter/core/types" "net/http" ) diff --git a/api/coin_info.go b/api/coin_info.go index d0ede134b..d3462ac7c 100644 --- a/api/coin_info.go +++ b/api/coin_info.go @@ -2,8 +2,8 @@ package api import ( "encoding/json" + "github.com/MinterTeam/minter-go-node/core/types" "github.com/gorilla/mux" - "minter/core/types" "net/http" ) diff --git a/api/estimate_coin_exchange_return.go b/api/estimate_coin_exchange_return.go index e367865a2..3a3bf5d8f 100644 --- a/api/estimate_coin_exchange_return.go +++ b/api/estimate_coin_exchange_return.go @@ -2,9 +2,9 @@ package api import ( "encoding/json" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/formula" "math/big" - "minter/core/types" - "minter/formula" "net/http" ) diff --git a/api/send_transaction.go b/api/send_transaction.go index 070ed1c20..a2eecdc18 100644 --- a/api/send_transaction.go +++ b/api/send_transaction.go @@ -5,13 +5,13 @@ import ( "io" "io/ioutil" - "minter/core/code" + "github.com/MinterTeam/minter-go-node/core/code" "net/http" "strings" //"github.com/tendermint/tendermint/rpc/core/types" + "github.com/MinterTeam/minter-go-node/core/types" abci "github.com/tendermint/abci/types" "github.com/tendermint/tmlibs/common" - "minter/core/types" ) type SendTransactionRequest struct { diff --git a/api/transaction_count.go b/api/transaction_count.go index daf6a56ec..549a0994b 100644 --- a/api/transaction_count.go +++ b/api/transaction_count.go @@ -2,8 +2,8 @@ package api import ( "encoding/json" + "github.com/MinterTeam/minter-go-node/core/types" "github.com/gorilla/mux" - "minter/core/types" "net/http" ) diff --git a/api/transactions.go b/api/transactions.go index 1ab80d0d5..5a9557b8e 100644 --- a/api/transactions.go +++ b/api/transactions.go @@ -2,10 +2,10 @@ package api import ( "encoding/json" + "github.com/MinterTeam/minter-go-node/core/transaction" "github.com/tendermint/tendermint/types" "github.com/tendermint/tmlibs/common" "math/big" - "minter/core/transaction" "net/http" ) diff --git a/cmd/minter/main.go b/cmd/minter/main.go index aae484090..a67089539 100644 --- a/cmd/minter/main.go +++ b/cmd/minter/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/MinterTeam/minter-go-node/api" + "github.com/MinterTeam/minter-go-node/core/minter" "github.com/tendermint/abci/server" "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" - "minter/api" - "minter/core/minter" "os" ) diff --git a/core/check/check.go b/core/check/check.go index 4bb777342..12dd1a4da 100644 --- a/core/check/check.go +++ b/core/check/check.go @@ -4,11 +4,11 @@ import ( "bytes" "errors" "fmt" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto" + "github.com/MinterTeam/minter-go-node/crypto/sha3" + "github.com/MinterTeam/minter-go-node/rlp" "math/big" - "minter/core/types" - "minter/crypto" - "minter/crypto/sha3" - "minter/rlp" ) var ( diff --git a/core/dao/dao.go b/core/dao/dao.go index 82cc31a86..252676a45 100644 --- a/core/dao/dao.go +++ b/core/dao/dao.go @@ -1,6 +1,6 @@ package dao -import "minter/core/types" +import "github.com/MinterTeam/minter-go-node/core/types" var ( Address = types.HexToAddress("Mxa93163fdf10724dc4785ff5cbfb9ac0b5949409f") diff --git a/core/minter/minter.go b/core/minter/minter.go index 3ad399a9f..0e942aa31 100644 --- a/core/minter/minter.go +++ b/core/minter/minter.go @@ -5,18 +5,18 @@ import ( "encoding/binary" "encoding/json" "fmt" + "github.com/MinterTeam/minter-go-node/cmd/utils" + "github.com/MinterTeam/minter-go-node/core/code" + "github.com/MinterTeam/minter-go-node/core/rewards" + "github.com/MinterTeam/minter-go-node/core/state" + "github.com/MinterTeam/minter-go-node/core/transaction" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/core/validators" + "github.com/MinterTeam/minter-go-node/genesis" + "github.com/MinterTeam/minter-go-node/helpers" + "github.com/MinterTeam/minter-go-node/mintdb" abciTypes "github.com/tendermint/abci/types" "math/big" - "minter/cmd/utils" - "minter/core/code" - "minter/core/rewards" - "minter/core/state" - "minter/core/transaction" - "minter/core/types" - "minter/core/validators" - "minter/genesis" - "minter/helpers" - "minter/mintdb" ) type Blockchain struct { diff --git a/core/state/balance_watcher.go b/core/state/balance_watcher.go index f0c84a577..00055fc57 100644 --- a/core/state/balance_watcher.go +++ b/core/state/balance_watcher.go @@ -2,8 +2,8 @@ package state import ( "encoding/json" + "github.com/MinterTeam/minter-go-node/core/types" "math/big" - "minter/core/types" ) var ( diff --git a/core/state/database.go b/core/state/database.go index 5bb267dd0..047608b7d 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/mintdb" + "github.com/MinterTeam/minter-go-node/trie" lru "github.com/hashicorp/golang-lru" - "minter/core/types" - "minter/mintdb" - "minter/trie" ) // Trie cache generation limit after which to evic trie nodes from memory. diff --git a/core/state/state_candidate.go b/core/state/state_candidate.go index bb6a6e6f3..b0add8456 100644 --- a/core/state/state_candidate.go +++ b/core/state/state_candidate.go @@ -22,9 +22,9 @@ import ( "bytes" "encoding/json" "fmt" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/rlp" "math/big" - "minter/core/types" - "minter/rlp" ) const ( diff --git a/core/state/state_coin.go b/core/state/state_coin.go index e159c360c..5cad8092e 100644 --- a/core/state/state_coin.go +++ b/core/state/state_coin.go @@ -20,10 +20,10 @@ import ( "io" "fmt" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto" + "github.com/MinterTeam/minter-go-node/rlp" "math/big" - "minter/core/types" - "minter/crypto" - "minter/rlp" ) // stateCoin represents a coin which is being modified. diff --git a/core/state/state_frozen_fund.go b/core/state/state_frozen_fund.go index 2c1f978c0..8ed68d6d6 100644 --- a/core/state/state_frozen_fund.go +++ b/core/state/state_frozen_fund.go @@ -21,9 +21,9 @@ import ( "bytes" "fmt" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/rlp" "math/big" - "minter/core/types" - "minter/rlp" ) // stateFrozenFund represents a frozen fund which is being modified. diff --git a/core/state/state_object.go b/core/state/state_object.go index ba1413cfc..173d0473d 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "minter/core/types" - "minter/crypto" - "minter/rlp" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto" + "github.com/MinterTeam/minter-go-node/rlp" "sort" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 5ea526cb3..7a08389ae 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -22,14 +22,14 @@ import ( "math/big" "sync" - "minter/core/types" - "minter/crypto" - "minter/rlp" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto" + "github.com/MinterTeam/minter-go-node/rlp" "bytes" + "github.com/MinterTeam/minter-go-node/core/check" + "github.com/MinterTeam/minter-go-node/core/dao" abci "github.com/tendermint/abci/types" - "minter/core/check" - "minter/core/dao" "sort" ) diff --git a/core/transaction/executor.go b/core/transaction/executor.go index bd3c38df5..7e76c3fdd 100644 --- a/core/transaction/executor.go +++ b/core/transaction/executor.go @@ -4,16 +4,16 @@ import ( "bytes" "encoding/hex" "fmt" + "github.com/MinterTeam/minter-go-node/core/check" + "github.com/MinterTeam/minter-go-node/core/code" + "github.com/MinterTeam/minter-go-node/core/state" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto" + "github.com/MinterTeam/minter-go-node/crypto/sha3" + "github.com/MinterTeam/minter-go-node/formula" + "github.com/MinterTeam/minter-go-node/rlp" "github.com/tendermint/tmlibs/common" "math/big" - "minter/core/check" - "minter/core/code" - "minter/core/state" - "minter/core/types" - "minter/crypto" - "minter/crypto/sha3" - "minter/formula" - "minter/rlp" "regexp" ) diff --git a/core/transaction/transaction.go b/core/transaction/transaction.go index 6d3db6b49..893572f3c 100644 --- a/core/transaction/transaction.go +++ b/core/transaction/transaction.go @@ -6,13 +6,13 @@ import ( "encoding/json" "errors" "fmt" + "github.com/MinterTeam/minter-go-node/core/commissions" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto" + "github.com/MinterTeam/minter-go-node/crypto/sha3" + "github.com/MinterTeam/minter-go-node/hexutil" + "github.com/MinterTeam/minter-go-node/rlp" "math/big" - "minter/core/commissions" - "minter/core/types" - "minter/crypto" - "minter/crypto/sha3" - "minter/hexutil" - "minter/rlp" ) var ( diff --git a/core/types/log.go b/core/types/log.go index 556800ef9..7c3efdd15 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -20,8 +20,8 @@ import ( "fmt" "io" - "minter/hexutil" - "minter/rlp" + "github.com/MinterTeam/minter-go-node/hexutil" + "github.com/MinterTeam/minter-go-node/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/types.go b/core/types/types.go index 4d7a94f20..bd915d692 100644 --- a/core/types/types.go +++ b/core/types/types.go @@ -24,8 +24,8 @@ import ( "reflect" "bytes" - "minter/crypto/sha3" - "minter/hexutil" + "github.com/MinterTeam/minter-go-node/crypto/sha3" + "github.com/MinterTeam/minter-go-node/hexutil" ) const ( diff --git a/crypto/crypto.go b/crypto/crypto.go index 3b530d716..6b6f69213 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,10 +28,10 @@ import ( "math/big" "os" - "minter/core/types" - "minter/crypto/sha3" - "minter/math" - "minter/rlp" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto/sha3" + "github.com/MinterTeam/minter-go-node/math" + "github.com/MinterTeam/minter-go-node/rlp" ) var ( diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 97f7314a1..542ca0db8 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - mintercrypto "minter/crypto" + mintercrypto "github.com/MinterTeam/minter-go-node/crypto" ) var ( diff --git a/formula/formula.go b/formula/formula.go index 4bc02915e..68db67f84 100644 --- a/formula/formula.go +++ b/formula/formula.go @@ -2,8 +2,8 @@ package formula import ( "github.com/ALTree/floatutils" + "github.com/MinterTeam/minter-go-node/core/types" "math/big" - "minter/core/types" "strings" ) diff --git a/genesis/genesis.go b/genesis/genesis.go index 1b7c969b0..2120a8ce3 100644 --- a/genesis/genesis.go +++ b/genesis/genesis.go @@ -1,6 +1,6 @@ package genesis -import "minter/core/types" +import "github.com/MinterTeam/minter-go-node/core/types" type AppState struct { FirstValidatorAddress types.Address `json:"first_validator_address"` diff --git a/mintdb/database.go b/mintdb/database.go index c01ffde21..d804ce817 100644 --- a/mintdb/database.go +++ b/mintdb/database.go @@ -23,12 +23,12 @@ import ( "time" // "github.com/ethereum/go-ethereum/log" + "github.com/MinterTeam/minter-go-node/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" - "minter/metrics" gometrics "github.com/rcrowley/go-metrics" ) diff --git a/mintdb/memory_database.go b/mintdb/memory_database.go index b2f44fc6b..f2e8a49e2 100644 --- a/mintdb/memory_database.go +++ b/mintdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "minter/core/types" + "github.com/MinterTeam/minter-go-node/core/types" ) /* diff --git a/trie/database.go b/trie/database.go index 0f916c5c2..f9e131d48 100644 --- a/trie/database.go +++ b/trie/database.go @@ -21,8 +21,8 @@ import ( "time" // "github.com/ethereum/go-ethereum/log" - "minter/core/types" - "minter/mintdb" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/mintdb" ) // secureKeyPrefix is the database key prefix used to store trie node preimages. diff --git a/trie/errors.go b/trie/errors.go index 21061821c..ac0086780 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "minter/core/types" + "github.com/MinterTeam/minter-go-node/core/types" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 4494229ce..7c63a04e4 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -21,9 +21,9 @@ import ( "hash" "sync" - "minter/core/types" - "minter/crypto/sha3" - "minter/rlp" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto/sha3" + "github.com/MinterTeam/minter-go-node/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 06f020fa7..a1671f838 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,7 +21,7 @@ import ( "container/heap" "errors" - "minter/core/types" + "github.com/MinterTeam/minter-go-node/core/types" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/node.go b/trie/node.go index 8d1261722..53ea8c83a 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "minter/core/types" - "minter/rlp" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/proof.go b/trie/proof.go index e7c8d14d7..e0ea5ddce 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "minter/crypto" + "github.com/MinterTeam/minter-go-node/crypto" // "github.com/ethereum/go-ethereum/log" - "minter/core/types" - "minter/mintdb" - "minter/rlp" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/mintdb" + "github.com/MinterTeam/minter-go-node/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/secure_trie.go b/trie/secure_trie.go index b988d288e..78e3fa49a 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -18,7 +18,7 @@ package trie import ( // "github.com/ethereum/go-ethereum/log" - "minter/core/types" + "github.com/MinterTeam/minter-go-node/core/types" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/sync.go b/trie/sync.go index a06131749..978d336de 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/mintdb" "gopkg.in/karalabe/cookiejar.v2/collections/prque" - "minter/core/types" - "minter/mintdb" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/trie.go b/trie/trie.go index db5e223a3..807db004b 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -22,9 +22,9 @@ import ( "fmt" // "github.com/ethereum/go-ethereum/log" + "github.com/MinterTeam/minter-go-node/core/types" + "github.com/MinterTeam/minter-go-node/crypto" "github.com/rcrowley/go-metrics" - "minter/core/types" - "minter/crypto" ) var (