Merge pull request #15 from Benzbeeb/patch-band-oracle-to-poa

Patch band oracle to use data from band-laozi-poa

Author: wlsaud619

config.toml

@@ -26,10 +26,11 @@ password = ""
 #        imf = "https://www.imf.org/external/np/fin/data/rms_five.aspx?tsvflag=Y"
 
         [APIs.band]
-        active = false
-        band = "https://terra-lcd.bandchain.org"
+        active = true
+        band = "https://terra-lcd-poa.bandchain.org"
 
 [Options]
         [Options.Interval]
         luna = 5
         stables = 200
+

price/band_fx.go

@@ -1,7 +1,6 @@
 package price
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -17,8 +16,7 @@ import (
 )
 
 type FxResponse struct {
-	Height string   `json:"height"`
-	Result []Result `json:"result"`
+	Result []Result `json:"price_results"`
 }
 
 type Result struct {
@@ -46,9 +44,9 @@ func (ps *PriceService) fxsToUsd(logger log.Logger) {
 			}()
 
 			req, err := http.NewRequest(
-				"POST",
-				cfg.Config.APIs.Band.Band+"/oracle/request_prices",
-				bytes.NewBuffer([]byte(`{"symbols":["LUNA", "XDR", "MNT", "EUR", "CNY", "JPY", "GBP", "INR", "CAD", "CHF", "HKD", "SGD", "AUD"],"min_count":10,"ask_count":16}`)),
+				"GET",
+				cfg.Config.APIs.Band.Band+"/oracle/v1/request_prices?symbols=LUNA&symbols=XDR&symbols=MNT&symbols=EUR&symbols=CNY&symbols=JPY&symbols=GBP&symbols=INR&symbols=CAD&symbols=CHF&symbols=HKD&symbols=SGD&symbols=AUD&min_count=3&ask_count=4",
+				nil,
 			)
 			req.Header.Set("Content-Type", "application/json")
 

price/band_luna.go

@@ -16,8 +16,7 @@ import (
 )
 
 type BandResponse struct {
-	Height int64      `json:"height,string"`
-	Result BandResult `json:"result"`
+	Request BandResult `json:"request"`
 }
 
 type RawRequests struct {
@@ -26,28 +25,11 @@ type RawRequests struct {
 	Calldata     []byte `json:"calldata,string"`
 }
 
-type Request struct {
-	OracleScriptID      uint64        `json:"oracle_script_id,string"`
-	Calldata            []byte        `json:"calldata,string"`
-	RequestedValidators []string      `json:"requested_validators"`
-	MinCount            uint64        `json:"min_count,string"`
-	RequestHeight       uint64        `json:"request_height,string"`
-	RequestTime         time.Time     `json:"request_time"`
-	ClientID            string        `json:"client_id"`
-	RawRequests         []RawRequests `json:"raw_requests"`
-}
-
 type RawReports struct {
 	ExternalID uint64 `json:"external_id,string"`
 	Data       string `json:"data"`
 }
 
-type Reports struct {
-	Validator       string       `json:"validator"`
-	InBeforeResolve bool         `json:"in_before_resolve"`
-	RawReports      []RawReports `json:"raw_reports"`
-}
-
 type RequestPacketData struct {
 	ClientID       string `json:"client_id"`
 	OracleScriptID uint64 `json:"oracle_script_id,string"`
@@ -66,15 +48,22 @@ type ResponsePacketData struct {
 	Result        []byte `json:"result,string"`
 }
 
-type Packet struct {
-	RequestPacketData  RequestPacketData  `json:"request_packet_data"`
-	ResponsePacketData ResponsePacketData `json:"response_packet_data"`
+type PacketResult struct {
+	ClientID       string `json:"client_id"`
+	OracleScriptID int64  `json:"oracle_script_id,string"`
+	Calldata       []byte `json:"calldata"`
+	AskCount       uint64 `json:"ask_count,string"`
+	MinCount       uint64 `json:"min_count,string"`
+	RequestID      int64  `json:"request_id,string"`
+	AnsCount       uint64 `json:"ans_count,string"`
+	RequestTime    int64  `json:"request_time,string"`
+	ResolveTime    int64  `json:"resolve_time,string"`
+	ResolveStatus  string `json:"resolve_status"`
+	Result         []byte `json:"result,string"`
 }
 
 type BandResult struct {
-	Request Request   `json:"request"`
-	Reports []Reports `json:"reports"`
-	Result  Packet    `json:"result"`
+	Result PacketResult `json:"result"`
 }
 
 type LunaPriceCallData struct {
@@ -102,7 +91,7 @@ func (lpcd *LunaPriceCallData) toBytes() []byte {
 var (
 	MULTIPLIER           = uint64(1000000000)
 	LUNA_PRICE_CALLDATA  = LunaPriceCallData{Multiplier: MULTIPLIER}
-	LUNA_PRICE_END_POINT = fmt.Sprintf("/oracle/request_search?oid=13&calldata=%x&min_count=10&ask_count=16", LUNA_PRICE_CALLDATA.toBytes())
+	LUNA_PRICE_END_POINT = fmt.Sprintf("/oracle/v1/request_search?oid=13&calldata=%x&min_count=3&ask_count=4", LUNA_PRICE_CALLDATA.toBytes())
 )
 
 func (ps *PriceService) bandLunaToKrw(logger log.Logger) {
@@ -142,8 +131,7 @@ func (ps *PriceService) bandLunaToKrw(logger log.Logger) {
 			}
 
 			var lp LunaPrice
-			Decode(br.Result.Result.ResponsePacketData.Result, &lp)
-
+			Decode(br.Request.Result.Result, &lp)
 			// Find median
 			prices := []float64{}
 			for _, order := range lp.OrderBooks[:4] {
@@ -159,7 +147,7 @@ func (ps *PriceService) bandLunaToKrw(logger log.Logger) {
 			}
 
 			price := sdk.NewDecCoinFromDec("krw", decAmount)
-			timestamp := int64(br.Result.Result.ResponsePacketData.ResolveTime)
+			timestamp := int64(br.Request.Result.ResolveTime)
 
 			logger.Info(fmt.Sprintf("Recent luna/krw: %s, timestamp: %d", price, timestamp))