Hyperspace

.env.local-hyperspace

@@ -0,0 +1,68 @@
+## all
+NODE_ENV = 'production'
+LOG_DESTINATION = 'console'
+LOG_LEVEL = 'info'
+# e2e-tests
+BROWSER_LOG_DESTINATION = 'browser.log'
+HEADLESS = 'false'
+USE_DAPPETEER = 'true'
+WEB3TORRENT_URL = 'http://localhost:3000'
+CLOSE_BROWSERS = 'true'
+
+## web3torrent, xstate-wallet, rps, simple-hub
+CHAIN_NETWORK_ID = '3141'
+
+## simple-hub, e2e
+INFURA_API_KEY = ''
+RPC_ENDPOINT = https://api.hyperspace.node.glif.io/rpc/v1
+
+## simple-hub, rps
+FIREBASE_API_KEY = 'AIzaSyAOvhDzJir_El3O6SJ2xQlrpOisnObq6zw'
+FIREBASE_PREFIX = 'netlify-hyperspace'
+FIREBASE_PROJECT = 'web3torrent-default-rtdb'
+
+## rps, xstate-wallet, ttt
+TARGET_NETWORK = 'hyperspace'
+
+## web3torrent, rps, ttt
+WALLET_URL = 'http://localhost:3055'
+
+## simple-hub, xstate-wallet
+CONSENSUS_APP_ADDRESS = '0xeB1170bf49fac482fA296C98Ac04024e8a2d6519'
+
+NITRO_ADJUDICATOR_ADDRESS = '0xaA512d99EC808FBf49b1e6491A251f2E75f913Ad'
+ETH_ASSET_HOLDER_ADDRESS = '0x6abaBB7e642C794264DAa2a1477B48521AaE1553'
+
+TRIVIAL_APP_ADDRESS = '0x95900b17Bd2CE12431C99A886FfDC5a451C14344'
+
+## simple-hub
+FIREBASE_URL = https://${FIREBASE_PROJECT}.firebaseio.com/
+# This is a funded address on goerli for the hub. This is NOT the production address/key
+HUB_CHAIN_PK = '0xBB72BD0824663E0B52FA3523ACED0F866550BBC1FD600D7F2DA9C45CAC509AE7'
+HUB_PARTICIPANT_ID = 'firebase:simple-hub'
+
+## xstate-wallet
+# This is a funded address on goerli for the hub. This is NOT the production address/key
+HUB_DESTINATION = '0x000000000000000000000000c4FB59b7fb0D8001Bda6DEA539117664573006c9'
+USE_INDEXED_DB = 'true'
+
+## web3torrent
+FUNDING_STRATEGY = 'Virtual'
+SINGLE_ASSET_PAYMENT_CONTRACT_ADDRESS = '0x4964f1aE3Ca9Ea0a1e7EF873a379768dBc74F034'
+SKIP_PREFLIGHT_CHECK = 'true'   
+TRACKER_URL = 'localhost:8000'
+TRACKER_URL_HTTP_PROTOCOL = 'http'
+GENERATE_SOURCEMAP = 'true'
+
+## rps
+RPS_CONTRACT_ADDRESS = '0x'
+
+## web3torrent-tracker
+TRACKER_PORT = 80
+
+## ttt
+TTT_CONTRACT_ADDRESS = '0x'
+FIREBASE_PROJECT_TTT = 'tic-tac-toe-production'
+
+
+ADD_LOGS = true

.env.production-hyperspace

@@ -0,0 +1,68 @@
+## all
+NODE_ENV = 'production'
+LOG_DESTINATION = 'console'
+LOG_LEVEL = 'info'
+# e2e-tests
+BROWSER_LOG_DESTINATION = 'browser.log'
+HEADLESS = 'false'
+USE_DAPPETEER = 'true'
+WEB3TORRENT_URL = 'https://hyperspace-torrent.statechannels.org'
+CLOSE_BROWSERS = 'true'
+
+## web3torrent, xstate-wallet, rps, simple-hub
+CHAIN_NETWORK_ID = '3141'
+
+## simple-hub, e2e
+INFURA_API_KEY = ''
+RPC_ENDPOINT = https://api.hyperspace.node.glif.io/rpc/v1
+
+## simple-hub, rps
+FIREBASE_API_KEY = 'AIzaSyAOvhDzJir_El3O6SJ2xQlrpOisnObq6zw'
+FIREBASE_PREFIX = 'netlify-hyperspace'
+FIREBASE_PROJECT = 'web3torrent-default-rtdb'
+
+## rps, xstate-wallet, ttt
+TARGET_NETWORK = 'hyperspace'
+
+## web3torrent, rps, ttt
+WALLET_URL = 'https://hyperspace-wallet.statechannels.org/'
+
+## simple-hub, xstate-wallet
+CONSENSUS_APP_ADDRESS = '0xeB1170bf49fac482fA296C98Ac04024e8a2d6519'
+
+NITRO_ADJUDICATOR_ADDRESS = '0xaA512d99EC808FBf49b1e6491A251f2E75f913Ad'
+ETH_ASSET_HOLDER_ADDRESS = '0x6abaBB7e642C794264DAa2a1477B48521AaE1553'
+
+TRIVIAL_APP_ADDRESS = '0x95900b17Bd2CE12431C99A886FfDC5a451C14344'
+
+## simple-hub
+FIREBASE_URL = https://${FIREBASE_PROJECT}.firebaseio.com/
+# This is a funded address on goerli for the hub. This is NOT the production address/key
+HUB_CHAIN_PK = '0xBB72BD0824663E0B52FA3523ACED0F866550BBC1FD600D7F2DA9C45CAC509AE7'
+HUB_PARTICIPANT_ID = 'firebase:simple-hub'
+
+## xstate-wallet
+# This is a funded address on goerli for the hub. This is NOT the production address/key
+HUB_DESTINATION = '0x000000000000000000000000c4FB59b7fb0D8001Bda6DEA539117664573006c9'
+USE_INDEXED_DB = 'true'
+
+## web3torrent
+FUNDING_STRATEGY = 'Virtual'
+SINGLE_ASSET_PAYMENT_CONTRACT_ADDRESS = '0x4964f1aE3Ca9Ea0a1e7EF873a379768dBc74F034'
+SKIP_PREFLIGHT_CHECK = 'true'   
+TRACKER_URL = 'web3torrent-tracker-hyperspace.herokuapp.com'
+TRACKER_URL_HTTP_PROTOCOL = 'https'
+GENERATE_SOURCEMAP = 'true'
+
+## rps
+RPS_CONTRACT_ADDRESS = '0x'
+
+## web3torrent-tracker
+TRACKER_PORT = 80
+
+## ttt
+TTT_CONTRACT_ADDRESS = '0x'
+FIREBASE_PROJECT_TTT = 'tic-tac-toe-production'
+
+
+ADD_LOGS = true

package.json

@@ -51,7 +51,6 @@
     "lint:check": "lerna run lint:check --no-sort --no-bail -- --max-warnings=0",
     "lint:write": "lerna run lint:write --no-sort --no-bail",
     "postinstall": "patch-package",
-    "preinstall": "npx typesync",
     "prepare": "lerna run --concurrency 8 --stream prepare",
     "publish": "lerna publish --yes from-package patch",
     "release:netlify": "lerna run release:netlify --stream -- --auth $NETLIFY_ACCESS_TOKEN --message $(git rev-parse --short HEAD) $([ $(git rev-parse --abbrev-ref HEAD) = master ] && echo --prod)",

packages/channel-client/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@statechannels/channel-client",
   "description": "Browser-compatible JS client implementing the State Channels Client API",
-  "version": "0.3.0",
+  "version": "0.3.0-hyperspace",
   "author": "snario <liam@l4v.io>",
   "dependencies": {
-    "@statechannels/client-api-schema": "^0.3.0",
-    "@statechannels/iframe-channel-provider": "^0.3.0",
+    "@statechannels/client-api-schema": "0.3.0",
+    "@statechannels/iframe-channel-provider": "0.3.0",
     "ethers": "4.0.45",
     "eventemitter3": "4.0.0",
     "loglevel": "1.6.8"

packages/channel-client/tsconfig.json

@@ -9,6 +9,5 @@
     "target": "es2015",
     "esModuleInterop": true,
     "types": ["react", "jest", "node"]
-  },
-  "references": [{"path": "../iframe-channel-provider"}, {"path": "../client-api-schema"}]
+  }
 }

packages/iframe-channel-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statechannels/iframe-channel-provider",
-  "version": "0.3.0",
+  "version": "0.3.0-hyperspace-patch-0",
   "browser": "dist/iframe-channel-provider.js",
   "browserslist": {
     "production": [

packages/iframe-channel-provider/src/channel-provider.ts

@@ -189,6 +189,7 @@ export class IFrameChannelProvider implements IFrameChannelProviderInterface {
 
   protected async onMessage(event: MessageEvent) {
     let message;
+    if (event.data == '') return;
     if (isJsonRpcNotification(event.data)) {
       message = parseNotification(event.data); // Narrows type, throws if it does not fit the schema
       const notificationMethod = message.method;

packages/iframe-channel-provider/src/postmessage-service.ts

@@ -40,6 +40,10 @@ export class PostMessageService {
     this.attempts += 1;
 
     logger.info({message}, 'Sending message (attempt %s)', this.attempts);
+    // TODO: This lets us get around CORS restrictions when using different ports on localhost
+    if (corsUrl.startsWith('http://localhost')) {
+      corsUrl = '*';
+    }
     target.postMessage(message, corsUrl);
     logger.info({message}, 'Sent message:');
 

packages/xstate-wallet/config/webpack.config.js

@@ -611,7 +611,7 @@ module.exports = function(webpackEnv) {
       isEnvProduction &&
         new WorkboxWebpackPlugin.GenerateSW({
           clientsClaim: true,
-          maximumFileSizeToCacheInBytes: 6000000,
+          maximumFileSizeToCacheInBytes: 10000000,
           exclude: [/\.map$/, /asset-manifest\.json$/],
           navigateFallback: publicUrl + '/index.html',
           navigateFallbackDenylist: [

packages/xstate-wallet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@statechannels/xstate-wallet",
   "description": "State channel wallet using xstate.",
-  "version": "0.3.0",
+  "version": "0.3.0-hyperspace",
   "author": "Alex Gap",
   "babel": {
     "presets": [
@@ -25,7 +25,7 @@
     "@rimble/connection-banner": "1.2.3",
     "@rimble/utils": "1.2.3",
     "@sentry/browser": "5.15.5",
-    "@statechannels/client-api-schema": "^0.3.0",
+    "@statechannels/client-api-schema": "0.3.0",
     "@statechannels/nitro-protocol": "^0.3.0",
     "@statechannels/wallet-core": "^0.3.0",
     "@statechannels/wire-format": "^0.3.0",
@@ -38,13 +38,14 @@
     "babel-preset-react-app": "9.1.0",
     "css-loader": "3.4.2",
     "dexie": "3.0.0",
-    "ethers": "5.0.7",
+    "ethers": "5.5.0",
     "eventemitter3": "4.0.0",
     "file-loader": "5.0.2",
     "filter-async-rxjs-pipe": "0.1.5",
     "fork-ts-checker-webpack-plugin": "1.5.0",
     "git-revision-webpack-plugin": "3.0.6",
     "guid-typescript": "1.0.9",
+    "webpack-dev-server": "^3.11.0",
     "html-webpack-plugin": "4.0.0-beta.5",
     "jsonrpc-lite": "2.1.0",
     "mini-css-extract-plugin": "0.9.0",
@@ -72,7 +73,6 @@
     "url-loader": "3.0.0",
     "url-parse": "1.4.7",
     "webpack": "4.41.5",
-    "webpack-dev-server": "^3.11.0",
     "webpack-manifest-plugin": "2.2.0",
     "webpack-merge": "4.2.2",
     "workbox-webpack-plugin": "5.0.0",

packages/xstate-wallet/scripts/start.js

@@ -53,7 +53,11 @@ void (async () => {
   });
 
   process.env.TARGET_NETWORK = getNetworkName(process.env.CHAIN_NETWORK_ID);
-
+  // TODO: Devtools doesn't support hyperspace yet
+  if (Number(process.env.CHAIN_NETWORK_ID) === 3141) {
+    process.env.TARGET_NETWORK = 'hyperspace';
+    console.log("Using 'hyperspace' as the target network");
+  }
   if (process.env.TARGET_NETWORK === 'development') {
     // Add contract addresses to process.env if running ganache
     const {deployer} = await await setupGanache(process.env.XSTATE_WALLET_DEPLOYER_ACCOUNT_INDEX);

packages/xstate-wallet/src/chain.ts

@@ -347,7 +347,7 @@ export class ChainWatcher implements Chain {
 
     const response = await this.signer.sendTransaction({
       ...convertNitroTransactionRequest(transactionRequest),
-      gasPrice: GAS_PRICE
+      maxPriorityFeePerGas: GAS_PRICE
     });
     return response.hash;
   }
@@ -369,7 +369,7 @@ export class ChainWatcher implements Chain {
     };
     const response = await this.signer.sendTransaction({
       ...convertNitroTransactionRequest(transactionRequest),
-      gasPrice: GAS_PRICE
+      maxPriorityFeePerGas: GAS_PRICE
     });
     const tx = await response.wait();
     return tx.transactionHash;
@@ -497,10 +497,7 @@ export class ChainWatcher implements Chain {
 function convertNitroTransactionRequest(nitroTransactionRequest): TransactionRequest {
   return {
     ...nitroTransactionRequest,
-    gasLimit: nitroTransactionRequest.gasLimit
-      ? BN.from(nitroTransactionRequest.gasLimit)
-      : undefined,
-    gasPrice: nitroTransactionRequest.gasPrice
+    maxPriorityFeePerGas: nitroTransactionRequest.gasPrice
       ? BN.from(nitroTransactionRequest.gasPrice)
       : undefined,
     nonce: nitroTransactionRequest.nonce ? BN.from(nitroTransactionRequest.nonce) : undefined,

packages/xstate-wallet/src/config.ts

@@ -1,5 +1,5 @@
-import {AddressZero} from '@ethersproject/constants';
-import {Destination} from '@statechannels/wallet-core';
+import { AddressZero } from '@ethersproject/constants';
+import { Destination } from '@statechannels/wallet-core';
 
 // TODO: Use getEnvBool from devtools once working
 function getBool(val: string | undefined): boolean {
@@ -71,3 +71,5 @@ export const HUB = {
 export const TARGET_NETWORK = process.env.TARGET_NETWORK || 'development';
 export const FAUCET_LINK =
   TARGET_NETWORK === 'goerli' ? 'https://goerli-faucet.slock.it/' : 'https://faucet.ropsten.be/';
+
+export const RPC_ENDPOINT = process.env.RPC_ENDPOINT;

packages/xstate-wallet/src/integration-tests/helpers.ts

@@ -181,7 +181,7 @@ export function generatePlayerUpdate(
     jsonrpc: '2.0',
     params: {
       channelId,
-      appData: '0x0',
+      appData: '0x00',
       allocations: [
         {
           token: hexZeroPad('0x0', 32),
@@ -231,7 +231,7 @@ export function generateCreateChannelRequest(
         }
       ],
       appDefinition: '0x430869383d611bBB1ce7Ca207024E7901bC26b40',
-      appData: '0x0',
+      appData: '0x00',
       fundingStrategy: 'Direct'
     }
   };
@@ -264,7 +264,7 @@ export function generateCloseAndWithdrawRequest(
     id: 88888888,
     method: 'CloseAndWithdraw',
     params: {
-      hubParticipantId: hub.participantId
-    }
+      playerParticipantId: player.participantId,
+      hub: hub,}
   };
 }