Merge pull request #51 from MinterTeam/dev

v0.0.5

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.0.5
+*Jule 4rd, 2018*
+
+BREAKING CHANGES
+
+- [core] Remove Reserve Coin from coin object. All coins should be reserved with base coin
+- [core] Limit tx payload and service data to 128 bytes
+- [core] Fix critical issue with instant convert of 2 custom coins 
+- [testnet] New testnet chain id (minter-test-network-8)
+- [tendermint] Switched to v0.22.0
+
+IMPROVEMENT
+
+- [api] Fix issue with not found coins
+
+BUG FIXES
+
+- [api] Fix transaction endpoint
+
 ## 0.0.4
 
 *June 24th, 2018*

Gopkg.toml

@@ -59,7 +59,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "0.21.0"
+  version = "0.22.0"
 
 [[constraint]]
   branch = "v2"

README.md

@@ -45,7 +45,7 @@ $ docker-compose up
 You'll need **go** [installed](https://golang.org/doc/install) and the required
 [environment variables set](https://github.com/tendermint/tendermint/wiki/Setting-GOPATH)
 
-1. Install [Tendermint 0.21.0](https://github.com/tendermint/tendermint/blob/master/docs/install.rst)
+1. Install [Tendermint 0.22.0](https://github.com/tendermint/tendermint/blob/master/docs/install.rst)
 
 2. Clone Minter to your machine
 ```bash

api/block.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/MinterTeam/minter-go-node/core/transaction"
 	"github.com/gorilla/mux"
+	"github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tmlibs/common"
 	"math/big"
 	"net/http"
 	"strconv"

api/coin_info.go

@@ -12,7 +12,6 @@ type CoinInfoResponse struct {
 	Symbol         types.CoinSymbol `json:"symbol"`
 	Volume         string           `json:"volume"`
 	Crr            uint             `json:"crr"`
-	ReserveCoin    types.CoinSymbol `json:"reserve_coin"`
 	ReserveBalance string           `json:"reserve_balance"`
 	Creator        types.Address    `json:"creator"`
 }
@@ -28,21 +27,31 @@ func GetCoinInfo(w http.ResponseWriter, r *http.Request) {
 
 	copy(coinSymbol[:], []byte(symbol))
 
-	coin := cState.GetStateCoin(coinSymbol).Data()
+	coin := cState.GetStateCoin(coinSymbol)
 
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+
+	if coin == nil {
+		w.WriteHeader(http.StatusNotFound)
+		json.NewEncoder(w).Encode(Response{
+			Code:   404,
+			Result: nil,
+			Log:    "Coin not found",
+		})
+		return
+	}
+
 	w.WriteHeader(http.StatusOK)
 
 	json.NewEncoder(w).Encode(Response{
 		Code: 0,
 		Result: CoinInfoResponse{
-			Name:           coin.Name,
-			Symbol:         coin.Symbol,
-			Volume:         coin.Volume.String(),
-			Crr:            coin.Crr,
-			ReserveCoin:    coin.ReserveCoin,
-			ReserveBalance: coin.ReserveBalance.String(),
-			Creator:        coin.Creator,
+			Name:           coin.Data().Name,
+			Symbol:         coin.Data().Symbol,
+			Volume:         coin.Data().Volume.String(),
+			Crr:            coin.Data().Crr,
+			ReserveBalance: coin.Data().ReserveBalance.String(),
+			Creator:        coin.Data().Creator,
 		},
 	})
 }

api/estimate_coin_exchange_return.go

@@ -26,17 +26,55 @@ func EstimateCoinExchangeReturn(w http.ResponseWriter, r *http.Request) {
 	var result *big.Int
 
 	if fromCoinSymbol == blockchain.BaseCoin {
-		coin := cState.GetStateCoin(toCoinSymbol).Data()
-		result = formula.CalculatePurchaseReturn(coin.Volume, coin.ReserveBalance, coin.Crr, value)
+		coin := cState.GetStateCoin(toCoinSymbol)
+		if coin == nil {
+			w.WriteHeader(http.StatusNotFound)
+			json.NewEncoder(w).Encode(Response{
+				Code:   404,
+				Result: nil,
+				Log:    "Coin not found",
+			})
+			return
+		}
+		result = formula.CalculatePurchaseReturn(coin.Data().Volume, coin.Data().ReserveBalance, coin.Data().Crr, value)
 	} else if toCoinSymbol == blockchain.BaseCoin {
-		coin := cState.GetStateCoin(fromCoinSymbol).Data()
-		result = formula.CalculateSaleReturn(coin.Volume, coin.ReserveBalance, coin.Crr, value)
+		coin := cState.GetStateCoin(fromCoinSymbol)
+		if coin == nil {
+			w.WriteHeader(http.StatusNotFound)
+			json.NewEncoder(w).Encode(Response{
+				Code:   404,
+				Result: nil,
+				Log:    "Coin not found",
+			})
+			return
+		}
+		result = formula.CalculateSaleReturn(coin.Data().Volume, coin.Data().ReserveBalance, coin.Data().Crr, value)
 	} else {
-		coinFrom := cState.GetStateCoin(fromCoinSymbol).Data()
-		coinTo := cState.GetStateCoin(toCoinSymbol).Data()
+		coinFrom := cState.GetStateCoin(fromCoinSymbol)
+		coinTo := cState.GetStateCoin(toCoinSymbol)
 
-		val := formula.CalculateSaleReturn(coinFrom.Volume, coinFrom.ReserveBalance, coinFrom.Crr, value)
-		result = formula.CalculatePurchaseReturn(coinTo.Volume, coinTo.ReserveBalance, coinTo.Crr, val)
+		if coinFrom == nil {
+			w.WriteHeader(http.StatusNotFound)
+			json.NewEncoder(w).Encode(Response{
+				Code:   404,
+				Result: nil,
+				Log:    "Coin not found",
+			})
+			return
+		}
+
+		if coinTo == nil {
+			w.WriteHeader(http.StatusNotFound)
+			json.NewEncoder(w).Encode(Response{
+				Code:   404,
+				Result: nil,
+				Log:    "Coin not found",
+			})
+			return
+		}
+
+		val := formula.CalculateSaleReturn(coinFrom.Data().Volume, coinFrom.Data().ReserveBalance, coinFrom.Data().Crr, value)
+		result = formula.CalculatePurchaseReturn(coinTo.Data().Volume, coinTo.Data().ReserveBalance, coinTo.Data().Crr, val)
 	}
 
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")

api/status.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"encoding/json"
+	"github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tmlibs/common"
 	"net/http"
 	"time"
 )

api/transaction.go

@@ -12,7 +12,7 @@ import (
 func Transaction(w http.ResponseWriter, r *http.Request) {
 
 	vars := mux.Vars(r)
-	hash := strings.TrimRight(vars["hash"], "Mt")
+	hash := strings.TrimLeft(vars["hash"], "Mt")
 	decoded, err := hex.DecodeString(hash)
 
 	result := new(types.TxResult)

api/transactions.go

@@ -3,8 +3,8 @@ package api
 import (
 	"encoding/json"
 	"github.com/MinterTeam/minter-go-node/core/transaction"
+	"github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tmlibs/common"
 	"math/big"
 	"net/http"
 )