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.

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

Devnet Release v8.0.0.hotifx+2 #3636

Merged
merged 28 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4239cc6
Mainnet Prerelease 6.5.1+hotfix.2 (#3279)
Mihajlo-Pavlovic Sep 9, 2024
639d6c4
Merge branch 'v6/release/mainnet' into v6/prerelease/mainnet
Mihajlo-Pavlovic Sep 9, 2024
19ff8e8
Mainnet Release 6.5.1+hotfix.2 (#3280)
Mihajlo-Pavlovic Sep 9, 2024
1e32c00
Allow major version update
Mihajlo-Pavlovic Dec 25, 2024
0ec9fd5
Merge branch 'v6/release/mainnet' into v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 25, 2024
a765a74
Merge pull request #3618 from OriginTrail/v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 25, 2024
82859eb
Merge pull request #3623 from OriginTrail/v6/prerelease/testnet
Mihajlo-Pavlovic Dec 26, 2024
f7ff15c
Merge branch 'v6/prerelease/mainnet' into v6/release/testnet
Mihajlo-Pavlovic Dec 26, 2024
62c67b7
Return exitNode
Mihajlo-Pavlovic Dec 26, 2024
8e97da4
Merge pull request #3624 from OriginTrail/v6/release/testnet
Mihajlo-Pavlovic Dec 26, 2024
bb219bd
V8 Mainnet Prerlease hotifx 1
Mihajlo-Pavlovic Dec 26, 2024
9b659e9
V8 Mainnet Prerlease +hotifx 1
Mihajlo-Pavlovic Dec 26, 2024
3f93564
Remove SA table indexes
Mihajlo-Pavlovic Dec 26, 2024
8c96c5a
Version bump
Mihajlo-Pavlovic Dec 26, 2024
f2e23eb
Prepare version for mainnet
Mihajlo-Pavlovic Dec 26, 2024
6f6db55
Merge branch 'v6/release/mainnet' into v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 26, 2024
09c146d
Merge pull request #3625 from OriginTrail/v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 26, 2024
f327bed
Merge pull request #3630 from OriginTrail/v8/release/devnet
Mihajlo-Pavlovic Dec 26, 2024
d76f875
Merge pull request #3626 from OriginTrail/v6/release/mainnet
Mihajlo-Pavlovic Dec 26, 2024
02dbc62
Merge branch 'v6/release/testnet' into v6/prerelease/testnet
Mihajlo-Pavlovic Dec 26, 2024
5b8ad26
Merge pull request #3631 from OriginTrail/v6/prerelease/testnet
Mihajlo-Pavlovic Dec 26, 2024
54999fd
Merge branch 'v6/prerelease/mainnet' into v6/release/testnet
Mihajlo-Pavlovic Dec 26, 2024
50fb1fa
Throw error when implementation is not present in blockchain module
Mihajlo-Pavlovic Dec 27, 2024
eee089b
Fix get for KA
brkagithub Dec 27, 2024
8311163
Merge pull request #3635 from OriginTrail/v8/fix-get-for-kas
Mihajlo-Pavlovic Dec 27, 2024
48116f9
Merge pull request #3634 from OriginTrail/improvment/disable-blockcha…
Mihajlo-Pavlovic Dec 27, 2024
622b54b
Don't call getNextCommand data for each command
Mihajlo-Pavlovic Dec 27, 2024
b41e559
version bump
Mihajlo-Pavlovic Dec 27, 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
113 changes: 113 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,113 @@
{
"modules":{
"network": {
"implementation": {
"libp2p-service": {
"config": {
"nat": {
"enabled": true,
"externalIp": "<node_static_ip_address>"
}
}
}
}
},
"blockchain":{
"implementation":{
"otp:2043":{
"enabled":true,
"config":{
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
]
}
},
"gnosis:100":{
"enabled":true,
"config":{
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"rpcEndpoints":[
"<gnosis_rpc_endpoint>"
],
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"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>"
]
}
}
}
},
"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"
]
}
}
113 changes: 113 additions & 0 deletions installer/data/template/.origintrail_noderc_one_click_testnet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"modules":{
"network": {
"implementation": {
"libp2p-service": {
"config": {
"nat": {
"enabled": true,
"externalIp": "<node_static_ip_address>"
}
}
}
}
},
"blockchain":{
"implementation":{
"otp:20430":{
"enabled":true,
"config":{
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"evmAddress":"<operational_wallet_public_key>",
"privateKey":"<operational_wallet_private_key>"
}
]
}
},
"gnosis:10200":{
"enabled":true,
"config":{
"sharesTokenName":"<node_name>",
"sharesTokenSymbol":"<node_symbol>",
"operatorFee":"<operator_fee>",
"rpcEndpoints":[
"<gnosis_rpc_endpoint>"
],
"evmManagementWalletPublicKey":"<management_wallet_public_key>",
"operationalWallets":[
{
"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>"
]
}
}
}
},
"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"
]
}
}
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": "8.0.0+hotfix.1",
"version": "8.0.0+hotfix.2",
"description": "OTNode V8",
"main": "index.js",
"type": "module",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
currentBatchNodes.length
}, leftover for retry: ${currentBatchLeftoverNodes.length}`,
);
const nextCommandData = this.getNextCommandData(command);
console.log('NEXT COMMAND DATA:', JSON.stringify(nextCommandData, null, 2));

Check warning on line 44 in src/commands/protocols/common/protocol-schedule-messages-command.js

View workflow job for this annotation

GitHub Actions / lint

Unexpected console statement

const addCommandPromises = currentBatchNodes.map(async (node) => {
const commandSequence = this.protocolService.getSenderCommandSequence(node.protocol);
Expand All @@ -48,7 +50,7 @@
sequence: commandSequence.slice(1),
delay: 0,
data: {
...this.getNextCommandData(command),
...nextCommandData,
blockchain,
operationId,
node,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,15 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
burned: [],
};
}
} else {
// kaId is number, so transform it to range
knowledgeAssetId = {
startTokenId: knowledgeAssetId,
endTokenId: knowledgeAssetId,
burned: [],
};
}

assertionPromise = this.tripleStoreService
.getAssertion(
blockchain,
Expand Down
8 changes: 8 additions & 0 deletions src/commands/protocols/get/sender/local-get-command.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,15 @@ class LocalGetCommand extends Command {
burned: [],
};
}
} else {
// kaId is number, so transform it to range
knowledgeAssetId = {
startTokenId: knowledgeAssetId,
endTokenId: knowledgeAssetId,
burned: [],
};
}

assertionPromise = this.tripleStoreService
.getAssertion(
blockchain,
Expand Down
4 changes: 2 additions & 2 deletions src/modules/base-module-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ class BaseModuleManager {

getImplementation(name = null) {
const keys = Object.keys(this.handlers);
if (keys.length === 1 || !name) {
return this.handlers[keys[0]];
if (!keys.includes(name)) {
throw new Error(`Blockchain: ${name} implementation is not enabled.`);
}
return this.handlers[name];
}
Expand Down
8 changes: 2 additions & 6 deletions src/modules/blockchain/blockchain-module-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@ class BlockchainModuleManager extends BaseModuleManager {
}

callImplementationFunction(blockchain, functionName, args = []) {
if (blockchain) {
if (this.getImplementation(blockchain)) {
return this.getImplementation(blockchain).module[functionName](...args);
}
} else {
return this.getImplementation().module[functionName](...args);
if (this.getImplementation(blockchain)) {
return this.getImplementation(blockchain).module[functionName](...args);
}
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@ export async function up({ context: { queryInterface } }) {
const indexes = [
{ table: 'shard', column: ['blockchain_id'], name: 'shard_blockchain_id_index' },
{ table: 'shard', column: ['last_dialed'], name: 'last_dialed_index' },
{
table: 'service_agreement',
column: ['blockchain_id'],
name: 'service_agreement_blockchain_id_index',
},
{
table: 'service_agreement',
column: ['blockchain_id', 'token_id'],
name: 'blockchain_id_token_id_index',
},
{ table: 'service_agreement', column: ['token_id'], name: 'token_id_index' },
{ table: 'paranet_synced_asset', column: ['ual'], name: 'paranet_synced_asset_ual_index' },
{
table: 'paranet_synced_asset',
Expand Down Expand Up @@ -103,12 +92,6 @@ export async function down({ context: { queryInterface } }) {

await queryInterface.removeIndex('shard', 'last_dialed_index');

await queryInterface.removeIndex('service_agreement', 'service_agreement_blockchain_id_index');

await queryInterface.removeIndex('service_agreement', 'blockchain_id_token_id_index');

await queryInterface.removeIndex('service_agreement', 'token_id_index');

await queryInterface.removeIndex('paranet_synced_asset', 'paranet_synced_asset_ual_index');

await queryInterface.removeIndex('paranet_synced_asset', 'paranet_ual_data_source_index');
Expand Down
Loading