@nomicfoundation/hardhat-viem 2.0.6 → 2.1.1
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/bytecode.js +3 -3
- package/internal/bytecode.js.map +1 -1
- package/internal/chains.d.ts.map +1 -1
- package/internal/chains.js +36 -11
- package/internal/chains.js.map +1 -1
- package/internal/errors.d.ts +1 -4
- package/internal/errors.d.ts.map +1 -1
- package/internal/errors.js +3 -17
- package/internal/errors.js.map +1 -1
- package/package.json +4 -4
- package/src/internal/bytecode.ts +4 -4
- package/src/internal/chains.ts +14 -19
- package/src/internal/errors.ts +1 -17
package/internal/bytecode.js
CHANGED
|
@@ -41,12 +41,12 @@ async function linkBytecode(artifact, libraries) {
|
|
|
41
41
|
return isHex(bytecode) ? bytecode : `0x${bytecode}`;
|
|
42
42
|
}
|
|
43
43
|
exports.linkBytecode = linkBytecode;
|
|
44
|
-
async function
|
|
44
|
+
async function throwOnAmbiguousLibraryNameOrUnnecessaryLink(contractName, libraries, neededLibraries) {
|
|
45
45
|
for (const linkedLibraryName of Object.keys(libraries)) {
|
|
46
46
|
const matchingLibraries = neededLibraries.filter(({ sourceName, libraryName }) => libraryName === linkedLibraryName ||
|
|
47
47
|
`${sourceName}:${libraryName}` === linkedLibraryName);
|
|
48
48
|
if (matchingLibraries.length > 1) {
|
|
49
|
-
throw new errors_1.
|
|
49
|
+
throw new errors_1.AmbiguousLibraryNameError(contractName, linkedLibraryName, matchingLibraries.map(({ sourceName, libraryName }) => `${sourceName}:${libraryName}`));
|
|
50
50
|
}
|
|
51
51
|
else if (matchingLibraries.length === 0) {
|
|
52
52
|
throw new errors_1.UnnecessaryLibraryLinkError(contractName, linkedLibraryName);
|
|
@@ -85,7 +85,7 @@ async function resolveBytecodeWithLinkedLibraries(artifact, libraries) {
|
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
await
|
|
88
|
+
await throwOnAmbiguousLibraryNameOrUnnecessaryLink(artifact.contractName, libraries, neededLibraries);
|
|
89
89
|
await throwOnOverlappingLibraryNames(artifact.contractName, libraries, neededLibraries);
|
|
90
90
|
await throwOnMissingLibrariesAddress(artifact.contractName, libraries, neededLibraries);
|
|
91
91
|
return linkBytecode(artifact, neededLibraries);
|
package/internal/bytecode.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bytecode.js","sourceRoot":"","sources":["../src/internal/bytecode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,qCAKkB;AAYX,KAAK,UAAU,YAAY,CAChC,QAAkB,EAClB,SAAiB;IAEjB,MAAM,EAAE,KAAK,EAAE,GAAG,wDAAa,MAAM,GAAC,CAAC;IACvC,IAAI,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IAEjC,mCAAmC;IACnC,KAAK,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,SAAS,EAAE;QAC5D,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,CAAC;QACxE,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,cAAc,EAAE;YAC9C,QAAQ;gBACN,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;oBACpC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;oBACpB,QAAQ,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SAChD;KACF;IAED,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;AACtD,CAAC;AAnBD,oCAmBC;AAED,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"bytecode.js","sourceRoot":"","sources":["../src/internal/bytecode.ts"],"names":[],"mappings":"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"}
|
package/internal/chains.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../src/internal/chains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../src/internal/chains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAM/C,wBAAsB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,CAsCzE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,WAEnD;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,cAAc,CAAC,CAQzB"}
|
package/internal/chains.js
CHANGED
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -7,30 +30,35 @@ exports.getMode = exports.isDevelopmentNetwork = exports.getChain = void 0;
|
|
|
7
30
|
const lodash_memoize_1 = __importDefault(require("lodash.memoize"));
|
|
8
31
|
const errors_1 = require("./errors");
|
|
9
32
|
async function getChain(provider) {
|
|
10
|
-
const
|
|
33
|
+
const { extractChain } = await Promise.resolve().then(() => __importStar(require("viem")));
|
|
34
|
+
const chainsModule = await Promise.resolve().then(() => __importStar(require("viem/chains")));
|
|
35
|
+
const chains = Object.values(chainsModule);
|
|
11
36
|
const chainId = await getChainId(provider);
|
|
12
37
|
if (isDevelopmentNetwork(chainId)) {
|
|
13
38
|
if (await isHardhatNetwork(provider)) {
|
|
14
|
-
return
|
|
39
|
+
return chainsModule.hardhat;
|
|
15
40
|
}
|
|
16
41
|
else if (await isFoundryNetwork(provider)) {
|
|
17
|
-
return
|
|
42
|
+
return chainsModule.foundry;
|
|
18
43
|
}
|
|
19
44
|
else {
|
|
20
45
|
throw new errors_1.UnknownDevelopmentNetworkError();
|
|
21
46
|
}
|
|
22
47
|
}
|
|
23
|
-
const
|
|
24
|
-
|
|
48
|
+
const chain = extractChain({
|
|
49
|
+
chains,
|
|
50
|
+
id: chainId,
|
|
51
|
+
});
|
|
52
|
+
if (chain === undefined) {
|
|
25
53
|
if (await isHardhatNetwork(provider)) {
|
|
26
54
|
return {
|
|
27
|
-
...
|
|
55
|
+
...chainsModule.hardhat,
|
|
28
56
|
id: chainId,
|
|
29
57
|
};
|
|
30
58
|
}
|
|
31
59
|
else if (await isFoundryNetwork(provider)) {
|
|
32
60
|
return {
|
|
33
|
-
...
|
|
61
|
+
...chainsModule.foundry,
|
|
34
62
|
id: chainId,
|
|
35
63
|
};
|
|
36
64
|
}
|
|
@@ -38,10 +66,7 @@ async function getChain(provider) {
|
|
|
38
66
|
throw new errors_1.NetworkNotFoundError(chainId);
|
|
39
67
|
}
|
|
40
68
|
}
|
|
41
|
-
|
|
42
|
-
throw new errors_1.MultipleMatchingNetworksError(chainId);
|
|
43
|
-
}
|
|
44
|
-
return matchingChains[0];
|
|
69
|
+
return chain;
|
|
45
70
|
}
|
|
46
71
|
exports.getChain = getChain;
|
|
47
72
|
function isDevelopmentNetwork(chainId) {
|
package/internal/chains.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chains.js","sourceRoot":"","sources":["../src/internal/chains.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chains.js","sourceRoot":"","sources":["../src/internal/chains.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,oEAAqC;AAErC,qCAAgF;AAEzE,KAAK,UAAU,QAAQ,CAAC,QAA0B;IACvD,MAAM,EAAE,YAAY,EAAE,GAAG,wDAAa,MAAM,GAAC,CAAC;IAC9C,MAAM,YAAY,GAAG,wDAAa,aAAa,GAAC,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAY,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE3C,IAAI,oBAAoB,CAAC,OAAO,CAAC,EAAE;QACjC,IAAI,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACpC,OAAO,YAAY,CAAC,OAAO,CAAC;SAC7B;aAAM,IAAI,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YAC3C,OAAO,YAAY,CAAC,OAAO,CAAC;SAC7B;aAAM;YACL,MAAM,IAAI,uCAA8B,EAAE,CAAC;SAC5C;KACF;IAED,MAAM,KAAK,GAAG,YAAY,CAAC;QACzB,MAAM;QACN,EAAE,EAAE,OAAO;KACZ,CAAC,CAAC;IAEH,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,IAAI,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACpC,OAAO;gBACL,GAAG,YAAY,CAAC,OAAO;gBACvB,EAAE,EAAE,OAAO;aACZ,CAAC;SACH;aAAM,IAAI,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YAC3C,OAAO;gBACL,GAAG,YAAY,CAAC,OAAO;gBACvB,EAAE,EAAE,OAAO;aACZ,CAAC;SACH;aAAM;YACL,MAAM,IAAI,6BAAoB,CAAC,OAAO,CAAC,CAAC;SACzC;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAtCD,4BAsCC;AAED,SAAgB,oBAAoB,CAAC,OAAe;IAClD,OAAO,OAAO,KAAK,KAAK,CAAC;AAC3B,CAAC;AAFD,oDAEC;AAEM,KAAK,UAAU,OAAO,CAC3B,QAA0B;IAE1B,IAAI,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE;QACpC,OAAO,SAAS,CAAC;KAClB;SAAM,IAAI,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE;QAC3C,OAAO,OAAO,CAAC;KAChB;SAAM;QACL,MAAM,IAAI,uCAA8B,EAAE,CAAC;KAC5C;AACH,CAAC;AAVD,0BAUC;AAED,MAAM,UAAU,GAAG,IAAA,wBAAO,EAAC,KAAK,EAAE,QAA0B,EAAE,EAAE,CAC9D,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAC3C,CAAC;AAEF,MAAM,gBAAgB,GAAG,IAAA,wBAAO,EAAC,KAAK,EAAE,QAA0B,EAAE,EAAE,CACpE,yBAAyB,CAAC,QAAQ,EAAE,aAAa,CAAC,gBAAgB,CAAC,CACpE,CAAC;AAEF,MAAM,gBAAgB,GAAG,IAAA,wBAAO,EAAC,KAAK,EAAE,QAA0B,EAAE,EAAE,CACpE,yBAAyB,CAAC,QAAQ,EAAE,aAAa,CAAC,eAAe,CAAC,CACnE,CAAC;AAEF,IAAK,aAGJ;AAHD,WAAK,aAAa;IAChB,sDAAqC,CAAA;IACrC,mDAAkC,CAAA;AACpC,CAAC,EAHI,aAAa,KAAb,aAAa,QAGjB;AAED,KAAK,UAAU,yBAAyB,CACtC,QAA0B,EAC1B,UAAkB;IAElB,IAAI;QACF,MAAM,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;KACb;IAAC,MAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|
package/internal/errors.d.ts
CHANGED
|
@@ -9,9 +9,6 @@ export declare class UnknownDevelopmentNetworkError extends HardhatViemError {
|
|
|
9
9
|
export declare class NetworkNotFoundError extends HardhatViemError {
|
|
10
10
|
constructor(chainId: number);
|
|
11
11
|
}
|
|
12
|
-
export declare class MultipleMatchingNetworksError extends HardhatViemError {
|
|
13
|
-
constructor(chainId: number);
|
|
14
|
-
}
|
|
15
12
|
export declare class DefaultWalletClientNotFoundError extends HardhatViemError {
|
|
16
13
|
constructor(networkName: string);
|
|
17
14
|
}
|
|
@@ -21,7 +18,7 @@ export declare class InvalidConfirmationsError extends HardhatViemError {
|
|
|
21
18
|
export declare class DeployContractError extends HardhatViemError {
|
|
22
19
|
constructor(txHash: string, blockNumber: bigint);
|
|
23
20
|
}
|
|
24
|
-
export declare class
|
|
21
|
+
export declare class AmbiguousLibraryNameError extends HardhatViemError {
|
|
25
22
|
constructor(contractName: string, libraryName: string, matchingLibraries: string[]);
|
|
26
23
|
}
|
|
27
24
|
export declare class OverlappingLibraryNamesError extends HardhatViemError {
|
package/internal/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/internal/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAE9D,qBAAa,gBAAiB,SAAQ,2BAA2B;gBACnD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK;CAG5C;AAED,qBAAa,8BAA+B,SAAQ,gBAAgB;;CAKnE;AAED,qBAAa,oBAAqB,SAAQ,gBAAgB;gBAC5C,OAAO,EAAE,MAAM;CAa5B;AAED,qBAAa,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/internal/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAE9D,qBAAa,gBAAiB,SAAQ,2BAA2B;gBACnD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK;CAG5C;AAED,qBAAa,8BAA+B,SAAQ,gBAAgB;;CAKnE;AAED,qBAAa,oBAAqB,SAAQ,gBAAgB;gBAC5C,OAAO,EAAE,MAAM;CAa5B;AAED,qBAAa,gCAAiC,SAAQ,gBAAgB;gBACxD,WAAW,EAAE,MAAM;CAWhC;AAED,qBAAa,yBAA0B,SAAQ,gBAAgB;;CAM9D;AAED,qBAAa,mBAAoB,SAAQ,gBAAgB;gBAC3C,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAKhD;AAED,qBAAa,yBAA0B,SAAQ,gBAAgB;gBAE3D,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EAAE;CAU9B;AAED,qBAAa,4BAA6B,SAAQ,gBAAgB;gBACpD,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAKpD;AAED,qBAAa,2BAA4B,SAAQ,gBAAgB;gBACnD,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAKtD;AAED,qBAAa,0BAA2B,SAAQ,gBAAgB;gBAE5D,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,CAAC;CAUpE"}
|
package/internal/errors.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MissingLibraryAddressError = exports.UnnecessaryLibraryLinkError = exports.OverlappingLibraryNamesError = exports.
|
|
3
|
+
exports.MissingLibraryAddressError = exports.UnnecessaryLibraryLinkError = exports.OverlappingLibraryNamesError = exports.AmbiguousLibraryNameError = exports.DeployContractError = exports.InvalidConfirmationsError = exports.DefaultWalletClientNotFoundError = exports.NetworkNotFoundError = exports.UnknownDevelopmentNetworkError = exports.HardhatViemError = void 0;
|
|
4
4
|
const plugins_1 = require("hardhat/plugins");
|
|
5
5
|
class HardhatViemError extends plugins_1.NomicLabsHardhatPluginError {
|
|
6
6
|
constructor(message, parent) {
|
|
@@ -29,20 +29,6 @@ You can find a list of supported networks here: https://github.com/wevm/viem/blo
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
exports.NetworkNotFoundError = NetworkNotFoundError;
|
|
32
|
-
class MultipleMatchingNetworksError extends HardhatViemError {
|
|
33
|
-
constructor(chainId) {
|
|
34
|
-
super(`Multiple networks with chain id ${chainId} found. You can override the chain by passing it as a parameter to the client getter:
|
|
35
|
-
|
|
36
|
-
import { someChain } from "viem/chains";
|
|
37
|
-
const client = await hre.viem.getPublicClient({
|
|
38
|
-
chain: someChain,
|
|
39
|
-
...
|
|
40
|
-
});
|
|
41
|
-
|
|
42
|
-
You can find a list of supported networks here: https://github.com/wevm/viem/blob/main/src/chains/index.ts`);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
exports.MultipleMatchingNetworksError = MultipleMatchingNetworksError;
|
|
46
32
|
class DefaultWalletClientNotFoundError extends HardhatViemError {
|
|
47
33
|
constructor(networkName) {
|
|
48
34
|
super(`Default wallet client not found. This can happen if no accounts were configured for this network (network: '${networkName}').
|
|
@@ -67,7 +53,7 @@ class DeployContractError extends HardhatViemError {
|
|
|
67
53
|
}
|
|
68
54
|
}
|
|
69
55
|
exports.DeployContractError = DeployContractError;
|
|
70
|
-
class
|
|
56
|
+
class AmbiguousLibraryNameError extends HardhatViemError {
|
|
71
57
|
constructor(contractName, libraryName, matchingLibraries) {
|
|
72
58
|
super(`The library name "${libraryName}" is ambiguous for the contract "${contractName}".
|
|
73
59
|
It may resolve to one of the following libraries:
|
|
@@ -76,7 +62,7 @@ ${matchingLibraries.map((fqn) => `\n\t* ${fqn}`).join(",")}
|
|
|
76
62
|
To fix this, choose one of these fully qualified library names and replace where appropriate.`);
|
|
77
63
|
}
|
|
78
64
|
}
|
|
79
|
-
exports.
|
|
65
|
+
exports.AmbiguousLibraryNameError = AmbiguousLibraryNameError;
|
|
80
66
|
class OverlappingLibraryNamesError extends HardhatViemError {
|
|
81
67
|
constructor(sourceName, libraryName) {
|
|
82
68
|
super(`The library name "${libraryName}" and "${sourceName}:${libraryName}" are both linking to the same library. Please use one of them, or If they are not the same library, use fully qualified names instead.`);
|
package/internal/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/internal/errors.ts"],"names":[],"mappings":";;;AAEA,6CAA8D;AAE9D,MAAa,gBAAiB,SAAQ,qCAA2B;IAC/D,YAAY,OAAe,EAAE,MAAc;QACzC,KAAK,CAAC,+BAA+B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,8BAA+B,SAAQ,gBAAgB;IAClE;QACE,KAAK,CAAC;6DACmD,CAAC,CAAC;IAC7D,CAAC;CACF;AALD,wEAKC;AAED,MAAa,oBAAqB,SAAQ,gBAAgB;IACxD,YAAY,OAAe;QACzB,KAAK,CACH,4BAA4B,OAAO;;;;;;;;2GAQkE,CACtG,CAAC;IACJ,CAAC;CACF;AAdD,oDAcC;AAED,MAAa,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/internal/errors.ts"],"names":[],"mappings":";;;AAEA,6CAA8D;AAE9D,MAAa,gBAAiB,SAAQ,qCAA2B;IAC/D,YAAY,OAAe,EAAE,MAAc;QACzC,KAAK,CAAC,+BAA+B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,8BAA+B,SAAQ,gBAAgB;IAClE;QACE,KAAK,CAAC;6DACmD,CAAC,CAAC;IAC7D,CAAC;CACF;AALD,wEAKC;AAED,MAAa,oBAAqB,SAAQ,gBAAgB;IACxD,YAAY,OAAe;QACzB,KAAK,CACH,4BAA4B,OAAO;;;;;;;;2GAQkE,CACtG,CAAC;IACJ,CAAC;CACF;AAdD,oDAcC;AAED,MAAa,gCAAiC,SAAQ,gBAAgB;IACpE,YAAY,WAAmB;QAC7B,KAAK,CACH,+GAA+G,WAAW;;;;;;gFAMhD,CAC3E,CAAC;IACJ,CAAC;CACF;AAZD,4EAYC;AAED,MAAa,yBAA0B,SAAQ,gBAAgB;IAC7D;QACE,KAAK,CACH,2IAA2I,CAC5I,CAAC;IACJ,CAAC;CACF;AAND,8DAMC;AAED,MAAa,mBAAoB,SAAQ,gBAAgB;IACvD,YAAY,MAAc,EAAE,WAAmB;QAC7C,KAAK,CACH,+BAA+B,MAAM,yBAAyB,WAAW,sDAAsD,CAChI,CAAC;IACJ,CAAC;CACF;AAND,kDAMC;AAED,MAAa,yBAA0B,SAAQ,gBAAgB;IAC7D,YACE,YAAoB,EACpB,WAAmB,EACnB,iBAA2B;QAE3B,KAAK,CACH,qBAAqB,WAAW,oCAAoC,YAAY;;EAEpF,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;8FAEoC,CACzF,CAAC;IACJ,CAAC;CACF;AAdD,8DAcC;AAED,MAAa,4BAA6B,SAAQ,gBAAgB;IAChE,YAAY,UAAkB,EAAE,WAAmB;QACjD,KAAK,CACH,qBAAqB,WAAW,UAAU,UAAU,IAAI,WAAW,yIAAyI,CAC7M,CAAC;IACJ,CAAC;CACF;AAND,oEAMC;AAED,MAAa,2BAA4B,SAAQ,gBAAgB;IAC/D,YAAY,YAAoB,EAAE,WAAmB;QACnD,KAAK,CACH,qBAAqB,WAAW,gDAAgD,YAAY,aAAa,CAC1G,CAAC;IACJ,CAAC;CACF;AAND,kEAMC;AAED,MAAa,0BAA2B,SAAQ,gBAAgB;IAC9D,YACE,YAAoB,EACpB,gBAAiE;QAEjE,KAAK,CACH;EACJ,gBAAgB;aACf,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,QAAQ,UAAU,IAAI,WAAW,GAAG,CAAC;aAC1E,IAAI,CAAC,KAAK,CAAC;0DAC4C,YAAY,GAAG,CACpE,CAAC;IACJ,CAAC;CACF;AAbD,gEAaC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nomicfoundation/hardhat-viem",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.1.1",
|
|
4
4
|
"description": "Hardhat plugin for viem",
|
|
5
5
|
"homepage": "https://github.com/nomicfoundation/hardhat/tree/main/packages/hardhat-viem",
|
|
6
6
|
"repository": "github:nomicfoundation/hardhat",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"@types/lodash": "^4.14.123",
|
|
32
32
|
"@types/lodash.memoize": "^4.1.7",
|
|
33
33
|
"@types/mocha": ">=9.1.0",
|
|
34
|
-
"@types/node": "^
|
|
34
|
+
"@types/node": "^20.0.0",
|
|
35
35
|
"@types/sinon": "^9.0.8",
|
|
36
36
|
"@typescript-eslint/eslint-plugin": "5.61.0",
|
|
37
37
|
"@typescript-eslint/parser": "5.61.0",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"eslint-plugin-import": "2.27.5",
|
|
43
43
|
"eslint-plugin-mocha": "10.4.1",
|
|
44
44
|
"eslint-plugin-prettier": "3.4.0",
|
|
45
|
-
"hardhat": "^2.
|
|
45
|
+
"hardhat": "^2.26.0",
|
|
46
46
|
"jest-diff": "^29.7.0",
|
|
47
47
|
"mocha": "^10.0.0",
|
|
48
48
|
"nyc": "^15.1.0",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@nomicfoundation/eslint-plugin-slow-imports": "^1.0.0"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"hardhat": "^2.
|
|
59
|
+
"hardhat": "^2.26.0",
|
|
60
60
|
"viem": "^2.7.6"
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
package/src/internal/bytecode.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type * as viemT from "viem";
|
|
|
2
2
|
import type { Artifact } from "hardhat/types/artifacts";
|
|
3
3
|
|
|
4
4
|
import {
|
|
5
|
-
|
|
5
|
+
AmbiguousLibraryNameError,
|
|
6
6
|
MissingLibraryAddressError,
|
|
7
7
|
OverlappingLibraryNamesError,
|
|
8
8
|
UnnecessaryLibraryLinkError,
|
|
@@ -39,7 +39,7 @@ export async function linkBytecode(
|
|
|
39
39
|
return isHex(bytecode) ? bytecode : `0x${bytecode}`;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
async function
|
|
42
|
+
async function throwOnAmbiguousLibraryNameOrUnnecessaryLink(
|
|
43
43
|
contractName: string,
|
|
44
44
|
libraries: Libraries<viemT.Address>,
|
|
45
45
|
neededLibraries: Link[]
|
|
@@ -52,7 +52,7 @@ async function throwOnAmbigousLibraryNameOrUnnecessaryLink(
|
|
|
52
52
|
);
|
|
53
53
|
|
|
54
54
|
if (matchingLibraries.length > 1) {
|
|
55
|
-
throw new
|
|
55
|
+
throw new AmbiguousLibraryNameError(
|
|
56
56
|
contractName,
|
|
57
57
|
linkedLibraryName,
|
|
58
58
|
matchingLibraries.map(
|
|
@@ -118,7 +118,7 @@ export async function resolveBytecodeWithLinkedLibraries(
|
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
|
|
121
|
-
await
|
|
121
|
+
await throwOnAmbiguousLibraryNameOrUnnecessaryLink(
|
|
122
122
|
artifact.contractName,
|
|
123
123
|
libraries,
|
|
124
124
|
neededLibraries
|
package/src/internal/chains.ts
CHANGED
|
@@ -4,39 +4,38 @@ import type { TestClientMode } from "../types";
|
|
|
4
4
|
|
|
5
5
|
import memoize from "lodash.memoize";
|
|
6
6
|
|
|
7
|
-
import {
|
|
8
|
-
UnknownDevelopmentNetworkError,
|
|
9
|
-
NetworkNotFoundError,
|
|
10
|
-
MultipleMatchingNetworksError,
|
|
11
|
-
} from "./errors";
|
|
7
|
+
import { UnknownDevelopmentNetworkError, NetworkNotFoundError } from "./errors";
|
|
12
8
|
|
|
13
9
|
export async function getChain(provider: EthereumProvider): Promise<Chain> {
|
|
14
|
-
const
|
|
10
|
+
const { extractChain } = await import("viem");
|
|
11
|
+
const chainsModule = await import("viem/chains");
|
|
12
|
+
const chains = Object.values(chainsModule) as Chain[];
|
|
15
13
|
const chainId = await getChainId(provider);
|
|
16
14
|
|
|
17
15
|
if (isDevelopmentNetwork(chainId)) {
|
|
18
16
|
if (await isHardhatNetwork(provider)) {
|
|
19
|
-
return
|
|
17
|
+
return chainsModule.hardhat;
|
|
20
18
|
} else if (await isFoundryNetwork(provider)) {
|
|
21
|
-
return
|
|
19
|
+
return chainsModule.foundry;
|
|
22
20
|
} else {
|
|
23
21
|
throw new UnknownDevelopmentNetworkError();
|
|
24
22
|
}
|
|
25
23
|
}
|
|
26
24
|
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
const chain = extractChain({
|
|
26
|
+
chains,
|
|
27
|
+
id: chainId,
|
|
28
|
+
});
|
|
30
29
|
|
|
31
|
-
if (
|
|
30
|
+
if (chain === undefined) {
|
|
32
31
|
if (await isHardhatNetwork(provider)) {
|
|
33
32
|
return {
|
|
34
|
-
...
|
|
33
|
+
...chainsModule.hardhat,
|
|
35
34
|
id: chainId,
|
|
36
35
|
};
|
|
37
36
|
} else if (await isFoundryNetwork(provider)) {
|
|
38
37
|
return {
|
|
39
|
-
...
|
|
38
|
+
...chainsModule.foundry,
|
|
40
39
|
id: chainId,
|
|
41
40
|
};
|
|
42
41
|
} else {
|
|
@@ -44,11 +43,7 @@ export async function getChain(provider: EthereumProvider): Promise<Chain> {
|
|
|
44
43
|
}
|
|
45
44
|
}
|
|
46
45
|
|
|
47
|
-
|
|
48
|
-
throw new MultipleMatchingNetworksError(chainId);
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
return matchingChains[0];
|
|
46
|
+
return chain;
|
|
52
47
|
}
|
|
53
48
|
|
|
54
49
|
export function isDevelopmentNetwork(chainId: number) {
|
package/src/internal/errors.ts
CHANGED
|
@@ -31,22 +31,6 @@ You can find a list of supported networks here: https://github.com/wevm/viem/blo
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
export class MultipleMatchingNetworksError extends HardhatViemError {
|
|
35
|
-
constructor(chainId: number) {
|
|
36
|
-
super(
|
|
37
|
-
`Multiple networks with chain id ${chainId} found. You can override the chain by passing it as a parameter to the client getter:
|
|
38
|
-
|
|
39
|
-
import { someChain } from "viem/chains";
|
|
40
|
-
const client = await hre.viem.getPublicClient({
|
|
41
|
-
chain: someChain,
|
|
42
|
-
...
|
|
43
|
-
});
|
|
44
|
-
|
|
45
|
-
You can find a list of supported networks here: https://github.com/wevm/viem/blob/main/src/chains/index.ts`
|
|
46
|
-
);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
|
|
50
34
|
export class DefaultWalletClientNotFoundError extends HardhatViemError {
|
|
51
35
|
constructor(networkName: string) {
|
|
52
36
|
super(
|
|
@@ -77,7 +61,7 @@ export class DeployContractError extends HardhatViemError {
|
|
|
77
61
|
}
|
|
78
62
|
}
|
|
79
63
|
|
|
80
|
-
export class
|
|
64
|
+
export class AmbiguousLibraryNameError extends HardhatViemError {
|
|
81
65
|
constructor(
|
|
82
66
|
contractName: string,
|
|
83
67
|
libraryName: string,
|