Merge pull request #53 from proximax-storage/v1.9.0-update

v1.9.0 update
proximax-storage · Oct 5, 2024 · d373a47 · d373a47
2 parents 83d7e84 + d52ee66
commit d373a47
Show file tree

Hide file tree

Showing 17 changed files with 346 additions and 12 deletions.
diff --git a/docker-api/docker-compose.yml b/docker-api/docker-compose.yml
@@ -17,16 +17,23 @@ services:
 
   catapult-api-node:
     # Downloads Catapult Server from specified Docker repo
-    image: proximax/proximax-sirius-chain:v1.8.4-bookworm
+    image: proximax/proximax-sirius-chain:v1.9.0-bookworm
     ports:
       - 7903:7903
       - 7902:7902
       - 7900:7900
       - 7901:7901
+      - 7904:7904/udp
+      - 7904:7904/tcp
+      - 25401:25401/tcp
+      - 25401:25401/udp
+      - 6881-6889:6881-6889/tcp
+      - 6881-6889:6881-6889/udp
     volumes:
       - ./:/chainconfig
       - ./data:/data:rw
       - ./logs:/logs:rw
+      - ./replicator_service_logs:/tmp/replicator_service_logs:rw
     entrypoint: /bin/bash
     command: -c "rm -rf /data/server.lock && /sirius/bin/sirius.bc /chainconfig"
     restart: on-failure

diff --git a/docker-api/resources/config-database.properties b/docker-api/resources/config-database.properties
@@ -26,4 +26,6 @@ catapult.mongo.plugins.operation = false
 catapult.mongo.plugins.supercontract  = false
 catapult.mongo.plugins.metadata_v2 = true
 catapult.mongo.plugins.committee = true
-catapult.mongo.plugins.dbrb = true
+catapult.mongo.plugins.dbrb = true
+catapult.mongo.plugins.liquidityprovider = true
+catapult.mongo.plugins.storage = true
diff --git a/docker-api/resources/config-extensions-server.properties b/docker-api/resources/config-extensions-server.properties
@@ -26,3 +26,4 @@ extension.sync = true
 extension.timesync = true
 extension.transactionsink = true
 extension.unbondedpruning = true
+extension.storage = false
diff --git a/docker-api/resources/config-network.properties b/docker-api/resources/config-network.properties
@@ -236,4 +236,31 @@ enabled = true
 
 # 1 week = 7 days = 168 hours
 dbrbProcessLifetimeAfterExpiration = 168h
-enableDbrbProcessBanning = true
+enableDbrbProcessBanning = true
+
+[plugin:catapult.plugins.liquidityprovider]
+enabled = false
+managerPublicKeys* = 
+maxWindowSize = 10
+percentsDigitsAfterDot = 2
+
+[plugin:catapult.plugins.storage]
+
+enabled = true
+minDriveSize = 1MB
+maxDriveSize = 1TB
+minCapacity = 1MB
+maxModificationSize = 1TB
+minReplicatorCount = 4
+maxReplicatorCount = 20
+maxFreeDownloadSize = 1MB
+maxDownloadSize = 1TB
+# 4 weeks = 28 days = 672 hours
+storageBillingPeriod = 672h
+downloadBillingPeriod = 24h
+verificationInterval = 4h
+shardSize = 20
+verificationExpirationCoefficient = 0.24
+verificationExpirationConstant = 10
+
+enableReplicatorBootKeyBinding = true
diff --git a/docker-api/resources/config-storage.properties b/docker-api/resources/config-storage.properties
@@ -0,0 +1,14 @@
+[replicator]
+
+key = REPLICATOR_PRIVATE_KEY
+host = 0.0.0.0
+port = 7904
+transactionTimeout = 1h
+storageDirectory = /data/drives
+sandboxDirectory = /data/drives/drive-sandboxes
+useTcpSocket = true
+useRpcReplicator = true
+rpcHost = 127.0.0.1
+rpcPort = 7905
+rpcHandleLostConnection = false
+rpcDbgChildCrash = true
diff --git a/docker-api/resources/replicators.json b/docker-api/resources/replicators.json
@@ -0,0 +1,16 @@
+{
+    "_info": "this file contains a list of bootstrap replicators",
+    "knownPeers": [
+      {
+        "publicKey": "",
+        "endpoint": {
+          "host": "",
+          "port": 7904
+        },
+        "metadata": {
+          "name": "",
+          "roles": "Api"
+        }
+      }
+    ]
+  }
diff --git a/docker-api/resources/supported-entities.json b/docker-api/resources/supported-entities.json
@@ -277,6 +277,104 @@
             "supportedVersions": [
                 2
             ]
+        },
+        {
+            "name": "dataModificationApproval",
+            "type": "17506",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "dataModificationCancel",
+            "type": "17762",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "dataModificationSingleApproval",
+            "type": "19298",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "dataModification",
+            "type": "16994",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "downloadApproval",
+            "type": "19810",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "downloadPayment",
+            "type": "18786",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "download",
+            "type": "17250",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "driveClosure",
+            "type": "20066",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "endDriveVerification",
+            "type": "20322",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "finishDownload",
+            "type": "18530",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "prepareBcDrive",
+            "type": "16738",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "replicatorOffboarding",
+            "type": "18274",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "storagePayment",
+            "type": "19042",
+            "supportedVersions": [
+                1
+            ]
+        },
+        {
+            "name": "verificationPayment",
+            "type": "19554",
+            "supportedVersions": [
+                1
+            ]
         }
     ]
 }
diff --git a/docker-api/restuserconfig/rest.json b/docker-api/restuserconfig/rest.json
@@ -8,7 +8,7 @@
     "crossDomainHttpMethods": ["GET", "POST", "PUT", "OPTIONS"],
     "cors": "*",
     "clientPrivateKey": "REST_PRIVATE_KEY",
-    "extensions": ["accountLink", "accountProperties", "aggregate", "exchange", "committee", "config", "lock", "metadata", "metadata_v2", "mosaic", "multisig", "namespace", "operation", "receipts", "richlist", "service", "supercontract", "transfer", "upgrade"],
+    "extensions": ["accountLink", "accountProperties", "aggregate", "exchange", "committee", "config", "liquidityProvider", "lock", "metadata", "metadata_v2", "mosaic", "multisig", "namespace", "operation", "receipts", "richlist", "service", "storage", "supercontract", "transfer", "upgrade"],
     "db": {
         "url": "mongodb://db:27017/",
         "name": "catapult",

diff --git a/docker-method/docker-compose.yml b/docker-method/docker-compose.yml
@@ -1,16 +1,23 @@
 version: "3.6"
 services:
   mainnet-peer:
-    image: proximax/proximax-sirius-chain:v1.8.4-bookworm
+    image: proximax/proximax-sirius-chain:v1.9.0-bookworm
     ports:
-      - 7903:7903
-      - 7902:7902
       - 7900:7900
       - 7901:7901
+      - 7902:7902
+      - 7903:7903
+      - 7904:7904/udp
+      - 7904:7904/tcp
+      - 25401:25401/tcp
+      - 25401:25401/udp
+      - 6881-6889:6881-6889/tcp
+      - 6881-6889:6881-6889/udp
     volumes:
       - ./:/chainconfig
       - ./data:/data:rw
       - ./logs:/logs:rw
+      - ./replicator_service_logs:/tmp/replicator_service_logs:rw
     entrypoint: /bin/bash
     command: -c "rm -f /data/server.lock && /sirius/bin/sirius.bc /chainconfig"
     restart: on-failure

diff --git a/docker-method/resources/config-database.properties b/docker-method/resources/config-database.properties
@@ -26,4 +26,6 @@ catapult.mongo.plugins.operation = false
 catapult.mongo.plugins.supercontract  = false
 catapult.mongo.plugins.metadata_v2 = true
 catapult.mongo.plugins.committee = true
-catapult.mongo.plugins.dbrb = true
+catapult.mongo.plugins.dbrb = true
+catapult.mongo.plugins.liquidityprovider = true
+catapult.mongo.plugins.storage = true
diff --git a/docker-method/resources/config-extensions-server.properties b/docker-method/resources/config-extensions-server.properties
@@ -26,3 +26,4 @@ extension.sync = true
 extension.timesync = true
 extension.transactionsink = true
 extension.unbondedpruning = true
+extension.storage = false
diff --git a/docker-method/resources/config-network.properties b/docker-method/resources/config-network.properties
@@ -236,4 +236,31 @@ enabled = true
 
 # 1 week = 7 days = 168 hours
 dbrbProcessLifetimeAfterExpiration = 168h
-enableDbrbProcessBanning = true
+enableDbrbProcessBanning = true
+
+[plugin:catapult.plugins.liquidityprovider]
+enabled = false
+managerPublicKeys* = 
+maxWindowSize = 10
+percentsDigitsAfterDot = 2
+
+[plugin:catapult.plugins.storage]
+
+enabled = true
+minDriveSize = 1MB
+maxDriveSize = 1TB
+minCapacity = 1MB
+maxModificationSize = 1TB
+minReplicatorCount = 4
+maxReplicatorCount = 20
+maxFreeDownloadSize = 1MB
+maxDownloadSize = 1TB
+# 4 weeks = 28 days = 672 hours
+storageBillingPeriod = 672h
+downloadBillingPeriod = 24h
+verificationInterval = 4h
+shardSize = 20
+verificationExpirationCoefficient = 0.24
+verificationExpirationConstant = 10
+
+enableReplicatorBootKeyBinding = true
diff --git a/docker-method/resources/config-storage.properties b/docker-method/resources/config-storage.properties
@@ -0,0 +1,14 @@
+[replicator]
+
+key = REPLICATOR_PRIVATE_KEY
+host = 0.0.0.0
+port = 7904
+transactionTimeout = 1h
+storageDirectory = /data/drives
+sandboxDirectory = /data/drives/drive-sandboxes
+useTcpSocket = true
+useRpcReplicator = true
+rpcHost = 127.0.0.1
+rpcPort = 7905
+rpcHandleLostConnection = false
+rpcDbgChildCrash = true
diff --git a/docker-method/resources/replicators.json b/docker-method/resources/replicators.json
@@ -0,0 +1,16 @@
+{
+    "_info": "this file contains a list of bootstrap replicators",
+    "knownPeers": [
+      {
+        "publicKey": "",
+        "endpoint": {
+          "host": "",
+          "port": 7904
+        },
+        "metadata": {
+          "name": "",
+          "roles": "Api"
+        }
+      }
+    ]
+  }