Skip to content

Commit

Permalink
pick up transaction manager with config fix
Browse files Browse the repository at this point in the history
Signed-off-by: Chengxuan Xing <[email protected]>
  • Loading branch information
Chengxuan committed Mar 30, 2023
1 parent 68c5262 commit 00dc5ea
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 13 deletions.
51 changes: 49 additions & 2 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,54 @@

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|name|Deprecated: Please use 'transactions.handler.name' instead|`string`|`<nil>`
|name|Deprecated: Please use 'transactions.handler.name' instead|`string`|`simple`

## policyengine.simple

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|fixedGasPrice|Deprecated: Please use 'transactions.handler.simple.fixedGasPrice' instead|Raw JSON|`<nil>`
|resubmitInterval|Deprecated: Please use 'transactions.handler.simple.resubmitInterval' instead|[`time.Duration`](https://pkg.go.dev/time#Duration)|`5m`

## policyengine.simple.gasOracle

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|connectionTimeout|The maximum amount of time that a connection is allowed to remain with no data transmitted|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
|expectContinueTimeout|See [ExpectContinueTimeout in the Go docs](https://pkg.go.dev/net/http#Transport)|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1s`
|headers|Adds custom headers to HTTP requests|`map[string]string`|`<nil>`
|idleTimeout|The max duration to hold a HTTP keepalive connection between calls|[`time.Duration`](https://pkg.go.dev/time#Duration)|`475ms`
|maxIdleConns|The max number of idle connections to hold pooled|`int`|`100`
|method|Deprecated: Please use 'transactions.handler.simple.gasOracle.method' instead|`string`|`GET`
|mode|Deprecated: Please use 'transactions.handler.simple.gasOracle.mode' instead|'connector', 'restapi', 'fixed', or 'disabled'|`connector`
|passthroughHeadersEnabled|Enable passing through the set of allowed HTTP request headers|`boolean`|`false`
|queryInterval|Deprecated: Please use 'transactions.handler.simple.gasOracle.queryInterval' instead|[`time.Duration`](https://pkg.go.dev/time#Duration)|`5m`
|requestTimeout|The maximum amount of time that a request is allowed to remain open|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`
|template|Deprecated: Please use 'transactions.handler.simple.gasOracle.template' instead|[Go Template](https://pkg.go.dev/text/template) `string`|`<nil>`
|tlsHandshakeTimeout|The maximum amount of time to wait for a successful TLS handshake|[`time.Duration`](https://pkg.go.dev/time#Duration)|`10s`
|url|Deprecated: Please use 'transactions.handler.simple.gasOracle.url' instead|`string`|`<nil>`

## policyengine.simple.gasOracle.auth

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|password|Password|`string`|`<nil>`
|username|Username|`string`|`<nil>`

## policyengine.simple.gasOracle.proxy

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|url|Deprecated: Please use 'transactions.handler.simple.gasOracle.proxy.url' instead|`string`|`<nil>`

## policyengine.simple.gasOracle.retry

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|count|The maximum number of times to retry|`int`|`5`
|enabled|Enables retries|`boolean`|`false`
|initWaitTime|The initial retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`250ms`
|maxWaitTime|The maximum retry delay|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s`

## policyloop

Expand Down Expand Up @@ -256,7 +303,7 @@

|Key|Description|Type|Default Value|
|---|-----------|----|-------------|
|name|The name of the transaction handler to use|`string`|`simple`
|name|The name of the transaction handler to use|`string`|`<nil>`

## transactions.handler.simple

Expand Down
13 changes: 8 additions & 5 deletions evmconnect_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ persistence:
ffcore:
url: http://127.0.0.1:5101
namespaces:
- default
- default
confirmations:
required: 0
policyengine.simple:
fixedGasPrice: 0
gasOracle:
mode: fixed
transactions:
handler:
name: simple
simple:
fixedGasPrice: 0
gasOracle:
mode: fixed
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.19

require (
github.com/hashicorp/golang-lru v0.5.4
github.com/hyperledger/firefly-common v1.2.1
github.com/hyperledger/firefly-common v1.2.7
github.com/hyperledger/firefly-signer v1.1.4
github.com/hyperledger/firefly-transaction-manager v1.2.6
github.com/hyperledger/firefly-transaction-manager v1.2.9-0.20230330181613-ac3579a7dd8b
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,12 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/hyperledger/firefly-common v1.2.1 h1:h35T5Ask/ixlW70KZxHpPsO5QfdnKBFEyX+7L10lwoo=
github.com/hyperledger/firefly-common v1.2.1/go.mod h1:aqaq2ZUzSlkwVC/TF+pwUkHxGDLYSE2DzdozZ1MIMeM=
github.com/hyperledger/firefly-common v1.2.7 h1:voFbNVRFHZ64EJbyxCtMbLLriNRyqrl+wdUEqpgexHs=
github.com/hyperledger/firefly-common v1.2.7/go.mod h1:uYO8DMgT3OGoF2R4Bew1Ql4BS3udYGzPs59sJH1V3E4=
github.com/hyperledger/firefly-signer v1.1.4 h1:Qpu1GLRWfsU3srtodGYqJ2LmZErYYJPstRLUlyh+zCg=
github.com/hyperledger/firefly-signer v1.1.4/go.mod h1:4h2MN910A2knrWGYCT+aWjBDlhptgQn/9WcT1N/Ct8s=
github.com/hyperledger/firefly-transaction-manager v1.2.6 h1:Z6ozlIjWUle6W5YY4Oe1xSXqnAXU4FaetY1fpQDMCS0=
github.com/hyperledger/firefly-transaction-manager v1.2.6/go.mod h1:MPsdnEu+MiWOAdcWr66fYW8cdxNZEKfw1AqGNx+TbNs=
github.com/hyperledger/firefly-transaction-manager v1.2.9-0.20230330181613-ac3579a7dd8b h1:qch34SRylsaNeU/QKh4veNzlnHSHzKrRJUyIUnwsyjU=
github.com/hyperledger/firefly-transaction-manager v1.2.9-0.20230330181613-ac3579a7dd8b/go.mod h1:cw8WaeziBv6WewOQVFIrkQcnv2ggJf9fnc/ztjzRorw=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
Expand Down

0 comments on commit 00dc5ea

Please sign in to comment.