Merge commit 'v0.13.5-rc1' into development

* commit 'd33fcef7e9ce91430281de15278f13b23b4f3066': (99 commits)
  Bump version to v0.13.5
  [OpenBazaar#1069] Improve edge cases and tests for POST /ob/resendordermessage
  Move Migration024 to 025 for merge from master
  Update latest fixes from multiwallet dep
  Fix imports; Add offline timeout to ORDER_PAYMENT sending
  Update multiwallet dependency
  pull in the upstream changes to vendor repos
  Update unit tests and fix nits
  Remove usage of core.Node global and fix nits
  [OpenBazaar#1069] Analyze/send ORDER messages on ORDER_PROCESSING_ERROR
  [OpenBazaar#1069] GGenerate OrderProcessingFailure message on local node
  Add error handling; Cleanup ErrEmptyPayload usage; Extra failure logging
  Update dev Docker to guarantee v1.2.0 protoc-gen-go
  remove return if extract address from pkscript fails for creation of txOut
  change the txn callback height to 0
  Fix bug initializing resyncManager
  Set resync interval to 15 minutes
  Refactor rescan manager and add migration024
  fix indentation and modify the offline scan conditional
  add txnOutputs to wallet interface txn and modify the GetTransaction function to populate the txnOutputs for use in the order payment message handler
  ...

Dockerfile

@@ -1,11 +1,27 @@
+# Build stage - Use a full build environment to create a static binary
 FROM golang:1.11
-WORKDIR /go/src/github.com/OpenBazaar/openbazaar-go
-COPY . .
-RUN go build --ldflags '-extldflags "-static"' -o /opt/openbazaard .
+COPY . /go/src/github.com/OpenBazaar/openbazaar-go
+RUN go build --ldflags '-extldflags "-static"' -o /opt/openbazaard /go/src/github.com/OpenBazaar/openbazaar-go
 
+# Final state - Create image containing nothing but the openbazaard binary and
+# some base settings
 FROM openbazaar/base:v1.0.0
+
+# Document ports in use
+#   4002 - HTTP(s) API
+#   4001 - libp2p/IPFS TCP port
+#   9005 - libp2p/IPFS websocket port
 EXPOSE 5001 5002 10005
-ENTRYPOINT ["/opt/openbazaard"]
+
+# Define a volume to perist data to. This data contains all the important
+# elements defining a peer so it must be durable as long as the identity exists
 VOLUME /var/lib/openbazaar
+
+# Tell the image what to execute by default. We start a mainnet OB server
+# that uses the defined volume for node data
+ENTRYPOINT ["/opt/openbazaard"]
 CMD ["start", "-d", "/var/lib/openbazaar"]
+
+# Copy the compiled binary into this image. It's COPY'd last since the rest of
+# this stage rarely changes while the binary changes every commit
 COPY --from=0 /opt/openbazaard /opt/openbazaard

Dockerfile.dev

@@ -31,6 +31,11 @@ RUN go get -u github.com/gogo/protobuf/proto \
               github.com/derekparker/delve/cmd/dlv \
               github.com/tools/godep
 
+RUN cd /go/src/github.com/golang/protobuf && \
+    git checkout tags/v1.2.0 -b v1.2.0 && \
+    cd protoc-gen-go && \
+    go install
+
 RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0
 
 WORKDIR /go/src/github.com/phoreproject/openbazaar-go

api/endpoints.go

@@ -113,6 +113,8 @@ func post(i *jsonAPIHandler, path string, w http.ResponseWriter, r *http.Request
 		i.POSTPost(w, r)
 	case strings.HasPrefix(path, "/ob/bulkupdatecurrency"):
 		i.POSTBulkUpdateCurrency(w, r)
+	case strings.HasPrefix(path, "/ob/resendordermessage"):
+		i.POSTResendOrderMessage(w, r)
 	case strings.HasPrefix(path, "/manage/initwallet"):
 		i.POSTInitWallet(w, r)
 	case strings.HasPrefix(path, "/manage/unlockwallet"):
@@ -201,12 +203,16 @@ func get(i *jsonAPIHandler, path string, w http.ResponseWriter, r *http.Request)
 		i.GETWalletStatus(w, r)
 	case strings.HasPrefix(path, "/ob/ipns"):
 		i.GETIPNS(w, r)
+	case strings.HasPrefix(path, "/ob/resolveipns"):
+		i.GETResolveIPNS(w, r)
 	case strings.HasPrefix(path, "/ob/peerinfo"):
 		i.GETPeerInfo(w, r)
 	case strings.HasPrefix(path, "/ob/posts"):
 		i.GETPosts(w, r)
 	case strings.HasPrefix(path, "/ob/post"):
 		i.GETPost(w, r)
+	case strings.HasPrefix(path, "/ob/scanofflinemessages"):
+		i.GETScanOfflineMessages(w, r)
 	case strings.HasPrefix(path, "/manage/iswalletlocked"):
 		i.GETIsWalletLocked(w, r)
 	default:

api/gateway.go

@@ -1,22 +1,21 @@
 package api
 
 import (
-	"net"
-	"net/http"
-
 	"github.com/ipfs/go-ipfs/core/corehttp"
 	"github.com/op/go-logging"
 	"github.com/phoreproject/openbazaar-go/core"
 	"github.com/phoreproject/openbazaar-go/schema"
+	"net"
+	"net/http"
 )
 
 var log = logging.MustGetLogger("api")
 
 // Gateway represents an HTTP API gateway
 type Gateway struct {
-	listener net.Listener
-	handler  http.Handler
-	config   schema.APIConfig
+	listener       net.Listener
+	handler        http.Handler
+	config         schema.APIConfig
 	gatewayRunning chan error
 }
 
@@ -88,4 +87,4 @@ func (g *Gateway) Serve(blocking bool) error {
 	}
 
 	return nil
-}
+}