@aztec/ethereum 0.69.0-devnet → 0.69.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAsChG"}
|
package/dest/test/start_anvil.js
CHANGED
|
@@ -1,30 +1,37 @@
|
|
|
1
1
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
2
2
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
3
3
|
import { createAnvil } from '@viem/anvil';
|
|
4
|
-
import getPort from 'get-port';
|
|
5
4
|
import { dirname, resolve } from 'path';
|
|
6
5
|
/**
|
|
7
6
|
* Ensures there's a running Anvil instance and returns the RPC URL.
|
|
8
7
|
*/
|
|
9
8
|
export async function startAnvil(l1BlockTime) {
|
|
10
|
-
let ethereumHostPort;
|
|
11
9
|
const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
|
|
10
|
+
let port;
|
|
12
11
|
// Start anvil.
|
|
13
12
|
// We go via a wrapper script to ensure if the parent dies, anvil dies.
|
|
14
13
|
const anvil = await retry(async () => {
|
|
15
|
-
ethereumHostPort = await getPort();
|
|
16
14
|
const anvil = createAnvil({
|
|
17
15
|
anvilBinary,
|
|
18
|
-
port:
|
|
16
|
+
port: 0,
|
|
19
17
|
blockTime: l1BlockTime,
|
|
18
|
+
stopTimeout: 1000,
|
|
19
|
+
});
|
|
20
|
+
// Listen to the anvil output to get the port.
|
|
21
|
+
const removeHandler = anvil.on('message', (message) => {
|
|
22
|
+
if (port === undefined && message.includes('Listening on')) {
|
|
23
|
+
port = parseInt(message.match(/Listening on ([^:]+):(\d+)/)[2]);
|
|
24
|
+
}
|
|
20
25
|
});
|
|
21
26
|
await anvil.start();
|
|
27
|
+
removeHandler();
|
|
22
28
|
return anvil;
|
|
23
29
|
}, 'Start anvil', makeBackoff([5, 5, 5]));
|
|
24
|
-
if (!
|
|
30
|
+
if (!port) {
|
|
25
31
|
throw new Error('Failed to start anvil');
|
|
26
32
|
}
|
|
27
|
-
|
|
28
|
-
|
|
33
|
+
// Monkeypatch the anvil instance to include the actually assigned port
|
|
34
|
+
Object.defineProperty(anvil, 'port', { value: port, writable: false });
|
|
35
|
+
return { anvil, rpcUrl: `http://127.0.0.1:${port}` };
|
|
29
36
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYW52aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9zdGFydF9hbnZpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzdELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV0RCxPQUFPLEVBQWMsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRXhDOztHQUVHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxVQUFVLENBQUMsV0FBb0I7SUFDbkQsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSwrQkFBK0IsQ0FBQyxDQUFDO0lBRWhILElBQUksSUFBd0IsQ0FBQztJQUU3QixlQUFlO0lBQ2YsdUVBQXVFO0lBQ3ZFLE1BQU0sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUN2QixLQUFLLElBQUksRUFBRTtRQUNULE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQztZQUN4QixXQUFXO1lBQ1gsSUFBSSxFQUFFLENBQUM7WUFDUCxTQUFTLEVBQUUsV0FBVztZQUN0QixXQUFXLEVBQUUsSUFBSTtTQUNsQixDQUFDLENBQUM7UUFFSCw4Q0FBOEM7UUFDOUMsTUFBTSxhQUFhLEdBQUcsS0FBSyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtZQUM1RCxJQUFJLElBQUksS0FBSyxTQUFTLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO2dCQUMzRCxJQUFJLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLENBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ25FLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3BCLGFBQWEsRUFBRSxDQUFDO1FBRWhCLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQyxFQUNELGFBQWEsRUFDYixXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQ3ZCLENBQUM7SUFFRixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDVixNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELHVFQUF1RTtJQUN2RSxNQUFNLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLG9CQUFvQixJQUFJLEVBQUUsRUFBRSxDQUFDO0FBQ3ZELENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/ethereum",
|
|
3
|
-
"version": "0.69.
|
|
3
|
+
"version": "0.69.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -29,11 +29,10 @@
|
|
|
29
29
|
"../package.common.json"
|
|
30
30
|
],
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@aztec/foundation": "0.69.
|
|
33
|
-
"@aztec/l1-artifacts": "0.69.
|
|
32
|
+
"@aztec/foundation": "0.69.1",
|
|
33
|
+
"@aztec/l1-artifacts": "0.69.1",
|
|
34
34
|
"@viem/anvil": "^0.0.10",
|
|
35
35
|
"dotenv": "^16.0.3",
|
|
36
|
-
"get-port": "^7.1.0",
|
|
37
36
|
"tslib": "^2.4.0",
|
|
38
37
|
"viem": "^2.7.15",
|
|
39
38
|
"zod": "^3.23.8"
|
package/src/test/start_anvil.ts
CHANGED
|
@@ -2,38 +2,47 @@ import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
|
2
2
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
3
3
|
|
|
4
4
|
import { type Anvil, createAnvil } from '@viem/anvil';
|
|
5
|
-
import getPort from 'get-port';
|
|
6
5
|
import { dirname, resolve } from 'path';
|
|
7
6
|
|
|
8
7
|
/**
|
|
9
8
|
* Ensures there's a running Anvil instance and returns the RPC URL.
|
|
10
9
|
*/
|
|
11
10
|
export async function startAnvil(l1BlockTime?: number): Promise<{ anvil: Anvil; rpcUrl: string }> {
|
|
12
|
-
let ethereumHostPort: number | undefined;
|
|
13
|
-
|
|
14
11
|
const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
|
|
15
12
|
|
|
13
|
+
let port: number | undefined;
|
|
14
|
+
|
|
16
15
|
// Start anvil.
|
|
17
16
|
// We go via a wrapper script to ensure if the parent dies, anvil dies.
|
|
18
17
|
const anvil = await retry(
|
|
19
18
|
async () => {
|
|
20
|
-
ethereumHostPort = await getPort();
|
|
21
19
|
const anvil = createAnvil({
|
|
22
20
|
anvilBinary,
|
|
23
|
-
port:
|
|
21
|
+
port: 0,
|
|
24
22
|
blockTime: l1BlockTime,
|
|
23
|
+
stopTimeout: 1000,
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
// Listen to the anvil output to get the port.
|
|
27
|
+
const removeHandler = anvil.on('message', (message: string) => {
|
|
28
|
+
if (port === undefined && message.includes('Listening on')) {
|
|
29
|
+
port = parseInt(message.match(/Listening on ([^:]+):(\d+)/)![2]);
|
|
30
|
+
}
|
|
25
31
|
});
|
|
26
32
|
await anvil.start();
|
|
33
|
+
removeHandler();
|
|
34
|
+
|
|
27
35
|
return anvil;
|
|
28
36
|
},
|
|
29
37
|
'Start anvil',
|
|
30
38
|
makeBackoff([5, 5, 5]),
|
|
31
39
|
);
|
|
32
40
|
|
|
33
|
-
if (!
|
|
41
|
+
if (!port) {
|
|
34
42
|
throw new Error('Failed to start anvil');
|
|
35
43
|
}
|
|
36
44
|
|
|
37
|
-
|
|
38
|
-
|
|
45
|
+
// Monkeypatch the anvil instance to include the actually assigned port
|
|
46
|
+
Object.defineProperty(anvil, 'port', { value: port, writable: false });
|
|
47
|
+
return { anvil, rpcUrl: `http://127.0.0.1:${port}` };
|
|
39
48
|
}
|