Skip to content
This repository has been archived by the owner on May 28, 2021. It is now read-only.

Commit

Permalink
Deploy indra-4.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Rahul Sethuram committed Jan 31, 2020
2 parents 48d6b76 + fc86469 commit 480375e
Show file tree
Hide file tree
Showing 48 changed files with 602 additions and 311 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
"@typescript-eslint/no-unused-expressions": "off",
"comma-dangle": ["error", "only-multiline"],
indent: ["error", 2],
"max-len": ["warn", { code: 100, ignoreTemplateLiterals: true }],
"max-len": ["warn", { code: 120, ignoreTemplateLiterals: true }],
"no-async-promise-executor": "off",
"no-undef": ["error"],
"no-unused-vars": ["error"],
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/cd-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
- run: make test-backwards-compatibility

test-daicard:
runs-on: ubuntu-latest
runs-on: ubuntu-16.04
needs: [build]
steps:
- uses: actions/checkout@v1
Expand All @@ -119,7 +119,8 @@ jobs:
INDRA_ADMIN_TOKEN: ${{ secrets.INDRA_ADMIN_TOKEN }}
RINKEBY_DOMAINNAME: rinkeby.indra.connext.network
RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
needs: [test-cf, test-client, test-contracts, test-integration, test-node, test-ssh]
# needs: [test-backwards-compatibility, test-cf, test-client, test-contracts, test-daicard, test-integration, test-node, test-ssh]
needs: [test-cf, test-client, test-contracts, test-daicard, test-integration, test-node, test-ssh]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
Expand All @@ -145,7 +146,8 @@ jobs:
INDRA_ADMIN_TOKEN: ${{ secrets.INDRA_ADMIN_TOKEN }}
MAINNET_DOMAINNAME: indra.connext.network
MAINNET_ETH_PROVIDER: ${{ secrets.MAINNET_ETH_PROVIDER }}
needs: [test-cf, test-client, test-contracts, test-integration, test-node, test-ssh]
# needs: [test-backwards-compatibility, test-cf, test-client, test-contracts, test-daicard, test-integration, test-node, test-ssh]
needs: [test-cf, test-client, test-contracts, test-daicard, test-integration, test-node, test-ssh]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
- run: make test-backwards-compatibility

test-daicard:
runs-on: ubuntu-latest
runs-on: ubuntu-16.04
needs: [build]
steps:
- uses: actions/checkout@v1
Expand All @@ -111,7 +111,7 @@ jobs:
env:
RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
STAGING_DOMAINNAME: staging.indra.connext.network
needs: [test-cf, test-client, test-contracts, test-integration, test-node, test-ssh]
needs: [test-cf, test-client, test-contracts, test-daicard, test-integration, test-node, test-ssh]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
- run: make test-backwards-compatibility

test-daicard:
runs-on: ubuntu-latest
runs-on: ubuntu-16.04
needs: [build]
steps:
- uses: actions/checkout@v1
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ make start

Beware! The first time `make start` is run, it will take a very long time (maybe as long as 5 minutes depending on your internet speed) but have no fear: downloads will be cached & most build steps won't ever need to be repeated again so subsequent `make start` runs will go much more quickly. Get this started asap & browse the rest of the README while the first build/deploy completes.

### Interacting with your Local Node
You can interact with the node by browsing to our reference implementation, the Dai Card, available at `localhost:3000`.

Note that the local node runs on a local blockchain (ganache) in a docker container. To test your node, point a wallet to your local chain at `localhost:8545` and then recover the following "sugar daddy" mnemonic:

`candy maple cake sugar pudding cream honey rich smooth crumble sweet treat`

Then, try sending some Eth to the Dai Card's deposit address (top left of the app).

### Useful Commands

- `make start`: Builds everything & then starts the app
Expand Down
4 changes: 2 additions & 2 deletions modules/cf-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@connext/cf-core",
"version": "4.0.6",
"version": "4.0.8",
"main": "dist/src/index.js",
"iife": "dist/src/index.iife.js",
"types": "dist/src/index.d.ts",
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"@connext/contracts": "1.0.4",
"@connext/types": "4.0.6",
"@connext/types": "4.0.8",
"ethers": "4.0.41",
"eventemitter3": "4.0.0",
"loglevel": "1.6.6",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { jsonRpcMethod } from "rpc-server";

import { RequestHandler } from "../../../request-handler";
import { CFCoreTypes, AppInstanceJson, ProtocolTypes } from "../../../types";
import { CFCoreTypes, ProtocolTypes } from "../../../types";
import { NodeController } from "../../controller";
import { StateChannel } from "../../../models";
import { prettyPrintObject } from "../../../utils";

/**
* Gets all installed appInstances across all of the channels open on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ export default class ProposeInstallController extends NodeController {

const {
proposedToIdentifier,
initiatorDeposit,
responderDeposit,
initiatorDepositTokenAddress: initiatorDepositTokenAddressParam,
responderDepositTokenAddress: responderDepositTokenAddressParam
} = params;
Expand Down Expand Up @@ -97,25 +95,6 @@ export default class ProposeInstallController extends NodeController {
proposedToIdentifier
);

// NOTE: will not fail if there is no free balance class. there is
// no free balance in the case of a channel between virtual
// participants
assertSufficientFundsWithinFreeBalance(
stateChannel,
myIdentifier,
initiatorDepositTokenAddress,
initiatorDeposit
);

// NOTE: will not fail if there is no free balance class. there is
// no free balance in the case of a channel between virtual
// participants
assertSufficientFundsWithinFreeBalance(
stateChannel,
proposedToIdentifier,
responderDepositTokenAddress,
responderDeposit
);

params.initiatorDepositTokenAddress = initiatorDepositTokenAddress;
params.responderDepositTokenAddress = responderDepositTokenAddress;
Expand Down
Loading

0 comments on commit 480375e

Please sign in to comment.