@openzeppelin/upgrades-core 1.32.1 → 1.32.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/manifest.d.ts +1 -1
- package/dist/manifest.d.ts.map +1 -1
- package/dist/manifest.js +17 -9
- package/dist/manifest.js.map +1 -1
- package/dist/manifest.test.js +11 -2
- package/dist/manifest.test.js.map +1 -1
- package/dist/provider.d.ts +8 -2
- package/dist/provider.d.ts.map +1 -1
- package/dist/provider.js +8 -1
- package/dist/provider.js.map +1 -1
- package/package.json +2 -2
- package/src/manifest.test.ts +14 -2
- package/src/manifest.ts +27 -12
- package/src/provider.ts +11 -2
package/dist/manifest.d.ts
CHANGED
package/dist/manifest.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAMjB,MAAM,YAAY,CAAC;AAIpB,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAS/C,MAAM,WAAW,YAAY;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE;SACJ,OAAO,IAAI,MAAM,CAAC,CAAC,EAAE,cAAc,GAAG,kBAAkB;KAC1D,CAAC;IACF,OAAO,EAAE,CAAC,eAAe,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAClD,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,MAAM,EAAE,aAAa,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,QAAQ,CAAC;CACzC;AAsDD,UAAU,mBAAmB;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE;QAEd,OAAO,EAAE,MAAM,CAAC;KACjB,GAAG,IAAI,CAAC;CACV;AAED,qBAAa,QAAQ;IACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAW;IAEnC,OAAO,CAAC,MAAM,CAAS;WAEV,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;gBAU1D,OAAO,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,mBAAmB,EAAE,QAAQ,CAAC,EAAE,MAAM;IAuCnF,QAAQ,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAI3C,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAYlE,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAS9D,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YAYvC,MAAM;YASN,QAAQ;YAqBR,SAAS;YAKT,oBAAoB;IAU5B,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAoB7C,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxC,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;YAYtC,IAAI;CAWnB;AAgBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAUhE;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAEhD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,YAAY,GAAG,YAAY,CAOvE"}
|
package/dist/manifest.js
CHANGED
|
@@ -26,20 +26,28 @@ function defaultManifest() {
|
|
|
26
26
|
const MANIFEST_DEFAULT_DIR = '.openzeppelin';
|
|
27
27
|
const MANIFEST_TEMP_DIR = 'openzeppelin-upgrades';
|
|
28
28
|
async function getDevInstanceMetadata(provider, chainId) {
|
|
29
|
-
let
|
|
29
|
+
let networkMetadata;
|
|
30
|
+
let networkType;
|
|
30
31
|
try {
|
|
31
|
-
|
|
32
|
+
networkMetadata = await (0, provider_1.getAnvilMetadata)(provider);
|
|
33
|
+
networkType = 'anvil';
|
|
32
34
|
}
|
|
33
35
|
catch (e) {
|
|
34
|
-
|
|
36
|
+
try {
|
|
37
|
+
networkMetadata = await (0, provider_1.getHardhatMetadata)(provider);
|
|
38
|
+
networkType = 'hardhat';
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
35
43
|
}
|
|
36
|
-
if (
|
|
37
|
-
throw new Error(`Broken invariant: Hardhat metadata's chainId ${
|
|
44
|
+
if (networkMetadata.chainId !== chainId) {
|
|
45
|
+
throw new Error(`Broken invariant: Hardhat or Anvil metadata's chainId ${networkMetadata.chainId} does not match eth_chainId ${chainId}`);
|
|
38
46
|
}
|
|
39
47
|
return {
|
|
40
|
-
networkName:
|
|
41
|
-
instanceId:
|
|
42
|
-
forkedNetwork:
|
|
48
|
+
networkName: networkType,
|
|
49
|
+
instanceId: networkMetadata.instanceId,
|
|
50
|
+
forkedNetwork: networkMetadata.forkedNetwork,
|
|
43
51
|
};
|
|
44
52
|
}
|
|
45
53
|
function getSuffix(chainId, devInstanceMetadata) {
|
|
@@ -80,7 +88,7 @@ class Manifest {
|
|
|
80
88
|
this.fallbackFile = devFile;
|
|
81
89
|
}
|
|
82
90
|
(0, debug_1.default)('development manifest file:', this.file, 'fallback file:', this.fallbackFile);
|
|
83
|
-
if (devInstanceMetadata.forkedNetwork
|
|
91
|
+
if (devInstanceMetadata.forkedNetwork) {
|
|
84
92
|
const forkedChainId = devInstanceMetadata.forkedNetwork.chainId;
|
|
85
93
|
(0, debug_1.default)('forked network chain id:', forkedChainId);
|
|
86
94
|
this.parent = new Manifest(forkedChainId);
|
package/dist/manifest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,2BAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"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"}
|
package/dist/manifest.test.js
CHANGED
|
@@ -318,9 +318,18 @@ ava_1.default.serial('dev instance with known network id', async (t) => {
|
|
|
318
318
|
(0, ava_1.default)('manifest name for an unknown network, development instance, hardhat', t => {
|
|
319
319
|
const chainId = 31337;
|
|
320
320
|
const instanceId = '0x22223';
|
|
321
|
-
const devInstanceMetadata = { networkName: '
|
|
321
|
+
const devInstanceMetadata = { networkName: 'hardhat', instanceId: instanceId };
|
|
322
322
|
const manifest = new manifest_1.Manifest(chainId, devInstanceMetadata, '/tmp');
|
|
323
|
-
const expectedPath = `/tmp/openzeppelin-upgrades/
|
|
323
|
+
const expectedPath = `/tmp/openzeppelin-upgrades/hardhat-${chainId}-${instanceId}.json`;
|
|
324
|
+
t.is(manifest.file, expectedPath);
|
|
325
|
+
t.is(manifest.fallbackFile, `.openzeppelin/unknown-${chainId}.json`);
|
|
326
|
+
});
|
|
327
|
+
(0, ava_1.default)('manifest name for an unknown network, development instance, anvil - forkedNetwork null', t => {
|
|
328
|
+
const chainId = 31337;
|
|
329
|
+
const instanceId = '0x22224';
|
|
330
|
+
const devInstanceMetadata = { networkName: 'anvil', instanceId: instanceId, forkedNetwork: null };
|
|
331
|
+
const manifest = new manifest_1.Manifest(chainId, devInstanceMetadata, '/tmp');
|
|
332
|
+
const expectedPath = `/tmp/openzeppelin-upgrades/anvil-${chainId}-${instanceId}.json`;
|
|
324
333
|
t.is(manifest.file, expectedPath);
|
|
325
334
|
t.is(manifest.fallbackFile, `.openzeppelin/unknown-${chainId}.json`);
|
|
326
335
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.test.js","sourceRoot":"","sources":["../src/manifest.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"manifest.test.js","sourceRoot":"","sources":["../src/manifest.test.ts"],"names":[],"mappings":"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"}
|
package/dist/provider.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export interface EthereumProvider {
|
|
2
|
+
send(method: 'anvil_metadata', params: []): Promise<HardhatMetadata>;
|
|
2
3
|
send(method: 'hardhat_metadata', params: []): Promise<HardhatMetadata>;
|
|
3
4
|
send(method: 'web3_clientVersion', params: []): Promise<string>;
|
|
4
5
|
send(method: 'net_version', params: []): Promise<string>;
|
|
@@ -11,12 +12,13 @@ export interface EthereumProvider {
|
|
|
11
12
|
send(method: 'eth_getTransactionReceipt', params: [string]): Promise<null | EthereumTransactionReceipt>;
|
|
12
13
|
send(method: string, params: unknown[]): Promise<unknown>;
|
|
13
14
|
}
|
|
14
|
-
interface HardhatMetadata {
|
|
15
|
+
export interface HardhatMetadata {
|
|
16
|
+
clientVersion: string;
|
|
15
17
|
chainId: number;
|
|
16
18
|
instanceId: string;
|
|
17
19
|
forkedNetwork?: {
|
|
18
20
|
chainId: number;
|
|
19
|
-
};
|
|
21
|
+
} | null;
|
|
20
22
|
}
|
|
21
23
|
interface EthereumTransaction {
|
|
22
24
|
blockHash: string | null;
|
|
@@ -39,6 +41,10 @@ export declare function getClientVersion(provider: EthereumProvider): Promise<st
|
|
|
39
41
|
* The underlying provider will throw an error if this RPC method is not available.
|
|
40
42
|
*/
|
|
41
43
|
export declare function getHardhatMetadata(provider: EthereumProvider): Promise<HardhatMetadata>;
|
|
44
|
+
/**
|
|
45
|
+
* Anvil could have anvil_metadata, for which hardhat_metadata is an alias.
|
|
46
|
+
*/
|
|
47
|
+
export declare function getAnvilMetadata(provider: EthereumProvider): Promise<HardhatMetadata>;
|
|
42
48
|
export declare function getStorageAt(provider: EthereumProvider, address: string, position: string, block?: string): Promise<string>;
|
|
43
49
|
export declare function getCode(provider: EthereumProvider, address: string, block?: string): Promise<string>;
|
|
44
50
|
export declare function call(provider: EthereumProvider, address: string, data: string, block?: string): Promise<string>;
|
package/dist/provider.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACvE,IAAI,CAAC,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,EAAE,0BAA0B,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,mBAAmB,CAAC,CAAC;IAChG,IAAI,CAAC,MAAM,EAAE,2BAA2B,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,0BAA0B,CAAC,CAAC;IACxG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3D;AAED,
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/provider.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isReceiptSuccessful = exports.isDevelopmentNetwork = exports.networkNames = exports.getTransactionReceipt = exports.getTransactionByHash = exports.isEmpty = exports.hasCode = exports.call = exports.getCode = exports.getStorageAt = exports.getHardhatMetadata = exports.getClientVersion = exports.getChainId = exports.getNetworkId = void 0;
|
|
3
|
+
exports.isReceiptSuccessful = exports.isDevelopmentNetwork = exports.networkNames = exports.getTransactionReceipt = exports.getTransactionByHash = exports.isEmpty = exports.hasCode = exports.call = exports.getCode = exports.getStorageAt = exports.getAnvilMetadata = exports.getHardhatMetadata = exports.getClientVersion = exports.getChainId = exports.getNetworkId = void 0;
|
|
4
4
|
async function getNetworkId(provider) {
|
|
5
5
|
return provider.send('net_version', []);
|
|
6
6
|
}
|
|
@@ -22,6 +22,13 @@ async function getHardhatMetadata(provider) {
|
|
|
22
22
|
return provider.send('hardhat_metadata', []);
|
|
23
23
|
}
|
|
24
24
|
exports.getHardhatMetadata = getHardhatMetadata;
|
|
25
|
+
/**
|
|
26
|
+
* Anvil could have anvil_metadata, for which hardhat_metadata is an alias.
|
|
27
|
+
*/
|
|
28
|
+
async function getAnvilMetadata(provider) {
|
|
29
|
+
return provider.send('anvil_metadata', []);
|
|
30
|
+
}
|
|
31
|
+
exports.getAnvilMetadata = getAnvilMetadata;
|
|
25
32
|
async function getStorageAt(provider, address, position, block = 'latest') {
|
|
26
33
|
const storage = await provider.send('eth_getStorageAt', [address, position, block]);
|
|
27
34
|
const padded = storage.replace(/^0x/, '').padStart(64, '0');
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openzeppelin/upgrades-core",
|
|
3
|
-
"version": "1.32.
|
|
3
|
+
"version": "1.32.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": "https://github.com/OpenZeppelin/openzeppelin-upgrades/tree/master/packages/core",
|
|
6
6
|
"license": "MIT",
|
|
@@ -71,5 +71,5 @@
|
|
|
71
71
|
"proper-lockfile": "^4.1.1",
|
|
72
72
|
"solidity-ast": "^0.4.51"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "c9f518d4a2b31a179487db2f0210dae0e02230c9"
|
|
75
75
|
}
|
package/src/manifest.test.ts
CHANGED
|
@@ -399,11 +399,23 @@ test('manifest name for an unknown network, development instance, non hardhat',
|
|
|
399
399
|
test('manifest name for an unknown network, development instance, hardhat', t => {
|
|
400
400
|
const chainId = 31337;
|
|
401
401
|
const instanceId = '0x22223';
|
|
402
|
-
const devInstanceMetadata = { networkName: '
|
|
402
|
+
const devInstanceMetadata = { networkName: 'hardhat', instanceId: instanceId };
|
|
403
403
|
|
|
404
404
|
const manifest = new Manifest(chainId, devInstanceMetadata, '/tmp');
|
|
405
405
|
|
|
406
|
-
const expectedPath = `/tmp/openzeppelin-upgrades/
|
|
406
|
+
const expectedPath = `/tmp/openzeppelin-upgrades/hardhat-${chainId}-${instanceId}.json`;
|
|
407
|
+
t.is(manifest.file, expectedPath);
|
|
408
|
+
t.is(manifest.fallbackFile, `.openzeppelin/unknown-${chainId}.json`);
|
|
409
|
+
});
|
|
410
|
+
|
|
411
|
+
test('manifest name for an unknown network, development instance, anvil - forkedNetwork null', t => {
|
|
412
|
+
const chainId = 31337;
|
|
413
|
+
const instanceId = '0x22224';
|
|
414
|
+
const devInstanceMetadata = { networkName: 'anvil', instanceId: instanceId, forkedNetwork: null };
|
|
415
|
+
|
|
416
|
+
const manifest = new Manifest(chainId, devInstanceMetadata, '/tmp');
|
|
417
|
+
|
|
418
|
+
const expectedPath = `/tmp/openzeppelin-upgrades/anvil-${chainId}-${instanceId}.json`;
|
|
407
419
|
t.is(manifest.file, expectedPath);
|
|
408
420
|
t.is(manifest.fallbackFile, `.openzeppelin/unknown-${chainId}.json`);
|
|
409
421
|
});
|
package/src/manifest.ts
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
import os from 'os';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { promises as fs } from 'fs';
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
EthereumProvider,
|
|
6
|
+
HardhatMetadata,
|
|
7
|
+
getAnvilMetadata,
|
|
8
|
+
getChainId,
|
|
9
|
+
getHardhatMetadata,
|
|
10
|
+
networkNames,
|
|
11
|
+
} from './provider';
|
|
5
12
|
import lockfile from 'proper-lockfile';
|
|
6
13
|
import { compare as compareVersions } from 'compare-versions';
|
|
7
14
|
|
|
@@ -44,28 +51,36 @@ function defaultManifest(): ManifestData {
|
|
|
44
51
|
const MANIFEST_DEFAULT_DIR = '.openzeppelin';
|
|
45
52
|
const MANIFEST_TEMP_DIR = 'openzeppelin-upgrades';
|
|
46
53
|
|
|
54
|
+
type DevNetworkType = 'hardhat' | 'anvil';
|
|
55
|
+
|
|
47
56
|
async function getDevInstanceMetadata(
|
|
48
57
|
provider: EthereumProvider,
|
|
49
58
|
chainId: number,
|
|
50
59
|
): Promise<DevInstanceMetadata | undefined> {
|
|
51
|
-
let
|
|
52
|
-
|
|
60
|
+
let networkMetadata: HardhatMetadata;
|
|
61
|
+
let networkType: DevNetworkType;
|
|
53
62
|
try {
|
|
54
|
-
|
|
63
|
+
networkMetadata = await getAnvilMetadata(provider);
|
|
64
|
+
networkType = 'anvil';
|
|
55
65
|
} catch (e: unknown) {
|
|
56
|
-
|
|
66
|
+
try {
|
|
67
|
+
networkMetadata = await getHardhatMetadata(provider);
|
|
68
|
+
networkType = 'hardhat';
|
|
69
|
+
} catch (e: unknown) {
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
57
72
|
}
|
|
58
73
|
|
|
59
|
-
if (
|
|
74
|
+
if (networkMetadata.chainId !== chainId) {
|
|
60
75
|
throw new Error(
|
|
61
|
-
`Broken invariant: Hardhat metadata's chainId ${
|
|
76
|
+
`Broken invariant: Hardhat or Anvil metadata's chainId ${networkMetadata.chainId} does not match eth_chainId ${chainId}`,
|
|
62
77
|
);
|
|
63
78
|
}
|
|
64
79
|
|
|
65
80
|
return {
|
|
66
|
-
networkName:
|
|
67
|
-
instanceId:
|
|
68
|
-
forkedNetwork:
|
|
81
|
+
networkName: networkType,
|
|
82
|
+
instanceId: networkMetadata.instanceId,
|
|
83
|
+
forkedNetwork: networkMetadata.forkedNetwork,
|
|
69
84
|
};
|
|
70
85
|
}
|
|
71
86
|
|
|
@@ -83,7 +98,7 @@ interface DevInstanceMetadata {
|
|
|
83
98
|
forkedNetwork?: {
|
|
84
99
|
// The chainId of the network that is being forked
|
|
85
100
|
chainId: number;
|
|
86
|
-
};
|
|
101
|
+
} | null;
|
|
87
102
|
}
|
|
88
103
|
|
|
89
104
|
export class Manifest {
|
|
@@ -129,7 +144,7 @@ export class Manifest {
|
|
|
129
144
|
}
|
|
130
145
|
debug('development manifest file:', this.file, 'fallback file:', this.fallbackFile);
|
|
131
146
|
|
|
132
|
-
if (devInstanceMetadata.forkedNetwork
|
|
147
|
+
if (devInstanceMetadata.forkedNetwork) {
|
|
133
148
|
const forkedChainId = devInstanceMetadata.forkedNetwork.chainId;
|
|
134
149
|
debug('forked network chain id:', forkedChainId);
|
|
135
150
|
|
package/src/provider.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export interface EthereumProvider {
|
|
2
|
+
send(method: 'anvil_metadata', params: []): Promise<HardhatMetadata>;
|
|
2
3
|
send(method: 'hardhat_metadata', params: []): Promise<HardhatMetadata>;
|
|
3
4
|
send(method: 'web3_clientVersion', params: []): Promise<string>;
|
|
4
5
|
send(method: 'net_version', params: []): Promise<string>;
|
|
@@ -12,13 +13,14 @@ export interface EthereumProvider {
|
|
|
12
13
|
send(method: string, params: unknown[]): Promise<unknown>;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
|
-
interface HardhatMetadata {
|
|
16
|
+
export interface HardhatMetadata {
|
|
17
|
+
clientVersion: string;
|
|
16
18
|
chainId: number;
|
|
17
19
|
instanceId: string;
|
|
18
20
|
forkedNetwork?: {
|
|
19
21
|
// The chainId of the network that is being forked
|
|
20
22
|
chainId: number;
|
|
21
|
-
};
|
|
23
|
+
} | null;
|
|
22
24
|
}
|
|
23
25
|
|
|
24
26
|
interface EthereumTransaction {
|
|
@@ -57,6 +59,13 @@ export async function getHardhatMetadata(provider: EthereumProvider): Promise<Ha
|
|
|
57
59
|
return provider.send('hardhat_metadata', []);
|
|
58
60
|
}
|
|
59
61
|
|
|
62
|
+
/**
|
|
63
|
+
* Anvil could have anvil_metadata, for which hardhat_metadata is an alias.
|
|
64
|
+
*/
|
|
65
|
+
export async function getAnvilMetadata(provider: EthereumProvider): Promise<HardhatMetadata> {
|
|
66
|
+
return provider.send('anvil_metadata', []);
|
|
67
|
+
}
|
|
68
|
+
|
|
60
69
|
export async function getStorageAt(
|
|
61
70
|
provider: EthereumProvider,
|
|
62
71
|
address: string,
|