Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #661 from 0xProject/release/8.1.2
Browse files Browse the repository at this point in the history
Release version 8.1.2
  • Loading branch information
jalextowle authored Jan 22, 2020
2 parents 529af7c + 4557b9a commit 7854825
Show file tree
Hide file tree
Showing 25 changed files with 830 additions and 781 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ jobs:
BASH_ENV: ~/.nvm/nvm.sh
docker:
- image: circleci/golang:1.12.13-browsers
- image: 0xorg/ganache-cli:latest
- image: 0xorg/ganache-cli:istanbul
environment:
VERSION: 5.0.0
VERSION: 5.1.0
SNAPSHOT_NAME: 0x_ganache_snapshot
resource_class: large
steps:
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

This changelog is a work in progress and may contain notes for versions which have not actually been released. Check the [Releases](https://github.com/0xProject/0x-mesh/releases) page to see full release notes and more information about the latest released versions.

## v8.1.2

### Bug fixes 🐞

- Update DevUtils contract to version that removed maker transfer simulation. ([#662](https://github.com/0xProject/0x-mesh/pull/662)).
- Fix faulty Go to Javascript conversion logic. ([#659](https://github.com/0xProject/0x-mesh/pull/659)).
- Updated dockerfiles to work with Go modules. ([#646](https://github.com/0xProject/0x-mesh/pull/646)).
- Update DevUtils mainnet contract address to version that fixes MAP order validation issue ([#644](https://github.com/0xProject/0x-mesh/pull/644)).


## v8.1.1

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Version](https://img.shields.io/badge/version-8.1.1-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
[![Version](https://img.shields.io/badge/version-8.1.2-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
[![Docs](https://img.shields.io/badge/docs-website-yellow.svg)](https://0x-org.gitbook.io/mesh)
[![Chat with us on Discord](https://img.shields.io/badge/chat-Discord-blueViolet.svg)](https://discord.gg/HF7fHwk)
[![Circle CI](https://img.shields.io/circleci/project/0xProject/0x-mesh/master.svg)](https://circleci.com/gh/0xProject/0x-mesh/tree/master)
Expand Down
2 changes: 1 addition & 1 deletion browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0x/mesh-browser",
"version": "8.1.1",
"version": "8.1.2",
"description": "TypeScript and JavaScript bindings for running Mesh directly in the browser.",
"main": "./lib/index.js",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion core/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const (
estimatedNonPollingEthereumRPCRequestsPer24Hrs = 50000
// logStatsInterval is how often to log stats for this node.
logStatsInterval = 5 * time.Minute
version = "8.1.1"
version = "8.1.2"
)

// Note(albrow): The Config type is currently copied to browser/ts/index.ts. We
Expand Down
6 changes: 2 additions & 4 deletions dockerfiles/mesh-bootstrap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ FROM golang:1.12.13-alpine3.9 as mesh-builder

RUN apk update && apk add ca-certificates nodejs-current npm make git dep gcc build-base musl linux-headers

WORKDIR /go/src/github.com/0xProject/0x-mesh
WORKDIR /0x-mesh

ADD . ./

RUN make deps-go-no-lockfile

RUN go build ./cmd/mesh-bootstrap

# Final Image
Expand All @@ -24,7 +22,7 @@ RUN apk update && apk add ca-certificates --no-cache

WORKDIR /usr/mesh

COPY --from=mesh-builder /go/src/github.com/0xProject/0x-mesh/mesh-bootstrap /usr/mesh/mesh-bootstrap
COPY --from=mesh-builder /0x-mesh/mesh-bootstrap /usr/mesh/mesh-bootstrap

# Default port for TCP multiaddr
EXPOSE 60558
Expand Down
6 changes: 2 additions & 4 deletions dockerfiles/mesh/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ FROM golang:1.12.13-alpine3.9 as mesh-builder

RUN apk update && apk add ca-certificates nodejs-current npm make git dep gcc build-base musl linux-headers

WORKDIR /go/src/github.com/0xProject/0x-mesh
WORKDIR /0x-mesh

ADD . ./

RUN make deps-go-no-lockfile

RUN go build ./cmd/mesh

# Final Image
Expand All @@ -24,7 +22,7 @@ RUN apk update && apk add ca-certificates --no-cache

WORKDIR /usr/mesh

COPY --from=mesh-builder /go/src/github.com/0xProject/0x-mesh/mesh /usr/mesh/mesh
COPY --from=mesh-builder /0x-mesh/mesh /usr/mesh/mesh

ENV RPC_ADDR=localhost:60557
EXPOSE 60557
Expand Down
2 changes: 2 additions & 0 deletions docs/browser/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @0x/mesh-browser

## @0x/mesh-browser

TypeScript and JavaScript bindings for running Mesh directly in the browser.

## Installation
Expand Down
Loading

0 comments on commit 7854825

Please sign in to comment.