forked from tornado-packages/ethers.js
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd5e39edf8 | ||
|
|
9e94c03d01 | ||
|
|
278b388307 | ||
|
|
106f8a2109 | ||
|
|
f79c9655bd | ||
|
|
427e16826e | ||
|
|
fab14f8f5a | ||
|
|
e8c89d7ca9 | ||
|
|
b1c6575a1b | ||
|
|
3b7176f322 | ||
|
|
5f7ddcd5d7 | ||
|
|
4c9d740cdf | ||
|
|
a930047a10 | ||
|
|
4e41871fa4 | ||
|
|
9947acc349 | ||
|
|
748f89660a | ||
|
|
2987925fa5 | ||
|
|
0589b3102e | ||
|
|
df51b26fe7 |
45
CHANGELOG.md
45
CHANGELOG.md
@@ -1,6 +1,51 @@
|
||||
CHANGELOG
|
||||
=========
|
||||
|
||||
ethers/v4.0.49 (2021-07-19 23:23)
|
||||
---------------------------------
|
||||
|
||||
- Updated elliptic library. ([#1439](https://github.com/ethers-io/ethers.js/issues/1439), [#1782](https://github.com/ethers-io/ethers.js/issues/1782); [9e94c03](https://github.com/ethers-io/ethers.js/commit/9e94c03d01ba51ef9b7b0cec060cb5077dd1b2e7))
|
||||
|
||||
ethers/v4.0.48 (2020-08-24 15:44)
|
||||
---------------------------------
|
||||
|
||||
- Bumped elliptic version for security updates. ([f79c965](https://github.com/ethers-io/ethers.js/commit/f79c9655bdd13ada834a6af9f66f93851740a9ab))
|
||||
|
||||
ethers/v4.0.47 (2020-04-21 23:15)
|
||||
---------------------------------
|
||||
|
||||
- Fixed typo in error message. ([#778](https://github.com/ethers-io/ethers.js/issues/778); [fab14f8](https://github.com/ethers-io/ethers.js/commit/fab14f8f5a16091810bbe4d35f38e0b976adab7c)).
|
||||
- Allow receive type in ABI without warning. ([#746](https://github.com/ethers-io/ethers.js/issues/746); [e8c89d7](https://github.com/ethers-io/ethers.js/commit/e8c89d7ca9cea6e20281f614c4fb22f180114622)).
|
||||
|
||||
ethers/v4.0.46 (2020-03-14 16:56)
|
||||
---------------------------------
|
||||
|
||||
- Fixed typo in error. ([#722](https://github.com/ethers-io/ethers.js/issues/722); [3b7176f](https://github.com/ethers-io/ethers.js/commit/3b7176f322376f8f42c333082388ef56d1720bae)).
|
||||
- Fix EtherscanProvider from throwing outside async context. ([#729](https://github.com/ethers-io/ethers.js/issues/729); [5f7ddcd](https://github.com/ethers-io/ethers.js/commit/5f7ddcd5d71d8a1c9efbeef1232c34ef93f92e5a)).
|
||||
|
||||
ethers/v4.0.45 (2020-02-16 16:16)
|
||||
---------------------------------
|
||||
|
||||
- Added default API key for EtherscanProvider. ([a930047](https://github.com/ethers-io/ethers.js/commit/a930047a102d3369c4e847d7ef43bd850704cf00)).
|
||||
- Fixed typo in arguments name for waitForTransaction. ([#477](https://github.com/ethers-io/ethers.js/issues/477); [4e41871](https://github.com/ethers-io/ethers.js/commit/4e41871fa4cf701d714ad73527a367e9ca1d3431)).
|
||||
- Partial support for non-English mnemonics for encrypted JSON wallets. ([#685](https://github.com/ethers-io/ethers.js/issues/685); [9947acc](https://github.com/ethers-io/ethers.js/commit/9947acc349691734bce8b33d870ab48944a7962f)).
|
||||
- Updated expected balance in test cases. ([748f896](https://github.com/ethers-io/ethers.js/commit/748f89660ac4bf60175f936da755cf1a0d370f46)).
|
||||
|
||||
ethers/v4.0.44 (2020-01-29 22:01)
|
||||
---------------------------------
|
||||
|
||||
- Fix backwards compatibility with certain parsed JSON objects passed into Interface and Contracts ([#721](https://github.com/ethers-io/ethers.js/issues/721); [0589b31](https://github.com/ethers-io/ethers.js/commit/0589b3102e2da702f4ac19a32c8b083faa6bbeea)).
|
||||
- Updated ENS registry address for all networks ([df51b26](https://github.com/ethers-io/ethers.js/commit/df51b26fe71c33fb8aa610d95c4955647345ce0a)).
|
||||
|
||||
ethers/v4.0.43 (2020-01-10 21:14)
|
||||
---------------------------------
|
||||
|
||||
- Fixed Contract and Interface constructor abi paramter type; should be a Fragment not a ParamType ([#602](https://github.com/ethers-io/ethers.js/issues/602); [6da5c53](https://github.com/ethers-io/ethers.js/commit/6da5c531206777ceef98d111a12b050a04bdf49c)).
|
||||
- Add missing chainId to transaction responses ([#700](https://github.com/ethers-io/ethers.js/issues/700); [26d3271](https://github.com/ethers-io/ethers.js/commit/26d32716436cd8925a5278173ba72ad54e00eef8)).
|
||||
- Fix resolveName when name is an address with an invalid checksum ([#694](https://github.com/ethers-io/ethers.js/issues/694); [bd066b8](https://github.com/ethers-io/ethers.js/commit/bd066b85421b1d0e575180e0626fcfb70135caf0)).
|
||||
- Fixed testcases for PhantomJS syntax. ([447889](https://github.com/ethers-io/ethers.js/commit/4478896ca5e77be0e20d6d491a092da981ed5343))
|
||||
|
||||
|
||||
ethers/v4.0.42 (2020-01-03 18:35)
|
||||
---------------------------------
|
||||
|
||||
|
||||
2
_version.d.ts
vendored
2
_version.d.ts
vendored
@@ -1 +1 @@
|
||||
export declare const version = "4.0.43";
|
||||
export declare const version = "4.0.49";
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.version = "4.0.43";
|
||||
exports.version = "4.0.49";
|
||||
|
||||
6
contract.d.ts
vendored
6
contract.d.ts
vendored
@@ -4,7 +4,7 @@ import { UnsignedTransaction } from './utils/transaction';
|
||||
import { BlockTag, Provider } from './providers/abstract-provider';
|
||||
import { Signer } from './abstract-signer';
|
||||
import { Arrayish } from './utils/bytes';
|
||||
import { EventFragment, FunctionFragment } from './utils/abi-coder';
|
||||
import { EventFragment, FunctionFragment, ParamType } from './utils/abi-coder';
|
||||
import { Block, Listener, Log, TransactionReceipt, TransactionRequest, TransactionResponse } from './providers/abstract-provider';
|
||||
export declare type ContractFunction = (...params: Array<any>) => Promise<any>;
|
||||
export declare type EventFilter = {
|
||||
@@ -51,7 +51,7 @@ export declare class Contract {
|
||||
readonly addressPromise: Promise<string>;
|
||||
readonly deployTransaction: TransactionResponse;
|
||||
private _deployedPromise;
|
||||
constructor(addressOrName: string, contractInterface: Array<string | FunctionFragment | EventFragment> | string | Interface, signerOrProvider: Signer | Provider);
|
||||
constructor(addressOrName: string, contractInterface: Array<string | FunctionFragment | EventFragment | ParamType> | string | Interface, signerOrProvider: Signer | Provider);
|
||||
deployed(): Promise<Contract>;
|
||||
_deployed(blockTag?: BlockTag): Promise<Contract>;
|
||||
fallback(overrides?: TransactionRequest): Promise<TransactionResponse>;
|
||||
@@ -74,7 +74,7 @@ export declare class ContractFactory {
|
||||
readonly interface: Interface;
|
||||
readonly bytecode: string;
|
||||
readonly signer: Signer;
|
||||
constructor(contractInterface: Array<string | FunctionFragment | EventFragment> | string | Interface, bytecode: Arrayish | string | {
|
||||
constructor(contractInterface: Array<string | FunctionFragment | EventFragment | ParamType> | string | Interface, bytecode: Arrayish | string | {
|
||||
object: string;
|
||||
}, signer?: Signer);
|
||||
getDeployTransaction(...args: Array<any>): UnsignedTransaction;
|
||||
|
||||
@@ -256,6 +256,8 @@ var Contract = /** @class */ (function () {
|
||||
// https://github.com/Microsoft/TypeScript/issues/5453
|
||||
// Once this issue is resolved (there are open PR) we can do this nicer
|
||||
// by making addressOrName default to null for 2 operand calls. :)
|
||||
// ParamType is not actually correct here, but for legacy reasons,
|
||||
// we need it. See #721.
|
||||
function Contract(addressOrName, contractInterface, signerOrProvider) {
|
||||
var _this = this;
|
||||
errors.checkNew(this, Contract);
|
||||
@@ -602,6 +604,8 @@ var Contract = /** @class */ (function () {
|
||||
}());
|
||||
exports.Contract = Contract;
|
||||
var ContractFactory = /** @class */ (function () {
|
||||
// ParamType is not actually correct here, but for legacy reasons,
|
||||
// we need it. See #721.
|
||||
function ContractFactory(contractInterface, bytecode, signer) {
|
||||
var bytecodeHex = null;
|
||||
// Allow the bytecode object from the Solidity compiler
|
||||
|
||||
470
dist/ethers.js
vendored
470
dist/ethers.js
vendored
File diff suppressed because it is too large
Load Diff
2
dist/ethers.min.js
vendored
2
dist/ethers.min.js
vendored
File diff suppressed because one or more lines are too long
2
dist/ethers.min.js.map
vendored
2
dist/ethers.min.js.map
vendored
File diff suppressed because one or more lines are too long
13
dist/ethers.types.txt
vendored
13
dist/ethers.types.txt
vendored
@@ -29,7 +29,7 @@ declare module 'ethers/contract' {
|
||||
import { BlockTag, Provider } from 'ethers/providers/abstract-provider';
|
||||
import { Signer } from 'ethers/abstract-signer';
|
||||
import { Arrayish } from 'ethers/utils/bytes';
|
||||
import { EventFragment, FunctionFragment } from 'ethers/utils/abi-coder';
|
||||
import { EventFragment, FunctionFragment, ParamType } from 'ethers/utils/abi-coder';
|
||||
import { Block, Listener, Log, TransactionReceipt, TransactionRequest, TransactionResponse } from 'ethers/providers/abstract-provider';
|
||||
export type ContractFunction = (...params: Array<any>) => Promise<any>;
|
||||
export type EventFilter = {
|
||||
@@ -75,7 +75,7 @@ declare module 'ethers/contract' {
|
||||
readonly [name: string]: ContractFunction | any;
|
||||
readonly addressPromise: Promise<string>;
|
||||
readonly deployTransaction: TransactionResponse;
|
||||
constructor(addressOrName: string, contractInterface: Array<string | FunctionFragment | EventFragment> | string | Interface, signerOrProvider: Signer | Provider);
|
||||
constructor(addressOrName: string, contractInterface: Array<string | FunctionFragment | EventFragment | ParamType> | string | Interface, signerOrProvider: Signer | Provider);
|
||||
deployed(): Promise<Contract>;
|
||||
_deployed(blockTag?: BlockTag): Promise<Contract>;
|
||||
fallback(overrides?: TransactionRequest): Promise<TransactionResponse>;
|
||||
@@ -95,7 +95,7 @@ declare module 'ethers/contract' {
|
||||
readonly interface: Interface;
|
||||
readonly bytecode: string;
|
||||
readonly signer: Signer;
|
||||
constructor(contractInterface: Array<string | FunctionFragment | EventFragment> | string | Interface, bytecode: Arrayish | string | {
|
||||
constructor(contractInterface: Array<string | FunctionFragment | EventFragment | ParamType> | string | Interface, bytecode: Arrayish | string | {
|
||||
object: string;
|
||||
}, signer?: Signer);
|
||||
getDeployTransaction(...args: Array<any>): UnsignedTransaction;
|
||||
@@ -266,7 +266,7 @@ declare module 'ethers/utils/shims' {
|
||||
}
|
||||
|
||||
declare module 'ethers/_version' {
|
||||
export const version = "4.0.43";
|
||||
export const version = "4.0.49";
|
||||
}
|
||||
|
||||
declare module 'ethers/utils/bignumber' {
|
||||
@@ -400,7 +400,7 @@ declare module 'ethers/utils/interface' {
|
||||
[name: string]: _EventDescription;
|
||||
};
|
||||
readonly deployFunction: _DeployDescription;
|
||||
constructor(abi: Array<string | FunctionFragment | EventFragment> | string);
|
||||
constructor(abi: Array<string | FunctionFragment | EventFragment | ParamType> | string);
|
||||
parseTransaction(tx: {
|
||||
data: string;
|
||||
value?: BigNumberish;
|
||||
@@ -553,7 +553,7 @@ declare module 'ethers/providers/abstract-provider' {
|
||||
abstract listeners(eventName: EventType): Array<Listener>;
|
||||
abstract removeAllListeners(eventName: EventType): Provider;
|
||||
abstract removeListener(eventName: EventType, listener: Listener): Provider;
|
||||
abstract waitForTransaction(transactionHash: string, timeout?: number): Promise<TransactionReceipt>;
|
||||
abstract waitForTransaction(transactionHash: string, confirmations?: number): Promise<TransactionReceipt>;
|
||||
constructor();
|
||||
static isProvider(value: any): value is Provider;
|
||||
}
|
||||
@@ -710,6 +710,7 @@ declare module 'ethers/utils/secret-storage' {
|
||||
entropy?: Arrayish;
|
||||
mnemonic?: string;
|
||||
path?: string;
|
||||
wordlist?: any;
|
||||
client?: string;
|
||||
salt?: Arrayish;
|
||||
uuid?: string;
|
||||
|
||||
2
dist/shims.js
vendored
2
dist/shims.js
vendored
File diff suppressed because one or more lines are too long
2301
package-lock.json
generated
2301
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@@ -1,6 +1,10 @@
|
||||
{
|
||||
"name": "ethers",
|
||||
"version": "4.0.43",
|
||||
"version": "4.0.49",
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"tag": "legacy"
|
||||
},
|
||||
"description": "Ethereum wallet library.",
|
||||
"main": "./index.js",
|
||||
"types": "./index.d.ts",
|
||||
@@ -20,8 +24,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"aes-js": "3.0.0",
|
||||
"bn.js": "^4.4.0",
|
||||
"elliptic": "6.5.2",
|
||||
"bn.js": "^4.11.9",
|
||||
"elliptic": "6.5.4",
|
||||
"hash.js": "1.1.3",
|
||||
"js-sha3": "0.5.7",
|
||||
"scrypt-js": "2.0.4",
|
||||
@@ -30,7 +34,7 @@
|
||||
"xmlhttprequest": "1.8.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^10.3.2",
|
||||
"@types/node": "10.17.28",
|
||||
"browserify": "^16.2.3",
|
||||
"browserify-zlib": "^0.2.0",
|
||||
"dts-bundle": "^0.7.3",
|
||||
@@ -45,7 +49,7 @@
|
||||
"gulp-uglify": "^3.0.0",
|
||||
"mocha": "^5.2.0",
|
||||
"mocha-phantomjs-core": "2.1.2",
|
||||
"solc": "0.4.20",
|
||||
"solc": "^0.7.0",
|
||||
"tsify": "^4.0.0",
|
||||
"tslint": "^5.10.0",
|
||||
"typescript": "^2.9.1",
|
||||
|
||||
2
providers/abstract-provider.d.ts
vendored
2
providers/abstract-provider.d.ts
vendored
@@ -102,7 +102,7 @@ export declare abstract class Provider implements OnceBlockable {
|
||||
abstract listeners(eventName: EventType): Array<Listener>;
|
||||
abstract removeAllListeners(eventName: EventType): Provider;
|
||||
abstract removeListener(eventName: EventType, listener: Listener): Provider;
|
||||
abstract waitForTransaction(transactionHash: string, timeout?: number): Promise<TransactionReceipt>;
|
||||
abstract waitForTransaction(transactionHash: string, confirmations?: number): Promise<TransactionReceipt>;
|
||||
constructor();
|
||||
static isProvider(value: any): value is Provider;
|
||||
}
|
||||
|
||||
@@ -81,6 +81,7 @@ function checkLogTag(blockTag) {
|
||||
}
|
||||
return parseInt(blockTag.substring(2), 16);
|
||||
}
|
||||
var defaultApiKey = "8FG3JMZ9USS4NTA6YKEKHINU56SEPPVBJR";
|
||||
var EtherscanProvider = /** @class */ (function (_super) {
|
||||
__extends(EtherscanProvider, _super);
|
||||
function EtherscanProvider(network, apiKey) {
|
||||
@@ -111,7 +112,7 @@ var EtherscanProvider = /** @class */ (function (_super) {
|
||||
throw new Error('unsupported network');
|
||||
}
|
||||
properties_1.defineReadOnly(_this, 'baseUrl', baseUrl);
|
||||
properties_1.defineReadOnly(_this, 'apiKey', apiKey);
|
||||
properties_1.defineReadOnly(_this, 'apiKey', apiKey || defaultApiKey);
|
||||
return _this;
|
||||
}
|
||||
EtherscanProvider.prototype.perform = function (method, params) {
|
||||
@@ -189,7 +190,7 @@ var EtherscanProvider = /** @class */ (function (_super) {
|
||||
url += apiKey;
|
||||
return get(url);
|
||||
}
|
||||
throw new Error('getBlock by blockHash not implmeneted');
|
||||
return Promise.reject(new Error('getBlock by blockHash not implemeneted'));
|
||||
case 'getTransaction':
|
||||
url += '/api?module=proxy&action=eth_getTransactionByHash&txhash=' + params.transactionHash;
|
||||
url += apiKey;
|
||||
@@ -206,7 +207,7 @@ var EtherscanProvider = /** @class */ (function (_super) {
|
||||
url += '/api?module=proxy&action=eth_call' + transaction;
|
||||
//url += '&tag=' + params.blockTag + apiKey;
|
||||
if (params.blockTag !== 'latest') {
|
||||
throw new Error('EtherscanProvider does not support blockTag for call');
|
||||
return Promise.reject(new Error('EtherscanProvider does not support blockTag for call'));
|
||||
}
|
||||
url += apiKey;
|
||||
return get(url);
|
||||
|
||||
@@ -1 +1 @@
|
||||
export const version = "4.0.43";
|
||||
export const version = "4.0.49";
|
||||
|
||||
@@ -364,7 +364,9 @@ export class Contract {
|
||||
// Once this issue is resolved (there are open PR) we can do this nicer
|
||||
// by making addressOrName default to null for 2 operand calls. :)
|
||||
|
||||
constructor(addressOrName: string, contractInterface: Array<string | FunctionFragment | EventFragment> | string | Interface, signerOrProvider: Signer | Provider) {
|
||||
// ParamType is not actually correct here, but for legacy reasons,
|
||||
// we need it. See #721.
|
||||
constructor(addressOrName: string, contractInterface: Array<string | FunctionFragment | EventFragment | ParamType> | string | Interface, signerOrProvider: Signer | Provider) {
|
||||
errors.checkNew(this, Contract);
|
||||
|
||||
// @TODO: Maybe still check the addressOrName looks like a valid address or name?
|
||||
@@ -744,7 +746,9 @@ export class ContractFactory {
|
||||
readonly bytecode: string;
|
||||
readonly signer: Signer;
|
||||
|
||||
constructor(contractInterface: Array<string | FunctionFragment | EventFragment> | string | Interface, bytecode: Arrayish | string | { object: string }, signer?: Signer) {
|
||||
// ParamType is not actually correct here, but for legacy reasons,
|
||||
// we need it. See #721.
|
||||
constructor(contractInterface: Array<string | FunctionFragment | EventFragment | ParamType> | string | Interface, bytecode: Arrayish | string | { object: string }, signer?: Signer) {
|
||||
|
||||
let bytecodeHex: string = null;
|
||||
|
||||
|
||||
@@ -156,7 +156,7 @@ export abstract class Provider implements OnceBlockable {
|
||||
abstract removeListener(eventName: EventType, listener: Listener): Provider;
|
||||
|
||||
// @TODO: This *could* be implemented here, but would pull in events...
|
||||
abstract waitForTransaction(transactionHash: string, timeout?: number): Promise<TransactionReceipt>;
|
||||
abstract waitForTransaction(transactionHash: string, confirmations?: number): Promise<TransactionReceipt>;
|
||||
|
||||
constructor() {
|
||||
setType(this, 'Provider');
|
||||
|
||||
@@ -73,6 +73,7 @@ function checkLogTag(blockTag: string): number | "latest" {
|
||||
return parseInt(blockTag.substring(2), 16);
|
||||
}
|
||||
|
||||
const defaultApiKey = "8FG3JMZ9USS4NTA6YKEKHINU56SEPPVBJR";
|
||||
|
||||
export class EtherscanProvider extends BaseProvider{
|
||||
readonly baseUrl: string;
|
||||
@@ -106,7 +107,7 @@ export class EtherscanProvider extends BaseProvider{
|
||||
}
|
||||
|
||||
defineReadOnly(this, 'baseUrl', baseUrl);
|
||||
defineReadOnly(this, 'apiKey', apiKey);
|
||||
defineReadOnly(this, 'apiKey', apiKey || defaultApiKey);
|
||||
}
|
||||
|
||||
|
||||
@@ -193,7 +194,7 @@ export class EtherscanProvider extends BaseProvider{
|
||||
url += apiKey;
|
||||
return get(url);
|
||||
}
|
||||
throw new Error('getBlock by blockHash not implmeneted');
|
||||
return Promise.reject(new Error('getBlock by blockHash not implemeneted'));
|
||||
|
||||
case 'getTransaction':
|
||||
url += '/api?module=proxy&action=eth_getTransactionByHash&txhash=' + params.transactionHash;
|
||||
@@ -212,7 +213,7 @@ export class EtherscanProvider extends BaseProvider{
|
||||
url += '/api?module=proxy&action=eth_call' + transaction;
|
||||
//url += '&tag=' + params.blockTag + apiKey;
|
||||
if (params.blockTag !== 'latest') {
|
||||
throw new Error('EtherscanProvider does not support blockTag for call');
|
||||
return Promise.reject(new Error('EtherscanProvider does not support blockTag for call'));
|
||||
}
|
||||
url += apiKey;
|
||||
return get(url);
|
||||
|
||||
@@ -607,7 +607,7 @@ class CoderAddress extends Coder {
|
||||
}
|
||||
decode(data: Uint8Array, offset: number): DecodedResult {
|
||||
if (data.length < offset + 32) {
|
||||
errors.throwError('insufficuent data for address type', errors.INVALID_ARGUMENT, {
|
||||
errors.throwError('insufficient data for address type', errors.INVALID_ARGUMENT, {
|
||||
arg: this.localName,
|
||||
coderType: 'address',
|
||||
value: hexlify(data.slice(offset, offset + 32))
|
||||
|
||||
@@ -374,6 +374,7 @@ function addMethod(method: any): void {
|
||||
break;
|
||||
}
|
||||
|
||||
case "receive":
|
||||
case 'fallback':
|
||||
// Nothing to do for fallback
|
||||
break;
|
||||
@@ -390,7 +391,9 @@ export class Interface {
|
||||
readonly events: { [ name: string ]: _EventDescription };
|
||||
readonly deployFunction: _DeployDescription;
|
||||
|
||||
constructor(abi: Array<string | FunctionFragment | EventFragment> | string) {
|
||||
// ParamType is not actually correct here, but for legacy reasons,
|
||||
// we need it. See #721.
|
||||
constructor(abi: Array<string | FunctionFragment | EventFragment | ParamType> | string) {
|
||||
errors.checkNew(this, Interface);
|
||||
|
||||
if (typeof(abi) === 'string') {
|
||||
|
||||
@@ -46,14 +46,14 @@ function etcDefaultProvider(url: string, network: string): (providers: any) => a
|
||||
|
||||
const homestead: Network = {
|
||||
chainId: 1,
|
||||
ensAddress: "0x314159265dd8dbb310642f98f50c066173c1259b",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: "homestead",
|
||||
_defaultProvider: ethDefaultProvider('homestead')
|
||||
};
|
||||
|
||||
const ropsten: Network = {
|
||||
chainId: 3,
|
||||
ensAddress: "0x112234455c3a32fd11230c42e7bccd4a84e02010",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: "ropsten",
|
||||
_defaultProvider: ethDefaultProvider('ropsten')
|
||||
};
|
||||
@@ -77,14 +77,14 @@ const networks: { [name: string]: Network } = {
|
||||
|
||||
rinkeby: {
|
||||
chainId: 4,
|
||||
ensAddress: "0xe7410170f87102DF0055eB195163A03B7F2Bff4A",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: 'rinkeby',
|
||||
_defaultProvider: ethDefaultProvider('rinkeby')
|
||||
},
|
||||
|
||||
goerli: {
|
||||
chainId: 5,
|
||||
ensAddress: "0x112234455c3a32fd11230c42e7bccd4a84e02010",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: "goerli",
|
||||
_defaultProvider: ethDefaultProvider('goerli')
|
||||
},
|
||||
|
||||
@@ -26,6 +26,7 @@ export type EncryptOptions = {
|
||||
entropy?: Arrayish;
|
||||
mnemonic?: string;
|
||||
path?: string;
|
||||
wordlist?: any; // Should be a wordlist, but don't want to create the dependency
|
||||
client?: string;
|
||||
salt?: Arrayish;
|
||||
uuid?: string;
|
||||
@@ -177,7 +178,8 @@ export function decrypt(json: string, password: Arrayish, progressCallback?: Pro
|
||||
}
|
||||
|
||||
// Version 0.1 x-ethers metadata must contain an encrypted mnemonic phrase
|
||||
if (searchPath(data, 'x-ethers/version') === '0.1') {
|
||||
const locale = searchPath(data, 'x-ethers/locale');
|
||||
if (searchPath(data, 'x-ethers/version') === '0.1' && (locale == null || locale === "en")) {
|
||||
var mnemonicCiphertext = looseArrayify(searchPath(data, 'x-ethers/mnemonicCiphertext'));
|
||||
var mnemonicIv = looseArrayify(searchPath(data, 'x-ethers/mnemonicCounter'));
|
||||
|
||||
@@ -318,7 +320,7 @@ export function encrypt(privateKey: Arrayish | SigningKey, password: Arrayish |
|
||||
throw new Error('entropy and mnemonic mismatch');
|
||||
}
|
||||
} else {
|
||||
entropy = arrayify(HDNode.mnemonicToEntropy(options.mnemonic));
|
||||
entropy = arrayify(HDNode.mnemonicToEntropy(options.mnemonic, options.wordlist));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -441,6 +443,9 @@ export function encrypt(privateKey: Arrayish | SigningKey, password: Arrayish |
|
||||
path: path,
|
||||
version: "0.1"
|
||||
};
|
||||
if (options.wordlist && typeof(options.wordlist.locale) === "string") {
|
||||
data['x-ethers'].locale = options.wordlist.locale;
|
||||
}
|
||||
}
|
||||
|
||||
if (progressCallback) { progressCallback(1); }
|
||||
|
||||
@@ -14,7 +14,7 @@ var blockchainData = {
|
||||
homestead: {
|
||||
balance: {
|
||||
address: '0xAC1639CF97a3A46D431e6d1216f576622894cBB5',
|
||||
balance: bigNumberify('4918774100000000')
|
||||
balance: bigNumberify('0x1119c64d965d00')
|
||||
},
|
||||
block3: {
|
||||
hash: '0x3d6122660cc824376f11ee842f83addc3525e2dd6756b9bcf0affa6aa88cf741',
|
||||
@@ -393,6 +393,15 @@ function testProvider(providerName, networkName) {
|
||||
});
|
||||
}
|
||||
|
||||
if (networkName === "homestead") {
|
||||
it('fetches ENS names', function() {
|
||||
this.timeout(20000);
|
||||
return provider.resolveName("ricmoo.firefly.eth").then(function(address) {
|
||||
assert.equal(address, "0x8ba1f109551bD432803012645Ac136ddd64DBA72");
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// Obviously many more cases to add here
|
||||
// - getTransactionCount
|
||||
// - getCode
|
||||
|
||||
@@ -514,7 +514,7 @@ var CoderAddress = /** @class */ (function (_super) {
|
||||
};
|
||||
CoderAddress.prototype.decode = function (data, offset) {
|
||||
if (data.length < offset + 32) {
|
||||
errors.throwError('insufficuent data for address type', errors.INVALID_ARGUMENT, {
|
||||
errors.throwError('insufficient data for address type', errors.INVALID_ARGUMENT, {
|
||||
arg: this.localName,
|
||||
coderType: 'address',
|
||||
value: bytes_1.hexlify(data.slice(offset, offset + 32))
|
||||
|
||||
2
utils/interface.d.ts
vendored
2
utils/interface.d.ts
vendored
@@ -98,7 +98,7 @@ export declare class Interface {
|
||||
[name: string]: _EventDescription;
|
||||
};
|
||||
readonly deployFunction: _DeployDescription;
|
||||
constructor(abi: Array<string | FunctionFragment | EventFragment> | string);
|
||||
constructor(abi: Array<string | FunctionFragment | EventFragment | ParamType> | string);
|
||||
parseTransaction(tx: {
|
||||
data: string;
|
||||
value?: BigNumberish;
|
||||
|
||||
@@ -294,6 +294,7 @@ function addMethod(method) {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "receive":
|
||||
case 'fallback':
|
||||
// Nothing to do for fallback
|
||||
break;
|
||||
@@ -303,6 +304,8 @@ function addMethod(method) {
|
||||
}
|
||||
}
|
||||
var Interface = /** @class */ (function () {
|
||||
// ParamType is not actually correct here, but for legacy reasons,
|
||||
// we need it. See #721.
|
||||
function Interface(abi) {
|
||||
errors.checkNew(this, Interface);
|
||||
if (typeof (abi) === 'string') {
|
||||
|
||||
@@ -37,13 +37,13 @@ function etcDefaultProvider(url, network) {
|
||||
}
|
||||
var homestead = {
|
||||
chainId: 1,
|
||||
ensAddress: "0x314159265dd8dbb310642f98f50c066173c1259b",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: "homestead",
|
||||
_defaultProvider: ethDefaultProvider('homestead')
|
||||
};
|
||||
var ropsten = {
|
||||
chainId: 3,
|
||||
ensAddress: "0x112234455c3a32fd11230c42e7bccd4a84e02010",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: "ropsten",
|
||||
_defaultProvider: ethDefaultProvider('ropsten')
|
||||
};
|
||||
@@ -62,13 +62,13 @@ var networks = {
|
||||
testnet: ropsten,
|
||||
rinkeby: {
|
||||
chainId: 4,
|
||||
ensAddress: "0xe7410170f87102DF0055eB195163A03B7F2Bff4A",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: 'rinkeby',
|
||||
_defaultProvider: ethDefaultProvider('rinkeby')
|
||||
},
|
||||
goerli: {
|
||||
chainId: 5,
|
||||
ensAddress: "0x112234455c3a32fd11230c42e7bccd4a84e02010",
|
||||
ensAddress: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
|
||||
name: "goerli",
|
||||
_defaultProvider: ethDefaultProvider('goerli')
|
||||
},
|
||||
|
||||
1
utils/secret-storage.d.ts
vendored
1
utils/secret-storage.d.ts
vendored
@@ -6,6 +6,7 @@ export declare type EncryptOptions = {
|
||||
entropy?: Arrayish;
|
||||
mnemonic?: string;
|
||||
path?: string;
|
||||
wordlist?: any;
|
||||
client?: string;
|
||||
salt?: Arrayish;
|
||||
uuid?: string;
|
||||
|
||||
@@ -130,7 +130,8 @@ function decrypt(json, password, progressCallback) {
|
||||
return null;
|
||||
}
|
||||
// Version 0.1 x-ethers metadata must contain an encrypted mnemonic phrase
|
||||
if (searchPath(data, 'x-ethers/version') === '0.1') {
|
||||
var locale = searchPath(data, 'x-ethers/locale');
|
||||
if (searchPath(data, 'x-ethers/version') === '0.1' && (locale == null || locale === "en")) {
|
||||
var mnemonicCiphertext = looseArrayify(searchPath(data, 'x-ethers/mnemonicCiphertext'));
|
||||
var mnemonicIv = looseArrayify(searchPath(data, 'x-ethers/mnemonicCounter'));
|
||||
var mnemonicCounter = new aes_js_1.default.Counter(mnemonicIv);
|
||||
@@ -262,7 +263,7 @@ function encrypt(privateKey, password, options, progressCallback) {
|
||||
}
|
||||
}
|
||||
else {
|
||||
entropy = bytes_1.arrayify(HDNode.mnemonicToEntropy(options.mnemonic));
|
||||
entropy = bytes_1.arrayify(HDNode.mnemonicToEntropy(options.mnemonic, options.wordlist));
|
||||
}
|
||||
}
|
||||
var path = options.path;
|
||||
@@ -387,6 +388,9 @@ function encrypt(privateKey, password, options, progressCallback) {
|
||||
path: path,
|
||||
version: "0.1"
|
||||
};
|
||||
if (options.wordlist && typeof (options.wordlist.locale) === "string") {
|
||||
data['x-ethers'].locale = options.wordlist.locale;
|
||||
}
|
||||
}
|
||||
if (progressCallback) {
|
||||
progressCallback(1);
|
||||
|
||||
Reference in New Issue
Block a user