diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index 2a5d9c74..e4071534 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -17,7 +17,7 @@ jobs: - name: Set build tag id: build_tag_generator run: | - RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger/firefly-ethconnect/releases/latest -s | jq .tag_name -r) + RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger-firefly/ethconnect/releases/latest -s | jq .tag_name -r) BUILD_TAG=$RELEASE_TAG-$(date +"%Y%m%d")-$GITHUB_RUN_NUMBER echo ::set-output name=BUILD_TAG::$BUILD_TAG @@ -27,17 +27,17 @@ jobs: --label commit=$GITHUB_SHA \ --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \ - --tag ghcr.io/hyperledger/firefly-ethconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} . + --tag ghcr.io/hyperledger-firefly/ethconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} . - name: Tag release - run: docker tag ghcr.io/hyperledger/firefly-ethconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly-ethconnect:head + run: docker tag ghcr.io/hyperledger-firefly/ethconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger-firefly/ethconnect:head - name: Push docker image run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push ghcr.io/hyperledger/firefly-ethconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} + docker push ghcr.io/hyperledger-firefly/ethconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} - name: Push head tag run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push ghcr.io/hyperledger/firefly-ethconnect:head + docker push ghcr.io/hyperledger-firefly/ethconnect:head diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml index 831c17ca..e6f3add8 100644 --- a/.github/workflows/docker_release.yml +++ b/.github/workflows/docker_release.yml @@ -21,26 +21,26 @@ jobs: --label commit=$GITHUB_SHA \ --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label tag=${GITHUB_REF##*/} \ - --tag ghcr.io/hyperledger/firefly-ethconnect:${GITHUB_REF##*/} \ - --tag ghcr.io/hyperledger/firefly-ethconnect:head \ + --tag ghcr.io/hyperledger-firefly/ethconnect:${GITHUB_REF##*/} \ + --tag ghcr.io/hyperledger-firefly/ethconnect:head \ . - name: Tag release if: github.event.action == 'released' - run: docker tag ghcr.io/hyperledger/firefly-ethconnect:${GITHUB_REF##*/} ghcr.io/hyperledger/firefly-ethconnect:latest + run: docker tag ghcr.io/hyperledger-firefly/ethconnect:${GITHUB_REF##*/} ghcr.io/hyperledger-firefly/ethconnect:latest - name: Push docker image run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push ghcr.io/hyperledger/firefly-ethconnect:${GITHUB_REF##*/} + docker push ghcr.io/hyperledger-firefly/ethconnect:${GITHUB_REF##*/} - name: Push head tag run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push ghcr.io/hyperledger/firefly-ethconnect:head + docker push ghcr.io/hyperledger-firefly/ethconnect:head - name: Push latest tag if: github.event.action == 'released' run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push ghcr.io/hyperledger/firefly-ethconnect:latest + docker push ghcr.io/hyperledger-firefly/ethconnect:latest diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index c6accb0c..13a49c48 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.26.4" check-latest: true - name: Install solc diff --git a/Dockerfile b/Dockerfile index 2c49c1a5..435e403f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-bullseye AS builder +FROM golang:1.26.4-bookworm AS builder WORKDIR /ethconnect RUN apt-get update -y \ && apt-get install -y build-essential git \ @@ -13,7 +13,7 @@ ADD . . RUN cp go.mod.new go.mod RUN make clean deps build -FROM debian:bullseye-slim +FROM debian:bookworm-slim WORKDIR /ethconnect COPY --from=builder /ethconnect/ethconnect . COPY --from=builder /ethconnect/ethbinding.so . diff --git a/README.md b/README.md index 310c51f9..4773afb1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![codecov](https://codecov.io/gh/hyperledger/firefly-ethconnect/branch/main/graph/badge.svg?token=nO6ihSAzpV)](https://codecov.io/gh/hyperledger/firefly-ethconnect) [![Go Report Card](https://goreportcard.com/badge/github.com/hyperledger/firefly-ethconnect)](https://goreportcard.com/report/github.com/hyperledger/firefly-ethconnect) +[![codecov](https://codecov.io/gh/hyperledger-firefly/ethconnect/branch/main/graph/badge.svg?token=nO6ihSAzpV)](https://codecov.io/gh/hyperledger-firefly/ethconnect) [![Go Report Card](https://goreportcard.com/badge/github.com/hyperledger-firefly/ethconnect)](https://goreportcard.com/report/github.com/hyperledger-firefly/ethconnect) ## EthConnect - Hyperledger FireFly connector for Ethereum networks @@ -7,7 +7,7 @@ for Ethereum networks. > For new projects, you are recommended to use the full Hyperledger FireFly > project stack - and consider using the new\ -> [EVMConnect](https://github.com/hyperledger/firefly-evmconnect) connector +> [EVMConnect](https://github.com/hyperledger-firefly/evmconnect) connector > for connectivity to your EVM based chains (whether public, or private). Since creation in 2018 a large amount of function has evolved through @@ -33,7 +33,7 @@ For example to allow connectivity from an Enterprise Service Bus (ESB) or other Enterprise Application Integration (EAI) tier, or applications running in a Java EE Application Server. -[![hyperledger/firefly-ethconnect](ethconnect.png)](ethconnect.pdf) +[![hyperledger-firefly/ethconnect](ethconnect.png)](ethconnect.pdf) ## License @@ -113,7 +113,7 @@ contracts and sending transactions, because it is: Instead thick client libraries such as [web3.js](https://github.com/ethereum/web3.js/), [web3j](https://github.com/web3j/web3j), [web3.py](https://github.com/ethereum/web3.py), [Nethereum](https://github.com/Nethereum/Nethereum) and [ethjs](https://github.com/ethjs/ethjs) are used to submit transactions. -These thick client libraries perform many of the same functions as hyperledger/firefly-ethconnect, simplifying submission of transactions, receipt checking, +These thick client libraries perform many of the same functions as hyperledger-firefly/ethconnect, simplifying submission of transactions, receipt checking, nonce management etc. In the modern world of Microservice architectures, having a simple, efficient @@ -141,7 +141,7 @@ Providing a Messaging layer with at-least-once delivery and message ordering, al Applications that have their own state stores are able to communicate over Messaging / Kafka with simple JSON payloads to stream transactions into a scalable set of Ethereum nodes, and process the replies as they occur. The application can scale horizontally. Applications can also be decoupled from the Ethereum network with an integration technology like an Enterprise Service Bus (ESB). -When spikes in workload occur that create a large queue of transactions that need to be fed into the Ethereum network at a lower rate, the hyperledger/firefly-ethconnect bridge feeds them in at an optimal rate. +When spikes in workload occur that create a large queue of transactions that need to be fed into the Ethereum network at a lower rate, the hyperledger-firefly/ethconnect bridge feeds them in at an optimal rate. ### Ethereum Webhooks and the REST Receipt Store (MongoDB) @@ -172,17 +172,17 @@ A capped collection can be used in MongoDB to limit the storage. For example to The transaction pooling/execution logic within an Ethereum node is based upon the concept of a `nonce`, which must be incremented exactly once each time a transaction is submitted from the same Ethereum address. There can be no gaps in the nonce values, or messages build up in the `queued transaction` pool waiting for the gap to be filled (which is the responsibility of the sender to fill). This allows for deterministic ordering of transactions sent by the same sender. -The management of this `nonce` pushes complexity back to the application tier - especially for horizontally scaled Enterprise applications sending many transactions using the same sender. By using an ordered Messaging stream to submit messages into the Ethereum network, many applications are able to delegate this complexity to hyperledger/firefly-ethconnect. +The management of this `nonce` pushes complexity back to the application tier - especially for horizontally scaled Enterprise applications sending many transactions using the same sender. By using an ordered Messaging stream to submit messages into the Ethereum network, many applications are able to delegate this complexity to hyperledger-firefly/ethconnect. -The hyperledger/firefly-ethconnect bridge contains all the logic necessary to communicate with the node to determine the next nonce, and also to cope with multiple requests being in flight within the same block, for the same sender (including [with IBFT](https://github.com/ethereum/EIPs/issues/650#issuecomment-360085474)). +The hyperledger-firefly/ethconnect bridge contains all the logic necessary to communicate with the node to determine the next nonce, and also to cope with multiple requests being in flight within the same block, for the same sender (including [with IBFT](https://github.com/ethereum/EIPs/issues/650#issuecomment-360085474)). When using the bridge, an application can submit simple YAML/JSON formatted transactions in a highly parallel way across many instances using the same sender address to the bridge over HTTPS/Kafka _without_ a nonce. Then through ordered message delivery and nonce management -code within the hyperledger/firefly-ethconnect bridge it will be assigned a nonce and submitted +code within the hyperledger-firefly/ethconnect bridge it will be assigned a nonce and submitted into the Ethereum node. The nonce assigned is returned by the bridge in the reply. -If a sender needs to achieve exactly-once delivery of transactions (vs. at-least-once) it is still necessary to allocate the nonce within the application and pass it into hyperledger/firefly-ethconnect in the payload. This allows the sender to control allocation of nonces using its internal state store / locking. +If a sender needs to achieve exactly-once delivery of transactions (vs. at-least-once) it is still necessary to allocate the nonce within the application and pass it into hyperledger-firefly/ethconnect in the payload. This allows the sender to control allocation of nonces using its internal state store / locking. > There's a good summary of at-least-once vs. exactly-once semantics in the [Akka documentation](https://doc.akka.io/docs/akka/current/general/message-delivery-reliability.html?language=scala#discussion-what-does-at-most-once-mean-) @@ -209,12 +209,12 @@ trivially. Some examples as follows: ## Why Kafka? We selected Kafka as the first Messaging platform, because Kafka has message ordering and scale characteristics that are ideally suited to the Ethereum transaction model: -- Transactions can be sprayed across partitions, while retaining order of the transactions for a particular sender. Allowing independent and dynamic scaling of the application, hyperledger/firefly-ethconnect bridge and Go-ethereum node components. +- Transactions can be sprayed across partitions, while retaining order of the transactions for a particular sender. Allowing independent and dynamic scaling of the application, hyperledger-firefly/ethconnect bridge and Go-ethereum node components. - The modern replication based cloud-native and continuously available architecture is ideal for Hyperledger projects, and is likely to be a good fit for the modern Microservice architectures that are common in Blockchain projects. ## Topics -[![hyperledger/firefly-ethconnect - Topics](ethconnect_topics.png)](ethconnect.pdf) +[![hyperledger-firefly/ethconnect - Topics](ethconnect_topics.png)](ethconnect.pdf) The topic usage is very simple: - One topic delivering messages into the bridge @@ -305,7 +305,7 @@ blockchain. Requires [Go 1.11](https://golang.org/dl/) or later to install with `go get` ```sh -go get github.com/hyperledger/firefly-ethconnect +go get github.com/hyperledger-firefly/ethconnect ``` ## Development environment diff --git a/cmd/ethconnect.go b/cmd/ethconnect.go index fad3eba2..5a43b4e4 100644 --- a/cmd/ethconnect.go +++ b/cmd/ethconnect.go @@ -24,11 +24,11 @@ import ( "gopkg.in/yaml.v2" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/kafka" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/rest" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/kafka" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/rest" + "github.com/hyperledger-firefly/ethconnect/internal/utils" "github.com/icza/dyno" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/plugins.go b/cmd/plugins.go index 09bd01ef..cfed4bd5 100644 --- a/cmd/plugins.go +++ b/cmd/plugins.go @@ -17,9 +17,9 @@ package cmd import ( "plugin" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/pkg/plugins" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/pkg/plugins" log "github.com/sirupsen/logrus" ) diff --git a/go.mod b/go.mod index 78aec888..ba8e3c5b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/hyperledger/firefly-ethconnect +module github.com/hyperledger-firefly/ethconnect -go 1.22 +go 1.26.4 require ( github.com/IBM/sarama v1.42.1 diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 233f8497..9b9170cf 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -17,8 +17,8 @@ package auth import ( "context" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/pkg/plugins" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/pkg/plugins" ) type ContextKey int diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go index 9dfbc222..d35ca9bf 100644 --- a/internal/auth/auth_test.go +++ b/internal/auth/auth_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" "github.com/stretchr/testify/assert" ) diff --git a/internal/contractgateway/kldparams.go b/internal/contractgateway/kldparams.go index ad879a2e..0fc0c5d8 100644 --- a/internal/contractgateway/kldparams.go +++ b/internal/contractgateway/kldparams.go @@ -19,7 +19,7 @@ import ( "net/textproto" "strings" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ) func getQueryParamNoCase(name string, req *http.Request) []string { diff --git a/internal/contractgateway/rest2eth.go b/internal/contractgateway/rest2eth.go index 4e7dac2b..bcf0a7d9 100644 --- a/internal/contractgateway/rest2eth.go +++ b/internal/contractgateway/rest2eth.go @@ -25,16 +25,16 @@ import ( "strings" "sync" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - ethconnecterrors "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/events" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/tx" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + ethconnecterrors "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/events" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/utils" "github.com/julienschmidt/httprouter" ethbinding "github.com/kaleido-io/ethbinding/pkg" diff --git a/internal/contractgateway/rest2eth_test.go b/internal/contractgateway/rest2eth_test.go index 5d7b16b3..04ed0034 100644 --- a/internal/contractgateway/rest2eth_test.go +++ b/internal/contractgateway/rest2eth_test.go @@ -25,16 +25,16 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/events" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/mocks/contractregistrymocks" - "github.com/hyperledger/firefly-ethconnect/mocks/ethmocks" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/events" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/mocks/contractregistrymocks" + "github.com/hyperledger-firefly/ethconnect/mocks/ethmocks" "github.com/julienschmidt/httprouter" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" diff --git a/internal/contractgateway/smartcontractgw.go b/internal/contractgateway/smartcontractgw.go index 323d7f62..3e8177ee 100644 --- a/internal/contractgateway/smartcontractgw.go +++ b/internal/contractgateway/smartcontractgw.go @@ -38,17 +38,17 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/events" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/openapi" - "github.com/hyperledger/firefly-ethconnect/internal/tx" - "github.com/hyperledger/firefly-ethconnect/internal/utils" - "github.com/hyperledger/firefly-ethconnect/internal/ws" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/events" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/openapi" + "github.com/hyperledger-firefly/ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/ws" ethbinding "github.com/kaleido-io/ethbinding/pkg" ) diff --git a/internal/contractgateway/smartcontractgw_test.go b/internal/contractgateway/smartcontractgw_test.go index 0628736f..b1cd742f 100644 --- a/internal/contractgateway/smartcontractgw_test.go +++ b/internal/contractgateway/smartcontractgw_test.go @@ -30,15 +30,15 @@ import ( "time" "github.com/go-openapi/spec" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/events" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/tx" - "github.com/hyperledger/firefly-ethconnect/mocks/contractregistrymocks" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/events" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/mocks/contractregistrymocks" "github.com/julienschmidt/httprouter" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" diff --git a/internal/contractgateway/syncdispatcher.go b/internal/contractgateway/syncdispatcher.go index db52c6fd..4f7efcf4 100644 --- a/internal/contractgateway/syncdispatcher.go +++ b/internal/contractgateway/syncdispatcher.go @@ -20,10 +20,10 @@ import ( "reflect" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/tx" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/contractgateway/syncdispatcher_test.go b/internal/contractgateway/syncdispatcher_test.go index bb17fe13..4044b71e 100644 --- a/internal/contractgateway/syncdispatcher_test.go +++ b/internal/contractgateway/syncdispatcher_test.go @@ -19,10 +19,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/tx" "github.com/stretchr/testify/assert" ) diff --git a/internal/contractregistry/contractstore.go b/internal/contractregistry/contractstore.go index f271ef13..3e33c613 100644 --- a/internal/contractregistry/contractstore.go +++ b/internal/contractregistry/contractstore.go @@ -31,9 +31,9 @@ import ( lru "github.com/hashicorp/golang-lru" log "github.com/sirupsen/logrus" - ethconnecterrors "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" - "github.com/hyperledger/firefly-ethconnect/internal/messages" + ethconnecterrors "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/messages" ) const ( diff --git a/internal/contractregistry/contractstore_test.go b/internal/contractregistry/contractstore_test.go index f4374aa8..b1006749 100644 --- a/internal/contractregistry/contractstore_test.go +++ b/internal/contractregistry/contractstore_test.go @@ -23,8 +23,8 @@ import ( "time" "github.com/go-openapi/spec" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" "github.com/stretchr/testify/assert" ) diff --git a/internal/contractregistry/remoteregistry.go b/internal/contractregistry/remoteregistry.go index d7644fcc..2aa9642f 100644 --- a/internal/contractregistry/remoteregistry.go +++ b/internal/contractregistry/remoteregistry.go @@ -20,10 +20,10 @@ import ( "net/url" "strings" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" diff --git a/internal/contractregistry/remoteregistry_test.go b/internal/contractregistry/remoteregistry_test.go index 156b23e5..0a64b588 100644 --- a/internal/contractregistry/remoteregistry_test.go +++ b/internal/contractregistry/remoteregistry_test.go @@ -24,8 +24,8 @@ import ( "path" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" "github.com/julienschmidt/httprouter" "github.com/stretchr/testify/assert" ) diff --git a/internal/eth/compiler.go b/internal/eth/compiler.go index 3726d676..7ec26c9e 100644 --- a/internal/eth/compiler.go +++ b/internal/eth/compiler.go @@ -23,9 +23,9 @@ import ( "regexp" "strings" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" ) diff --git a/internal/eth/getreceipt.go b/internal/eth/getreceipt.go index b0722442..b1510a50 100644 --- a/internal/eth/getreceipt.go +++ b/internal/eth/getreceipt.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/eth/privacygroup.go b/internal/eth/privacygroup.go index 1dc3c752..4ad8984b 100644 --- a/internal/eth/privacygroup.go +++ b/internal/eth/privacygroup.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" ethbinding "github.com/kaleido-io/ethbinding/pkg" ) diff --git a/internal/eth/privacygroup_test.go b/internal/eth/privacygroup_test.go index 9e0dff79..46d61e0e 100644 --- a/internal/eth/privacygroup_test.go +++ b/internal/eth/privacygroup_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/eth/rpc.go b/internal/eth/rpc.go index 15520c7b..91953500 100644 --- a/internal/eth/rpc.go +++ b/internal/eth/rpc.go @@ -19,9 +19,9 @@ import ( "net/url" "os" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/eth/rpc_test.go b/internal/eth/rpc_test.go index e3058965..5adfc8bd 100644 --- a/internal/eth/rpc_test.go +++ b/internal/eth/rpc_test.go @@ -23,8 +23,8 @@ import ( "github.com/julienschmidt/httprouter" "github.com/spf13/cobra" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/stretchr/testify/assert" ) diff --git a/internal/eth/send.go b/internal/eth/send.go index b253dc9c..facc01b4 100644 --- a/internal/eth/send.go +++ b/internal/eth/send.go @@ -22,10 +22,10 @@ import ( "strings" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" ethbinding "github.com/kaleido-io/ethbinding/pkg" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" log "github.com/sirupsen/logrus" ) @@ -52,7 +52,7 @@ func (tx *Txn) calculateGas(ctx context.Context, rpc RPCClient, txArgs *SendTXAr if err := rpc.CallContext(ctx, &gas, "eth_estimateGas", txArgs); err != nil { // Now we attempt a call of the transaction, because that will return us a useful error in the case, of a revert. estError := errors.Errorf(errors.TransactionSendGasEstimateFailed, err) - log.Errorf(estError.Error()) + log.Error(estError.Error()) if _, reverted, err := tx.Call(ctx, rpc, "latest"); err != nil { return reverted, err } diff --git a/internal/eth/txn.go b/internal/eth/txn.go index 76314129..084d5f54 100644 --- a/internal/eth/txn.go +++ b/internal/eth/txn.go @@ -24,10 +24,10 @@ import ( "strconv" "strings" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" @@ -177,7 +177,7 @@ func GetTransactionInfo(ctx context.Context, rpc RPCClient, txHash string) (*Txn } func addErrorToRetval(retval map[string]interface{}, retBytes []byte, rawRetval interface{}, err error) { - log.Warnf(err.Error()) + log.Warn(err.Error()) retval["rlp"] = hex.EncodeToString(retBytes) retval["raw"] = rawRetval retval["error"] = err.Error() diff --git a/internal/eth/txn_test.go b/internal/eth/txn_test.go index fa376590..06b1147f 100644 --- a/internal/eth/txn_test.go +++ b/internal/eth/txn_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/messages" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" @@ -626,7 +626,7 @@ func TestSendTxnABIParam(t *testing.T) { tx, err := NewSendTxn(&msg, nil) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -679,7 +679,7 @@ func TestSendTxnInlineParam(t *testing.T) { tx, err := NewSendTxn(&msg, nil) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -989,7 +989,7 @@ func TestSendTxnNodeAssignNonce(t *testing.T) { tx, err := NewSendTxn(&msg, nil) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -1025,7 +1025,7 @@ func TestSendWithTXSignerContractOK(t *testing.T) { tx, err := NewSendTxn(&msg, signer) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -1054,7 +1054,7 @@ func TestSendWithTXSignerOK(t *testing.T) { tx, err := NewSendTxn(&msg, signer) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -1086,7 +1086,7 @@ func TestSendWithTXSignerFail(t *testing.T) { tx, err := NewSendTxn(&msg, signer) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -1116,7 +1116,7 @@ func TestSendWithTXSignerFailPrivate(t *testing.T) { tx, err := NewSendTxn(&msg, signer) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -1144,7 +1144,7 @@ func TestNewContractWithTXSignerOK(t *testing.T) { tx, err := NewContractDeployTxn(&msg, signer) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -1171,7 +1171,7 @@ func TestNewNilTXSignerOK(t *testing.T) { tx, err := NewNilTX("hd-u0abcd1234-u0bcde9876-12345", 12345, signer) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{} @@ -1198,7 +1198,7 @@ func TestSendTxnRPFError(t *testing.T) { tx, err := NewSendTxn(&msg, nil) assert.Nil(err) msgBytes, _ := json.Marshal(&msg) - log.Infof(string(msgBytes)) + log.Info(string(msgBytes)) rpc := testRPCClient{ mockError: fmt.Errorf("pop"), diff --git a/internal/eth/txncount.go b/internal/eth/txncount.go index 05a3add2..18debd38 100644 --- a/internal/eth/txncount.go +++ b/internal/eth/txncount.go @@ -20,7 +20,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" ethbinding "github.com/kaleido-io/ethbinding/pkg" ) diff --git a/internal/eth/txncount_test.go b/internal/eth/txncount_test.go index 6663f70a..50f5a453 100644 --- a/internal/eth/txncount_test.go +++ b/internal/eth/txncount_test.go @@ -19,7 +19,7 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/events/block_confirmations.go b/internal/events/block_confirmations.go index 774a1a3e..1f991ce3 100644 --- a/internal/events/block_confirmations.go +++ b/internal/events/block_confirmations.go @@ -24,8 +24,8 @@ import ( "time" lru "github.com/hashicorp/golang-lru" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" ) diff --git a/internal/events/block_confirmations_test.go b/internal/events/block_confirmations_test.go index 7384038c..cc2fef1c 100644 --- a/internal/events/block_confirmations_test.go +++ b/internal/events/block_confirmations_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/mocks/ethmocks" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/mocks/ethmocks" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/events/eventstream.go b/internal/events/eventstream.go index 6293c82f..a752ed44 100644 --- a/internal/events/eventstream.go +++ b/internal/events/eventstream.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/ws" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/ws" ethbinding "github.com/kaleido-io/ethbinding/pkg" lru "github.com/hashicorp/golang-lru" diff --git a/internal/events/eventstream_test.go b/internal/events/eventstream_test.go index 1fb189a1..1881e1de 100644 --- a/internal/events/eventstream_test.go +++ b/internal/events/eventstream_test.go @@ -26,14 +26,14 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/mocks/contractregistrymocks" - "github.com/hyperledger/firefly-ethconnect/mocks/ethmocks" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/mocks/contractregistrymocks" + "github.com/hyperledger-firefly/ethconnect/mocks/ethmocks" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/events/logprocessor.go b/internal/events/logprocessor.go index 1b847dbe..c93b90be 100644 --- a/internal/events/logprocessor.go +++ b/internal/events/logprocessor.go @@ -20,9 +20,9 @@ import ( "strings" "sync" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" ) diff --git a/internal/events/logprocessor_test.go b/internal/events/logprocessor_test.go index da313e36..c922bee7 100644 --- a/internal/events/logprocessor_test.go +++ b/internal/events/logprocessor_test.go @@ -19,7 +19,7 @@ import ( "math/big" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/stretchr/testify/assert" ) diff --git a/internal/events/submanager.go b/internal/events/submanager.go index c8150c93..e4600b65 100644 --- a/internal/events/submanager.go +++ b/internal/events/submanager.go @@ -24,13 +24,13 @@ import ( "github.com/spf13/cobra" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/utils" - "github.com/hyperledger/firefly-ethconnect/internal/ws" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/ws" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" "github.com/syndtr/goleveldb/leveldb" diff --git a/internal/events/submanager_test.go b/internal/events/submanager_test.go index 75fbbb89..498722bf 100644 --- a/internal/events/submanager_test.go +++ b/internal/events/submanager_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" - "github.com/hyperledger/firefly-ethconnect/mocks/contractregistrymocks" - "github.com/hyperledger/firefly-ethconnect/mocks/ethmocks" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/mocks/contractregistrymocks" + "github.com/hyperledger-firefly/ethconnect/mocks/ethmocks" "github.com/julienschmidt/httprouter" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/spf13/cobra" diff --git a/internal/events/subscription.go b/internal/events/subscription.go index 1f5e0efa..56c2deb4 100644 --- a/internal/events/subscription.go +++ b/internal/events/subscription.go @@ -20,11 +20,11 @@ import ( "strings" "time" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/messages" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" ) diff --git a/internal/events/subscription_test.go b/internal/events/subscription_test.go index 3dc01599..e3e49e0d 100644 --- a/internal/events/subscription_test.go +++ b/internal/events/subscription_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/mocks/contractregistrymocks" - "github.com/hyperledger/firefly-ethconnect/mocks/ethmocks" + "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/mocks/contractregistrymocks" + "github.com/hyperledger-firefly/ethconnect/mocks/ethmocks" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/stretchr/testify/assert" diff --git a/internal/events/webhooks.go b/internal/events/webhooks.go index 297a4a56..227aa47c 100644 --- a/internal/events/webhooks.go +++ b/internal/events/webhooks.go @@ -24,7 +24,7 @@ import ( "net/url" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) @@ -120,7 +120,7 @@ func (w *webhookAction) validateURL() (*url.URL, *net.IPAddr, error) { } if w.es.isAddressUnsafe(addr) { err := errors.Errorf(errors.EventStreamsWebhookProhibitedAddress, u.Hostname()) - log.Errorf(err.Error()) + log.Error(err.Error()) return nil, nil, err } return u, addr, nil diff --git a/internal/events/websockets.go b/internal/events/websockets.go index 89b2168f..367bbf3d 100644 --- a/internal/events/websockets.go +++ b/internal/events/websockets.go @@ -15,7 +15,7 @@ package events import ( - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/kafka/circuitbreaker.go b/internal/kafka/circuitbreaker.go index 9df2a739..73d6e140 100644 --- a/internal/kafka/circuitbreaker.go +++ b/internal/kafka/circuitbreaker.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/kafka/client_test.go b/internal/kafka/client_test.go index c472915c..d684937a 100644 --- a/internal/kafka/client_test.go +++ b/internal/kafka/client_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/IBM/sarama" - "github.com/hyperledger/firefly-ethconnect/mocks/saramamocks" + "github.com/hyperledger-firefly/ethconnect/mocks/saramamocks" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/kafka/kafkabridge.go b/internal/kafka/kafkabridge.go index 53ea6dc8..36ae06e6 100644 --- a/internal/kafka/kafkabridge.go +++ b/internal/kafka/kafkabridge.go @@ -23,13 +23,13 @@ import ( "time" "github.com/IBM/sarama" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/tx" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/utils" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/kafka/kafkabridge_test.go b/internal/kafka/kafkabridge_test.go index 22ab5c9d..0680c624 100644 --- a/internal/kafka/kafkabridge_test.go +++ b/internal/kafka/kafkabridge_test.go @@ -24,13 +24,13 @@ import ( "time" "github.com/IBM/sarama" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/tx" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/internal/kafka/kafkacommon.go b/internal/kafka/kafkacommon.go index 9c1d464f..14a7ad82 100644 --- a/internal/kafka/kafkacommon.go +++ b/internal/kafka/kafkacommon.go @@ -25,8 +25,8 @@ import ( "time" "github.com/IBM/sarama" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/utils" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/kvstore/kvstore.go b/internal/kvstore/kvstore.go index 5f3bfc92..1dc613a3 100644 --- a/internal/kvstore/kvstore.go +++ b/internal/kvstore/kvstore.go @@ -17,7 +17,7 @@ package kvstore import ( "encoding/json" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/internal/messages/messages.go b/internal/messages/messages.go index f5d949e3..9e2d51ca 100644 --- a/internal/messages/messages.go +++ b/internal/messages/messages.go @@ -18,7 +18,7 @@ import ( "encoding/json" "reflect" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" ethbinding "github.com/kaleido-io/ethbinding/pkg" ) diff --git a/internal/messages/messages_test.go b/internal/messages/messages_test.go index 5fb85e9e..3ea094c9 100644 --- a/internal/messages/messages_test.go +++ b/internal/messages/messages_test.go @@ -19,7 +19,7 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" "github.com/stretchr/testify/assert" ) diff --git a/internal/openapi/abi2swagger.go b/internal/openapi/abi2swagger.go index def002ee..d03d875f 100644 --- a/internal/openapi/abi2swagger.go +++ b/internal/openapi/abi2swagger.go @@ -22,7 +22,7 @@ import ( "github.com/go-openapi/jsonreference" "github.com/go-openapi/spec" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/tidwall/gjson" ) diff --git a/internal/openapi/abi2swagger_test.go b/internal/openapi/abi2swagger_test.go index ad9b2a8c..3e39e68d 100644 --- a/internal/openapi/abi2swagger_test.go +++ b/internal/openapi/abi2swagger_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" "github.com/stretchr/testify/assert" ) diff --git a/internal/receipts/leveldbreceipt_test.go b/internal/receipts/leveldbreceipt_test.go index 08ae446b..427cc49e 100644 --- a/internal/receipts/leveldbreceipt_test.go +++ b/internal/receipts/leveldbreceipt_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/utils" "github.com/oklog/ulid/v2" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/receipts/leveldbreceipts.go b/internal/receipts/leveldbreceipts.go index 046ccd64..aff11045 100644 --- a/internal/receipts/leveldbreceipts.go +++ b/internal/receipts/leveldbreceipts.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/kvstore" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/kvstore" "github.com/oklog/ulid/v2" log "github.com/sirupsen/logrus" "github.com/syndtr/goleveldb/leveldb/util" diff --git a/internal/receipts/memreceipts.go b/internal/receipts/memreceipts.go index 9a3e16c7..4df6d94e 100644 --- a/internal/receipts/memreceipts.go +++ b/internal/receipts/memreceipts.go @@ -18,7 +18,7 @@ import ( "container/list" "sync" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/receipts/mongoreceipts.go b/internal/receipts/mongoreceipts.go index d79df605..09d6229b 100644 --- a/internal/receipts/mongoreceipts.go +++ b/internal/receipts/mongoreceipts.go @@ -19,7 +19,7 @@ import ( "github.com/globalsign/mgo" "github.com/globalsign/mgo/bson" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/rest/receiptstore.go b/internal/rest/receiptstore.go index 4b728e65..1c0cca08 100644 --- a/internal/rest/receiptstore.go +++ b/internal/rest/receiptstore.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/contractgateway" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/contractgateway" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/utils" "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" ) diff --git a/internal/rest/receiptstore_test.go b/internal/rest/receiptstore_test.go index 682fe825..e7c3b6ed 100644 --- a/internal/rest/receiptstore_test.go +++ b/internal/rest/receiptstore_test.go @@ -24,12 +24,12 @@ import ( "net/http/httptest" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/utils" "github.com/julienschmidt/httprouter" ) diff --git a/internal/rest/resterror.go b/internal/rest/resterror.go index f5121a58..0bcaf19c 100644 --- a/internal/rest/resterror.go +++ b/internal/rest/resterror.go @@ -18,7 +18,7 @@ import ( "encoding/json" "net/http" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/rest/restgateway.go b/internal/rest/restgateway.go index 0ddfe8ec..dbfae27a 100644 --- a/internal/rest/restgateway.go +++ b/internal/rest/restgateway.go @@ -26,16 +26,16 @@ import ( "syscall" "time" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/contractgateway" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/kafka" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/tx" - "github.com/hyperledger/firefly-ethconnect/internal/utils" - "github.com/hyperledger/firefly-ethconnect/internal/ws" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/contractgateway" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/kafka" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/ws" "github.com/IBM/sarama" "github.com/julienschmidt/httprouter" diff --git a/internal/rest/restgateway_test.go b/internal/rest/restgateway_test.go index ae3b13d0..17fc8fc1 100644 --- a/internal/rest/restgateway_test.go +++ b/internal/rest/restgateway_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" - "github.com/hyperledger/firefly-ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/eth" "github.com/julienschmidt/httprouter" "github.com/stretchr/testify/assert" ) diff --git a/internal/rest/webhooks.go b/internal/rest/webhooks.go index e97f7051..99a4b663 100644 --- a/internal/rest/webhooks.go +++ b/internal/rest/webhooks.go @@ -20,11 +20,11 @@ import ( "net/http" "reflect" - "github.com/hyperledger/firefly-ethconnect/internal/contractgateway" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/contractgateway" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/utils" "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" ) diff --git a/internal/rest/webhooks_test.go b/internal/rest/webhooks_test.go index e84ab3bd..49b954a2 100644 --- a/internal/rest/webhooks_test.go +++ b/internal/rest/webhooks_test.go @@ -25,9 +25,9 @@ import ( "regexp" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/mocks/ethmocks" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/mocks/ethmocks" "github.com/julienschmidt/httprouter" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/stretchr/testify/assert" diff --git a/internal/rest/webhooksdirect.go b/internal/rest/webhooksdirect.go index 0804254d..c3121adc 100644 --- a/internal/rest/webhooksdirect.go +++ b/internal/rest/webhooksdirect.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/tx" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/rest/webhooksdirect_test.go b/internal/rest/webhooksdirect_test.go index ed1d52d5..1487f2e4 100644 --- a/internal/rest/webhooksdirect_test.go +++ b/internal/rest/webhooksdirect_test.go @@ -24,10 +24,10 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/tx" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/tx" "github.com/julienschmidt/httprouter" "github.com/stretchr/testify/assert" diff --git a/internal/rest/webhookskafka.go b/internal/rest/webhookskafka.go index 01910c3c..1af64421 100644 --- a/internal/rest/webhookskafka.go +++ b/internal/rest/webhookskafka.go @@ -21,10 +21,10 @@ import ( "sync" "github.com/IBM/sarama" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/kafka" - "github.com/hyperledger/firefly-ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/kafka" + "github.com/hyperledger-firefly/ethconnect/internal/messages" log "github.com/sirupsen/logrus" ) diff --git a/internal/rest/webhookskafka_test.go b/internal/rest/webhookskafka_test.go index 20b7824e..a6ca3682 100644 --- a/internal/rest/webhookskafka_test.go +++ b/internal/rest/webhookskafka_test.go @@ -30,13 +30,13 @@ import ( "time" "github.com/IBM/sarama" - "github.com/hyperledger/firefly-ethconnect/internal/auth" - "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/kafka" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/auth" + "github.com/hyperledger-firefly/ethconnect/internal/auth/authtest" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/kafka" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/tx/addressbook.go b/internal/tx/addressbook.go index a731eae0..be6bc36e 100644 --- a/internal/tx/addressbook.go +++ b/internal/tx/addressbook.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/utils" log "github.com/sirupsen/logrus" ) diff --git a/internal/tx/addressbook_test.go b/internal/tx/addressbook_test.go index 74844449..38fdeb2a 100644 --- a/internal/tx/addressbook_test.go +++ b/internal/tx/addressbook_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/eth" "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/tx/hdwallet.go b/internal/tx/hdwallet.go index 1e25d846..6e95cfef 100644 --- a/internal/tx/hdwallet.go +++ b/internal/tx/hdwallet.go @@ -23,10 +23,10 @@ import ( "strings" "github.com/alecthomas/template" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" ) diff --git a/internal/tx/hdwallet_test.go b/internal/tx/hdwallet_test.go index 78fca72e..448acbc3 100644 --- a/internal/tx/hdwallet_test.go +++ b/internal/tx/hdwallet_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" ethbinding "github.com/kaleido-io/ethbinding/pkg" "github.com/stretchr/testify/assert" ) diff --git a/internal/tx/txncontext.go b/internal/tx/txncontext.go index c4c6ad29..dc71d4fc 100644 --- a/internal/tx/txncontext.go +++ b/internal/tx/txncontext.go @@ -17,7 +17,7 @@ package tx import ( "context" - "github.com/hyperledger/firefly-ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/messages" ) // TxnContext is passed for each message that arrives at the bridge diff --git a/internal/tx/txnprocessor.go b/internal/tx/txnprocessor.go index 614763d1..40a704a6 100644 --- a/internal/tx/txnprocessor.go +++ b/internal/tx/txnprocessor.go @@ -25,11 +25,11 @@ import ( "github.com/spf13/cobra" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/internal/receipts" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/internal/receipts" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" ) diff --git a/internal/tx/txnprocessor_test.go b/internal/tx/txnprocessor_test.go index 594a3578..94a18f85 100644 --- a/internal/tx/txnprocessor_test.go +++ b/internal/tx/txnprocessor_test.go @@ -31,10 +31,10 @@ import ( "github.com/julienschmidt/httprouter" "github.com/spf13/cobra" - "github.com/hyperledger/firefly-ethconnect/internal/eth" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" - "github.com/hyperledger/firefly-ethconnect/internal/messages" - "github.com/hyperledger/firefly-ethconnect/mocks/receiptsmocks" + "github.com/hyperledger-firefly/ethconnect/internal/eth" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/messages" + "github.com/hyperledger-firefly/ethconnect/mocks/receiptsmocks" ethbinding "github.com/kaleido-io/ethbinding/pkg" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/utils/ethutils.go b/internal/utils/ethutils.go index 387a2f36..ed89dc44 100644 --- a/internal/utils/ethutils.go +++ b/internal/utils/ethutils.go @@ -17,8 +17,8 @@ package utils import ( "strings" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/ethbind" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/ethbind" ethbinding "github.com/kaleido-io/ethbinding/pkg" ) diff --git a/internal/utils/httprequester.go b/internal/utils/httprequester.go index e68b71a1..0594fa69 100644 --- a/internal/utils/httprequester.go +++ b/internal/utils/httprequester.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "net/http" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/utils/payloadutils.go b/internal/utils/payloadutils.go index 0ea6c2f2..9b8c6154 100644 --- a/internal/utils/payloadutils.go +++ b/internal/utils/payloadutils.go @@ -20,7 +20,7 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" "github.com/icza/dyno" log "github.com/sirupsen/logrus" yaml "gopkg.in/yaml.v2" diff --git a/internal/utils/tlsutils.go b/internal/utils/tlsutils.go index 930f5c3c..b2090b18 100644 --- a/internal/utils/tlsutils.go +++ b/internal/utils/tlsutils.go @@ -19,7 +19,7 @@ import ( "crypto/x509" "io/ioutil" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" log "github.com/sirupsen/logrus" ) diff --git a/internal/ws/wsconn.go b/internal/ws/wsconn.go index 3a713d70..9c9e5ed9 100644 --- a/internal/ws/wsconn.go +++ b/internal/ws/wsconn.go @@ -22,8 +22,8 @@ import ( ws "github.com/gorilla/websocket" log "github.com/sirupsen/logrus" - "github.com/hyperledger/firefly-ethconnect/internal/errors" - "github.com/hyperledger/firefly-ethconnect/internal/utils" + "github.com/hyperledger-firefly/ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/utils" ) type webSocketConnection struct { diff --git a/internal/ws/wsserver.go b/internal/ws/wsserver.go index 28b88207..c6c763b8 100644 --- a/internal/ws/wsserver.go +++ b/internal/ws/wsserver.go @@ -21,7 +21,7 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-ethconnect/internal/errors" + "github.com/hyperledger-firefly/ethconnect/internal/errors" "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" ) diff --git a/main.go b/main.go index 36196216..b825dc76 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/hyperledger/firefly-ethconnect/cmd" + "github.com/hyperledger-firefly/ethconnect/cmd" ) var buildDate, buildVersion string // Set by ldflags diff --git a/mocks/contractregistrymocks/contract_store.go b/mocks/contractregistrymocks/contract_store.go index 0f273b52..6e00f200 100644 --- a/mocks/contractregistrymocks/contract_store.go +++ b/mocks/contractregistrymocks/contract_store.go @@ -3,8 +3,8 @@ package contractregistrymocks import ( - contractregistry "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - messages "github.com/hyperledger/firefly-ethconnect/internal/messages" + contractregistry "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + messages "github.com/hyperledger-firefly/ethconnect/internal/messages" mock "github.com/stretchr/testify/mock" diff --git a/mocks/contractregistrymocks/remote_registry.go b/mocks/contractregistrymocks/remote_registry.go index c2f2d7a7..f7bc026a 100644 --- a/mocks/contractregistrymocks/remote_registry.go +++ b/mocks/contractregistrymocks/remote_registry.go @@ -3,8 +3,8 @@ package contractregistrymocks import ( - contractregistry "github.com/hyperledger/firefly-ethconnect/internal/contractregistry" - messages "github.com/hyperledger/firefly-ethconnect/internal/messages" + contractregistry "github.com/hyperledger-firefly/ethconnect/internal/contractregistry" + messages "github.com/hyperledger-firefly/ethconnect/internal/messages" mock "github.com/stretchr/testify/mock" )