Merge branch 'main' into tt-1862-remove-logstream

Author: Tofel

.github/workflows/framework-golden-tests.yml

@@ -10,9 +10,6 @@ jobs:
     env:
       LOKI_TENANT_ID: promtail
       LOKI_URL: http://localhost:3030/loki/api/v1/push
-      # this is not the best practice, and it must be fixed, run your tests WITHOUT IT!
-      # however, on current latest image we must use this flag
-      CTF_IGNORE_CRITICAL_LOGS: true
     runs-on: ubuntu-latest
     permissions:
       id-token: write

.github/workflows/framework.yml

@@ -9,6 +9,8 @@ jobs:
     defaults:
       run:
         working-directory: framework
+    env:
+      CTF_JD_IMAGE: ${{ secrets.CTF_JD_IMAGE }}
     runs-on: ubuntu-latest
     permissions:
       id-token: write

book/src/framework/components/blockchains/evm.md

@@ -72,5 +72,17 @@ Public: 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266
 Private: ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 ```
 
-Test keys for `Besu` can be found [here](https://besu.hyperledger.org/23.4.1/private-networks/reference/accounts-for-testing)
+For `Besu` keys are
+```
+Public: 0xfe3b557e8fb62b89f4916b721be55ceb828dbd73
+Private: 0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63
+
+Public: 0x627306090abaB3A6e1400e9345bC60c78a8BEf57
+Private: 0xc87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3
+
+Public: 0xf17f52151EbEF6C7334FAD080c5704D77216b732
+Private: 0xae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f
+```
+
+More docs for `Besu` can be found [here](https://besu.hyperledger.org/private-networks/reference/accounts-for-testing)
 

book/src/framework/components/state.md

@@ -40,7 +40,7 @@ One node set is enough for any kind of testing, if you need more nodes consider
 
 ## Custom ports
 
-You can also define a custom set of ports for any node
+You can also define a custom set of ports for any node.
 ```toml
 [nodeset]
   nodes = 5
@@ -53,6 +53,7 @@ You can also define a custom set of ports for any node
 
     [nodeset.node_specs.node]
       # here we defined 2 new ports to listen and mapped them to our host machine
-      custom_ports = [14000, 14001]
+      # syntax is "host:docker", if you provide only host port then we map 1-to-1
+      custom_ports = ["14000:15000", "20000"]
       image = "public.ecr.aws/chainlink/chainlink:v2.16.0"
 ```

book/src/framework/configuration.md

@@ -7,9 +7,10 @@
 |         CTF_CONFIGS          | Path(s) to test config files. <br/>Can be more than one, ex.: smoke.toml,smoke_1.toml,smoke_2.toml.<br/>First filepath will hold all the merged values | Any valid TOML file path |                          -                          |     ✅     |
 |        CTF_LOG_LEVEL         |                                                                   Harness log level                                                                    | `info`, `debug`, `trace` |                       `info`                        |    🚫     |
 |      CTF_PROMTAIL_DEBUG      |                                    Set `true` if you are integrating with remote `Loki` push API to debug Promtail                                     |          `true`, `false` |                       `false`                       |    🚫     |
+|   CTF_IGNORE_CRITICAL_LOGS   |                                      Ignore all logs that has CRIT,FATAL or PANIC levels (Chainlink nodes only!)                                       |          `true`, `false` |                       `false`                       |    🚫     |
+|     CTF_CHAINLINK_IMAGE      |                                           Flag to override Chainlink Docker image in format $repository:$tag                                           |         $repository:$tag |                          -                          |    🚫     |
+|         CTF_JD_IMAGE         |                                                Job distributor service image in format $repository:$tag                                                |         $repository:$tag |                          -                          |    🚫     |
 |           LOKI_URL           |                                            URL to `Loki` push api, should be like`${host}/loki/api/v1/push`                                            |                      URL | `http://host.docker.internal:3030/loki/api/v1/push` |    🚫     |
 |        LOKI_TENANT_ID        |                                                Streams all components logs to `Loki`, see params below                                                 |                 `string` |                     `promtail`                      |    🚫     |
 |       LOKI_BASIC_AUTH        |                                                          Basic auth in format $user:$password                                                          |        `$user:$password` |                          -                          |    🚫     |
 |         RESTY_DEBUG          |                                                            Log all Resty client HTTP calls                                                             |          `true`, `false` |                       `false`                       |    🚫     |
-|   CTF_IGNORE_CRITICAL_LOGS   |                                      Ignore all logs that has CRIT,FATAL or PANIC levels (Chainlink nodes only!)                                       |          `true`, `false` |                       `false`                       |    🚫     |
-|     CTF_CHAINLINK_IMAGE      |                                           Flag to override Chainlink Docker image in format $repository:$tag                                           |         $repository:$tag |                          -                          |    🚫     |

framework/.changeset/v0.3.2.md

@@ -0,0 +1,5 @@
+- Allow exposing CL node ports in host:docker format
+- Expose default test private keys as framework constants
+- Rename CHAINLINK_IMAGE to CTF_CHAINLINK_IMAGE to avoid CI collisions
+- Add CTF_JD_IMAGE env var
+- Add JobDistributor component

framework/.changeset/v0.3.3.md

@@ -0,0 +1,3 @@
+- Upgrade Besu to 24.9.1
+- Expose default test private keys as framework constants
+- Collect all the logs even between restarts

framework/.changeset/v0.3.4.md

@@ -0,0 +1 @@
+- Bump go-ethereum as in core, fix darwin amd/arm binary release

framework/Makefile

@@ -29,5 +29,5 @@ tidy:
 go_mod:
 	go mod download
 
-test_unit: go_mod
-	go test -timeout 5m -count 1 -run TestDocker
+test_component: go_mod
+	go test -timeout 5m -count 1 -run TestComponentDocker ./...

framework/components/blockchain/besu.go

@@ -12,9 +12,15 @@ import (
 	"github.com/testcontainers/testcontainers-go/wait"
 )
 
+const (
+	DefaultBesuPrivateKey1 = "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"
+	DefaultBesuPrivateKey2 = "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3"
+	DefaultBesuPrivateKey3 = "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f"
+)
+
 func defaultBesu(in *Input) {
 	if in.Image == "" {
-		in.Image = "hyperledger/besu:22.1.0"
+		in.Image = "hyperledger/besu:24.9.1"
 	}
 	if in.ChainID == "" {
 		in.ChainID = "1337"