Merge pull request #25 from distributed-ledger-technology/update-1.6.1

Updated Web3.js Deno to 1.6.1

Author: ntrotner

mod.ts

@@ -1,4 +1,4 @@
-// @deno-types="https://deno.land/x/web3@v0.7.3/packages/web3/types/index.d.ts"
-import Web3 from 'https://deno.land/x/web3@v0.7.3/packages/web3/src/index.js';
+// @deno-types="https://deno.land/x/web3@v0.8.0/packages/web3/types/index.d.ts"
+import Web3 from 'https://deno.land/x/web3@v0.8.0/packages/web3/src/index.js';
 
 export default Web3;

packages/web3-bzz/README.md

@@ -19,7 +19,7 @@ npm install web3-bzz
 ## Usage
 
 ```js
-const Web3Bzz = require('https://deno.land/x/web3@v0.7.3/packages/web3-bzz/src/index.js');
+const Web3Bzz = require('https://deno.land/x/web3@v0.8.0/packages/web3-bzz/src/index.js');
 
 const bzz = new Web3Bzz('http://swarm-gateways.net');
 ```

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

@@ -17,7 +17,7 @@
  * @date 2018
  */
 
-import { Bzz } from 'https://deno.land/x/web3@v0.7.3/packages/web3-bzz/src/index.js';
+import { Bzz } from 'https://deno.land/x/web3@v0.8.0/packages/web3-bzz/src/index.js';
 
 // $ExpectType Bzz
 const bzz_empty = new Bzz();

packages/web3-core-helpers/README.md

@@ -17,7 +17,7 @@ npm install web3-core-helpers
 ## Usage
 
 ```js
-const helpers = require('https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js');
+const helpers = require('https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js');
 
 helpers.formatters;
 helpers.errors;

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

@@ -23,8 +23,8 @@
 
 'use strict';
 
-import utils from 'https://deno.land/x/web3@v0.7.3/packages/web3-utils/src/index.js';
-import Iban from 'https://deno.land/x/web3@v0.7.3/packages/web3-eth-iban/src/index.js';
+import utils from 'https://deno.land/x/web3@v0.8.0/packages/web3-utils/src/index.js';
+import Iban from 'https://deno.land/x/web3@v0.8.0/packages/web3-eth-iban/src/index.js';
 
 /**
  * Will format the given storage key array values to hex strings.
@@ -273,6 +273,9 @@ const outputTransactionReceiptFormatter = function (receipt) {
     receipt.logs = receipt.logs.map(outputLogFormatter);
   }
 
+  if (receipt.effectiveGasPrice) {
+    receipt.effectiveGasPrice = utils.hexToNumber(receipt.effectiveGasPrice);
+  }
   if (receipt.contractAddress) {
     receipt.contractAddress = utils.toChecksumAddress(receipt.contractAddress);
   }

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

@@ -17,7 +17,7 @@
  * @date 2019
  */
 
-import { errors, WebSocketEvent } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
+import { errors, WebSocketEvent } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
 
 // $ExpectType Error
 errors.ErrorResponse(new Error('hey'));

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

@@ -17,7 +17,7 @@
  * @date 2018
  */
 
-import { formatters } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
+import { formatters } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
 
 // $ExpectType number
 formatters.outputBigNumberFormatter(100);

packages/web3-core-method/README.md

@@ -19,7 +19,7 @@ npm install web3-core-method
 ## Usage
 
 ```js
-const Web3Method = require('https://deno.land/x/web3@v0.7.3/packages/web3-core-method/src/index.js');
+const Web3Method = require('https://deno.land/x/web3@v0.8.0/packages/web3-core-method/src/index.js');
 
 const method = new Web3Method({
     name: 'sendTransaction',

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

@@ -23,11 +23,11 @@
 
 'use strict';
 
-import { errors } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
-import { formatters } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
-import utils from 'https://deno.land/x/web3@v0.7.3/packages/web3-utils/src/index.js';
-import promiEvent from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-promievent/src/index.js';
-import { subscriptions as Subscriptions } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-subscriptions/src/index.js';
+import { errors } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
+import { formatters } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
+import utils from 'https://deno.land/x/web3@v0.8.0/packages/web3-utils/src/index.js';
+import promiEvent from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-promievent/src/index.js';
+import { subscriptions as Subscriptions } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-subscriptions/src/index.js';
 import * as EthersTransactionUtils from 'https://jspm.dev/@ethersproject/transactions';
 
 const Method = function Method(options) {

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

@@ -17,7 +17,7 @@
  * @date 2018
  */
 
-import { JsonRpcPayload } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/types/index.d.ts';
+import { JsonRpcPayload } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/types/index.d.ts';
 
 export interface Method {
     name: string;

packages/web3-core-promievent/README.md

@@ -19,7 +19,7 @@ npm install web3-core-promievent
 ## Usage
 
 ```js
-const Web3PromiEvent = require('https://deno.land/x/web3@v0.7.3/packages/web3-core-promievent/src/index.js');
+const Web3PromiEvent = require('https://deno.land/x/web3@v0.8.0/packages/web3-core-promievent/src/index.js');
 
 const myFunc = function(){
     const promiEvent = Web3PromiEvent();

packages/web3-core-requestmanager/README.md

@@ -19,8 +19,8 @@ npm install web3-core-requestmanager
 ## Usage
 
 ```js
-const Web3WsProvider = require('https://deno.land/x/web3@v0.7.3/packages/web3-providers-ws/src/index.js');
-const Web3RequestManager = require('https://deno.land/x/web3@v0.7.3/packages/web3-core-requestmanager/src/index.js');
+const Web3WsProvider = require('https://deno.land/x/web3@v0.8.0/packages/web3-providers-ws/src/index.js');
+const Web3RequestManager = require('https://deno.land/x/web3@v0.8.0/packages/web3-core-requestmanager/src/index.js');
 
 const requestManager = new Web3RequestManager(new Web3WsProvider('ws://localhost:8546'));
 ```

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

@@ -22,7 +22,7 @@
 
 'use strict';
 
-import { errors } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
+import { errors } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
 import Jsonrpc from './jsonrpc.js';
 
 const Batch = function (requestManager) {
@@ -47,8 +47,10 @@ Batch.prototype.add = function (request) {
  */
 Batch.prototype.execute = function () {
   const { requests } = this;
+  const sortResponses = this._sortResponses.bind(this);
+
   this.requestManager.sendBatch(requests, (err, results) => {
-    results = results || [];
+    results = sortResponses(results);
     requests.map((request, index) => results[index] || {}).forEach((result, index) => {
       if (requests[index].callback) {
         if (result && result.error) {
@@ -69,4 +71,9 @@ Batch.prototype.execute = function () {
   });
 };
 
+// Sort responses
+Batch.prototype._sortResponses = function (responses) {    
+  return (responses || []).sort((a, b) => a.id - b.id);
+};
+
 export default Batch;

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

@@ -20,10 +20,10 @@
 'use strict';
 
 import { callbackify } from 'https://deno.land/[email protected]/node/util.ts';
-import { errors } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
-import WebsocketProvider from 'https://deno.land/x/web3@v0.7.3/packages/web3-providers-ws/src/index.js';
-import HttpProvider from 'https://deno.land/x/web3@v0.7.3/packages/web3-providers-http/src/index.js';
-import IpcProvider from 'https://deno.land/x/web3@v0.7.3/packages/web3-providers-ipc/src/index.js';
+import { errors } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
+import WebsocketProvider from 'https://deno.land/x/web3@v0.8.0/packages/web3-providers-ws/src/index.js';
+import HttpProvider from 'https://deno.land/x/web3@v0.8.0/packages/web3-providers-http/src/index.js';
+import IpcProvider from 'https://deno.land/x/web3@v0.8.0/packages/web3-providers-ipc/src/index.js';
 import Jsonrpc from './jsonrpc.js';
 import BatchManager from './batch.js';
 import givenProvider from './givenProvider.js';

packages/web3-core-subscriptions/README.md

@@ -19,7 +19,7 @@ npm install web3-core-subscriptions
 ## Usage
 
 ```js
-const Web3Subscriptions = require('https://deno.land/x/web3@v0.7.3/packages/web3-core-subscriptions/src/index.js');
+const Web3Subscriptions = require('https://deno.land/x/web3@v0.8.0/packages/web3-core-subscriptions/src/index.js');
 
 const sub = new Web3Subscriptions({
     name: 'subscribe',

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

@@ -22,9 +22,9 @@
 
 'use strict';
 
-import { errors } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
+import { errors } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
 import EventEmitter from 'https://jspm.dev/eventemitter3';
-import { formatters } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
+import { formatters } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
 
 function identity(value) { // used to return the exact same replica of the value given to it as the argument
   return value;

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

@@ -20,7 +20,7 @@
  * @date 2019
  */
 
-import { Subscriptions, Subscription } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-subscriptions/src/index.js';
+import { Subscriptions, Subscription } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-subscriptions/src/index.js';
 
 const subscriptions = new Subscriptions({
   name: '',

packages/web3-core/README.md

@@ -19,7 +19,7 @@ npm install web3-core
 ## Usage
 
 ```js
-const core = require('https://deno.land/x/web3@v0.7.3/packages/web3-core/src/index.js');
+const core = require('https://deno.land/x/web3@v0.8.0/packages/web3-core/src/index.js');
 
 const CoolLib = function CoolLib() {
     // sets _requestmanager and adds basic functions

packages/web3-core/src/extend.js

@@ -22,9 +22,9 @@
 
 'use strict';
 
-import { formatters } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
-import Method from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-method/src/index.js';
-import utils from 'https://deno.land/x/web3@v0.7.3/packages/web3-utils/src/index.js';
+import { formatters } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
+import Method from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-method/src/index.js';
+import utils from 'https://deno.land/x/web3@v0.8.0/packages/web3-utils/src/index.js';
 
 const extend = function (pckg) {
   /* jshint maxcomplexity:5 */

packages/web3-core/src/index.js

@@ -20,7 +20,7 @@
  * @date 2017
  */
 
-import requestManager from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-requestmanager/src/index.js';
+import requestManager from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-requestmanager/src/index.js';
 
 import extend from './extend.js';
 

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

@@ -27,8 +27,8 @@ import {
   WebsocketProviderOptions,
   JsonRpcPayload,
   JsonRpcResponse,
-} from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/types/index.d.ts';
-import { Method } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-method/types/index.d.ts';
+} from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/types/index.d.ts';
+import { Method } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-method/types/index.d.ts';
 import BN from 'https://deno.land/x/web3/types/bn.d.ts';
 import BigNumber from 'https://deno.land/x/web3/types/bignumber.d.ts';
 
@@ -134,6 +134,8 @@ export interface Transaction {
     to: string | null;
     value: string;
     gasPrice: string;
+    maxPriorityFeePerGas?: number | string | BN;
+    maxFeePerGas?: number | string | BN;
     gas: number;
     input: string;
 }
@@ -144,6 +146,8 @@ export interface TransactionConfig {
     value?: number | string | BN;
     gas?: number | string;
     gasPrice?: number | string | BN;
+    maxPriorityFeePerGas?: number | string | BN;
+    maxFeePerGas?: number | string | BN;
     data?: string;
     nonce?: number;
     chainId?: number;
@@ -209,6 +213,7 @@ export interface TransactionReceipt {
     contractAddress?: string;
     cumulativeGasUsed: number;
     gasUsed: number;
+    effectiveGasPrice: number;
     logs: Log[];
     logsBloom: string;
     events?: {

packages/web3-eth-abi/README.md

@@ -19,7 +19,7 @@ npm install web3-eth-abi
 ## Usage
 
 ```js
-const Web3EthAbi = require('https://deno.land/x/web3@v0.7.3/packages/web3-eth-abi/src/index.js');
+const Web3EthAbi = require('https://deno.land/x/web3@v0.8.0/packages/web3-eth-abi/src/index.js');
 
 Web3EthAbi.encodeFunctionSignature('myMethod(uint256,string)');
 > '0x24ee0097'

packages/web3-eth-abi/src/index.js

@@ -23,7 +23,7 @@
 
 import { Buffer } from 'https://jspm.dev/npm:@jspm/core@2/nodelibs/buffer';
 
-import utils from 'https://deno.land/x/web3@v0.7.3/packages/web3-utils/src/index.js';
+import utils from 'https://deno.land/x/web3@v0.8.0/packages/web3-utils/src/index.js';
 import { AbiCoder as EthersAbiCoder } from 'https://jspm.dev/@ethersproject/abi';
 import { ParamType } from 'https://jspm.dev/@ethersproject/abi';
 

packages/web3-eth-abi/types/index.d.ts

@@ -17,7 +17,7 @@
  * @date 2018
  */
 
-import { AbiInput, AbiItem } from 'https://deno.land/x/web3@v0.7.3/packages/web3-utils/types/index.d.ts';
+import { AbiInput, AbiItem } from 'https://deno.land/x/web3@v0.8.0/packages/web3-utils/types/index.d.ts';
 
 export class AbiCoder {
   encodeFunctionSignature(functionName: string | AbiItem): string;

packages/web3-eth-abi/types/tests/abi-coder-test.ts

@@ -20,7 +20,7 @@
  * @date 2018
  */
 
-import { AbiCoder } from 'https://deno.land/x/web3@v0.7.3/packages/web3-eth-abi/src/index.js';
+import { AbiCoder } from 'https://deno.land/x/web3@v0.8.0/packages/web3-eth-abi/src/index.js';
 
 const abiCoder = new AbiCoder();
 

packages/web3-eth-accounts/README.md

@@ -19,7 +19,7 @@ npm install web3-eth-accounts
 ## Usage
 
 ```js
-const Web3EthAccounts = require('https://deno.land/x/web3@v0.7.3/packages/web3-eth-accounts/src/index.js');
+const Web3EthAccounts = require('https://deno.land/x/web3@v0.8.0/packages/web3-eth-accounts/src/index.js');
 
 const account = new Web3EthAccounts('ws://localhost:8546');
 account.create();

packages/web3-eth-accounts/src/index.js

@@ -22,14 +22,14 @@
 
 'use strict';
 
-import core from 'https://deno.land/x/web3@v0.7.3/packages/web3-core/src/index.js';
-import Method from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-method/src/index.js';
+import core from 'https://deno.land/x/web3@v0.8.0/packages/web3-core/src/index.js';
+import Method from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-method/src/index.js';
 import Account from 'https://jspm.dev/eth-lib/lib/account';
 import cryp from 'https://jspm.dev/npm:@jspm/core@2/nodelibs/crypto';
 import scrypt from 'https://jspm.dev/scrypt-js';
 import * as uuid from 'https://jspm.dev/uuid';
-import utils from 'https://deno.land/x/web3@v0.7.3/packages/web3-utils/src/index.js';
-import * as helpers from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
+import utils from 'https://deno.land/x/web3@v0.8.0/packages/web3-utils/src/index.js';
+import * as helpers from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
 import TX from 'https://jspm.dev/@ethereumjs/tx';
 import Common from 'https://jspm.dev/@ethereumjs/common';
 import { Hardfork as HardForks } from 'https://jspm.dev/@ethereumjs/common';

packages/web3-eth-accounts/types/index.d.ts

@@ -17,9 +17,9 @@
  * @date 2018
  */
 
-import { AccountsBase, SignedTransaction, WalletBase } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core/types/index.d.ts';
+import { AccountsBase, SignedTransaction, WalletBase } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core/types/index.d.ts';
 
-export { SignedTransaction } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core/types/index.d.ts';
+export { SignedTransaction } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core/types/index.d.ts';
 
 export class Accounts extends AccountsBase {}
 

packages/web3-eth-accounts/types/tests/accounts-tests.ts

@@ -16,7 +16,7 @@
  * @author Josh Stevens <[email protected]>
  * @date 2018
  */
-import { Accounts, SignedTransaction } from 'https://deno.land/x/web3@v0.7.3/packages/web3-eth-accounts/src/index.js';
+import { Accounts, SignedTransaction } from 'https://deno.land/x/web3@v0.8.0/packages/web3-eth-accounts/src/index.js';
 
 // $ExpectType Accounts
 const accounts_empty = new Accounts();

packages/web3-eth-contract/README.md

@@ -19,7 +19,7 @@ npm install web3-eth-contract
 ## Usage
 
 ```js
-const Web3EthContract = require('https://deno.land/x/web3@v0.7.3/packages/web3-eth-contract/src/index.js');
+const Web3EthContract = require('https://deno.land/x/web3@v0.8.0/packages/web3-eth-contract/src/index.js');
 
 // Set provider for all later instances to use
 Web3EthContract.setProvider('ws://localhost:8546');

packages/web3-eth-contract/src/index.js

@@ -19,7 +19,7 @@
  *
  * To initialize a contract use:
  *
- *  var Contract = require('https://deno.land/x/web3@v0.7.3/packages/web3-eth-contract/src/index.js');
+ *  var Contract = require('https://deno.land/x/web3@v0.8.0/packages/web3-eth-contract/src/index.js');
  *  Contract.setProvider('ws://localhost:8546');
  *  var contract = new Contract(abi, address, ...);
  *
@@ -29,14 +29,14 @@
 
 'use strict';
 
-import core from 'https://deno.land/x/web3@v0.7.3/packages/web3-core/src/index.js';
-import Method from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-method/src/index.js';
-import utils from 'https://deno.land/x/web3@v0.7.3/packages/web3-utils/src/index.js';
-import { subscription as Subscription } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-subscriptions/src/index.js';
-import { formatters } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
-import { errors } from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-helpers/src/index.js';
-import promiEvent from 'https://deno.land/x/web3@v0.7.3/packages/web3-core-promievent/src/index.js';
-import abi from 'https://deno.land/x/web3@v0.7.3/packages/web3-eth-abi/src/index.js';
+import core from 'https://deno.land/x/web3@v0.8.0/packages/web3-core/src/index.js';
+import Method from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-method/src/index.js';
+import utils from 'https://deno.land/x/web3@v0.8.0/packages/web3-utils/src/index.js';
+import { subscription as Subscription } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-subscriptions/src/index.js';
+import { formatters } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
+import { errors } from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-helpers/src/index.js';
+import promiEvent from 'https://deno.land/x/web3@v0.8.0/packages/web3-core-promievent/src/index.js';
+import abi from 'https://deno.land/x/web3@v0.8.0/packages/web3-eth-abi/src/index.js';
 
 /**
  * Should be called to create new contract instance