Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit 648bce2

Browse files
Merge pull request #1 from ethereum/1.0
get fork in sync with local fork
2 parents 2cfa2ea + 6961fa2 commit 648bce2

File tree

796 files changed

+37945
-73551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

796 files changed

+37945
-73551
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ jest.config.js
99
jest.preprocessor.js
1010
W3cWebsocket.js
1111
packages/**/rollup.config.js
12+
packages/**/node_modules
13+
angular-patch.js

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ node_modules
1515
coverage/
1616
lerna-debug.log
1717
.eslintcache
18+
docs/_build

.travis.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
language: node_js
22
node_js:
3-
- "6"
4-
- "7"
53
- "8"
6-
- "9"
74
- "10"
85
- "11"
6+
- "12"
97
env:
108
- CXX=g++-4.8
119
addons:
@@ -14,10 +12,8 @@ addons:
1412
- ubuntu-toolchain-r-test
1513
packages:
1614
- g++-4.8
17-
env:
18-
matrix:
19-
- CXX=g++-4.8 TEST_SUITE=test
2015
before_script:
16+
- npm i -g typescript@next
2117
- export DISPLAY=:99.0
2218
- sh -e /etc/init.d/xvfb start
2319
install:

ISSUE_TEMPLATE.md

+54-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,66 @@
1-
<!---
1+
<!---------------------------------------------------------------------------------------
22
3-
Steps before creating an issue:
3+
Welcome to the Web3.js Issue Template!
44
5-
1. I have read the documentation.
6-
2. I was looking for an solution on stackoverflow or somewhere else.
7-
3. I checked the issue list if an identical issue already exists.
5+
If you're new around here, reading this will make sure you're helped ASAP.
6+
The more details you include, the better the community will be able to help you!
7+
8+
---------------------------------------------------------------------------------------->
9+
10+
### Description <!-- In plain words, what happened -->
811

9-
-->
1012

1113
#### Expected behavior
14+
<!---------------------------------------------------------------------
15+
Example:
16+
Calling `await web3.eth.getAccounts()` should return an array.
17+
----------------------------------------------------------------------->
18+
1219

1320
#### Actual behavior
21+
<!---------------------------------------------------------------------
22+
Example:
23+
Calling `await web3.eth.getAccounts()` returns "monkey".
24+
----------------------------------------------------------------------->
25+
1426

1527
#### Steps to reproduce the behavior
28+
<!---------------------------------------------------------------------
29+
Example:
30+
1. Import `web3`
31+
2. Set the provider to `localhost`
32+
3. Fetch latest block
33+
34+
Please use the code blocks Markdown does provide:
35+
36+
```js
37+
38+
console.log('Pretty syntax!');
39+
40+
```
41+
----------------------------------------------------------------------->
42+
43+
44+
#### Error Logs
45+
46+
47+
#### Gists
48+
<!---------------------------------------------------------------------
49+
Including links to gists with:
50+
* ABI JSON,
51+
* working Solidity code, etc.
52+
53+
gist tutorial: https://help.github.com/en/articles/creating-gists
54+
----------------------------------------------------------------------->
55+
1656

17-
1. [First step]
18-
2. [Second step]
19-
3. [and so on...]
57+
### Versions
58+
* web3.js:
59+
* nodejs:
60+
* browser:
61+
* ethereum node:
2062

21-
#### Error Logs
2263

23-
#### Versions
24-
[NPM, Node, Web3.js, OS, device...]
64+
<!---------------------------------------------------------------------
65+
Thanks for your cooperation!
66+
----------------------------------------------------------------------->

PULL_REQUEST_TEMPLATE.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Fixes #(issue)
1313

1414
- [ ] Bug fix
1515
- [ ] New feature
16-
- [ ] Breaking change
16+
- [ ] Breaking change
17+
- [ ] Enhancement
1718

1819
## Checklist:
1920

@@ -27,4 +28,4 @@ Fixes #(issue)
2728
- [ ] I ran ```npm run test``` in the root folder with success and extended the tests if necessary.
2829
- [ ] I ran ```npm run build``` in the root folder and tested it in the browser and with node.
2930
- [ ] I ran ```npm run dtslint``` in the root folder and tested that all my types are correct
30-
- [ ] I have tested my code on the live network.
31+
- [ ] I have tested my code on an ethereum test network.

README.md

+23-7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ npm install web3
2727
yarn add web3
2828
```
2929

30+
### Meteor
31+
32+
```bash
33+
meteor npm install --save [email protected]
34+
```
35+
3036
## Usage
3137

3238
```js
@@ -59,7 +65,7 @@ web3.eth.getAccounts()
5965

6066
### Usage with TypeScript
6167

62-
We do support types within the repo itself. Please open an issue here if you find any wrong types.
68+
We support types within the repo itself. Please open an issue here if you find any wrong types.
6369

6470
You can use `web3.js` as follows:
6571

@@ -68,6 +74,15 @@ import Web3 from 'web3';
6874
const web3 = new Web3("ws://localhost:8546");
6975
```
7076

77+
If you are using the types in a `commonjs` module like for example a node app you just have to enable `esModuleInterop` in your `tsconfig` compile option, also enable `allowSyntheticDefaultImports` for typesystem compatibility:
78+
79+
```js
80+
"compilerOptions": {
81+
"allowSyntheticDefaultImports": true,
82+
"esModuleInterop": true,
83+
....
84+
```
85+
7186
## Documentation
7287
7388
Documentation can be found at [read the docs][docs]
@@ -84,18 +99,19 @@ Documentation can be found at [read the docs][docs]
8499
85100
### Commands
86101
```bash
87-
npm run clean // removes all the node_modules folders in all modules
88-
npm run bootstrap // install all dependencies and symlinks the internal modules for all modules
89-
npm run test // runs all tests
90-
npm run build // runs rollup
91-
npm run dev // runs rollup with a watcher
102+
npm install # install all dependencies for npm run bootstrap
103+
npm run bootstrap # install all dependencies and symlinks the internal modules for all modules
104+
npm run build # runs rollup
105+
npm run test # runs all tests
106+
npm run clean # removes all the node_modules folders in all modules
107+
npm run dev # runs rollup with a watcher
92108

93109
```
94110
95111
### Support
96112
97113
![browsers](https://img.shields.io/badge/browsers-latest%202%20versions-brightgreen.svg)
98-
![node](https://img.shields.io/badge/node->=6-green.svg)
114+
![node](https://img.shields.io/badge/node->=8-green.svg)
99115
100116
### Community
101117
- [Gitter](https://gitter.im/ethereum/web3.js?source=orgpage)
Binary file not shown.
-355 KB
Binary file not shown.
-11.5 KB
Binary file not shown.

docs/_build/doctrees/glossary.doctree

-20.4 KB
Binary file not shown.
-3.23 KB
Binary file not shown.
-23.9 KB
Binary file not shown.
-10.8 KB
Binary file not shown.

docs/_build/doctrees/index.doctree

-6.86 KB
Binary file not shown.

docs/_build/doctrees/web3-bzz.doctree

-45.7 KB
Binary file not shown.
-64.9 KB
Binary file not shown.
-126 KB
Binary file not shown.
-163 KB
Binary file not shown.
-108 KB
Binary file not shown.
-54 KB
Binary file not shown.
-18.3 KB
Binary file not shown.
-80.4 KB
Binary file not shown.
-76.6 KB
Binary file not shown.

docs/_build/doctrees/web3-eth.doctree

-262 KB
Binary file not shown.

docs/_build/doctrees/web3-net.doctree

-15 KB
Binary file not shown.

docs/_build/doctrees/web3-shh.doctree

-171 KB
Binary file not shown.
-179 KB
Binary file not shown.

docs/_build/doctrees/web3.doctree

-40.9 KB
Binary file not shown.

docs/_build/html/.buildinfo

-4
This file was deleted.

docs/_build/html/_sources/callbacks-promises-events.rst.txt

-30
This file was deleted.

docs/_build/html/_sources/callbacks-promises-events.txt

-30
This file was deleted.

docs/_build/html/_sources/getting-started.rst.txt

-41
This file was deleted.

docs/_build/html/_sources/getting-started.txt

-41
This file was deleted.

0 commit comments

Comments
 (0)