Merge pull request #64 from threefoldtech/feat_tfgrid_validation_update

feat: align with v11 types
threefoldtech · Nov 14, 2022 · 8481543 · 8481543
2 parents 8eb15ed + 15caded
commit 8481543
Show file tree

Hide file tree

Showing 18 changed files with 14,901 additions and 5,959 deletions.
diff --git a/.env b/.env
@@ -4,5 +4,5 @@ DB_PASS=postgres
 DB_HOST=172.17.0.1
 DB_PORT=5432
 TYPEORM_LOGGING=error
-INDEXER_ENDPOINT_URL=http://localhost:4011/v1/graphql
-WS_URL=wss://tfchain.dev.grid.tf
+INDEXER_ENDPOINT_URL=http://localhost:4010/v1/graphql
+WS_URL=ws://0.0.0.0:9944
diff --git a/indexer/.env b/indexer/.env
@@ -2,6 +2,6 @@
 #    indexer options      #
 ###########################
 
-#WS_ENDPOINT=ws://192.168.49.1:9945
-WS_ENDPOINT=wss://tfchain.dev.grid.tf
+WS_ENDPOINT=ws://192.168.49.1:9944
+#WS_ENDPOINT=wss://tfchain.dev.grid.tf
 START_HEIGHT=0
diff --git a/indexer/chart/Chart.yaml b/indexer/chart/Chart.yaml
@@ -1,5 +1,5 @@
 name: tfchainindexer
 description: Helm Chart for the tfchain hydra indexer
-version: 2.4.0
+version: 2.5.0
 apiVersion: v2
-appVersion: "2.5.13"
+appVersion: "2.6.0"
diff --git a/indexer/chart/templates/indexer-config.yaml b/indexer/chart/templates/indexer-config.yaml
@@ -488,7 +488,7 @@ data:
               }
             },
             {
-              "minmax": [104, null],
+              "minmax": [105, null],
               "types": {
                 "Contract": {
                   "version": " u32",
@@ -499,6 +499,36 @@ data:
                   "solutionProviderID": "Option<U64>"
                 }
               }
+            },
+            {
+              "minmax": [118, null],
+              "types": {
+                "Node": {
+                  "version": "u32",
+                  "id": "u32",
+                  "farmId": "u32",
+                  "twinId": "u32",
+                  "resources": "Resources",
+                  "location": "Location",
+                  "country": "Vec<u8>",
+                  "city": "Vec<u8>",
+                  "publicConfig": "Option<PublicConfig>",
+                  "created": "u64",
+                  "farmingPolicyId": "u32",
+                  "interfaces": "Vec<Interface>",
+                  "certification": "NodeCertification",
+                  "secureBoot": "bool",
+                  "virtualized": "bool",
+                  "serialNumber": "Vec<u8>",
+                  "connectionPrice": "u32"
+                },
+                "Location": {
+                  "city": "Vec<u8>",
+                  "country": "Vec<u8>",
+                  "latitude": "Vec<u8>",
+                  "longitude": "Vec<u8>"
+                }
+              }
             }
           ]
         }

diff --git a/indexer/typesBundle.json b/indexer/typesBundle.json
@@ -496,6 +496,36 @@
               "solutionProviderID": "Option<U64>"
             }
           }
+        },
+        {
+          "minmax": [118, null],
+          "types": {
+            "Node": {
+              "version": "u32",
+              "id": "u32",
+              "farmId": "u32",
+              "twinId": "u32",
+              "resources": "Resources",
+              "location": "Location",
+              "country": "Vec<u8>",
+              "city": "Vec<u8>",
+              "publicConfig": "Option<PublicConfig>",
+              "created": "u64",
+              "farmingPolicyId": "u32",
+              "interfaces": "Vec<Interface>",
+              "certification": "NodeCertification",
+              "secureBoot": "bool",
+              "virtualized": "bool",
+              "serialNumber": "Vec<u8>",
+              "connectionPrice": "u32"
+            },
+            "Location": {
+              "city": "Vec<u8>",
+              "country": "Vec<u8>",
+              "latitude": "Vec<u8>",
+              "longitude": "Vec<u8>"
+            }
+          }
         }
       ]
     }