Merge pull request #3626 from OriginTrail/v6/release/mainnet

Align Mainnet and develop branches
OriginTrail · Dec 26, 2024 · d76f875 · d76f875
2 parents 462b9bd + 09c146d
commit d76f875
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 38 deletions.
diff --git a/installer/data/template/.origintrail_noderc_one_click_mainnet.json b/installer/data/template/.origintrail_noderc_one_click_mainnet.json
@@ -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"
+    ]
+  }
+}
diff --git a/installer/data/template/.origintrail_noderc_one_click_testnet.json b/installer/data/template/.origintrail_noderc_one_click_testnet.json
@@ -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"
+    ]
+  }
+}
diff --git a/...on/sequelize/migrations/20240301095400-remove-corrupted-service-agreements- for-gnosis.js b/...on/sequelize/migrations/20240301095400-remove-corrupted-service-agreements- for-gnosis.js
diff --git a/...es/repository/implementation/sequelize/migrations/20241105160000-add-indexes-to-tables.js b/...es/repository/implementation/sequelize/migrations/20241105160000-add-indexes-to-tables.js
@@ -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',
@@ -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');