Skip to content

Commit e94323f

Browse files
vlasonfavlasonfa
committed
Changes after pre-merge quality control tools
1 parent eb85968 commit e94323f

File tree

12 files changed

+21
-24
lines changed

12 files changed

+21
-24
lines changed

‎docs/adding-new-nodes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ First of all, THANK YOU! The easier it is to run a blockchain node on AWS the si
3131
- `lib/constructs/constants.ts` - Useful constants to use in configuration files and to set up infrastructure.
3232
- `lib/constructs/ha-rpc-nodes-with-alb.ts` - Provisions up to 4 identical EC2 instances to run nodes managed by an Auto Scaling Group and behind an Application Load Balancer.
3333
- `lib/constructs/single-node.ts` - Creates a single EC2 instance to run a blockchain node.
34-
- `lib/constructs/snapshots-bucket.ts` - Creates an S3 bucket to store a copy of blockchain node state to speed up syncing process.
34+
- `lib/constructs/snapshots-bucket.ts` - Creates an S3 bucket to store a copy of blockchain node state to speed up syncing process.

‎docs/pre-merge-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ npm run install-pre-commit-mac
4040

4141
# Run
4242
npm run run-pre-commit
43-
```
43+
```

‎lib/constructs/amb-ethereum-single-node.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ export class SingleNodeAMBEthereumConstruct extends cdkContructs.Construct {
1919

2020
constructor(scope: cdkContructs.Construct, id: string, props: SingleNodeAMBEthereumConstructCustomProps) {
2121
super(scope, id);
22-
22+
2323
const REGION = cdk.Stack.of(this).region;
2424
const {
2525
instanceType,
2626
availabilityZone,
2727
ethNetworkId,
2828
} = props;
29-
29+
3030
const createNode = new cr.AwsCustomResource(this, 'createNode', {
3131
onCreate: { // will be called for a CREATE event
3232
service: 'ManagedBlockchain',
@@ -45,7 +45,7 @@ export class SingleNodeAMBEthereumConstruct extends cdkContructs.Construct {
4545
resources: cr.AwsCustomResourcePolicy.ANY_RESOURCE,
4646
}),
4747
});
48-
48+
4949
const createAccessor = new cr.AwsCustomResource(this, 'createAccessor', {
5050
onCreate: { // will be called for a CREATE event
5151
service: 'ManagedBlockchain',
@@ -60,14 +60,14 @@ export class SingleNodeAMBEthereumConstruct extends cdkContructs.Construct {
6060
resources: cr.AwsCustomResourcePolicy.ANY_RESOURCE,
6161
}),
6262
});
63-
63+
6464
this.nodeId = createNode.getResponseField('NodeId');
6565
this.rpcUrl = `https://${this.nodeId}.t.ethereum.managedblockchain.${REGION}.amazonaws.com`;
6666
this.billingToken=createAccessor.getResponseField('BillingToken');
6767
this.rpcUrlWithBillingToken = `${this.rpcUrl}?billingtoken=${this.billingToken}`;
6868

6969
const deleteAccessor = new cr.AwsCustomResource(this, 'deleteAccessor', {
70-
onDelete: {
70+
onDelete: {
7171
service: 'ManagedBlockchain',
7272
action: 'deleteAccessor',
7373
parameters: {
@@ -79,9 +79,9 @@ export class SingleNodeAMBEthereumConstruct extends cdkContructs.Construct {
7979
resources: cr.AwsCustomResourcePolicy.ANY_RESOURCE,
8080
}),
8181
});
82-
82+
8383
const deleteNode = new cr.AwsCustomResource(this, 'deleteNode', {
84-
onDelete: {
84+
onDelete: {
8585
service: 'ManagedBlockchain',
8686
action: 'deleteNode',
8787
parameters: {
@@ -94,18 +94,17 @@ export class SingleNodeAMBEthereumConstruct extends cdkContructs.Construct {
9494
resources: cr.AwsCustomResourcePolicy.ANY_RESOURCE,
9595
}),
9696
});
97-
97+
9898
// nag.NagSuppressions.addResourceSuppressions(
9999
// this,
100100
// [
101101
// {
102102
// id: "AwsSolutions-EC29",
103103
// reason: "Its Ok to terminate this instance as long as we have the data in the snapshot",
104-
104+
105105
// },
106106
// ],
107107
// true
108108
// );
109109
}
110110
}
111-

‎lib/scroll/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ node_modules
88
cdk.out
99
.idea
1010

11-
*-node.json
11+
*-node.json

‎lib/scroll/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ We will use AWS Cloud9 to execute the subsequent commands. Follow the instructio
130130
# Make sure you are in aws-blockchain-node-runners/lib/scroll
131131
npx cdk deploy scroll-ethereum-l1-node --json --outputs-file scroll-ethereum-l1-node.json
132132
```
133-
To watch the progress, open the [AMB Web UI](https://console.aws.amazon.com/managedblockchain/home), click the name of your target network from the list (Mainnet, Goerly, etc.) and watch the status of the node to change from `Creating` to `Available`.
133+
To watch the progress, open the [AMB Web UI](https://console.aws.amazon.com/managedblockchain/home), click the name of your target network from the list (Mainnet, Goerly, etc.) and watch the status of the node to change from `Creating` to `Available`.
134134
135135
6. Deploy Scroll Full Node and wait for another 10-20 minutes for it to sync
136136
@@ -169,7 +169,7 @@ We will use AWS Cloud9 to execute the subsequent commands. Follow the instructio
169169
echo "INSTANCE_ID=" $INSTANCE_ID
170170
export AWS_REGION=us-east-1
171171
aws ssm start-session --target $INSTANCE_ID --region $AWS_REGION
172-
172+
173173
curl -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' http://localhost:8545
174174
```
175175
@@ -244,7 +244,7 @@ Open Dashboards and select scroll-single-node from the list of dashboards.
244244
```
245245
4. Where to find the key l2geth directories?
246246
247-
- The directory with binaries is `/home/ubuntu/l2geth-source`.
247+
- The directory with binaries is `/home/ubuntu/l2geth-source`.
248248
- The data directory of l2geth agent is `/home/ubuntu/l2geth-source/l2geth-datadir`
249249
250250
5. You can now attach to l2geth?
@@ -260,4 +260,4 @@ Open Dashboards and select scroll-single-node from the list of dashboards.
260260
261261
> eth.blockNumber
262262
10000
263-
```
263+
```

‎lib/scroll/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ new ScrollSingleNodeStack(app, "scroll-single-node", {
3333
scrollVersion: config.baseNodeConfig.scrollVersion,
3434
nodeConfiguration: config.baseNodeConfig.nodeConfiguration,
3535
dataVolume: config.baseNodeConfig.dataVolume,
36-
});
36+
});

‎lib/scroll/lib/assets/sync-checker/syncchecker-scroll.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@ TIMESTAMP=$(date +"%Y-%m-%dT%H:%M:%S%:z")
2222

2323
aws cloudwatch put-metric-data --metric-name elc_sync_block --namespace CWAgent --value $SCROLL_SYNC_BLOCK --timestamp $TIMESTAMP --dimensions InstanceId=$INSTANCE_ID --region $REGION
2424
aws cloudwatch put-metric-data --metric-name elc_blocks_behind --namespace CWAgent --value $SCROLL_BLOCKS_BEHIND --timestamp $TIMESTAMP --dimensions InstanceId=$INSTANCE_ID --region $REGION
25-

‎lib/scroll/lib/config/scrollConfig.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,3 @@ export const baseNodeConfig: configTypes.ScrollBaseNodeConfig = {
3838
throughput: process.env.SCROLL_DATA_VOL_THROUGHPUT ? parseInt(process.env.SCROLL_DATA_VOL_THROUGHPUT): 700,
3939
},
4040
};
41-

‎lib/scroll/sample-configs/.env-sample-full

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ SCROLL_CPU_TYPE="x86_64" # All options: "x86_64", "ARM_64". IMPO
1919
SCROLL_DATA_VOL_TYPE="gp3" # Other options: "io1" | "io2" | "gp3" | "instance-store" . IMPORTANT: Use "instance-store" option only with instance types that support that feature, like popular for node im4gn, d3, i3en, and i4i instance families
2020
SCROLL_DATA_VOL_SIZE="1000" # Current required data size to keep both smapshot archive and unarchived version of it
2121
SCROLL_DATA_VOL_IOPS="3000" # Max IOPS for EBS volumes (not applicable for "instance-store")
22-
SCROLL_DATA_VOL_THROUGHPUT="700" # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")
22+
SCROLL_DATA_VOL_THROUGHPUT="700" # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")

‎lib/scroll/test/.env-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ SCROLL_CPU_TYPE="x86_64" # All options: "x86_64", "ARM_64". IMPO
1919
SCROLL_DATA_VOL_TYPE="gp3" # Other options: "io1" | "io2" | "gp3" | "instance-store" . IMPORTANT: Use "instance-store" option only with instance types that support that feature, like popular for node im4gn, d3, i3en, and i4i instance families
2020
SCROLL_DATA_VOL_SIZE="1000" # Current required data size to keep both smapshot archive and unarchived version of it
2121
SCROLL_DATA_VOL_IOPS="3000" # Max IOPS for EBS volumes (not applicable for "instance-store")
22-
SCROLL_DATA_VOL_THROUGHPUT="700" # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")
22+
SCROLL_DATA_VOL_THROUGHPUT="700" # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")

0 commit comments

Comments
 (0)