@layerzerolabs/hardhat-collect-outcomes 2.3.6 → 2.3.8
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/CHANGELOG.md +12 -0
- package/dist/src/index.js +9 -5
- package/dist/src/index.js.map +1 -1
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +4 -4
- package/dist/src/utils.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +13 -10
- package/src/utils.ts +4 -5
package/CHANGELOG.md
CHANGED
package/dist/src/index.js
CHANGED
|
@@ -27,7 +27,7 @@ const utils_1 = require("./utils");
|
|
|
27
27
|
const setting = userCollects.artifacts;
|
|
28
28
|
config.paths.collects.artifacts = {
|
|
29
29
|
target: (0, utils_1.abspath)(setting.target, config.paths.root),
|
|
30
|
-
patterns: setting.patterns
|
|
30
|
+
patterns: setting.patterns,
|
|
31
31
|
skip: setting.skip,
|
|
32
32
|
noCopy: setting.noCopy ?? false,
|
|
33
33
|
};
|
|
@@ -36,7 +36,7 @@ const utils_1 = require("./utils");
|
|
|
36
36
|
const setting = userCollects.deployments;
|
|
37
37
|
config.paths.collects.deployments = {
|
|
38
38
|
target: (0, utils_1.abspath)(setting.target, config.paths.root),
|
|
39
|
-
patterns: setting.patterns
|
|
39
|
+
patterns: setting.patterns,
|
|
40
40
|
noCopy: setting.noCopy ?? false,
|
|
41
41
|
};
|
|
42
42
|
}
|
|
@@ -44,7 +44,7 @@ const utils_1 = require("./utils");
|
|
|
44
44
|
const setting = userCollects.typechain;
|
|
45
45
|
config.paths.collects.typechain = {
|
|
46
46
|
target: (0, utils_1.abspath)(setting.target, config.paths.root),
|
|
47
|
-
patterns: setting.patterns
|
|
47
|
+
patterns: setting.patterns,
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
});
|
|
@@ -61,6 +61,7 @@ const taskArgsStore = {
|
|
|
61
61
|
await runSuper();
|
|
62
62
|
});
|
|
63
63
|
(0, config_1.subtask)(task_names_1.TASK_COMPILE_SOLIDITY_COMPILE_JOBS, 'copying artifacts').setAction(async (taskArgs, { config, network }, runSuper) => {
|
|
64
|
+
/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
64
65
|
const compileSolOutput = await runSuper(taskArgs);
|
|
65
66
|
if (config.paths.collects.artifacts === undefined) {
|
|
66
67
|
return compileSolOutput;
|
|
@@ -76,7 +77,7 @@ const taskArgsStore = {
|
|
|
76
77
|
}
|
|
77
78
|
const artifactsRoot = (0, utils_1.sanitizePath)(config.paths.artifacts);
|
|
78
79
|
const patterns = config.paths.collects.artifacts.patterns.map((p) => `${artifactsRoot}/${p}`);
|
|
79
|
-
const target = config.paths.collects.artifacts
|
|
80
|
+
const { target } = config.paths.collects.artifacts;
|
|
80
81
|
for (const pattern of patterns) {
|
|
81
82
|
const files = await (0, glob_1.glob)(pattern);
|
|
82
83
|
await Promise.all(files.map(async (f) => {
|
|
@@ -84,8 +85,10 @@ const taskArgsStore = {
|
|
|
84
85
|
}));
|
|
85
86
|
}
|
|
86
87
|
return compileSolOutput;
|
|
88
|
+
/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
87
89
|
});
|
|
88
90
|
(0, config_1.subtask)(hardhat_deploy_1.TASK_DEPLOY_RUN_DEPLOY, 'deploy run only').setAction(async (taskArgs, { config }, runSuper) => {
|
|
91
|
+
/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
89
92
|
const deployOutput = await runSuper(taskArgs);
|
|
90
93
|
if (config.paths.collects.deployments === undefined) {
|
|
91
94
|
return deployOutput;
|
|
@@ -95,7 +98,7 @@ const taskArgsStore = {
|
|
|
95
98
|
}
|
|
96
99
|
const deploymentsRoot = config.paths.deployments;
|
|
97
100
|
const patterns = config.paths.collects.deployments.patterns.map((p) => `${deploymentsRoot}/${p}`);
|
|
98
|
-
const target = config.paths.collects.deployments
|
|
101
|
+
const { target } = config.paths.collects.deployments;
|
|
99
102
|
for (const pattern of patterns) {
|
|
100
103
|
const files = await (0, glob_1.glob)(pattern);
|
|
101
104
|
await Promise.all(files.map(async (f) => {
|
|
@@ -103,5 +106,6 @@ const taskArgsStore = {
|
|
|
103
106
|
}));
|
|
104
107
|
}
|
|
105
108
|
return deployOutput;
|
|
109
|
+
/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
106
110
|
});
|
|
107
111
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;AAAA,6FAA6F;AAC7F,+CAA+C;AAC/C,6BAA0B;AAC1B,+BAA2B;AAC3B,iEAAmG;AACnG,2CAA4D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAKvD;AAED,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOtF;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvG;AAGD,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,MAG3C,CAAA"}
|
package/dist/src/utils.js
CHANGED
|
@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.sanitizePath = exports.copyFilesInRelativePath = exports.globFiles = exports.abspath = void 0;
|
|
27
|
-
const
|
|
27
|
+
const fs = __importStar(require("node:fs"));
|
|
28
|
+
const path = __importStar(require("node:path"));
|
|
29
|
+
const util = __importStar(require("node:util"));
|
|
28
30
|
const minimatch_1 = require("minimatch");
|
|
29
|
-
const fs = require('node:fs');
|
|
30
|
-
const util = require('node:util');
|
|
31
31
|
function abspath(p, root) {
|
|
32
32
|
if (path.isAbsolute(p)) {
|
|
33
33
|
return p;
|
|
@@ -41,7 +41,7 @@ async function globFiles(files, patterns) {
|
|
|
41
41
|
const rv = files.filter(minimatch_1.minimatch.filter(pattern, { matchBase: true }));
|
|
42
42
|
retval.push(...rv);
|
|
43
43
|
}
|
|
44
|
-
return retval;
|
|
44
|
+
return Promise.resolve(retval);
|
|
45
45
|
}
|
|
46
46
|
exports.globFiles = globFiles;
|
|
47
47
|
async function copyFilesInRelativePath(root, sour, target) {
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6B;AAC7B,gDAAiC;AACjC,gDAAiC;AAEjC,yCAAqC;AAErC,SAAgB,OAAO,CAAC,CAAS,EAAE,IAAY;IAC3C,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;QACpB,OAAO,CAAC,CAAA;KACX;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAC7C,CAAC;AALD,0BAKC;AAEM,KAAK,UAAU,SAAS,CAAC,KAAe,EAAE,QAAkB;IAC/D,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC5B,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,qBAAS,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACvE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;KACrB;IACD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;AAClC,CAAC;AAPD,8BAOC;AAEM,KAAK,UAAU,uBAAuB,CAAC,IAAY,EAAE,IAAY,EAAE,MAAc;IACpF,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAA;KACzD;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;QACzC,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;KAC3D;IACD,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AACjD,CAAC;AAXD,0DAWC;AAED,0DAA0D;AACnD,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE;IACjD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACpD,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AAHY,QAAA,YAAY,gBAGxB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@layerzerolabs/hardhat-collect-outcomes",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.8",
|
|
4
4
|
"description": "hardhat plugin to collect files from smart contracts",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ethereum",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@ethersproject/abi": "^5.7.0",
|
|
35
35
|
"@ethersproject/providers": "^5.7.0",
|
|
36
|
-
"@layerzerolabs/typescript-config-next": "^2.3.
|
|
36
|
+
"@layerzerolabs/typescript-config-next": "^2.3.8",
|
|
37
37
|
"@nomiclabs/hardhat-ethers": "^2.2.3",
|
|
38
38
|
"@typechain/ethers-v5": "^10.2.1",
|
|
39
39
|
"@typechain/hardhat": "^6.1.6",
|
package/src/index.ts
CHANGED
|
@@ -4,7 +4,6 @@ import './type-extensions'
|
|
|
4
4
|
import { glob } from 'glob'
|
|
5
5
|
import { TASK_COMPILE, TASK_COMPILE_SOLIDITY_COMPILE_JOBS } from 'hardhat/builtin-tasks/task-names'
|
|
6
6
|
import { extendConfig, subtask, task } from 'hardhat/config'
|
|
7
|
-
import { HardhatConfig } from 'hardhat/types'
|
|
8
7
|
import { TASK_DEPLOY_RUN_DEPLOY } from 'hardhat-deploy'
|
|
9
8
|
|
|
10
9
|
import { abspath, copyFilesInRelativePath, sanitizePath } from './utils'
|
|
@@ -29,7 +28,7 @@ extendConfig((config, userConfig) => {
|
|
|
29
28
|
const setting = userCollects.artifacts
|
|
30
29
|
config.paths.collects.artifacts = {
|
|
31
30
|
target: abspath(setting.target, config.paths.root),
|
|
32
|
-
patterns: setting.patterns
|
|
31
|
+
patterns: setting.patterns,
|
|
33
32
|
skip: setting.skip,
|
|
34
33
|
noCopy: setting.noCopy ?? false,
|
|
35
34
|
}
|
|
@@ -39,7 +38,7 @@ extendConfig((config, userConfig) => {
|
|
|
39
38
|
const setting = userCollects.deployments
|
|
40
39
|
config.paths.collects.deployments = {
|
|
41
40
|
target: abspath(setting.target, config.paths.root),
|
|
42
|
-
patterns: setting.patterns
|
|
41
|
+
patterns: setting.patterns,
|
|
43
42
|
noCopy: setting.noCopy ?? false,
|
|
44
43
|
}
|
|
45
44
|
}
|
|
@@ -48,12 +47,12 @@ extendConfig((config, userConfig) => {
|
|
|
48
47
|
const setting = userCollects.typechain
|
|
49
48
|
config.paths.collects.typechain = {
|
|
50
49
|
target: abspath(setting.target, config.paths.root),
|
|
51
|
-
patterns: setting.patterns
|
|
50
|
+
patterns: setting.patterns,
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
53
|
})
|
|
55
54
|
|
|
56
|
-
|
|
55
|
+
interface StoreType {
|
|
57
56
|
noCopyArtifacts: boolean
|
|
58
57
|
noCopyDeployments: boolean
|
|
59
58
|
}
|
|
@@ -74,6 +73,7 @@ task(TASK_COMPILE)
|
|
|
74
73
|
|
|
75
74
|
subtask(TASK_COMPILE_SOLIDITY_COMPILE_JOBS, 'copying artifacts').setAction(
|
|
76
75
|
async (taskArgs, { config, network }, runSuper) => {
|
|
76
|
+
/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
77
77
|
const compileSolOutput = await runSuper(taskArgs)
|
|
78
78
|
if (config.paths.collects.artifacts === undefined) {
|
|
79
79
|
return compileSolOutput
|
|
@@ -90,8 +90,8 @@ subtask(TASK_COMPILE_SOLIDITY_COMPILE_JOBS, 'copying artifacts').setAction(
|
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
const artifactsRoot = sanitizePath(config.paths.artifacts)
|
|
93
|
-
const patterns = config.paths.collects.artifacts
|
|
94
|
-
const target = config.paths.collects.artifacts
|
|
93
|
+
const patterns = config.paths.collects.artifacts.patterns.map((p) => `${artifactsRoot}/${p}`)
|
|
94
|
+
const { target } = config.paths.collects.artifacts
|
|
95
95
|
for (const pattern of patterns) {
|
|
96
96
|
const files = await glob(pattern)
|
|
97
97
|
await Promise.all(
|
|
@@ -102,10 +102,12 @@ subtask(TASK_COMPILE_SOLIDITY_COMPILE_JOBS, 'copying artifacts').setAction(
|
|
|
102
102
|
}
|
|
103
103
|
|
|
104
104
|
return compileSolOutput
|
|
105
|
+
/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
105
106
|
}
|
|
106
107
|
)
|
|
107
108
|
|
|
108
109
|
subtask(TASK_DEPLOY_RUN_DEPLOY, 'deploy run only').setAction(async (taskArgs, { config }, runSuper) => {
|
|
110
|
+
/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
109
111
|
const deployOutput = await runSuper(taskArgs)
|
|
110
112
|
if (config.paths.collects.deployments === undefined) {
|
|
111
113
|
return deployOutput
|
|
@@ -115,9 +117,9 @@ subtask(TASK_DEPLOY_RUN_DEPLOY, 'deploy run only').setAction(async (taskArgs, {
|
|
|
115
117
|
return deployOutput
|
|
116
118
|
}
|
|
117
119
|
|
|
118
|
-
const deploymentsRoot =
|
|
119
|
-
const patterns = config.paths.collects.deployments
|
|
120
|
-
const target = config.paths.collects.deployments
|
|
120
|
+
const deploymentsRoot = config.paths.deployments
|
|
121
|
+
const patterns = config.paths.collects.deployments.patterns.map((p) => `${deploymentsRoot}/${p}`)
|
|
122
|
+
const { target } = config.paths.collects.deployments
|
|
121
123
|
for (const pattern of patterns) {
|
|
122
124
|
const files = await glob(pattern)
|
|
123
125
|
await Promise.all(
|
|
@@ -128,4 +130,5 @@ subtask(TASK_DEPLOY_RUN_DEPLOY, 'deploy run only').setAction(async (taskArgs, {
|
|
|
128
130
|
}
|
|
129
131
|
|
|
130
132
|
return deployOutput
|
|
133
|
+
/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return */
|
|
131
134
|
})
|
package/src/utils.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import * as
|
|
1
|
+
import * as fs from 'node:fs'
|
|
2
|
+
import * as path from 'node:path'
|
|
3
|
+
import * as util from 'node:util'
|
|
2
4
|
|
|
3
5
|
import { minimatch } from 'minimatch'
|
|
4
6
|
|
|
5
|
-
const fs = require('node:fs')
|
|
6
|
-
const util = require('node:util')
|
|
7
|
-
|
|
8
7
|
export function abspath(p: string, root: string): string {
|
|
9
8
|
if (path.isAbsolute(p)) {
|
|
10
9
|
return p
|
|
@@ -18,7 +17,7 @@ export async function globFiles(files: string[], patterns: string[]): Promise<st
|
|
|
18
17
|
const rv = files.filter(minimatch.filter(pattern, { matchBase: true }))
|
|
19
18
|
retval.push(...rv)
|
|
20
19
|
}
|
|
21
|
-
return retval
|
|
20
|
+
return Promise.resolve(retval)
|
|
22
21
|
}
|
|
23
22
|
|
|
24
23
|
export async function copyFilesInRelativePath(root: string, sour: string, target: string): Promise<void> {
|