Preprod merge for v1.3 release

.circleci/config.yml

@@ -6,12 +6,12 @@ executors:
     environment:
       PROJECT_ROOT_FOLDER: ~/project
     docker:
-      - image: cimg/go:1.16-node
+      - image: cimg/go:1.17-node
   docker-image-golang-dependencies:
     environment:
       PROJECT_ROOT_FOLDER: ~/project
     docker:
-      - image: cimg/go:1.16-node
+      - image: cimg/go:1.17-node
       - image: proxeus/node-crypto-forex-rates
       - image: proxeus/document-service
       - image: proxeus/mongo-dev-cluster
@@ -25,7 +25,7 @@ executors:
 jobs:
   build-ui:
     docker:
-      - image: cimg/go:1.16-node
+      - image: cimg/go:1.17-node
     steps:
       - checkout
       - restore_cache:

README.md

@@ -62,10 +62,16 @@ If all goes well, Proxeus should be available at http://localhost:1323. The next
 
 If you find a vulnerability that may affect live or testnet deployments please DO NOT file a public issue - send your report privately to [email protected]
 
-## License - test3
+## License
 
 Licensed under the GNU GENERAL PUBLIC LICENSE. You may read a copy of the [License here](LICENSE).
 
 ## Acknowledgements
 
 Like so many projects, this effort has roots in many places. The list can be found in [ACKNOWLEDGEMENTS](ACKNOWLEDGEMENTS).
+
+## Supported Chains
+
+- goerli
+- mainnet
+- polygon-mumbai

docker-compose-cloud.override.yml

@@ -70,6 +70,7 @@ services:
       # Replace values for letsencrypt
       LETSENCRYPT_HOST: ${PROXEUS_VIRTUAL_HOST:-proxeus.example.com}
       LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:[email protected]}
+    restart: unless-stopped
 
   document-service:
     networks:
@@ -83,6 +84,7 @@ services:
       # Replace values for letsencrypt
       LETSENCRYPT_HOST: ${DOCUMENT_SERVICE_VIRTUAL_HOST:-proxeus.example.com}
       LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:[email protected]}
+    restart: unless-stopped
 
   node-crypto-forex-rates:
     networks:
@@ -96,16 +98,4 @@ services:
       # Replace values for letsencrypt
       LETSENCRYPT_HOST: ${NODE_CRYPTO_FOREX_RATES_VIRTUAL_HOST:-proxeus.example.com}
       LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:[email protected]}
-
-  # Add Watchtower
-  # https://hub.docker.com/r/v2tec/watchtower/
-  # Watches your containers and automatically restarts them whenever their
-  # image is refreshed
-  watchtower:
-    image: v2tec/watchtower
-    container_name: watchtower
-    restart: always
-    volumes:
-      - ${DOCKER_SOCK:-/var/run/docker.sock}:/var/run/docker.sock:ro
-      - ${DOCKER_CONFIG_FILE:-/root/.docker/config.json}:/config.json
-    command: --interval 60 --label-enable
+    restart: unless-stopped

docker-compose.yml

@@ -88,7 +88,7 @@ services:
     restart: unless-stopped
     environment:
       PROXEUS_INSTANCE_URL: "${PROXEUS_PLATFORM_DOMAIN:-http://xes-platform:1323}"
-      PROXEUS_ETH_CLIENT_URL: "${PROXEUS_ETH_CLIENT_URL:-https://ropsten.infura.io/v3/}"
+      PROXEUS_ETH_CLIENT_URL: "${PROXEUS_ETH_CLIENT_URL:-https://goerli.infura.io/v3/}"
       PROXEUS_INFURA_API_KEY: ${PROXEUS_INFURA_API_KEY}
       SERVICE_SECRET: secret
       SERVICE_PORT: 8012

docs/configure.md

@@ -13,9 +13,9 @@ https://dev-ds.proxeus.com/
 ## Infura API Key
 Generate a  [infura API Key](https://infura.io)
 
-## Blockchain contract address (ropsten)
+## Blockchain contract address (goerli)
 ```
-0x8d654e67694fda572c08edd55a86008b0c20002d
+0x66FF4FBF80D4a3C85a54974446309a2858221689
 ```
 (alternatively deploy own smart contract from ProxeusFS.sol)
 
@@ -50,7 +50,7 @@ Usage of ./artifacts/proxeus:
   -AirdropAmountXES string
     	Amount of XES to airdrop to newly registered users. (PROXEUS_AIRDROP_AMOUNT_XES) (default "0")
   -AirdropEnabled string
-    	Enables/Disables the XES & Ether airdrop feature on ropsten. (PROXEUS_AIRDROP_ENABLED) (default "false")
+    	Enables/Disables the XES & Ether airdrop feature on test network. (PROXEUS_AIRDROP_ENABLED) (default "false")
   -AirdropWalletfile string
     	Path to File containing Private Key of the Wallet to fund Airdrops of XES and Ether. (PROXEUS_AIRDROP_WALLETFILE)
   -AirdropWalletkey string
@@ -62,7 +62,7 @@ Usage of ./artifacts/proxeus:
   -BlockchainContractAddress string
     	Ethereum contract address which will be used to register files and verify them. (PROXEUS_BLOCKCHAIN_CONTRACT_ADDRESS)
   -BlockchainNet string
-    	Ethereum blockchain net like mainnet or ropsten. (PROXEUS_BLOCKCHAIN_NET) (default "ropsten")
+    	Ethereum blockchain net like mainnet/goerli/polygon-mumbai/polygon-mainnet. (PROXEUS_BLOCKCHAIN_NET) (default "goerli")
   -CacheExpiry string
     	Common cache expiry which will be used for email tokens or similar. (PROXEUS_CACHE_EXPIRY) (default "24h")
   -DataDir string
@@ -80,9 +80,9 @@ Usage of ./artifacts/proxeus:
   -EmailFrom string
     	Email that is being used to send out emails. (PROXEUS_EMAIL_FROM)
   -EthClientURL string
-    	Ethereum client URL (PROXEUS_ETH_CLIENT_URL) (default "https://ropsten.infura.io/v3/")
+    	Ethereum client URL (PROXEUS_ETH_CLIENT_URL) (default "https://goerli.infura.io/v3/")
   -EthWebSocketURL string
-    	Ethereum websocket URL (PROXEUS_ETH_WEB_SOCKET_URL) (default "wss://ropsten.infura.io/ws/v3/")
+    	Ethereum websocket URL (PROXEUS_ETH_WEB_SOCKET_URL) (default "wss://goerli.infura.io/ws/v3/")
   -InfuraApiKey string
     	API Key to access Infura node. (PROXEUS_INFURA_API_KEY)
   -LogPath string
@@ -100,5 +100,5 @@ Usage of ./artifacts/proxeus:
   -TestMode string
     	Run the server in test mode =NOT FOR PRODUCTION=. (PROXEUS_TEST_MODE) (default "false")
   -XESContractAddress string
-    	 (PROXEUS_XESCONTRACT_ADDRESS) (default "0x84E0b37e8f5B4B86d5d299b0B0e33686405A3919")
+    	 (PROXEUS_XESCONTRACT_ADDRESS) (default "0x15FeA089CC48B4f4596242c138156e3B53579B37")
 ```

docs/contract_deployment.md

@@ -16,8 +16,8 @@ The latest ProxeusFS contract can be found in github: https://github.com/Proxeus
  2. Create or Import an Ethereum Account in Metamask
 
 ### Deployment
- 1. Switch to ropsten/mainnet in Metamask depending on where you would like to deploy the contract
- 2. Make sure your Ethereum Account has some Ether to fund the transactions (Ropsten faucet: https://faucet.ropsten.be/)
+ 1. Switch to goerli/mainnet/polygon-mumbai/polygon-mainnet in Metamask depending on where you would like to deploy the contract
+ 2. Make sure your Ethereum Account has some Ether to fund the transactions (Goerli faucet: https://goerlifaucet.com/)
  3. Open Remix: https://remix.ethereum.org
  4. Upload the ProxeusFS.sol file
  5. Open the "Plugin Manager" (Sidebar) and enable Plugins "Solidity Compiler" & "Deploy & Run Transactions"

docs/quickstart.md

@@ -19,10 +19,10 @@ Please create an account on those platform and get an API Keys.
 
 ## Proxeus Demo Ethereum Smart Contract
 
-For your convenience, a demo smart contract is deployed on the Ropsten network at the following address:
+For your convenience, a demo smart contract is deployed on the Goerli network at the following address:
 
 ```
-0x1d3e5c81bf4bc60d41a8fbbb3d1bae6f03a75f71
+0x66FF4FBF80D4a3C85a54974446309a2858221689
 ```
 
 ## Create a docker-compose.yml file

go.mod

@@ -33,9 +33,9 @@ require (
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
-	go.mongodb.org/mongo-driver v1.9.0
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
-	golang.org/x/net v0.0.0-20220607020251-c690dde0001d
+	go.mongodb.org/mongo-driver v1.11.1
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
+	golang.org/x/net v0.4.0
 	gopkg.in/gavv/httpexpect.v2 v2.3.1
 )
 
@@ -44,9 +44,11 @@ require (
 	github.com/dlclark/regexp2 v1.4.1-0.20220329233251-d0559a0de6e3 // indirect
 	github.com/fasthttp/websocket v1.4.3-rc.10 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
+	github.com/go-bindata/go-bindata/v3 v3.1.3 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/kisielk/errcheck v1.6.2 // indirect
 	github.com/klauspost/compress v1.15.1 // indirect
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/labstack/echo-contrib v0.12.0
@@ -60,10 +62,14 @@ require (
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/valyala/fasthttp v1.35.0 // indirect
+	github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad // indirect
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
+	github.com/yuin/goldmark v1.5.3 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 // indirect
+	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
+	golang.org/x/tools v0.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 )