Skip to content

Commit

Permalink
added defaultConfig.json
Browse files Browse the repository at this point in the history
  • Loading branch information
@simon-jentzsch
simon-jentzsch committed Nov 14, 2018
1 parent 1186eb6 commit b8f67ae
Show file tree
Hide file tree
Showing 6 changed files with 221 additions and 142 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"main": "js/src/index.js",
"scripts": {
"docu": "typedoc --exclude test --excludePrivate --readme none --ignoreCompilerErrors --target ES6 --mode 'modules' --json doc.json src/index.ts ; cat doc.json | slockit-docu index slockit/in3/blob/master/src \"# INCUBED API\n\nThis documentation contains a list of all Datastructures and Classes used within the IN3 Client.\n\" > doc/README.md ; rm doc.json",
"build": "tsc -p .",
"build": "tsc -p .; cp src/client/defaultConfig.json js/src/client/",
"test": "nyc mocha --timeout 5000 -R $(pwd)/js/test/util/mochaReporter --require ts-node/register --require source-map-support/register --full-trace --bail test/*.ts && cp -r coverage test/report/",
"updateTypes": "slockit-types ",
"browserify": "echo '{}' > node_modules/ethereum-common/genesisState.json; cd js; browserify --full-paths -r ./src/client/Client.js:in3 -t [ babelify --presets [ \"@babel/preset-es2015\" ] ] -o in3.js; uglifyjs --compress --source-map --output in3.min.js -- in3.js; cd ..",
"disc": "cd js; discify in3.js > in3.html; cd ..",
"cmd": "node --inspect --experimental-repl-await -e \"axios=require('axios').default;in3=require('./js/src/index');Client=in3.default\" -i"
"cmd": "node --inspect -e \"axios=require('axios').default;in3=require('./js/src/index');Client=in3.default;c=new Client()\" -i"
},
"nyc": {
"include": [
Expand Down
109 changes: 3 additions & 106 deletions src/client/Client.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { EventEmitter } from 'events'
import Cache from './cache'
import { adjustConfig } from './configHandler'
import axios from 'axios'
const defaultConfig = require('./defaultConfig.json')


/**
Expand All @@ -55,114 +56,10 @@ export default class Client extends EventEmitter {
this.addListener('beforeRequest', adjustConfig)
this.transport = transport || new AxiosTransport(config.format || 'json')
this.defConfig = {
proof: 'none',
signatureCount: 0,
minDeposit: 0,
autoUpdateList: true,
requestCount: 3,
loggerUrl: 'https://search-test-usn.slock.it/logIn3',
chainId: '0x1',
mainChain: '0x2a',
chainRegistry: '0x53d02daE1253CDf7C9b93a6ED0462d97697C85F9',
...defaultConfig,
...config,
servers: {
'0x1': { // mainnet
needsUpdate: true,
contractChain: '0x1',
contract: '0x2736D225f85740f42D17987100dc8d58e9e16252',
nodeList: [
{
deposit: 0,
chainIds: ['0x1'],
address: '0x8f354b72856e516f1e931c97d1ed3bf1709f38c9',
url: 'https://in3.slock.it/mainnet/nd-3',
props: 65535
},
{
deposit: 0,
chainIds: ['0x1'],
address: '0x243D5BB48A47bEd0F6A89B61E4660540E856A33D',
url: 'https://in3.slock.it/mainnet/nd-5',
props: 65535
}
]
},
'0x44d': { // tobalaba
needsUpdate: true,
contractChain: '0x44d',
contract: '0x845E484b505443814B992Bf0319A5e8F5e407879',
nodeList: [
{
deposit: 0,
chainIds: ['0x44d'],
address: '0x8f354b72856e516f1e931c97d1ed3bf1709f38c9',
url: 'https://in3.slock.it/tobalaba/nd-3',
props: 65535
},
{
deposit: 0,
chainIds: ['0x44d'],
address: '0x243D5BB48A47bEd0F6A89B61E4660540E856A33D',
url: 'https://in3.slock.it/tobalaba/nd-5',
props: 65535
} ]
},
'0x4b1': { // evan
needsUpdate: true,
contractChain: '0x4b1',
contract: '0x85613723dB1Bc29f332A37EeF10b61F8a4225c7e',
nodeList: [
{
deposit: 0,
chainIds: ['0x4b1'],
address: '0xeaC4B82273e828878fD765D993800891bA2E3475',
url: 'http://52.47.61.24:8500',
props: 65535
},
{
deposit: 0,
chainIds: ['0x4b1'],
address: '0x243D5BB48A47bEd0F6A89B61E4660540E856A33A',
url: 'https://in3.slock.it/evan/nd-5',
props: 65535
}
]
},
'0x2a': { // kovan
needsUpdate: true,
contractChain: '0x2a',
contract: '0x27a37a1210df14f7e058393d026e2fb53b7cf8c1',
nodeList: [
{
deposit: 0,
chainIds: ['0x2a'],
address: '0x8f354b72856e516f1e931c97d1ed3bf1709f38c9',
url: 'https://in3.slock.it/kovan/nd-3',
props: 65535
},
{
deposit: 0,
chainIds: ['0x2a'],
address: '0x243D5BB48A47bEd0F6A89B61E4660540E856A33D',
url: 'https://in3.slock.it/kovan/nd-5',
props: 65535
}
]
},
'0x7d0': { // ipfs
needsUpdate: true,
contractChain: '0x7d0',
contract: '0xf0fb87f4757c77ea3416afe87f36acaa0496c7e9',
nodeList: [
{
deposit: 0,
chainIds: ['0x7d0'],
address: '0x784bfa9eb182c3a02dbeb5285e3dba92d717e07a',
url: 'https://in3.slock.it/ipfs/nd-1',
props: 65535
}
]
},
...defaultConfig.servers,
...((config && config.servers) || {})
}
}
Expand Down
134 changes: 134 additions & 0 deletions src/client/defaultConfig.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
{
"proof": "none",
"signatureCount": 0,
"minDeposit": 0,
"autoUpdateList": true,
"requestCount": 3,
"loggerUrl": "https://search-test-usn.slock.it/logIn3",
"chainId": "0x1",
"mainChain": "0x2a",
"chainRegistry": "0x53d02daE1253CDf7C9b93a6ED0462d97697C85F9",

"servers": {
"0x1": {
"name":"mainnet",
"needsUpdate": true,
"contractChain": "0x1",
"contract": "0x2736D225f85740f42D17987100dc8d58e9e16252",
"nodeList": [
{
"deposit" :0,
"chainIds" :["0x1"],
"address" :"0x8f354b72856e516f1e931c97d1ed3bf1709f38c9",
"url" :"https://in3.slock.it/mainnet/nd-3",
"props" :65535
},
{
"deposit" :0,
"chainIds" :["0x1"],
"address" :"0x243D5BB48A47bEd0F6A89B61E4660540E856A33D",
"url" :"https://in3.slock.it/mainnet/nd-5",
"props" :65535
}
]
},
"0x44d" :{
"name":"tobalaba",
"chainSpec":{
"engine":"authorityRound",
"validatorContract":"0x1000000000000000000000000000000000000005"
},
"needsUpdate" :true,
"contractChain" :"0x44d",
"contract" :"0x845E484b505443814B992Bf0319A5e8F5e407879",
"nodeList" :[
{
"deposit" :0,
"chainIds" :["0x44d"],
"address" :"0x8f354b72856e516f1e931c97d1ed3bf1709f38c9",
"url" :"https://in3.slock.it/tobalaba/nd-3",
"props" :65535
},
{
"deposit" :0,
"chainIds" :["0x44d"],
"address" :"0x243D5BB48A47bEd0F6A89B61E4660540E856A33D",
"url" :"https://in3.slock.it/tobalaba/nd-5",
"props" :65535
} ]
},
"0x4b1" :{
"name":"evan",
"needsUpdate" :true,
"contractChain" :"0x4b1",
"contract" :"0x85613723dB1Bc29f332A37EeF10b61F8a4225c7e",
"nodeList" :[
{
"deposit" :0,
"chainIds" :["0x4b1"],
"address" :"0xeaC4B82273e828878fD765D993800891bA2E3475",
"url" :"http://52.47.61.24:8500",
"props" :65535
},
{
"deposit" :0,
"chainIds" :["0x4b1"],
"address" :"0x243D5BB48A47bEd0F6A89B61E4660540E856A33A",
"url" :"https://in3.slock.it/evan/nd-5",
"props" :65535
}
]
},
"0x2a" :{
"name":"kovan",
"chainSpec":{
"engine":"authorityRound",
"validatorList":[
"0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
"0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
"0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
"0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
"0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
"0x00E6d2b931F55a3f1701c7389d592a7778897879",
"0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
]
},
"needsUpdate" :true,
"contractChain" :"0x2a",
"contract" :"0x27a37a1210df14f7e058393d026e2fb53b7cf8c1",
"nodeList" :[
{
"deposit" :0,
"chainIds" :["0x2a"],
"address" :"0x8f354b72856e516f1e931c97d1ed3bf1709f38c9",
"url" :"https://in3.slock.it/kovan/nd-3",
"props" :65535
},
{
"deposit" :0,
"chainIds" :["0x2a"],
"address" :"0x243D5BB48A47bEd0F6A89B61E4660540E856A33D",
"url" :"https://in3.slock.it/kovan/nd-5",
"props" :65535
}
]
},
"0x7d0" :{
"name":"ipfs",
"needsUpdate" :true,
"contractChain" :"0x7d0",
"contract" :"0xf0fb87f4757c77ea3416afe87f36acaa0496c7e9",
"nodeList" :[
{
"deposit" :0,
"chainIds" :["0x7d0"],
"address" :"0x784bfa9eb182c3a02dbeb5285e3dba92d717e07a",
"url" :"https://in3.slock.it/ipfs/nd-1",
"props" :65535
}
]
}
}
}

0 comments on commit b8f67ae

Please sign in to comment.