Merge pull request #152 from MinterTeam/dev

v0.7.0

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.7.0
+*Nov 15th, 2018*
+
+BREAKING CHANGES
+
+- [api] `/api/sendTransaction` is now returns only `checkTx` result. Applications are now forced to manually check if transaction is included in blockchain.
+- [tendermint] Update to [v0.26.1](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0261) 
+- [core] Block hash is now 32 bytes length
+
+IMPROVEMENT
+
+- [core] Add `MultisendTx`
+- [core] Add special cases to Formulas #140
+- [core] Stake unbond now instant after dropping of from 1,000st place #146
+- [p2p] Default send and receive rates are now 15mB/s
+- [mempool] Set max mempool size to 10,000txs
+- [gui] Small GUI improvements
+
 ## 0.6.0
 *Oct 30th, 2018*
 

Gopkg.toml

@@ -39,15 +39,15 @@
 
 [[constraint]]
   name = "github.com/rs/cors"
-  version = "=1.4.0"
+  version = "^1.6.0"
 
 [[constraint]]
   name = "github.com/danil-lashin/iavl"
   branch = "master"
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "=v0.26.0-rc0"
+  revision = "1ce24a62828e9920efa7d7741b5f63f908c7c706"
 
 [[constraint]]
   branch = "v1"

README.md

@@ -40,8 +40,8 @@ You can get official installation instructions in our [docs](https://minter-go-n
 - [Telegram Bot Wallet](https://t.me/BipWallet_Bot)
 - [Android Wallet](https://play.google.com/store/apps/details?id=network.minter.bipwallet)
 
-
-- [Magnum Wallet (unofficial)](http://app.magnumwallet.co/?utm_source=gh&utm_medium=res&utm_campaign=mi)
+### Unofficial
+- [Magnum Wallet](http://app.magnumwallet.co/?utm_source=gh&utm_medium=res&utm_campaign=mi)
 
 ### Community
 - [Telegram Channel (English)](https://t.me/MinterTeam)

api/api.go

@@ -55,8 +55,6 @@ func RunApi(b *minter.Blockchain, tmRPC *rpc.Local) {
 	router.HandleFunc("/api/balance/{address}", wrapper(GetBalance)).Methods("GET")
 	router.HandleFunc("/api/transactionCount/{address}", wrapper(GetTransactionCount)).Methods("GET")
 	router.HandleFunc("/api/sendTransaction", wrapper(SendTransaction)).Methods("POST")
-	router.HandleFunc("/api/sendTransactionSync", wrapper(SendTransactionSync)).Methods("POST")
-	router.HandleFunc("/api/sendTransactionAsync", wrapper(SendTransactionAsync)).Methods("POST")
 	router.HandleFunc("/api/transaction/{hash}", wrapper(Transaction)).Methods("GET")
 	router.HandleFunc("/api/block/{height}", wrapper(Block)).Methods("GET")
 	router.HandleFunc("/api/transactions", wrapper(Transactions)).Methods("GET")
@@ -196,14 +194,14 @@ type Response struct {
 	Log    string      `json:"log,omitempty"`
 }
 
-func GetStateForRequest(r *http.Request) *state.StateDB {
+func GetStateForRequest(r *http.Request) (*state.StateDB, error) {
 	height, _ := strconv.Atoi(r.URL.Query().Get("height"))
 
-	cState := blockchain.CurrentState()
-
 	if height > 0 {
-		cState, _ = blockchain.GetStateForHeight(height)
+		cState, err := blockchain.GetStateForHeight(height)
+
+		return cState, err
 	}
 
-	return cState
+	return blockchain.CurrentState(), nil
 }

api/balance.go

@@ -17,7 +17,17 @@ type BalanceRequest struct {
 }
 
 func GetBalance(w http.ResponseWriter, r *http.Request) {
-	cState := GetStateForRequest(r)
+	cState, err := GetStateForRequest(r)
+
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+		w.WriteHeader(http.StatusNotFound)
+		_ = json.NewEncoder(w).Encode(Response{
+			Code: 404,
+			Log:  "State for given height not found",
+		})
+		return
+	}
 
 	vars := mux.Vars(r)
 	address := types.HexToAddress(vars["address"])

api/candidate.go

@@ -12,7 +12,17 @@ func GetCandidate(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	pubkey := types.Hex2Bytes(strings.TrimLeft(vars["pubkey"], "Mp"))
 
-	cState := GetStateForRequest(r)
+	cState, err := GetStateForRequest(r)
+
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+		w.WriteHeader(http.StatusNotFound)
+		_ = json.NewEncoder(w).Encode(Response{
+			Code: 404,
+			Log:  "State for given height not found",
+		})
+		return
+	}
 
 	candidate := cState.GetStateCandidate(pubkey)
 
@@ -34,7 +44,7 @@ func GetCandidate(w http.ResponseWriter, r *http.Request) {
 		Result: struct {
 			Candidate Candidate `json:"candidate"`
 		}{
-			Candidate: makeResponseCandidate(*candidate),
+			Candidate: makeResponseCandidate(*candidate, true),
 		},
 	})
 }

api/candidates.go

@@ -6,7 +6,17 @@ import (
 )
 
 func GetCandidates(w http.ResponseWriter, r *http.Request) {
-	cState := GetStateForRequest(r)
+	cState, err := GetStateForRequest(r)
+
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+		w.WriteHeader(http.StatusNotFound)
+		_ = json.NewEncoder(w).Encode(Response{
+			Code: 404,
+			Log:  "State for given height not found",
+		})
+		return
+	}
 
 	candidates := cState.GetStateCandidates().GetData()
 
@@ -15,7 +25,7 @@ func GetCandidates(w http.ResponseWriter, r *http.Request) {
 	var result []Candidate
 
 	for _, candidate := range candidates {
-		result = append(result, makeResponseCandidate(candidate))
+		result = append(result, makeResponseCandidate(candidate, false))
 	}
 
 	w.WriteHeader(http.StatusOK)

api/coin_info.go

@@ -16,8 +16,17 @@ type CoinInfoResponse struct {
 }
 
 func GetCoinInfo(w http.ResponseWriter, r *http.Request) {
+	cState, err := GetStateForRequest(r)
 
-	cState := GetStateForRequest(r)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+		w.WriteHeader(http.StatusNotFound)
+		_ = json.NewEncoder(w).Encode(Response{
+			Code: 404,
+			Log:  "State for given height not found",
+		})
+		return
+	}
 
 	vars := mux.Vars(r)
 	symbol := vars["symbol"]

api/estimate_coin_buy.go

@@ -18,8 +18,17 @@ type EstimateCoinBuyResponse struct {
 }
 
 func EstimateCoinBuy(w http.ResponseWriter, r *http.Request) {
+	cState, err := GetStateForRequest(r)
 
-	cState := GetStateForRequest(r)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+		w.WriteHeader(http.StatusNotFound)
+		_ = json.NewEncoder(w).Encode(Response{
+			Code: 404,
+			Log:  "State for given height not found",
+		})
+		return
+	}
 
 	query := r.URL.Query()
 	coinToSell := query.Get("coin_to_sell")

api/estimate_coin_sell.go

@@ -18,8 +18,17 @@ type EstimateCoinSellResponse struct {
 }
 
 func EstimateCoinSell(w http.ResponseWriter, r *http.Request) {
+	cState, err := GetStateForRequest(r)
 
-	cState := GetStateForRequest(r)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+		w.WriteHeader(http.StatusNotFound)
+		_ = json.NewEncoder(w).Encode(Response{
+			Code: 404,
+			Log:  "State for given height not found",
+		})
+		return
+	}
 
 	query := r.URL.Query()
 	coinToSell := query.Get("coin_to_sell")

api/estimate_tx_commission.go

@@ -11,8 +11,17 @@ import (
 )
 
 func EstimateTxCommission(w http.ResponseWriter, r *http.Request) {
+	cState, err := GetStateForRequest(r)
 
-	cState := GetStateForRequest(r)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+		w.WriteHeader(http.StatusNotFound)
+		_ = json.NewEncoder(w).Encode(Response{
+			Code: 404,
+			Log:  "State for given height not found",
+		})
+		return
+	}
 
 	query := r.URL.Query()
 	rawTx := query.Get("tx")