Skip to content

Commit 293e998

Browse files
ChengxuanChengxuan
authored
Merge pull request #128 from kaleido-io/ff-common-update
Update to the latest release of firefly-common
2 parents 83ae49a + 9579f19 commit 293e998

File tree

3 files changed

+43
-3
lines changed

3 files changed

+43
-3
lines changed

‎config.md

+39
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@
3131

3232
|Key|Description|Type|Default Value|
3333
|---|-----------|----|-------------|
34+
|ca|The TLS certificate authority in PEM format (this option is ignored if caFile is also set)|`string`|`<nil>`
3435
|caFile|The path to the CA file for TLS on this API|`string`|`<nil>`
36+
|cert|The TLS certificate in PEM format (this option is ignored if certFile is also set)|`string`|`<nil>`
3537
|certFile|The path to the certificate file for TLS on this API|`string`|`<nil>`
3638
|clientAuth|Enables or disables client auth for TLS on this API|`string`|`<nil>`
3739
|enabled|Enables or disables TLS on this API|`boolean`|`false`
3840
|insecureSkipHostVerify|When to true in unit test development environments to disable TLS verification. Use with extreme caution|`boolean`|`<nil>`
41+
|key|The TLS certificate key in PEM format (this option is ignored if keyFile is also set)|`string`|`<nil>`
3942
|keyFile|The path to the private key file for TLS on this API|`string`|`<nil>`
4043
|requiredDNAttributes|A set of required subject DN attributes. Each entry is a regular expression, and the subject certificate must have a matching attribute of the specified type (CN, C, O, OU, ST, L, STREET, POSTALCODE, SERIALNUMBER are valid attributes)|`map[string]string`|`<nil>`
4144

@@ -98,11 +101,14 @@
98101

99102
|Key|Description|Type|Default Value|
100103
|---|-----------|----|-------------|
104+
|ca|The TLS certificate authority in PEM format (this option is ignored if caFile is also set)|`string`|`<nil>`
101105
|caFile|The path to the CA file for TLS on this API|`string`|`<nil>`
106+
|cert|The TLS certificate in PEM format (this option is ignored if certFile is also set)|`string`|`<nil>`
102107
|certFile|The path to the certificate file for TLS on this API|`string`|`<nil>`
103108
|clientAuth|Enables or disables client auth for TLS on this API|`string`|`<nil>`
104109
|enabled|Enables or disables TLS on this API|`boolean`|`false`
105110
|insecureSkipHostVerify|When to true in unit test development environments to disable TLS verification. Use with extreme caution|`boolean`|`<nil>`
111+
|key|The TLS certificate key in PEM format (this option is ignored if keyFile is also set)|`string`|`<nil>`
106112
|keyFile|The path to the private key file for TLS on this API|`string`|`<nil>`
107113
|requiredDNAttributes|A set of required subject DN attributes. Each entry is a regular expression, and the subject certificate must have a matching attribute of the specified type (CN, C, O, OU, ST, L, STREET, POSTALCODE, SERIALNUMBER are valid attributes)|`map[string]string`|`<nil>`
108114

@@ -193,11 +199,14 @@
193199

194200
|Key|Description|Type|Default Value|
195201
|---|-----------|----|-------------|
202+
|ca|The TLS certificate authority in PEM format (this option is ignored if caFile is also set)|`string`|`<nil>`
196203
|caFile|The path to the CA file for TLS on this API|`string`|`<nil>`
204+
|cert|The TLS certificate in PEM format (this option is ignored if certFile is also set)|`string`|`<nil>`
197205
|certFile|The path to the certificate file for TLS on this API|`string`|`<nil>`
198206
|clientAuth|Enables or disables client auth for TLS on this API|`string`|`<nil>`
199207
|enabled|Enables or disables TLS on this API|`boolean`|`false`
200208
|insecureSkipHostVerify|When to true in unit test development environments to disable TLS verification. Use with extreme caution|`boolean`|`<nil>`
209+
|key|The TLS certificate key in PEM format (this option is ignored if keyFile is also set)|`string`|`<nil>`
201210
|keyFile|The path to the private key file for TLS on this API|`string`|`<nil>`
202211
|requiredDNAttributes|A set of required subject DN attributes. Each entry is a regular expression, and the subject certificate must have a matching attribute of the specified type (CN, C, O, OU, ST, L, STREET, POSTALCODE, SERIALNUMBER are valid attributes)|`map[string]string`|`<nil>`
203212

@@ -298,15 +307,25 @@
298307
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
299308
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
300309

310+
## policyengine.simple.gasOracle.throttle
311+
312+
|Key|Description|Type|Default Value|
313+
|---|-----------|----|-------------|
314+
|burst|The maximum number of requests that can be made in a short period of time before the throttling kicks in.|`int`|`<nil>`
315+
|requestsPerSecond|The average rate at which requests are allowed to pass through over time.|`int`|`<nil>`
316+
301317
## policyengine.simple.gasOracle.tls
302318

303319
|Key|Description|Type|Default Value|
304320
|---|-----------|----|-------------|
321+
|ca|The TLS certificate authority in PEM format (this option is ignored if caFile is also set)|`string`|`<nil>`
305322
|caFile|The path to the CA file for TLS on this API|`string`|`<nil>`
323+
|cert|The TLS certificate in PEM format (this option is ignored if certFile is also set)|`string`|`<nil>`
306324
|certFile|The path to the certificate file for TLS on this API|`string`|`<nil>`
307325
|clientAuth|Enables or disables client auth for TLS on this API|`string`|`<nil>`
308326
|enabled|Enables or disables TLS on this API|`boolean`|`<nil>`
309327
|insecureSkipHostVerify|When to true in unit test development environments to disable TLS verification. Use with extreme caution|`boolean`|`<nil>`
328+
|key|The TLS certificate key in PEM format (this option is ignored if keyFile is also set)|`string`|`<nil>`
310329
|keyFile|The path to the private key file for TLS on this API|`string`|`<nil>`
311330
|requiredDNAttributes|A set of required subject DN attributes. Each entry is a regular expression, and the subject certificate must have a matching attribute of the specified type (CN, C, O, OU, ST, L, STREET, POSTALCODE, SERIALNUMBER are valid attributes)|`map[string]string`|`<nil>`
312331

@@ -389,15 +408,25 @@
389408
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
390409
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
391410

411+
## transactions.handler.simple.gasOracle.throttle
412+
413+
|Key|Description|Type|Default Value|
414+
|---|-----------|----|-------------|
415+
|burst|The maximum number of requests that can be made in a short period of time before the throttling kicks in.|`int`|`<nil>`
416+
|requestsPerSecond|The average rate at which requests are allowed to pass through over time.|`int`|`<nil>`
417+
392418
## transactions.handler.simple.gasOracle.tls
393419

394420
|Key|Description|Type|Default Value|
395421
|---|-----------|----|-------------|
422+
|ca|The TLS certificate authority in PEM format (this option is ignored if caFile is also set)|`string`|`<nil>`
396423
|caFile|The path to the CA file for TLS on this API|`string`|`<nil>`
424+
|cert|The TLS certificate in PEM format (this option is ignored if certFile is also set)|`string`|`<nil>`
397425
|certFile|The path to the certificate file for TLS on this API|`string`|`<nil>`
398426
|clientAuth|Enables or disables client auth for TLS on this API|`string`|`<nil>`
399427
|enabled|Enables or disables TLS on this API|`boolean`|`<nil>`
400428
|insecureSkipHostVerify|When to true in unit test development environments to disable TLS verification. Use with extreme caution|`boolean`|`<nil>`
429+
|key|The TLS certificate key in PEM format (this option is ignored if keyFile is also set)|`string`|`<nil>`
401430
|keyFile|The path to the private key file for TLS on this API|`string`|`<nil>`
402431
|requiredDNAttributes|A set of required subject DN attributes. Each entry is a regular expression, and the subject certificate must have a matching attribute of the specified type (CN, C, O, OU, ST, L, STREET, POSTALCODE, SERIALNUMBER are valid attributes)|`map[string]string`|`<nil>`
403432

@@ -447,14 +476,24 @@
447476
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
448477
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
449478

479+
## webhooks.throttle
480+
481+
|Key|Description|Type|Default Value|
482+
|---|-----------|----|-------------|
483+
|burst|The maximum number of requests that can be made in a short period of time before the throttling kicks in.|`int`|`<nil>`
484+
|requestsPerSecond|The average rate at which requests are allowed to pass through over time.|`int`|`<nil>`
485+
450486
## webhooks.tls
451487

452488
|Key|Description|Type|Default Value|
453489
|---|-----------|----|-------------|
490+
|ca|The TLS certificate authority in PEM format (this option is ignored if caFile is also set)|`string`|`<nil>`
454491
|caFile|The path to the CA file for TLS on this API|`string`|`<nil>`
492+
|cert|The TLS certificate in PEM format (this option is ignored if certFile is also set)|`string`|`<nil>`
455493
|certFile|The path to the certificate file for TLS on this API|`string`|`<nil>`
456494
|clientAuth|Enables or disables client auth for TLS on this API|`string`|`<nil>`
457495
|enabled|Enables or disables TLS on this API|`boolean`|`false`
458496
|insecureSkipHostVerify|When to true in unit test development environments to disable TLS verification. Use with extreme caution|`boolean`|`<nil>`
497+
|key|The TLS certificate key in PEM format (this option is ignored if keyFile is also set)|`string`|`<nil>`
459498
|keyFile|The path to the private key file for TLS on this API|`string`|`<nil>`
460499
|requiredDNAttributes|A set of required subject DN attributes. Each entry is a regular expression, and the subject certificate must have a matching attribute of the specified type (CN, C, O, OU, ST, L, STREET, POSTALCODE, SERIALNUMBER are valid attributes)|`map[string]string`|`<nil>`

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/gorilla/mux v1.8.1
1313
github.com/gorilla/websocket v1.5.1
1414
github.com/hashicorp/golang-lru/v2 v2.0.7
15-
github.com/hyperledger/firefly-common v1.4.6
15+
github.com/hyperledger/firefly-common v1.4.9
1616
github.com/lib/pq v1.10.9
1717
github.com/oklog/ulid/v2 v2.1.0
1818
github.com/prometheus/client_golang v1.18.0
@@ -40,6 +40,7 @@ require (
4040
go.uber.org/atomic v1.11.0 // indirect
4141
go.uber.org/multierr v1.11.0 // indirect
4242
golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e // indirect
43+
golang.org/x/time v0.5.0 // indirect
4344
)
4445

4546
require (

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
9090
github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
9191
github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
9292
github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
93-
github.com/hyperledger/firefly-common v1.4.6 h1:qqXoSaRml3WjUnWcWxrrXs5AIOWa+UcMXLCF8yEa4Pk=
94-
github.com/hyperledger/firefly-common v1.4.6/go.mod h1:jkErZdQmC9fsAJZQO427tURdwB9iiW+NMUZSqS3eBIE=
93+
github.com/hyperledger/firefly-common v1.4.9 h1:PfPZ73FN8WUoPl8iF8ud00B8476+jmqXHHi94w0Krbc=
94+
github.com/hyperledger/firefly-common v1.4.9/go.mod h1:dXewcVMFNON2SvQ1UPvu64OWUt77+M3p8qy61lT1kE4=
9595
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
9696
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
9797
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=

0 commit comments

Comments
 (0)