Skip to content

Commit

Permalink
Merge pull request #3315 from ethereum/release/1.2.5
Browse files Browse the repository at this point in the history
Release - 1.2.5
  • Loading branch information
nivida authored Jan 27, 2020
2 parents 0b657c2 + dc62d7e commit 4f60d97
Show file tree
Hide file tree
Showing 50 changed files with 1,414 additions and 1,555 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ Released with 1.0.0-beta.37 code base.
- fix: export bloom functions on the index.js
- Prefer receipt status to code availability on contract deployment (#3298)


## [Unreleased]

## [1.2.6]
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ npm run-script build
Then include `dist/web3.js` in your html file.
This will expose `Web3` on the window object.

Or via jsDelivr CDN

```html
<script src="https://cdn.jsdelivr.net/npm/web3@latest/dist/web3.min.js"></script>
```
UNPKG

```html
<script src="https://unpkg.com/web3@latest/dist/web3.min.js"></script>
```
## Usage

```js
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"namespace": "ethereum",
"name": "web3",
"version": "1.2.3",
"version": "1.2.5",
"description": "Ethereum JavaScript API",
"license": "LGPL-3.0",
"main": [
Expand Down
2 changes: 1 addition & 1 deletion dist/web3.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.4",
"version": "1.2.5",
"lerna": "2.0.0",
"command": {
"init": {
Expand Down
17 changes: 12 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* jshint ignore:start */
Package.describe({
name: 'ethereum:web3',
version: '1.2.3',
version: '1.2.5',
summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
git: 'https://github.com/ethereum/ethereum.js',
// By default, Meteor will default to using README.md for documentation.
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "web3",
"private": true,
"version": "1.2.4",
"version": "1.2.5",
"description": "Ethereum JavaScript API wrapper repository",
"license": "LGPL-3.0",
"engines": {
Expand Down Expand Up @@ -135,7 +135,6 @@
"mocha": "^6.2.1",
"nyc": "^14.1.1",
"puppeteer": "^1.20.0",
"regenerator-runtime": "^0.13.3",
"sandboxed-module": "^2.0.3",
"surge": "^0.21.3",
"typescript": "next",
Expand Down
Loading

0 comments on commit 4f60d97

Please sign in to comment.