Merge WITH CONFLICTS tag 'horizon-v0.15.3' into update-to-0.15.3

- this commit included all files that have status "both modified" with conflicts
- in addition, i removed all files that had status "removed by them"
  since we didn't have any conflicts in these

* tag 'horizon-v0.15.3': (322 commits)
  Horizon 0.15.3
  Validate UTF-8 strings in params (stellar#800)
  Fix horizon reap. (stellar#782)
  Fix query checking (stellar#792)
  Fix run_tests (stellar#793)
  Update protocols/horizon README
  Horizon Documentation (stellar#763)
  Horizon 0.15.2
  Rebuild test scenarios and fix travis builds (stellar#787)
  Fix slow trades page query (stellar#785)
  Update docs with information about successful transactions
  Fix init-asset-stats command (stellar#775)
  Change `glide` to `dep` in Horizon README (stellar#784)
  Update asset.md (stellar#766)
  update path-finding docs (stellar#776)
  Update responses.md (stellar#765)
  Add "Postgres configuration" section in Horizon Admin Guide (stellar#773)
  Init asset stats command (stellar#764)
  Go 1.11 builds (stellar#762)
  Horizon 0.15.1
  ...

.gitignore

@@ -4,3 +4,5 @@
 /local-archive
 /.vscode/*.sql
 .idea
+debug
+.bundle

.travis.yml

@@ -1,22 +1,23 @@
+dist: xenial
 language: go
 services:
 - mysql
 - postgres
 - redis-server
 addons:
   postgresql: '9.4'
+  ssh_known_hosts:
+  - bitbucket.org
 go:
-- '1.7'
-- '1.8'
 - '1.9'
+- '1.10'
+- '1.11'
 - tip
 go_import_path: github.com/stellar/go
 install:
-- wget https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-linux-amd64.tar.gz
-- tar -xzvf glide-v0.12.3-linux-amd64.tar.gz
-- cp linux-amd64/glide $GOPATH/bin
+- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 script:
-- glide install
+- dep ensure -v
 - ./support/scripts/run_tests
 
 before_deploy:
@@ -45,7 +46,7 @@ deploy:
     name: Snapshots $(date --utc +'%F-%T')
     on:
       branch: master
-      go: '1.9'
+      go: '1.11'
   #tagged releases
   - provider: releases
     skip_cleanup: true
@@ -57,4 +58,5 @@ deploy:
     on:
       repo: stellar/go
       tags: true
-      go: '1.9'
+      condition: $TRAVIS_TAG != snapshots
+      go: '1.11'

CHANGELOG.md

@@ -15,10 +15,15 @@ NOTE:  this changelog represents the changes that are associated with the librar
 - xdr: added support for new signer types
 - build: `Signer` learned support for new signer types
 - strkey: added support for new signer types
-- network:  Added the `HashTransaction` helper func to get the hash of a transaction targetted to a specific stellar network.
+- network:  Added the `HashTransaction` helper func to get the hash of a transaction targeted to a specific stellar network.
+- trades: Added Server-Sent Events endpoint to support streaming of trades
+- trades: add `base_offer_id` and `counter_offer_id` to trade resources.
+- trade aggregation: Added an optional `offset` parameter that lets you offset the bucket timestamps in hour-long increments. Can only be used if the `resolution` parameter is greater than 1 hour. `offset` must also be in whole-hours and less than 24 hours.
+
 
 ### Changed:
 
 - build: _BREAKING CHANGE_:  A transaction built and signed using the `build` package no longer default to the test network.
+- trades for offer endpoint will query for trades that match the given offer on either side of trades, rather than just the "sell" offer.
 
 [Unreleased]: https://github.com/stellar/go/commits/master

Dockerfile

@@ -1,11 +1,8 @@
-FROM golang:1.9
-RUN bash -c "curl https://glide.sh/get | sh"
+FROM golang:1.10.3
+RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 WORKDIR /go/src/github.com/stellar/go
 
-COPY glide.lock /go/src/github.com/stellar/go
-COPY glide.yaml /go/src/github.com/stellar/go
-RUN glide install
-
 COPY . .
+RUN dep ensure -v
 RUN go install github.com/stellar/go/tools/...
-RUN go install github.com/stellar/go/services/...
+RUN go install github.com/stellar/go/services/...

Gemfile.lock

@@ -1,22 +1,24 @@
 GIT
   remote: https://github.com/stellar/stellar_core_commander.git
-  revision: 2a6d83e147069188afba52f751edaca45985d07a
+  revision: 154c81daae1ae9acd41e81e1740e8e961124d8bd
   branch: master
   specs:
-    stellar_core_commander (0.0.12)
-      activesupport (>= 4.0.0)
-      contracts (~> 0.9)
+    stellar_core_commander (0.0.13)
+      activesupport (>= 5.2.0)
+      contracts (~> 0.16)
       faraday (~> 0.9.1)
       faraday_middleware (~> 0.9.1)
       pg (~> 0.18.1)
+      pry (~> 0.11.3)
       sequel (~> 5.5.0)
       slop (~> 3.6.0)
-      stellar-base (>= 0.12.0)
+      stellar-base (>= 0.17.0)
+      stellar-sdk (>= 0.5.0)
       typhoeus (~> 0.8.0)
 
 GIT
   remote: https://github.com/stellar/xdrgen.git
-  revision: e29a93e248f2ae97ec783949676b4293a67b768e
+  revision: c56e3ff84b325e2c28b3668a8c98be89886adf2a
   branch: master
   specs:
     xdrgen (0.0.1)
@@ -28,43 +30,58 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activesupport (5.1.4)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     base32 (0.3.2)
+    citrus (3.0.2)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     contracts (0.16.0)
     digest-crc (0.4.1)
     ethon (0.11.0)
       ffi (>= 1.3.0)
+    excon (0.62.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    faraday-digestauth (0.3.0)
+      faraday (~> 0.7)
+      net-http-digest_auth (~> 1.4)
+    faraday_hal_middleware (0.1.0)
+      faraday_middleware (~> 0.9)
     faraday_middleware (0.9.2)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.21)
-    i18n (0.9.3)
+    ffi (1.9.25)
+    hyperclient (0.9.0)
+      faraday (>= 0.9.0)
+      faraday-digestauth
+      faraday_hal_middleware
+      faraday_middleware
+      net-http-digest_auth
+      uri_template
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     memoist (0.11.0)
     method_source (0.9.0)
     minitest (5.11.3)
     multipart-post (2.0.0)
+    net-http-digest_auth (1.4.1)
     netrc (0.11.0)
-    octokit (4.8.0)
+    octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pg (0.18.4)
     polyglot (0.3.5)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.1)
-    rake (12.3.0)
+    public_suffix (3.0.3)
+    rake (12.3.1)
     rbnacl (5.0.0)
       ffi
     rbnacl-libsodium (1.0.16)
@@ -74,23 +91,33 @@ GEM
       faraday (~> 0.8, < 1.0)
     sequel (5.5.0)
     slop (3.6.0)
-    stellar-base (0.12.0)
-      activesupport (>= 4.2.7)
+    stellar-base (0.17.0)
+      activesupport (>= 5.2.0)
       base32
       digest-crc
       rbnacl
-      rbnacl-libsodium (~> 1.0.3)
-      xdr (~> 2.0.0)
+      rbnacl-libsodium (~> 1.0.16)
+      xdr (~> 3.0.0)
+    stellar-sdk (0.5.0)
+      activesupport (>= 5.2.0)
+      contracts (~> 0.16)
+      excon (~> 0.44, >= 0.44.4)
+      hyperclient (~> 0.7)
+      stellar-base (>= 0.16.0)
+      toml-rb (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
+    toml-rb (1.1.2)
+      citrus (~> 3.0, > 3.0)
     treetop (1.5.3)
       polyglot (~> 0.3)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xdr (2.0.0)
-      activemodel (>= 4.2.7)
-      activesupport (>= 4.2.7)
+    uri_template (0.7.0)
+    xdr (3.0.0)
+      activemodel (>= 5.2.0)
+      activesupport (>= 5.2.0)
 
 PLATFORMS
   ruby
@@ -104,4 +131,4 @@ DEPENDENCIES
   xdrgen!
 
 BUNDLED WITH
-   1.16.1
+   1.16.5