@rocketh/router 0.11.23 → 0.11.25-testing.0
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/index.d.ts +4 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +52 -55
- package/dist/index.js.map +1 -1
- package/package.json +4 -5
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Abi } from 'abitype';
|
|
2
|
-
import type { Artifact, DeploymentConstruction, Deployment } from 'rocketh';
|
|
2
|
+
import type { Artifact, DeploymentConstruction, Deployment, Environment } from 'rocketh';
|
|
3
3
|
import '@rocketh/deploy';
|
|
4
4
|
import { DeployContractParameters } from 'viem';
|
|
5
5
|
import Router10X60 from './solidity-proxy-artifacts/Router10x60.js';
|
|
@@ -11,9 +11,7 @@ export type RouterEnhancedDeploymentConstruction = Omit<DeploymentConstruction<t
|
|
|
11
11
|
export type DeployViaRouterFunction = <TAbi extends Abi>(name: string, params: RouterEnhancedDeploymentConstruction, routes: Route<Abi>[], extraABIs?: Abi[]) => Promise<Deployment<TAbi> & {
|
|
12
12
|
newlyDeployed: boolean;
|
|
13
13
|
}>;
|
|
14
|
-
declare
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
}
|
|
14
|
+
export declare function deployViaRouter<TAbi extends Abi>(env: Environment, name: string, params: RouterEnhancedDeploymentConstruction, routes: Route<Abi>[], extraABIs?: Abi[]): Promise<Deployment<TAbi> & {
|
|
15
|
+
newlyDeployed: boolean;
|
|
16
|
+
}>;
|
|
19
17
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAC5B,OAAO,KAAK,EAAC,QAAQ,EAAE,sBAAsB,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAC5B,OAAO,KAAK,EAAC,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AACxG,OAAO,iBAAiB,CAAC;AAEzB,OAAO,EAAC,wBAAwB,EAAC,MAAM,MAAM,CAAC;AAE9C,OAAO,WAAW,MAAM,2CAA2C,CAAC;AAKpE,MAAM,MAAM,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,GAAG,IAAI,IAAI,CAC/C,wBAAwB,CAAC,IAAI,CAAC,EAC9B,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CACxC,GAAG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,IAAI,CACtD,sBAAsB,CAAC,OAAO,WAAW,CAAC,GAAG,CAAC,EAC9C,UAAU,GAAG,MAAM,CACnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,CAAC,IAAI,SAAS,GAAG,EACtD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,oCAAoC,EAC5C,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EACpB,SAAS,CAAC,EAAE,GAAG,EAAE,KACb,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;IAAC,aAAa,EAAE,OAAO,CAAA;CAAC,CAAC,CAAC;AAE1D,wBAAsB,eAAe,CAAC,IAAI,SAAS,GAAG,EACrD,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,oCAAoC,EAC5C,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EACpB,SAAS,CAAC,EAAE,GAAG,EAAE,GACf,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;IAAC,aAAa,EAAE,OAAO,CAAA;CAAC,CAAC,CAwEtD"}
|
package/dist/index.js
CHANGED
|
@@ -1,64 +1,61 @@
|
|
|
1
1
|
import '@rocketh/deploy';
|
|
2
|
-
import {
|
|
2
|
+
import { mergeArtifacts } from 'rocketh';
|
|
3
3
|
import { logs } from 'named-logs';
|
|
4
4
|
import Router10X60 from './solidity-proxy-artifacts/Router10x60.js';
|
|
5
|
+
import { deploy } from '@rocketh/deploy';
|
|
5
6
|
const logger = logs('@rocketh/router');
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
namedAbis.push({ name: `extra${i}`, artifact: { abi: extra } });
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
const { sigJSMap, mergedABI, mergedDevDocs, mergedUserDocs } = mergeArtifacts(namedAbis);
|
|
20
|
-
for (const route of routes) {
|
|
21
|
-
const deployedRoute = await env.deploy(`${name}_Router_${route.name}_Route`, {
|
|
22
|
-
...params,
|
|
23
|
-
artifact: route.artifact,
|
|
24
|
-
args: route.args,
|
|
25
|
-
});
|
|
26
|
-
implementations.push(deployedRoute.address);
|
|
27
|
-
}
|
|
28
|
-
const fallbackImplementation = '0x0000000000000000000000000000000000000000';
|
|
29
|
-
const unorderedSigMap = [];
|
|
30
|
-
for (const entry of sigJSMap) {
|
|
31
|
-
// we add +1 to index as 0 indicate no implementation
|
|
32
|
-
unorderedSigMap.push((entry[0] + entry[1].index.toString(16).padStart(2, '0')));
|
|
7
|
+
export async function deployViaRouter(env, name, params, routes, extraABIs) {
|
|
8
|
+
const implementations = [];
|
|
9
|
+
const namedAbis = [];
|
|
10
|
+
for (const route of routes) {
|
|
11
|
+
namedAbis.push(route);
|
|
12
|
+
}
|
|
13
|
+
if (extraABIs) {
|
|
14
|
+
for (let i = 0; i < extraABIs.length; i++) {
|
|
15
|
+
const extra = extraABIs[i];
|
|
16
|
+
namedAbis.push({ name: `extra${i}`, artifact: { abi: extra } });
|
|
33
17
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
implementations,
|
|
39
|
-
sigMap,
|
|
40
|
-
};
|
|
41
|
-
logger.info(`routes`, routeParams);
|
|
42
|
-
const router = await env.deploy(`${name}_Router`, {
|
|
18
|
+
}
|
|
19
|
+
const { sigJSMap, mergedABI, mergedDevDocs, mergedUserDocs } = mergeArtifacts(namedAbis);
|
|
20
|
+
for (const route of routes) {
|
|
21
|
+
const deployedRoute = await deploy(env, `${name}_Router_${route.name}_Route`, {
|
|
43
22
|
...params,
|
|
44
|
-
artifact:
|
|
45
|
-
args:
|
|
23
|
+
artifact: route.artifact,
|
|
24
|
+
args: route.args,
|
|
46
25
|
});
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
26
|
+
implementations.push(deployedRoute.address);
|
|
27
|
+
}
|
|
28
|
+
const fallbackImplementation = '0x0000000000000000000000000000000000000000';
|
|
29
|
+
const unorderedSigMap = [];
|
|
30
|
+
for (const entry of sigJSMap) {
|
|
31
|
+
// we add +1 to index as 0 indicate no implementation
|
|
32
|
+
unorderedSigMap.push((entry[0] + entry[1].index.toString(16).padStart(2, '0')));
|
|
33
|
+
}
|
|
34
|
+
const sigMap = unorderedSigMap.sort();
|
|
35
|
+
let existingDeployment = env.getOrNull(name);
|
|
36
|
+
const routeParams = {
|
|
37
|
+
fallbackImplementation,
|
|
38
|
+
implementations,
|
|
39
|
+
sigMap,
|
|
40
|
+
};
|
|
41
|
+
logger.info(`routes`, routeParams);
|
|
42
|
+
const router = await deploy(env, `${name}_Router`, {
|
|
43
|
+
...params,
|
|
44
|
+
artifact: Router10X60,
|
|
45
|
+
args: [routeParams],
|
|
46
|
+
});
|
|
47
|
+
logger.info(`router deployed at ${router.address}`);
|
|
48
|
+
if (!existingDeployment || router.newlyDeployed) {
|
|
49
|
+
const { newlyDeployed, ...routerWithoutDeployedFlag } = router;
|
|
50
|
+
existingDeployment = await env.save(name, {
|
|
51
|
+
...routerWithoutDeployedFlag,
|
|
52
|
+
abi: mergedABI,
|
|
53
|
+
devdoc: mergedDevDocs,
|
|
54
|
+
userdoc: mergedUserDocs,
|
|
55
|
+
});
|
|
56
|
+
logger.info(`save with merged ABI: ${name}`);
|
|
57
|
+
return { ...existingDeployment, newlyDeployed: true };
|
|
60
58
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
});
|
|
59
|
+
return { ...existingDeployment, newlyDeployed: false };
|
|
60
|
+
}
|
|
64
61
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rocketh/router",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.25-testing.0",
|
|
4
4
|
"description": "provide router based proxy deployment for rocketh",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -24,12 +24,11 @@
|
|
|
24
24
|
"eip-1193": "^0.6.2",
|
|
25
25
|
"rimraf": "^6.0.1",
|
|
26
26
|
"typescript": "^5.8.2",
|
|
27
|
-
"
|
|
28
|
-
"rocketh": "0.11.
|
|
27
|
+
"rocketh": "0.11.22-testing.0",
|
|
28
|
+
"@rocketh/deploy": "0.11.22-testing.0"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
31
|
-
"@rocketh/deploy": "0.11.
|
|
32
|
-
"rocketh": "0.11.20"
|
|
31
|
+
"@rocketh/deploy": "0.11.22-testing.0"
|
|
33
32
|
},
|
|
34
33
|
"dependencies": {
|
|
35
34
|
"ethers": "^6.13.5",
|