chore: migrate to hyperledger-firefly org, firefly deps, Go 1.26.4

.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

.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

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)

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.
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

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

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 .

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
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )

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"
 )
 

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"
 )

config.md

@@ -95,6 +95,13 @@
 |password|Password|`string`|`<nil>`
 |username|Username|`string`|`<nil>`
 
+## 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`|`<nil>`
+|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
+
 ## 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`|`<nil>`
+
 ## connector.proxy
 
 |Key|Description|Type|Default Value|
@@ -440,6 +453,19 @@
 |password|Password|`string`|`<nil>`
 |username|Username|`string`|`<nil>`
 
+## 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`|`<nil>`
+|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
+
+## 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`|`<nil>`
+
 ## policyengine.simple.gasOracle.proxy
 
 |Key|Description|Type|Default Value|
@@ -542,6 +568,19 @@
 |password|Password|`string`|`<nil>`
 |username|Username|`string`|`<nil>`
 
+## 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`|`<nil>`
+|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
+
+## 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`|`<nil>`
+
 ## transactions.handler.simple.gasOracle.proxy
 
 |Key|Description|Type|Default Value|
@@ -611,6 +650,19 @@
 |password|Password|`string`|`<nil>`
 |username|Username|`string`|`<nil>`
 
+## 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`|`<nil>`
+|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`<nil>`
+
+## 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`|`<nil>`
+
 ## webhooks.proxy
 
 |Key|Description|Type|Default Value|

evmconnect/main.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hyperledger/firefly-evmconnect/cmd"
+	"github.com/hyperledger-firefly/evmconnect/cmd"
 )
 
 func main() {

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

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=

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 (

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) {

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"
 )

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) {

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"
 )