Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 3.x with latest 1.x #3977

Merged
merged 10 commits into from
Mar 26, 2021
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ jobs:
]
env:
TEST: ${{ matrix.testCmd }}
INFURA_HTTP: ${{ secrets.INFURA_HTTP }}
steps:
- uses: actions/setup-node@v1
with:
Expand Down Expand Up @@ -104,6 +105,8 @@ jobs:
runs-on: windows-latest
env:
TEST: "e2e_windows"
INFURA_HTTP: ${{ secrets.INFURA_HTTP }}
INFURA_WSS: ${{ secrets.INFURA_WSS }}
steps:
- uses: actions/setup-node@v1
with:
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v14.15.1
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,18 @@ Released with 1.0.0-beta.37 code base.
### Added

- Github action for running tests for `web3-eth2-core` and `web3-eth2-beaconchain` packages (#3892)
- Added description to documentation on how to connect using a remote node provider (#3884)
- Added Security risk warning to docs for `web3.utils.soliditySha3` (#3908)
- `.nvmrc` file using Node.js version `v.14.15.1` (#3817)

### Changed

- Unified babel compiler for `web3-eth2-core` and `web3-eth2-beaconchain` (#3892)
- Renamed the `tsc` script in all packages to `compile`; updates the corresponding `lerna run` usage in the main `package.json` (#3894)
- moved deprecation warnings to postinstall scripts (#3917)
- Upgrade `@chainsafe/geth-dev-assistant` from `0.1.5` to `0.1.9` (#3950)
- Replaced hardcoded infura link with Github Secret for some tests (#3943)
- Bump `elliptic` from `6.5.3` to `6.5.4` for `web3-eth-accounts` (#3941)
- Bump `elliptic` from `6.5.3` to `6.5.4` for `web3-bzz` (#3940)
- Bump `elliptic` from `6.5.3` to `6.5.4` for `web3-core-requestmanager` (#3945)
- Rewrite `web3-eth-iban` in ES6 (#3955)
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,7 @@ This project adheres to the [Release Guidelines](./REVIEW.md).
[netlify-url]: https://app.netlify.com/sites/web3-staging/deploys
[stackexchange-image]: https://img.shields.io/badge/web3js-stackexchange-brightgreen
[stackexchange-url]: https://ethereum.stackexchange.com/questions/tagged/web3js

## Semantic versioning

This project follows [semver](https://semver.org/) as closely as possible **from version 1.3.0 onwards**. Earlier minor version bumps [might](https://github.com/ethereum/web3.js/issues/3758) have included breaking behavior changes.
12 changes: 11 additions & 1 deletion docs/include_package-core.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Returns
``Boolean``

-------
Example
Example: Local Geth Node
-------

.. code-block:: javascript
Expand All @@ -52,6 +52,16 @@ Example
// on windows the path is: "\\\\.\\pipe\\geth.ipc"
// on linux the path is: "/users/myuser/.ethereum/geth.ipc"

-------
Example: Remote Node Provider
-------

.. code-block:: javascript

// Using a remote node provider, like Alchemy (https://www.alchemyapi.io/supernode), is simple.
var Web3 = require('web3');
var web3 = new Web3("https://eth-mainnet.alchemyapi.io/v2/your-api-key");


------------------------------------------------------------------------------

Expand Down
74,023 changes: 51,139 additions & 22,884 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"scripts": {
"version": "npm run build",
"postinstall": "npm run bootstrap",
"build": "npm run bootstrap && lerna run tsc && webpack && cp -r ./dist ./packages/web3",
"build": "npm run bootstrap && lerna run compile && webpack && cp -r ./dist ./packages/web3",
"publish": "lerna publish",
"bootstrap": "lerna bootstrap --hoist",
"lint": "jshint *.js packages",
Expand Down Expand Up @@ -95,7 +95,7 @@
"@babel/preset-env": "^7.12.1",
"@babel/preset-typescript": "^7.12.1",
"@babel/runtime": "^7.12.1",
"@chainsafe/geth-dev-assistant": "^0.1.5",
"@chainsafe/geth-dev-assistant": "^0.1.9",
"@ensdomains/ens": "^0.4.5",
"@ensdomains/resolver": "^0.2.4",
"@types/bignumber.js": "^4.0.2",
Expand Down Expand Up @@ -136,6 +136,5 @@
"wait-port": "^0.2.9",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12"
},
"dependencies": {}
}
}
Loading