Skip to content

Commit cca7ae1

Browse files
authored
Merge branch 'main' into solana
2 parents 4429cfb + 721112e commit cca7ae1

File tree

81 files changed

+1450
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1450
-1081
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: blueprints-cdk-tests
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
blueprints-cdk-tests:
10+
name: Run CDK tests for all blueprints
11+
runs-on: ubuntu-latest
12+
permissions:
13+
actions: read
14+
contents: read
15+
defaults:
16+
run:
17+
shell: bash
18+
working-directory: scripts
19+
steps:
20+
- uses: actions/checkout@v2
21+
- uses: actions/setup-node@v3
22+
with:
23+
node-version: 19
24+
cache: npm
25+
cache-dependency-path: package-lock.json
26+
27+
- name: Install dependencies
28+
run: npm ci
29+
- name: Run unit tests
30+
run: ./run-all-cdk-tests.sh

.github/workflows/pre-commit.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: pre-commit
2+
3+
on:
4+
pull_request:
5+
branches: ["main"]
6+
7+
jobs:
8+
pre-commit:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v3
12+
- uses: actions/setup-python@v3
13+
- uses: pre-commit/[email protected]

.github/workflows/semgrep.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Name of this GitHub Actions workflow.
2+
name: Semgrep
3+
4+
on:
5+
# Scan changed files in PRs (diff-aware scanning):
6+
pull_request:
7+
branches: ["main"]
8+
# Scan on-demand through GitHub Actions interface:
9+
workflow_dispatch: {}
10+
# Scan mainline branches and report all findings:
11+
push:
12+
branches: ["main"]
13+
14+
jobs:
15+
semgrep_scan:
16+
# User definable name of this GitHub Actions job.
17+
name: semgrep/ci
18+
# If you are self-hosting, change the following `runs-on` value:
19+
runs-on: ubuntu-latest
20+
container:
21+
# A Docker image with Semgrep installed. Do not change this.
22+
image: returntocorp/semgrep
23+
# Skip any PR created by dependabot to avoid permission issues:
24+
if: (github.actor != 'dependabot[bot]')
25+
permissions:
26+
# required for all workflows
27+
security-events: write
28+
# only required for workflows in private repositories
29+
actions: read
30+
contents: read
31+
32+
steps:
33+
# Fetch project source with GitHub Actions Checkout.
34+
- name: Checkout repository
35+
uses: actions/checkout@v3
36+
37+
- name: Perform Semgrep Analysis
38+
# @NOTE: This is the actual semgrep command to scan your code.
39+
# Modify the --config option to 'r/all' to scan using all rules,
40+
# or use multiple flags to specify particular rules, such as
41+
# --config r/all --config custom/rules
42+
run: semgrep scan -q --sarif --config auto > semgrep-results.sarif
43+
44+
# upload the results for the CodeQL GitHub app to annotate the code
45+
- name: Save SARIF results as artifact
46+
uses: actions/upload-artifact@v4
47+
with:
48+
name: semgrep-scan-results
49+
path: semgrep-results.sarif
50+
51+
# Upload SARIF file generated in previous step
52+
- name: Upload SARIF result to the GitHub Security Dashboard
53+
uses: github/codeql-action/upload-sarif@v2
54+
with:
55+
sarif_file: semgrep-results.sarif
56+
if: always()

.github/workflows/website-test-deploy.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ jobs:
99
test-deploy:
1010
name: Test deployment
1111
runs-on: ubuntu-latest
12+
permissions:
13+
actions: read
14+
contents: read
1215
defaults:
1316
run:
1417
shell: bash

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
!jest.config.js
88
*.d.ts
99
node_modules
10+
!lib/**/package-lock.json
11+
lib/**/foo.bar
1012

1113
# CDK asset staging directory
1214
.cdk.staging
@@ -35,4 +37,4 @@ ha-nodes-deploy*.json
3537
*.OLD
3638
.env
3739
.idea
38-
.vscode
40+
.vscode

.vscode/settings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"cSpell.words": [
3+
"bcuser",
4+
"usermod"
5+
]
6+
}

lib/base/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ We currently don't recommend running **archive** nodes in HA setup, because it t
208208
:::
209209

210210
### Monitoring
211-
Every 5 minutes a script on the deployed node publishes to CloudWatch service the metrics for current block for L1/L2 clients as well as blocks behind metric for L1 and minutes behind for L2. When the node is fully synced the blocks behind metric should get to 4 and minutes behind should get down to 0.
211+
Every 5 minutes a script on the deployed node publishes to CloudWatch service the metrics for current block for L1/L2 clients as well as blocks behind metric for L1 and minutes behind for L2. When the node is fully synced the blocks behind metric should get to 4 and minutes behind should get down to 0.
212212

213213
- To see the metrics for **single node only**:
214214
- Navigate to CloudWatch service (make sure you are in the region you have specified for AWS_REGION)
@@ -291,4 +291,4 @@ sudo su bcuser
291291
```
292292
4. Where to find the key Base client directories?
293293

294-
- The data directory is `/data`
294+
- The data directory is `/data`

lib/base/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ cdk.Aspects.of(app).add(
5757
reports: true,
5858
logIgnores: false,
5959
})
60-
);
60+
);

lib/besu-private/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
This blueprint deploys a ready-to-test private blockchain network powered by [Hyperledger Besu](https://github.com/hyperledger/besu/) with [IBFT consensus](https://arxiv.org/abs/2002.03613). It is accessible by applications via [AWS PrivateLink](https://aws.amazon.com/privatelink/) and [Network Load Balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html) (NLB).
88

9-
High-level features include:
9+
High-level features include:
1010
- Automated blockchain node recovery based on deep health check.
1111
- Automated key management after initial setup.
1212
- Deployment of software changes without downtime.

lib/ethereum/.env-sample

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)