@rocketh/core 0.17.15 → 0.17.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/account.js +2 -2
- package/dist/account.js.map +1 -1
- package/dist/artifacts.d.ts +2 -3
- package/dist/artifacts.d.ts.map +1 -1
- package/dist/artifacts.js +4 -1
- package/dist/artifacts.js.map +1 -1
- package/package.json +1 -1
- package/src/account.ts +2 -2
- package/src/artifacts.ts +7 -6
package/dist/account.js
CHANGED
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
*/
|
|
21
21
|
export function resolveAccount(account, env) {
|
|
22
22
|
if (account.startsWith('0x')) {
|
|
23
|
-
return account;
|
|
23
|
+
return account.toLowerCase();
|
|
24
24
|
}
|
|
25
25
|
if (env.namedAccounts) {
|
|
26
26
|
const address = env.namedAccounts[account];
|
|
27
27
|
if (!address) {
|
|
28
28
|
throw new Error(`no address for ${account}`);
|
|
29
29
|
}
|
|
30
|
-
return address;
|
|
30
|
+
return address.toLowerCase();
|
|
31
31
|
}
|
|
32
32
|
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
|
33
33
|
}
|
package/dist/account.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,cAAc,CAC7B,OAAgC,EAChC,GAAuC;IAEvC,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,cAAc,CAC7B,OAAgC,EAChC,GAAuC;IAEvC,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC,WAAW,EAAmB,CAAC;IAC/C,CAAC;IAED,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,OAAO,CAAC,WAAW,EAAmB,CAAC;IAC/C,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,yBAAyB,CACxC,OAAgC,EAChC,GAAuC;IAEvC,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,OAAwB,CAAC;IACjC,CAAC;IAED,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC"}
|
package/dist/artifacts.d.ts
CHANGED
|
@@ -7,8 +7,7 @@ export declare function mergeABIs(list: {
|
|
|
7
7
|
name: string;
|
|
8
8
|
abi: Abi;
|
|
9
9
|
}[], options?: {
|
|
10
|
-
|
|
11
|
-
ignoreList?: string[];
|
|
10
|
+
checkForConflicts?: boolean | string[];
|
|
12
11
|
}): {
|
|
13
12
|
mergedABI: (import("abitype").AbiConstructor | import("abitype").AbiError | import("abitype").AbiEvent | import("abitype").AbiFallback | import("abitype").AbiFunction | import("abitype").AbiReceive)[];
|
|
14
13
|
added: Map<string, import("abitype").AbiConstructor | import("abitype").AbiError | import("abitype").AbiEvent | import("abitype").AbiFallback | import("abitype").AbiFunction | import("abitype").AbiReceive>;
|
|
@@ -24,7 +23,7 @@ export declare function mergeArtifacts(list: {
|
|
|
24
23
|
abi: Abi;
|
|
25
24
|
};
|
|
26
25
|
}[], options?: {
|
|
27
|
-
|
|
26
|
+
checkForConflicts?: boolean | string[];
|
|
28
27
|
}): {
|
|
29
28
|
mergedABI: (import("abitype").AbiConstructor | import("abitype").AbiError | import("abitype").AbiEvent | import("abitype").AbiFallback | import("abitype").AbiFunction | import("abitype").AbiReceive)[];
|
|
30
29
|
added: Map<string, import("abitype").AbiConstructor | import("abitype").AbiError | import("abitype").AbiEvent | import("abitype").AbiFallback | import("abitype").AbiFunction | import("abitype").AbiReceive>;
|
package/dist/artifacts.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../src/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAG1D,KAAK,aAAa,CAAC,IAAI,IAAI;IAC1B,CAAC,UAAU,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;CAClD,CAAC;AA6CF,wBAAgB,SAAS,
|
|
1
|
+
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../src/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAG1D,KAAK,aAAa,CAAC,IAAI,IAAI;IAC1B,CAAC,UAAU,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;CAClD,CAAC;AA6CF,wBAAgB,SAAS,CAAC,IAAI,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,EAAE,EAAE,OAAO,CAAC,EAAE;IAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,CAAA;CAAC;;;;eAGlE,MAAM;mBAAa,MAAM;sBAAgB,MAAM;;EAuE1F;AAED,wBAAgB,cAAc,CAC7B,IAAI,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG;QAAC,GAAG,EAAE,GAAG,CAAA;KAAC,CAAA;CAAC,EAAE,EACrE,OAAO,CAAC,EAAE;IAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,CAAA;CAAC;;;;;;eA3EP,MAAM;mBAAa,MAAM;sBAAgB,MAAM;;EA6H1F"}
|
package/dist/artifacts.js
CHANGED
|
@@ -41,6 +41,9 @@ export function mergeABIs(list, options) {
|
|
|
41
41
|
const added = new Map();
|
|
42
42
|
const mergedABI = [];
|
|
43
43
|
const sigJSMap = new Map();
|
|
44
|
+
// we default to check for conflict unless it is explicity set to false
|
|
45
|
+
const checkForConflicts = options?.checkForConflicts !== undefined ? !!options.checkForConflicts : true;
|
|
46
|
+
const ignoreList = typeof options?.checkForConflicts === 'object' ? options.checkForConflicts : [];
|
|
44
47
|
for (let i = 0; i < list.length; i++) {
|
|
45
48
|
const listElem = list[i];
|
|
46
49
|
for (const element of listElem.abi) {
|
|
@@ -48,7 +51,7 @@ export function mergeABIs(list, options) {
|
|
|
48
51
|
// const selector = getFunctionSelector(element);
|
|
49
52
|
const selector = toFunctionSelector(element);
|
|
50
53
|
if (sigJSMap.has(selector)) {
|
|
51
|
-
if (
|
|
54
|
+
if (checkForConflicts && !ignoreList.includes(element.name)) {
|
|
52
55
|
const existing = sigJSMap.get(selector);
|
|
53
56
|
throw new Error(`ABI conflict: ${existing.routeName} has function "${existing.functionName}" which conflict with ${listElem.name}'s "${element.name}" (selector: "${selector}") `);
|
|
54
57
|
}
|
package/dist/artifacts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../src/artifacts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,kBAAkB,EAAC,MAAM,MAAM,CAAC;AAUxC,yEAAyE;AACzE,SAAS,SAAS,CAAC,IAAS,EAAE,IAAS;IACtC,UAAU;IACV,SAAS,QAAQ,CAAC,GAAQ;QACzB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACb,CAAC;aAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACb,CAAC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAC;QACd,CAAC;QACD,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACxC,OAAO,KAAK,CAAC;YACd,CAAC;QACF,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,QAAQ,CAAC,MAAW,EAAE,aAAkB,EAAE,KAAa;IAC/D,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5E,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACpD,IAAI,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBACpG,MAAM,IAAI,KAAK,CAAC,OAAO,KAAK,eAAe,SAAS,IAAI,CAAC,CAAC;YAC3D,CAAC;YACD,eAAe,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAM,UAAU,SAAS,
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../src/artifacts.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/account.ts
CHANGED
|
@@ -26,7 +26,7 @@ export function resolveAccount(
|
|
|
26
26
|
env: Pick<Environment, 'namedAccounts'>,
|
|
27
27
|
): `0x${string}` {
|
|
28
28
|
if (account.startsWith('0x')) {
|
|
29
|
-
return account as `0x${string}`;
|
|
29
|
+
return account.toLowerCase() as `0x${string}`;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
if (env.namedAccounts) {
|
|
@@ -34,7 +34,7 @@ export function resolveAccount(
|
|
|
34
34
|
if (!address) {
|
|
35
35
|
throw new Error(`no address for ${account}`);
|
|
36
36
|
}
|
|
37
|
-
return address
|
|
37
|
+
return address.toLowerCase() as `0x${string}`;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
package/src/artifacts.ts
CHANGED
|
@@ -49,13 +49,14 @@ function mergeDoc(values: any, mergedDevDocs: any, field: string) {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
export function mergeABIs(
|
|
53
|
-
list: {name: string; abi: Abi}[],
|
|
54
|
-
options?: {doNotCheckForConflicts?: boolean; ignoreList?: string[]},
|
|
55
|
-
) {
|
|
52
|
+
export function mergeABIs(list: {name: string; abi: Abi}[], options?: {checkForConflicts?: boolean | string[]}) {
|
|
56
53
|
const added: Map<string, ArrayElement<Abi>> = new Map();
|
|
57
54
|
const mergedABI: CreateMutable<Abi> = [];
|
|
58
55
|
const sigJSMap: Map<`0x${string}`, {index: number; routeName: string; functionName: string}> = new Map();
|
|
56
|
+
|
|
57
|
+
// we default to check for conflict unless it is explicity set to false
|
|
58
|
+
const checkForConflicts = options?.checkForConflicts !== undefined ? !!options.checkForConflicts : true;
|
|
59
|
+
const ignoreList = typeof options?.checkForConflicts === 'object' ? options.checkForConflicts : [];
|
|
59
60
|
for (let i = 0; i < list.length; i++) {
|
|
60
61
|
const listElem = list[i];
|
|
61
62
|
for (const element of listElem.abi) {
|
|
@@ -63,7 +64,7 @@ export function mergeABIs(
|
|
|
63
64
|
// const selector = getFunctionSelector(element);
|
|
64
65
|
const selector = toFunctionSelector(element);
|
|
65
66
|
if (sigJSMap.has(selector)) {
|
|
66
|
-
if (
|
|
67
|
+
if (checkForConflicts && !ignoreList.includes(element.name)) {
|
|
67
68
|
const existing = sigJSMap.get(selector);
|
|
68
69
|
throw new Error(
|
|
69
70
|
`ABI conflict: ${existing!.routeName} has function "${existing!.functionName}" which conflict with ${
|
|
@@ -126,7 +127,7 @@ export function mergeABIs(
|
|
|
126
127
|
|
|
127
128
|
export function mergeArtifacts(
|
|
128
129
|
list: {name: string; artifact: Partial<Artifact<Abi>> & {abi: Abi}}[],
|
|
129
|
-
options?: {
|
|
130
|
+
options?: {checkForConflicts?: boolean | string[]},
|
|
130
131
|
) {
|
|
131
132
|
const {mergedABI, added, sigJSMap} = mergeABIs(
|
|
132
133
|
list.map((v) => ({name: v.name, abi: v.artifact.abi})),
|