Skip to content

Commit

Permalink
Merge pull request #1959 from OriginTrail/v6/prerelease/testnet
Browse files Browse the repository at this point in the history
OriginTrail 6.0.0-beta.1.37 Testnet Release
  • Loading branch information
NZT48 authored May 12, 2022
2 parents 5df878b + c2c7c80 commit 4c8718d
Show file tree
Hide file tree
Showing 43 changed files with 40,157 additions and 31,522 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
es6: true,
node: true,
},
extends: ['airbnb', 'prettier'],
extends: ['airbnb/base', 'prettier'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 2017,
Expand All @@ -16,6 +16,7 @@ module.exports = {
'no-restricted-syntax': 0,
'guard-for-in': 0,
'no-console': 'warn',
'no-continue' : 1,
'no-continue': 1,
'no-underscore-dangle': 0,
},
};
10 changes: 5 additions & 5 deletions .github/workflows/TEST-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
test-unit:
#todo think about locking the version - version should be the same as the one in official documentation
runs-on: ubuntu-latest
# services:
services:
# mysql:
# image: mysql:5.7
# env:
Expand All @@ -22,10 +22,10 @@ jobs:
# ports:
# - 3306:3306
# options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
# graphdb:
# image: khaller/graphdb-free:latest
# ports:
# - 7200:7200
graphdb:
image: khaller/graphdb-free:latest
ports:
- 7200:7200
strategy:
matrix:
node-version: [16.x]
Expand Down
46 changes: 25 additions & 21 deletions .origintrail_noderc_example
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
{
"blockchain":[
{
"blockchainTitle": "Polygon",
"networkId": "polygon::testnet",
"rpcEndpoints": ["https://rpc-mumbai.maticvigil.com/"],
"publicKey": "...",
"privateKey": "..."
}
],
"graphDatabase": {
"username": "admin",
"password": ""
},
"logLevel": "trace",
"rpcPort": 8900,
"network": {
},
"ipWhitelist": [
"::1",
"127.0.0.1"
]
"blockchain": [
{
"blockchainTitle": "Polygon",
"networkId": "polygon::testnet",
"rpcEndpoints": [
"https://rpc-mumbai.maticvigil.com/",
"https://matic-mumbai.chainstacklabs.com",
"https://rpc-mumbai.matic.today",
"https://matic-testnet-archive-rpc.bwarelabs.com"
],
"publicKey": "...",
"privateKey": "..."
}
],
"graphDatabase": {
"username": "admin",
"password": ""
},
"logLevel": "trace",
"rpcPort": 8900,
"network": {},
"ipWhitelist": [
"::1",
"127.0.0.1"
]
}
122 changes: 100 additions & 22 deletions config/config.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,39 @@
{
"development": {
"appDataPath": "data",
"autoUpdate": {
"enabled": false,
"branch": "v6/develop",
"backupDirectory": "../backup"
"modules": {
"autoUpdater": {
"enabled": false,
"implementation": {
"ot-auto-updater": {
"package": "./auto-updater/implementation/ot-auto-updater",
"config": {
"branch": "v6/develop"
}
}
}
},
"httpClient": {
"enabled": true,
"implementation": {
"express-http-client": {
"package": "./http-client/implementation/express-http-client",
"config": {}
}
}
}
},
"appDataPath": "data",
"blockchain": [
{
"blockchainTitle": "Polygon",
"networkId": "polygon::mainnet",
"hubContractAddress": "0xFD6ECaed420aB70fb97eB2423780517dc425ef81",
"rpcEndpoints": ["https://rpc-mumbai.maticvigil.com/"]
"rpcEndpoints": [
"https://rpc-mumbai.maticvigil.com/",
"https://matic-mumbai.chainstacklabs.com",
"https://rpc-mumbai.matic.today",
"https://matic-testnet-archive-rpc.bwarelabs.com"
]
}
],
"graphDatabase": {
Expand Down Expand Up @@ -39,12 +61,29 @@
}
},
"test": {
"appDataPath": "data",
"autoUpdate": {
"enabled": false,
"branch": "v6/develop",
"backupDirectory": "../backup"
"modules": {
"autoUpdater": {
"enabled": false,
"implementation": {
"ot-auto-updater": {
"package": "./auto-updater/implementation/ot-auto-updater",
"config": {
"branch": "v6/develop"
}
}
}
},
"httpClient": {
"enabled": true,
"implementation": {
"express-http-client": {
"package": "./http-client/implementation/express-http-client",
"config": {}
}
}
}
},
"appDataPath": "data",
"blockchain": [
{
"blockchainTitle": "ganache",
Expand Down Expand Up @@ -78,18 +117,40 @@
}
},
"testnet": {
"appDataPath": "data",
"autoUpdate": {
"enabled": true,
"branch": "v6/release/testnet",
"backupDirectory": "../backup"
"modules": {
"autoUpdater": {
"enabled": true,
"implementation": {
"ot-auto-updater": {
"package": "./auto-updater/implementation/ot-auto-updater",
"config": {
"branch": "v6/release/testnet"
}
}
}
},
"httpClient": {
"enabled": true,
"implementation": {
"express-http-client": {
"package": "./http-client/implementation/express-http-client",
"config": {}
}
}
}
},
"appDataPath": "data",
"blockchain": [
{
"blockchainTitle": "Polygon",
"networkId": "polygon::testnet",
"hubContractAddress": "0xFD6ECaed420aB70fb97eB2423780517dc425ef81",
"rpcEndpoints": ["https://rpc-mumbai.maticvigil.com/"]
"rpcEndpoints": [
"https://rpc-mumbai.maticvigil.com/",
"https://matic-mumbai.chainstacklabs.com",
"https://rpc-mumbai.matic.today",
"https://matic-testnet-archive-rpc.bwarelabs.com"
]
}
],
"graphDatabase": {
Expand Down Expand Up @@ -121,12 +182,29 @@
}
},
"mainnet": {
"appDataPath": "data",
"autoUpdate": {
"enabled": true,
"branch": "v6/release/mainnet",
"backupDirectory": "../backup"
"modules": {
"autoUpdater": {
"enabled": true,
"implementation": {
"ot-auto-updater": {
"package": "./auto-updater/implementation/ot-auto-updater",
"config": {
"branch": "v6/release/mainnet"
}
}
}
},
"httpClient": {
"enabled": true,
"implementation": {
"express-http-client": {
"package": "./http-client/implementation/express-http-client",
"config": {}
}
}
}
},
"appDataPath": "data",
"blockchain": [],
"graphDatabase": {
"implementation": "GraphDB",
Expand Down
Loading

0 comments on commit 4c8718d

Please sign in to comment.