hardhat 2.11.1 → 2.11.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/internal/cli/cli.js +4 -2
- package/internal/cli/cli.js.map +1 -1
- package/internal/cli/project-creation.d.ts +1 -0
- package/internal/cli/project-creation.d.ts.map +1 -1
- package/internal/cli/project-creation.js +10 -8
- package/internal/cli/project-creation.js.map +1 -1
- package/internal/core/jsonrpc/types/base-types.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/base-types.js +15 -5
- package/internal/core/jsonrpc/types/base-types.js.map +1 -1
- package/internal/core/params/hardhat-params.js +1 -1
- package/internal/core/params/hardhat-params.js.map +1 -1
- package/internal/hardhat-network/provider/node.d.ts +0 -1
- package/internal/hardhat-network/provider/node.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.js +8 -10
- package/internal/hardhat-network/provider/node.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.js +1 -3
- package/internal/hardhat-network/provider/utils/makeForkClient.js.map +1 -1
- package/internal/hardhat-network/stack-traces/constants.d.ts +1 -1
- package/internal/hardhat-network/stack-traces/constants.js +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.js +1 -23
- package/internal/hardhat-network/stack-traces/error-inferrer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts +1 -1
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.js +7 -0
- package/internal/hardhat-network/stack-traces/solidityTracer.js.map +1 -1
- package/package.json +11 -11
- package/sample-projects/javascript/README.md +1 -1
- package/sample-projects/javascript/hardhat.config.js +1 -1
- package/sample-projects/typescript/README.md +1 -1
- package/sample-projects/typescript/hardhat.config.ts +1 -1
- package/src/internal/cli/cli.ts +5 -2
- package/src/internal/cli/project-creation.ts +10 -11
- package/src/internal/core/jsonrpc/types/base-types.ts +23 -9
- package/src/internal/core/params/hardhat-params.ts +1 -1
- package/src/internal/hardhat-network/provider/node.ts +10 -18
- package/src/internal/hardhat-network/provider/utils/makeForkClient.ts +1 -3
- package/src/internal/hardhat-network/stack-traces/constants.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/error-inferrer.ts +1 -30
- package/src/internal/hardhat-network/stack-traces/solidity-errors.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/solidityTracer.ts +8 -0
- package/src/types/config.ts +1 -1
- package/types/config.d.ts +1 -1
- package/types/config.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solidity-stack-trace.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"solidity-stack-trace.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solidityTracer.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidityTracer.ts"],"names":[],"mappings":"AAYA,OAAO,EAWL,YAAY,EAEb,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,kBAAkB,EAGnB,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,cAAc;IACzB,OAAO,CAAC,cAAc,CAAuB;IAEtC,aAAa,CAClB,wBAAwB,EAAE,YAAY,GACrC,kBAAkB;IAoBrB,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,iCAAiC;
|
|
1
|
+
{"version":3,"file":"solidityTracer.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidityTracer.ts"],"names":[],"mappings":"AAYA,OAAO,EAWL,YAAY,EAEb,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,kBAAkB,EAGnB,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,cAAc;IACzB,OAAO,CAAC,cAAc,CAAuB;IAEtC,aAAa,CAClB,wBAAwB,EAAE,YAAY,GACrC,kBAAkB;IAoBrB,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,iCAAiC;IA2DzC,OAAO,CAAC,2BAA2B;IAanC,OAAO,CAAC,+BAA+B;IAWvC,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,qBAAqB;IAkE7B,OAAO,CAAC,gBAAgB;CAazB"}
|
|
@@ -57,6 +57,13 @@ class SolidityTracer {
|
|
|
57
57
|
return [unrecognizedEntry, ...this.getStackTrace(subtrace)];
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
+
if (trace.error?.error === exceptions_1.ERROR.CODESIZE_EXCEEDS_MAXIMUM) {
|
|
61
|
+
return [
|
|
62
|
+
{
|
|
63
|
+
type: solidity_stack_trace_1.StackTraceEntryType.CONTRACT_TOO_LARGE_ERROR,
|
|
64
|
+
},
|
|
65
|
+
];
|
|
66
|
+
}
|
|
60
67
|
const isInvalidOpcodeError = trace.error?.error === exceptions_1.ERROR.INVALID_OPCODE;
|
|
61
68
|
if ((0, message_trace_1.isCreateTrace)(trace)) {
|
|
62
69
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solidityTracer.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidityTracer.ts"],"names":[],"mappings":";;;AAAA,gFAAwE;AACxE,yDAAqD;AAErD,qDAI0B;AAC1B,iHAGwD;AACxD,mDAayB;AACzB,mCAAgD;AAChD,uCAAmC;AACnC,iEAIgC;AAEhC,MAAa,cAAc;IAA3B;QACU,mBAAc,GAAG,IAAI,8BAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"solidityTracer.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidityTracer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "hardhat",
|
|
3
|
-
"version": "2.11.
|
|
3
|
+
"version": "2.11.2",
|
|
4
4
|
"author": "Nomic Labs LLC",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://hardhat.org",
|
|
@@ -99,16 +99,16 @@
|
|
|
99
99
|
"dependencies": {
|
|
100
100
|
"@ethersproject/abi": "^5.1.2",
|
|
101
101
|
"@metamask/eth-sig-util": "^4.0.0",
|
|
102
|
-
"@nomicfoundation/ethereumjs-block": "^4.0.0
|
|
103
|
-
"@nomicfoundation/ethereumjs-blockchain": "^6.0.0
|
|
104
|
-
"@nomicfoundation/ethereumjs-common": "^3.0.0
|
|
105
|
-
"@nomicfoundation/ethereumjs-evm": "^1.0.0
|
|
106
|
-
"@nomicfoundation/ethereumjs-rlp": "^4.0.0
|
|
107
|
-
"@nomicfoundation/ethereumjs-statemanager": "^1.0.0
|
|
108
|
-
"@nomicfoundation/ethereumjs-trie": "^5.0.0
|
|
109
|
-
"@nomicfoundation/ethereumjs-tx": "^4.0.0
|
|
110
|
-
"@nomicfoundation/ethereumjs-util": "^8.0.0
|
|
111
|
-
"@nomicfoundation/ethereumjs-vm": "^6.0.0
|
|
102
|
+
"@nomicfoundation/ethereumjs-block": "^4.0.0",
|
|
103
|
+
"@nomicfoundation/ethereumjs-blockchain": "^6.0.0",
|
|
104
|
+
"@nomicfoundation/ethereumjs-common": "^3.0.0",
|
|
105
|
+
"@nomicfoundation/ethereumjs-evm": "^1.0.0",
|
|
106
|
+
"@nomicfoundation/ethereumjs-rlp": "^4.0.0",
|
|
107
|
+
"@nomicfoundation/ethereumjs-statemanager": "^1.0.0",
|
|
108
|
+
"@nomicfoundation/ethereumjs-trie": "^5.0.0",
|
|
109
|
+
"@nomicfoundation/ethereumjs-tx": "^4.0.0",
|
|
110
|
+
"@nomicfoundation/ethereumjs-util": "^8.0.0",
|
|
111
|
+
"@nomicfoundation/ethereumjs-vm": "^6.0.0",
|
|
112
112
|
"@nomicfoundation/solidity-analyzer": "^0.0.3",
|
|
113
113
|
"@sentry/node": "^5.18.1",
|
|
114
114
|
"@types/bn.js": "^5.1.0",
|
package/src/internal/cli/cli.ts
CHANGED
|
@@ -50,6 +50,7 @@ import {
|
|
|
50
50
|
const log = debug("hardhat:core:cli");
|
|
51
51
|
|
|
52
52
|
const ANALYTICS_SLOW_TASK_THRESHOLD = 300;
|
|
53
|
+
const SHOULD_SHOW_STACK_TRACES_BY_DEFAULT = isRunningOnCiServer();
|
|
53
54
|
|
|
54
55
|
async function printVersionMessage(packageJson: PackageJson) {
|
|
55
56
|
console.log(packageJson.version);
|
|
@@ -106,7 +107,9 @@ async function suggestInstallingHardhatVscode() {
|
|
|
106
107
|
async function main() {
|
|
107
108
|
// We first accept this argument anywhere, so we know if the user wants
|
|
108
109
|
// stack traces before really parsing the arguments.
|
|
109
|
-
let showStackTraces =
|
|
110
|
+
let showStackTraces =
|
|
111
|
+
process.argv.includes("--show-stack-traces") ||
|
|
112
|
+
SHOULD_SHOW_STACK_TRACES_BY_DEFAULT;
|
|
110
113
|
|
|
111
114
|
try {
|
|
112
115
|
const packageJson = await getPackageJson();
|
|
@@ -328,7 +331,7 @@ async function main() {
|
|
|
328
331
|
log("Couldn't report error to sentry: %O", e);
|
|
329
332
|
}
|
|
330
333
|
|
|
331
|
-
if (showStackTraces) {
|
|
334
|
+
if (showStackTraces || SHOULD_SHOW_STACK_TRACES_BY_DEFAULT) {
|
|
332
335
|
console.error(error);
|
|
333
336
|
} else {
|
|
334
337
|
if (!isHardhatError) {
|
|
@@ -36,11 +36,11 @@ type SampleProjectTypeCreationAction =
|
|
|
36
36
|
const HARDHAT_PACKAGE_NAME = "hardhat";
|
|
37
37
|
|
|
38
38
|
const PROJECT_DEPENDENCIES: Dependencies = {
|
|
39
|
-
"@nomicfoundation/hardhat-toolbox": "^
|
|
39
|
+
"@nomicfoundation/hardhat-toolbox": "^2.0.0",
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
const PEER_DEPENDENCIES: Dependencies = {
|
|
43
|
-
hardhat: "^2.
|
|
43
|
+
hardhat: "^2.11.1",
|
|
44
44
|
"@nomicfoundation/hardhat-network-helpers": "^1.0.0",
|
|
45
45
|
"@nomicfoundation/hardhat-chai-matchers": "^1.0.0",
|
|
46
46
|
"@nomiclabs/hardhat-ethers": "^2.0.0",
|
|
@@ -48,7 +48,7 @@ const PEER_DEPENDENCIES: Dependencies = {
|
|
|
48
48
|
chai: "^4.2.0",
|
|
49
49
|
ethers: "^5.4.7",
|
|
50
50
|
"hardhat-gas-reporter": "^1.0.8",
|
|
51
|
-
"solidity-coverage": "^0.
|
|
51
|
+
"solidity-coverage": "^0.8.0",
|
|
52
52
|
"@typechain/hardhat": "^6.1.2",
|
|
53
53
|
typechain: "^8.1.0",
|
|
54
54
|
"@typechain/ethers-v5": "^10.1.0",
|
|
@@ -180,16 +180,15 @@ async function printRecommendedDepsInstallationInstructions(
|
|
|
180
180
|
console.log(` ${cmd.join(" ")}`);
|
|
181
181
|
}
|
|
182
182
|
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
"hardhat.config.js",
|
|
186
|
-
`/** @type import('hardhat/config').HardhatUserConfig */
|
|
183
|
+
// exported so we can test that it uses the latest supported version of solidity
|
|
184
|
+
export const EMPTY_HARDHAT_CONFIG = `/** @type import('hardhat/config').HardhatUserConfig */
|
|
187
185
|
module.exports = {
|
|
188
|
-
solidity: "0.8.
|
|
186
|
+
solidity: "0.8.17",
|
|
189
187
|
};
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
188
|
+
`;
|
|
189
|
+
|
|
190
|
+
async function writeEmptyHardhatConfig() {
|
|
191
|
+
return fsExtra.writeFile("hardhat.config.js", EMPTY_HARDHAT_CONFIG, "utf-8");
|
|
193
192
|
}
|
|
194
193
|
|
|
195
194
|
async function getAction(): Promise<Action> {
|
|
@@ -49,23 +49,37 @@ function validateStorageSlot(u: unknown, c: t.Context): t.Validation<bigint> {
|
|
|
49
49
|
);
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
if (u
|
|
53
|
-
return t.failure(
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
)
|
|
52
|
+
if (u === "") {
|
|
53
|
+
return t.failure(u, c, "Storage slot argument cannot be an empty string");
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
if (u.startsWith("0x")) {
|
|
57
|
+
if (u.length > 66) {
|
|
58
|
+
return t.failure(
|
|
59
|
+
u,
|
|
60
|
+
c,
|
|
61
|
+
`Storage slot argument must have a length of at most 66 ("0x" + 32 bytes), but '${u}' has a length of ${u.length}`
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
} else {
|
|
65
|
+
if (u.length > 64) {
|
|
66
|
+
return t.failure(
|
|
67
|
+
u,
|
|
68
|
+
c,
|
|
69
|
+
`Storage slot argument must have a length of at most 64 (32 bytes), but '${u}' has a length of ${u.length}`
|
|
70
|
+
);
|
|
71
|
+
}
|
|
58
72
|
}
|
|
59
73
|
|
|
60
|
-
if (u.
|
|
74
|
+
if (u.match(/^(0x)?([0-9a-fA-F]){0,64}$/) === null) {
|
|
61
75
|
return t.failure(
|
|
62
76
|
u,
|
|
63
77
|
c,
|
|
64
|
-
`Storage slot argument must
|
|
78
|
+
`Storage slot argument must be a valid hexadecimal, got '${u}'`
|
|
65
79
|
);
|
|
66
80
|
}
|
|
67
81
|
|
|
68
|
-
return t.success(BigInt(u));
|
|
82
|
+
return t.success(u === "0x" ? 0n : BigInt(u.startsWith("0x") ? u : `0x${u}`));
|
|
69
83
|
}
|
|
70
84
|
|
|
71
85
|
export const rpcAddress = new t.Type<Buffer>(
|
|
@@ -15,7 +15,7 @@ export const HARDHAT_PARAM_DEFINITIONS: HardhatParamDefinitions = {
|
|
|
15
15
|
showStackTraces: {
|
|
16
16
|
name: "showStackTraces",
|
|
17
17
|
defaultValue: false,
|
|
18
|
-
description: "Show stack traces.",
|
|
18
|
+
description: "Show stack traces (always enabled on CI servers).",
|
|
19
19
|
type: types.boolean,
|
|
20
20
|
isFlag: true,
|
|
21
21
|
isOptional: true,
|
|
@@ -70,10 +70,7 @@ import {
|
|
|
70
70
|
encodeSolidityStackTrace,
|
|
71
71
|
SolidityError,
|
|
72
72
|
} from "../stack-traces/solidity-errors";
|
|
73
|
-
import {
|
|
74
|
-
SolidityStackTrace,
|
|
75
|
-
StackTraceEntryType,
|
|
76
|
-
} from "../stack-traces/solidity-stack-trace";
|
|
73
|
+
import { SolidityStackTrace } from "../stack-traces/solidity-stack-trace";
|
|
77
74
|
import { SolidityTracer } from "../stack-traces/solidityTracer";
|
|
78
75
|
import { VMDebugTracer } from "../stack-traces/vm-debug-tracer";
|
|
79
76
|
import { VmTraceDecoder } from "../stack-traces/vm-trace-decoder";
|
|
@@ -1821,7 +1818,7 @@ Hardhat Network's forking functionality only works with blocks from at least spu
|
|
|
1821
1818
|
receipts,
|
|
1822
1819
|
stateRoot: block.header.stateRoot,
|
|
1823
1820
|
logsBloom: block.header.logsBloom,
|
|
1824
|
-
|
|
1821
|
+
receiptsRoot: block.header.receiptTrie,
|
|
1825
1822
|
gasUsed: block.header.gasUsed,
|
|
1826
1823
|
},
|
|
1827
1824
|
traces,
|
|
@@ -1947,11 +1944,8 @@ Hardhat Network's forking functionality only works with blocks from at least spu
|
|
|
1947
1944
|
throw error;
|
|
1948
1945
|
}
|
|
1949
1946
|
|
|
1950
|
-
if (error.error === ERROR.
|
|
1951
|
-
if (
|
|
1952
|
-
stackTrace !== undefined &&
|
|
1953
|
-
this._isContractTooLargeStackTrace(stackTrace)
|
|
1954
|
-
) {
|
|
1947
|
+
if (error.error === ERROR.CODESIZE_EXCEEDS_MAXIMUM) {
|
|
1948
|
+
if (stackTrace !== undefined) {
|
|
1955
1949
|
return encodeSolidityStackTrace(
|
|
1956
1950
|
"Transaction ran out of gas",
|
|
1957
1951
|
stackTrace
|
|
@@ -1961,6 +1955,12 @@ Hardhat Network's forking functionality only works with blocks from at least spu
|
|
|
1961
1955
|
return new TransactionExecutionError("Transaction ran out of gas");
|
|
1962
1956
|
}
|
|
1963
1957
|
|
|
1958
|
+
if (error.error === ERROR.OUT_OF_GAS) {
|
|
1959
|
+
// if the error is an out of gas, we ignore the inferred error in the
|
|
1960
|
+
// trace
|
|
1961
|
+
return new TransactionExecutionError("Transaction ran out of gas");
|
|
1962
|
+
}
|
|
1963
|
+
|
|
1964
1964
|
const returnData = new ReturnData(vmResult.returnValue);
|
|
1965
1965
|
|
|
1966
1966
|
let returnDataExplanation;
|
|
@@ -1997,14 +1997,6 @@ Hardhat Network's forking functionality only works with blocks from at least spu
|
|
|
1997
1997
|
);
|
|
1998
1998
|
}
|
|
1999
1999
|
|
|
2000
|
-
private _isContractTooLargeStackTrace(stackTrace: SolidityStackTrace) {
|
|
2001
|
-
return (
|
|
2002
|
-
stackTrace.length > 0 &&
|
|
2003
|
-
stackTrace[stackTrace.length - 1].type ===
|
|
2004
|
-
StackTraceEntryType.CONTRACT_TOO_LARGE_ERROR
|
|
2005
|
-
);
|
|
2006
|
-
}
|
|
2007
|
-
|
|
2008
2000
|
private _calculateTimestampAndOffset(
|
|
2009
2001
|
timestamp?: bigint
|
|
2010
2002
|
): [bigint, boolean, bigint] {
|
|
@@ -78,9 +78,7 @@ Please use block number ${lastSafeBlock} or wait for the block to get ${
|
|
|
78
78
|
const forkBlockTimestamp = rpcQuantityToNumber(block.timestamp) * 1000;
|
|
79
79
|
|
|
80
80
|
const cacheToDiskEnabled =
|
|
81
|
-
forkConfig.blockNumber !== undefined &&
|
|
82
|
-
forkCachePath !== undefined &&
|
|
83
|
-
actualMaxReorg !== undefined;
|
|
81
|
+
forkConfig.blockNumber !== undefined && forkCachePath !== undefined;
|
|
84
82
|
|
|
85
83
|
const forkClient = new JsonRpcClient(
|
|
86
84
|
provider,
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.
|
|
1
|
+
export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.17";
|
|
2
2
|
export const FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
|
|
@@ -49,8 +49,6 @@ const FIRST_SOLC_VERSION_CREATE_PARAMS_VALIDATION = "0.5.9";
|
|
|
49
49
|
const FIRST_SOLC_VERSION_RECEIVE_FUNCTION = "0.6.0";
|
|
50
50
|
const FIRST_SOLC_VERSION_WITH_UNMAPPED_REVERTS = "0.6.3";
|
|
51
51
|
|
|
52
|
-
const EIP170_BYTECODE_SIZE_INCLUSIVE_LIMIT = 0x6000;
|
|
53
|
-
|
|
54
52
|
export interface SubmessageData {
|
|
55
53
|
messageTrace: MessageTrace;
|
|
56
54
|
stacktrace: SolidityStackTrace;
|
|
@@ -1376,34 +1374,7 @@ export class ErrorInferrer {
|
|
|
1376
1374
|
}
|
|
1377
1375
|
|
|
1378
1376
|
private _isContractTooLargeError(trace: DecodedCreateMessageTrace) {
|
|
1379
|
-
|
|
1380
|
-
return false;
|
|
1381
|
-
}
|
|
1382
|
-
|
|
1383
|
-
// This error doesn't come from solidity, but actually from the VM.
|
|
1384
|
-
// The deployment code executes correctly, but it OOGs.
|
|
1385
|
-
const lastStep = trace.steps[trace.steps.length - 1];
|
|
1386
|
-
if (!isEvmStep(lastStep)) {
|
|
1387
|
-
return false;
|
|
1388
|
-
}
|
|
1389
|
-
|
|
1390
|
-
const lastInst = trace.bytecode.getInstruction(lastStep.pc);
|
|
1391
|
-
if (lastInst.opcode !== Opcode.RETURN) {
|
|
1392
|
-
return false;
|
|
1393
|
-
}
|
|
1394
|
-
|
|
1395
|
-
// TODO: This is an over approximation, as we should be comparing the
|
|
1396
|
-
// runtime bytecode.
|
|
1397
|
-
if (
|
|
1398
|
-
trace.bytecode.normalizedCode.length <=
|
|
1399
|
-
EIP170_BYTECODE_SIZE_INCLUSIVE_LIMIT
|
|
1400
|
-
) {
|
|
1401
|
-
return false;
|
|
1402
|
-
}
|
|
1403
|
-
|
|
1404
|
-
// TODO: What happens if it's an actual out of gas that OOGs at the return?
|
|
1405
|
-
// maybe traces should have gasLimit and gasUsed.
|
|
1406
|
-
return true;
|
|
1377
|
+
return trace.error?.error === ERROR.CODESIZE_EXCEEDS_MAXIMUM;
|
|
1407
1378
|
}
|
|
1408
1379
|
|
|
1409
1380
|
private _solidity063CorrectLineNumber(
|
|
@@ -123,7 +123,6 @@ function encodeStackTraceEntry(
|
|
|
123
123
|
case StackTraceEntryType.CALL_FAILED_ERROR:
|
|
124
124
|
case StackTraceEntryType.DIRECT_LIBRARY_CALL_ERROR:
|
|
125
125
|
case StackTraceEntryType.UNMAPPED_SOLC_0_6_3_REVERT_ERROR:
|
|
126
|
-
case StackTraceEntryType.CONTRACT_TOO_LARGE_ERROR:
|
|
127
126
|
return sourceReferenceToSolidityCallsite(stackTraceEntry.sourceReference);
|
|
128
127
|
|
|
129
128
|
case StackTraceEntryType.UNRECOGNIZED_CREATE_CALLSTACK_ENTRY:
|
|
@@ -188,6 +187,7 @@ function encodeStackTraceEntry(
|
|
|
188
187
|
);
|
|
189
188
|
|
|
190
189
|
case StackTraceEntryType.OTHER_EXECUTION_ERROR:
|
|
190
|
+
case StackTraceEntryType.CONTRACT_TOO_LARGE_ERROR:
|
|
191
191
|
if (stackTraceEntry.sourceReference === undefined) {
|
|
192
192
|
return new SolidityCallSite(
|
|
193
193
|
undefined,
|
|
@@ -171,7 +171,7 @@ export interface OtherExecutionErrorStackTraceEntry {
|
|
|
171
171
|
|
|
172
172
|
export interface ContractTooLargeErrorStackTraceEntry {
|
|
173
173
|
type: StackTraceEntryType.CONTRACT_TOO_LARGE_ERROR;
|
|
174
|
-
sourceReference
|
|
174
|
+
sourceReference?: SourceReference;
|
|
175
175
|
}
|
|
176
176
|
|
|
177
177
|
export interface InternalFunctionCallStackEntry {
|
|
@@ -99,6 +99,14 @@ export class SolidityTracer {
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
+
if (trace.error?.error === ERROR.CODESIZE_EXCEEDS_MAXIMUM) {
|
|
103
|
+
return [
|
|
104
|
+
{
|
|
105
|
+
type: StackTraceEntryType.CONTRACT_TOO_LARGE_ERROR,
|
|
106
|
+
},
|
|
107
|
+
];
|
|
108
|
+
}
|
|
109
|
+
|
|
102
110
|
const isInvalidOpcodeError = trace.error?.error === ERROR.INVALID_OPCODE;
|
|
103
111
|
|
|
104
112
|
if (isCreateTrace(trace)) {
|
package/src/types/config.ts
CHANGED
|
@@ -175,7 +175,7 @@ export interface HardhatNetworkForkingConfig {
|
|
|
175
175
|
enabled: boolean;
|
|
176
176
|
url: string;
|
|
177
177
|
blockNumber?: number;
|
|
178
|
-
httpHeaders
|
|
178
|
+
httpHeaders?: { [name: string]: string };
|
|
179
179
|
}
|
|
180
180
|
|
|
181
181
|
export interface HttpNetworkConfig {
|
package/types/config.d.ts
CHANGED
package/types/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/types/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/types/config.ts"],"names":[],"mappings":"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"}
|