From d699d116f58f8186331bf2f4d28c4641c28365b9 Mon Sep 17 00:00:00 2001
From: Augustus Chang <augustus.chang@smartcontract.com>
Date: Thu, 17 Aug 2023 12:47:51 -0700
Subject: [PATCH] regen schemas + fix hashFile

---
 .github/workflows/gauntlet.yml                |  2 +-
 .../schema/access-controller.json             | 15 +++-----
 .../access-controller/schema/raw/execute.json |  9 ++---
 .../schema/raw/instantiate.json               |  3 +-
 .../access-controller/schema/raw/query.json   |  3 +-
 .../main/deviation-flagging-validator.json    | 21 ++++-------
 .../schema/raw/execute.json                   | 12 +++----
 .../schema/raw/instantiate.json               |  3 +-
 .../schema/raw/query.json                     |  3 +-
 .../raw/response_to_flagging_threshold.json   |  3 +-
 contracts/flags/schema/flags.json             | 36 ++++++++-----------
 contracts/flags/schema/raw/execute.json       | 15 +++-----
 contracts/flags/schema/raw/instantiate.json   |  3 +-
 contracts/flags/schema/raw/query.json         | 18 +++++-----
 14 files changed, 53 insertions(+), 93 deletions(-)

diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml
index c6401432..c9dd78d8 100644
--- a/.github/workflows/gauntlet.yml
+++ b/.github/workflows/gauntlet.yml
@@ -68,7 +68,7 @@ jobs:
           cache-name: cache-wasmd-artifacts
         with:
           path: artifacts
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('artifacts') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('contracts') }}
 
       - if: ${{ steps.cache-wasmd-artifacts.outputs.cache-hit != 'true' }}
         name: Build Wasmd Artifacts
diff --git a/contracts/access-controller/schema/access-controller.json b/contracts/access-controller/schema/access-controller.json
index 58fcee51..8a4b94a4 100644
--- a/contracts/access-controller/schema/access-controller.json
+++ b/contracts/access-controller/schema/access-controller.json
@@ -5,8 +5,7 @@
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "InstantiateMsg",
-    "type": "object",
-    "additionalProperties": false
+    "type": "object"
   },
   "execute": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -33,8 +32,7 @@
               "address": {
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -54,8 +52,7 @@
               "address": {
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -75,8 +72,7 @@
               "to": {
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -108,8 +104,7 @@
               "address": {
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
diff --git a/contracts/access-controller/schema/raw/execute.json b/contracts/access-controller/schema/raw/execute.json
index f66f26ae..53b89a4e 100644
--- a/contracts/access-controller/schema/raw/execute.json
+++ b/contracts/access-controller/schema/raw/execute.json
@@ -23,8 +23,7 @@
             "address": {
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -44,8 +43,7 @@
             "address": {
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -65,8 +63,7 @@
             "to": {
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
diff --git a/contracts/access-controller/schema/raw/instantiate.json b/contracts/access-controller/schema/raw/instantiate.json
index 1352613d..44588cf2 100644
--- a/contracts/access-controller/schema/raw/instantiate.json
+++ b/contracts/access-controller/schema/raw/instantiate.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "InstantiateMsg",
-  "type": "object",
-  "additionalProperties": false
+  "type": "object"
 }
diff --git a/contracts/access-controller/schema/raw/query.json b/contracts/access-controller/schema/raw/query.json
index d5e3e25e..39683732 100644
--- a/contracts/access-controller/schema/raw/query.json
+++ b/contracts/access-controller/schema/raw/query.json
@@ -23,8 +23,7 @@
             "address": {
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
diff --git a/contracts/deviation-flagging-validator/schema/main/deviation-flagging-validator.json b/contracts/deviation-flagging-validator/schema/main/deviation-flagging-validator.json
index 65315206..98c1f975 100644
--- a/contracts/deviation-flagging-validator/schema/main/deviation-flagging-validator.json
+++ b/contracts/deviation-flagging-validator/schema/main/deviation-flagging-validator.json
@@ -21,8 +21,7 @@
         "description": "The address of the flags contract",
         "type": "string"
       }
-    },
-    "additionalProperties": false
+    }
   },
   "execute": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -45,8 +44,7 @@
                 "description": "Address to transfer ownership to",
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -76,8 +74,7 @@
                 "format": "uint32",
                 "minimum": 0.0
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -98,8 +95,7 @@
               "flags": {
                 "$ref": "#/definitions/Addr"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -140,8 +136,7 @@
                 "format": "uint32",
                 "minimum": 0.0
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -180,8 +175,7 @@
                 "description": "Previous answer, used as the median of difference with the current answer to determine if the deviation threshold has been exceeded",
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -218,8 +212,7 @@
           "format": "uint32",
           "minimum": 0.0
         }
-      },
-      "additionalProperties": false
+      }
     },
     "is_valid": {
       "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/deviation-flagging-validator/schema/raw/execute.json b/contracts/deviation-flagging-validator/schema/raw/execute.json
index 0fd04c4e..2470610a 100644
--- a/contracts/deviation-flagging-validator/schema/raw/execute.json
+++ b/contracts/deviation-flagging-validator/schema/raw/execute.json
@@ -19,8 +19,7 @@
               "description": "Address to transfer ownership to",
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -50,8 +49,7 @@
               "format": "uint32",
               "minimum": 0.0
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -72,8 +70,7 @@
             "flags": {
               "$ref": "#/definitions/Addr"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -114,8 +111,7 @@
               "format": "uint32",
               "minimum": 0.0
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
diff --git a/contracts/deviation-flagging-validator/schema/raw/instantiate.json b/contracts/deviation-flagging-validator/schema/raw/instantiate.json
index c32eed30..adc347d6 100644
--- a/contracts/deviation-flagging-validator/schema/raw/instantiate.json
+++ b/contracts/deviation-flagging-validator/schema/raw/instantiate.json
@@ -17,6 +17,5 @@
       "description": "The address of the flags contract",
       "type": "string"
     }
-  },
-  "additionalProperties": false
+  }
 }
diff --git a/contracts/deviation-flagging-validator/schema/raw/query.json b/contracts/deviation-flagging-validator/schema/raw/query.json
index ec0abf35..a736840a 100644
--- a/contracts/deviation-flagging-validator/schema/raw/query.json
+++ b/contracts/deviation-flagging-validator/schema/raw/query.json
@@ -24,8 +24,7 @@
               "description": "Previous answer, used as the median of difference with the current answer to determine if the deviation threshold has been exceeded",
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
diff --git a/contracts/deviation-flagging-validator/schema/raw/response_to_flagging_threshold.json b/contracts/deviation-flagging-validator/schema/raw/response_to_flagging_threshold.json
index 128de95d..a60b8356 100644
--- a/contracts/deviation-flagging-validator/schema/raw/response_to_flagging_threshold.json
+++ b/contracts/deviation-flagging-validator/schema/raw/response_to_flagging_threshold.json
@@ -11,6 +11,5 @@
       "format": "uint32",
       "minimum": 0.0
     }
-  },
-  "additionalProperties": false
+  }
 }
diff --git a/contracts/flags/schema/flags.json b/contracts/flags/schema/flags.json
index 00318895..aa9d8c38 100644
--- a/contracts/flags/schema/flags.json
+++ b/contracts/flags/schema/flags.json
@@ -17,8 +17,7 @@
       "raising_access_controller": {
         "type": "string"
       }
-    },
-    "additionalProperties": false
+    }
   },
   "execute": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -41,8 +40,7 @@
                 "description": "Address to transfer ownership to",
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -69,8 +67,7 @@
               "subject": {
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -93,8 +90,7 @@
                   "type": "string"
                 }
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -117,8 +113,7 @@
                   "type": "string"
                 }
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -138,8 +133,7 @@
               "rac_address": {
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -153,17 +147,17 @@
       {
         "type": "string",
         "enum": [
-          "owner",
-          "raising_access_controller"
+          "Owner",
+          "RaisingAccessController"
         ]
       },
       {
         "type": "object",
         "required": [
-          "flag"
+          "Flag"
         ],
         "properties": {
-          "flag": {
+          "Flag": {
             "type": "object",
             "required": [
               "subject"
@@ -172,8 +166,7 @@
               "subject": {
                 "type": "string"
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
@@ -181,10 +174,10 @@
       {
         "type": "object",
         "required": [
-          "flags"
+          "Flags"
         ],
         "properties": {
-          "flags": {
+          "Flags": {
             "type": "object",
             "required": [
               "subjects"
@@ -196,8 +189,7 @@
                   "type": "string"
                 }
               }
-            },
-            "additionalProperties": false
+            }
           }
         },
         "additionalProperties": false
diff --git a/contracts/flags/schema/raw/execute.json b/contracts/flags/schema/raw/execute.json
index f39de382..dab14c4c 100644
--- a/contracts/flags/schema/raw/execute.json
+++ b/contracts/flags/schema/raw/execute.json
@@ -19,8 +19,7 @@
               "description": "Address to transfer ownership to",
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -47,8 +46,7 @@
             "subject": {
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -71,8 +69,7 @@
                 "type": "string"
               }
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -95,8 +92,7 @@
                 "type": "string"
               }
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -116,8 +112,7 @@
             "rac_address": {
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
diff --git a/contracts/flags/schema/raw/instantiate.json b/contracts/flags/schema/raw/instantiate.json
index b430b9ab..a9e65836 100644
--- a/contracts/flags/schema/raw/instantiate.json
+++ b/contracts/flags/schema/raw/instantiate.json
@@ -13,6 +13,5 @@
     "raising_access_controller": {
       "type": "string"
     }
-  },
-  "additionalProperties": false
+  }
 }
diff --git a/contracts/flags/schema/raw/query.json b/contracts/flags/schema/raw/query.json
index a2aeac78..89370dd0 100644
--- a/contracts/flags/schema/raw/query.json
+++ b/contracts/flags/schema/raw/query.json
@@ -5,17 +5,17 @@
     {
       "type": "string",
       "enum": [
-        "owner",
-        "raising_access_controller"
+        "Owner",
+        "RaisingAccessController"
       ]
     },
     {
       "type": "object",
       "required": [
-        "flag"
+        "Flag"
       ],
       "properties": {
-        "flag": {
+        "Flag": {
           "type": "object",
           "required": [
             "subject"
@@ -24,8 +24,7 @@
             "subject": {
               "type": "string"
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false
@@ -33,10 +32,10 @@
     {
       "type": "object",
       "required": [
-        "flags"
+        "Flags"
       ],
       "properties": {
-        "flags": {
+        "Flags": {
           "type": "object",
           "required": [
             "subjects"
@@ -48,8 +47,7 @@
                 "type": "string"
               }
             }
-          },
-          "additionalProperties": false
+          }
         }
       },
       "additionalProperties": false