Merge pull request #2069 from OpenBazaar/brian.supereconomy

[NO MERGE] Add Super Economic to Server

Author: cpacia

api/jsonapi.go

@@ -3473,6 +3473,8 @@ func (i *jsonAPIHandler) GETEstimateFee(w http.ResponseWriter, r *http.Request)
 		feeLevel = wallet.NORMAL
 	case "ECONOMIC":
 		feeLevel = wallet.ECONOMIC
+	case "SUPER_ECONOMIC":
+		feeLevel = wallet.SUPER_ECONOMIC
 	default:
 		ErrorResponse(w, http.StatusBadRequest, "Unknown feeLevel")
 		return
@@ -3516,25 +3518,28 @@ func (i *jsonAPIHandler) GETEstimateFee(w http.ResponseWriter, r *http.Request)
 func (i *jsonAPIHandler) GETFees(w http.ResponseWriter, r *http.Request) {
 	_, coinType := path.Split(r.URL.Path)
 	type fees struct {
-		Priority *repo.CurrencyValue `json:"priority"`
-		Normal   *repo.CurrencyValue `json:"normal"`
-		Economic *repo.CurrencyValue `json:"economic"`
+		Priority      *repo.CurrencyValue `json:"priority"`
+		Normal        *repo.CurrencyValue `json:"normal"`
+		Economic      *repo.CurrencyValue `json:"economic"`
+		SuperEconomic *repo.CurrencyValue `json:"superEconomic"`
 	}
 	if coinType == "fees" {
 		ret := make(map[string]interface{})
 		for ct, wal := range i.node.Multiwallet {
 			priority := wal.GetFeePerByte(wallet.PRIOIRTY)
 			normal := wal.GetFeePerByte(wallet.NORMAL)
 			economic := wal.GetFeePerByte(wallet.ECONOMIC)
+			superEconomic := wal.GetFeePerByte(wallet.SUPER_ECONOMIC)
 			defn, err := i.node.LookupCurrency(wal.CurrencyCode())
 			if err != nil {
 				ErrorResponse(w, http.StatusInternalServerError, err.Error())
 				return
 			}
 			ret[ct.CurrencyCode()] = fees{
-				Priority: &repo.CurrencyValue{Currency: defn, Amount: &priority},
-				Normal:   &repo.CurrencyValue{Currency: defn, Amount: &normal},
-				Economic: &repo.CurrencyValue{Currency: defn, Amount: &economic},
+				Priority:      &repo.CurrencyValue{Currency: defn, Amount: &priority},
+				Normal:        &repo.CurrencyValue{Currency: defn, Amount: &normal},
+				Economic:      &repo.CurrencyValue{Currency: defn, Amount: &economic},
+				SuperEconomic: &repo.CurrencyValue{Currency: defn, Amount: &superEconomic},
 			}
 		}
 		out, err := json.MarshalIndent(ret, "", "    ")
@@ -3553,15 +3558,17 @@ func (i *jsonAPIHandler) GETFees(w http.ResponseWriter, r *http.Request) {
 	priority := wal.GetFeePerByte(wallet.PRIOIRTY)
 	normal := wal.GetFeePerByte(wallet.NORMAL)
 	economic := wal.GetFeePerByte(wallet.ECONOMIC)
+	superEconomic := wal.GetFeePerByte(wallet.SUPER_ECONOMIC)
 	defn, err := i.node.LookupCurrency(wal.CurrencyCode())
 	if err != nil {
 		ErrorResponse(w, http.StatusInternalServerError, err.Error())
 		return
 	}
 	f := fees{
-		Priority: &repo.CurrencyValue{Currency: defn, Amount: &priority},
-		Normal:   &repo.CurrencyValue{Currency: defn, Amount: &normal},
-		Economic: &repo.CurrencyValue{Currency: defn, Amount: &economic},
+		Priority:      &repo.CurrencyValue{Currency: defn, Amount: &priority},
+		Normal:        &repo.CurrencyValue{Currency: defn, Amount: &normal},
+		Economic:      &repo.CurrencyValue{Currency: defn, Amount: &economic},
+		SuperEconomic: &repo.CurrencyValue{Currency: defn, Amount: &superEconomic},
 	}
 	out, err := json.MarshalIndent(f, "", "    ")
 	if err != nil {

core/order.go

@@ -390,7 +390,7 @@ func processOfflineDirectOrder(n *OpenBazaarNode, wal wallet.Wallet, contract *p
 	if !ok {
 		return "", "", *big.NewInt(0), errors.New("invalid payment amount")
 	}
-	fpb := wal.GetFeePerByte(wallet.NORMAL)
+	fpb := wal.GetFeePerByte(wallet.SUPER_ECONOMIC)
 	f := new(big.Int).Mul(&fpb, big.NewInt(int64(EscrowReleaseSize)))
 	t := new(big.Int).Div(total, big.NewInt(4))
 

core/spend.go

@@ -97,6 +97,8 @@ func (n *OpenBazaarNode) Spend(args *SpendRequest) (*SpendResponse, error) {
 		feeLevel = wallet.NORMAL
 	case "ECONOMIC":
 		feeLevel = wallet.ECONOMIC
+	case "SUPER_ECONOMIC":
+		feeLevel = wallet.SUPER_ECONOMIC
 	default:
 		feeLevel = wallet.NORMAL
 	}

schema/configuration.go

@@ -39,16 +39,17 @@ type WalletsConfig struct {
 }
 
 type CoinConfig struct {
-	Type             string                 `json:"Type"`
-	APIPool          []string               `json:"API"`
-	APITestnetPool   []string               `json:"APITestnet"`
-	MaxFee           uint64                 `json:"MaxFee"`
-	FeeAPI           string                 `json:"FeeAPI"`
-	HighFeeDefault   uint64                 `json:"HighFeeDefault"`
-	MediumFeeDefault uint64                 `json:"MediumFeeDefault"`
-	LowFeeDefault    uint64                 `json:"LowFeeDefault"`
-	TrustedPeer      string                 `json:"TrustedPeer"`
-	WalletOptions    map[string]interface{} `json:"WalletOptions"`
+	Type               string                 `json:"Type"`
+	APIPool            []string               `json:"API"`
+	APITestnetPool     []string               `json:"APITestnet"`
+	MaxFee             uint64                 `json:"MaxFee"`
+	FeeAPI             string                 `json:"FeeAPI"`
+	SuperLowFeeDefault uint64                 `json:"SuperLowFeeDefault"`
+	HighFeeDefault     uint64                 `json:"HighFeeDefault"`
+	MediumFeeDefault   uint64                 `json:"MediumFeeDefault"`
+	LowFeeDefault      uint64                 `json:"LowFeeDefault"`
+	TrustedPeer        string                 `json:"TrustedPeer"`
+	WalletOptions      map[string]interface{} `json:"WalletOptions"`
 }
 
 type DataSharing struct {