hardhat 2.9.1 → 2.9.3
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/builtin-tasks/node.js +4 -3
- package/builtin-tasks/node.js.map +1 -1
- package/builtin-tasks/test.js +4 -1
- package/builtin-tasks/test.js.map +1 -1
- package/internal/cli/cli.js +3 -3
- package/internal/cli/cli.js.map +1 -1
- package/internal/core/config/config-loading.d.ts +5 -2
- package/internal/core/config/config-loading.d.ts.map +1 -1
- package/internal/core/config/config-loading.js +1 -1
- package/internal/core/config/config-loading.js.map +1 -1
- package/internal/core/runtime-environment.d.ts +3 -2
- package/internal/core/runtime-environment.d.ts.map +1 -1
- package/internal/core/runtime-environment.js +2 -1
- package/internal/core/runtime-environment.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.js +2 -7
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.js +2 -4
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.js.map +1 -1
- package/internal/lib/hardhat-lib.d.ts.map +1 -1
- package/internal/lib/hardhat-lib.js +2 -2
- package/internal/lib/hardhat-lib.js.map +1 -1
- package/internal/util/hardforks.d.ts +2 -0
- package/internal/util/hardforks.d.ts.map +1 -1
- package/internal/util/hardforks.js +28 -1
- package/internal/util/hardforks.js.map +1 -1
- package/package.json +3 -3
- package/register.js +2 -2
- package/register.js.map +1 -1
- package/src/builtin-tasks/node.ts +5 -2
- package/src/builtin-tasks/test.ts +4 -4
- package/src/internal/cli/cli.ts +11 -7
- package/src/internal/core/config/config-loading.ts +7 -3
- package/src/internal/core/runtime-environment.ts +3 -1
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts +2 -11
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts +2 -5
- package/src/internal/lib/hardhat-lib.ts +4 -3
- package/src/internal/util/hardforks.ts +29 -0
- package/src/register.ts +4 -3
- package/src/types/runtime.ts +2 -1
- package/types/runtime.d.ts +2 -1
- package/types/runtime.d.ts.map +1 -1
package/builtin-tasks/node.js
CHANGED
|
@@ -56,8 +56,8 @@ Private Key: ${privateKey}`;
|
|
|
56
56
|
(0, config_env_1.subtask)(task_names_1.TASK_NODE_GET_PROVIDER)
|
|
57
57
|
.addOptionalParam("forkUrl", undefined, undefined, config_env_1.types.string)
|
|
58
58
|
.addOptionalParam("forkBlockNumber", undefined, undefined, config_env_1.types.int)
|
|
59
|
-
.setAction(async ({ forkBlockNumber: forkBlockNumberParam, forkUrl: forkUrlParam, }, { artifacts, config, network }) => {
|
|
60
|
-
var _a, _b;
|
|
59
|
+
.setAction(async ({ forkBlockNumber: forkBlockNumberParam, forkUrl: forkUrlParam, }, { artifacts, config, network, userConfig }) => {
|
|
60
|
+
var _a, _b, _c, _d, _e;
|
|
61
61
|
let provider = network.provider;
|
|
62
62
|
if (network.name !== constants_1.HARDHAT_NETWORK_NAME) {
|
|
63
63
|
const networkConfig = config.networks[constants_1.HARDHAT_NETWORK_NAME];
|
|
@@ -90,10 +90,11 @@ Private Key: ${privateKey}`;
|
|
|
90
90
|
],
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
|
+
const hardhatNetworkUserConfig = (_d = (_c = userConfig.networks) === null || _c === void 0 ? void 0 : _c[constants_1.HARDHAT_NETWORK_NAME]) !== null && _d !== void 0 ? _d : {};
|
|
93
94
|
// enable logging
|
|
94
95
|
await provider.request({
|
|
95
96
|
method: "hardhat_setLoggingEnabled",
|
|
96
|
-
params: [true],
|
|
97
|
+
params: [(_e = hardhatNetworkUserConfig.loggingEnabled) !== null && _e !== void 0 ? _e : true],
|
|
97
98
|
});
|
|
98
99
|
return provider;
|
|
99
100
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/builtin-tasks/node.ts"],"names":[],"mappings":";;;;;AAEA,kDAA0B;AAC1B,kDAA0B;AAC1B,wDAA+B;AAE/B,qDAA6D;AAC7D,mEAA0E;AAC1E,oDAAuD;AACvD,8DAAsD;AACtD,0EAAyE;AACzE,0DAAwF;AACxF,uEAGoD;AACpD,0DAAuD;AAOvD,2EAAkF;AAClF,6CAMsB;AACtB,yCAAoD;AAEpD,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,yBAAyB,CAAC,CAAC;AAE7C,SAAS,yBAAyB;IAChC,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,IAAI,CACR,sEAAsE,CACvE,CACF,CAAC;IACF,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,IAAI,CACR,2EAA2E,CAC5E,CACF,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,aAAmC;IACpE,MAAM,eAAe,GACnB,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;QACtC,aAAa,CAAC,QAAQ,CAAC,QAAQ,KAAK,yCAAwB,CAAC;IAE/D,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GACnD,OAAO,CAAC,iBAAiB,CAA2B,CAAC;IAEvD,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAExB,IAAI,eAAe,EAAE;QACnB,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,yBAAyB,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,EAAE,CAAC;KACf;IAED,MAAM,QAAQ,GAAG,IAAA,4CAAqC,EACpD,aAAa,CAAC,QAAQ,CACvB,CAAC;IAEF,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;QACjD,MAAM,OAAO,GAAG,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAE5E,MAAM,OAAO,GAAG,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;aACpC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC/B,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEhB,IAAI,KAAK,GAAG,YAAY,KAAK,KAAK,OAAO,KAAK,OAAO,OAAO,CAAC;QAE7D,IAAI,eAAe,EAAE;YACnB,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;YAC7D,KAAK,IAAI;eACA,UAAU,EAAE,CAAC;SACvB;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,EAAE,CAAC;KACf;IAED,IAAI,eAAe,EAAE;QACnB,yBAAyB,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,EAAE,CAAC;KACf;AACH,CAAC;AAED,IAAA,oBAAO,EAAC,mCAAsB,CAAC;KAC5B,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAK,CAAC,MAAM,CAAC;KAC/D,gBAAgB,CAAC,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAK,CAAC,GAAG,CAAC;KACpE,SAAS,CACR,KAAK,EACH,EACE,eAAe,EAAE,oBAAoB,EACrC,OAAO,EAAE,YAAY,GAItB,EACD,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/builtin-tasks/node.ts"],"names":[],"mappings":"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"}
|
package/builtin-tasks/test.js
CHANGED
|
@@ -55,7 +55,10 @@ const task_names_1 = require("./task-names");
|
|
|
55
55
|
.setAction(async (taskArgs, { config }) => {
|
|
56
56
|
var _a;
|
|
57
57
|
const { default: Mocha } = await Promise.resolve().then(() => __importStar(require("mocha")));
|
|
58
|
-
const mochaConfig = Object.assign(
|
|
58
|
+
const mochaConfig = Object.assign({}, config.mocha);
|
|
59
|
+
if (taskArgs.grep !== undefined) {
|
|
60
|
+
mochaConfig.grep = taskArgs.grep;
|
|
61
|
+
}
|
|
59
62
|
if (taskArgs.bail) {
|
|
60
63
|
mochaConfig.bail = true;
|
|
61
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/builtin-tasks/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,kDAA0B;AAC1B,gDAAwB;AAExB,qDAA6D;AAC7D,mEAAmE;AACnE,4EAA8E;AAC9E,sFAA4F;AAC5F,sHAAiI;AACjI,gDAA6C;AAC7C,sDAAqD;AAErD,6CAOsB;AAEtB,IAAA,oBAAO,EAAC,qCAAwB,CAAC;KAC9B,kCAAkC,CACjC,WAAW,EACX,mCAAmC,EACnC,EAAE,CACH;KACA,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAA2B,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACtE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,MAAM,sBAAsB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACjD,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAC/B,CAAC;QAEF,OAAO,sBAAsB,CAAC;KAC/B;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,WAAI,EAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAErE,IAAI,CAAC,IAAA,4CAAuB,EAAC,MAAM,CAAC,EAAE;QACpC,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,WAAI,EAAC,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAErE,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEL,IAAA,oBAAO,EAAC,6CAAgC,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;AAE1D,IAAA,oBAAO,EAAC,sCAAyB,CAAC;KAC/B,OAAO,CAAC,UAAU,EAAE,uBAAuB,CAAC;KAC5C,OAAO,CAAC,MAAM,EAAE,iDAAiD,CAAC;KAClE,gBAAgB,CACf,MAAM,EACN,oDAAoD,CACrD;KACA,kCAAkC,CACjC,WAAW,EACX,mCAAmC,EACnC,EAAE,CACH;KACA,SAAS,CACR,KAAK,EACH,QAKC,EACD,EAAE,MAAM,EAAE,EACV,EAAE;;IACF,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,wDAAa,OAAO,GAAC,CAAC;IAEjD,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/builtin-tasks/test.ts"],"names":[],"mappings":"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"}
|
package/internal/cli/cli.js
CHANGED
|
@@ -98,7 +98,7 @@ async function main() {
|
|
|
98
98
|
const showEmptyConfigWarning = true;
|
|
99
99
|
const showSolidityConfigWarnings = taskName === task_names_1.TASK_COMPILE;
|
|
100
100
|
const ctx = context_1.HardhatContext.createHardhatContext();
|
|
101
|
-
const
|
|
101
|
+
const { resolvedConfig, userConfig } = (0, config_loading_1.loadConfigAndTasks)(hardhatArguments, {
|
|
102
102
|
showEmptyConfigWarning,
|
|
103
103
|
showSolidityConfigWarnings,
|
|
104
104
|
});
|
|
@@ -114,7 +114,7 @@ async function main() {
|
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
116
|
const analytics = await analytics_1.Analytics.getInstance(telemetryConsent);
|
|
117
|
-
reporter_1.Reporter.setConfigPath(
|
|
117
|
+
reporter_1.Reporter.setConfigPath(resolvedConfig.paths.configFile);
|
|
118
118
|
if (telemetryConsent === true) {
|
|
119
119
|
reporter_1.Reporter.setEnabled(true);
|
|
120
120
|
}
|
|
@@ -141,7 +141,7 @@ async function main() {
|
|
|
141
141
|
}
|
|
142
142
|
taskArguments = argumentsParser.parseTaskArguments(taskDefinition, unparsedCLAs);
|
|
143
143
|
}
|
|
144
|
-
const env = new runtime_environment_1.Environment(
|
|
144
|
+
const env = new runtime_environment_1.Environment(resolvedConfig, hardhatArguments, taskDefinitions, envExtenders, ctx.experimentalHardhatNetworkMessageTraceHooks, userConfig);
|
|
145
145
|
ctx.setHardhatRuntimeEnvironment(env);
|
|
146
146
|
const timestampBeforeRun = new Date().getTime();
|
|
147
147
|
await env.run(taskName, taskArguments);
|
package/internal/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/internal/cli/cli.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/internal/cli/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { HardhatArguments, HardhatConfig } from "../../../types";
|
|
1
|
+
import { HardhatArguments, HardhatConfig, HardhatUserConfig } from "../../../types";
|
|
2
2
|
export declare function resolveConfigPath(configPath: string | undefined): string;
|
|
3
3
|
export declare function loadConfigAndTasks(hardhatArguments?: Partial<HardhatArguments>, { showEmptyConfigWarning, showSolidityConfigWarnings, }?: {
|
|
4
4
|
showEmptyConfigWarning?: boolean;
|
|
5
5
|
showSolidityConfigWarnings?: boolean;
|
|
6
|
-
}):
|
|
6
|
+
}): {
|
|
7
|
+
resolvedConfig: HardhatConfig;
|
|
8
|
+
userConfig: HardhatUserConfig;
|
|
9
|
+
};
|
|
7
10
|
/**
|
|
8
11
|
* Receives an Error and checks if it's a MODULE_NOT_FOUND and the reason that
|
|
9
12
|
* caused it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loading.d.ts","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":"AAQA,OAAO,
|
|
1
|
+
{"version":3,"file":"config-loading.d.ts","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AAmBxB,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,UAU/D;AAED,wBAAgB,kBAAkB,CAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAC5C,EACE,sBAA8B,EAC9B,0BAAkC,GACnC,GAAE;IACD,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,0BAA0B,CAAC,EAAE,OAAO,CAAC;CAItC,GACA;IAAE,cAAc,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAE,CA6DlE;AAiCD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,QA8DxE"}
|
|
@@ -81,7 +81,7 @@ function loadConfigAndTasks(hardhatArguments, { showEmptyConfigWarning = false,
|
|
|
81
81
|
checkUnsupportedSolidityConfig(resolved);
|
|
82
82
|
checkUnsupportedRemappings(resolved);
|
|
83
83
|
}
|
|
84
|
-
return resolved;
|
|
84
|
+
return { resolvedConfig: resolved, userConfig: frozenUserConfig };
|
|
85
85
|
}
|
|
86
86
|
exports.loadConfigAndTasks = loadConfigAndTasks;
|
|
87
87
|
function deepFreezeUserConfig(config, propertyPath = []) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loading.js","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA0B;AAC1B,kDAA0B;AAC1B,wDAA+B;AAC/B,gDAAwB;AACxB,oDAA4B;
|
|
1
|
+
{"version":3,"file":"config-loading.js","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { Artifacts as IArtifacts, EnvironmentExtender, ExperimentalHardhatNetworkMessageTraceHook, HardhatArguments, HardhatConfig, HardhatRuntimeEnvironment, Network, RunTaskFunction, TasksMap } from "../../types";
|
|
1
|
+
import { Artifacts as IArtifacts, EnvironmentExtender, ExperimentalHardhatNetworkMessageTraceHook, HardhatArguments, HardhatConfig, HardhatRuntimeEnvironment, HardhatUserConfig, Network, RunTaskFunction, TasksMap } from "../../types";
|
|
2
2
|
export declare class Environment implements HardhatRuntimeEnvironment {
|
|
3
3
|
readonly config: HardhatConfig;
|
|
4
4
|
readonly hardhatArguments: HardhatArguments;
|
|
5
5
|
readonly tasks: TasksMap;
|
|
6
|
+
readonly userConfig: HardhatUserConfig;
|
|
6
7
|
private static readonly _BLACKLISTED_PROPERTIES;
|
|
7
8
|
network: Network;
|
|
8
9
|
artifacts: IArtifacts;
|
|
@@ -19,7 +20,7 @@ export declare class Environment implements HardhatRuntimeEnvironment {
|
|
|
19
20
|
* @param tasks A map of tasks.
|
|
20
21
|
* @param extenders A list of extenders.
|
|
21
22
|
*/
|
|
22
|
-
constructor(config: HardhatConfig, hardhatArguments: HardhatArguments, tasks: TasksMap, extenders?: EnvironmentExtender[], experimentalHardhatNetworkMessageTraceHooks?: ExperimentalHardhatNetworkMessageTraceHook[]);
|
|
23
|
+
constructor(config: HardhatConfig, hardhatArguments: HardhatArguments, tasks: TasksMap, extenders?: EnvironmentExtender[], experimentalHardhatNetworkMessageTraceHooks?: ExperimentalHardhatNetworkMessageTraceHook[], userConfig?: HardhatUserConfig);
|
|
23
24
|
/**
|
|
24
25
|
* Executes the task with the given name.
|
|
25
26
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-environment.d.ts","sourceRoot":"","sources":["../../src/internal/core/runtime-environment.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,IAAI,UAAU,EACvB,mBAAmB,EACnB,0CAA0C,EAC1C,gBAAgB,EAChB,aAAa,EACb,yBAAyB,EACzB,OAAO,EAGP,eAAe,EAGf,QAAQ,EACT,MAAM,aAAa,CAAC;AAarB,qBAAa,WAAY,YAAW,yBAAyB;aAyBzC,MAAM,EAAE,aAAa;aACrB,gBAAgB,EAAE,gBAAgB;aAClC,KAAK,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"runtime-environment.d.ts","sourceRoot":"","sources":["../../src/internal/core/runtime-environment.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,IAAI,UAAU,EACvB,mBAAmB,EACnB,0CAA0C,EAC1C,gBAAgB,EAChB,aAAa,EACb,yBAAyB,EACzB,iBAAiB,EACjB,OAAO,EAGP,eAAe,EAGf,QAAQ,EACT,MAAM,aAAa,CAAC;AAarB,qBAAa,WAAY,YAAW,yBAAyB;aAyBzC,MAAM,EAAE,aAAa;aACrB,gBAAgB,EAAE,gBAAgB;aAClC,KAAK,EAAE,QAAQ;aAGf,UAAU,EAAE,iBAAiB;IA7B/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAG7C;IAEK,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,EAAE,UAAU,CAAC;IAE7B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwB;IAEnD;;;;;;;;;;;OAWG;gBAEe,MAAM,EAAE,aAAa,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,QAAQ,EAC/B,SAAS,GAAE,mBAAmB,EAAO,EACrC,2CAA2C,GAAE,0CAA0C,EAAO,EAC9E,UAAU,GAAE,iBAAsB;IA4CpD;;;;;;;;OAQG;IACH,SAAgB,GAAG,EAAE,eAAe,CA2BlC;IAEF;;;;;;OAMG;IACI,cAAc,CACnB,SAAS,GAAE,MAAM,EAAwC,GACxD,MAAM,IAAI;YA6BC,kBAAkB;IA6ChC;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,0BAA0B;IAsDlC;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;IAwBxB;;;;;;;OAOG;IACH,OAAO,CAAC,oBAAoB;CAc7B"}
|
|
@@ -26,10 +26,11 @@ class Environment {
|
|
|
26
26
|
* @param tasks A map of tasks.
|
|
27
27
|
* @param extenders A list of extenders.
|
|
28
28
|
*/
|
|
29
|
-
constructor(config, hardhatArguments, tasks, extenders = [], experimentalHardhatNetworkMessageTraceHooks = []) {
|
|
29
|
+
constructor(config, hardhatArguments, tasks, extenders = [], experimentalHardhatNetworkMessageTraceHooks = [], userConfig = {}) {
|
|
30
30
|
this.config = config;
|
|
31
31
|
this.hardhatArguments = hardhatArguments;
|
|
32
32
|
this.tasks = tasks;
|
|
33
|
+
this.userConfig = userConfig;
|
|
33
34
|
/**
|
|
34
35
|
* Executes the task with the given name.
|
|
35
36
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-environment.js","sourceRoot":"","sources":["../../src/internal/core/runtime-environment.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;
|
|
1
|
+
{"version":3,"file":"runtime-environment.js","sourceRoot":"","sources":["../../src/internal/core/runtime-environment.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAkB1B,4CAAyC;AAEzC,uCAA0C;AAE1C,4DAAqE;AACrE,qCAAwC;AACxC,+CAAuC;AACvC,2DAA0D;AAC1D,+DAAoE;AAEpE,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,kBAAkB,CAAC,CAAC;AAEtC,MAAa,WAAW;IAYtB;;;;;;;;;;;OAWG;IACH,YACkB,MAAqB,EACrB,gBAAkC,EAClC,KAAe,EAC/B,YAAmC,EAAE,EACrC,8CAA4F,EAAE,EAC9E,aAAgC,EAAE;QALlC,WAAM,GAAN,MAAM,CAAe;QACrB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,UAAK,GAAL,KAAK,CAAU;QAGf,eAAU,GAAV,UAAU,CAAwB;QA4CpD;;;;;;;;WAQG;QACa,QAAG,GAAoB,KAAK,EAAE,IAAI,EAAE,aAAa,GAAG,EAAE,EAAE,EAAE;YACxE,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAExC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YAE7B,IAAI,cAAc,KAAK,SAAS,EAAE;gBAChC,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,SAAS,CAAC,iBAAiB,EAAE;oBACzD,IAAI,EAAE,IAAI;iBACX,CAAC,CAAC;aACJ;YAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,0BAA0B,CAC3D,cAAc,EACd,aAAa,CACd,CAAC;YAEF,IAAI;gBACF,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAClC,cAAc,EACd,qBAAqB,CACtB,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAA,2CAA0B,EAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAE5D,gFAAgF;gBAChF,MAAM,CAAC,CAAC;aACT;QACH,CAAC,CAAC;QA9EA,GAAG,CAAC,oCAAoC,CAAC,CAAC;QAE1C,MAAM,WAAW,GACf,gBAAgB,CAAC,OAAO,KAAK,SAAS;YACpC,CAAC,CAAC,gBAAgB,CAAC,OAAO;YAC1B,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;QAE5B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEnD,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE;gBACtD,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,GAAG,EAAE;YAC/B,GAAG,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;YACpD,OAAO,IAAA,6BAAc,EACnB,WAAW,EACX,aAAa,EACb,IAAI,CAAC,MAAM,CAAC,KAAK,EACjB,IAAI,CAAC,SAAS,EACd,2CAA2C,CAAC,GAAG,CAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAmB,EAAE,kBAA2B,EAAE,EAAE,CAC7D,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,kBAAkB,CAAC,CACxC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,GAAG;YACb,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC;YACpC,QAAQ;SACT,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAE5B,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAwCD;;;;;;OAMG;IACI,cAAc,CACnB,YAAsB,WAAW,CAAC,uBAAuB;QAEzD,MAAM,WAAW,GAAG,MAAa,CAAC;QAElC,MAAM,cAAc,GAA4B,EAAE,CAAC;QACnD,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC;QAEpC,WAAW,CAAC,GAAG,GAAG,IAAI,CAAC;QAEvB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3B,SAAS;aACV;YAED,cAAc,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACvC,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC1B;QAED,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC3B,SAAS;iBACV;gBAED,WAAW,CAAC,GAAG,GAAG,WAAW,CAAC;gBAC9B,WAAW,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;aACxC;QACH,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,cAA8B,EAC9B,aAA4B;QAE5B,IAAI,gBAAqB,CAAC;QAE1B,IAAI,cAAc,YAAY,2CAAwB,EAAE;YACtD,gBAAgB,GAAG,KAAK,EACtB,iBAAgC,aAAa,EAC7C,EAAE;gBACF,GAAG,CAAC,oBAAoB,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;gBAE/C,OAAO,IAAI,CAAC,kBAAkB,CAC5B,cAAc,CAAC,oBAAoB,EACnC,cAAc,CACf,CAAC;YACJ,CAAC,CAAC;YAEF,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC;SACnC;aAAM;YACL,gBAAgB,GAAG,KAAK,IAAI,EAAE;gBAC5B,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,gBAAgB,CAAC,sBAAsB,EAAE;oBACrE,QAAQ,EAAE,cAAc,CAAC,IAAI;iBAC9B,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,gBAAgB,CAAC,SAAS,GAAG,KAAK,CAAC;SACpC;QAED,MAAM,QAAQ,GAAoC,gBAAgB,CAAC;QAEnE,MAAM,WAAW,GAAG,MAAa,CAAC;QAClC,MAAM,gBAAgB,GAAQ,WAAW,CAAC,QAAQ,CAAC;QACnD,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEhC,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEjD,IAAI;YACF,OAAO,MAAM,cAAc,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;SACnE;gBAAS;YACR,kBAAkB,EAAE,CAAC;YACrB,WAAW,CAAC,QAAQ,GAAG,gBAAgB,CAAC;SACzC;IACH,CAAC;IAED;;;;;;;;;;;;OAYG;IACK,0BAA0B,CAChC,cAA8B,EAC9B,aAA4B;QAE5B,MAAM,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,GAAG,cAAc,CAAC;QAExE,MAAM,6BAA6B,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAEtE,oCAAoC;QACpC,MAAM,uBAAuB,GAAG;YAC9B,GAAG,6BAA6B;YAChC,GAAG,0BAA0B;SAC9B,CAAC;QAEF,MAAM,qBAAqB,GAGvB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAE/B,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,MAAM,CACtD,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,EAAE;YACtC,IAAI;gBACF,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC;gBACvC,MAAM,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;gBAC/C,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CACjD,eAAe,EACf,aAAa,CACd,CAAC;gBACF,IAAI,qBAAqB,KAAK,SAAS,EAAE;oBACvC,MAAM,CAAC,SAAS,CAAC,GAAG,qBAAqB,CAAC;iBAC3C;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,qBAAY,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;oBACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACpB;aACF;YACD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC5B,CAAC,EACD,qBAAqB,CACtB,CAAC;QAEF,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,iBAAiB,CAAC;QAE5E,8CAA8C;QAC9C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,MAAM,aAAa,CAAC,CAAC,CAAC,CAAC;SACxB;QAED,4EAA4E;QAC5E,MAAM,qBAAqB,mCAAQ,aAAa,GAAK,cAAc,CAAE,CAAC;QAEtE,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED;;;;;;OAMG;IACK,gBAAgB,CACtB,eAAqC,EACrC,aAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;QAE3D,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,IAAI,UAAU,EAAE;gBACd,uDAAuD;gBACvD,OAAO,YAAY,CAAC;aACrB;YAED,0CAA0C;YAC1C,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,SAAS,CAAC,qBAAqB,EAAE;gBAC7D,KAAK,EAAE,IAAI;aACZ,CAAC,CAAC;SACJ;QAED,kDAAkD;QAClD,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAE1D,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;;;OAOG;IACK,oBAAoB,CAC1B,eAAqC,EACrC,aAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC;QAE9D,oGAAoG;QACpG,yDAAyD;QACzD,MAAM,sBAAsB,GAAG,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAE5E,KAAK,MAAM,KAAK,IAAI,sBAAsB,EAAE;YAC1C,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SACjC;IACH,CAAC;;AA1TH,kCA2TC;AA1TyB,mCAAuB,GAAa;IAC1D,gBAAgB;IAChB,oBAAoB;CACrB,CAAC"}
|
package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadOnlyValidEIP1559Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ReadOnlyValidEIP1559Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAMlC;;GAEG;AACH,qBAAa,+BAAgC,SAAQ,2BAA2B;WAChE,UAAU,CACtB,OAAO,EAAE,sBAAsB,EAC/B,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,gBAAgB,CAC5B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,mBAAmB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,eAAe,CAC3B,OAAO,EAAE,2BAA2B,EACpC,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;IAMR,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAE,sBAA2B;IA4BvD,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,IAAI,IAAI,KAAK;IAMb,UAAU,IAAI,KAAK;IAMnB,UAAU,IAAI,KAAK;IAMnB,cAAc,IAAI,KAAK;IAMvB,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK;IACpC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK;IAOlC,iBAAiB,IAAI,KAAK;IAM1B,kBAAkB,IAAI,KAAK;IAM3B,2BAA2B,IAAI,KAAK;IAMpC,gBAAgB,IAAI,KAAK;CAKjC"}
|
|
@@ -8,6 +8,7 @@ const common_1 = __importDefault(require("@ethereumjs/common"));
|
|
|
8
8
|
const tx_1 = require("@ethereumjs/tx");
|
|
9
9
|
const ethereumjs_util_1 = require("ethereumjs-util");
|
|
10
10
|
const errors_1 = require("../../../core/providers/errors");
|
|
11
|
+
const hardforks_1 = require("../../../util/hardforks");
|
|
11
12
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
12
13
|
/**
|
|
13
14
|
* This class is like `ReadOnlyValidTransaction` but for EIP-1559 transactions.
|
|
@@ -21,13 +22,7 @@ class ReadOnlyValidEIP1559Transaction extends tx_1.FeeMarketEIP1559Transaction {
|
|
|
21
22
|
// this class should only be used with txs in a hardfork that
|
|
22
23
|
// supports EIP-1559
|
|
23
24
|
fakeCommon.isActivatedEIP = (eip) => {
|
|
24
|
-
|
|
25
|
-
return true;
|
|
26
|
-
}
|
|
27
|
-
if (eip === 1559) {
|
|
28
|
-
return true;
|
|
29
|
-
}
|
|
30
|
-
throw new Error("Expected `isActivatedEIP` to only be called with 2930 or 1559");
|
|
25
|
+
return hardforks_1.LONDON_EIPS.has(eip);
|
|
31
26
|
};
|
|
32
27
|
// this class should only be used with EIP-1559 txs,
|
|
33
28
|
// which always have a `chainId` value
|
package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadOnlyValidEIP1559Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,uCAAwE;AACxE,qDAA8C;AAM9C,2DAA+D;
|
|
1
|
+
{"version":3,"file":"ReadOnlyValidEIP1559Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,uCAAwE;AACxE,qDAA8C;AAM9C,2DAA+D;AAC/D,uDAAsD;AAEtD,yEAAyE;AAEzE;;GAEG;AACH,MAAa,+BAAgC,SAAQ,gCAA2B;IAyC9E,YAAY,MAAe,EAAE,OAA+B,EAAE;QAC5D,MAAM,UAAU,GAAG,IAAI,gBAAM,CAAC;YAC5B,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,QAAQ,EAAE,qDAAqD;SAC1E,CAAC,CAAC;QAEH,6DAA6D;QAC7D,oBAAoB;QACnB,UAAkB,CAAC,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE;YACnD,OAAO,uBAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,oDAAoD;QACpD,sCAAsC;QACrC,UAAkB,CAAC,SAAS,GAAG,GAAG,EAAE;YACnC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,OAAO,IAAI,oBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC7B;YAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAlEM,MAAM,CAAC,UAAU,CACtB,OAA+B,EAC/B,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAC5B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,eAAe,CAC3B,OAAoC,EACpC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAkCM,eAAe;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,IAAI;QACT,MAAM,IAAI,sBAAa,CACrB,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,cAAc;QACnB,MAAM,IAAI,sBAAa,CACrB,wEAAwE,CACzE,CAAC;IACJ,CAAC;IAIM,QAAQ,CAAC,eAAwB,KAAK;QAC3C,MAAM,IAAI,sBAAa,CACrB,kEAAkE,CACnE,CAAC;IACJ,CAAC;IAEM,iBAAiB;QACtB,MAAM,IAAI,sBAAa,CACrB,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IAEM,kBAAkB;QACvB,MAAM,IAAI,sBAAa,CACrB,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAEM,2BAA2B;QAChC,MAAM,IAAI,sBAAa,CACrB,qFAAqF,CACtF,CAAC;IACJ,CAAC;IAEM,gBAAgB;QACrB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;CACF;AApID,0EAoIC"}
|
package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadOnlyValidEIP2930Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,EACvB,4BAA4B,EAC5B,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"ReadOnlyValidEIP2930Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,EACvB,4BAA4B,EAC5B,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;AAO9C;;;GAGG;AACH,qBAAa,+BAAgC,SAAQ,4BAA4B;WACjE,UAAU,CACtB,OAAO,EAAE,uBAAuB,EAChC,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,gBAAgB,CAC5B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,mBAAmB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,eAAe,CAC3B,OAAO,EAAE,4BAA4B,EACrC,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;IAMR,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAE,uBAA4B;IA2BxD,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,IAAI,IAAI,KAAK;IAMb,UAAU,IAAI,KAAK;IAMnB,UAAU,IAAI,KAAK;IAMnB,cAAc,IAAI,KAAK;IAMvB,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK;IACpC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK;IAOlC,iBAAiB,IAAI,KAAK;IAM1B,kBAAkB,IAAI,KAAK;IAM3B,2BAA2B,IAAI,KAAK;IAMpC,gBAAgB,IAAI,KAAK;CAKjC"}
|
|
@@ -8,6 +8,7 @@ const common_1 = __importDefault(require("@ethereumjs/common"));
|
|
|
8
8
|
const tx_1 = require("@ethereumjs/tx");
|
|
9
9
|
const ethereumjs_util_1 = require("ethereumjs-util");
|
|
10
10
|
const errors_1 = require("../../../core/providers/errors");
|
|
11
|
+
const hardforks_1 = require("../../../util/hardforks");
|
|
11
12
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
12
13
|
/**
|
|
13
14
|
* This class is like `ReadOnlyValidTransaction` but for
|
|
@@ -21,10 +22,7 @@ class ReadOnlyValidEIP2930Transaction extends tx_1.AccessListEIP2930Transaction
|
|
|
21
22
|
// this class should only be used with txs in a hardfork that
|
|
22
23
|
// supports EIP-2930
|
|
23
24
|
fakeCommon.isActivatedEIP = (eip) => {
|
|
24
|
-
|
|
25
|
-
return true;
|
|
26
|
-
}
|
|
27
|
-
throw new Error("Expected `isActivatedEIP` to only be called with 2930");
|
|
25
|
+
return hardforks_1.BERLIN_EIPS.has(eip);
|
|
28
26
|
};
|
|
29
27
|
// this class should only be used with EIP-2930 txs,
|
|
30
28
|
// which (we assume) always have a defined `chainId` value
|
package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadOnlyValidEIP2930Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,uCAKwB;AACxB,qDAA8C;AAE9C,2DAA+D;
|
|
1
|
+
{"version":3,"file":"ReadOnlyValidEIP2930Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,uCAKwB;AACxB,qDAA8C;AAE9C,2DAA+D;AAC/D,uDAAsD;AAEtD,yEAAyE;AAEzE;;;GAGG;AACH,MAAa,+BAAgC,SAAQ,iCAA4B;IAyC/E,YAAY,MAAe,EAAE,OAAgC,EAAE;QAC7D,MAAM,UAAU,GAAG,IAAI,gBAAM,CAAC;YAC5B,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,6DAA6D;QAC7D,oBAAoB;QACnB,UAAkB,CAAC,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE;YACnD,OAAO,uBAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,oDAAoD;QACpD,0DAA0D;QACzD,UAAkB,CAAC,SAAS,GAAG,GAAG,EAAE;YACnC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,OAAO,IAAI,oBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC7B;YAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAjEM,MAAM,CAAC,UAAU,CACtB,OAAgC,EAChC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAC5B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,eAAe,CAC3B,OAAqC,EACrC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAiCM,eAAe;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,IAAI;QACT,MAAM,IAAI,sBAAa,CACrB,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,cAAc;QACnB,MAAM,IAAI,sBAAa,CACrB,wEAAwE,CACzE,CAAC;IACJ,CAAC;IAIM,QAAQ,CAAC,eAAwB,KAAK;QAC3C,MAAM,IAAI,sBAAa,CACrB,kEAAkE,CACnE,CAAC;IACJ,CAAC;IAEM,iBAAiB;QACtB,MAAM,IAAI,sBAAa,CACrB,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IAEM,kBAAkB;QACvB,MAAM,IAAI,sBAAa,CACrB,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAEM,2BAA2B;QAChC,MAAM,IAAI,sBAAa,CACrB,qFAAqF,CACtF,CAAC;IACJ,CAAC;IAEM,gBAAgB;QACrB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;CACF;AAnID,0EAmIC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat-lib.d.ts","sourceRoot":"","sources":["../../src/internal/lib/hardhat-lib.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAWxD,QAAA,IAAI,GAAG,EAAE,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"hardhat-lib.d.ts","sourceRoot":"","sources":["../../src/internal/lib/hardhat-lib.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAWxD,QAAA,IAAI,GAAG,EAAE,yBAAyB,CAAC;AAwCnC,SAAS,GAAG,CAAC"}
|
|
@@ -29,8 +29,8 @@ else {
|
|
|
29
29
|
if (hardhatArguments.verbose) {
|
|
30
30
|
debug_1.default.enable("hardhat*");
|
|
31
31
|
}
|
|
32
|
-
const
|
|
33
|
-
env = new runtime_environment_1.Environment(
|
|
32
|
+
const { resolvedConfig, userConfig } = (0, config_loading_1.loadConfigAndTasks)(hardhatArguments);
|
|
33
|
+
env = new runtime_environment_1.Environment(resolvedConfig, hardhatArguments, ctx.tasksDSL.getTaskDefinitions(), ctx.extendersManager.getExtenders(), ctx.experimentalHardhatNetworkMessageTraceHooks, userConfig);
|
|
34
34
|
ctx.setHardhatRuntimeEnvironment(env);
|
|
35
35
|
}
|
|
36
36
|
module.exports = env;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat-lib.js","sourceRoot":"","sources":["../../src/internal/lib/hardhat-lib.ts"],"names":[],"mappings":";;;;AAAA,kDAA0B;AAG1B,wCAA4C;AAC5C,kEAAmE;AACnE,2CAA8C;AAC9C,qDAA6C;AAC7C,gEAAsE;AACtE,kEAA0E;AAC1E,qEAA0D;AAC1D,uGAA+E;AAE/E,IAAI,GAAmB,CAAC;AACxB,IAAI,GAA8B,CAAC;AAEnC,IAAA,sDAAe,GAAE,CAAC;AAElB,IAAI,wBAAc,CAAC,SAAS,EAAE,EAAE;IAC9B,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAEzC,6EAA6E;IAC7E,uBAAuB;IACvB,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE;QACjC,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;KACrE;IAED,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC;CACvB;KAAM;IACL,GAAG,GAAG,wBAAc,CAAC,oBAAoB,EAAE,CAAC;IAE5C,MAAM,gBAAgB,GAAG,IAAA,sCAAsB,EAC7C,0CAAyB,EACzB,OAAO,CAAC,GAAG,CACZ,CAAC;IAEF,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,eAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KAC1B;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"hardhat-lib.js","sourceRoot":"","sources":["../../src/internal/lib/hardhat-lib.ts"],"names":[],"mappings":";;;;AAAA,kDAA0B;AAG1B,wCAA4C;AAC5C,kEAAmE;AACnE,2CAA8C;AAC9C,qDAA6C;AAC7C,gEAAsE;AACtE,kEAA0E;AAC1E,qEAA0D;AAC1D,uGAA+E;AAE/E,IAAI,GAAmB,CAAC;AACxB,IAAI,GAA8B,CAAC;AAEnC,IAAA,sDAAe,GAAE,CAAC;AAElB,IAAI,wBAAc,CAAC,SAAS,EAAE,EAAE;IAC9B,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAEzC,6EAA6E;IAC7E,uBAAuB;IACvB,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE;QACjC,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;KACrE;IAED,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC;CACvB;KAAM;IACL,GAAG,GAAG,wBAAc,CAAC,oBAAoB,EAAE,CAAC;IAE5C,MAAM,gBAAgB,GAAG,IAAA,sCAAsB,EAC7C,0CAAyB,EACzB,OAAO,CAAC,GAAG,CACZ,CAAC;IAEF,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,eAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KAC1B;IAED,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,IAAA,mCAAkB,EAAC,gBAAgB,CAAC,CAAC;IAE5E,GAAG,GAAG,IAAI,iCAAW,CACnB,cAAc,EACd,gBAAgB,EAChB,GAAG,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EACjC,GAAG,CAAC,gBAAgB,CAAC,YAAY,EAAE,EACnC,GAAG,CAAC,2CAA2C,EAC/C,UAAU,CACX,CAAC;IAEF,GAAG,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;CACvC;AAED,iBAAS,GAAG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardforks.d.ts","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":"AAEA,oBAAY,YAAY;IACtB,QAAQ,eAAe;IACvB,SAAS,cAAc;IACvB,GAAG,QAAQ;IACX,iBAAiB,qBAAqB;IACtC,eAAe,mBAAmB;IAClC,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,YAAY,gBAAgB;IAC5B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,aAAa,iBAAiB;CAC/B;AAkBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAY1D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,YAAY,GACtB,OAAO,CAOT"}
|
|
1
|
+
{"version":3,"file":"hardforks.d.ts","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,aAiBtB,CAAC;AAEH,eAAO,MAAM,WAAW,aAQtB,CAAC;AAEH,oBAAY,YAAY;IACtB,QAAQ,eAAe;IACvB,SAAS,cAAc;IACvB,GAAG,QAAQ;IACX,iBAAiB,qBAAqB;IACtC,eAAe,mBAAmB;IAClC,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,YAAY,gBAAgB;IAC5B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,aAAa,iBAAiB;CAC/B;AAkBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAY1D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,YAAY,GACtB,OAAO,CAOT"}
|
|
@@ -1,7 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.hardforkGte = exports.getHardforkName = exports.HardforkName = void 0;
|
|
3
|
+
exports.hardforkGte = exports.getHardforkName = exports.HardforkName = exports.LONDON_EIPS = exports.BERLIN_EIPS = void 0;
|
|
4
4
|
const errors_1 = require("../core/errors");
|
|
5
|
+
exports.BERLIN_EIPS = new Set([
|
|
6
|
+
// Homestead
|
|
7
|
+
2, 7, 8,
|
|
8
|
+
// Tangerine Whistle
|
|
9
|
+
150, 158,
|
|
10
|
+
// Spurious Dragon
|
|
11
|
+
155, 160, 161, 170,
|
|
12
|
+
// Byzantium
|
|
13
|
+
100, 140, 196, 197, 198, 211, 214, 649, 658,
|
|
14
|
+
// Constantinople
|
|
15
|
+
1014, 1052, 1234, 145,
|
|
16
|
+
// Istanbul
|
|
17
|
+
1108, 1344, 152, 1884, 2028, 2200,
|
|
18
|
+
// Muir Glacier
|
|
19
|
+
2384,
|
|
20
|
+
// Berlin
|
|
21
|
+
2565, 2718, 2929, 2930,
|
|
22
|
+
]);
|
|
23
|
+
exports.LONDON_EIPS = new Set([
|
|
24
|
+
...exports.BERLIN_EIPS,
|
|
25
|
+
// London
|
|
26
|
+
1559,
|
|
27
|
+
3198,
|
|
28
|
+
3529,
|
|
29
|
+
3541,
|
|
30
|
+
3554,
|
|
31
|
+
]);
|
|
5
32
|
var HardforkName;
|
|
6
33
|
(function (HardforkName) {
|
|
7
34
|
HardforkName["FRONTIER"] = "chainstart";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardforks.js","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":";;;AAAA,2CAAwD;
|
|
1
|
+
{"version":3,"file":"hardforks.js","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":";;;AAAA,2CAAwD;AAE3C,QAAA,WAAW,GAAG,IAAI,GAAG,CAAC;IACjC,YAAY;IACZ,CAAC,EAAE,CAAC,EAAE,CAAC;IACP,oBAAoB;IACpB,GAAG,EAAE,GAAG;IACR,kBAAkB;IAClB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAClB,YAAY;IACZ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC3C,iBAAiB;IACjB,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG;IACrB,WAAW;IACX,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IACjC,eAAe;IACf,IAAI;IACJ,SAAS;IACT,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;CACvB,CAAC,CAAC;AAEU,QAAA,WAAW,GAAG,IAAI,GAAG,CAAC;IACjC,GAAG,mBAAW;IACd,SAAS;IACT,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;CACL,CAAC,CAAC;AAEH,IAAY,YAcX;AAdD,WAAY,YAAY;IACtB,uCAAuB,CAAA;IACvB,uCAAuB,CAAA;IACvB,2BAAW,CAAA;IACX,sDAAsC,CAAA;IACtC,kDAAkC,CAAA;IAClC,uCAAuB,CAAA;IACvB,iDAAiC,CAAA;IACjC,yCAAyB,CAAA;IACzB,qCAAqB,CAAA;IACrB,4CAA4B,CAAA;IAC5B,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,8CAA8B,CAAA;AAChC,CAAC,EAdW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAcvB;AAED,MAAM,eAAe,GAAmB;IACtC,YAAY,CAAC,QAAQ;IACrB,YAAY,CAAC,SAAS;IACtB,YAAY,CAAC,GAAG;IAChB,YAAY,CAAC,iBAAiB;IAC9B,YAAY,CAAC,eAAe;IAC5B,YAAY,CAAC,SAAS;IACtB,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,UAAU;IACvB,YAAY,CAAC,QAAQ;IACrB,YAAY,CAAC,YAAY;IACzB,YAAY,CAAC,MAAM;IACnB,YAAY,CAAC,MAAM;IACnB,YAAY,CAAC,aAAa;CAC3B,CAAC;AAEF,SAAgB,eAAe,CAAC,IAAY;IAC1C,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CACzB,MAAM,CAAC,MAAM,CAAS,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAClD,CAAC;IAEJ,IAAA,+BAAsB,EACpB,YAAY,KAAK,SAAS,EAC1B,wBAAwB,IAAI,EAAE,CAC/B,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC;AAZD,0CAYC;AAED;;;GAGG;AACH,SAAgB,WAAW,CACzB,SAAuB,EACvB,SAAuB;IAEvB,4EAA4E;IAC5E,+DAA+D;IAC/D,MAAM,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtD,OAAO,MAAM,IAAI,MAAM,CAAC;AAC1B,CAAC;AAVD,kCAUC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "hardhat",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.3",
|
|
4
4
|
"author": "Nomic Labs LLC",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://hardhat.org",
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
"prettier": "prettier \"**/*.{js,md,json}\"",
|
|
33
33
|
"test": "mocha --recursive \"test/**/*.ts\"",
|
|
34
34
|
"test:except-tracing": "mocha --recursive \"test/**/*.ts\" --invert --grep \"Stack traces\"",
|
|
35
|
-
"test:tracing": "mocha --recursive \"test/internal/hardhat-network/{helpers,stack-traces}
|
|
36
|
-
"test:forking": "mocha --recursive \"test/internal/hardhat-network/{helpers,jsonrpc,provider}
|
|
35
|
+
"test:tracing": "mocha --recursive \"test/internal/hardhat-network/{helpers,stack-traces}/**/*.ts\"",
|
|
36
|
+
"test:forking": "mocha --recursive \"test/internal/hardhat-network/{helpers,jsonrpc,provider}/**/*.ts\"",
|
|
37
37
|
"build": "tsc --build .",
|
|
38
38
|
"clean": "rimraf builtin-tasks internal types utils *.d.ts *.map *.js build-test tsconfig.tsbuildinfo test/internal/hardhat-network/provider/.hardhat_node_test_cache"
|
|
39
39
|
},
|
package/register.js
CHANGED
|
@@ -26,8 +26,8 @@ if (!context_1.HardhatContext.isCreated()) {
|
|
|
26
26
|
if ((0, typescript_support_1.willRunWithTypescript)(hardhatArguments.config)) {
|
|
27
27
|
(0, typescript_support_1.loadTsNode)(hardhatArguments.tsconfig);
|
|
28
28
|
}
|
|
29
|
-
const
|
|
30
|
-
const env = new runtime_environment_1.Environment(
|
|
29
|
+
const { resolvedConfig, userConfig } = (0, config_loading_1.loadConfigAndTasks)(hardhatArguments);
|
|
30
|
+
const env = new runtime_environment_1.Environment(resolvedConfig, hardhatArguments, ctx.tasksDSL.getTaskDefinitions(), ctx.extendersManager.getExtenders(), ctx.experimentalHardhatNetworkMessageTraceHooks, userConfig);
|
|
31
31
|
ctx.setHardhatRuntimeEnvironment(env);
|
|
32
32
|
env.injectToGlobal();
|
|
33
33
|
}
|
package/register.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["src/register.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,gDAAoD;AACpD,0EAA2E;AAC3E,wEAA8E;AAC9E,0EAAkF;AAClF,6EAAkE;AAClE,2EAG4C;AAC5C,qDAGiC;AACjC,+GAAuF;AAEvF,IAAA,sDAAe,GAAE,CAAC;AAElB,IAAI,CAAC,wBAAc,CAAC,SAAS,EAAE,EAAE;IAC/B,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAEvC,MAAM,GAAG,GAAG,wBAAc,CAAC,oBAAoB,EAAE,CAAC;IAElD,IAAI,IAAA,oCAA0B,GAAE,EAAE;QAChC,IAAA,oCAA0B,GAAE,CAAC;KAC9B;IAED,MAAM,gBAAgB,GAAG,IAAA,sCAAsB,EAC7C,0CAAyB,EACzB,OAAO,CAAC,GAAG,CACZ,CAAC;IAEF,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,eAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KAC1B;IAED,IAAI,IAAA,0CAAqB,EAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE;QAClD,IAAA,+BAAU,EAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KACvC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["src/register.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,gDAAoD;AACpD,0EAA2E;AAC3E,wEAA8E;AAC9E,0EAAkF;AAClF,6EAAkE;AAClE,2EAG4C;AAC5C,qDAGiC;AACjC,+GAAuF;AAEvF,IAAA,sDAAe,GAAE,CAAC;AAElB,IAAI,CAAC,wBAAc,CAAC,SAAS,EAAE,EAAE;IAC/B,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAEvC,MAAM,GAAG,GAAG,wBAAc,CAAC,oBAAoB,EAAE,CAAC;IAElD,IAAI,IAAA,oCAA0B,GAAE,EAAE;QAChC,IAAA,oCAA0B,GAAE,CAAC;KAC9B;IAED,MAAM,gBAAgB,GAAG,IAAA,sCAAsB,EAC7C,0CAAyB,EACzB,OAAO,CAAC,GAAG,CACZ,CAAC;IAEF,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,eAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KAC1B;IAED,IAAI,IAAA,0CAAqB,EAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE;QAClD,IAAA,+BAAU,EAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KACvC;IAED,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,IAAA,mCAAkB,EAAC,gBAAgB,CAAC,CAAC;IAE5E,MAAM,GAAG,GAAG,IAAI,iCAAW,CACzB,cAAc,EACd,gBAAgB,EAChB,GAAG,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EACjC,GAAG,CAAC,gBAAgB,CAAC,YAAY,EAAE,EACnC,GAAG,CAAC,2CAA2C,EAC/C,UAAU,CACX,CAAC;IAEF,GAAG,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;IAEtC,GAAG,CAAC,cAAc,EAAE,CAAC;CACtB"}
|
|
@@ -104,7 +104,7 @@ subtask(TASK_NODE_GET_PROVIDER)
|
|
|
104
104
|
forkBlockNumber?: number;
|
|
105
105
|
forkUrl?: string;
|
|
106
106
|
},
|
|
107
|
-
{ artifacts, config, network }
|
|
107
|
+
{ artifacts, config, network, userConfig }
|
|
108
108
|
): Promise<EthereumProvider> => {
|
|
109
109
|
let provider = network.provider;
|
|
110
110
|
|
|
@@ -155,10 +155,13 @@ subtask(TASK_NODE_GET_PROVIDER)
|
|
|
155
155
|
});
|
|
156
156
|
}
|
|
157
157
|
|
|
158
|
+
const hardhatNetworkUserConfig =
|
|
159
|
+
userConfig.networks?.[HARDHAT_NETWORK_NAME] ?? {};
|
|
160
|
+
|
|
158
161
|
// enable logging
|
|
159
162
|
await provider.request({
|
|
160
163
|
method: "hardhat_setLoggingEnabled",
|
|
161
|
-
params: [true],
|
|
164
|
+
params: [hardhatNetworkUserConfig.loggingEnabled ?? true],
|
|
162
165
|
});
|
|
163
166
|
|
|
164
167
|
return provider;
|
|
@@ -72,11 +72,11 @@ subtask(TASK_TEST_RUN_MOCHA_TESTS)
|
|
|
72
72
|
) => {
|
|
73
73
|
const { default: Mocha } = await import("mocha");
|
|
74
74
|
|
|
75
|
-
const mochaConfig: MochaOptions = {
|
|
76
|
-
...config.mocha,
|
|
77
|
-
grep: taskArgs.grep,
|
|
78
|
-
};
|
|
75
|
+
const mochaConfig: MochaOptions = { ...config.mocha };
|
|
79
76
|
|
|
77
|
+
if (taskArgs.grep !== undefined) {
|
|
78
|
+
mochaConfig.grep = taskArgs.grep;
|
|
79
|
+
}
|
|
80
80
|
if (taskArgs.bail) {
|
|
81
81
|
mochaConfig.bail = true;
|
|
82
82
|
}
|
package/src/internal/cli/cli.ts
CHANGED
|
@@ -139,10 +139,13 @@ async function main() {
|
|
|
139
139
|
|
|
140
140
|
const ctx = HardhatContext.createHardhatContext();
|
|
141
141
|
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
142
|
+
const { resolvedConfig, userConfig } = loadConfigAndTasks(
|
|
143
|
+
hardhatArguments,
|
|
144
|
+
{
|
|
145
|
+
showEmptyConfigWarning,
|
|
146
|
+
showSolidityConfigWarnings,
|
|
147
|
+
}
|
|
148
|
+
);
|
|
146
149
|
|
|
147
150
|
let telemetryConsent: boolean | undefined = hasConsentedTelemetry();
|
|
148
151
|
|
|
@@ -162,7 +165,7 @@ async function main() {
|
|
|
162
165
|
|
|
163
166
|
const analytics = await Analytics.getInstance(telemetryConsent);
|
|
164
167
|
|
|
165
|
-
Reporter.setConfigPath(
|
|
168
|
+
Reporter.setConfigPath(resolvedConfig.paths.configFile);
|
|
166
169
|
if (telemetryConsent === true) {
|
|
167
170
|
Reporter.setEnabled(true);
|
|
168
171
|
}
|
|
@@ -200,11 +203,12 @@ async function main() {
|
|
|
200
203
|
}
|
|
201
204
|
|
|
202
205
|
const env = new Environment(
|
|
203
|
-
|
|
206
|
+
resolvedConfig,
|
|
204
207
|
hardhatArguments,
|
|
205
208
|
taskDefinitions,
|
|
206
209
|
envExtenders,
|
|
207
|
-
ctx.experimentalHardhatNetworkMessageTraceHooks
|
|
210
|
+
ctx.experimentalHardhatNetworkMessageTraceHooks,
|
|
211
|
+
userConfig
|
|
208
212
|
);
|
|
209
213
|
|
|
210
214
|
ctx.setHardhatRuntimeEnvironment(env);
|
|
@@ -6,7 +6,11 @@ import fsExtra from "fs-extra";
|
|
|
6
6
|
import path from "path";
|
|
7
7
|
import semver from "semver";
|
|
8
8
|
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
HardhatArguments,
|
|
11
|
+
HardhatConfig,
|
|
12
|
+
HardhatUserConfig,
|
|
13
|
+
} from "../../../types";
|
|
10
14
|
import { HardhatContext } from "../../context";
|
|
11
15
|
import { SUPPORTED_SOLIDITY_VERSION_RANGE } from "../../hardhat-network/stack-traces/solidityTracer";
|
|
12
16
|
import { findClosestPackageJson } from "../../util/packageInfo";
|
|
@@ -49,7 +53,7 @@ export function loadConfigAndTasks(
|
|
|
49
53
|
showEmptyConfigWarning: false,
|
|
50
54
|
showSolidityConfigWarnings: false,
|
|
51
55
|
}
|
|
52
|
-
): HardhatConfig {
|
|
56
|
+
): { resolvedConfig: HardhatConfig; userConfig: HardhatUserConfig } {
|
|
53
57
|
let configPath =
|
|
54
58
|
hardhatArguments !== undefined ? hardhatArguments.config : undefined;
|
|
55
59
|
|
|
@@ -109,7 +113,7 @@ export function loadConfigAndTasks(
|
|
|
109
113
|
checkUnsupportedRemappings(resolved);
|
|
110
114
|
}
|
|
111
115
|
|
|
112
|
-
return resolved;
|
|
116
|
+
return { resolvedConfig: resolved, userConfig: frozenUserConfig };
|
|
113
117
|
}
|
|
114
118
|
|
|
115
119
|
function deepFreezeUserConfig(
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
HardhatArguments,
|
|
8
8
|
HardhatConfig,
|
|
9
9
|
HardhatRuntimeEnvironment,
|
|
10
|
+
HardhatUserConfig,
|
|
10
11
|
Network,
|
|
11
12
|
ParamDefinition,
|
|
12
13
|
RunSuperFunction,
|
|
@@ -56,7 +57,8 @@ export class Environment implements HardhatRuntimeEnvironment {
|
|
|
56
57
|
public readonly hardhatArguments: HardhatArguments,
|
|
57
58
|
public readonly tasks: TasksMap,
|
|
58
59
|
extenders: EnvironmentExtender[] = [],
|
|
59
|
-
experimentalHardhatNetworkMessageTraceHooks: ExperimentalHardhatNetworkMessageTraceHook[] = []
|
|
60
|
+
experimentalHardhatNetworkMessageTraceHooks: ExperimentalHardhatNetworkMessageTraceHook[] = [],
|
|
61
|
+
public readonly userConfig: HardhatUserConfig = {}
|
|
60
62
|
) {
|
|
61
63
|
log("Creating HardhatRuntimeEnvironment");
|
|
62
64
|
|
package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
FeeMarketEIP1559ValuesArray,
|
|
8
8
|
} from "@ethereumjs/tx/src/types";
|
|
9
9
|
import { InternalError } from "../../../core/providers/errors";
|
|
10
|
+
import { LONDON_EIPS } from "../../../util/hardforks";
|
|
10
11
|
|
|
11
12
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
12
13
|
|
|
@@ -63,17 +64,7 @@ export class ReadOnlyValidEIP1559Transaction extends FeeMarketEIP1559Transaction
|
|
|
63
64
|
// this class should only be used with txs in a hardfork that
|
|
64
65
|
// supports EIP-1559
|
|
65
66
|
(fakeCommon as any).isActivatedEIP = (eip: number) => {
|
|
66
|
-
|
|
67
|
-
return true;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
if (eip === 1559) {
|
|
71
|
-
return true;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
throw new Error(
|
|
75
|
-
"Expected `isActivatedEIP` to only be called with 2930 or 1559"
|
|
76
|
-
);
|
|
67
|
+
return LONDON_EIPS.has(eip);
|
|
77
68
|
};
|
|
78
69
|
|
|
79
70
|
// this class should only be used with EIP-1559 txs,
|
package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
import { Address, BN } from "ethereumjs-util";
|
|
9
9
|
|
|
10
10
|
import { InternalError } from "../../../core/providers/errors";
|
|
11
|
+
import { BERLIN_EIPS } from "../../../util/hardforks";
|
|
11
12
|
|
|
12
13
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
13
14
|
|
|
@@ -64,11 +65,7 @@ export class ReadOnlyValidEIP2930Transaction extends AccessListEIP2930Transactio
|
|
|
64
65
|
// this class should only be used with txs in a hardfork that
|
|
65
66
|
// supports EIP-2930
|
|
66
67
|
(fakeCommon as any).isActivatedEIP = (eip: number) => {
|
|
67
|
-
|
|
68
|
-
return true;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
throw new Error("Expected `isActivatedEIP` to only be called with 2930");
|
|
68
|
+
return BERLIN_EIPS.has(eip);
|
|
72
69
|
};
|
|
73
70
|
|
|
74
71
|
// this class should only be used with EIP-2930 txs,
|
|
@@ -37,14 +37,15 @@ if (HardhatContext.isCreated()) {
|
|
|
37
37
|
debug.enable("hardhat*");
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
const
|
|
40
|
+
const { resolvedConfig, userConfig } = loadConfigAndTasks(hardhatArguments);
|
|
41
41
|
|
|
42
42
|
env = new Environment(
|
|
43
|
-
|
|
43
|
+
resolvedConfig,
|
|
44
44
|
hardhatArguments,
|
|
45
45
|
ctx.tasksDSL.getTaskDefinitions(),
|
|
46
46
|
ctx.extendersManager.getExtenders(),
|
|
47
|
-
ctx.experimentalHardhatNetworkMessageTraceHooks
|
|
47
|
+
ctx.experimentalHardhatNetworkMessageTraceHooks,
|
|
48
|
+
userConfig
|
|
48
49
|
);
|
|
49
50
|
|
|
50
51
|
ctx.setHardhatRuntimeEnvironment(env);
|
|
@@ -1,5 +1,34 @@
|
|
|
1
1
|
import { assertHardhatInvariant } from "../core/errors";
|
|
2
2
|
|
|
3
|
+
export const BERLIN_EIPS = new Set([
|
|
4
|
+
// Homestead
|
|
5
|
+
2, 7, 8,
|
|
6
|
+
// Tangerine Whistle
|
|
7
|
+
150, 158,
|
|
8
|
+
// Spurious Dragon
|
|
9
|
+
155, 160, 161, 170,
|
|
10
|
+
// Byzantium
|
|
11
|
+
100, 140, 196, 197, 198, 211, 214, 649, 658,
|
|
12
|
+
// Constantinople
|
|
13
|
+
1014, 1052, 1234, 145,
|
|
14
|
+
// Istanbul
|
|
15
|
+
1108, 1344, 152, 1884, 2028, 2200,
|
|
16
|
+
// Muir Glacier
|
|
17
|
+
2384,
|
|
18
|
+
// Berlin
|
|
19
|
+
2565, 2718, 2929, 2930,
|
|
20
|
+
]);
|
|
21
|
+
|
|
22
|
+
export const LONDON_EIPS = new Set([
|
|
23
|
+
...BERLIN_EIPS,
|
|
24
|
+
// London
|
|
25
|
+
1559,
|
|
26
|
+
3198,
|
|
27
|
+
3529,
|
|
28
|
+
3541,
|
|
29
|
+
3554,
|
|
30
|
+
]);
|
|
31
|
+
|
|
3
32
|
export enum HardforkName {
|
|
4
33
|
FRONTIER = "chainstart",
|
|
5
34
|
HOMESTEAD = "homestead",
|
package/src/register.ts
CHANGED
|
@@ -39,14 +39,15 @@ if (!HardhatContext.isCreated()) {
|
|
|
39
39
|
loadTsNode(hardhatArguments.tsconfig);
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
const
|
|
42
|
+
const { resolvedConfig, userConfig } = loadConfigAndTasks(hardhatArguments);
|
|
43
43
|
|
|
44
44
|
const env = new Environment(
|
|
45
|
-
|
|
45
|
+
resolvedConfig,
|
|
46
46
|
hardhatArguments,
|
|
47
47
|
ctx.tasksDSL.getTaskDefinitions(),
|
|
48
48
|
ctx.extendersManager.getExtenders(),
|
|
49
|
-
ctx.experimentalHardhatNetworkMessageTraceHooks
|
|
49
|
+
ctx.experimentalHardhatNetworkMessageTraceHooks,
|
|
50
|
+
userConfig
|
|
50
51
|
);
|
|
51
52
|
|
|
52
53
|
ctx.setHardhatRuntimeEnvironment(env);
|
package/src/types/runtime.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Artifacts } from "./artifacts";
|
|
2
|
-
import { HardhatConfig, NetworkConfig } from "./config";
|
|
2
|
+
import { HardhatConfig, HardhatUserConfig, NetworkConfig } from "./config";
|
|
3
3
|
import { EthereumProvider } from "./provider";
|
|
4
4
|
|
|
5
5
|
/**
|
|
@@ -186,6 +186,7 @@ export type RunTaskFunction = (
|
|
|
186
186
|
|
|
187
187
|
export interface HardhatRuntimeEnvironment {
|
|
188
188
|
readonly config: HardhatConfig;
|
|
189
|
+
readonly userConfig: HardhatUserConfig;
|
|
189
190
|
readonly hardhatArguments: HardhatArguments;
|
|
190
191
|
readonly tasks: TasksMap;
|
|
191
192
|
readonly run: RunTaskFunction;
|
package/types/runtime.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Artifacts } from "./artifacts";
|
|
2
|
-
import { HardhatConfig, NetworkConfig } from "./config";
|
|
2
|
+
import { HardhatConfig, HardhatUserConfig, NetworkConfig } from "./config";
|
|
3
3
|
import { EthereumProvider } from "./provider";
|
|
4
4
|
/**
|
|
5
5
|
* This class is used to dynamically validate task's argument types.
|
|
@@ -113,6 +113,7 @@ export interface TasksMap {
|
|
|
113
113
|
export declare type RunTaskFunction = (name: string, taskArguments?: TaskArguments) => Promise<any>;
|
|
114
114
|
export interface HardhatRuntimeEnvironment {
|
|
115
115
|
readonly config: HardhatConfig;
|
|
116
|
+
readonly userConfig: HardhatUserConfig;
|
|
116
117
|
readonly hardhatArguments: HardhatArguments;
|
|
117
118
|
readonly tasks: TasksMap;
|
|
118
119
|
readonly run: RunTaskFunction;
|
package/types/runtime.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/types/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/types/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C;;GAEG;AAEH,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,GAAG,IAAI,CAAC;CACrD;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;IACzD;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;IAEnD,QAAQ,CAAC,CAAC,EACR,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,CAAC,EAChB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EACtB,UAAU,CAAC,EAAE,OAAO,GACnB,IAAI,CAAC;IAER,gBAAgB,CAAC,CAAC,EAChB,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,CAAC,EAChB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GACrB,IAAI,CAAC;IAER,kBAAkB,CAAC,CAAC,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,CAAC,EAChB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EACtB,UAAU,CAAC,EAAE,OAAO,GACnB,IAAI,CAAC;IAER,0BAA0B,CAAC,CAAC,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,CAAC,EAChB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GACrB,IAAI,CAAC;IAER,0BAA0B,CAAC,CAAC,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,CAAC,EAAE,EAClB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EACtB,UAAU,CAAC,EAAE,OAAO,GACnB,IAAI,CAAC;IAER,kCAAkC,CAAC,CAAC,EAClC,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,CAAC,EAAE,EAClB,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GACrB,IAAI,CAAC;IAER,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,CAAC,CAAC;IACjB,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;IACpE,YAAY,EAAE,CAAC,CAAC;IAChB,UAAU,EAAE,IAAI,CAAC;CAClB;AAED,MAAM,WAAW,0BAA0B,CAAC,CAAC,CAC3C,SAAQ,uBAAuB,CAAC,CAAC,CAAC;IAClC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,cAAe,SAAQ,0BAA0B;IAChE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAI5B,QAAQ,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;IAE/C,QAAQ,CAAC,0BAA0B,EAAE,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;CAClE;AAED;;;;;;;;;;;;;GAaG;AACH,oBAAY,aAAa,GAAG,GAAG,CAAC;AAEhC,MAAM,WAAW,gBAAgB,CAAC,IAAI,SAAS,aAAa;IAC1D,CAAC,aAAa,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,oBAAY,UAAU,CAAC,KAAK,SAAS,aAAa,IAAI,CACpD,QAAQ,EAAE,KAAK,EACf,GAAG,EAAE,yBAAyB,EAC9B,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,KAC9B,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,oBAAY,uBAAuB,GAAG;KACnC,KAAK,IAAI,MAAM,QAAQ,CAAC,gBAAgB,CAAC,GAAG,0BAA0B,CACrE,gBAAgB,CAAC,KAAK,CAAC,CACxB;CACF,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC;CAChC;AAED,oBAAY,eAAe,GAAG,CAC5B,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,aAAa,KAC1B,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,eAAe,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;CAC/B;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAED;;;GAGG;AACH,oBAAY,mBAAmB,GAAG,CAAC,GAAG,EAAE,yBAAyB,KAAK,IAAI,CAAC"}
|