diff --git a/.github/settings.yml b/.github/settings.yml index 3f164bfb..720c9c33 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -5,7 +5,7 @@ repository: name: firefly-evmconnect description: Firefly EVM Connect - homepage: https://github.com/hyperledger/firefly-evmconnect + homepage: https://github.com/hyperledger-firefly/evmconnect default_branch: main has_downloads: true has_issues: true diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index afcad606..d8966f5a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.26.4" - name: Build and Test run: make diff --git a/CHANGELOG.md b/CHANGELOG.md index 67649c87..ec6d38a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ # Changelog -[FireFly EVM Connector Releases](https://github.com/hyperledger/firefly-evmconnect/releases) +[FireFly EVM Connector Releases](https://github.com/hyperledger-firefly/evmconnect/releases) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ca471dd..b3ce7c5d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ We welcome contributions to the FireFly Project in many forms, and there's always plenty to do! Please visit the -[contributors guide](https://hyperledger.github.io/firefly/latest/contributors/) in the +[contributors guide](https://hyperledger-firefly.github.io/firefly/latest/contributors/) in the docs to learn how to make contributions to this exciting project. Creative Commons License
This work is licensed under a Creative Commons Attribution 4.0 International License. diff --git a/Dockerfile b/Dockerfile index f97b5bc3..61353fe0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23-alpine3.20 AS builder +FROM golang:1.26.4-alpine3.24 AS builder RUN apk add --no-cache make git ARG BUILD_VERSION ENV BUILD_VERSION=${BUILD_VERSION} @@ -11,7 +11,7 @@ USER 1001 RUN make # Copy the migrations from FFTM down into our local migrations directory -RUN DB_MIGRATIONS_DIR=$(go list -f '{{.Dir}}' github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi | sed 's|pkg/ffcapi|db|') \ +RUN DB_MIGRATIONS_DIR=$(go list -f '{{.Dir}}' github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi | sed 's|pkg/ffcapi|db|') \ && cp -R "$DB_MIGRATIONS_DIR" db FROM alpine:3.21.3 diff --git a/Makefile b/Makefile index b9c04b30..3702b6d0 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ ${MOCKERY}: ${LINT}: $(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8 mockpaths: - $(eval FFTM_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger/firefly-transaction-manager/pkg/fftm)) - $(eval FF_SIGNER_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger/firefly-signer/pkg/rpcbackend)) + $(eval FFTM_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger-firefly/transaction-manager/pkg/fftm)) + $(eval FF_SIGNER_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger-firefly/signer/pkg/rpcbackend)) define makemock mocks: mocks-$(strip $(1))-$(strip $(2)) @@ -50,4 +50,4 @@ deps: reference: $(VGO) test ./cmd -timeout=10s -tags docs docker: - docker build --build-arg BUILD_VERSION=${BUILD_VERSION} ${DOCKER_ARGS} -t hyperledger/firefly-evmconnect . + docker build --build-arg BUILD_VERSION=${BUILD_VERSION} ${DOCKER_ARGS} -t hyperledger-firefly/evmconnect . diff --git a/README.md b/README.md index a13bff80..ebd2df02 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -[![codecov](https://codecov.io/gh/hyperledger/firefly-evmconnect/branch/main/graph/badge.svg?token=OEI8A08P0R)](https://codecov.io/gh/hyperledger/firefly-evmconnect) -[![Go Reference](https://pkg.go.dev/badge/github.com/hyperledger/firefly-evmconnect.svg)](https://pkg.go.dev/github.com/hyperledger/firefly-evmconnect) +[![codecov](https://codecov.io/gh/hyperledger-firefly/evmconnect/branch/main/graph/badge.svg?token=OEI8A08P0R)](https://codecov.io/gh/hyperledger-firefly/evmconnect) +[![Go Reference](https://pkg.go.dev/badge/github.com/hyperledger-firefly/evmconnect.svg)](https://pkg.go.dev/github.com/hyperledger-firefly/evmconnect) # Hyperledger FireFly EVM Connector This repo provides a reference implementation of the FireFly Connector API (FFCAPI) for EVM Based blockchains. -See the [Hyperledger Firefly Documentation](https://hyperledger.github.io/firefly/latest/overview/public_vs_permissioned/#firefly-architecture-for-public-chains) -and the [FireFly Transaction Manager](https://github.com/hyperledger/firefly-transaction-manager) repository for +See the [Hyperledger Firefly Documentation](https://hyperledger-firefly.github.io/firefly/latest/overview/public_vs_permissioned/#firefly-architecture-for-public-chains) +and the [FireFly Transaction Manager](https://github.com/hyperledger-firefly/transaction-manager) repository for more information. -> Also see [firefly-ethconnect](https://github.com/hyperledger/firefly-ethconnect) for the hardened +> Also see [firefly-ethconnect](https://github.com/hyperledger-firefly/ethconnect) for the hardened > connector optimized for private Ethereum sidechains, optimized for finality assured consensus > algorithms and throughput. @@ -24,7 +24,7 @@ A key responsibility of the FFCAPI connector is to map from developer friendly J down to the binary encoding of the blockchain. This repo uses the Apache 2.0 RLP encoding/decoding utilities from the -[firefly-signer](https://github.com/hyperledger/firefly-signer) repository. +[firefly-signer](https://github.com/hyperledger-firefly/signer) repository. ## Configuration diff --git a/cmd/config.go b/cmd/config.go index d2115d03..b5aafb2b 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/spf13/cobra" ) diff --git a/cmd/config_docs_generate_test.go b/cmd/config_docs_generate_test.go index 99a33ae6..46c0deac 100644 --- a/cmd/config_docs_generate_test.go +++ b/cmd/config_docs_generate_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/cmd/config_docs_test.go b/cmd/config_docs_test.go index 5d24453d..1dc93dd0 100644 --- a/cmd/config_docs_test.go +++ b/cmd/config_docs_test.go @@ -26,7 +26,7 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/cmd/evmconnect.go b/cmd/evmconnect.go index cf8373b3..4c0fa209 100644 --- a/cmd/evmconnect.go +++ b/cmd/evmconnect.go @@ -23,14 +23,14 @@ import ( "os/signal" "syscall" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/ethereum" - fftmcmd "github.com/hyperledger/firefly-transaction-manager/cmd" - "github.com/hyperledger/firefly-transaction-manager/pkg/fftm" - txhandlerfactory "github.com/hyperledger/firefly-transaction-manager/pkg/txhandler/registry" - "github.com/hyperledger/firefly-transaction-manager/pkg/txhandler/simple" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/ethereum" + fftmcmd "github.com/hyperledger-firefly/transaction-manager/cmd" + "github.com/hyperledger-firefly/transaction-manager/pkg/fftm" + txhandlerfactory "github.com/hyperledger-firefly/transaction-manager/pkg/txhandler/registry" + "github.com/hyperledger-firefly/transaction-manager/pkg/txhandler/simple" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/evmconnect_test.go b/cmd/evmconnect_test.go index 33d03fcf..666987a9 100644 --- a/cmd/evmconnect_test.go +++ b/cmd/evmconnect_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-evmconnect/mocks/fftmmocks" + "github.com/hyperledger-firefly/evmconnect/mocks/fftmmocks" "github.com/stretchr/testify/assert" ) diff --git a/cmd/version.go b/cmd/version.go index 3b13d5f6..d799fa3b 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -22,8 +22,8 @@ import ( "fmt" "runtime/debug" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" "github.com/spf13/cobra" "gopkg.in/yaml.v2" ) diff --git a/config.md b/config.md index 40cdb589..7b5ee621 100644 --- a/config.md +++ b/config.md @@ -95,6 +95,13 @@ |password|Password|`string`|`` |username|Username|`string`|`` +## connector.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + ## connector.events |Key|Description|Type|Default Value| @@ -106,6 +113,12 @@ |checkpointBlockGap|The number of blocks at the head of the chain that should be considered unstable (could be dropped from the canonical chain after a re-org). Unless events with a full set of confirmations are detected, the restart checkpoint will this many blocks behind the chain head.|`int`|`50` |filterPollingInterval|The interval between polling calls to a filter, when checking for newly arrived events|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1s` +## connector.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## connector.proxy |Key|Description|Type|Default Value| @@ -440,6 +453,19 @@ |password|Password|`string`|`` |username|Username|`string`|`` +## policyengine.simple.gasOracle.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## policyengine.simple.gasOracle.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## policyengine.simple.gasOracle.proxy |Key|Description|Type|Default Value| @@ -542,6 +568,19 @@ |password|Password|`string`|`` |username|Username|`string`|`` +## transactions.handler.simple.gasOracle.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## transactions.handler.simple.gasOracle.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## transactions.handler.simple.gasOracle.proxy |Key|Description|Type|Default Value| @@ -611,6 +650,19 @@ |password|Password|`string`|`` |username|Username|`string`|`` +## webhooks.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## webhooks.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## webhooks.proxy |Key|Description|Type|Default Value| diff --git a/evmconnect/main.go b/evmconnect/main.go index d38434cb..2c95b2af 100644 --- a/evmconnect/main.go +++ b/evmconnect/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/hyperledger/firefly-evmconnect/cmd" + "github.com/hyperledger-firefly/evmconnect/cmd" ) func main() { diff --git a/go.mod b/go.mod index 2638b4c3..1d85f8c3 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ -module github.com/hyperledger/firefly-evmconnect +module github.com/hyperledger-firefly/evmconnect -go 1.23.0 +go 1.26.4 require ( github.com/gorilla/mux v1.8.1 github.com/hashicorp/golang-lru v1.0.2 - github.com/hyperledger/firefly-common v1.5.9 - github.com/hyperledger/firefly-signer v1.1.23-0.20260422080826-42345c6c6b85 - github.com/hyperledger/firefly-transaction-manager v1.4.5 + github.com/hyperledger-firefly/common v1.6.1 + github.com/hyperledger-firefly/signer v1.2.0 + github.com/hyperledger-firefly/transaction-manager v1.5.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 4515a309..3d7d2670 100644 --- a/go.sum +++ b/go.sum @@ -100,12 +100,12 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/hyperledger/firefly-common v1.5.9 h1:Z1+SuKNYJ8hPKQ5CvcsMg6r/E4RyW6wb08nGwtcc8Ww= -github.com/hyperledger/firefly-common v1.5.9/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs= -github.com/hyperledger/firefly-signer v1.1.23-0.20260422080826-42345c6c6b85 h1:gh3YhxUYYwOfBCsEJXFmWO7SFzFrNuNulXftOam2JRI= -github.com/hyperledger/firefly-signer v1.1.23-0.20260422080826-42345c6c6b85/go.mod h1:cb40Xkm/t2+KH+V1q3/zxZPohBNEA0iOA7mcr9wyfzI= -github.com/hyperledger/firefly-transaction-manager v1.4.5 h1:zBe8hbzv6lJEWD5Ypk6efO5WXFs4+pqIFLUu7zbdmsg= -github.com/hyperledger/firefly-transaction-manager v1.4.5/go.mod h1:1kbYt8ofDXqfwC02vwV/HoOjmiv0IuT9UkJ//bbrliE= +github.com/hyperledger-firefly/common v1.6.1 h1:LjePiqXLwLwFwadcXuQnwlwX606S7bCaZZza233nrfg= +github.com/hyperledger-firefly/common v1.6.1/go.mod h1:TAcQ7lZ7iNRo5jxh4d4tt7M2NJ7eT6WAnkWqEvLdY+4= +github.com/hyperledger-firefly/signer v1.2.0 h1:8/PSj1I6Mvffulj/As/No7cH6EnRuuYcZ6ZEskZ31ss= +github.com/hyperledger-firefly/signer v1.2.0/go.mod h1:itDUFeTNFfrrYSvPgKokDlpDVD9N24WCGRzGGrEqWQQ= +github.com/hyperledger-firefly/transaction-manager v1.5.0 h1:uo+K9AavHB5Uc/gVEM3hG8QLvRRYEzf+fZyD4WKKwxA= +github.com/hyperledger-firefly/transaction-manager v1.5.0/go.mod h1:s4YmONoY6wLr88pZCpNoa8rrZFVMb7V+oEXwC+YvHmE= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= diff --git a/internal/ethereum/config.go b/internal/ethereum/config.go index c113c1c6..d13cd9c4 100644 --- a/internal/ethereum/config.go +++ b/internal/ethereum/config.go @@ -17,9 +17,9 @@ package ethereum import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) const ( diff --git a/internal/ethereum/deploy_contract_prepare.go b/internal/ethereum/deploy_contract_prepare.go index b87aeefd..f1f4d64f 100644 --- a/internal/ethereum/deploy_contract_prepare.go +++ b/internal/ethereum/deploy_contract_prepare.go @@ -23,12 +23,12 @@ import ( "encoding/json" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) DeployContractPrepare(ctx context.Context, req *ffcapi.ContractDeployPrepareRequest) (res *ffcapi.TransactionPrepareResponse, reason ffcapi.ErrorReason, err error) { diff --git a/internal/ethereum/deploy_contract_prepare_test.go b/internal/ethereum/deploy_contract_prepare_test.go index f8eb103c..4164631e 100644 --- a/internal/ethereum/deploy_contract_prepare_test.go +++ b/internal/ethereum/deploy_contract_prepare_test.go @@ -21,10 +21,10 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/estimate_gas.go b/internal/ethereum/estimate_gas.go index 62c425bf..8a8b7c77 100644 --- a/internal/ethereum/estimate_gas.go +++ b/internal/ethereum/estimate_gas.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/etherrors" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/etherrors" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) GasEstimate(ctx context.Context, transaction *ffcapi.TransactionInput) (*ffcapi.GasEstimateResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/estimate_gas_test.go b/internal/ethereum/estimate_gas_test.go index a8552c67..47cb4666 100644 --- a/internal/ethereum/estimate_gas_test.go +++ b/internal/ethereum/estimate_gas_test.go @@ -21,13 +21,13 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-evmconnect/mocks/ethblocklistenermocks" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/evmconnect/mocks/ethblocklistenermocks" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/ethereum.go b/internal/ethereum/ethereum.go index c266f999..62a90950 100644 --- a/internal/ethereum/ethereum.go +++ b/internal/ethereum/ethereum.go @@ -25,21 +25,21 @@ import ( "time" lru "github.com/hashicorp/golang-lru" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/internal/retryutil" - "github.com/hyperledger/firefly-evmconnect/pkg/ethblocklistener" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/internal/retryutil" + "github.com/hyperledger-firefly/evmconnect/pkg/ethblocklistener" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) type ethConnector struct { diff --git a/internal/ethereum/ethereum_test.go b/internal/ethereum/ethereum_test.go index 47193c07..01314ab4 100644 --- a/internal/ethereum/ethereum_test.go +++ b/internal/ethereum/ethereum_test.go @@ -23,15 +23,15 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-evmconnect/mocks/ethblocklistenermocks" - "github.com/hyperledger/firefly-evmconnect/mocks/rpcbackendmocks" - "github.com/hyperledger/firefly-evmconnect/pkg/ethblocklistener" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/evmconnect/mocks/ethblocklistenermocks" + "github.com/hyperledger-firefly/evmconnect/mocks/rpcbackendmocks" + "github.com/hyperledger-firefly/evmconnect/pkg/ethblocklistener" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/ethereum/event_actions.go b/internal/ethereum/event_actions.go index c7b79461..76dc99a5 100644 --- a/internal/ethereum/event_actions.go +++ b/internal/ethereum/event_actions.go @@ -20,11 +20,11 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethblocklistener" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethblocklistener" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) EventStreamStart(ctx context.Context, req *ffcapi.EventStreamStartRequest) (*ffcapi.EventStreamStartResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/event_actions_test.go b/internal/ethereum/event_actions_test.go index f5eb1207..4126b1ac 100644 --- a/internal/ethereum/event_actions_test.go +++ b/internal/ethereum/event_actions_test.go @@ -20,11 +20,11 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-evmconnect/mocks/rpcbackendmocks" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/evmconnect/mocks/rpcbackendmocks" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/event_enricher.go b/internal/ethereum/event_enricher.go index d04e973e..09227ce5 100644 --- a/internal/ethereum/event_enricher.go +++ b/internal/ethereum/event_enricher.go @@ -21,14 +21,14 @@ import ( "context" "math" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) type eventEnricher struct { diff --git a/internal/ethereum/event_enricher_test.go b/internal/ethereum/event_enricher_test.go index ae27fd9a..8d93e97a 100644 --- a/internal/ethereum/event_enricher_test.go +++ b/internal/ethereum/event_enricher_test.go @@ -22,9 +22,9 @@ import ( "math" "testing" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/internal/ethereum/event_listener.go b/internal/ethereum/event_listener.go index 1fb888ff..d9ab1345 100644 --- a/internal/ethereum/event_listener.go +++ b/internal/ethereum/event_listener.go @@ -22,13 +22,13 @@ import ( "math/big" "sync" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) // listenerCheckpoint is our Ethereum specific custom options that can be specified when creating a listener @@ -161,7 +161,7 @@ func (l *listener) listenerCatchupLoop() { defer close(l.catchupLoopDone) // Only filtering on a single listener - ctx := log.WithLogField(l.es.ctx, "listener", l.id.String()) + ctx := log.WithLogFields(l.es.ctx, "listener", l.id.String()) al := l.es.buildAggregatedListener([]*listener{l}) failCount := 0 diff --git a/internal/ethereum/event_listener_test.go b/internal/ethereum/event_listener_test.go index 8ab93e41..53cd327b 100644 --- a/internal/ethereum/event_listener_test.go +++ b/internal/ethereum/event_listener_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-evmconnect/mocks/rpcbackendmocks" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/evmconnect/mocks/rpcbackendmocks" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "golang.org/x/net/context" diff --git a/internal/ethereum/event_stream.go b/internal/ethereum/event_stream.go index ac57401a..1930ecca 100644 --- a/internal/ethereum/event_stream.go +++ b/internal/ethereum/event_stream.go @@ -25,15 +25,15 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/etherrors" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/etherrors" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) // eventFilter is our Ethereum specific filter options - an array of these can be configured on each listener diff --git a/internal/ethereum/event_stream_test.go b/internal/ethereum/event_stream_test.go index bb0ea7d6..5ccf5c56 100644 --- a/internal/ethereum/event_stream_test.go +++ b/internal/ethereum/event_stream_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-evmconnect/mocks/rpcbackendmocks" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/evmconnect/mocks/rpcbackendmocks" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/exec_query.go b/internal/ethereum/exec_query.go index e56ce6ed..409da888 100644 --- a/internal/ethereum/exec_query.go +++ b/internal/ethereum/exec_query.go @@ -20,16 +20,16 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/etherrors" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/etherrors" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) QueryInvoke(ctx context.Context, req *ffcapi.QueryInvokeRequest) (*ffcapi.QueryInvokeResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/exec_query_test.go b/internal/ethereum/exec_query_test.go index 57bdef58..f6b66f5c 100644 --- a/internal/ethereum/exec_query_test.go +++ b/internal/ethereum/exec_query_test.go @@ -22,14 +22,14 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/get_address_balance.go b/internal/ethereum/get_address_balance.go index b42f4da8..0a6c7a89 100644 --- a/internal/ethereum/get_address_balance.go +++ b/internal/ethereum/get_address_balance.go @@ -19,9 +19,9 @@ package ethereum import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) AddressBalance(ctx context.Context, req *ffcapi.AddressBalanceRequest) (*ffcapi.AddressBalanceResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/get_address_balance_test.go b/internal/ethereum/get_address_balance_test.go index 9e62d81e..694a38b6 100644 --- a/internal/ethereum/get_address_balance_test.go +++ b/internal/ethereum/get_address_balance_test.go @@ -20,9 +20,9 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/get_block_info.go b/internal/ethereum/get_block_info.go index df78379f..cce2459e 100644 --- a/internal/ethereum/get_block_info.go +++ b/internal/ethereum/get_block_info.go @@ -20,11 +20,11 @@ import ( "context" "math/big" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) BlockInfoByNumber(ctx context.Context, req *ffcapi.BlockInfoByNumberRequest) (*ffcapi.BlockInfoByNumberResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/get_block_info_test.go b/internal/ethereum/get_block_info_test.go index e2468171..009a3804 100644 --- a/internal/ethereum/get_block_info_test.go +++ b/internal/ethereum/get_block_info_test.go @@ -20,8 +20,8 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/get_gas_price.go b/internal/ethereum/get_gas_price.go index e94e35e8..06e319d8 100644 --- a/internal/ethereum/get_gas_price.go +++ b/internal/ethereum/get_gas_price.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) GasPriceEstimate(ctx context.Context, _ *ffcapi.GasPriceEstimateRequest) (*ffcapi.GasPriceEstimateResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/get_gas_price_test.go b/internal/ethereum/get_gas_price_test.go index 891c5b40..1fa05713 100644 --- a/internal/ethereum/get_gas_price_test.go +++ b/internal/ethereum/get_gas_price_test.go @@ -20,9 +20,9 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/get_next_nonce.go b/internal/ethereum/get_next_nonce.go index ee662778..58b6dee9 100644 --- a/internal/ethereum/get_next_nonce.go +++ b/internal/ethereum/get_next_nonce.go @@ -19,9 +19,9 @@ package ethereum import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) NextNonceForSigner(ctx context.Context, req *ffcapi.NextNonceForSignerRequest) (*ffcapi.NextNonceForSignerResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/get_next_nonce_test.go b/internal/ethereum/get_next_nonce_test.go index e8851676..03469d74 100644 --- a/internal/ethereum/get_next_nonce_test.go +++ b/internal/ethereum/get_next_nonce_test.go @@ -20,9 +20,9 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/get_receipt.go b/internal/ethereum/get_receipt.go index fd812ad6..18d403b9 100644 --- a/internal/ethereum/get_receipt.go +++ b/internal/ethereum/get_receipt.go @@ -24,14 +24,14 @@ import ( "math/big" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) // receiptExtraInfo is the version of the receipt we store under the TX. diff --git a/internal/ethereum/get_receipt_test.go b/internal/ethereum/get_receipt_test.go index 4ed39449..5de50da9 100644 --- a/internal/ethereum/get_receipt_test.go +++ b/internal/ethereum/get_receipt_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/new_block_listener.go b/internal/ethereum/new_block_listener.go index 0fb315bd..e3206166 100644 --- a/internal/ethereum/new_block_listener.go +++ b/internal/ethereum/new_block_listener.go @@ -19,8 +19,8 @@ package ethereum import ( "context" - "github.com/hyperledger/firefly-evmconnect/pkg/ethblocklistener" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/evmconnect/pkg/ethblocklistener" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) GetChainTrackingMode(_ context.Context) ffcapi.ChainTrackingMode { diff --git a/internal/ethereum/new_block_listener_test.go b/internal/ethereum/new_block_listener_test.go index 3155a445..3318160e 100644 --- a/internal/ethereum/new_block_listener_test.go +++ b/internal/ethereum/new_block_listener_test.go @@ -19,9 +19,9 @@ package ethereum import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/prepare_transaction.go b/internal/ethereum/prepare_transaction.go index af742ec1..7b697836 100644 --- a/internal/ethereum/prepare_transaction.go +++ b/internal/ethereum/prepare_transaction.go @@ -21,14 +21,14 @@ import ( "encoding/json" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) type txType int diff --git a/internal/ethereum/prepare_transaction_test.go b/internal/ethereum/prepare_transaction_test.go index a54c07c2..5e1fdbd3 100644 --- a/internal/ethereum/prepare_transaction_test.go +++ b/internal/ethereum/prepare_transaction_test.go @@ -22,11 +22,11 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/send_transaction.go b/internal/ethereum/send_transaction.go index a6cab0e7..bd51a650 100644 --- a/internal/ethereum/send_transaction.go +++ b/internal/ethereum/send_transaction.go @@ -22,15 +22,15 @@ import ( "encoding/json" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/etherrors" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/etherrors" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) TransactionSend(ctx context.Context, req *ffcapi.TransactionSendRequest) (*ffcapi.TransactionSendResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/send_transaction_test.go b/internal/ethereum/send_transaction_test.go index 16beac99..83c39135 100644 --- a/internal/ethereum/send_transaction_test.go +++ b/internal/ethereum/send_transaction_test.go @@ -21,11 +21,11 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-evmconnect/pkg/etherrors" - "github.com/hyperledger/firefly-signer/pkg/ethsigner" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/evmconnect/pkg/etherrors" + "github.com/hyperledger-firefly/signer/pkg/ethsigner" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/ethereum/statuses.go b/internal/ethereum/statuses.go index 030b1a7f..e9253df2 100644 --- a/internal/ethereum/statuses.go +++ b/internal/ethereum/statuses.go @@ -19,9 +19,9 @@ package ethereum import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-evmconnect/pkg/etherrors" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/evmconnect/pkg/etherrors" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func (c *ethConnector) IsLive(_ context.Context) (*ffcapi.LiveResponse, ffcapi.ErrorReason, error) { diff --git a/internal/ethereum/statuses_test.go b/internal/ethereum/statuses_test.go index 943046ad..0f495f79 100644 --- a/internal/ethereum/statuses_test.go +++ b/internal/ethereum/statuses_test.go @@ -19,8 +19,8 @@ package ethereum import ( "testing" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/msgs/en_config_descriptions.go b/internal/msgs/en_config_descriptions.go index f98a959e..aa45f8bf 100644 --- a/internal/msgs/en_config_descriptions.go +++ b/internal/msgs/en_config_descriptions.go @@ -17,7 +17,7 @@ package msgs import ( - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "golang.org/x/text/language" ) diff --git a/internal/msgs/en_error_messages.go b/internal/msgs/en_error_messages.go index 7d047c6a..2f0a093e 100644 --- a/internal/msgs/en_error_messages.go +++ b/internal/msgs/en_error_messages.go @@ -19,7 +19,7 @@ package msgs import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "golang.org/x/text/language" ) diff --git a/internal/msgs/en_field_descriptions.go b/internal/msgs/en_field_descriptions.go index eda66c66..7606629b 100644 --- a/internal/msgs/en_field_descriptions.go +++ b/internal/msgs/en_field_descriptions.go @@ -17,7 +17,7 @@ package msgs import ( - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "golang.org/x/text/language" ) diff --git a/internal/retryutil/retry_delay.go b/internal/retryutil/retry_delay.go index 50b1102a..b2e5d6e9 100644 --- a/internal/retryutil/retry_delay.go +++ b/internal/retryutil/retry_delay.go @@ -20,8 +20,8 @@ import ( "context" "time" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" ) type RetryWrapper struct { diff --git a/internal/retryutil/retry_delay_test.go b/internal/retryutil/retry_delay_test.go index 912a5ab3..76f713f4 100644 --- a/internal/retryutil/retry_delay_test.go +++ b/internal/retryutil/retry_delay_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/retry" "github.com/stretchr/testify/require" ) diff --git a/mocks/ethblocklistenermocks/block_listener.go b/mocks/ethblocklistenermocks/block_listener.go index 43fbd178..b6324123 100644 --- a/mocks/ethblocklistenermocks/block_listener.go +++ b/mocks/ethblocklistenermocks/block_listener.go @@ -5,16 +5,12 @@ package ethblocklistenermocks import ( context "context" - ethblocklistener "github.com/hyperledger/firefly-evmconnect/pkg/ethblocklistener" - ethrpc "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - - ethtypes "github.com/hyperledger/firefly-signer/pkg/ethtypes" - - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" - + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + ethblocklistener "github.com/hyperledger-firefly/evmconnect/pkg/ethblocklistener" + ethrpc "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + ethtypes "github.com/hyperledger-firefly/signer/pkg/ethtypes" + rpcbackend "github.com/hyperledger-firefly/signer/pkg/rpcbackend" mock "github.com/stretchr/testify/mock" - - rpcbackend "github.com/hyperledger/firefly-signer/pkg/rpcbackend" ) // BlockListener is an autogenerated mock type for the BlockListener type diff --git a/mocks/fftmmocks/manager.go b/mocks/fftmmocks/manager.go index 444bc8c3..b0752f63 100644 --- a/mocks/fftmmocks/manager.go +++ b/mocks/fftmmocks/manager.go @@ -5,19 +5,14 @@ package fftmmocks import ( context "context" - apitypes "github.com/hyperledger/firefly-transaction-manager/pkg/apitypes" - - eventapi "github.com/hyperledger/firefly-transaction-manager/pkg/eventapi" - - ffcapi "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" - - metric "github.com/hyperledger/firefly-common/pkg/metric" - - mock "github.com/stretchr/testify/mock" + apitypes "github.com/hyperledger-firefly/transaction-manager/pkg/apitypes" + eventapi "github.com/hyperledger-firefly/transaction-manager/pkg/eventapi" + ffcapi "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" mux "github.com/gorilla/mux" - - txhandler "github.com/hyperledger/firefly-transaction-manager/pkg/txhandler" + metric "github.com/hyperledger-firefly/common/pkg/metric" + txhandler "github.com/hyperledger-firefly/transaction-manager/pkg/txhandler" + mock "github.com/stretchr/testify/mock" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/rpcbackendmocks/backend.go b/mocks/rpcbackendmocks/backend.go index 1ba3d6d6..23130f05 100644 --- a/mocks/rpcbackendmocks/backend.go +++ b/mocks/rpcbackendmocks/backend.go @@ -5,7 +5,8 @@ package rpcbackendmocks import ( context "context" - rpcbackend "github.com/hyperledger/firefly-signer/pkg/rpcbackend" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + rpcbackend "github.com/hyperledger-firefly/signer/pkg/rpcbackend" mock "github.com/stretchr/testify/mock" ) @@ -37,24 +38,51 @@ func (_m *Backend) CallRPC(ctx context.Context, result interface{}, method strin return r0 } +// CallRPCBatch provides a mock function with given fields: ctx, ops +func (_m *Backend) CallRPCBatch(ctx context.Context, ops ...*rpcbackend.RPCBatchOp) []*rpcbackend.RPCError { + _va := make([]interface{}, len(ops)) + for _i := range ops { + _va[_i] = ops[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for CallRPCBatch") + } + + var r0 []*rpcbackend.RPCError + if rf, ok := ret.Get(0).(func(context.Context, ...*rpcbackend.RPCBatchOp) []*rpcbackend.RPCError); ok { + r0 = rf(ctx, ops...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]*rpcbackend.RPCError) + } + } + + return r0 +} + // SyncRequest provides a mock function with given fields: ctx, rpcReq -func (_m *Backend) SyncRequest(ctx context.Context, rpcReq *rpcbackend.RPCRequest) (*rpcbackend.RPCResponse, error) { +func (_m *Backend) SyncRequest(ctx context.Context, rpcReq *rpcbackend.RPCRequest) (*rpcbackend.RPCResponseTyped[*fftypes.JSONAny], error) { ret := _m.Called(ctx, rpcReq) if len(ret) == 0 { panic("no return value specified for SyncRequest") } - var r0 *rpcbackend.RPCResponse + var r0 *rpcbackend.RPCResponseTyped[*fftypes.JSONAny] var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *rpcbackend.RPCRequest) (*rpcbackend.RPCResponse, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *rpcbackend.RPCRequest) (*rpcbackend.RPCResponseTyped[*fftypes.JSONAny], error)); ok { return rf(ctx, rpcReq) } - if rf, ok := ret.Get(0).(func(context.Context, *rpcbackend.RPCRequest) *rpcbackend.RPCResponse); ok { + if rf, ok := ret.Get(0).(func(context.Context, *rpcbackend.RPCRequest) *rpcbackend.RPCResponseTyped[*fftypes.JSONAny]); ok { r0 = rf(ctx, rpcReq) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*rpcbackend.RPCResponse) + r0 = ret.Get(0).(*rpcbackend.RPCResponseTyped[*fftypes.JSONAny]) } } diff --git a/mocks/rpcbackendmocks/subscription.go b/mocks/rpcbackendmocks/subscription.go index af6e98fb..403fac58 100644 --- a/mocks/rpcbackendmocks/subscription.go +++ b/mocks/rpcbackendmocks/subscription.go @@ -5,10 +5,9 @@ package rpcbackendmocks import ( context "context" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + rpcbackend "github.com/hyperledger-firefly/signer/pkg/rpcbackend" mock "github.com/stretchr/testify/mock" - - rpcbackend "github.com/hyperledger/firefly-signer/pkg/rpcbackend" ) // Subscription is an autogenerated mock type for the Subscription type diff --git a/pkg/ethblocklistener/block_receipt_fetcher.go b/pkg/ethblocklistener/block_receipt_fetcher.go index b27e1038..4ff46961 100644 --- a/pkg/ethblocklistener/block_receipt_fetcher.go +++ b/pkg/ethblocklistener/block_receipt_fetcher.go @@ -19,11 +19,11 @@ package ethblocklistener import ( "runtime/debug" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" ) type blockReceiptRequest struct { diff --git a/pkg/ethblocklistener/block_receipt_fetcher_test.go b/pkg/ethblocklistener/block_receipt_fetcher_test.go index 3e67c6b9..c35e58c1 100644 --- a/pkg/ethblocklistener/block_receipt_fetcher_test.go +++ b/pkg/ethblocklistener/block_receipt_fetcher_test.go @@ -20,12 +20,12 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-evmconnect/mocks/rpcbackendmocks" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/evmconnect/mocks/rpcbackendmocks" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/ethblocklistener/blocklistener.go b/pkg/ethblocklistener/blocklistener.go index 41c99e93..5862b9d8 100644 --- a/pkg/ethblocklistener/blocklistener.go +++ b/pkg/ethblocklistener/blocklistener.go @@ -23,19 +23,19 @@ import ( "time" lru "github.com/hashicorp/golang-lru" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/internal/retryutil" - "github.com/hyperledger/firefly-evmconnect/pkg/etherrors" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/internal/retryutil" + "github.com/hyperledger-firefly/evmconnect/pkg/etherrors" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) // a linked list of accumulated confirmations for a transaction @@ -153,7 +153,7 @@ func NewBlockListenerSupplyBackend(ctx context.Context, retry *retry.Retry, conf conf.ChainTrackingMode = ffcapi.ChainTrackingModeFull } bl := &blockListener{ - ctx: log.WithLogField(ctx, "role", "blocklistener"), + ctx: log.WithLogFields(ctx, "role", "blocklistener"), retry: &retryutil.RetryWrapper{Retry: retry}, backend: httpBackend, // use the HTTP backend - might get overwritten by a connected websocket later wsBackend: wsBackend, diff --git a/pkg/ethblocklistener/blocklistener_blockquery.go b/pkg/ethblocklistener/blocklistener_blockquery.go index 82a65e19..69f4c199 100644 --- a/pkg/ethblocklistener/blocklistener_blockquery.go +++ b/pkg/ethblocklistener/blocklistener_blockquery.go @@ -19,11 +19,11 @@ package ethblocklistener import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" ) func (bl *blockListener) addToBlockCache(blockInfo *ethrpc.BlockInfoJSONRPC) { diff --git a/pkg/ethblocklistener/blocklistener_blockquery_test.go b/pkg/ethblocklistener/blocklistener_blockquery_test.go index 7c9fdc0b..654016f4 100644 --- a/pkg/ethblocklistener/blocklistener_blockquery_test.go +++ b/pkg/ethblocklistener/blocklistener_blockquery_test.go @@ -19,11 +19,11 @@ package ethblocklistener import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/ethblocklistener/blocklistener_test.go b/pkg/ethblocklistener/blocklistener_test.go index 05abb940..256e4f8f 100644 --- a/pkg/ethblocklistener/blocklistener_test.go +++ b/pkg/ethblocklistener/blocklistener_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-evmconnect/mocks/rpcbackendmocks" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/evmconnect/mocks/rpcbackendmocks" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -791,7 +791,7 @@ func TestBlockListenerReorgReplaceTail(t *testing.T) { func TestBlockListenerGap(t *testing.T) { - // See issue https://github.com/hyperledger/firefly-evmconnect/issues/10 + // See issue https://github.com/hyperledger-firefly/evmconnect/issues/10 // We have seen that certain JSON/RPC endpoints might miss blocks during re-orgs, and our listener // needs to cope with this. This means winding back when we find a gap and re-building our canonical // view of the chain. diff --git a/pkg/ethblocklistener/confirmation_reconciler.go b/pkg/ethblocklistener/confirmation_reconciler.go index 9769ac12..10fbb1ce 100644 --- a/pkg/ethblocklistener/confirmation_reconciler.go +++ b/pkg/ethblocklistener/confirmation_reconciler.go @@ -19,12 +19,12 @@ package ethblocklistener import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) func toBlockInfoList(ffcapiBlocks []*ethrpc.MinimalBlockInfo) (blocks []*ethrpc.BlockInfoJSONRPC) { diff --git a/pkg/ethblocklistener/confirmation_reconciler_test.go b/pkg/ethblocklistener/confirmation_reconciler_test.go index fa7ce29d..6c59f26f 100644 --- a/pkg/ethblocklistener/confirmation_reconciler_test.go +++ b/pkg/ethblocklistener/confirmation_reconciler_test.go @@ -25,12 +25,12 @@ import ( "testing" lru "github.com/hashicorp/golang-lru" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-evmconnect/mocks/rpcbackendmocks" - "github.com/hyperledger/firefly-evmconnect/pkg/ethrpc" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" - "github.com/hyperledger/firefly-signer/pkg/rpcbackend" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/evmconnect/mocks/rpcbackendmocks" + "github.com/hyperledger-firefly/evmconnect/pkg/ethrpc" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" + "github.com/hyperledger-firefly/signer/pkg/rpcbackend" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/etherrors/error_mapping.go b/pkg/etherrors/error_mapping.go index 11b6641b..443828d7 100644 --- a/pkg/etherrors/error_mapping.go +++ b/pkg/etherrors/error_mapping.go @@ -19,7 +19,7 @@ package etherrors import ( "strings" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" ) type RPCMethodCategory int diff --git a/pkg/etherrors/error_mapping_test.go b/pkg/etherrors/error_mapping_test.go index 9fc21f92..b114f628 100644 --- a/pkg/etherrors/error_mapping_test.go +++ b/pkg/etherrors/error_mapping_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" + "github.com/hyperledger-firefly/transaction-manager/pkg/ffcapi" "github.com/stretchr/testify/require" ) diff --git a/pkg/ethrpc/ethrpc.go b/pkg/ethrpc/ethrpc.go index 8056a8e7..9512b8d5 100644 --- a/pkg/ethrpc/ethrpc.go +++ b/pkg/ethrpc/ethrpc.go @@ -20,8 +20,8 @@ import ( "encoding/json" "math/big" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" ) // TxReceiptJSONRPC is the receipt obtained over JSON/RPC from the ethereum client, with gas used, logs and contract address diff --git a/pkg/ethrpc/ethrpc_test.go b/pkg/ethrpc/ethrpc_test.go index 004eae11..42dc2b32 100644 --- a/pkg/ethrpc/ethrpc_test.go +++ b/pkg/ethrpc/ethrpc_test.go @@ -22,8 +22,8 @@ import ( "math/big" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-signer/pkg/ethtypes" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/signer/pkg/ethtypes" "github.com/stretchr/testify/require" ) diff --git a/pkg/ethrpc/jsonformatoptions.go b/pkg/ethrpc/jsonformatoptions.go index b44235d3..8eea92cf 100644 --- a/pkg/ethrpc/jsonformatoptions.go +++ b/pkg/ethrpc/jsonformatoptions.go @@ -24,9 +24,9 @@ import ( "net/url" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-evmconnect/internal/msgs" - "github.com/hyperledger/firefly-signer/pkg/abi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/evmconnect/internal/msgs" + "github.com/hyperledger-firefly/signer/pkg/abi" ) type JSONFormatOptions string diff --git a/pkg/ethrpc/jsonformatoptions_test.go b/pkg/ethrpc/jsonformatoptions_test.go index d724e881..31fb426c 100644 --- a/pkg/ethrpc/jsonformatoptions_test.go +++ b/pkg/ethrpc/jsonformatoptions_test.go @@ -23,7 +23,7 @@ import ( "math/big" "testing" - "github.com/hyperledger/firefly-signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/abi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )