Skip to content

Commit 9dc2db8

Browse files
authored
Merge branch 'main' into main
2 parents 455dbfa + f67a468 commit 9dc2db8

File tree

25 files changed

+919
-606
lines changed

25 files changed

+919
-606
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- go
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
- name: Initialize CodeQL
3434
uses: github/codeql-action/init@v3
3535
with:

.github/workflows/docker_main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
permissions:
1818
packages: write
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v5
2121
with:
2222
fetch-depth: 0
2323

.github/workflows/docker_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
permissions:
1515
packages: write
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
with:
1919
fetch-depth: 0
2020

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
contents: write
1919
steps:
2020
- name: Checkout source
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v5
2222
with:
2323
fetch-depth: 0
2424

.github/workflows/go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
TEST_ARGS: -v
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v5
3131
with:
3232
fetch-depth: 0
3333

@@ -47,7 +47,7 @@ jobs:
4747
docker:
4848
runs-on: ubuntu-latest
4949
steps:
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v5
5151
with:
5252
fetch-depth: 0
5353

@@ -139,7 +139,7 @@ jobs:
139139
multiparty-enabled: false
140140

141141
steps:
142-
- uses: actions/checkout@v3
142+
- uses: actions/checkout@v5
143143
with:
144144
fetch-depth: 0
145145

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
blockchain-node: besu
5151
fail-fast: false
5252
steps:
53-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v5
5454
with:
5555
fetch-depth: 0
5656

@@ -87,7 +87,7 @@ jobs:
8787
migration-test:
8888
runs-on: firefly-ubuntu-latest
8989
steps:
90-
- uses: actions/checkout@v3
90+
- uses: actions/checkout@v5
9191
with:
9292
fetch-depth: 0
9393

.github/workflows/solidity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
solidity-test:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v5
1616
- name: Use Node.js
1717
uses: actions/setup-node@v2
1818
with:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apk add make=4.4.1-r2 \
1818
gcc=14.2.0-r4 \
1919
build-base=0.5-r3 \
2020
curl=8.12.1-r1 \
21-
git=2.47.2-r0
21+
git=2.47.3-r0
2222
WORKDIR /firefly
2323
RUN chgrp -R 0 /firefly \
2424
&& chmod -R g+rwX /firefly \
@@ -74,7 +74,7 @@ FROM $BASE_TAG
7474
ARG UI_TAG
7575
ARG UI_RELEASE
7676
RUN apk add --update --no-cache \
77-
sqlite=3.48.0-r2 \
77+
sqlite=3.48.0-r3 \
7878
postgresql16-client=16.9-r0 \
7979
curl=8.12.1-r1 \
8080
jq=1.7.1-r0

doc-site/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
deploy:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v5
2121
with:
2222
fetch-depth: 0 # fetch all commits/branches
2323
- uses: actions/setup-python@v4

doc-site/docs/reference/config.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ title: Configuration Reference
675675
|count|The maximum number of times to retry|`int`|`5`
676676
|enabled|Enables retries|`boolean`|`false`
677677
|errorStatusCodeRegex|The regex that the error response status code must match to trigger retry|`string`|`<nil>`
678+
|factor|The retry backoff factor|`float32`|`2`
678679
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
679680
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
680681

@@ -704,6 +705,7 @@ title: Configuration Reference
704705

705706
|Key|Description|Type|Default Value|
706707
|---|-----------|----|-------------|
708+
|backgroundConnect|When true the connection is established in the background with infinite reconnect (makes initialConnectAttempts redundant when set)|`boolean`|`false`
707709
|connectionTimeout|The amount of time to wait while establishing a connection (or auto-reconnection)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`45s`
708710
|heartbeatInterval|The amount of time to wait between heartbeat signals on the WebSocket connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
709711
|initialConnectAttempts|The number of attempts FireFly will make to connect to the WebSocket when starting up, before failing|`int`|`5`
@@ -831,6 +833,7 @@ title: Configuration Reference
831833
|count|The maximum number of times to retry|`int`|`5`
832834
|enabled|Enables retries|`boolean`|`false`
833835
|errorStatusCodeRegex|The regex that the error response status code must match to trigger retry|`string`|`<nil>`
836+
|factor|The retry backoff factor|`float32`|`2`
834837
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
835838
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
836839

@@ -860,6 +863,7 @@ title: Configuration Reference
860863

861864
|Key|Description|Type|Default Value|
862865
|---|-----------|----|-------------|
866+
|backgroundConnect|When true the connection is established in the background with infinite reconnect (makes initialConnectAttempts redundant when set)|`boolean`|`false`
863867
|connectionTimeout|The amount of time to wait while establishing a connection (or auto-reconnection)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`45s`
864868
|heartbeatInterval|The amount of time to wait between heartbeat signals on the WebSocket connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
865869
|initialConnectAttempts|The number of attempts FireFly will make to connect to the WebSocket when starting up, before failing|`int`|`5`
@@ -982,6 +986,7 @@ title: Configuration Reference
982986
|count|The maximum number of times to retry|`int`|`5`
983987
|enabled|Enables retries|`boolean`|`false`
984988
|errorStatusCodeRegex|The regex that the error response status code must match to trigger retry|`string`|`<nil>`
989+
|factor|The retry backoff factor|`float32`|`2`
985990
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
986991
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
987992

@@ -1011,6 +1016,7 @@ title: Configuration Reference
10111016

10121017
|Key|Description|Type|Default Value|
10131018
|---|-----------|----|-------------|
1019+
|backgroundConnect|When true the connection is established in the background with infinite reconnect (makes initialConnectAttempts redundant when set)|`boolean`|`false`
10141020
|connectionTimeout|The amount of time to wait while establishing a connection (or auto-reconnection)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`45s`
10151021
|heartbeatInterval|The amount of time to wait between heartbeat signals on the WebSocket connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
10161022
|initialConnectAttempts|The number of attempts FireFly will make to connect to the WebSocket when starting up, before failing|`int`|`5`
@@ -1136,6 +1142,7 @@ title: Configuration Reference
11361142
|count|The maximum number of times to retry|`int`|`5`
11371143
|enabled|Enables retries|`boolean`|`false`
11381144
|errorStatusCodeRegex|The regex that the error response status code must match to trigger retry|`string`|`<nil>`
1145+
|factor|The retry backoff factor|`float32`|`2`
11391146
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
11401147
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
11411148

@@ -1165,6 +1172,7 @@ title: Configuration Reference
11651172

11661173
|Key|Description|Type|Default Value|
11671174
|---|-----------|----|-------------|
1175+
|backgroundConnect|When true the connection is established in the background with infinite reconnect (makes initialConnectAttempts redundant when set)|`boolean`|`false`
11681176
|connectionTimeout|The amount of time to wait while establishing a connection (or auto-reconnection)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`45s`
11691177
|heartbeatInterval|The amount of time to wait between heartbeat signals on the WebSocket connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
11701178
|initialConnectAttempts|The number of attempts FireFly will make to connect to the WebSocket when starting up, before failing|`int`|`5`
@@ -1276,6 +1284,7 @@ title: Configuration Reference
12761284
|count|The maximum number of times to retry|`int`|`5`
12771285
|enabled|Enables retries|`boolean`|`false`
12781286
|errorStatusCodeRegex|The regex that the error response status code must match to trigger retry|`string`|`<nil>`
1287+
|factor|The retry backoff factor|`float32`|`2`
12791288
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
12801289
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
12811290

@@ -1305,6 +1314,7 @@ title: Configuration Reference
13051314

13061315
|Key|Description|Type|Default Value|
13071316
|---|-----------|----|-------------|
1317+
|backgroundConnect|When true the connection is established in the background with infinite reconnect (makes initialConnectAttempts redundant when set)|`boolean`|`false`
13081318
|connectionTimeout|The amount of time to wait while establishing a connection (or auto-reconnection)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`45s`
13091319
|heartbeatInterval|The amount of time to wait between heartbeat signals on the WebSocket connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
13101320
|initialConnectAttempts|The number of attempts FireFly will make to connect to the WebSocket when starting up, before failing|`int`|`5`
@@ -1510,6 +1520,7 @@ title: Configuration Reference
15101520
|count|The maximum number of times to retry|`int`|`5`
15111521
|enabled|Enables retries|`boolean`|`false`
15121522
|errorStatusCodeRegex|The regex that the error response status code must match to trigger retry|`string`|`<nil>`
1523+
|factor|The retry backoff factor|`float32`|`2`
15131524
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
15141525
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
15151526

@@ -1539,6 +1550,7 @@ title: Configuration Reference
15391550

15401551
|Key|Description|Type|Default Value|
15411552
|---|-----------|----|-------------|
1553+
|backgroundConnect|When true the connection is established in the background with infinite reconnect (makes initialConnectAttempts redundant when set)|`boolean`|`false`
15421554
|connectionTimeout|The amount of time to wait while establishing a connection (or auto-reconnection)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`45s`
15431555
|heartbeatInterval|The amount of time to wait between heartbeat signals on the WebSocket connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
15441556
|initialConnectAttempts|The number of attempts FireFly will make to connect to the WebSocket when starting up, before failing|`int`|`5`

0 commit comments

Comments
 (0)