Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Devnet Release 6.5.1+hotfix.2 #3275

Merged
merged 6 commits into from
Sep 9, 2024
Merged

Devnet Release 6.5.1+hotfix.2 #3275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7afb42
OriginTrail Devnet Prerelease v6.5.1 (#3261)
Mihajlo-Pavlovic Jul 19, 2024
9228fc1
OriginTrail Devnet Prerelease v6.5.1 Hotfix 1 (#3268)
Mihajlo-Pavlovic Aug 1, 2024
e7eb866
Merge branch 'v6/development-network' into v6/prerelease/devnet
Mihajlo-Pavlovic Aug 1, 2024
6b9592e
Devnet Prerelease 6.5.1+hotfix.2 (#3273)
Mihajlo-Pavlovic Sep 9, 2024
1939ce7
Merge branch 'v6/development-network' into v6/prerelease/devnet
Mihajlo-Pavlovic Sep 9, 2024
208c429
Fix package-lock
Mihajlo-Pavlovic Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 42 additions & 11 deletions installer/data/template/.origintrail_noderc_one_click_mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,69 @@
{
"modules":{
"network": {
"implementation": {
"libp2p-service": {
"config": {
"nat": {
"enabled": true,
"externalIp": "<node_static_ip_address>"
}
}
}
}
},
"blockchain":{
"implementation":{
"otp:2043":{
"enabled":true,
"config":{
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
]
}
},
"gnosis:100":{
"enabled":true,
"config":{
"operatorFee": <node_operator_fee>,
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"rpcEndpoints":[
"<gnosis_rpc_endpoint>"
],
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
]
}
},
"base:8453":{
"enabled":true,
"config":{
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
],
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"rpcEndpoints":[
"<base_rpc_endpoint>"
]
}
}
}
},
Expand Down
53 changes: 42 additions & 11 deletions installer/data/template/.origintrail_noderc_one_click_testnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,69 @@
{
"modules":{
"network": {
"implementation": {
"libp2p-service": {
"config": {
"nat": {
"enabled": true,
"externalIp": "<node_static_ip_address>"
}
}
}
}
},
"blockchain":{
"implementation":{
"otp:20430":{
"enabled":true,
"config":{
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
]
}
},
"gnosis:10200":{
"enabled":true,
"config":{
"operatorFee": <node_operator_fee>,
"sharesTokenSymbol":"<shares_token_symbol>",
"sharesTokenName":"<shares_token_name>",
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"rpcEndpoints":[
"<gnosis_rpc_endpoint>"
],
"evmManagementWalletPublicKey":"<emv_management_key_public_key>",
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<evm_operational_key_public_key>",
"privateKey":"<evm_operational_key_private_key>"
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
]
}
},
"base:84532":{
"enabled":true,
"config":{
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
],
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"rpcEndpoints":[
"<base_rpc_endpoint>"
]
}
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "origintrail_node",
"version": "6.5.1+hotfix.1",
"version": "6.5.1+hotfix.2",
"description": "OTNode V6",
"main": "index.js",
"type": "module",
Expand Down
7 changes: 5 additions & 2 deletions src/constants/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,11 @@ export const COMMAND_TX_GAS_INCREASE_FACTORS = {
};

export const CONTRACT_FUNCTION_GAS_LIMIT_INCREASE_FACTORS = {
'submitUpdateCommit((address,uint256,bytes,uint8,uint16,uint72,uint72,uint72))': 1.2,
'submitUpdateCommit((address,uint256,bytes,uint8,uint16))': 1.2,
sendProof: 2,
'submitCommit((address,uint256,bytes,uint8,uint16))': 2,
'submitCommit((address,uint256,bytes,uint8,uint16,uint72,uint72,uint72))': 2,
'submitUpdateCommit((address,uint256,bytes,uint8,uint16,uint72,uint72,uint72))': 2,
'submitUpdateCommit((address,uint256,bytes,uint8,uint16))': 2,
};

export const GNOSIS_DEFAULT_GAS_PRICE = {
Expand Down
Loading