Pre release

.gitignore

@@ -1,6 +1,7 @@
 # Test artifacts
 
 repo/testdata/
+./config*
 
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
@@ -35,12 +36,11 @@ dist
 
 # Development environment files
 .ackrc
+.vscode
 .tags*
 *.sw?
-debug
-.vscode
-config*
-openbazaar-go*
+marketplace-go*
+config_*
 
 # macOS
 .DS_Store

.golangci.yml

@@ -48,8 +48,8 @@ linters:
     - goconst
     - govet
     - megacheck
+    - errcheck
   disable:
     - goimports
-    - errcheck
     - golint
     - prealloc

.travis.yml

@@ -8,11 +8,11 @@ env:
   - "PATH=/home/travis/gopath/bin:$PATH"
 before_install:
   - go get -u github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/tcnksm/ghr
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.23.3
 install:
   - echo "No external dependencies required. Skipping travis default library dependency setup to use vendors..."
 script:
-  - $GOPATH/bin/golangci-lint run --deadline 10m
+  - $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=
   - cd $TRAVIS_BUILD_DIR && go test -i && ./test_compile.sh
   - goveralls -coverprofile=coverage.out -service travis-ci
 after_success:

CONTRIBUTING.md

@@ -11,10 +11,10 @@ You must run `gofmt` before each commit. Travis will fail if you do not run it.
 
 All commits are checked with [golangci-lint](https://github.com/golangci/golangci-lint) using the [.golangci.yml](.golangci.yml) config in the repo.
 
-Additionally, we like to keep the [Go Report Card](https://goreportcard.com/report/github.com/phoreproject/openbazaar-go) score at A or better. So keep those other tests in mind when you commit.
+Additionally, we like to keep the [Go Report Card](https://goreportcard.com/report/github.com/phoreproject/pm-go) score at A or better. So keep those other tests in mind when you commit.
 
 ## Tests
-If you add new code, please submit a unit test with it. We might not accept the PR without it. Additionally, you are expected to make the appropriate changes to existing tests if they are affected by your commits. This also includes the integration tests in the [qa package](https://github.com/phoreproject/openbazaar-go/tree/master/qa).
+If you add new code, please submit a unit test with it. We might not accept the PR without it. Additionally, you are expected to make the appropriate changes to existing tests if they are affected by your commits. This also includes the integration tests in the [qa package](https://github.com/phoreproject/pm-go/tree/master/qa).
 
 ## Pull Requests
 If your PR isn't ready to merge make sure you specify this somehow. For example by placing [WIP] in the PR title. Ideally you should include a `task list` in the PR message to track the progress of the PR.

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/phoreproject/pm-go
+RUN go build --ldflags '-extldflags "-static"' -o /opt/marketplaced /go/src/github.com/phoreproject/pm-go
 
-FROM openbazaar/base:v1.0.0
+# Final state - Create image containing nothing but the marketplaced binary and
+# some base settings
+FROM PhoreMarketplace/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"]
-VOLUME /var/lib/openbazaar
-CMD ["start", "-d", "/var/lib/openbazaar"]
-COPY --from=0 /opt/openbazaard /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/marketplace
+
+# Tell the image what to execute by default. We start a mainnet OB server
+# that uses the defined volume for node data
+ENTRYPOINT ["/opt/marketplaced"]
+CMD ["start", "-d", "/var/lib/marketplace"]
+
+# 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/marketplaced /opt/marketplaced

Dockerfile.dev

@@ -1,39 +1,20 @@
-FROM golang:1.11
-VOLUME /var/lib/openbazaar
+FROM phoremarketplace/server-qa:0.10
 
-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
-
-WORKDIR /go/src/github.com/phoreproject/openbazaar-go
+WORKDIR /go/src/github.com/phoreproject/pm-go
 RUN go get -u github.com/gogo/protobuf/proto \
               github.com/golang/protobuf/protoc-gen-go \
               github.com/icrowley/fake \
               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
+WORKDIR /go/src/github.com/phoreproject/pm-go
 
 COPY . .
 

Dockerfile.dummy

@@ -1,11 +1,11 @@
 # Build stage
 FROM golang:1.8.1
-WORKDIR /go/src/github.com/phoreproject/openbazaar-go
+WORKDIR /go/src/github.com/phoreproject/pm-go
 COPY . .
 RUN go build -o /opt/dummy ./dummy
 
 # Run stage
-FROM openbazaar/server
+FROM phoremarketplace/server
 COPY ./run.sh /opt/run.sh
 COPY --from=0 /opt/dummy /opt/dummy
 ENTRYPOINT ["/bin/sh"]

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/phoreproject/pm-go
+
+COPY ./Makefile ./Makefile
+
+VOLUME /go/src/github.com/phoreproject/pm-go
+
+CMD make qa_test