Merge pull request #229 from kaleido-io/evmconnect

Remove early FFCAPI implementation not it is replaced by EVMConnect

.vscode/settings.json

@@ -3,9 +3,6 @@
   "cSpell.words": [
     "ABIID",
     "Debugf",
-    "ffcapi",
-    "ffcapiconnector",
-    "ffcapiconnectormocks",
     "ffcmocks",
     "fftypes",
     "hashicorp",

Makefile

@@ -64,7 +64,6 @@ endef
 $(eval $(call makemock, internal/contractregistry, ContractStore,           contractregistrymocks))
 $(eval $(call makemock, internal/contractregistry, RemoteRegistry,          contractregistrymocks))
 $(eval $(call makemock, internal/eth,              RPCClient,               ethmocks))
-$(eval $(call makemock, internal/ffcapiconnector,  FFCServer,               ffcapiconnectormocks))
 $(eval $(call makemock, internal/receipts,         ReceiptStorePersistence, receiptsmocks))
 $(eval $(call makemock, $$(SARAMA_PATH),           Client,                  saramamocks))
 $(eval $(call makemock, $$(SARAMA_PATH),           ConsumerGroup,           saramamocks))

README.md

@@ -2,33 +2,13 @@
 
 ## EthConnect - Hyperledger FireFly connector for Ethereum networks
 
-This repo has evolved and now contains two related components of the Hyperledger FireFly
-ecosystem.
+This repo contains the original implementation of the FireFly Connector
+for Ethereum networks.
 
-## 1) FireFly EthConnect FFCAPI Connector - for public networks
-
-See [FireFly architecture for public chains](https://hyperledger.github.io/firefly/overview/public_vs_permissioned.html#firefly-architecture-for-public-chains) in the Hyperledger FireFly
-documentation for details on how the requirements for transaction
-management in public chains (confirmations, gas management, policy-based
-transaction re-submission) are managed.
-
-In this architecture, the policy engine of
-[FireFly Transaction Manager](https://github.com/hyperledger/firefly-transaction-manager) works in tandem with FireFly Core to form a sophisticated "brain" for managing
-transactions through from submission to eventual mining (whether that
-takes seconds, hours or days).
-
-The connectors themselves are highly pluggable, and easy to build for a new
-blockchain ecosystem. The first reference implementation of the FireFly Connector API (FFCAPI)
-is provided in this repo:
-
-- See the [internal/ffcapiconnector](./internal/ffcapiconnector) folder for that implementation
-
-> A separate trimmed-down repository containing just a reference FFCAPI connector
-> for EVM-based blockchain networks is a roadmap item for the Hyperledger FireFly community.
-> Related to this is the [hyperledger/firefly-signer](https://github.com/hyperledger/firefly-signer)
-> repo, which contains RLP encoding, and signing utility functions (Apache 2.0 licensed).
-
-## 2) FireFly EthConnect REST Gateway - for permissioned chains
+> 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
+> for connectivity to your EVM based chains (whether public, or private).
 
 Since creation in 2018 a large amount of function has evolved through
 use in production projects. Primarily this function has been driven by

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
-	github.com/hyperledger/firefly-common v0.1.4
+	github.com/hyperledger/firefly-common v1.1.1
 	github.com/icza/dyno v0.0.0-20210726202311-f1bafe5d9996
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kaleido-io/ethbinding v0.0.0-20220405144420-999853435d9e
@@ -34,13 +34,11 @@ require (
 	github.com/nwaples/rardecode v1.1.3 // indirect
 	github.com/oklog/ulid/v2 v2.0.2
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/cobra v1.4.0
-	github.com/spf13/viper v1.11.0 // indirect
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.8.0
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/tidwall/gjson v1.14.1
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
@@ -49,12 +47,7 @@ require (
 	github.com/x-cray/logrus-prefixed-formatter v0.5.2
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
-	golang.org/x/net v0.0.0-20220516155154-20f960328961 // indirect
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
-	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
 	gopkg.in/yaml.v2 v2.4.0
-	gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99 // indirect
 )
 
 replace github.com/kaleido-io/ethbinding => ../ethbinding