Use integer and uint64 tro better express the genesis schema

This will allow `generator` to understand create model types.

Author: jannotti

daemon/algod/api/Makefile

@@ -33,7 +33,8 @@ server/v2/generated/model/types.go:	algod.oas3.yml
 	$(GOPATH1)/bin/oapi-codegen -config ./server/v2/generated/model/model_types.yml algod.oas3.yml
 
 algod.oas3.yml:	algod.oas2.json
-	jq < algod.oas2.json > /dev/null	# fail with a nice explantion if json is malformed
+	jq < algod.oas2.json > /dev/null    # fail with a nice explantion if json is malformed
+	! grep '"type": "number"' $<	    # Don't use the number type. Use integer (and format uint64 usually)
 	curl -s -X POST "$(SWAGGER_CONVERTER_API)/api/convert" -H "accept: application/json" -H "Content-Type: application/json" -d @./algod.oas2.json -o .3tmp.json
 	python3 jsoncanon.py < .3tmp.json > algod.oas3.yml
 	rm -f .3tmp.json

daemon/algod/api/algod.oas2.json

@@ -3092,10 +3092,11 @@
           "type": "object",
           "properties": {
             "algo": {
-              "type": "number"
+              "type": "integer",
+              "format" : "uint64"
             },
             "onl": {
-              "type": "number"
+              "type": "integer"
             },
             "sel": {
               "type": "string"
@@ -3107,13 +3108,16 @@
               "type": "string"
             },
             "voteKD": {
-              "type": "number"
+              "type": "integer",
+              "format" : "uint64"
             },
             "voteFst": {
-              "type": "number"
+              "type": "integer",
+              "format" : "uint64"
             },
             "voteLst": {
-              "type": "number"
+              "type": "integer",
+              "format" : "uint64"
             }
           },
           "required": [
@@ -3159,7 +3163,8 @@
           "type": "string"
         },
         "timestamp": {
-          "type": "number"
+          "type": "integer",
+          "format" : "int64"
         }
       },
       "required": [

daemon/algod/api/algod.oas3.yml

@@ -2087,7 +2087,8 @@
             "type": "string"
           },
           "timestamp": {
-            "type": "number"
+            "format": "int64",
+            "type": "integer"
           }
         },
         "required": [
@@ -2113,10 +2114,11 @@
           "state": {
             "properties": {
               "algo": {
-                "type": "number"
+                "format": "uint64",
+                "type": "integer"
               },
               "onl": {
-                "type": "number"
+                "type": "integer"
               },
               "sel": {
                 "type": "string"
@@ -2128,13 +2130,16 @@
                 "type": "string"
               },
               "voteFst": {
-                "type": "number"
+                "format": "uint64",
+                "type": "integer"
               },
               "voteKD": {
-                "type": "number"
+                "format": "uint64",
+                "type": "integer"
               },
               "voteLst": {
-                "type": "number"
+                "format": "uint64",
+                "type": "integer"
               }
             },
             "required": [