Merge commit 'v0.13.8-rc1' into development

* commit '1ab22c8e2fb4e59122d38bb2d7cb0dbee890efee': (30 commits)
  Vendor latest changes for multiwallet
  Error on no inputs available
  (OpenBazaar#1919) Migrate to AddWatchedAddresses (OpenBazaar#1920)
  Do not mark wallet address as watched + fix earlier txn errors
  Update make openbazaard command to not include tag
  Point Dockfiles at public Docker Hub repo; Add make help
  Remove unused imports
  Fix linter issues
  Update transports
  Update Bitcoin Cash rates dialer
  Refactor Dockerfile.dev to derive from latest Dockerfile.qa
  Refactor Dockerfile.qa
  Add openbazaard and qa targets to Makefile; Fix docker build targets
  Add QA docker commands to Makefile
  QA dockerfile
  Add qa.sh script
  Fix transports for message retriever and images
  Fix formatted logging messages
  Add dates to timestamps for desktop server
  Add date to the timestamps in Haven logging
  ...

Author: anchaj

Dockerfile.dev

@@ -1,28 +1,4 @@
-FROM golang:1.11
-VOLUME /var/lib/openbazaar
-
-RUN wget https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz && \
-    tar xvf Python-3.6.0.tgz && \
-    cd Python-3.6.0 && \
-    ./configure --enable-optimizations && \
-    make -j8
-RUN apt-get update && apt-get install -yq zlib1g-dev libssl-dev unzip
-RUN cd Python-3.6.0 && \
-    make altinstall && \
-    ln -s /usr/local/bin/python3.6 /usr/local/bin/python3
-
-COPY ./qa/requirements.txt ./requirements.txt
-
-RUN pip3.6 install --upgrade pip && \
-    pip3.6 install -r requirements.txt && \
-    wget https://bitcoin.org/bin/bitcoin-core-0.16.3/bitcoin-0.16.3-x86_64-linux-gnu.tar.gz && \
-    tar -xvzf bitcoin-0.16.3-x86_64-linux-gnu.tar.gz -C /opt
-
-RUN wget https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.0-linux-x86_64.zip && \
-    unzip ./protoc-3.6.0-linux-x86_64.zip -x readme.txt && \
-    mv ./include/* /usr/local/include/ && \
-    mv ./bin/protoc /usr/local/bin/ && \
-    rm -rf ./include ./bin
+FROM openbazaar/server-qa:0.10
 
 WORKDIR /go/src/github.com/phoreproject/openbazaar-go
 RUN go get -u github.com/gogo/protobuf/proto \

Dockerfile.qa

@@ -0,0 +1,34 @@
+FROM golang:1.11
+
+ENV BITCOIND_VERSION=0.16.3
+ENV BITCOIND_PATH=/opt/bitcoin-${BITCOIND_VERSION}
+
+# software installs, from most stable to most volatile
+RUN apt-get update -y
+RUN apt-get install -yq software-properties-common \
+                        zlib1g-dev \
+                        libssl-dev \
+                        unzip \
+                        python3 \
+                        python3-pip
+
+RUN wget https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.0-linux-x86_64.zip && \
+    unzip ./protoc-3.6.0-linux-x86_64.zip -x readme.txt && \
+    mv ./include/* /usr/local/include/ && \
+    mv ./bin/protoc /usr/local/bin/ && \
+    rm -rf ./include ./bin
+
+COPY ./qa/requirements.txt ./requirements.txt
+
+RUN python3 -m pip install --upgrade pip && \
+    pip install -r ./requirements.txt && \
+    wget https://bitcoin.org/bin/bitcoin-core-0.16.3/bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.gz && \
+    tar -xvzf bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.gz -C /opt
+
+WORKDIR /go/src/github.com/OpenBazaar/openbazaar-go
+
+COPY ./Makefile ./Makefile
+
+VOLUME /go/src/github.com/OpenBazaar/openbazaar-go
+
+CMD make qa_test

Makefile

@@ -1,11 +1,31 @@
+.DEFAULT_GOAL := help
+
+##
+## Global ENV vars
+##
+
+GIT_SHA ?= $(shell git rev-parse --short=8 HEAD)
+GIT_TAG ?= $(shell git describe --tags --abbrev=0)
+
+##
+## Helpful Help
+##
+
+.PHONY: help
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+
 ##
 ## Building
 ##
 
-ios_framework:
+.PHONY: ios_framework
+ios_framework: ## Build iOS Framework for mobile
 	gomobile bind -target=ios github.com/phoreproject/openbazaar-go/mobile
 
-android_framework:
+.PHONY: android_framework
+android_framework: ## Build Android Framework for mobile
 	gomobile bind -target=android github.com/phoreproject/openbazaar-go/mobile
 
 ##
@@ -17,20 +37,57 @@ P_ANY = Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any
 PKGMAP = $(P_TIMESTAMP),$(P_ANY)
 
 .PHONY: protos
-protos:
+protos: ## Build go files for proto definitions
 	cd pb/protos && PATH=$(PATH):$(GOPATH)/bin protoc --go_out=$(PKGMAP):.. *.proto
 
+
+##
+## Testing
+##
+OPENBAZAARD_NAME ?= openbazaard-$(GIT_SHA)
+BITCOIND_PATH ?= .
+
+.PHONY: openbazaard
+openbazaard: ## Build daemon
+	$(info "Building openbazaar daemon...")
+	go build -o ./$(OPENBAZAARD_NAME) .
+
+.PHONY: qa_test
+qa_test: openbazaard ## Run QA test suite against current working copy
+	$(info "Running QA... (openbazaard: ../$(OPENBAZAARD_NAME) bitcoind: $(BITCOIND_PATH)/bin/bitcoind)")
+	(cd qa && ./runtests.sh ../$(OPENBAZAARD_NAME) $(BITCOIND_PATH)/bin/bitcoind)
+
 ##
 ## Docker
 ##
-DOCKER_PROFILE ?= openbazaar
-DOCKER_VERSION ?= $(shell git describe --tags --abbrev=0)
-DOCKER_IMAGE_NAME ?= $(DOCKER_PROFILE)/server:$(DOCKER_VERSION)
+PUBLIC_DOCKER_REGISTRY ?= openbazaar
+QA_DEV_TAG ?= 0.10
+
+DOCKER_SERVER_IMAGE_NAME ?= $(PUBLIC_DOCKER_REGISTRY)/server:$(GIT_TAG)
+DOCKER_QA_IMAGE_NAME ?= $(PUBLIC_DOCKER_REGISTRY)/server-qa:$(QA_DEV_TAG)
+DOCKER_DEV_IMAGE_NAME ?= $(PUBLIC_DOCKER_REGISTRY)/server-dev:$(QA_DEV_TAG)
+
+
+.PHONY: docker_build
+docker_build: ## Build container for daemon
+	docker build -t $(DOCKER_SERVER_IMAGE_NAME) .
+
+.PHONY: docker_push
+docker_push: docker ## Push container for daemon
+	docker push $(DOCKER_SERVER_IMAGE_NAME)
+
+.PHONY: qa_docker_build
+qa_docker_build: ## Build container with QA test dependencies included
+	docker build -t $(DOCKER_QA_IMAGE_NAME) -f ./Dockerfile.qa .
+
+.PHONY: qa_docker_push
+qa_docker_push: qa_docker_build ## Push container for daemon QA test environment
+	docker push $(DOCKER_QA_IMAGE_NAME)
 
-.PHONY: docker
-docker:
-	docker build -t $(DOCKER_IMAGE_NAME) .
+.PHONY: dev_docker_build
+dev_docker: ## Build container with dev dependencies included
+	docker build -t $(DOCKER_DEV_IMAGE_NAME) -f ./Dockerfile.dev .
 
-.PHONY: push_docker
-push_docker:
-	docker push $(DOCKER_IMAGE_NAME)
+.PHONY: dev_docker_push
+dev_docker_push: dev_docker_build ## Push container for daemon dev environment
+	docker push $(DOCKER_DEV_IMAGE_NAME)

api/jsonapi.go

@@ -1639,53 +1639,12 @@ func (i *jsonAPIHandler) POSTResyncBlockchain(w http.ResponseWriter, r *http.Req
 
 func (i *jsonAPIHandler) GETOrder(w http.ResponseWriter, r *http.Request) {
 	_, orderID := path.Split(r.URL.Path)
-	var (
-		err         error
-		isSale      bool
-		contract    *pb.RicardianContract
-		state       pb.OrderState
-		funded      bool
-		records     []*wallet.TransactionRecord
-		read        bool
-		paymentCoin *repo.CurrencyCode
-	)
-	contract, state, funded, records, read, paymentCoin, err = i.node.Datastore.Purchases().GetByOrderId(orderID)
-	if err != nil {
-		contract, state, funded, records, read, paymentCoin, err = i.node.Datastore.Sales().GetByOrderId(orderID)
-		if err != nil {
-			ErrorResponse(w, http.StatusNotFound, "Order not found")
-			return
-		}
-		isSale = true
-	}
-	resp := new(pb.OrderRespApi)
-	resp.Contract = contract
-	resp.Funded = funded
-	resp.Read = read
-	resp.State = state
 
-	// TODO: Remove once broken contracts are migrated
-	lookupCoin := contract.BuyerOrder.Payment.Coin
-	_, err = repo.LoadCurrencyDefinitions().Lookup(lookupCoin)
-	if err != nil {
-		log.Warningf("invalid BuyerOrder.Payment.Coin (%s) on order (%s)", lookupCoin, orderID)
-		contract.BuyerOrder.Payment.Coin = paymentCoin.String()
-	}
-
-	paymentTxs, refundTx, err := i.node.BuildTransactionRecords(contract, records, state)
+	resp, err := i.node.GetOrder(orderID)
 	if err != nil {
-		ErrorResponse(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	resp.PaymentAddressTransactions = paymentTxs
-	resp.RefundAddressTransaction = refundTx
-
-	unread, err := i.node.Datastore.Chat().GetUnreadCount(orderID)
-	if err != nil {
-		ErrorResponse(w, http.StatusInternalServerError, err.Error())
+		ErrorResponse(w, http.StatusNotFound, "Order not found")
 		return
 	}
-	resp.UnreadChatMessages = uint64(unread)
 
 	m := jsonpb.Marshaler{
 		EnumsAsInts:  false,
@@ -1698,11 +1657,7 @@ func (i *jsonAPIHandler) GETOrder(w http.ResponseWriter, r *http.Request) {
 		ErrorResponse(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	if isSale {
-		i.node.Datastore.Sales().MarkAsRead(orderID)
-	} else {
-		i.node.Datastore.Purchases().MarkAsRead(orderID)
-	}
+
 	SanitizedResponseM(w, out, new(pb.OrderRespApi))
 }
 

cmd/start.go

@@ -62,11 +62,11 @@ import (
 )
 
 var stdoutLogFormat = logging.MustStringFormatter(
-	`%{color:reset}%{color}%{time:15:04:05.000} [%{level}] [%{module}/%{shortfunc}] %{message}`,
+	`%{color:reset}%{color}%{time:2006-01-02 15:04:05.000} [%{level}] [%{module}/%{shortfunc}] %{message}`,
 )
 
 var fileLogFormat = logging.MustStringFormatter(
-	`%{time:15:04:05.000} [%{level}] [%{module}/%{shortfunc}] %{message}`,
+	`%{time:2006-01-02 15:04:05.000} [%{level}] [%{module}/%{shortfunc}] %{message}`,
 )
 
 var ErrNoGateways = errors.New("no gateway addresses configured")

core/completion.go

@@ -349,6 +349,10 @@ func (n *OpenBazaarNode) ReleaseFundsAfterTimeout(contract *pb.RicardianContract
 		}
 	}
 
+	if len(txInputs) == 0 {
+		return errors.New("there are no inputs available for this transaction")
+	}
+
 	chaincode, err := hex.DecodeString(contract.BuyerOrder.Payment.Chaincode)
 	if err != nil {
 		return err

core/images.go

@@ -9,7 +9,6 @@ import (
 	_ "image/png"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
 	netUrl "net/url"
 	"os"
@@ -164,12 +163,14 @@ func (n *OpenBazaarNode) FetchImage(peerID string, imageType string, size string
 
 // GetBase64Image - fetch the image and return it as base64 encoded string
 func (n *OpenBazaarNode) GetBase64Image(url string) (base64ImageData, filename string, err error) {
-	dial := net.Dial
+	var client *http.Client
 	if n.TorDialer != nil {
-		dial = n.TorDialer.Dial
+		tbTransport := &http.Transport{Dial: n.TorDialer.Dial}
+		client = &http.Client{Transport: tbTransport, Timeout: time.Second * 30}
+	} else {
+		client = &http.Client{Timeout: time.Second * 30}
 	}
-	tbTransport := &http.Transport{Dial: dial}
-	client := &http.Client{Transport: tbTransport, Timeout: time.Second * 30}
+
 	resp, err := client.Get(url)
 	if err != nil {
 		return "", "", err

core/order.go

@@ -78,6 +78,64 @@ const (
 	CryptocurrencyPurchasePaymentAddressMaxLength = 512
 )
 
+// GetOrder - provide API response order object by orderID
+func (n *OpenBazaarNode) GetOrder(orderID string) (*pb.OrderRespApi, error) {
+	var (
+		err         error
+		isSale      bool
+		contract    *pb.RicardianContract
+		state       pb.OrderState
+		funded      bool
+		records     []*wallet.TransactionRecord
+		read        bool
+		paymentCoin *repo.CurrencyCode
+	)
+	contract, state, funded, records, read, paymentCoin, err = n.Datastore.Purchases().GetByOrderId(orderID)
+	if err != nil {
+		contract, state, funded, records, read, paymentCoin, err = n.Datastore.Sales().GetByOrderId(orderID)
+		if err != nil {
+			return nil, errors.New("order not found")
+		}
+		isSale = true
+	}
+	resp := new(pb.OrderRespApi)
+	resp.Contract = contract
+	resp.Funded = funded
+	resp.Read = read
+	resp.State = state
+
+	// TODO: Remove once broken contracts are migrated
+	lookupCoin := contract.BuyerOrder.Payment.Coin
+	_, err = repo.LoadCurrencyDefinitions().Lookup(lookupCoin)
+	if err != nil {
+		log.Warningf("invalid BuyerOrder.Payment.Coin (%s) on order (%s)", lookupCoin, orderID)
+		contract.BuyerOrder.Payment.Coin = paymentCoin.String()
+	}
+
+	paymentTxs, refundTx, err := n.BuildTransactionRecords(contract, records, state)
+	if err != nil {
+		log.Errorf(err.Error())
+		return nil, err
+	}
+	resp.PaymentAddressTransactions = paymentTxs
+	resp.RefundAddressTransaction = refundTx
+
+	unread, err := n.Datastore.Chat().GetUnreadCount(orderID)
+	if err != nil {
+		log.Errorf(err.Error())
+		return nil, err
+	}
+	resp.UnreadChatMessages = uint64(unread)
+
+	if isSale {
+		n.Datastore.Sales().MarkAsRead(orderID)
+	} else {
+		n.Datastore.Purchases().MarkAsRead(orderID)
+	}
+
+	return resp, nil
+}
+
 // Purchase - add ricardian contract
 func (n *OpenBazaarNode) Purchase(data *PurchaseData) (orderID string, paymentAddress string, paymentAmount uint64, vendorOnline bool, err error) {
 	contract, err := n.createContractWithOrder(data)
@@ -213,7 +271,7 @@ func prepareModeratedOrderContract(data *PurchaseData, n *OpenBazaarNode, contra
 	payment.Chaincode = hex.EncodeToString(chaincode)
 	contract.BuyerOrder.RefundFee = wal.GetFeePerByte(wallet.NORMAL)
 
-	err = wal.AddWatchedAddress(addr)
+	err = wal.AddWatchedAddresses(addr)
 	if err != nil {
 		return nil, err
 	}
@@ -250,7 +308,7 @@ func processOnlineDirectOrder(resp *pb.Message, n *OpenBazaarNode, wal wallet.Wa
 	if err != nil {
 		return "", "", 0, false, err
 	}
-	err = wal.AddWatchedAddress(addr)
+	err = wal.AddWatchedAddresses(addr)
 	if err != nil {
 		return "", "", 0, false, err
 	}
@@ -298,7 +356,7 @@ func processOfflineDirectOrder(n *OpenBazaarNode, wal wallet.Wallet, contract *p
 	payment.RedeemScript = hex.EncodeToString(redeemScript)
 	payment.Chaincode = hex.EncodeToString(chaincode)
 
-	err = wal.AddWatchedAddress(addr)
+	err = wal.AddWatchedAddresses(addr)
 	if err != nil {
 		return "", "", 0, false, err
 	}