Skip to content

Commit 4797490

Browse files
ntrotnerntrotner
authored
Merge pull request #33 from distributed-ledger-technology/update-1.7.0
Updated Web3.js Deno to 1.7.0
2 parents 9485825 + 24c719d commit 4797490

File tree

176 files changed

+382
-336
lines changed

Some content is hidden

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

176 files changed

+382
-336
lines changed

‎mod.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// @deno-types="https://deno.land/x/web3@v0.8.5/packages/web3/types/index.d.ts"
2-
import Web3 from 'https://deno.land/x/web3@v0.8.5/packages/web3/src/index.js';
1+
// @deno-types="https://deno.land/x/web3@v0.9.0/packages/web3/types/index.d.ts"
2+
import Web3 from 'https://deno.land/x/web3@v0.9.0/packages/web3/src/index.js';
33

44
export default Web3;

‎packages/web3-bzz/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm install web3-bzz
1919
## Usage
2020

2121
```js
22-
const Web3Bzz = require('https://deno.land/x/web3@v0.8.5/packages/web3-bzz/src/index.js');
22+
const Web3Bzz = require('https://deno.land/x/web3@v0.9.0/packages/web3-bzz/src/index.js');
2323

2424
const bzz = new Web3Bzz('http://swarm-gateways.net');
2525
```

‎packages/web3-bzz/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-bzz/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-bzz",
3-
"version": "1.6.1",
3+
"version": "1.7.0",
44
"description": "Web3 module to interact with the Swarm network.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-bzz",
66
"license": "LGPL-3.0",

‎packages/web3-bzz/types/tests/bzz-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @date 2018
1818
*/
1919

20-
import { Bzz } from 'https://deno.land/x/web3@v0.8.5/packages/web3-bzz/src/index.js';
20+
import { Bzz } from 'https://deno.land/x/web3@v0.9.0/packages/web3-bzz/src/index.js';
2121

2222
// $ExpectType Bzz
2323
const bzz_empty = new Bzz();

‎packages/web3-core-helpers/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ npm install web3-core-helpers
1717
## Usage
1818

1919
```js
20-
const helpers = require('https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js');
20+
const helpers = require('https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js');
2121

2222
helpers.formatters;
2323
helpers.errors;

‎packages/web3-core-helpers/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-core-helpers/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-helpers",
3-
"version": "1.6.1",
3+
"version": "1.7.0",
44
"description": "Web3 core tools helper for sub packages. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
66
"license": "LGPL-3.0",
@@ -14,8 +14,8 @@
1414
},
1515
"main": "lib/index.js",
1616
"dependencies": {
17-
"web3-eth-iban": "1.6.1",
18-
"web3-utils": "1.6.1"
17+
"web3-eth-iban": "1.7.0",
18+
"web3-utils": "1.7.0"
1919
},
2020
"devDependencies": {
2121
"@types/node": "^12.12.6",

‎packages/web3-core-helpers/src/formatters.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
'use strict';
2525

26-
import utils from 'https://deno.land/x/web3@v0.8.5/packages/web3-utils/src/index.js';
27-
import Iban from 'https://deno.land/x/web3@v0.8.5/packages/web3-eth-iban/src/index.js';
26+
import utils from 'https://deno.land/x/web3@v0.9.0/packages/web3-utils/src/index.js';
27+
import Iban from 'https://deno.land/x/web3@v0.9.0/packages/web3-eth-iban/src/index.js';
2828

2929
/**
3030
* Will format the given storage key array values to hex strings.

‎packages/web3-core-helpers/types/tests/errors-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @date 2019
1818
*/
1919

20-
import { errors, WebSocketEvent } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
20+
import { errors, WebSocketEvent } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
2121

2222
// $ExpectType Error
2323
errors.ErrorResponse(new Error('hey'));

‎packages/web3-core-helpers/types/tests/formatters-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @date 2018
1818
*/
1919

20-
import { formatters } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
20+
import { formatters } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
2121

2222
// $ExpectType number
2323
formatters.outputBigNumberFormatter(100);

‎packages/web3-core-method/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm install web3-core-method
1919
## Usage
2020

2121
```js
22-
const Web3Method = require('https://deno.land/x/web3@v0.8.5/packages/web3-core-method/src/index.js');
22+
const Web3Method = require('https://deno.land/x/web3@v0.9.0/packages/web3-core-method/src/index.js');
2323

2424
const method = new Web3Method({
2525
name: 'sendTransaction',

‎packages/web3-core-method/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-core-method/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-method",
3-
"version": "1.6.1",
3+
"version": "1.7.0",
44
"description": "Creates the methods on the web3 modules. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-method",
66
"license": "LGPL-3.0",
@@ -15,10 +15,10 @@
1515
"main": "lib/index.js",
1616
"dependencies": {
1717
"@ethersproject/transactions": "^5.0.0-beta.135",
18-
"web3-core-helpers": "1.6.1",
19-
"web3-core-promievent": "1.6.1",
20-
"web3-core-subscriptions": "1.6.1",
21-
"web3-utils": "1.6.1"
18+
"web3-core-helpers": "1.7.0",
19+
"web3-core-promievent": "1.7.0",
20+
"web3-core-subscriptions": "1.7.0",
21+
"web3-utils": "1.7.0"
2222
},
2323
"devDependencies": {
2424
"dtslint": "^3.4.1",

‎packages/web3-core-method/src/index.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
'use strict';
2525

26-
import { errors } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
27-
import { formatters } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
28-
import utils from 'https://deno.land/x/web3@v0.8.5/packages/web3-utils/src/index.js';
29-
import promiEvent from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-promievent/src/index.js';
30-
import { subscriptions as Subscriptions } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-subscriptions/src/index.js';
26+
import { errors } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
27+
import { formatters } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
28+
import utils from 'https://deno.land/x/web3@v0.9.0/packages/web3-utils/src/index.js';
29+
import promiEvent from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-promievent/src/index.js';
30+
import { subscriptions as Subscriptions } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-subscriptions/src/index.js';
3131
import * as EthersTransactionUtils from 'https://jspm.dev/@ethersproject/transactions';
3232

3333
const Method = function Method(options) {
@@ -54,6 +54,7 @@ const Method = function Method(options) {
5454
this.transactionBlockTimeout = options.transactionBlockTimeout || 50;
5555
this.transactionConfirmationBlocks = options.transactionConfirmationBlocks || 24;
5656
this.transactionPollingTimeout = options.transactionPollingTimeout || 750;
57+
this.transactionPollingInterval = options.transactionPollingInterval || 1000;
5758
this.blockHeaderTimeout = options.blockHeaderTimeout || 10; // 10 seconds
5859
this.defaultCommon = options.defaultCommon;
5960
this.defaultChain = options.defaultChain;
@@ -532,7 +533,7 @@ Method.prototype._confirmTransaction = function (defer, result, payload) {
532533
let blockHeaderArrived = false;
533534

534535
const startInterval = () => {
535-
intervalId = setInterval(checkConfirmation.bind(null, existingReceipt, true), 1000);
536+
intervalId = setInterval(checkConfirmation.bind(null, existingReceipt, true), method.transactionPollingInterval);
536537
};
537538

538539
// If provider do not support event subscription use polling

‎packages/web3-core-method/types/index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @date 2018
1818
*/
1919

20-
import { JsonRpcPayload } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/types/index.d.ts';
20+
import { JsonRpcPayload } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/types/index.d.ts';
2121

2222
export interface Method {
2323
name: string;

‎packages/web3-core-promievent/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm install web3-core-promievent
1919
## Usage
2020

2121
```js
22-
const Web3PromiEvent = require('https://deno.land/x/web3@v0.8.5/packages/web3-core-promievent/src/index.js');
22+
const Web3PromiEvent = require('https://deno.land/x/web3@v0.9.0/packages/web3-core-promievent/src/index.js');
2323

2424
const myFunc = function(){
2525
const promiEvent = Web3PromiEvent();

‎packages/web3-core-promievent/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-core-promievent/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-promievent",
3-
"version": "1.6.1",
3+
"version": "1.7.0",
44
"description": "This package extends the EventEmitter with the Promise class to allow chaining as well as multiple final states of a function.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-promievent",
66
"license": "LGPL-3.0",

‎packages/web3-core-requestmanager/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ npm install web3-core-requestmanager
1919
## Usage
2020

2121
```js
22-
const Web3WsProvider = require('https://deno.land/x/web3@v0.8.5/packages/web3-providers-ws/src/index.js');
23-
const Web3RequestManager = require('https://deno.land/x/web3@v0.8.5/packages/web3-core-requestmanager/src/index.js');
22+
const Web3WsProvider = require('https://deno.land/x/web3@v0.9.0/packages/web3-providers-ws/src/index.js');
23+
const Web3RequestManager = require('https://deno.land/x/web3@v0.9.0/packages/web3-core-requestmanager/src/index.js');
2424

2525
const requestManager = new Web3RequestManager(new Web3WsProvider('ws://localhost:8546'));
2626
```

‎packages/web3-core-requestmanager/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-core-requestmanager/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-requestmanager",
3-
"version": "1.6.1",
3+
"version": "1.7.0",
44
"description": "Web3 module to handle requests to external providers.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-requestmanager",
66
"license": "LGPL-3.0",
@@ -13,9 +13,9 @@
1313
},
1414
"dependencies": {
1515
"util": "^0.12.0",
16-
"web3-core-helpers": "1.6.1",
17-
"web3-providers-http": "1.6.1",
18-
"web3-providers-ipc": "1.6.1",
19-
"web3-providers-ws": "1.6.1"
16+
"web3-core-helpers": "1.7.0",
17+
"web3-providers-http": "1.7.0",
18+
"web3-providers-ipc": "1.7.0",
19+
"web3-providers-ws": "1.7.0"
2020
}
2121
}

‎packages/web3-core-requestmanager/src/batch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
'use strict';
2424

25-
import { errors } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
25+
import { errors } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
2626
import Jsonrpc from './jsonrpc.js';
2727

2828
const Batch = function (requestManager) {

‎packages/web3-core-requestmanager/src/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
'use strict';
2121

2222
import { callbackify } from 'https://deno.land/[email protected]/node/util.ts';
23-
import { errors } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
24-
import WebsocketProvider from 'https://deno.land/x/web3@v0.8.5/packages/web3-providers-ws/src/index.js';
25-
import HttpProvider from 'https://deno.land/x/web3@v0.8.5/packages/web3-providers-http/src/index.js';
26-
import IpcProvider from 'https://deno.land/x/web3@v0.8.5/packages/web3-providers-ipc/src/index.js';
23+
import { errors } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
24+
import WebsocketProvider from 'https://deno.land/x/web3@v0.9.0/packages/web3-providers-ws/src/index.js';
25+
import HttpProvider from 'https://deno.land/x/web3@v0.9.0/packages/web3-providers-http/src/index.js';
26+
import IpcProvider from 'https://deno.land/x/web3@v0.9.0/packages/web3-providers-ipc/src/index.js';
2727
import Jsonrpc from './jsonrpc.js';
2828
import BatchManager from './batch.js';
2929
import givenProvider from './givenProvider.js';

‎packages/web3-core-subscriptions/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm install web3-core-subscriptions
1919
## Usage
2020

2121
```js
22-
const Web3Subscriptions = require('https://deno.land/x/web3@v0.8.5/packages/web3-core-subscriptions/src/index.js');
22+
const Web3Subscriptions = require('https://deno.land/x/web3@v0.9.0/packages/web3-core-subscriptions/src/index.js');
2323

2424
const sub = new Web3Subscriptions({
2525
name: 'subscribe',

‎packages/web3-core-subscriptions/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-core-subscriptions/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-subscriptions",
3-
"version": "1.6.1",
3+
"version": "1.7.0",
44
"description": "Manages web3 subscriptions. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-subscriptions",
66
"license": "LGPL-3.0",
@@ -15,7 +15,7 @@
1515
"main": "lib/index.js",
1616
"dependencies": {
1717
"eventemitter3": "4.0.4",
18-
"web3-core-helpers": "1.6.1"
18+
"web3-core-helpers": "1.7.0"
1919
},
2020
"devDependencies": {
2121
"dtslint": "^3.4.1",

‎packages/web3-core-subscriptions/src/subscription.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
'use strict';
2424

25-
import { errors } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
25+
import { errors } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
2626
import EventEmitter from 'https://jspm.dev/eventemitter3';
27-
import { formatters } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
27+
import { formatters } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
2828

2929
function identity(value) { // used to return the exact same replica of the value given to it as the argument
3030
return value;

‎packages/web3-core-subscriptions/types/tests/subscriptions.tests.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @date 2019
2121
*/
2222

23-
import { Subscriptions, Subscription } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-subscriptions/src/index.js';
23+
import { Subscriptions, Subscription } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-subscriptions/src/index.js';
2424

2525
const subscriptions = new Subscriptions({
2626
name: '',

‎packages/web3-core/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm install web3-core
1919
## Usage
2020

2121
```js
22-
const core = require('https://deno.land/x/web3@v0.8.5/packages/web3-core/src/index.js');
22+
const core = require('https://deno.land/x/web3@v0.9.0/packages/web3-core/src/index.js');
2323

2424
const CoolLib = function CoolLib() {
2525
// sets _requestmanager and adds basic functions

‎packages/web3-core/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-core/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core",
3-
"version": "1.6.1",
3+
"version": "1.7.0",
44
"description": "Web3 core tools for sub-packages. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core",
66
"license": "LGPL-3.0",
@@ -17,10 +17,10 @@
1717
"@types/bn.js": "^4.11.5",
1818
"@types/node": "^12.12.6",
1919
"bignumber.js": "^9.0.0",
20-
"web3-core-helpers": "1.6.1",
21-
"web3-core-method": "1.6.1",
22-
"web3-core-requestmanager": "1.6.1",
23-
"web3-utils": "1.6.1"
20+
"web3-core-helpers": "1.7.0",
21+
"web3-core-method": "1.7.0",
22+
"web3-core-requestmanager": "1.7.0",
23+
"web3-utils": "1.7.0"
2424
},
2525
"devDependencies": {
2626
"dtslint": "^3.4.1",

‎packages/web3-core/src/extend.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
'use strict';
2424

25-
import { formatters } from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-helpers/src/index.js';
26-
import Method from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-method/src/index.js';
27-
import utils from 'https://deno.land/x/web3@v0.8.5/packages/web3-utils/src/index.js';
25+
import { formatters } from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-helpers/src/index.js';
26+
import Method from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-method/src/index.js';
27+
import utils from 'https://deno.land/x/web3@v0.9.0/packages/web3-utils/src/index.js';
2828

2929
const extend = function (pckg) {
3030
/* jshint maxcomplexity:5 */

‎packages/web3-core/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @date 2017
2121
*/
2222

23-
import requestManager from 'https://deno.land/x/web3@v0.8.5/packages/web3-core-requestmanager/src/index.js';
23+
import requestManager from 'https://deno.land/x/web3@v0.9.0/packages/web3-core-requestmanager/src/index.js';
2424

2525
import extend from './extend.js';
2626

0 commit comments

Comments
 (0)