Skip to content

Commit

Permalink
Merge pull request #1617 from OriginTrail/prerelease/testnet
Browse files Browse the repository at this point in the history
OriginTrail Testnet Release v5.1.1
  • Loading branch information
djordjekovac authored Aug 20, 2021
2 parents d22a85d + b4483c5 commit b1ef68b
Show file tree
Hide file tree
Showing 117 changed files with 581,020 additions and 214 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/TEST-truffle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ jobs:
- run: sudo ./setup_arangodb.sh
- run: cp .origintrail_noderc.travis .origintrail_noderc
- run: npm run ganache > $ARTIFACTS_DIR/run-ganache1.log & npm run truffle:test:ethr > $ARTIFACTS_DIR/truffle-test-ethr.log;
- run: npm run ganache > $ARTIFACTS_DIR/run-ganache1.log & npm run truffle:test:otpc > $ARTIFACTS_DIR/truffle-test-otpc.log;
- run: npm run ganache > $ARTIFACTS_DIR/run-ganache2.log & npm run truffle:deploy:ethr:ganache > $ARTIFACTS_DIR/truffle-migrate-ethr.log;
- run: npm run ganache > $ARTIFACTS_DIR/run-ganache2.log & npm run truffle:deploy:otpc:ganache > $ARTIFACTS_DIR/truffle-migrate-otpc.log;
- uses: actions/upload-artifact@v2
if: ${{ always() }}
with:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ The key issues OriginTrail tackles are:

The OriginTrail Ecosystem is built on 3 main pillars:

###Neutrality
### Neutrality

Being an open-source, decentralized system, based on open global standards, neutrality is crucial for the OriginTrail ecosystem as it prevents vendor lock-ins, ensures integrity, and effectively breaks data silos. Neutrality means adopting co-creation principles, working with other blockchain ecosystems and solutions builders even as they may be competing in the same market on the application level.

###Usability
### Usability

Both blockchain environments, as well as OriginTrail, are fundamental technologies. In order to ensure the onboarding of enterprises, there needs to be a great focus on enhancing the user experience, as solutions need to meet the expectations of rapid value generation.

###Inclusiveness
### Inclusiveness

Continuing to form partnerships with technological and business global leaders that can employ the OriginTrail ecosystem for their communities. Catering to the needs of leading global communities requires us to be making strides in designing technical infrastructure and business models that support the adoption of the OriginTrail in diverse business communities.

Expand Down
60 changes: 44 additions & 16 deletions config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"database": "origintrail-develop",
"host": "localhost",
"max_path_length": 1000,
"engine_folder_path": "/var/lib/arangodb3/engine-rocksdb",
"replication_info": {
"endpoint": "",
"username": "",
Expand Down Expand Up @@ -99,19 +100,6 @@
"node_private_key": "",
"management_wallet": "",
"plugins": []
},
{
"blockchain_title": "xDai",
"network_id": "xdai:testnet",
"rpc_server_url": "https://xdai.poanetwork.dev",
"hub_contract_address": "0x17324BdB37c607c0742e95eFc98973221E1eB9b4",
"identity_filepath": "xdai_erc725_identity.json",
"gas_limit": "2000000",
"gas_price": "1000000000",
"dc_price_factor" : "3",
"dh_price_factor" : "2",
"trac_price_in_base_currency" : "0.4",
"plugins": []
}
]
},
Expand Down Expand Up @@ -181,7 +169,11 @@
"dataset_pruning": {
"enabled": false,
"imported_pruning_delay_in_minutes": 1440,
"replicated_pruning_delay_in_minutes": 1440
"replicated_pruning_delay_in_minutes": 1440,
"low_estimated_value_datasets": {
"enabled": false,
"minimum_free_space_percentage": 50
}
}
},
"testnet": {
Expand Down Expand Up @@ -230,6 +222,7 @@
"database": "origintrail",
"host": "localhost",
"max_path_length": 1000,
"engine_folder_path": "/var/lib/arangodb3/engine-rocksdb",
"replication_info": {
"endpoint": "",
"username": "",
Expand Down Expand Up @@ -309,6 +302,19 @@
"dh_price_factor" : "2",
"trac_price_in_base_currency" : "0.4"
},
{
"blockchain_title": "Polygon",
"network_id": "polygon:testnet",
"rpc_server_url": "https://rpc-mumbai.matic.today",
"chain_id": 80001,
"hub_contract_address": "0x819deeadF9c4a1d5199435Fa195ff7824CCd687e",
"identity_filepath": "polygon_erc725_identity.json",
"gas_limit": "2000000",
"gas_price": "1000000000",
"dc_price_factor" : "3",
"dh_price_factor" : "2",
"trac_price_in_base_currency" : "0.4"
},
{
"blockchain_title": "OriginTrail-Parachain",
"network_id": "parachain:testnet",
Expand Down Expand Up @@ -395,7 +401,11 @@
"dataset_pruning": {
"enabled": false,
"imported_pruning_delay_in_minutes": 1440,
"replicated_pruning_delay_in_minutes": 1440
"replicated_pruning_delay_in_minutes": 1440,
"low_estimated_value_datasets": {
"enabled": false,
"minimum_free_space_percentage": 50
}
}
},
"mainnet": {
Expand Down Expand Up @@ -444,6 +454,7 @@
"database": "origintrail",
"host": "localhost",
"max_path_length": 1000,
"engine_folder_path": "/var/lib/arangodb3/engine-rocksdb",
"replication_info": {
"endpoint": "10.1.0.5",
"username": "root",
Expand Down Expand Up @@ -494,6 +505,19 @@
"dh_price_factor" : "2",
"trac_price_in_base_currency" : "0.4"
},
{
"blockchain_title": "Polygon",
"network_id": "polygon:mainnet",
"rpc_server_url": "https://rpc-mainnet.matic.network",
"chain_id": 137,
"hub_contract_address": "",
"identity_filepath": "polygon_erc725_identity.json",
"gas_limit": "2000000",
"gas_price": "1000000000",
"dc_price_factor" : "3",
"dh_price_factor" : "2",
"trac_price_in_base_currency" : "0.4"
},
{
"blockchain_title": "OriginTrail-Parachain",
"network_id": "parachain:mainnet",
Expand Down Expand Up @@ -580,7 +604,11 @@
"dataset_pruning": {
"enabled": false,
"imported_pruning_delay_in_minutes": 1440,
"replicated_pruning_delay_in_minutes": 1440
"replicated_pruning_delay_in_minutes": 1440,
"low_estimated_value_datasets": {
"enabled": false,
"minimum_free_space_percentage": 50
}
}
}
}
8 changes: 6 additions & 2 deletions modules/Blockchain.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const Ethereum = require('./Blockchain/Ethereum');
const XDai = require('./Blockchain/XDai');
const Polygon = require('./Blockchain/Polygon');
const OriginTrailParachain = require('./Blockchain/OriginTrailParachain');
const uuidv4 = require('uuid/v4');
const Op = require('sequelize/lib/operators');
Expand Down Expand Up @@ -41,6 +42,9 @@ class Blockchain {
case constants.BLOCKCHAIN_TITLE.XDai:
this.blockchain[i] = new XDai(ctx, implementation_configuration);
break;
case constants.BLOCKCHAIN_TITLE.Polygon:
this.blockchain[i] = new Polygon(ctx, implementation_configuration);
break;
case constants.BLOCKCHAIN_TITLE.OriginTrailParachain:
this.blockchain[i] = new OriginTrailParachain(ctx, implementation_configuration);
break;
Expand All @@ -56,7 +60,7 @@ class Blockchain {
* Initialize Blockchain provider
* @returns {Promise<void>}
*/
async loadContracts() {
async loadContracts(subscribeToContractsChangedEvents = true) {
try {
const promises = [];

Expand All @@ -70,7 +74,7 @@ class Blockchain {
throw e;
}

if (!this.initalized) {
if (!this.initalized && subscribeToContractsChangedEvents) {
this.initalized = true;
this.subscribeToEventPermanentWithCallback([
'ContractsChanged',
Expand Down
6 changes: 0 additions & 6 deletions modules/Blockchain/Ethereum/desktop.ini

This file was deleted.

Loading

0 comments on commit b1ef68b

Please sign in to comment.