Updated dist files.

This commit is contained in:
Richard Moore 2019-02-12 00:56:38 -05:00
parent 72edcd054f
commit 94b0abc240
No known key found for this signature in database
GPG Key ID: 525F70A6FCABC295
6 changed files with 54 additions and 38 deletions

42
dist/ethers.js vendored
View File

@ -10712,17 +10712,19 @@ var BaseProvider = /** @class */ (function (_super) {
if (confirmations == null) { if (confirmations == null) {
confirmations = 1; confirmations = 1;
} }
return web_1.poll(function () { if (confirmations === 0) {
return _this.getTransactionReceipt(transactionHash).then(function (receipt) { return this.getTransactionReceipt(transactionHash);
if (confirmations === 0) { }
return receipt; return new Promise(function (resolve) {
var handler = function (receipt) {
if (receipt.confirmations < confirmations) {
return;
} }
if (receipt == null || receipt.confirmations < confirmations) { _this.removeListener(transactionHash, handler);
return undefined; resolve(receipt);
} };
return receipt; _this.on(transactionHash, handler);
}); });
}, { onceBlock: this });
}; };
BaseProvider.prototype.getBlockNumber = function () { BaseProvider.prototype.getBlockNumber = function () {
var _this = this; var _this = this;
@ -11225,13 +11227,19 @@ var BaseProvider = /** @class */ (function (_super) {
}); });
}; };
BaseProvider.prototype.removeAllListeners = function (eventName) { BaseProvider.prototype.removeAllListeners = function (eventName) {
var eventTag = getEventTag(eventName); if (eventName == null) {
this._events = this._events.filter(function (event) { this._events = [];
return (event.tag !== eventTag);
});
if (eventName === 'pending') {
this._stopPending(); this._stopPending();
} }
else {
var eventTag_1 = getEventTag(eventName);
this._events = this._events.filter(function (event) {
return (event.tag !== eventTag_1);
});
if (eventName === 'pending') {
this._stopPending();
}
}
if (this._events.length === 0) { if (this._events.length === 0) {
this.polling = false; this.polling = false;
} }
@ -11241,13 +11249,13 @@ var BaseProvider = /** @class */ (function (_super) {
var found = false; var found = false;
var eventTag = getEventTag(eventName); var eventTag = getEventTag(eventName);
this._events = this._events.filter(function (event) { this._events = this._events.filter(function (event) {
if (event.tag !== eventTag) { if (event.tag !== eventTag || event.listener != listener) {
return true; return true;
} }
if (found) { if (found) {
return true; return true;
} }
found = false; found = true;
return false; return false;
}); });
if (eventName === 'pending' && this.listenerCount('pending') === 0) { if (eventName === 'pending' && this.listenerCount('pending') === 0) {

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

@ -784,7 +784,7 @@ declare module 'ethers/providers/base-provider' {
emit(eventName: EventType, ...args: Array<any>): boolean; emit(eventName: EventType, ...args: Array<any>): boolean;
listenerCount(eventName?: EventType): number; listenerCount(eventName?: EventType): number;
listeners(eventName: EventType): Array<Listener>; listeners(eventName: EventType): Array<Listener>;
removeAllListeners(eventName: EventType): Provider; removeAllListeners(eventName?: EventType): Provider;
removeListener(eventName: EventType, listener: Listener): Provider; removeListener(eventName: EventType, listener: Listener): Provider;
} }
} }

View File

@ -69,6 +69,6 @@ export declare class BaseProvider extends Provider {
emit(eventName: EventType, ...args: Array<any>): boolean; emit(eventName: EventType, ...args: Array<any>): boolean;
listenerCount(eventName?: EventType): number; listenerCount(eventName?: EventType): number;
listeners(eventName: EventType): Array<Listener>; listeners(eventName: EventType): Array<Listener>;
removeAllListeners(eventName: EventType): Provider; removeAllListeners(eventName?: EventType): Provider;
removeListener(eventName: EventType, listener: Listener): Provider; removeListener(eventName: EventType, listener: Listener): Provider;
} }

View File

@ -656,17 +656,19 @@ var BaseProvider = /** @class */ (function (_super) {
if (confirmations == null) { if (confirmations == null) {
confirmations = 1; confirmations = 1;
} }
return web_1.poll(function () { if (confirmations === 0) {
return _this.getTransactionReceipt(transactionHash).then(function (receipt) { return this.getTransactionReceipt(transactionHash);
if (confirmations === 0) { }
return receipt; return new Promise(function (resolve) {
var handler = function (receipt) {
if (receipt.confirmations < confirmations) {
return;
} }
if (receipt == null || receipt.confirmations < confirmations) { _this.removeListener(transactionHash, handler);
return undefined; resolve(receipt);
} };
return receipt; _this.on(transactionHash, handler);
}); });
}, { onceBlock: this });
}; };
BaseProvider.prototype.getBlockNumber = function () { BaseProvider.prototype.getBlockNumber = function () {
var _this = this; var _this = this;
@ -1169,13 +1171,19 @@ var BaseProvider = /** @class */ (function (_super) {
}); });
}; };
BaseProvider.prototype.removeAllListeners = function (eventName) { BaseProvider.prototype.removeAllListeners = function (eventName) {
var eventTag = getEventTag(eventName); if (eventName == null) {
this._events = this._events.filter(function (event) { this._events = [];
return (event.tag !== eventTag);
});
if (eventName === 'pending') {
this._stopPending(); this._stopPending();
} }
else {
var eventTag_1 = getEventTag(eventName);
this._events = this._events.filter(function (event) {
return (event.tag !== eventTag_1);
});
if (eventName === 'pending') {
this._stopPending();
}
}
if (this._events.length === 0) { if (this._events.length === 0) {
this.polling = false; this.polling = false;
} }
@ -1185,13 +1193,13 @@ var BaseProvider = /** @class */ (function (_super) {
var found = false; var found = false;
var eventTag = getEventTag(eventName); var eventTag = getEventTag(eventName);
this._events = this._events.filter(function (event) { this._events = this._events.filter(function (event) {
if (event.tag !== eventTag) { if (event.tag !== eventTag || event.listener != listener) {
return true; return true;
} }
if (found) { if (found) {
return true; return true;
} }
found = false; found = true;
return false; return false;
}); });
if (eventName === 'pending' && this.listenerCount('pending') === 0) { if (eventName === 'pending' && this.listenerCount('pending') === 0) {