Deploy indra-4.0.4

connext · Jan 23, 2020 · 115d08d · 115d08d
2 parents 9f8aa08 + 3a243a2
commit 115d08d
Show file tree

Hide file tree

Showing 19 changed files with 55 additions and 64 deletions.
diff --git a/modules/cf-core/package.json b/modules/cf-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connext/cf-core",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "main": "dist/src/index.js",
   "iife": "dist/src/index.iife.js",
   "types": "dist/src/index.d.ts",
@@ -15,8 +15,8 @@
     "test:coverage": "jest --runInBand --detectOpenHandles --bail --coverage"
   },
   "dependencies": {
-    "@connext/contracts": "1.0.1",
-    "@connext/types": "4.0.2",
+    "@connext/contracts": "1.0.2",
+    "@connext/types": "4.0.4",
     "ethers": "4.0.41",
     "eventemitter3": "4.0.0",
     "loglevel": "1.6.6",

diff --git a/modules/cf-core/src/contracts.ts b/modules/cf-core/src/contracts.ts
@@ -1,15 +1,10 @@
-import ChallengeRegistry from "@connext/contracts/build/ChallengeRegistry.json";
-import CounterfactualApp from "@connext/contracts/build/CounterfactualApp.json";
-import ConditionalTransactionDelegateTarget from "@connext/contracts/build/ConditionalTransactionDelegateTarget.json";
-import ERC20 from "@connext/contracts/build/ERC20.json";
-import MinimumViableMultisig from "@connext/contracts/build/MinimumViableMultisig.json";
-import ProxyFactory from "@connext/contracts/build/ProxyFactory.json";
-
 export {
+  addressBook,
+  addressHistory,
   ChallengeRegistry,
-  CounterfactualApp,
   ConditionalTransactionDelegateTarget,
+  CounterfactualApp,
   ERC20,
   MinimumViableMultisig,
-  ProxyFactory
-};
+  ProxyFactory,
+} from "@connext/contracts";
diff --git a/modules/cf-core/src/utils.ts b/modules/cf-core/src/utils.ts
@@ -1,5 +1,4 @@
 import { CriticalStateChannelAddresses } from "@connext/types";
-import { addressBook, addressHistory } from "@connext/contracts";
 import { Contract } from "ethers";
 import { Provider } from "ethers/providers";
 import {
@@ -16,7 +15,7 @@ import {
 import { fromExtendedKey } from "ethers/utils/hdnode";
 
 import { JSON_STRINGIFY_SPACE } from "./constants";
-import { MinimumViableMultisig, ProxyFactory } from "./contracts";
+import { addressBook, addressHistory, MinimumViableMultisig, ProxyFactory } from "./contracts";
 
 export function getFirstElementInListNotEqualTo(test: string, list: string[]) {
   return list.filter(x => x !== test)[0];

diff --git a/modules/client/package.json b/modules/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connext/client",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "Client for Connext Network",
   "main": "dist/index.js",
   "files": [
@@ -16,10 +16,10 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@connext/cf-core": "4.0.2",
-    "@connext/messaging": "4.0.2",
-    "@connext/store": "4.0.2",
-    "@connext/types": "4.0.2",
+    "@connext/cf-core": "4.0.4",
+    "@connext/messaging": "4.0.4",
+    "@connext/store": "4.0.4",
+    "@connext/types": "4.0.4",
     "core-js": "3.6.1",
     "eccrypto": "1.1.3",
     "ethers": "4.0.41",

diff --git a/modules/contracts/address-book.json b/modules/contracts/address-book.json
@@ -220,6 +220,11 @@
       "address": "0x40cd4292438642bAc4b5733ED4ec45509bf164Bb",
       "bytecode": "0x401c9743f9b231490322bcca4301d75e5d0b39745d9fc8b90f8cd5b779852225",
       "txHash": "0x4bdba42fa5cc00add4b0774e2a4154b31207dc8d0a26d7f16e3fbd1e30cd9243"
+    },
+    "Token": {
+      "address": "0xc5f89a4DfB8947F90f79E3d34EC05C07B7E64265",
+      "bytecode": "0xf97398131762b89df0289198fa30b8da8776d0afc8662aefc397a0b6b31ceb44",
+      "txHash": "0x3217505ee0b45b53dd492272f683d8ed68fe9453c36dc612bd1dd3c356c08afb"
     }
   },
   "4447": {

diff --git a/modules/contracts/ops/migrate-contracts.js b/modules/contracts/ops/migrate-contracts.js
@@ -169,16 +169,8 @@ const sendGift = async (address, token) => {
 
   // Sanity check: Is our eth provider serving us the correct network?
   const net = process.env.ETH_NETWORK;
-  if (((net === `mainnet` || net === `live`) && chainId === 1) ||
-      (net === `ropsten` && chainId === 3) ||
-      ((net === `rinkeby` || net === `staging`) && chainId === 4) ||
-      (net === `kovan` && chainId === 42) ||
-      (net === `ganache` && chainId === ganacheId)) {
-    console.log(`\nPreparing to migrate contracts to ${net} network (${chainId})`);
-    console.log(`Deployer Wallet: address=${wallet.address} nonce=${nonce} balance=${balance}`);
-  } else {
-    console.error(`Warning: given network (${net}) doesn't match the network ID from provider: ${chainId}`);
-  }
+  console.log(`\nPreparing to migrate contracts to ${net} network (${chainId})`);
+  console.log(`Deployer Wallet: address=${wallet.address} nonce=${nonce} balance=${balance}`);
 
   ////////////////////////////////////////
   // Deploy contracts
@@ -194,7 +186,7 @@ const sendGift = async (address, token) => {
   }
 
   // If this network has not token yet, deploy one
-  if (!getSavedData(`Token`, `address`)) {
+  if (chainId === ganacheId || !getSavedData(`Token`, `address`)) {
     token = await deployContract(`Token`, tokenArtifacts, []);
   }
 

diff --git a/modules/contracts/package.json b/modules/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connext/contracts",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Smart contracts that power a Counterfactual State Channel platform",
   "license": "ISC",
   "files": ["address-book.json", "address-history.json", "build", "contracts", "index.ts"],
@@ -13,7 +13,7 @@
     "lint-sol": "solium -d ."
   },
   "dependencies": {
-    "@connext/types": "4.0.2",
+    "@connext/types": "4.0.4",
     "ethers": "4.0.41",
     "ganache-cli": "6.7.0",
     "openzeppelin-solidity": "2.3.0"

diff --git a/modules/daicard/package.json b/modules/daicard/package.json
@@ -12,9 +12,9 @@
     "format": "prettier --write \"src/**/*.js\""
   },
   "dependencies": {
-    "@connext/client": "4.0.2",
-    "@connext/store": "4.0.2",
-    "@connext/types": "4.0.2",
+    "@connext/client": "4.0.4",
+    "@connext/store": "4.0.4",
+    "@connext/types": "4.0.4",
     "@material-ui/core": "4.8.2",
     "@material-ui/icons": "4.5.1",
     "@walletconnect/browser": "1.0.0-beta.41",
@@ -41,7 +41,7 @@
     "xstate": "4.7.5"
   },
   "devDependencies": {
-    "@connext/types": "4.0.2",
+    "@connext/types": "4.0.4",
     "bn.js": "5.1.1",
     "chai-bn": "0.2.0"
   },

diff --git a/modules/dashboard/package.json b/modules/dashboard/package.json
@@ -9,10 +9,9 @@
     "eject": "react-scripts eject"
   },
   "dependencies": {
-    "@connext/cf-core": "4.0.2",
-    "@connext/contracts": "1.0.1",
-    "@connext/messaging": "4.0.2",
-    "@connext/types": "4.0.2",
+    "@connext/cf-core": "4.0.4",
+    "@connext/messaging": "4.0.4",
+    "@connext/types": "4.0.4",
     "@material-ui/core": "4.8.2",
     "@material-ui/icons": "4.5.1",
     "react": "16.12.0",

diff --git a/modules/dashboard/src/components/Admin/ScanCriticalAddresses.js b/modules/dashboard/src/components/Admin/ScanCriticalAddresses.js
@@ -1,5 +1,4 @@
 import { scanForCriticalAddresses } from "@connext/cf-core";
-import { addressHistory } from "@connext/contracts";
 import { getDefaultProvider } from "ethers";
 import React, { useState } from "react";
 import Button from "@material-ui/core/Button";

diff --git a/modules/messaging/package.json b/modules/messaging/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@connext/messaging",
   "description": "Messaging module for Connext client",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "main": "dist/index.js",
   "iife": "dist/index.iife.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
     "prepare": "npm run build"
   },
   "dependencies": {
-    "@connext/types": "4.0.2",
+    "@connext/types": "4.0.4",
     "ts-nats": "1.2.4",
     "websocket-nats": "0.3.3"
   },

diff --git a/modules/node/package.json b/modules/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indra-node",
-	"version": "4.0.2",
+	"version": "4.0.4",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -21,10 +21,10 @@
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand"
   },
   "dependencies": {
-    "@connext/cf-core": "4.0.2",
-    "@connext/contracts": "1.0.1",
-    "@connext/messaging": "4.0.2",
-    "@connext/types": "4.0.2",
+    "@connext/cf-core": "4.0.4",
+    "@connext/contracts": "1.0.2",
+    "@connext/messaging": "4.0.4",
+    "@connext/types": "4.0.4",
     "@nestjs/common": "6.5.3",
     "@nestjs/core": "6.5.3",
     "@nestjs/microservices": "6.5.3",
@@ -45,7 +45,7 @@
     "uuid": "3.3.3"
   },
   "devDependencies": {
-    "@connext/client": "4.0.2",
+    "@connext/client": "4.0.4",
     "@nestjs/testing": "6.5.3",
     "@types/express": "4.17.2",
     "@types/jest": "24.0.25",

diff --git a/modules/payment-bot/package.json b/modules/payment-bot/package.json
@@ -12,9 +12,9 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@connext/client": "4.0.2",
-    "@connext/store": "4.0.2",
-    "@connext/types": "4.0.2",
+    "@connext/client": "4.0.4",
+    "@connext/store": "4.0.4",
+    "@connext/types": "4.0.4",
     "commander": "4.0.1",
     "dotenv": "8.2.0",
     "ethers": "4.0.41",

diff --git a/modules/store/package.json b/modules/store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connext/store",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "Store module for Connext client",
   "main": "dist/index.js",
   "files": [
@@ -16,7 +16,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@connext/types": "4.0.2",
+    "@connext/types": "4.0.4",
     "ethers": "4.0.41",
     "pisa-client": "0.1.4-connext-beta.1",
     "uuid": "3.3.3"

diff --git a/modules/test-runner/package.json b/modules/test-runner/package.json
@@ -10,12 +10,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@connext/cf-core": "4.0.2",
-    "@connext/client": "4.0.2",
-    "@connext/contracts": "1.0.1",
-    "@connext/messaging": "4.0.2",
-    "@connext/store": "4.0.2",
-    "@connext/types": "4.0.2",
+    "@connext/cf-core": "4.0.4",
+    "@connext/client": "4.0.4",
+    "@connext/contracts": "1.0.2",
+    "@connext/messaging": "4.0.4",
+    "@connext/store": "4.0.4",
+    "@connext/types": "4.0.4",
     "core-js": "3.6.1",
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",

diff --git a/modules/types/package.json b/modules/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connext/types",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "TypeScript typings for common Connext types",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",

diff --git a/ops/start-prod.sh b/ops/start-prod.sh
@@ -128,6 +128,8 @@ if [[ "$chainId" == "1" ]]
 then eth_network_name="mainnet"
 elif [[ "$chainId" == "4" ]]
 then eth_network_name="rinkeby"
+elif [[ "$chainId" == "6" ]]
+then eth_network_name="kotti"
 elif [[ "$chainId" == "42" ]]
 then eth_network_name="kovan"
 elif [[ "$chainId" == "$ganache_chain_id" ]]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "indra",
-	"version": "4.0.2",
+	"version": "4.0.4",
 	"description": "",
 	"repository": {
 		"type": "git",