2
0
mirror of synced 2025-02-24 12:08:10 +00:00

Updated dist files.

This commit is contained in:
Richard Moore 2018-07-30 23:15:36 -04:00
parent cc6f658ef1
commit 22f007498d
No known key found for this signature in database
GPG Key ID: 525F70A6FCABC295
9 changed files with 2220 additions and 1021 deletions

21
dist/ethers.js vendored
View File

@ -11820,14 +11820,21 @@ utils.defineProperty(Web3Signer, 'onchange', {
var Web3Provider = /** @class */ (function (_super) { var Web3Provider = /** @class */ (function (_super) {
__extends(Web3Provider, _super); __extends(Web3Provider, _super);
function Web3Provider(web3Provider, network) { function Web3Provider(web3Provider, network) {
var _this = this; var _this =
if (!web3Provider || !web3Provider.sendAsync) { // HTTP has a host; IPC has a path.
_super.call(this, web3Provider.host || web3Provider.path || '', network) || this;
errors.checkNew(_this, Web3Provider);
if (web3Provider) {
if (web3Provider.sendAsync) {
_this._sendAsync = web3Provider.sendAsync.bind(web3Provider);
}
else if (web3Provider.send) {
_this._sendAsync = web3Provider.send.bind(web3Provider);
}
}
if (!web3Provider || !_this._sendAsync) {
errors.throwError('invalid web3Provider', errors.INVALID_ARGUMENT, { arg: 'web3Provider', value: web3Provider }); errors.throwError('invalid web3Provider', errors.INVALID_ARGUMENT, { arg: 'web3Provider', value: web3Provider });
} }
// HTTP has a host; IPC has a path.
var url = web3Provider.host || web3Provider.path || '';
_this = _super.call(this, url, network) || this;
errors.checkNew(_this, Web3Provider);
properties_1.defineReadOnly(_this, '_web3Provider', web3Provider); properties_1.defineReadOnly(_this, '_web3Provider', web3Provider);
return _this; return _this;
} }
@ -11846,7 +11853,7 @@ var Web3Provider = /** @class */ (function (_super) {
id: 42, id: 42,
jsonrpc: "2.0" jsonrpc: "2.0"
}; };
_this._web3Provider.sendAsync(request, function (error, result) { _this._sendAsync(request, function (error, result) {
if (error) { if (error) {
reject(error); reject(error);
return; return;

2
dist/ethers.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -459,7 +459,8 @@ declare module 'ethers/providers/web3-provider' {
isMetaMask?: boolean; isMetaMask?: boolean;
host?: string; host?: string;
path?: string; path?: string;
sendAsync: (request: any, callback: (error: any, response: any) => void) => void; sendAsync?: (request: any, callback: (error: any, response: any) => void) => void;
send?: (request: any, callback: (error: any, response: any) => void) => void;
}; };
export class Web3Provider extends JsonRpcProvider { export class Web3Provider extends JsonRpcProvider {
readonly _web3Provider: AsyncSendable; readonly _web3Provider: AsyncSendable;

3168
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -37,12 +37,12 @@
"eslint-plugin-promise": "^3.8.0", "eslint-plugin-promise": "^3.8.0",
"ethereumjs-tx": "^1.3.5", "ethereumjs-tx": "^1.3.5",
"ethereumjs-util": "^5.2.0", "ethereumjs-util": "^5.2.0",
"gulp": "^3.9.1", "gulp": "^4.0.0",
"gulp-cli": "^2.0.1", "gulp-cli": "^2.0.1",
"gulp-sourcemaps": "^2.6.4", "gulp-sourcemaps": "^2.6.4",
"gulp-typescript": "^5.0.0-alpha.1", "gulp-typescript": "^5.0.0-alpha.1",
"gulp-uglify": "^3.0.0", "gulp-uglify": "^3.0.0",
"mocha": "^3.2.0", "mocha": "^5.2.0",
"mocha-phantomjs-core": "2.1.2", "mocha-phantomjs-core": "2.1.2",
"solc": "0.4.20", "solc": "0.4.20",
"tsify": "^4.0.0", "tsify": "^4.0.0",
@ -50,7 +50,7 @@
"typescript": "^2.9.1", "typescript": "^2.9.1",
"vinyl-buffer": "^1.0.1", "vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0", "vinyl-source-stream": "^2.0.0",
"web3": "0.20.6" "web3-providers-http": "1.0.0-beta.35"
}, },
"browser": "./dist/ethers.js", "browser": "./dist/ethers.js",
"keywords": [ "keywords": [

View File

@ -4,10 +4,12 @@ export declare type AsyncSendable = {
isMetaMask?: boolean; isMetaMask?: boolean;
host?: string; host?: string;
path?: string; path?: string;
sendAsync: (request: any, callback: (error: any, response: any) => void) => void; sendAsync?: (request: any, callback: (error: any, response: any) => void) => void;
send?: (request: any, callback: (error: any, response: any) => void) => void;
}; };
export declare class Web3Provider extends JsonRpcProvider { export declare class Web3Provider extends JsonRpcProvider {
readonly _web3Provider: AsyncSendable; readonly _web3Provider: AsyncSendable;
private _sendAsync;
constructor(web3Provider: AsyncSendable, network?: Networkish); constructor(web3Provider: AsyncSendable, network?: Networkish);
send(method: string, params: any): Promise<any>; send(method: string, params: any): Promise<any>;
} }

View File

@ -30,14 +30,21 @@ utils.defineProperty(Web3Signer, 'onchange', {
var Web3Provider = /** @class */ (function (_super) { var Web3Provider = /** @class */ (function (_super) {
__extends(Web3Provider, _super); __extends(Web3Provider, _super);
function Web3Provider(web3Provider, network) { function Web3Provider(web3Provider, network) {
var _this = this; var _this =
if (!web3Provider || !web3Provider.sendAsync) { // HTTP has a host; IPC has a path.
_super.call(this, web3Provider.host || web3Provider.path || '', network) || this;
errors.checkNew(_this, Web3Provider);
if (web3Provider) {
if (web3Provider.sendAsync) {
_this._sendAsync = web3Provider.sendAsync.bind(web3Provider);
}
else if (web3Provider.send) {
_this._sendAsync = web3Provider.send.bind(web3Provider);
}
}
if (!web3Provider || !_this._sendAsync) {
errors.throwError('invalid web3Provider', errors.INVALID_ARGUMENT, { arg: 'web3Provider', value: web3Provider }); errors.throwError('invalid web3Provider', errors.INVALID_ARGUMENT, { arg: 'web3Provider', value: web3Provider });
} }
// HTTP has a host; IPC has a path.
var url = web3Provider.host || web3Provider.path || '';
_this = _super.call(this, url, network) || this;
errors.checkNew(_this, Web3Provider);
properties_1.defineReadOnly(_this, '_web3Provider', web3Provider); properties_1.defineReadOnly(_this, '_web3Provider', web3Provider);
return _this; return _this;
} }
@ -56,7 +63,7 @@ var Web3Provider = /** @class */ (function (_super) {
id: 42, id: 42,
jsonrpc: "2.0" jsonrpc: "2.0"
}; };
_this._web3Provider.sendAsync(request, function (error, result) { _this._sendAsync(request, function (error, result) {
if (error) { if (error) {
reject(error); reject(error);
return; return;

View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
var assert = require('assert'); var assert = require('assert');
var web3 = require('web3'); var Web3HttpProvider = require('web3-providers-http');
var utils = require('./utils'); var utils = require('./utils');
var ethers = utils.getEthers(__filename); var ethers = utils.getEthers(__filename);
@ -257,7 +257,7 @@ function testProvider(providerName, networkName) {
provider = ethers.getDefaultProvider(); provider = ethers.getDefaultProvider();
} else if (providerName === 'Web3Provider') { } else if (providerName === 'Web3Provider') {
var infuraUrl = (new ethers.InfuraProvider()).connection.url; var infuraUrl = (new ethers.InfuraProvider()).connection.url;
provider = new ethers.Web3Provider(new web3.providers.HttpProvider(infuraUrl)); provider = new ethers.Web3Provider(new Web3HttpProvider(infuraUrl));
} else { } else {
provider = new ethers[providerName](); provider = new ethers[providerName]();
} }
@ -266,7 +266,7 @@ function testProvider(providerName, networkName) {
provider = ethers.getDefaultProvider(networkName); provider = ethers.getDefaultProvider(networkName);
} else if (providerName === 'Web3Provider') { } else if (providerName === 'Web3Provider') {
var infuraUrl = (new ethers.InfuraProvider(networkName)).connection.url; var infuraUrl = (new ethers.InfuraProvider(networkName)).connection.url;
provider = new ethers.Web3Provider(new web3.providers.HttpProvider(infuraUrl), networkName); provider = new ethers.Web3Provider(new Web3HttpProvider(infuraUrl), networkName);
} else { } else {
provider = new ethers[providerName](networkName); provider = new ethers[providerName](networkName);
} }
@ -361,10 +361,10 @@ function testProvider(providerName, networkName) {
['getDefaultProvider', 'InfuraProvider', 'EtherscanProvider', 'Web3Provider'].forEach(function(providerName) { ['getDefaultProvider', 'InfuraProvider', 'EtherscanProvider', 'Web3Provider'].forEach(function(providerName) {
// @TODO: Remove this! Temporary because Etherscan is down // @TODO: Remove this! Temporary because Etherscan is down
if (providerName === 'EtherscanProvider') { //if (providerName === 'EtherscanProvider') {
console.log("******** Remove this soon! Etherscan is having issues."); // console.log("******** Remove this soon! Etherscan is having issues.");
return; // return;
} //}
testProvider(providerName, networkName); testProvider(providerName, networkName);
}); });