upgrade horizonclient to patched version to fix load offers issues (c…

…loses #369) (#373)

* Revert "Upgrade horizonclient to v2 to fix horizon v1 API changes (closes #360) (#362)"

This reverts commit ba19842.

* 2 - update glide.yaml and glide.lock file to use v2.0 of stellar/go repo for the horizonclient dependency

* 3 - use forked version of stellar/go at nikhilsaraf/go branch "horizonclient-v2.0.0/1_export_offerBase"

* 4 - upgrade to second patched version of horizonclient (fee stats fix)

glide.yaml

@@ -9,7 +9,9 @@ import:
 - package: github.com/spf13/pflag
   version: v1.0.0
 - package: github.com/stellar/go
-  version: release-horizonclient-v2.1.0
+  repo: [email protected]:nikhilsaraf/go.git
+  vcs: git
+  version: horizonclient-v2.0.0/2_max_fee_stats
   subpackages:
   - build
   - clients/horizonclient

plugins/batchedExchange.go

@@ -341,15 +341,17 @@ func (b BatchedExchange) OpenOrders2Offers(orders []model.OpenOrder, baseAsset h
 			lmt = &lastModTime
 		}
 		offers = append(offers, hProtocol.Offer{
-			ID:                 ID,
-			Seller:             tradingAccount,
-			Selling:            sellingAsset,
-			Buying:             buyingAsset,
-			Amount:             amount,
-			PriceR:             price,
-			Price:              priceString,
-			LastModifiedLedger: 0, // TODO fix?
-			LastModifiedTime:   lmt,
+			ID: ID,
+			OfferBase: hProtocol.OfferBase{
+				Seller:             tradingAccount,
+				Selling:            sellingAsset,
+				Buying:             buyingAsset,
+				Amount:             amount,
+				PriceR:             price,
+				Price:              priceString,
+				LastModifiedLedger: 0, // TODO fix?
+				LastModifiedTime:   lmt,
+			},
 		})
 	}
 	return offers, nil

plugins/sdexExtensions.go

@@ -85,7 +85,7 @@ func getFeeFromStats(horizonClient horizonclient.ClientInterface, capacityTrigge
 	return maxOpFeeStroops, nil
 }
 
-func getMaxFee(fs *hProtocol.FeeStats, percentile uint8) (int64, error) {
+func getMaxFee(fs *hProtocol.FeeStats, percentile uint8) (int, error) {
 	switch percentile {
 	case 10:
 		return fs.MaxFee.P10, nil