Deploy indra-7.0.0

.gitignore

@@ -25,6 +25,10 @@ modules/*/package-lock.json
 **/.test-store
 **/cache/**
 
+# Data Storage
+modules/bot/.connext-store/
+.chaindata
+
 # Docs
 modules/client/docs
 
@@ -54,12 +58,6 @@ cypress/videos
 **/.env
 **/react-app-env.d.ts
 ops/database/snapshots
-
-# Http files
-ganache.http
-modules/bot/.connext-store/
-modules/bot-registry/.node-persist/
-
 .secret
 
 # Local address book

Makefile

@@ -54,9 +54,12 @@ start-headless: dev
 start-daicard: dev
 	INDRA_UI=daicard bash ops/start-dev.sh
 
+start-testnet: contracts
+	INDRA_CHAIN_LOG_LEVEL=1 bash ops/start-testnet.sh
+
 start-test: start-test-staging
 start-test-staging:
-	INDRA_ETH_PROVIDER=http://localhost:8545 INDRA_MODE=test-staging bash ops/start-prod.sh
+	INDRA_MODE=test-staging bash ops/start-prod.sh
 
 start-test-release:
 	INDRA_ETH_PROVIDER=http://localhost:8545 INDRA_MODE=test-release bash ops/start-prod.sh
@@ -73,6 +76,9 @@ start-bot-farm: bot
 stop:
 	bash ops/stop.sh
 
+stop-all:
+	bash ops/stop.sh all
+
 restart-headless: dev
 	bash ops/stop.sh
 	INDRA_UI=headless bash ops/start-dev.sh
@@ -87,7 +93,7 @@ restart-prod:
 	bash ops/stop.sh
 	bash ops/start-prod.sh
 
-clean: stop
+clean: stop-all
 	docker container prune -f
 	rm -rf .flags/*
 	rm -rf node_modules/@connext modules/*/node_modules/@connext
@@ -110,12 +116,13 @@ quick-reset:
 	rm -rf modules/*/.connext-store
 	touch modules/node/src/main.ts
 
-reset: stop
+reset: stop-all
 	docker container prune -f
 	docker network rm $(project) $(project)_cf_tester $(project)_node_tester $(project)_test_store 2> /dev/null || true
 	docker secret rm $(project)_database_dev 2> /dev/null || true
-	docker volume rm $(project)_chain_dev $(project)_database_dev  2> /dev/null || true
+	docker volume rm $(project)_chain_1337 $(project)_chain_1338 $(project)_database_dev  2> /dev/null || true
 	docker volume rm `docker volume ls -q -f name=$(project)_database_test_*` 2> /dev/null || true
+	rm -rf .chaindata/*
 	rm -rf .flags/deployed-contracts
 
 push-commit:
@@ -136,10 +143,6 @@ pull-release:
 pull-backwards-compatible:
 	bash ops/pull-images.sh $(backwards_compatible_version)
 
-deployed-contracts: contracts
-	bash ops/deploy-contracts.sh
-	touch .flags/$@
-
 build-report:
 	bash ops/build-report.sh
 
@@ -175,7 +178,7 @@ test-tps-lg: bot
 	bash ops/test/tps.sh 40 0 10
 
 test-cf: cf-core
-	bash ops/test/cf.sh
+	bash ops/test/cf.sh test
 
 test-contracts: contracts utils
 	bash ops/test/unit.sh contracts
@@ -202,7 +205,7 @@ test-watcher: watcher
 	bash ops/test/watcher.sh
 
 watch-cf: cf-core
-	bash ops/test/cf.sh --watch
+	bash ops/test/cf.sh watch
 
 watch-integration:
 	bash ops/test/integration.sh watch
@@ -211,7 +214,7 @@ watch-ui: node-modules
 	bash ops/test/ui.sh --watch
 
 watch-node: node
-	bash ops/test/node.sh --watch
+	bash ops/test/node.sh watch
 
 ########################################
 # Begin Real Build Rules

README.md

@@ -92,6 +92,10 @@ If you want to use custom contracts or a new network though, you'll have to depl
 
 For example: to deploy to Goerli testnet, you'll first need to retrieve the mnemonic for an account that has enough funds to pay the gas fees. Copy that mnemonic to your clipboard & then run:
 
+```bash
+make contracts
+```
+then
 ```bash
 bash ops/deploy-contracts.sh https://goerli.infura.io/abc123
 ```

cypress/tests/utils.js

@@ -1,7 +1,7 @@
 /* global Cypress, cy */
 const eth = require("ethers");
 const tokenArtifacts = require("@openzeppelin/contracts/build/contracts/ERC20Mintable.json");
-const addressBook = require("../../modules/contracts/address-book.json");
+const addressBook = require("../../.chaindata/addresses/1337-1338.json");
 
 const provider = new eth.providers.JsonRpcProvider(Cypress.env("provider"));
 const funder = eth.Wallet.fromMnemonic(Cypress.env("funder")).connect(provider);

dev.env

@@ -1,6 +1,5 @@
-INDRA_ADMIN_TOKEN="cxt1234"
-INDRA_ETH_PROVIDER="http://ethprovider:8545"
-INDRA_LOG_LEVEL="3"
-INDRA_NATS_JWT_SIGNER_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----MIIEowIBAAKCAQEAqU/GXp8MqmugQyRk5FUFBvlJt1/h7L3Crzlzejz/OxriZdq/lBNQW9S1kzGc7qjXprZ1Kg3zP6irr6wmvP0WYBGltWs2cWUAmxh0PSxuKdT/OyL9w+rjKLh4yo3ex6DX3Ij0iP01Ej2POe5WrPDS8j6LT0s4HZ1FprL5h7RUQWV3cO4pF+1kl6HlBpNzEQzocW9ig4DNdSeUENARHWoCixE1gFYo9RXm7acqgqCk3ihdJRIbO4e/m1aZq2mvAFK+yHTIWBL0p5PF0Fe8zcWdNeEATYB+eRdNJ3jjS8447YrcbQcBQmhFjk8hbCnc3Rv3HvAapk8xDFhImdVF1ffDFwIDAQABAoIBAGZIs2ZmX5h0/JSTYAAw/KCB6W7Glg4XdY21/3VRdD+Ytj0iMaqbIGjZz/fkeRIVHnKwt4d4dgN3OoEeVyjFHMdc4eb/phxLEFqiI1bxiHvtGWP4d6XsON9Y0mBL5NJk8QNiGZjIn08tsWEmA2bm9gkyj6aPoo8BfBqA9Q5uepgmYIPT2NtEXvTbd2dedAEJDJspHKHqBfcuNBVoVhUixVSgehWGGP4GX+FvAEHbawDrwULkMvgblH+X8nBtzikp29LNpOZSRRbqF/Da0AkluFvuDUUIzitjZs5koSEAteaulkZO08BMxtovQjh/ZPtVZKZ27POCNOgRsbm/lVIXRMECgYEA2TQQ2Xy6eO5XfbiT4ZD1Z1xe9B6Ti7J2fC0ZNNSXs4DzdYVcHNIuZqfK6fGqmByvSnFut7n5Po0z2FdXc7xcKFJdBZdFP3GLXbN9vpRPIk9b6n+0df471uTYwVocmAGXez++y73j5XzHQQW4WmmC5SlKjQUWCGkuzISVjRDtlZ0CgYEAx43KPrJxSijjE2+VWYjNFVuv6KilnWoA8I2cZ7TtPi4h//r5vyOUst0egR3lJ7rBof74VttQPvqAk3GN697IrE/bSwefwG2lM1Ta0KB3jn6b/iT4ckmaOB+v6aDHq/GPW6l/sxD0RIEelRYZlsNLepRgKhcQckhjnWzQuGWSl0MCgYBYJQ0BdeCm2vKejp1U2OL+Qzo1j4MJGi+DTToBepTlv9sNQkWTXKh/+HAcaHp2qI1qhIYOAWbov5zemvNegH5Vzrb5Yd40VPvd1s2c3csPfW0ryQ+PItFd8BkWvl8EQQEcf04KmNE3fF/QP2YFKvR30z3x5LKAT08yqEuYp9oC8QKBgQCfc9XqGU3bEya3Lg8ptt0gtt2ty6xiRwSvMoiKeZCkgdpbH6EWMQktjvBD/a5Q+7KjjgfD54SMfj/lEPR1R9QTk8/HeTUWXsaFaMVbtQ0zSEm/Xq1DLTrUo8U9qmJCK0gA10SZwe9dGctlF36k8DJMpWjd2QYkO2GVthBld4wV3wKBgC7S4q0wmcrQIjyDIFmISQNdOAJhR0pJXG8mK2jECbEXxbKkAJnLj73DJ+1OVBlx4HXx54PiEkV3M3iTinf5tBSi8nA2D3s829F65XKFli1RC4rJv+2ygH8PnXX9rQKhK/v6/jeelKquH8zy894hLZe7feSsWV9GMgb5l9p+UzWB-----END RSA PRIVATE KEY-----"
-INDRA_NATS_JWT_SIGNER_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqU/GXp8MqmugQyRk5FUFBvlJt1/h7L3Crzlzejz/OxriZdq/lBNQW9S1kzGc7qjXprZ1Kg3zP6irr6wmvP0WYBGltWs2cWUAmxh0PSxuKdT/OyL9w+rjKLh4yo3ex6DX3Ij0iP01Ej2POe5WrPDS8j6LT0s4HZ1FprL5h7RUQWV3cO4pF+1kl6HlBpNzEQzocW9ig4DNdSeUENARHWoCixE1gFYo9RXm7acqgqCk3ihdJRIbO4e/m1aZq2mvAFK+yHTIWBL0p5PF0Fe8zcWdNeEATYB+eRdNJ3jjS8447YrcbQcBQmhFjk8hbCnc3Rv3HvAapk8xDFhImdVF1ffDFwIDAQAB-----END PUBLIC KEY-----"
-INDRA_UI="daicard" # one of: "daicard", "dashboard", "headless"
+export INDRA_ADMIN_TOKEN="cxt1234"
+export INDRA_LOG_LEVEL="3"
+export INDRA_NATS_JWT_SIGNER_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----MIIEowIBAAKCAQEAqU/GXp8MqmugQyRk5FUFBvlJt1/h7L3Crzlzejz/OxriZdq/lBNQW9S1kzGc7qjXprZ1Kg3zP6irr6wmvP0WYBGltWs2cWUAmxh0PSxuKdT/OyL9w+rjKLh4yo3ex6DX3Ij0iP01Ej2POe5WrPDS8j6LT0s4HZ1FprL5h7RUQWV3cO4pF+1kl6HlBpNzEQzocW9ig4DNdSeUENARHWoCixE1gFYo9RXm7acqgqCk3ihdJRIbO4e/m1aZq2mvAFK+yHTIWBL0p5PF0Fe8zcWdNeEATYB+eRdNJ3jjS8447YrcbQcBQmhFjk8hbCnc3Rv3HvAapk8xDFhImdVF1ffDFwIDAQABAoIBAGZIs2ZmX5h0/JSTYAAw/KCB6W7Glg4XdY21/3VRdD+Ytj0iMaqbIGjZz/fkeRIVHnKwt4d4dgN3OoEeVyjFHMdc4eb/phxLEFqiI1bxiHvtGWP4d6XsON9Y0mBL5NJk8QNiGZjIn08tsWEmA2bm9gkyj6aPoo8BfBqA9Q5uepgmYIPT2NtEXvTbd2dedAEJDJspHKHqBfcuNBVoVhUixVSgehWGGP4GX+FvAEHbawDrwULkMvgblH+X8nBtzikp29LNpOZSRRbqF/Da0AkluFvuDUUIzitjZs5koSEAteaulkZO08BMxtovQjh/ZPtVZKZ27POCNOgRsbm/lVIXRMECgYEA2TQQ2Xy6eO5XfbiT4ZD1Z1xe9B6Ti7J2fC0ZNNSXs4DzdYVcHNIuZqfK6fGqmByvSnFut7n5Po0z2FdXc7xcKFJdBZdFP3GLXbN9vpRPIk9b6n+0df471uTYwVocmAGXez++y73j5XzHQQW4WmmC5SlKjQUWCGkuzISVjRDtlZ0CgYEAx43KPrJxSijjE2+VWYjNFVuv6KilnWoA8I2cZ7TtPi4h//r5vyOUst0egR3lJ7rBof74VttQPvqAk3GN697IrE/bSwefwG2lM1Ta0KB3jn6b/iT4ckmaOB+v6aDHq/GPW6l/sxD0RIEelRYZlsNLepRgKhcQckhjnWzQuGWSl0MCgYBYJQ0BdeCm2vKejp1U2OL+Qzo1j4MJGi+DTToBepTlv9sNQkWTXKh/+HAcaHp2qI1qhIYOAWbov5zemvNegH5Vzrb5Yd40VPvd1s2c3csPfW0ryQ+PItFd8BkWvl8EQQEcf04KmNE3fF/QP2YFKvR30z3x5LKAT08yqEuYp9oC8QKBgQCfc9XqGU3bEya3Lg8ptt0gtt2ty6xiRwSvMoiKeZCkgdpbH6EWMQktjvBD/a5Q+7KjjgfD54SMfj/lEPR1R9QTk8/HeTUWXsaFaMVbtQ0zSEm/Xq1DLTrUo8U9qmJCK0gA10SZwe9dGctlF36k8DJMpWjd2QYkO2GVthBld4wV3wKBgC7S4q0wmcrQIjyDIFmISQNdOAJhR0pJXG8mK2jECbEXxbKkAJnLj73DJ+1OVBlx4HXx54PiEkV3M3iTinf5tBSi8nA2D3s829F65XKFli1RC4rJv+2ygH8PnXX9rQKhK/v6/jeelKquH8zy894hLZe7feSsWV9GMgb5l9p+UzWB-----END RSA PRIVATE KEY-----"
+export INDRA_NATS_JWT_SIGNER_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqU/GXp8MqmugQyRk5FUFBvlJt1/h7L3Crzlzejz/OxriZdq/lBNQW9S1kzGc7qjXprZ1Kg3zP6irr6wmvP0WYBGltWs2cWUAmxh0PSxuKdT/OyL9w+rjKLh4yo3ex6DX3Ij0iP01Ej2POe5WrPDS8j6LT0s4HZ1FprL5h7RUQWV3cO4pF+1kl6HlBpNzEQzocW9ig4DNdSeUENARHWoCixE1gFYo9RXm7acqgqCk3ihdJRIbO4e/m1aZq2mvAFK+yHTIWBL0p5PF0Fe8zcWdNeEATYB+eRdNJ3jjS8447YrcbQcBQmhFjk8hbCnc3Rv3HvAapk8xDFhImdVF1ffDFwIDAQAB-----END PUBLIC KEY-----"
+export INDRA_UI="daicard" # one of: "daicard", "dashboard", "headless"

modules/apps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connext/apps",
-  "version": "7.0.0-alpha.20",
+  "version": "7.0.0",
   "description": "Connext Counterfactual Apps",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -18,13 +18,13 @@
     "clean": "rm -rf ./dist"
   },
   "devDependencies": {
-    "@connext/contracts": "3.3.1",
-    "@connext/types": "7.0.0-alpha.20",
-    "@connext/utils": "7.0.0-alpha.20",
+    "@connext/contracts": "3.4.1",
+    "@connext/types": "7.0.0",
+    "@connext/utils": "7.0.0",
     "@rollup/plugin-json": "4.1.0",
     "ethers": "5.0.5",
     "rollup": "2.21.0",
     "rollup-plugin-typescript2": "0.27.1",
-    "typescript": "3.9.6"
+    "typescript": "3.9.7"
   }
 }

modules/apps/src/SimpleTwoPartySwapApp/validation.ts

@@ -1,12 +1,12 @@
-import { AllowedSwap, SwapRate, ProtocolParams } from "@connext/types";
+import { AllowedSwap, ProtocolParams } from "@connext/types";
 import { calculateExchangeWad, getAddressFromAssetId, stringify } from "@connext/utils";
 import { BigNumber } from "ethers";
 
 const ALLOWED_DISCREPANCY_PCT = 5;
 
 export const validateSimpleSwapApp = (
   params: ProtocolParams.Propose,
-  allowedSwaps: SwapRate[],
+  allowedSwaps: AllowedSwap[],
   ourRate: string,
   responderDecimals: number,
 ) => {

modules/apps/src/middleware.ts

@@ -2,7 +2,7 @@ import {
   Address,
   ContractAddresses,
   MiddlewareContext,
-  NetworkContext,
+  NetworkContexts,
   ProposeMiddlewareContext,
   ProtocolName,
   ProtocolNames,
@@ -48,28 +48,24 @@ export const sharedProposalMiddleware = (
 
 // add any validation middlewares
 export const generateValidationMiddleware = async (
-  network: NetworkContext,
-  supportedTokenAddresses: Address[],
+  networkContexts: NetworkContexts,
+  supportedTokenAddresses: { [chainId: number]: Address[] },
 ): Promise<ValidationMiddleware> => {
-  if (!network.provider) {
-    throw new Error(`Validation middleware needs access to a provider`);
-  }
-
   const validationMiddleware: ValidationMiddleware = async (
     protocol: ProtocolName,
     middlewareContext: MiddlewareContext,
   ) => {
     switch (protocol) {
       case ProtocolNames.propose: {
         await proposeMiddleware(
-          network,
+          networkContexts,
           middlewareContext as ProposeMiddlewareContext,
           supportedTokenAddresses,
         );
         break;
       }
       case ProtocolNames.uninstall: {
-        await uninstallMiddleware(network, middlewareContext as UninstallMiddlewareContext);
+        await uninstallMiddleware(networkContexts, middlewareContext as UninstallMiddlewareContext);
         break;
       }
       case ProtocolNames.setup:
@@ -87,14 +83,15 @@ export const generateValidationMiddleware = async (
 };
 
 const uninstallMiddleware = async (
-  network: NetworkContext,
+  networkContexts: NetworkContexts,
   middlewareContext: UninstallMiddlewareContext,
 ) => {
-  const { appInstance } = middlewareContext;
+  const { appInstance, stateChannel } = middlewareContext;
+  const { contractAddresses, provider } = networkContexts[stateChannel.chainId];
   const appDef = appInstance.appDefinition;
   switch (appDef) {
-    case network.contractAddresses.DepositApp: {
-      await uninstallDepositMiddleware(middlewareContext, network.provider);
+    case contractAddresses.DepositApp: {
+      await uninstallDepositMiddleware(middlewareContext, provider);
       break;
     }
     default: {
@@ -104,17 +101,18 @@ const uninstallMiddleware = async (
 };
 
 const proposeMiddleware = async (
-  network: NetworkContext,
+  networkContexts: NetworkContexts,
   middlewareContext: ProposeMiddlewareContext,
-  supportedTokenAddresses: Address[],
+  supportedTokenAddresses: { [chainId: number]: Address[] },
 ) => {
-  const { contractAddresses } = network;
-  const { proposal } = middlewareContext;
-  sharedProposalMiddleware(middlewareContext, contractAddresses, supportedTokenAddresses);
+  const { proposal, stateChannel } = middlewareContext;
+  const { contractAddresses, provider } = networkContexts[stateChannel.chainId];
+  const supportedTokensForChainId = supportedTokenAddresses[stateChannel.chainId];
+  sharedProposalMiddleware(middlewareContext, contractAddresses, supportedTokensForChainId);
   const appDef = proposal.appDefinition;
   switch (appDef) {
     case contractAddresses.DepositApp: {
-      await proposeDepositMiddleware(middlewareContext, network.provider);
+      await proposeDepositMiddleware(middlewareContext, provider);
       break;
     }
     case contractAddresses.GraphSignedTransferApp: {
@@ -134,7 +132,7 @@ const proposeMiddleware = async (
       break;
     }
     case contractAddresses.HashLockTransferApp: {
-      await proposeHashLockTransferMiddleware(middlewareContext, network.provider);
+      await proposeHashLockTransferMiddleware(middlewareContext, provider);
       break;
     }
     case contractAddresses.WithdrawApp: {

modules/bot/package.json

@@ -11,21 +11,21 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@connext/client": "7.0.0-alpha.20",
-    "@connext/contracts": "3.3.1",
-    "@connext/store": "7.0.0-alpha.20",
-    "@connext/types": "7.0.0-alpha.20",
-    "@connext/utils": "7.0.0-alpha.20",
+    "@connext/client": "7.0.0",
+    "@connext/contracts": "3.4.1",
+    "@connext/store": "7.0.0",
+    "@connext/types": "7.0.0",
+    "@connext/utils": "7.0.0",
     "axios": "0.19.2",
     "body-parser": "1.19.0",
     "ethers": "5.0.5",
     "express": "4.17.1",
     "interval-promise": "1.4.0",
-    "yargs": "15.4.0"
+    "yargs": "15.4.1"
   },
   "devDependencies": {
     "@types/yargs": "15.0.5",
     "ts-node": "8.10.2",
-    "typescript": "3.9.6"
+    "typescript": "3.9.7"
   }
 }

modules/bot/src/env.ts

@@ -1,10 +1,10 @@
 export const env = {
-  ethProviderUrl: process.env.INDRA_ETH_RPC_URL!,
+  ethProviderUrl: process.env.INDRA_CHAIN_URL!,
   nodeUrl: process.env.INDRA_NODE_URL!,
 };
 
 if (!env.ethProviderUrl) {
-  throw new Error(`An INDRA_ETH_RPC_URL is required but was not provided.`);
+  throw new Error(`An INDRA_CHAIN_URL is required but was not provided.`);
 }
 
 if (!env.nodeUrl) {