Skip to content

Commit

Permalink
Merge pull request #3123 from OriginTrail/v6/prerelease/mainnet
Browse files Browse the repository at this point in the history
OriginTrail Mainnet Release v6.2.4
  • Loading branch information
djordjekovac committed Apr 10, 2024
2 parents 85b272d + b2d6afb commit 830f4cc
Show file tree
Hide file tree
Showing 12 changed files with 413 additions and 60 deletions.
38 changes: 31 additions & 7 deletions config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@
"package": "./network/implementation/libp2p-service.js",
"config": {
"dht": {
"kBucketSize": 20,
"type": "dual"
"kBucketSize": 20
},
"nat": {
"enabled": false,
"externalIp": null
},
"connectionManager": {
"autoDial": true,
Expand Down Expand Up @@ -161,7 +164,8 @@
"tokenBasedAuthEnabled": false,
"loggingEnabled": true,
"ipWhitelist": ["::1", "127.0.0.1"],
"publicOperations": []
"publicOperations": [],
"bothIpAndTokenAuthRequired": false
}
},
"test": {
Expand Down Expand Up @@ -206,6 +210,10 @@
"dht": {
"kBucketSize": 20
},
"nat": {
"enabled": false,
"externalIp": null
},
"connectionManager": {
"autoDial": true,
"autoDialInterval": 10e3,
Expand Down Expand Up @@ -314,7 +322,8 @@
"tokenBasedAuthEnabled": false,
"loggingEnabled": true,
"ipWhitelist": ["::1", "127.0.0.1"],
"publicOperations": []
"publicOperations": [],
"bothIpAndTokenAuthRequired": false
}
},
"testnet": {
Expand All @@ -341,6 +350,10 @@
"dht": {
"kBucketSize": 20
},
"nat": {
"enabled": true,
"externalIp": null
},
"connectionManager": {
"autoDial": true,
"autoDialInterval": 10e3,
Expand Down Expand Up @@ -480,7 +493,8 @@
"tokenBasedAuthEnabled": false,
"loggingEnabled": true,
"ipWhitelist": ["::1", "127.0.0.1"],
"publicOperations": []
"publicOperations": [],
"bothIpAndTokenAuthRequired": false
}
},
"devnet": {
Expand All @@ -507,6 +521,10 @@
"dht": {
"kBucketSize": 20
},
"nat": {
"enabled": true,
"externalIp": null
},
"connectionManager": {
"autoDial": true,
"autoDialInterval": 10e3,
Expand Down Expand Up @@ -646,7 +664,8 @@
"tokenBasedAuthEnabled": false,
"loggingEnabled": true,
"ipWhitelist": ["::1", "127.0.0.1"],
"publicOperations": []
"publicOperations": [],
"bothIpAndTokenAuthRequired": false
}
},
"mainnet": {
Expand All @@ -673,6 +692,10 @@
"dht": {
"kBucketSize": 20
},
"nat": {
"enabled": true,
"externalIp": null
},
"connectionManager": {
"autoDial": true,
"autoDialInterval": 10e3,
Expand Down Expand Up @@ -812,7 +835,8 @@
"tokenBasedAuthEnabled": false,
"loggingEnabled": true,
"ipWhitelist": ["::1", "127.0.0.1"],
"publicOperations": []
"publicOperations": [],
"bothIpAndTokenAuthRequired": false
}
}
}
82 changes: 82 additions & 0 deletions installer/data/template/.origintrail_noderc_one_click_mainnet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"modules":{
"blockchain":{
"implementation":{
"otp:2043":{
"enabled":true,
"config":{
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
}
]
}
},
"gnosis:100":{
"enabled":true,
"config":{
"operatorFee": <node_operator_fee>,
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"rpcEndpoints":[
"<gnosis_rpc_endpoint>"
],
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
}
]
}
}
}
},
"tripleStore":{
"implementation":{
"ot-blazegraph":{
"enabled":true,
"package":"./triple-store/implementation/ot-blazegraph/ot-blazegraph.js",
"config":{
"repositories":{
"privateCurrent":{
"url":"http://localhost:9999",
"name":"private-current",
"username":"admin",
"password":""
},
"privateHistory":{
"url":"http://localhost:9999",
"name":"private-history",
"username":"admin",
"password":""
},
"publicCurrent":{
"url":"http://localhost:9999",
"name":"public-current",
"username":"admin",
"password":""
},
"publicHistory":{
"url":"http://localhost:9999",
"name":"public-history",
"username":"admin",
"password":""
}
}
}
}
}
}
},
"auth":{
"ipWhitelist":[
"::1",
"127.0.0.1"
]
}
}
105 changes: 66 additions & 39 deletions installer/data/template/.origintrail_noderc_one_click_testnet.json
Original file line number Diff line number Diff line change
@@ -1,55 +1,82 @@
{
"modules": {
"blockchain": {
"defaultImplementation": "otp",
"implementation": {
"otp": {
"config": {
"sharesTokenSymbol": "<SHARES_TOKEN_SYMBOL>",
"sharesTokenName": "<SHARES_TOKEN_NAME>",
"evmOperationalWalletPublicKey": "<EVM_OPERATIONAL_WALLET>",
"evmOperationalWalletPrivateKey": "<EVM_OPERATIONAL_WALLET_PRIVATE_KEY>",
"evmManagementWalletPrivateKey": "<EVM_MANAGEMENT_WALLET_PRIVATE_KEY>",
"evmManagementWalletPublicKey": "<EVM_MANAGEMENT_WALLET>"
"modules":{
"blockchain":{
"implementation":{
"otp:20430":{
"enabled":true,
"config":{
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
}
]
}
},
"gnosis:10200":{
"enabled":true,
"config":{
"operatorFee": <node_operator_fee>,
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"rpcEndpoints":[
"<gnosis_rpc_endpoint>"
],
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
}
]
}
}
}
},
"tripleStore": {
"implementation": {
"ot-blazegraph": {
"enabled": true,
"package": "./triple-store/implementation/ot-blazegraph/ot-blazegraph.js",
"config": {
"repositories": {
"privateCurrent": {
"url": "http://localhost:9999",
"name": "private-current",
"username": "admin",
"password": ""
"tripleStore":{
"implementation":{
"ot-blazegraph":{
"enabled":true,
"package":"./triple-store/implementation/ot-blazegraph/ot-blazegraph.js",
"config":{
"repositories":{
"privateCurrent":{
"url":"http://localhost:9999",
"name":"private-current",
"username":"admin",
"password":""
},
"privateHistory": {
"url": "http://localhost:9999",
"name": "private-history",
"username": "admin",
"password": ""
"privateHistory":{
"url":"http://localhost:9999",
"name":"private-history",
"username":"admin",
"password":""
},
"publicCurrent": {
"url": "http://localhost:9999",
"name": "public-current",
"username": "admin",
"password": ""
"publicCurrent":{
"url":"http://localhost:9999",
"name":"public-current",
"username":"admin",
"password":""
},
"publicHistory": {
"url": "http://localhost:9999",
"name": "public-history",
"username": "admin",
"password": ""
"publicHistory":{
"url":"http://localhost:9999",
"name":"public-history",
"username":"admin",
"password":""
}
}
}
}
}
}
},
"auth":{
"ipWhitelist":[
"::1",
"127.0.0.1"
]
}
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "origintrail_node",
"version": "6.2.3",
"version": "6.2.4",
"description": "OTNode V6",
"main": "index.js",
"type": "module",
Expand Down
Loading

0 comments on commit 830f4cc

Please sign in to comment.