Merge remote-tracking branch 'origin/alfstaging-20-01-27' into alfajo…

…res-2020-02-05

.env.alfajores

@@ -11,25 +11,31 @@ CLUSTER_DOMAIN_NAME="celo-testnet"
 TESTNET_PROJECT_NAME="celo-testnet-production"
 
 BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
-BLOCKSCOUT_DOCKER_IMAGE_TAG="9fcacb14cc0d68cb62478454ddb5c4ff9d66e92b"
+BLOCKSCOUT_DOCKER_IMAGE_TAG="f2262dd393323d4c19000984b6784963d695e1cf"
 BLOCKSCOUT_WEB_REPLICAS=3
-BLOCKSCOUT_DB_SUFFIX="7"
+BLOCKSCOUT_DB_SUFFIX="8"
 BLOCKSCOUT_SUBNETWORK_NAME="Alfajores"
 
+ETHSTATS_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/ethstats"
+ETHSTATS_DOCKER_IMAGE_TAG="9ff1e3836ba427e91d45df31b24ba66756d19dee"
+ETHSTATS_TRUSTED_ADDRESSES=""
+ETHSTATS_BANNED_ADDRESSES=""
+ETHSTATS_RESERVED_ADDRESSES=""
+
 FAUCET_GENESIS_ACCOUNTS=2
 
 GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_NODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
+GETH_NODE_DOCKER_IMAGE_TAG="45859e59b2c9335e383e2a997eb2a0fd13056235"
 
-GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/geth-all"
+GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth-all"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_BOOTNODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="45859e59b2c9335e383e2a997eb2a0fd13056235"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-CELOTOOL_DOCKER_IMAGE_TAG="celotool-552b1accf90404fdcd886670d150af0a5cae116f"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-9548656d0411d8c3b3d525727e621442e21b055a"
 
 CELOCLI_STANDALONE_IMAGE_REPOSITORY="gcr.io/celo-testnet/celocli-standalone"
 CELOCLI_STANDALONE_IMAGE_TAG="0.0.30-beta2"
@@ -42,19 +48,20 @@ ORACLE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/oracle"
 ORACLE_DOCKER_IMAGE_TAG="default"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-552b1accf90404fdcd886670d150af0a5cae116f"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-9548656d0411d8c3b3d525727e621442e21b055a"
 
-ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-5035b241cbcfbd4f261e3d77e1fca8f6dc8edc32"
+ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-9548656d0411d8c3b3d525727e621442e21b055a"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
-GETH_EXPORTER_DOCKER_IMAGE_TAG="6df683de7ae30d3fbca384abb14599d0e8130d35"
+GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"
 
 # Genesis Vars
-NETWORK_ID=44785
+NETWORK_ID=44786
 CONSENSUS_TYPE="istanbul"
 BLOCK_TIME=5
-EPOCH=720   // 1 hour
+# Epoch length is 1 day
+EPOCH=17280
 ISTANBUL_REQUEST_TIMEOUT_MS=10000
 
 # the number of load test clients that will be given funds in the genesis & migrations
@@ -65,9 +72,10 @@ LOAD_TEST_TX_DELAY_MS=36000
 # the amount in cUSD wei to give faucet, load test, and attestation bot accounts
 FAUCET_CUSD_WEI=60000000000000000000000
 
-VALIDATORS=70
-TX_NODES=10
-STATIC_IPS_FOR_GETH_NODES=true
+VALIDATORS=10
+PROXIED_VALIDATORS=5
+TX_NODES=5
+STATIC_IPS_FOR_GETH_NODES=false
 # Whether tx_nodes/validators stateful set should use ssd persistent disks
 GETH_NODES_SSD_DISKS=true
 IN_MEMORY_DISCOVERY_TABLE=false

.env.alfajoresstaging

@@ -13,29 +13,31 @@ CLUSTER_DOMAIN_NAME="celo-testnet"
 TESTNET_PROJECT_NAME="celo-testnet"
 
 BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
-BLOCKSCOUT_DOCKER_IMAGE_TAG="9ebd645aa670a5195641ca03c9f9717b5ea897cc"
+BLOCKSCOUT_DOCKER_IMAGE_TAG="f2262dd393323d4c19000984b6784963d695e1cf"
 BLOCKSCOUT_WEB_REPLICAS=3
 # Increment this value everytime you redeploy blockscout. Or else the deployment will fail due to the
 # existing database.
-BLOCKSCOUT_DB_SUFFIX="13"
+BLOCKSCOUT_DB_SUFFIX="14"
 BLOCKSCOUT_SUBNETWORK_NAME="Alfajores Staging"
+
 ETHSTATS_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/ethstats"
-ETHSTATS_DOCKER_IMAGE_TAG="e95256a2ac8414bd22900e8029f896eaf68ca411"
+ETHSTATS_DOCKER_IMAGE_TAG="9ff1e3836ba427e91d45df31b24ba66756d19dee"
 ETHSTATS_TRUSTED_ADDRESSES=""
 ETHSTATS_BANNED_ADDRESSES=""
+ETHSTATS_RESERVED_ADDRESSES=""
 
 GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_NODE_DOCKER_IMAGE_TAG="cd119bed3f4bf02365737bc7a87d3e2e0f9ba663"
+GETH_NODE_DOCKER_IMAGE_TAG="45859e59b2c9335e383e2a997eb2a0fd13056235"
 
 GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth-all"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_BOOTNODE_DOCKER_IMAGE_TAG="cd119bed3f4bf02365737bc7a87d3e2e0f9ba663"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="45859e59b2c9335e383e2a997eb2a0fd13056235"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-CELOTOOL_DOCKER_IMAGE_TAG="celotool-dcad01808c05f77ea71b911ba331caab0fd739d3"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-9548656d0411d8c3b3d525727e621442e21b055a"
 
 CELOCLI_STANDALONE_IMAGE_REPOSITORY="gcr.io/celo-testnet/celocli-standalone"
 CELOCLI_STANDALONE_IMAGE_TAG="0.0.30-beta2"
@@ -48,10 +50,10 @@ ORACLE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/oracle"
 ORACLE_DOCKER_IMAGE_TAG="default"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-4f63a422e0af6efca536b569f3005de209eb1cfd"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-9548656d0411d8c3b3d525727e621442e21b055a"
 
 ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo"
-ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-dcad01808c05f77ea71b911ba331caab0fd739d3"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-9548656d0411d8c3b3d525727e621442e21b055a"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
 GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"
@@ -60,8 +62,8 @@ GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"
 NETWORK_ID=1101
 CONSENSUS_TYPE="istanbul"
 BLOCK_TIME=5
-# Epoch length is 10 minutes
-EPOCH=120
+# Epoch length is 1 day
+EPOCH=17280
 LOOKBACK=12
 ISTANBUL_REQUEST_TIMEOUT_MS=10000
 
@@ -77,11 +79,10 @@ FAUCET_CUSD_WEI=60000000000000000000000
 VALIDATORS=10
 PROXIED_VALIDATORS=5
 TX_NODES=5
-STATIC_IPS_FOR_GETH_NODES=true
+STATIC_IPS_FOR_GETH_NODES=false
 # Whether tx_nodes/validators stateful set should use ssd persistent disks
 GETH_NODES_SSD_DISKS=true
-IN_MEMORY_DISCOVERY_TABLE=false
-PING_IP_FROM_PACKET=true
+IN_MEMORY_DISCOVERY_TABLE=true
 
 # Testnet vars
 GETH_NODES_BACKUP_CRONJOB_ENABLED=true
@@ -105,4 +106,4 @@ MOBILE_WALLET_PLAYSTORE_LINK="https://play.google.com/apps/internaltest/47009904
 PROMTOSD_SCRAPE_INTERVAL="5m"
 PROMTOSD_EXPORT_INTERVAL="5m"
 
-SMS_RETRIEVER_HASH_CODE=l5k6LvdPDXS
+SMS_RETRIEVER_HASH_CODE=CxTNcFAmVOE

packages/helm-charts/README.md

@@ -70,7 +70,7 @@ export PROJECT_NAME=celo-testnet
 gcloud config set project $PROJECT_NAME
 ```
 
-We use `celo-testnet` for all non-production environments, and `celo-production` for production environments.
+We use `celo-testnet` for all non-production environments, and `celo-testnet-production` for production environments.
 
 Then create a new Kubernetes cluster:
 

packages/protocol/migrationsConfig.js

@@ -32,7 +32,7 @@ const DefaultConfig = {
     slashableDowntime: 480,
   },
   election: {
-    minElectableValidators: '22',
+    minElectableValidators: '10',
     maxElectableValidators: '100',
     maxVotesPerAccount: 3,
     electabilityThreshold: 1 / 1000,
@@ -81,7 +81,7 @@ const DefaultConfig = {
     participationBaselineQuorumFactor: 1,
   },
   lockedGold: {
-    unlockingPeriod: (60 * 60 * 24 * 3) / 24, // 3 days divided by 24 to accelerate for Stake off
+    unlockingPeriod: 60 * 60 * 24 * 3, // 3 days
   },
   oracles: {
     reportExpiry: 10 * 60, // 10 minutes
@@ -113,20 +113,20 @@ const DefaultConfig = {
   validators: {
     groupLockedGoldRequirements: {
       value: '10000000000000000000000', // 10k gold per validator
-      duration: (60 * 24 * 60 * 60) / 24, // 60 days divided by 24 to accelerate for Stake off
+      duration: 60 * 24 * 60 * 60, // 60 days
     },
     validatorLockedGoldRequirements: {
       value: '10000000000000000000000', // 10k gold
-      duration: (60 * 24 * 60 * 60) / 24, // 60 days divided by 24 to accelerate for Stake off
+      duration: 60 * 24 * 60 * 60, // 60 days
     },
     validatorScoreParameters: {
       exponent: 10,
       adjustmentSpeed: 0.1,
     },
     membershipHistoryLength: 60,
     maxGroupSize: '5',
-    // 30 Days divided by 24 to accelerate for Stake off
-    slashingPenaltyResetPeriod: (60 * 60 * 24 * 30) / 24,
+    // 30 Days
+    slashingPenaltyResetPeriod: 60 * 60 * 24 * 30,
 
     // We register a number of C-Labs groups to contain an initial set of validators to run the network.
     validatorKeys: [],

packages/protocol/truffle-config.js

@@ -8,7 +8,7 @@ const { CoverageSubprovider } = require('@0x/sol-coverage')
 const argv = require('minimist')(process.argv.slice(2), { string: ['truffle_override', 'network'] })
 
 const SOLC_VERSION = '0.5.8'
-const ALFAJORES_NETWORKID = 44785
+const ALFAJORES_NETWORKID = 44786
 const BAKLAVA_NETWORKID = 200110
 const BAKLAVASTAGING_NETWORKID = 31416