Merge pull request #2 from stakewise/feature/merkle-distributor

Add new variables to the oracle for merkle distributor

geth/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: geth
-version: 1.10.2
+version: 1.10.3
 kubeVersion: "^1.14.0-0"
 description: Official Golang implementation of the Ethereum v1 protocol.
 type: application
@@ -16,4 +16,4 @@ maintainers:
   - name: Dmitri Tsumak
     email: [email protected]
 icon: https://raw.githubusercontent.com/ethereum/ethereum-org/master/public/images/logos/ETHEREUM-ICON_Black.png
-appVersion: v1.10.2
+appVersion: v1.10.3

geth/values.yaml

@@ -27,7 +27,7 @@ bootnode:
   ## ref: https://hub.docker.com/r/ethereum/client-go/tags/
   image:
     repository: "ethereum/client-go"
-    tag: "alltools-v1.10.2"
+    tag: "alltools-v1.10.3"
     pullPolicy: IfNotPresent
 
   # Node key for the identity
@@ -55,7 +55,7 @@ miner:
   ## ref: https://hub.docker.com/r/ethereum/client-go/tags/
   image:
     repository: "ethereum/client-go"
-    tag: "v1.10.2"
+    tag: "v1.10.3"
     pullPolicy: IfNotPresent
 
   # Assign unique account to each miner
@@ -131,7 +131,7 @@ node:
   ## ref: https://hub.docker.com/r/ethereum/client-go/tags/
   image:
     repository: "ethereum/client-go"
-    tag: "v1.10.2"
+    tag: "v1.10.3"
     pullPolicy: IfNotPresent
 
   # How many geth nodes to run simultaneously

oracle/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: oracle
-version: 1.1.1
+version: 1.3.1
 kubeVersion: "^1.14.0-0"
 description: The StakeWise application for submitting off-chain data to smart contracts.
 type: application
@@ -14,4 +14,4 @@ sources:
 maintainers:
   - name: Dmitri Tsumak
     email: [email protected]
-appVersion: v1.1.1
+appVersion: v1.3.1

oracle/templates/configmap.yaml

@@ -20,6 +20,7 @@ data:
   WEB3_WS_ENDPOINT_TIMEOUT: {{ .Values.settings.web3WsEndpointTimeout | quote }}
   WEB3_HTTP_ENDPOINT: {{ .Values.settings.web3HttpEndpoint | quote }}
   BEACON_CHAIN_RPC_ENDPOINT: {{ .Values.settings.beaconChainRpcEndpoint | quote }}
+  ETHERSCAN_ADDRESS_BASE_URL: {{ .Values.settings.etherscanAddressBaseUrl | quote }}
 
   # middlewares
   INJECT_POA_MIDDLEWARE: {{ .Values.settings.injectPOAMiddleware | quote }}
@@ -46,3 +47,14 @@ data:
   REWARD_ETH_CONTRACT_ADDRESS: {{ .Values.settings.rewardEthContractAddress | quote }}
   STAKED_ETH_CONTRACT_ADDRESS: {{ .Values.settings.stakedEthContractAddress | quote }}
   ORACLES_CONTRACT_ADDRESS: {{ .Values.settings.oraclesContractAddress | quote }}
+  DAO_ADDRESS: {{ .Values.settings.daoAddress | quote }}
+  MULTICALL_CONTRACT_ADDRESS: {{ .Values.settings.multicallContractAddress | quote }}
+  MERKLE_DISTRIBUTOR_CONTRACT_ADDRESS: {{ .Values.settings.merkleDistributorContractAddress | quote }}
+  BALANCER_VAULT_CONTRACT_ADDRESS: {{ .Values.settings.balancerVaultContractAddress | quote }}
+  ENS_RESOLVER_CONTRACT_ADDRESS: {{ .Values.settings.ensResolverContractAddress | quote }}
+  DAO_ENS_DOMAIN: {{ .Values.settings.daoEnsDomain | quote }}
+  ORACLES_ENS_TEXT_RECORD: {{ .Values.settings.oracleEnsTextRecord | quote }}
+  BALANCER_SUBGRAPH_URL: {{ .Values.settings.balancerSubgraphUrl | quote }}
+  UNISWAP_V2_SUBGRAPH_URL: {{ .Values.settings.uniswapV2subgraphUrl | quote }}
+  UNISWAP_V3_SUBGRAPH_URL: {{ .Values.settings.uniswapV3subgraphUrl | quote }}
+  IPFS_ENDPOINT: {{ .Values.settings.ipfsEndpoint | quote }}

oracle/values.yaml

@@ -23,7 +23,7 @@ tolerations: [ ]
 # Docker image
 image:
   repository: "stakewiselabs/oracle"
-  tag: "v1.1.1"
+  tag: "1.3.1"
   pullPolicy: IfNotPresent
 
 # Configure resource requests and limits.
@@ -49,6 +49,8 @@ settings:
   web3HttpEndpoint: ""
   beaconChainRpcEndpoint: "<eth2 chain endpoint>"
 
+  etherscanAddressBaseUrl: "https://etherscan.io/address/"
+
   # middlewares
   injectPOAMiddleware: "False"
   injectStaleCheckMiddleware: "False"
@@ -64,16 +66,29 @@ settings:
   balanceErrorThreshold: "0.008"
 
   # transactions
-  transactionTimeout: "10800"
+  transactionTimeout: "1800"
 
   # processing interval
-  processInterval: "30"
+  processInterval: "300"
 
   # contracts
   poolContractAddress: "0x0"
   rewardEthContractAddress: "0x0"
   stakedEthContractAddress: "0x0"
   oraclesContractAddress: "0x0"
+  daoAddress: "0x0"
+  multicallContractAddress: "0x0"
+  merkleDistributorContractAddress: "0x0"
+  balancerVaultContractAddress: "0x0"
+  ensResolverContractAddress: "0x0"
+
+  daoEnsDomain: "stakewise.eth"
+  oracleEnsTextRecord: "oraclesconfig"
+  balancerSubgraphUrl: "https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-v2"
+  uniswapV2subgraphUrl: "https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v2"
+  uniswapV3subgraphUrl: "https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3"
+  ipfsEndpoint: "/dns/ipfs.infura.io/tcp/5001/https"
+
 
   # credentials
   oraclePrivateKey: ""

prysm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: prysm
-version: 1.3.8-hotfix-6c0942
+version: 1.3.11
 kubeVersion: "^1.14.0-0"
 description: Golang implementation of the Ethereum 2.0 client.
 type: application
@@ -14,4 +14,4 @@ sources:
 maintainers:
   - name: Dmitri Tsumak
     email: [email protected]
-appVersion: v1.3.9
+appVersion: v1.3.11

prysm/values.yaml

@@ -21,7 +21,7 @@ bootnode:
   # Docker image
   image:
     repository: "gcr.io/prysmaticlabs/prysm/bootnode"
-    tag: "HEAD-255354"
+    tag: "HEAD-9fd557"
     pullPolicy: IfNotPresent
 
   # Optional private key used for identity
@@ -51,7 +51,7 @@ slasher:
   # Docker image
   image:
     repository: "gcr.io/prysmaticlabs/prysm/slasher"
-    tag: "v1.3.9"
+    tag: "v1.3.11"
     pullPolicy: IfNotPresent
 
   extraFlags:
@@ -115,7 +115,7 @@ beacon:
   # Docker image
   image:
     repository: "gcr.io/prysmaticlabs/prysm/beacon-chain"
-    tag: "v1.3.9"
+    tag: "v1.3.11"
     pullPolicy: IfNotPresent
 
   # Enable pod disruption budget