Deploy alfajores

.env

@@ -16,16 +16,16 @@ BLOCKSCOUT_WEB_REPLICAS=3
 BLOCKSCOUT_DB_SUFFIX=
 
 GETH_NODE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/geth"
-GETH_NODE_DOCKER_IMAGE_TAG="ac6c5bbb2af0f27400c77ef9c155056ff3b73d45"
+GETH_NODE_DOCKER_IMAGE_TAG="f7095b78003062db9536e1d070772d20a3f81e93"
 
 GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/geth-all"
-GETH_BOOTNODE_DOCKER_IMAGE_TAG="ac6c5bbb2af0f27400c77ef9c155056ff3b73d45"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="f7095b78003062db9536e1d070772d20a3f81e93"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-CELOTOOL_DOCKER_IMAGE_TAG="celotool-4c8adab747673a220ab6803c9e6a01ecca61e5b1"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-552b1accf90404fdcd886670d150af0a5cae116f"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-4c8adab747673a220ab6803c9e6a01ecca61e5b1"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-552b1accf90404fdcd886670d150af0a5cae116f"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
 GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"

.env.alfajores

@@ -18,24 +18,24 @@ BLOCKSCOUT_SUBNETWORK_NAME="Alfajores"
 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="73c1d86b519c72722a924664304e6573cbcf77fa"
+GETH_NODE_DOCKER_IMAGE_TAG="f7095b78003062db9536e1d070772d20a3f81e93"
 
 GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="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="73c1d86b519c72722a924664304e6573cbcf77fa"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="f7095b78003062db9536e1d070772d20a3f81e93"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-CELOTOOL_DOCKER_IMAGE_TAG="celotool-0df549bcf4e147b2ac593aa7a19260ba17a77ff5"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-552b1accf90404fdcd886670d150af0a5cae116f"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-0df549bcf4e147b2ac593aa7a19260ba17a77ff5"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-552b1accf90404fdcd886670d150af0a5cae116f"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
-GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"
+GETH_EXPORTER_DOCKER_IMAGE_TAG="6df683de7ae30d3fbca384abb14599d0e8130d35"
 
 # Genesis Vars
-NETWORK_ID=44781
+NETWORK_ID=44782
 CONSENSUS_TYPE="istanbul"
 PREDEPLOYED_CONTRACTS="REGISTRY"
 BLOCK_TIME=5

.env.alfajoresstaging

@@ -11,8 +11,8 @@ CLUSTER_DOMAIN_NAME="celo-testnet"
 TESTNET_PROJECT_NAME="celo-testnet"
 
 BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
-BLOCKSCOUT_WEB_DOCKER_IMAGE_TAG="web-fb9a5bd46a0968865ef30cc568a260f01cb7fdaf"
-BLOCKSCOUT_INDEXER_DOCKER_IMAGE_TAG="indexer-fb9a5bd46a0968865ef30cc568a260f01cb7fdaf"
+BLOCKSCOUT_WEB_DOCKER_IMAGE_TAG="web-f6c3e0888d1d0ef72dc8bf870808702b7fd13730"
+BLOCKSCOUT_INDEXER_DOCKER_IMAGE_TAG="indexer-f6c3e0888d1d0ef72dc8bf870808702b7fd13730"
 BLOCKSCOUT_WEB_REPLICAS=3
 # Increment this value everytime you redeploy blockscout. Or else the deployment will fail due to the
 # existing database.

.env.integration

@@ -9,8 +9,8 @@ CLUSTER_DOMAIN_NAME="celo-testnet"
 TESTNET_PROJECT_NAME="celo-testnet"
 
 BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
-BLOCKSCOUT_WEB_DOCKER_IMAGE_TAG="web-fb9a5bd46a0968865ef30cc568a260f01cb7fdaf"
-BLOCKSCOUT_INDEXER_DOCKER_IMAGE_TAG="indexer-fb9a5bd46a0968865ef30cc568a260f01cb7fdaf"
+BLOCKSCOUT_WEB_DOCKER_IMAGE_TAG="web-f6c3e0888d1d0ef72dc8bf870808702b7fd13730"
+BLOCKSCOUT_INDEXER_DOCKER_IMAGE_TAG="indexer-f6c3e0888d1d0ef72dc8bf870808702b7fd13730"
 BLOCKSCOUT_WEB_REPLICAS=3
 BLOCKSCOUT_DB_SUFFIX="18"
 BLOCKSCOUT_SUBNETWORK_NAME="Integration"

dockerfiles/cli/Dockerfile

@@ -49,7 +49,7 @@ RUN npm install @celo/celocli
 FROM node:8-alpine as final_image
 
 ARG network_name="alfajores"
-ARG network_id="44781"
+ARG network_id="44782"
 
 # Without musl-dev, geth will fail with a confusing "No such file or directory" error.
 # bash is required for start_geth.sh
@@ -66,4 +66,4 @@ COPY --from=node /celo-monorepo/node_modules /celo-monorepo/node_modules
 RUN chmod ugo+x /celo/start_geth.sh && ln -s /celo-monorepo/node_modules/.bin/celocli /usr/local/bin/celocli
 
 EXPOSE 8545 8546 30303 30303/udp
-ENTRYPOINT ["/celo/start_geth.sh", "/usr/local/bin/geth", "alfajores", "full", "44781", "/root/.celo", "/celo/genesis.json", "/celo/static-nodes.json"]
+ENTRYPOINT ["/celo/start_geth.sh", "/usr/local/bin/geth", "alfajores", "full", "44782", "/root/.celo", "/celo/genesis.json", "/celo/static-nodes.json"]

packages/blockchain-api/app.alfajores.yaml

@@ -5,8 +5,8 @@ env_variables:
   DEPLOY_ENV: 'alfajores'
   BLOCKSCOUT_API: 'https://alfajores-blockscout.celo-testnet.org/api'
   # Pull addresses from the build artifacts of the network in protocol/build
-  CELO_GOLD_ADDRESS: '0x4813BFD311E132ade22c70dFf7e5DB045d26D070'
-  CELO_DOLLAR_ADDRESS: '0x299E74bdCD90d4E10f7957EF074ceE32d7e9089a'
-  FAUCET_ADDRESS: '0x456f41406B32c45D59E539e4BBA3D7898c3584dA '
+  CELO_GOLD_ADDRESS: '0x11CD75C45638Ec9f41C0e8Df78fc756201E48ff2'
+  CELO_DOLLAR_ADDRESS: '0xd4b4fcaCAc9e23225680e89308E0a4C41Dd9C6B4'
+  FAUCET_ADDRESS: '0x456f41406B32c45D59E539e4BBA3D7898c3584dA'
   VERIFICATION_REWARDS_ADDRESS: '0xb4fdaf5f3cd313654aa357299ada901b1d2dd3b5'
-  ABE_ADDRESS: '0xbaf22812681355442465B59c476cE20a60823105'
+  ABE_ADDRESS: '0x714f2879A4aa985508537f851FeBCfB26D7aF40D'

packages/cli/start_geth.sh

@@ -11,8 +11,8 @@ GETH_BINARY=${1:-"/usr/local/bin/geth"}
 NETWORK_NAME=${2:-"alfajores"}
 # Default to testing the ultralight sync mode
 SYNCMODE=${3:-"ultralight"}
-# Default to 1101
-NETWORK_ID=${4:-"44781"}
+# Default to 44782
+NETWORK_ID=${4:-"44782"}
 DATA_DIR=${5:-"/tmp/tmp1"}
 GENESIS_FILE_PATH=${6:-"/celo/genesis.json"}
 STATIC_NODES_FILE_PATH=${7:-"/celo/static-nodes.json"}

packages/docs/getting-started/running-a-full-node.md

@@ -62,7 +62,7 @@ A bootnode's purpose is to help nodes find other nodes in the network. This comm
 **Step 6: Start the full node**  
 This command specifies the settings needed to run the node, and gets it started.
 
-`` $ docker run -p 127.0.0.1:8545:8545 -p 127.0.0.1:8546:8546 -p 30303:30303 -p 30303:30303/udp -v `pwd`:/root/.celo us.gcr.io/celo-testnet/celo-node:alfajores --verbosity 3 --networkid 44781 --syncmode full --rpc --rpcaddr 0.0.0.0 --rpcapi eth,net,web3,debug,admin,personal --lightserv 90 --lightpeers 1000 --maxpeers 1100 --etherbase $CELO_ACCOUNT_ADDRESS ``
+`` $ docker run -p 127.0.0.1:8545:8545 -p 127.0.0.1:8546:8546 -p 30303:30303 -p 30303:30303/udp -v `pwd`:/root/.celo us.gcr.io/celo-testnet/celo-node:alfajores --verbosity 3 --networkid 44782 --syncmode full --rpc --rpcaddr 0.0.0.0 --rpcapi eth,net,web3,debug,admin,personal --lightserv 90 --lightpeers 1000 --maxpeers 1100 --etherbase $CELO_ACCOUNT_ADDRESS ``
 
 You'll start seeing some output. There may be some errors or warnings that are ignorable. After a few minutes, you should see lines that look like this. This means your node has synced with the network and is receiving blocks.
 

packages/docs/getting-started/running-a-validator.md

@@ -75,15 +75,15 @@ In order to allow the node to sync with the network, give it the address for the
 
 Start up the node:
 
-`` $ docker run -p 127.0.0.1:8545:8545 -p 127.0.0.1:8546:8546 -p 30303:30303 -p 30303:30303/udp -v `pwd`:/root/.celo us.gcr.io/celo-testnet/celo-node:alfajores --verbosity 3 --networkid 44781 --syncmode full --rpc --rpcaddr 0.0.0.0 --rpcapi eth,net,web3,debug,admin,personal --maxpeers 1100 --mine --miner.verificationpool=https://us-central1-celo-testnet-production.cloudfunctions.net/handleVerificationRequestalfajores/v0.1/sms/ --etherbase $CELO_VALIDATOR_ADDRESS ``
+`` $ docker run -p 127.0.0.1:8545:8545 -p 127.0.0.1:8546:8546 -p 30303:30303 -p 30303:30303/udp -v `pwd`:/root/.celo us.gcr.io/celo-testnet/celo-node:alfajores --verbosity 3 --networkid 44782 --syncmode full --rpc --rpcaddr 0.0.0.0 --rpcapi eth,net,web3,debug,admin,personal --maxpeers 1100 --mine --miner.verificationpool=https://us-central1-celo-testnet-production.cloudfunctions.net/handleVerificationRequestalfajores/v0.1/sms/ --etherbase $CELO_VALIDATOR_ADDRESS ``
 
 {% hint style="danger" %}
 **Security**: The command line above includes the parameter `--rpcaddr 0.0.0.0` which makes the Celo Blockchain software listen for incoming RPC requests on all network adaptors. Exercise extreme caution in doing this when running outside Docker, as it means that any unlocked accounts and their funds may be accessed from other machines on the Internet. In the context of running a Docker container on your local machine, this together with the `docker -p` flags allows you to make RPC calls from outside the container, i.e from your local host, but not from outside your machine. Read more about [Docker Networking](https://docs.docker.com/network/network-tutorial-standalone/#use-user-defined-bridge-networks) here.
 {% endhint %}
 
 The `mine` flag does not mean the node starts mining blocks, but rather starts trying to participate in the BFT consensus protocol. It cannot do this until it gets elected -- so next we need to rig an election.
 
-The `networkid` parameter value of `44781` indicates we are connecting the Alfajores Testnet.
+The `networkid` parameter value of `44782` indicates we are connecting the Alfajores Testnet.
 
 ### Set up deposits
 

packages/notification-service/config/config.alfajores.env

@@ -3,8 +3,8 @@ PORT=80
 FIREBASE_DB=https://celo-org-mobile-alfajores.firebaseio.com
 BLOCKSCOUT_API=https://alfajores-blockscout.celo-testnet.org/api?
 NODE_TLS_REJECT_UNAUTHORIZED=0
-STABLE_TOKEN_ADDRESS=0x299E74bdCD90d4E10f7957EF074ceE32d7e9089a
-GOLD_TOKEN_ADDRESS=0x4813BFD311E132ade22c70dFf7e5DB045d26D070
+STABLE_TOKEN_ADDRESS=0xd4b4fcaCAc9e23225680e89308E0a4C41Dd9C6B4
+GOLD_TOKEN_ADDRESS=0x11CD75C45638Ec9f41C0e8Df78fc756201E48ff2
 DEFAULT_LOCALE=en
 NOTIFICATION_TTL_MS=604800000
 POLLING_INTERVAL=1000

packages/protocol/truffle.js

@@ -6,11 +6,11 @@ const DEVELOPMENT_FROM = '0x5409ed021d9299bf6814279a6a1411a7e866a631'
 const INTEGRATION_FROM = '0x47e172F6CfB6c7D01C1574fa3E2Be7CC73269D95'
 const INTEGRATION_TESTING_FROM = '0x47e172F6CfB6c7D01C1574fa3E2Be7CC73269D95'
 const ALFAJORESSTAING_FROM = '0xf4314cb9046bece6aa54bb9533155434d0c76909'
-const ALFAJORES_FROM = '0x456f41406b32c45d59e539e4bba3d7898c3584da'
+const ALFAJORES_FROM = '0x456f41406B32c45D59E539e4BBA3D7898c3584dA'
 const PILOT_FROM = '0x387bCb16Bfcd37AccEcF5c9eB2938E30d3aB8BF2'
 const PILOTSTAGING_FROM = '0x545DEBe3030B570731EDab192640804AC8Cf65CA'
 
-const ALFAJORES_NETWORKID = 44781
+const ALFAJORES_NETWORKID = 44782
 
 const defaultConfig = {
   host: '127.0.0.1',

packages/verification-pool-api/contracts/Attestations.ts

@@ -801,6 +801,6 @@ export default async function getInstance(web3: Web3) {
     "type": "function"
   }
 ],
-   "0xAfDF1963Dac816dd84B49B8d2179296Ab32D6519"
+   "0x714f2879A4aa985508537f851FeBCfB26D7aF40D"
   )
 }

packages/verification-pool-api/contracts/GoldToken.ts

@@ -295,6 +295,6 @@ export default async function getInstance(web3: Web3) {
     "type": "function"
   }
 ],
-   "0xbe7E2bf1d46f7F351a1785e707Eae8f252Af94Dd"
+   "0x11CD75C45638Ec9f41C0e8Df78fc756201E48ff2"
   )
 }

packages/verification-pool-api/contracts/StableToken.ts

@@ -722,6 +722,6 @@ export default async function getInstance(web3: Web3) {
     "type": "function"
   }
 ],
-   "0x4917775b54738BFf899C91f320d260Be413f1d16"
+   "0xd4b4fcaCAc9e23225680e89308E0a4C41Dd9C6B4"
   )
 }

packages/verification-pool-api/src/celoEnv.ts

@@ -1 +1 @@
-export const CELO_ENV = 'alfajoresstaging'
+export const CELO_ENV = 'alfajores'