diff --git a/package-lock.json b/package-lock.json
index e589947..a90a822 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@jackallabs/jackal.js-protos",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@jackallabs/jackal.js-protos",
-      "version": "2.1.1",
+      "version": "2.2.0",
       "license": "MIT",
       "dependencies": {
         "@cosmjs/amino": "^0.32.3",
@@ -38,7 +38,7 @@
         "typedoc": "^0.25.3",
         "typescript": "^5.2.2",
         "vite": "^5.2.10",
-        "vite-plugin-dts": "^3.6.3",
+        "vite-plugin-dts": "^4.2.2",
         "vite-tsconfig-paths": "^4.2.1",
         "vitest": "0.34.6"
       }
@@ -56,11 +56,32 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/parser": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
-      "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
       "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.6"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -68,6 +89,20 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/types": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
@@ -332,9 +367,9 @@
       "integrity": "sha512-D1Yc+Zy8oL/hkUkFUL/bwxvuDBzRGpc4cF7/SkdhxX4iHpSLgdOuTt1mhCh9+kl6NQREy9t7SYZ6xeW5gFe60w=="
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
         "ppc64"
       ],
@@ -347,9 +382,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
@@ -362,9 +397,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
@@ -377,9 +412,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
@@ -392,9 +427,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
@@ -407,9 +442,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
@@ -422,9 +457,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
@@ -437,9 +472,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
@@ -452,9 +487,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
@@ -467,9 +502,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
@@ -482,9 +517,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
@@ -497,9 +532,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
@@ -512,9 +547,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
@@ -527,9 +562,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
@@ -542,9 +577,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
@@ -557,9 +592,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
@@ -572,9 +607,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
@@ -587,9 +622,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
@@ -602,9 +637,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
@@ -617,9 +652,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
@@ -632,9 +667,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
@@ -647,9 +682,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
@@ -662,9 +697,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
@@ -875,9 +910,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
@@ -890,18 +925,18 @@
       }
     },
     "node_modules/@microsoft/api-extractor": {
-      "version": "7.43.0",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.43.0.tgz",
-      "integrity": "sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w==",
-      "dev": true,
-      "dependencies": {
-        "@microsoft/api-extractor-model": "7.28.13",
-        "@microsoft/tsdoc": "0.14.2",
-        "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "4.0.2",
-        "@rushstack/rig-package": "0.5.2",
-        "@rushstack/terminal": "0.10.0",
-        "@rushstack/ts-command-line": "4.19.1",
+      "version": "7.47.7",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.47.7.tgz",
+      "integrity": "sha512-fNiD3G55ZJGhPOBPMKD/enozj8yxJSYyVJWxRWdcUtw842rvthDHJgUWq9gXQTensFlMHv2wGuCjjivPv53j0A==",
+      "dev": true,
+      "dependencies": {
+        "@microsoft/api-extractor-model": "7.29.6",
+        "@microsoft/tsdoc": "~0.15.0",
+        "@microsoft/tsdoc-config": "~0.17.0",
+        "@rushstack/node-core-library": "5.7.0",
+        "@rushstack/rig-package": "0.5.3",
+        "@rushstack/terminal": "0.14.0",
+        "@rushstack/ts-command-line": "4.22.6",
         "lodash": "~4.17.15",
         "minimatch": "~3.0.3",
         "resolve": "~1.22.1",
@@ -914,14 +949,14 @@
       }
     },
     "node_modules/@microsoft/api-extractor-model": {
-      "version": "7.28.13",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.28.13.tgz",
-      "integrity": "sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw==",
+      "version": "7.29.6",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.29.6.tgz",
+      "integrity": "sha512-gC0KGtrZvxzf/Rt9oMYD2dHvtN/1KPEYsrQPyMKhLHnlVuO/f4AFN3E4toqZzD2pt4LhkKoYmL2H9tX3yCOyRw==",
       "dev": true,
       "dependencies": {
-        "@microsoft/tsdoc": "0.14.2",
-        "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "4.0.2"
+        "@microsoft/tsdoc": "~0.15.0",
+        "@microsoft/tsdoc-config": "~0.17.0",
+        "@rushstack/node-core-library": "5.7.0"
       }
     },
     "node_modules/@microsoft/api-extractor/node_modules/brace-expansion": {
@@ -975,36 +1010,45 @@
       }
     },
     "node_modules/@microsoft/tsdoc": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
-      "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.15.0.tgz",
+      "integrity": "sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA==",
       "dev": true
     },
     "node_modules/@microsoft/tsdoc-config": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz",
-      "integrity": "sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.17.0.tgz",
+      "integrity": "sha512-v/EYRXnCAIHxOHW+Plb6OWuUoMotxTN0GLatnpOb1xq0KuTNw/WI3pamJx/UbsoJP5k9MCw1QxvvhPcF9pH3Zg==",
       "dev": true,
       "dependencies": {
-        "@microsoft/tsdoc": "0.14.2",
-        "ajv": "~6.12.6",
+        "@microsoft/tsdoc": "0.15.0",
+        "ajv": "~8.12.0",
         "jju": "~1.4.0",
-        "resolve": "~1.19.0"
+        "resolve": "~1.22.2"
       }
     },
-    "node_modules/@microsoft/tsdoc-config/node_modules/resolve": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+    "node_modules/@microsoft/tsdoc-config/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.1.0",
-        "path-parse": "^1.0.6"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/@microsoft/tsdoc-config/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
     "node_modules/@noble/hashes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
@@ -1199,9 +1243,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
-      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
+      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
       "cpu": [
         "arm"
       ],
@@ -1211,9 +1255,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
-      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
+      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
       "cpu": [
         "arm64"
       ],
@@ -1223,9 +1267,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
-      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
+      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
       "cpu": [
         "arm64"
       ],
@@ -1235,9 +1279,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
-      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
+      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
       "cpu": [
         "x64"
       ],
@@ -1247,9 +1291,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
-      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
+      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
       "cpu": [
         "arm"
       ],
@@ -1259,9 +1303,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
-      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
+      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
       "cpu": [
         "arm"
       ],
@@ -1271,9 +1315,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
-      "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
+      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
       "cpu": [
         "arm64"
       ],
@@ -1283,9 +1327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
-      "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
+      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
       "cpu": [
         "arm64"
       ],
@@ -1295,9 +1339,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
-      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
+      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
       "cpu": [
         "ppc64"
       ],
@@ -1307,9 +1351,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
-      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
+      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
       "cpu": [
         "riscv64"
       ],
@@ -1319,9 +1363,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
-      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
+      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
       "cpu": [
         "s390x"
       ],
@@ -1331,9 +1375,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
-      "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
+      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
       "cpu": [
         "x64"
       ],
@@ -1343,9 +1387,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
-      "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
+      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
       "cpu": [
         "x64"
       ],
@@ -1355,9 +1399,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
-      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
+      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
       "cpu": [
         "arm64"
       ],
@@ -1367,9 +1411,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
-      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
+      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
       "cpu": [
         "ia32"
       ],
@@ -1379,9 +1423,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
-      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
+      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
       "cpu": [
         "x64"
       ],
@@ -1391,17 +1435,19 @@
       ]
     },
     "node_modules/@rushstack/node-core-library": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-4.0.2.tgz",
-      "integrity": "sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.7.0.tgz",
+      "integrity": "sha512-Ff9Cz/YlWu9ce4dmqNBZpA45AEya04XaBFIjV7xTVeEf+y/kTjEasmozqFELXlNG4ROdevss75JrrZ5WgufDkQ==",
       "dev": true,
       "dependencies": {
+        "ajv": "~8.13.0",
+        "ajv-draft-04": "~1.0.0",
+        "ajv-formats": "~3.0.1",
         "fs-extra": "~7.0.1",
         "import-lazy": "~4.0.0",
         "jju": "~1.4.0",
         "resolve": "~1.22.1",
-        "semver": "~7.5.4",
-        "z-schema": "~5.0.2"
+        "semver": "~7.5.4"
       },
       "peerDependencies": {
         "@types/node": "*"
@@ -1412,6 +1458,42 @@
         }
       }
     },
+    "node_modules/@rushstack/node-core-library/node_modules/ajv": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
+      "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.4.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@rushstack/node-core-library/node_modules/ajv-draft-04": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
+      "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^8.5.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rushstack/node-core-library/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
     "node_modules/@rushstack/node-core-library/node_modules/semver": {
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -1428,9 +1510,9 @@
       }
     },
     "node_modules/@rushstack/rig-package": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.5.2.tgz",
-      "integrity": "sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.5.3.tgz",
+      "integrity": "sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow==",
       "dev": true,
       "dependencies": {
         "resolve": "~1.22.1",
@@ -1438,12 +1520,12 @@
       }
     },
     "node_modules/@rushstack/terminal": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.10.0.tgz",
-      "integrity": "sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.14.0.tgz",
+      "integrity": "sha512-juTKMAMpTIJKudeFkG5slD8Z/LHwNwGZLtU441l/u82XdTBfsP+LbGKJLCNwP5se+DMCT55GB8x9p6+C4UL7jw==",
       "dev": true,
       "dependencies": {
-        "@rushstack/node-core-library": "4.0.2",
+        "@rushstack/node-core-library": "5.7.0",
         "supports-color": "~8.1.1"
       },
       "peerDependencies": {
@@ -1471,12 +1553,12 @@
       }
     },
     "node_modules/@rushstack/ts-command-line": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.19.1.tgz",
-      "integrity": "sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg==",
+      "version": "4.22.6",
+      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.6.tgz",
+      "integrity": "sha512-QSRqHT/IfoC5nk9zn6+fgyqOPXHME0BfchII9EUPR19pocsNp/xSbeBCbD3PIR2Lg+Q5qk7OFqk1VhWPMdKHJg==",
       "dev": true,
       "dependencies": {
-        "@rushstack/terminal": "0.10.0",
+        "@rushstack/terminal": "0.14.0",
         "@types/argparse": "1.0.38",
         "argparse": "~1.0.9",
         "string-argv": "~0.3.1"
@@ -1871,71 +1953,78 @@
       }
     },
     "node_modules/@volar/language-core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-1.11.1.tgz",
-      "integrity": "sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.5.tgz",
+      "integrity": "sha512-F4tA0DCO5Q1F5mScHmca0umsi2ufKULAnMOVBfMsZdT4myhVl4WdKRwCaKcfOkIEuyrAVvtq1ESBdZ+rSyLVww==",
       "dev": true,
       "dependencies": {
-        "@volar/source-map": "1.11.1"
+        "@volar/source-map": "2.4.5"
       }
     },
     "node_modules/@volar/source-map": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-1.11.1.tgz",
-      "integrity": "sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==",
-      "dev": true,
-      "dependencies": {
-        "muggle-string": "^0.3.1"
-      }
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.5.tgz",
+      "integrity": "sha512-varwD7RaKE2J/Z+Zu6j3mNNJbNT394qIxXwdvz/4ao/vxOfyClZpSDtLKkwWmecinkOVos5+PWkWraelfMLfpw==",
+      "dev": true
     },
     "node_modules/@volar/typescript": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-1.11.1.tgz",
-      "integrity": "sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.5.tgz",
+      "integrity": "sha512-mcT1mHvLljAEtHviVcBuOyAwwMKz1ibXTi5uYtP/pf4XxoAzpdkQ+Br2IC0NPCvLCbjPZmbf3I0udndkfB1CDg==",
       "dev": true,
       "dependencies": {
-        "@volar/language-core": "1.11.1",
-        "path-browserify": "^1.0.1"
+        "@volar/language-core": "2.4.5",
+        "path-browserify": "^1.0.1",
+        "vscode-uri": "^3.0.8"
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.4.27",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
-      "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.8.tgz",
+      "integrity": "sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.24.4",
-        "@vue/shared": "3.4.27",
+        "@babel/parser": "^7.25.3",
+        "@vue/shared": "3.5.8",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.4.27",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
-      "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.8.tgz",
+      "integrity": "sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-core": "3.4.27",
-        "@vue/shared": "3.4.27"
+        "@vue/compiler-core": "3.5.8",
+        "@vue/shared": "3.5.8"
+      }
+    },
+    "node_modules/@vue/compiler-vue2": {
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz",
+      "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==",
+      "dev": true,
+      "dependencies": {
+        "de-indent": "^1.0.2",
+        "he": "^1.2.0"
       }
     },
     "node_modules/@vue/language-core": {
-      "version": "1.8.27",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.27.tgz",
-      "integrity": "sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.6.tgz",
+      "integrity": "sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==",
       "dev": true,
       "dependencies": {
-        "@volar/language-core": "~1.11.1",
-        "@volar/source-map": "~1.11.1",
-        "@vue/compiler-dom": "^3.3.0",
-        "@vue/shared": "^3.3.0",
+        "@volar/language-core": "~2.4.1",
+        "@vue/compiler-dom": "^3.4.0",
+        "@vue/compiler-vue2": "^2.7.16",
+        "@vue/shared": "^3.4.0",
         "computeds": "^0.0.1",
         "minimatch": "^9.0.3",
-        "muggle-string": "^0.3.1",
-        "path-browserify": "^1.0.1",
-        "vue-template-compiler": "^2.7.14"
+        "muggle-string": "^0.4.1",
+        "path-browserify": "^1.0.1"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -1947,9 +2036,9 @@
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.4.27",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
-      "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.8.tgz",
+      "integrity": "sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==",
       "dev": true
     },
     "node_modules/acorn": {
@@ -1998,6 +2087,45 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ajv-formats": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -2474,22 +2602,18 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/commander": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
       "dev": true
     },
+    "node_modules/compare-versions": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
+      "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==",
+      "dev": true
+    },
     "node_modules/computeds": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/computeds/-/computeds-0.0.1.tgz",
@@ -2649,12 +2773,12 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2861,9 +2985,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "hasInstallScript": true,
       "bin": {
         "esbuild": "bin/esbuild"
@@ -2872,29 +2996,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -3152,6 +3276,12 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "node_modules/fast-uri": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
+      "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+      "dev": true
+    },
     "node_modules/fastq": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
@@ -3997,18 +4127,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-      "dev": true
-    },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-      "dev": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -4048,11 +4166,11 @@
       "dev": true
     },
     "node_modules/magic-string": {
-      "version": "0.30.10",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
-      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/make-dir": {
@@ -4188,15 +4306,15 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "node_modules/muggle-string": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.3.1.tgz",
-      "integrity": "sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
+      "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
       "dev": true
     },
     "node_modules/nanoid": {
@@ -4480,9 +4598,9 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -4526,9 +4644,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -4545,8 +4663,8 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -4743,6 +4861,15 @@
       "resolved": "https://registry.npmjs.org/readonly-date/-/readonly-date-1.0.0.tgz",
       "integrity": "sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ=="
     },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -4845,9 +4972,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
-      "integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
+      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
       "dependencies": {
         "@types/estree": "1.0.5"
       },
@@ -4859,22 +4986,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.17.2",
-        "@rollup/rollup-android-arm64": "4.17.2",
-        "@rollup/rollup-darwin-arm64": "4.17.2",
-        "@rollup/rollup-darwin-x64": "4.17.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.17.2",
-        "@rollup/rollup-linux-arm64-musl": "4.17.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-musl": "4.17.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.17.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.17.2",
-        "@rollup/rollup-win32-x64-msvc": "4.17.2",
+        "@rollup/rollup-android-arm-eabi": "4.22.4",
+        "@rollup/rollup-android-arm64": "4.22.4",
+        "@rollup/rollup-darwin-arm64": "4.22.4",
+        "@rollup/rollup-darwin-x64": "4.22.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
+        "@rollup/rollup-linux-arm64-musl": "4.22.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-musl": "4.22.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
+        "@rollup/rollup-win32-x64-msvc": "4.22.4",
         "fsevents": "~2.3.2"
       }
     },
@@ -5049,9 +5176,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5275,6 +5402,15 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -5507,23 +5643,14 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/validator": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz",
-      "integrity": "sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/vite": {
-      "version": "5.2.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz",
-      "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz",
+      "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==",
       "dependencies": {
-        "esbuild": "^0.20.1",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -5542,6 +5669,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -5559,6 +5687,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -5594,18 +5725,20 @@
       }
     },
     "node_modules/vite-plugin-dts": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-3.9.1.tgz",
-      "integrity": "sha512-rVp2KM9Ue22NGWB8dNtWEr+KekN3rIgz1tWD050QnRGlriUCmaDwa7qA5zDEjbXg5lAXhYMSBJtx3q3hQIJZSg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.2.2.tgz",
+      "integrity": "sha512-USwTMReZFf8yXV+cKkm4WOMqmFjbReAvkyxON5xzdnZzJEBnFgax6BBDZIGGr9WMJYvhHdpaIHLrOjXDcla4OA==",
       "dev": true,
       "dependencies": {
-        "@microsoft/api-extractor": "7.43.0",
+        "@microsoft/api-extractor": "7.47.7",
         "@rollup/pluginutils": "^5.1.0",
-        "@vue/language-core": "^1.8.27",
-        "debug": "^4.3.4",
+        "@volar/typescript": "^2.4.4",
+        "@vue/language-core": "2.1.6",
+        "compare-versions": "^6.1.1",
+        "debug": "^4.3.6",
         "kolorist": "^1.8.0",
-        "magic-string": "^0.30.8",
-        "vue-tsc": "^1.8.27"
+        "local-pkg": "^0.5.0",
+        "magic-string": "^0.30.11"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -5620,6 +5753,22 @@
         }
       }
     },
+    "node_modules/vite-plugin-dts/node_modules/local-pkg": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
+      "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
+      "dev": true,
+      "dependencies": {
+        "mlly": "^1.4.2",
+        "pkg-types": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
     "node_modules/vite-plugin-node-polyfills": {
       "version": "0.17.0",
       "resolved": "https://registry.npmjs.org/vite-plugin-node-polyfills/-/vite-plugin-node-polyfills-0.17.0.tgz",
@@ -5750,32 +5899,11 @@
       "integrity": "sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==",
       "dev": true
     },
-    "node_modules/vue-template-compiler": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
-      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
-      "dev": true,
-      "dependencies": {
-        "de-indent": "^1.0.2",
-        "he": "^1.2.0"
-      }
-    },
-    "node_modules/vue-tsc": {
-      "version": "1.8.27",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.27.tgz",
-      "integrity": "sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==",
-      "dev": true,
-      "dependencies": {
-        "@volar/typescript": "~1.11.1",
-        "@vue/language-core": "1.8.27",
-        "semver": "^7.5.4"
-      },
-      "bin": {
-        "vue-tsc": "bin/vue-tsc.js"
-      },
-      "peerDependencies": {
-        "typescript": "*"
-      }
+    "node_modules/vscode-uri": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
+      "dev": true
     },
     "node_modules/which": {
       "version": "2.0.2",
@@ -5894,26 +6022,6 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/z-schema": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.5.tgz",
-      "integrity": "sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==",
-      "dev": true,
-      "dependencies": {
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "validator": "^13.7.0"
-      },
-      "bin": {
-        "z-schema": "bin/z-schema"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "commander": "^9.4.1"
-      }
     }
   }
 }
diff --git a/package.json b/package.json
index 382f2a9..d30da6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jackallabs/jackal.js-protos",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Package of all protos used by Jackal.js",
   "keywords": [
     "jackal",
@@ -80,7 +80,7 @@
     "typedoc": "^0.25.3",
     "typescript": "^5.2.2",
     "vite": "^5.2.10",
-    "vite-plugin-dts": "^3.6.3",
+    "vite-plugin-dts": "^4.2.2",
     "vite-tsconfig-paths": "^4.2.1",
     "vitest": "0.34.6"
   }
diff --git a/src/interfaces/snackages/IRnsExtension.ts b/src/interfaces/snackages/IRnsExtension.ts
index f761fc6..30e8351 100644
--- a/src/interfaces/snackages/IRnsExtension.ts
+++ b/src/interfaces/snackages/IRnsExtension.ts
@@ -7,8 +7,8 @@ import type {
   DQueryForSale,
   DQueryInit,
   DQueryListOwnedNames,
-  DQueryName,
-  DQueryRnsParams,
+  DQueryName, DQueryPrimaryName,
+  DQueryRnsParams, TQueryPrimaryNameResponseStrict,
 } from '@/types/queries'
 import type {
   TQueryAllBidsResponseStrict,
@@ -123,6 +123,14 @@ export interface IRnsExtensionMembers
    * @returns Promise<TQueryNameResponseStrict>
    */
   readonly name: (request: DQueryName) => Promise<TQueryNameResponseStrict>
+
+  /**
+   * @function primaryName
+   * @param {DQueryPrimaryName} request
+   * @returns Promise<TQueryPrimaryNameResponseStrict>
+   */
+  readonly primaryName: (request: DQueryPrimaryName) => Promise<TQueryPrimaryNameResponseStrict>
+
   /**
    * @function params
    * @param {DQueryRnsParams} [request]
diff --git a/src/interfaces/snackages/IStorageExtension.ts b/src/interfaces/snackages/IStorageExtension.ts
index c51b74c..3aa29aa 100644
--- a/src/interfaces/snackages/IStorageExtension.ts
+++ b/src/interfaces/snackages/IStorageExtension.ts
@@ -1,15 +1,18 @@
 import {
   DQueryActiveProviders,
   DQueryAllAttestations,
+  type DQueryAllGauges,
   DQueryAllProofs,
   DQueryAllProviders,
   DQueryAllReports,
   DQueryAllStoragePaymentInfo,
   DQueryAttestation,
+  type DQueryAvailableSpace,
   DQueryClientFreeSpace,
+  type DQueryFilesFromNote,
   DQueryFileUploadCheck,
   DQueryFindFile,
-  DQueryFreeSpace,
+  DQueryFreeSpace, type DQueryNetworkSize,
   DQueryOpenFiles,
   DQueryPayData,
   DQueryPriceCheck,
@@ -25,6 +28,9 @@ import {
   DQueryStoragePaymentInfo,
   DQueryStorageStats,
   DQueryStoreCount,
+  type TQueryAllGaugesResponseStrict,
+  type TQueryAvailableSpaceResponseStrict,
+  type TQueryFilesFromNoteResponseStrict, type TQueryNetworkSizeResponseStrict,
   TQueryStorageAllFilesByMerkleResponseStrict,
   TQueryStorageAllFilesByOwnerResponseStrict,
 } from '@/types/queries'
@@ -141,6 +147,15 @@ export interface IStorageExtensionMembers
     request: DQueryStorageAllFilesByOwner,
   ) => Promise<TQueryStorageAllFilesByOwnerResponseStrict>
 
+  /**
+   * @function allGauges
+   * @param {DQueryAllGauges} [request]
+   * @returns Promise<TQueryAllGaugesResponseStrict>
+   */
+  readonly allGauges: (
+      request?: DQueryAllGauges,
+  ) => Promise<TQueryAllGaugesResponseStrict>
+
   /**
    * @function allProofs
    * @param {DQueryAllProofs} [request]
@@ -186,6 +201,15 @@ export interface IStorageExtensionMembers
     request: DQueryAttestation,
   ) => Promise<TQueryAttestationResponseStrict>
 
+  /**
+   * @function availableSpace
+   * @param {DQueryAvailableSpace} [request]
+   * @returns Promise<TQueryAvailableSpaceResponseStrict>
+   */
+  readonly availableSpace: (
+      request?: DQueryAvailableSpace,
+  ) => Promise<TQueryAvailableSpaceResponseStrict>
+
   /**
    * @function clientFreeSpace
    * @param {DQueryClientFreeSpace} request
@@ -204,6 +228,15 @@ export interface IStorageExtensionMembers
     request: DQueryStorageFile,
   ) => Promise<TQueryStorageFileResponseStrict>
 
+  /**
+   * @function filesFromNote
+   * @param {DQueryFilesFromNote} request
+   * @returns Promise<TQueryFilesFromNoteResponseStrict>
+   */
+  readonly filesFromNote: (
+      request: DQueryFilesFromNote,
+  ) => Promise<TQueryFilesFromNoteResponseStrict>
+
   /**
    * @function fileUploadCheck
    * @param {DQueryFileUploadCheck} request
@@ -231,6 +264,15 @@ export interface IStorageExtensionMembers
     request: DQueryFreeSpace,
   ) => Promise<TQueryFreeSpaceResponseStrict>
 
+  /**
+   * @function networkSize
+   * @param {DQueryNetworkSize} [request]
+   * @returns Promise<TQueryNetworkSizeResponseStrict>
+   */
+  readonly networkSize: (
+      request?: DQueryNetworkSize,
+  ) => Promise<TQueryNetworkSizeResponseStrict>
+
   /**
    * @function openFiles
    * @param {DQueryOpenFiles} request
diff --git a/src/postGen/canine_chain/jklmint/params.ts b/src/postGen/canine_chain/jklmint/params.ts
index f41b08e..00604a3 100644
--- a/src/postGen/canine_chain/jklmint/params.ts
+++ b/src/postGen/canine_chain/jklmint/params.ts
@@ -14,33 +14,27 @@ export interface Params {
   mintDenom: string;
   /** default 8 */
   devGrantsRatio: number;
-  /** default 25 */
-  referralCommission: number;
-  /** default 12 */
-  storageProviderRatio: number;
   /** default 80 - this includes the community pool allocation */
   stakerRatio: number;
   /** default 4200000 */
   tokensPerBlock: number;
-  /** default 40 */
-  polRatio: number;
   /** default 6 */
   mintDecrease: number;
   /** multi-sig */
   storageStipendAddress: string;
+  /** default 12 */
+  storageProviderRatio: number;
 }
 
 function createBaseParams(): Params {
   return {
     mintDenom: "",
     devGrantsRatio: 0,
-    referralCommission: 0,
-    storageProviderRatio: 0,
     stakerRatio: 0,
     tokensPerBlock: 0,
-    polRatio: 0,
     mintDecrease: 0,
     storageStipendAddress: "",
+    storageProviderRatio: 0,
   };
 }
 
@@ -52,26 +46,20 @@ export const Params = {
     if (message.devGrantsRatio !== 0) {
       writer.uint32(16).int64(message.devGrantsRatio);
     }
-    if (message.referralCommission !== 0) {
-      writer.uint32(24).int64(message.referralCommission);
-    }
-    if (message.storageProviderRatio !== 0) {
-      writer.uint32(32).int64(message.storageProviderRatio);
-    }
     if (message.stakerRatio !== 0) {
-      writer.uint32(40).int64(message.stakerRatio);
+      writer.uint32(24).int64(message.stakerRatio);
     }
     if (message.tokensPerBlock !== 0) {
-      writer.uint32(48).int64(message.tokensPerBlock);
-    }
-    if (message.polRatio !== 0) {
-      writer.uint32(56).int64(message.polRatio);
+      writer.uint32(32).int64(message.tokensPerBlock);
     }
     if (message.mintDecrease !== 0) {
-      writer.uint32(64).int64(message.mintDecrease);
+      writer.uint32(40).int64(message.mintDecrease);
     }
     if (message.storageStipendAddress !== "") {
-      writer.uint32(74).string(message.storageStipendAddress);
+      writer.uint32(50).string(message.storageStipendAddress);
+    }
+    if (message.storageProviderRatio !== 0) {
+      writer.uint32(56).int64(message.storageProviderRatio);
     }
     return writer;
   },
@@ -102,49 +90,35 @@ export const Params = {
             break;
           }
 
-          message.referralCommission = longToNumber(reader.int64() as Long);
+          message.stakerRatio = longToNumber(reader.int64() as Long);
           continue;
         case 4:
           if (tag !== 32) {
             break;
           }
 
-          message.storageProviderRatio = longToNumber(reader.int64() as Long);
+          message.tokensPerBlock = longToNumber(reader.int64() as Long);
           continue;
         case 5:
           if (tag !== 40) {
             break;
           }
 
-          message.stakerRatio = longToNumber(reader.int64() as Long);
+          message.mintDecrease = longToNumber(reader.int64() as Long);
           continue;
         case 6:
-          if (tag !== 48) {
+          if (tag !== 50) {
             break;
           }
 
-          message.tokensPerBlock = longToNumber(reader.int64() as Long);
+          message.storageStipendAddress = reader.string();
           continue;
         case 7:
           if (tag !== 56) {
             break;
           }
 
-          message.polRatio = longToNumber(reader.int64() as Long);
-          continue;
-        case 8:
-          if (tag !== 64) {
-            break;
-          }
-
-          message.mintDecrease = longToNumber(reader.int64() as Long);
-          continue;
-        case 9:
-          if (tag !== 74) {
-            break;
-          }
-
-          message.storageStipendAddress = reader.string();
+          message.storageProviderRatio = longToNumber(reader.int64() as Long);
           continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
@@ -159,13 +133,11 @@ export const Params = {
     return {
       mintDenom: isSet(object.mintDenom) ? gt.String(object.mintDenom) : "",
       devGrantsRatio: isSet(object.devGrantsRatio) ? gt.Number(object.devGrantsRatio) : 0,
-      referralCommission: isSet(object.referralCommission) ? gt.Number(object.referralCommission) : 0,
-      storageProviderRatio: isSet(object.storageProviderRatio) ? gt.Number(object.storageProviderRatio) : 0,
       stakerRatio: isSet(object.stakerRatio) ? gt.Number(object.stakerRatio) : 0,
       tokensPerBlock: isSet(object.tokensPerBlock) ? gt.Number(object.tokensPerBlock) : 0,
-      polRatio: isSet(object.polRatio) ? gt.Number(object.polRatio) : 0,
       mintDecrease: isSet(object.mintDecrease) ? gt.Number(object.mintDecrease) : 0,
       storageStipendAddress: isSet(object.storageStipendAddress) ? gt.String(object.storageStipendAddress) : "",
+      storageProviderRatio: isSet(object.storageProviderRatio) ? gt.Number(object.storageProviderRatio) : 0,
     };
   },
 
@@ -177,27 +149,21 @@ export const Params = {
     if (message.devGrantsRatio !== 0) {
       obj.devGrantsRatio = Math.round(message.devGrantsRatio);
     }
-    if (message.referralCommission !== 0) {
-      obj.referralCommission = Math.round(message.referralCommission);
-    }
-    if (message.storageProviderRatio !== 0) {
-      obj.storageProviderRatio = Math.round(message.storageProviderRatio);
-    }
     if (message.stakerRatio !== 0) {
       obj.stakerRatio = Math.round(message.stakerRatio);
     }
     if (message.tokensPerBlock !== 0) {
       obj.tokensPerBlock = Math.round(message.tokensPerBlock);
     }
-    if (message.polRatio !== 0) {
-      obj.polRatio = Math.round(message.polRatio);
-    }
     if (message.mintDecrease !== 0) {
       obj.mintDecrease = Math.round(message.mintDecrease);
     }
     if (message.storageStipendAddress !== "") {
       obj.storageStipendAddress = message.storageStipendAddress;
     }
+    if (message.storageProviderRatio !== 0) {
+      obj.storageProviderRatio = Math.round(message.storageProviderRatio);
+    }
     return obj;
   },
 
@@ -208,13 +174,11 @@ export const Params = {
     const message = createBaseParams();
     message.mintDenom = object.mintDenom ?? "";
     message.devGrantsRatio = object.devGrantsRatio ?? 0;
-    message.referralCommission = object.referralCommission ?? 0;
-    message.storageProviderRatio = object.storageProviderRatio ?? 0;
     message.stakerRatio = object.stakerRatio ?? 0;
     message.tokensPerBlock = object.tokensPerBlock ?? 0;
-    message.polRatio = object.polRatio ?? 0;
     message.mintDecrease = object.mintDecrease ?? 0;
     message.storageStipendAddress = object.storageStipendAddress ?? "";
+    message.storageProviderRatio = object.storageProviderRatio ?? 0;
     return message;
   },
 };
diff --git a/src/postGen/canine_chain/rns/query.ts b/src/postGen/canine_chain/rns/query.ts
index b81ddfd..a138d47 100644
--- a/src/postGen/canine_chain/rns/query.ts
+++ b/src/postGen/canine_chain/rns/query.ts
@@ -30,6 +30,14 @@ export interface QueryNameResponse {
   name: Names | undefined;
 }
 
+export interface QueryPrimaryName {
+  owner: string;
+}
+
+export interface QueryPrimaryNameResponse {
+  name: Names | undefined;
+}
+
 export interface QueryListOwnedNames {
   address: string;
   pagination: PageRequest | undefined;
@@ -318,6 +326,120 @@ export const QueryNameResponse = {
   },
 };
 
+function createBaseQueryPrimaryName(): QueryPrimaryName {
+  return { owner: "" };
+}
+
+export const QueryPrimaryName = {
+  encode(message: QueryPrimaryName, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.owner !== "") {
+      writer.uint32(10).string(message.owner);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryPrimaryName {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryPrimaryName();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.owner = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryPrimaryName {
+    return { owner: isSet(object.owner) ? gt.String(object.owner) : "" };
+  },
+
+  toJSON(message: QueryPrimaryName): unknown {
+    const obj: any = {};
+    if (message.owner !== "") {
+      obj.owner = message.owner;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryPrimaryName>, I>>(base?: I): QueryPrimaryName {
+    return QueryPrimaryName.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryPrimaryName>, I>>(object: I): QueryPrimaryName {
+    const message = createBaseQueryPrimaryName();
+    message.owner = object.owner ?? "";
+    return message;
+  },
+};
+
+function createBaseQueryPrimaryNameResponse(): QueryPrimaryNameResponse {
+  return { name: undefined };
+}
+
+export const QueryPrimaryNameResponse = {
+  encode(message: QueryPrimaryNameResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.name !== undefined) {
+      Names.encode(message.name, writer.uint32(10).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryPrimaryNameResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryPrimaryNameResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.name = Names.decode(reader, reader.uint32());
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryPrimaryNameResponse {
+    return { name: isSet(object.name) ? Names.fromJSON(object.name) : undefined };
+  },
+
+  toJSON(message: QueryPrimaryNameResponse): unknown {
+    const obj: any = {};
+    if (message.name !== undefined) {
+      obj.name = Names.toJSON(message.name);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryPrimaryNameResponse>, I>>(base?: I): QueryPrimaryNameResponse {
+    return QueryPrimaryNameResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryPrimaryNameResponse>, I>>(object: I): QueryPrimaryNameResponse {
+    const message = createBaseQueryPrimaryNameResponse();
+    message.name = (object.name !== undefined && object.name !== null) ? Names.fromPartial(object.name) : undefined;
+    return message;
+  },
+};
+
 function createBaseQueryListOwnedNames(): QueryListOwnedNames {
   return { address: "", pagination: undefined };
 }
@@ -1374,6 +1496,8 @@ export interface Query {
   Init(request: QueryInit): Promise<QueryInitResponse>;
   /** Queries a list of Init items. */
   AllInits(request: QueryAllInits): Promise<QueryAllInitsResponse>;
+  /** Queries a list of Init items. */
+  PrimaryName(request: QueryPrimaryName): Promise<QueryPrimaryNameResponse>;
 }
 
 export const QueryServiceName = "canine_chain.rns.Query";
@@ -1393,6 +1517,7 @@ export class QueryClientImpl implements Query {
     this.AllForSale = this.AllForSale.bind(this);
     this.Init = this.Init.bind(this);
     this.AllInits = this.AllInits.bind(this);
+    this.PrimaryName = this.PrimaryName.bind(this);
   }
   Params(request: QueryParams): Promise<QueryParamsResponse> {
     const data = QueryParams.encode(request).finish();
@@ -1453,6 +1578,12 @@ export class QueryClientImpl implements Query {
     const promise = this.rpc.request(this.service, "AllInits", data);
     return promise.then((data) => QueryAllInitsResponse.decode(_m0.Reader.create(data)));
   }
+
+  PrimaryName(request: QueryPrimaryName): Promise<QueryPrimaryNameResponse> {
+    const data = QueryPrimaryName.encode(request).finish();
+    const promise = this.rpc.request(this.service, "PrimaryName", data);
+    return promise.then((data) => QueryPrimaryNameResponse.decode(_m0.Reader.create(data)));
+  }
 }
 
 interface Rpc {
diff --git a/src/postGen/canine_chain/rns/tx.ts b/src/postGen/canine_chain/rns/tx.ts
index 181f48c..0a82cb1 100644
--- a/src/postGen/canine_chain/rns/tx.ts
+++ b/src/postGen/canine_chain/rns/tx.ts
@@ -11,6 +11,7 @@ import { Coin } from "../../cosmos/base/v1beta1/coin";
 
 export const protobufPackage = "canine_chain.rns";
 
+/** Deprecated! Use MsgRegisterName instead */
 export interface MsgRegister {
   creator: string;
   name: string;
@@ -21,6 +22,17 @@ export interface MsgRegister {
 export interface MsgRegisterResponse {
 }
 
+export interface MsgRegisterName {
+  creator: string;
+  name: string;
+  years: number;
+  data: string;
+  setPrimary: boolean;
+}
+
+export interface MsgRegisterNameResponse {
+}
+
 export interface MsgUpdate {
   creator: string;
   name: string;
@@ -30,6 +42,14 @@ export interface MsgUpdate {
 export interface MsgUpdateResponse {
 }
 
+export interface MsgMakePrimary {
+  creator: string;
+  name: string;
+}
+
+export interface MsgMakePrimaryResponse {
+}
+
 export interface MsgBid {
   creator: string;
   name: string;
@@ -263,6 +283,168 @@ export const MsgRegisterResponse = {
   },
 };
 
+function createBaseMsgRegisterName(): MsgRegisterName {
+  return { creator: "", name: "", years: 0, data: "", setPrimary: false };
+}
+
+export const MsgRegisterName = {
+  encode(message: MsgRegisterName, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.creator !== "") {
+      writer.uint32(10).string(message.creator);
+    }
+    if (message.name !== "") {
+      writer.uint32(18).string(message.name);
+    }
+    if (message.years !== 0) {
+      writer.uint32(24).int64(message.years);
+    }
+    if (message.data !== "") {
+      writer.uint32(34).string(message.data);
+    }
+    if (message.setPrimary !== false) {
+      writer.uint32(40).bool(message.setPrimary);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): MsgRegisterName {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseMsgRegisterName();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.creator = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.name = reader.string();
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.years = longToNumber(reader.int64() as Long);
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          message.data = reader.string();
+          continue;
+        case 5:
+          if (tag !== 40) {
+            break;
+          }
+
+          message.setPrimary = reader.bool();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): MsgRegisterName {
+    return {
+      creator: isSet(object.creator) ? gt.String(object.creator) : "",
+      name: isSet(object.name) ? gt.String(object.name) : "",
+      years: isSet(object.years) ? gt.Number(object.years) : 0,
+      data: isSet(object.data) ? gt.String(object.data) : "",
+      setPrimary: isSet(object.setPrimary) ? gt.Boolean(object.setPrimary) : false,
+    };
+  },
+
+  toJSON(message: MsgRegisterName): unknown {
+    const obj: any = {};
+    if (message.creator !== "") {
+      obj.creator = message.creator;
+    }
+    if (message.name !== "") {
+      obj.name = message.name;
+    }
+    if (message.years !== 0) {
+      obj.years = Math.round(message.years);
+    }
+    if (message.data !== "") {
+      obj.data = message.data;
+    }
+    if (message.setPrimary !== false) {
+      obj.setPrimary = message.setPrimary;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<MsgRegisterName>, I>>(base?: I): MsgRegisterName {
+    return MsgRegisterName.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<MsgRegisterName>, I>>(object: I): MsgRegisterName {
+    const message = createBaseMsgRegisterName();
+    message.creator = object.creator ?? "";
+    message.name = object.name ?? "";
+    message.years = object.years ?? 0;
+    message.data = object.data ?? "";
+    message.setPrimary = object.setPrimary ?? false;
+    return message;
+  },
+};
+
+function createBaseMsgRegisterNameResponse(): MsgRegisterNameResponse {
+  return {};
+}
+
+export const MsgRegisterNameResponse = {
+  encode(_: MsgRegisterNameResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): MsgRegisterNameResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseMsgRegisterNameResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): MsgRegisterNameResponse {
+    return {};
+  },
+
+  toJSON(_: MsgRegisterNameResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<MsgRegisterNameResponse>, I>>(base?: I): MsgRegisterNameResponse {
+    return MsgRegisterNameResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<MsgRegisterNameResponse>, I>>(_: I): MsgRegisterNameResponse {
+    const message = createBaseMsgRegisterNameResponse();
+    return message;
+  },
+};
+
 function createBaseMsgUpdate(): MsgUpdate {
   return { creator: "", name: "", data: "" };
 }
@@ -395,6 +577,123 @@ export const MsgUpdateResponse = {
   },
 };
 
+function createBaseMsgMakePrimary(): MsgMakePrimary {
+  return { creator: "", name: "" };
+}
+
+export const MsgMakePrimary = {
+  encode(message: MsgMakePrimary, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.creator !== "") {
+      writer.uint32(10).string(message.creator);
+    }
+    if (message.name !== "") {
+      writer.uint32(18).string(message.name);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): MsgMakePrimary {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseMsgMakePrimary();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.creator = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.name = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): MsgMakePrimary {
+    return {
+      creator: isSet(object.creator) ? gt.String(object.creator) : "",
+      name: isSet(object.name) ? gt.String(object.name) : "",
+    };
+  },
+
+  toJSON(message: MsgMakePrimary): unknown {
+    const obj: any = {};
+    if (message.creator !== "") {
+      obj.creator = message.creator;
+    }
+    if (message.name !== "") {
+      obj.name = message.name;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<MsgMakePrimary>, I>>(base?: I): MsgMakePrimary {
+    return MsgMakePrimary.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<MsgMakePrimary>, I>>(object: I): MsgMakePrimary {
+    const message = createBaseMsgMakePrimary();
+    message.creator = object.creator ?? "";
+    message.name = object.name ?? "";
+    return message;
+  },
+};
+
+function createBaseMsgMakePrimaryResponse(): MsgMakePrimaryResponse {
+  return {};
+}
+
+export const MsgMakePrimaryResponse = {
+  encode(_: MsgMakePrimaryResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): MsgMakePrimaryResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseMsgMakePrimaryResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): MsgMakePrimaryResponse {
+    return {};
+  },
+
+  toJSON(_: MsgMakePrimaryResponse): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<MsgMakePrimaryResponse>, I>>(base?: I): MsgMakePrimaryResponse {
+    return MsgMakePrimaryResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<MsgMakePrimaryResponse>, I>>(_: I): MsgMakePrimaryResponse {
+    const message = createBaseMsgMakePrimaryResponse();
+    return message;
+  },
+};
+
 function createBaseMsgBid(): MsgBid {
   return { creator: "", name: "", bid: undefined };
 }
@@ -1655,6 +1954,7 @@ export const MsgInitResponse = {
 
 export interface Msg {
   Register(request: MsgRegister): Promise<MsgRegisterResponse>;
+  RegisterName(request: MsgRegisterName): Promise<MsgRegisterNameResponse>;
   Bid(request: MsgBid): Promise<MsgBidResponse>;
   AcceptBid(request: MsgAcceptBid): Promise<MsgAcceptBidResponse>;
   CancelBid(request: MsgCancelBid): Promise<MsgCancelBidResponse>;
@@ -1666,6 +1966,7 @@ export interface Msg {
   DelRecord(request: MsgDelRecord): Promise<MsgDelRecordResponse>;
   Init(request: MsgInit): Promise<MsgInitResponse>;
   Update(request: MsgUpdate): Promise<MsgUpdateResponse>;
+  MakePrimary(request: MsgMakePrimary): Promise<MsgMakePrimaryResponse>;
 }
 
 export const MsgServiceName = "canine_chain.rns.Msg";
@@ -1676,6 +1977,7 @@ export class MsgClientImpl implements Msg {
     this.service = opts?.service || MsgServiceName;
     this.rpc = rpc;
     this.Register = this.Register.bind(this);
+    this.RegisterName = this.RegisterName.bind(this);
     this.Bid = this.Bid.bind(this);
     this.AcceptBid = this.AcceptBid.bind(this);
     this.CancelBid = this.CancelBid.bind(this);
@@ -1687,6 +1989,7 @@ export class MsgClientImpl implements Msg {
     this.DelRecord = this.DelRecord.bind(this);
     this.Init = this.Init.bind(this);
     this.Update = this.Update.bind(this);
+    this.MakePrimary = this.MakePrimary.bind(this);
   }
   Register(request: MsgRegister): Promise<MsgRegisterResponse> {
     const data = MsgRegister.encode(request).finish();
@@ -1694,6 +1997,12 @@ export class MsgClientImpl implements Msg {
     return promise.then((data) => MsgRegisterResponse.decode(_m0.Reader.create(data)));
   }
 
+  RegisterName(request: MsgRegisterName): Promise<MsgRegisterNameResponse> {
+    const data = MsgRegisterName.encode(request).finish();
+    const promise = this.rpc.request(this.service, "RegisterName", data);
+    return promise.then((data) => MsgRegisterNameResponse.decode(_m0.Reader.create(data)));
+  }
+
   Bid(request: MsgBid): Promise<MsgBidResponse> {
     const data = MsgBid.encode(request).finish();
     const promise = this.rpc.request(this.service, "Bid", data);
@@ -1759,6 +2068,12 @@ export class MsgClientImpl implements Msg {
     const promise = this.rpc.request(this.service, "Update", data);
     return promise.then((data) => MsgUpdateResponse.decode(_m0.Reader.create(data)));
   }
+
+  MakePrimary(request: MsgMakePrimary): Promise<MsgMakePrimaryResponse> {
+    const data = MsgMakePrimary.encode(request).finish();
+    const promise = this.rpc.request(this.service, "MakePrimary", data);
+    return promise.then((data) => MsgMakePrimaryResponse.decode(_m0.Reader.create(data)));
+  }
 }
 
 interface Rpc {
diff --git a/src/postGen/canine_chain/storage/params.ts b/src/postGen/canine_chain/storage/params.ts
index 1548c03..18148c5 100644
--- a/src/postGen/canine_chain/storage/params.ts
+++ b/src/postGen/canine_chain/storage/params.ts
@@ -27,6 +27,10 @@ export interface Params {
   /** TODO: fix casing */
   collateralPrice: number;
   checkWindow: number;
+  /** default 40 */
+  polRatio: number;
+  /** default 25 */
+  referralCommission: number;
 }
 
 function createBaseParams(): Params {
@@ -42,6 +46,8 @@ function createBaseParams(): Params {
     attestMinToPass: 0,
     collateralPrice: 0,
     checkWindow: 0,
+    polRatio: 0,
+    referralCommission: 0,
   };
 }
 
@@ -80,6 +86,12 @@ export const Params = {
     if (message.checkWindow !== 0) {
       writer.uint32(88).int64(message.checkWindow);
     }
+    if (message.polRatio !== 0) {
+      writer.uint32(96).int64(message.polRatio);
+    }
+    if (message.referralCommission !== 0) {
+      writer.uint32(104).int64(message.referralCommission);
+    }
     return writer;
   },
 
@@ -167,6 +179,20 @@ export const Params = {
 
           message.checkWindow = longToNumber(reader.int64() as Long);
           continue;
+        case 12:
+          if (tag !== 96) {
+            break;
+          }
+
+          message.polRatio = longToNumber(reader.int64() as Long);
+          continue;
+        case 13:
+          if (tag !== 104) {
+            break;
+          }
+
+          message.referralCommission = longToNumber(reader.int64() as Long);
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -189,6 +215,8 @@ export const Params = {
       attestMinToPass: isSet(object.attestMinToPass) ? gt.Number(object.attestMinToPass) : 0,
       collateralPrice: isSet(object.collateralPrice) ? gt.Number(object.collateralPrice) : 0,
       checkWindow: isSet(object.checkWindow) ? gt.Number(object.checkWindow) : 0,
+      polRatio: isSet(object.polRatio) ? gt.Number(object.polRatio) : 0,
+      referralCommission: isSet(object.referralCommission) ? gt.Number(object.referralCommission) : 0,
     };
   },
 
@@ -227,6 +255,12 @@ export const Params = {
     if (message.checkWindow !== 0) {
       obj.checkWindow = Math.round(message.checkWindow);
     }
+    if (message.polRatio !== 0) {
+      obj.polRatio = Math.round(message.polRatio);
+    }
+    if (message.referralCommission !== 0) {
+      obj.referralCommission = Math.round(message.referralCommission);
+    }
     return obj;
   },
 
@@ -246,6 +280,8 @@ export const Params = {
     message.attestMinToPass = object.attestMinToPass ?? 0;
     message.collateralPrice = object.collateralPrice ?? 0;
     message.checkWindow = object.checkWindow ?? 0;
+    message.polRatio = object.polRatio ?? 0;
+    message.referralCommission = object.referralCommission ?? 0;
     return message;
   },
 };
diff --git a/src/postGen/canine_chain/storage/query.ts b/src/postGen/canine_chain/storage/query.ts
index a9cf339..f2ea6c8 100644
--- a/src/postGen/canine_chain/storage/query.ts
+++ b/src/postGen/canine_chain/storage/query.ts
@@ -10,7 +10,7 @@ import _m0 from "protobufjs/minimal";
 import { PageRequest, PageResponse } from "../../cosmos/base/query/v1beta1/pagination";
 import { FileProof, UnifiedFile } from "./active_deals";
 import { Params } from "./params";
-import { StoragePaymentInfo } from "./payment_info";
+import { PaymentGauge, StoragePaymentInfo } from "./payment_info";
 import { ActiveProviders, AttestationForm, Providers, ReportForm } from "./providers";
 
 export const protobufPackage = "canine_chain.storage";
@@ -52,6 +52,15 @@ export interface QueryAllProofsResponse {
   pagination: PageResponse | undefined;
 }
 
+export interface QueryAllGauges {
+  pagination: PageRequest | undefined;
+}
+
+export interface QueryAllGaugesResponse {
+  gauges: PaymentGauge[];
+  pagination: PageResponse | undefined;
+}
+
 export interface QueryFile {
   merkle: Uint8Array;
   owner: string;
@@ -62,6 +71,17 @@ export interface QueryFileResponse {
   file: UnifiedFile | undefined;
 }
 
+export interface QueryFilesFromNote {
+  pagination: PageRequest | undefined;
+  key: string;
+  value: string;
+}
+
+export interface QueryFilesFromNoteResponse {
+  files: UnifiedFile[];
+  pagination: PageResponse | undefined;
+}
+
 export interface QueryOpenFiles {
   providerAddress: string;
   pagination: PageRequest | undefined;
@@ -254,6 +274,20 @@ export interface QueryStorageStatsResponse_UsersByPlanEntry {
   value: number;
 }
 
+export interface QueryNetworkSize {
+}
+
+export interface QueryNetworkSizeResponse {
+  size: number;
+}
+
+export interface QueryAvailableSpace {
+}
+
+export interface QueryAvailableSpaceResponse {
+  size: number;
+}
+
 function createBaseQueryParams(): QueryParams {
   return {};
 }
@@ -806,6 +840,141 @@ export const QueryAllProofsResponse = {
   },
 };
 
+function createBaseQueryAllGauges(): QueryAllGauges {
+  return { pagination: undefined };
+}
+
+export const QueryAllGauges = {
+  encode(message: QueryAllGauges, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.pagination !== undefined) {
+      PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllGauges {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryAllGauges();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.pagination = PageRequest.decode(reader, reader.uint32());
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryAllGauges {
+    return { pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined };
+  },
+
+  toJSON(message: QueryAllGauges): unknown {
+    const obj: any = {};
+    if (message.pagination !== undefined) {
+      obj.pagination = PageRequest.toJSON(message.pagination);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryAllGauges>, I>>(base?: I): QueryAllGauges {
+    return QueryAllGauges.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryAllGauges>, I>>(object: I): QueryAllGauges {
+    const message = createBaseQueryAllGauges();
+    message.pagination = (object.pagination !== undefined && object.pagination !== null)
+      ? PageRequest.fromPartial(object.pagination)
+      : undefined;
+    return message;
+  },
+};
+
+function createBaseQueryAllGaugesResponse(): QueryAllGaugesResponse {
+  return { gauges: [], pagination: undefined };
+}
+
+export const QueryAllGaugesResponse = {
+  encode(message: QueryAllGaugesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    for (const v of message.gauges) {
+      PaymentGauge.encode(v!, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.pagination !== undefined) {
+      PageResponse.encode(message.pagination, writer.uint32(18).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllGaugesResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryAllGaugesResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.gauges.push(PaymentGauge.decode(reader, reader.uint32()));
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.pagination = PageResponse.decode(reader, reader.uint32());
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryAllGaugesResponse {
+    return {
+      gauges: gt.Array.isArray(object?.gauges) ? object.gauges.map((e: any) => PaymentGauge.fromJSON(e)) : [],
+      pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined,
+    };
+  },
+
+  toJSON(message: QueryAllGaugesResponse): unknown {
+    const obj: any = {};
+    if (message.gauges?.length) {
+      obj.gauges = message.gauges.map((e) => PaymentGauge.toJSON(e));
+    }
+    if (message.pagination !== undefined) {
+      obj.pagination = PageResponse.toJSON(message.pagination);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryAllGaugesResponse>, I>>(base?: I): QueryAllGaugesResponse {
+    return QueryAllGaugesResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryAllGaugesResponse>, I>>(object: I): QueryAllGaugesResponse {
+    const message = createBaseQueryAllGaugesResponse();
+    message.gauges = object.gauges?.map((e) => PaymentGauge.fromPartial(e)) || [];
+    message.pagination = (object.pagination !== undefined && object.pagination !== null)
+      ? PageResponse.fromPartial(object.pagination)
+      : undefined;
+    return message;
+  },
+};
+
 function createBaseQueryFile(): QueryFile {
   return { merkle: new Uint8Array(0), owner: "", start: 0 };
 }
@@ -954,6 +1123,173 @@ export const QueryFileResponse = {
   },
 };
 
+function createBaseQueryFilesFromNote(): QueryFilesFromNote {
+  return { pagination: undefined, key: "", value: "" };
+}
+
+export const QueryFilesFromNote = {
+  encode(message: QueryFilesFromNote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.pagination !== undefined) {
+      PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.key !== "") {
+      writer.uint32(18).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(26).string(message.value);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryFilesFromNote {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryFilesFromNote();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.pagination = PageRequest.decode(reader, reader.uint32());
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.key = reader.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.value = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryFilesFromNote {
+    return {
+      pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined,
+      key: isSet(object.key) ? gt.String(object.key) : "",
+      value: isSet(object.value) ? gt.String(object.value) : "",
+    };
+  },
+
+  toJSON(message: QueryFilesFromNote): unknown {
+    const obj: any = {};
+    if (message.pagination !== undefined) {
+      obj.pagination = PageRequest.toJSON(message.pagination);
+    }
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryFilesFromNote>, I>>(base?: I): QueryFilesFromNote {
+    return QueryFilesFromNote.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryFilesFromNote>, I>>(object: I): QueryFilesFromNote {
+    const message = createBaseQueryFilesFromNote();
+    message.pagination = (object.pagination !== undefined && object.pagination !== null)
+      ? PageRequest.fromPartial(object.pagination)
+      : undefined;
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
+    return message;
+  },
+};
+
+function createBaseQueryFilesFromNoteResponse(): QueryFilesFromNoteResponse {
+  return { files: [], pagination: undefined };
+}
+
+export const QueryFilesFromNoteResponse = {
+  encode(message: QueryFilesFromNoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    for (const v of message.files) {
+      UnifiedFile.encode(v!, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.pagination !== undefined) {
+      PageResponse.encode(message.pagination, writer.uint32(18).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryFilesFromNoteResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryFilesFromNoteResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.files.push(UnifiedFile.decode(reader, reader.uint32()));
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.pagination = PageResponse.decode(reader, reader.uint32());
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryFilesFromNoteResponse {
+    return {
+      files: gt.Array.isArray(object?.files) ? object.files.map((e: any) => UnifiedFile.fromJSON(e)) : [],
+      pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined,
+    };
+  },
+
+  toJSON(message: QueryFilesFromNoteResponse): unknown {
+    const obj: any = {};
+    if (message.files?.length) {
+      obj.files = message.files.map((e) => UnifiedFile.toJSON(e));
+    }
+    if (message.pagination !== undefined) {
+      obj.pagination = PageResponse.toJSON(message.pagination);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryFilesFromNoteResponse>, I>>(base?: I): QueryFilesFromNoteResponse {
+    return QueryFilesFromNoteResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryFilesFromNoteResponse>, I>>(object: I): QueryFilesFromNoteResponse {
+    const message = createBaseQueryFilesFromNoteResponse();
+    message.files = object.files?.map((e) => UnifiedFile.fromPartial(e)) || [];
+    message.pagination = (object.pagination !== undefined && object.pagination !== null)
+      ? PageResponse.fromPartial(object.pagination)
+      : undefined;
+    return message;
+  },
+};
+
 function createBaseQueryOpenFiles(): QueryOpenFiles {
   return { providerAddress: "", pagination: undefined };
 }
@@ -3815,10 +4151,212 @@ export const QueryStorageStatsResponse_UsersByPlanEntry = {
   },
 };
 
+function createBaseQueryNetworkSize(): QueryNetworkSize {
+  return {};
+}
+
+export const QueryNetworkSize = {
+  encode(_: QueryNetworkSize, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryNetworkSize {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryNetworkSize();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): QueryNetworkSize {
+    return {};
+  },
+
+  toJSON(_: QueryNetworkSize): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryNetworkSize>, I>>(base?: I): QueryNetworkSize {
+    return QueryNetworkSize.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryNetworkSize>, I>>(_: I): QueryNetworkSize {
+    const message = createBaseQueryNetworkSize();
+    return message;
+  },
+};
+
+function createBaseQueryNetworkSizeResponse(): QueryNetworkSizeResponse {
+  return { size: 0 };
+}
+
+export const QueryNetworkSizeResponse = {
+  encode(message: QueryNetworkSizeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.size !== 0) {
+      writer.uint32(8).uint64(message.size);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryNetworkSizeResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryNetworkSizeResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.size = longToNumber(reader.uint64() as Long);
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryNetworkSizeResponse {
+    return { size: isSet(object.size) ? gt.Number(object.size) : 0 };
+  },
+
+  toJSON(message: QueryNetworkSizeResponse): unknown {
+    const obj: any = {};
+    if (message.size !== 0) {
+      obj.size = Math.round(message.size);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryNetworkSizeResponse>, I>>(base?: I): QueryNetworkSizeResponse {
+    return QueryNetworkSizeResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryNetworkSizeResponse>, I>>(object: I): QueryNetworkSizeResponse {
+    const message = createBaseQueryNetworkSizeResponse();
+    message.size = object.size ?? 0;
+    return message;
+  },
+};
+
+function createBaseQueryAvailableSpace(): QueryAvailableSpace {
+  return {};
+}
+
+export const QueryAvailableSpace = {
+  encode(_: QueryAvailableSpace, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryAvailableSpace {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryAvailableSpace();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(_: any): QueryAvailableSpace {
+    return {};
+  },
+
+  toJSON(_: QueryAvailableSpace): unknown {
+    const obj: any = {};
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryAvailableSpace>, I>>(base?: I): QueryAvailableSpace {
+    return QueryAvailableSpace.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryAvailableSpace>, I>>(_: I): QueryAvailableSpace {
+    const message = createBaseQueryAvailableSpace();
+    return message;
+  },
+};
+
+function createBaseQueryAvailableSpaceResponse(): QueryAvailableSpaceResponse {
+  return { size: 0 };
+}
+
+export const QueryAvailableSpaceResponse = {
+  encode(message: QueryAvailableSpaceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.size !== 0) {
+      writer.uint32(8).uint64(message.size);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): QueryAvailableSpaceResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseQueryAvailableSpaceResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.size = longToNumber(reader.uint64() as Long);
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): QueryAvailableSpaceResponse {
+    return { size: isSet(object.size) ? gt.Number(object.size) : 0 };
+  },
+
+  toJSON(message: QueryAvailableSpaceResponse): unknown {
+    const obj: any = {};
+    if (message.size !== 0) {
+      obj.size = Math.round(message.size);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<QueryAvailableSpaceResponse>, I>>(base?: I): QueryAvailableSpaceResponse {
+    return QueryAvailableSpaceResponse.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<QueryAvailableSpaceResponse>, I>>(object: I): QueryAvailableSpaceResponse {
+    const message = createBaseQueryAvailableSpaceResponse();
+    message.size = object.size ?? 0;
+    return message;
+  },
+};
+
 export interface Query {
   Params(request: QueryParams): Promise<QueryParamsResponse>;
   /** Queries a File by merkle, owner, and start. */
   File(request: QueryFile): Promise<QueryFileResponse>;
+  /** Queries a File by merkle, owner, and start. */
+  FilesFromNote(request: QueryFilesFromNote): Promise<QueryFilesFromNoteResponse>;
   /** Queries a list of open files by provider_address. */
   OpenFiles(request: QueryOpenFiles): Promise<QueryAllFilesResponse>;
   /** Queries a list of File items. */
@@ -3867,6 +4405,12 @@ export interface Query {
   ActiveProviders(request: QueryActiveProviders): Promise<QueryActiveProvidersResponse>;
   /** Queries protocol storage space used and purchased. */
   StorageStats(request: QueryStorageStats): Promise<QueryStorageStatsResponse>;
+  /** Queries how much storage space is being used on the network at this time. */
+  NetworkSize(request: QueryNetworkSize): Promise<QueryNetworkSizeResponse>;
+  /** Queries the amount of offered storage by active providers */
+  AvailableSpace(request: QueryAvailableSpace): Promise<QueryAvailableSpaceResponse>;
+  /** Queries protocol storage space used and purchased. */
+  Gauges(request: QueryAllGauges): Promise<QueryAllGaugesResponse>;
 }
 
 export const QueryServiceName = "canine_chain.storage.Query";
@@ -3878,6 +4422,7 @@ export class QueryClientImpl implements Query {
     this.rpc = rpc;
     this.Params = this.Params.bind(this);
     this.File = this.File.bind(this);
+    this.FilesFromNote = this.FilesFromNote.bind(this);
     this.OpenFiles = this.OpenFiles.bind(this);
     this.AllFiles = this.AllFiles.bind(this);
     this.AllFilesByMerkle = this.AllFilesByMerkle.bind(this);
@@ -3902,6 +4447,9 @@ export class QueryClientImpl implements Query {
     this.PriceCheck = this.PriceCheck.bind(this);
     this.ActiveProviders = this.ActiveProviders.bind(this);
     this.StorageStats = this.StorageStats.bind(this);
+    this.NetworkSize = this.NetworkSize.bind(this);
+    this.AvailableSpace = this.AvailableSpace.bind(this);
+    this.Gauges = this.Gauges.bind(this);
   }
   Params(request: QueryParams): Promise<QueryParamsResponse> {
     const data = QueryParams.encode(request).finish();
@@ -3915,6 +4463,12 @@ export class QueryClientImpl implements Query {
     return promise.then((data) => QueryFileResponse.decode(_m0.Reader.create(data)));
   }
 
+  FilesFromNote(request: QueryFilesFromNote): Promise<QueryFilesFromNoteResponse> {
+    const data = QueryFilesFromNote.encode(request).finish();
+    const promise = this.rpc.request(this.service, "FilesFromNote", data);
+    return promise.then((data) => QueryFilesFromNoteResponse.decode(_m0.Reader.create(data)));
+  }
+
   OpenFiles(request: QueryOpenFiles): Promise<QueryAllFilesResponse> {
     const data = QueryOpenFiles.encode(request).finish();
     const promise = this.rpc.request(this.service, "OpenFiles", data);
@@ -4058,6 +4612,24 @@ export class QueryClientImpl implements Query {
     const promise = this.rpc.request(this.service, "StorageStats", data);
     return promise.then((data) => QueryStorageStatsResponse.decode(_m0.Reader.create(data)));
   }
+
+  NetworkSize(request: QueryNetworkSize): Promise<QueryNetworkSizeResponse> {
+    const data = QueryNetworkSize.encode(request).finish();
+    const promise = this.rpc.request(this.service, "NetworkSize", data);
+    return promise.then((data) => QueryNetworkSizeResponse.decode(_m0.Reader.create(data)));
+  }
+
+  AvailableSpace(request: QueryAvailableSpace): Promise<QueryAvailableSpaceResponse> {
+    const data = QueryAvailableSpace.encode(request).finish();
+    const promise = this.rpc.request(this.service, "AvailableSpace", data);
+    return promise.then((data) => QueryAvailableSpaceResponse.decode(_m0.Reader.create(data)));
+  }
+
+  Gauges(request: QueryAllGauges): Promise<QueryAllGaugesResponse> {
+    const data = QueryAllGauges.encode(request).finish();
+    const promise = this.rpc.request(this.service, "Gauges", data);
+    return promise.then((data) => QueryAllGaugesResponse.decode(_m0.Reader.create(data)));
+  }
 }
 
 interface Rpc {
diff --git a/src/postGen/google/protobuf/any.ts b/src/postGen/google/protobuf/any.ts
index 3a7820d..51e9cc2 100644
--- a/src/postGen/google/protobuf/any.ts
+++ b/src/postGen/google/protobuf/any.ts
@@ -34,8 +34,12 @@ export const protobufPackage = "google.protobuf";
  *     if (any.is(Foo.class)) {
  *       foo = any.unpack(Foo.class);
  *     }
+ *     // or ...
+ *     if (any.isSameTypeAs(Foo.getDefaultInstance())) {
+ *       foo = any.unpack(Foo.getDefaultInstance());
+ *     }
  *
- * Example 3: Pack and unpack a message in Python.
+ *  Example 3: Pack and unpack a message in Python.
  *
  *     foo = Foo(...)
  *     any = Any()
@@ -45,7 +49,7 @@ export const protobufPackage = "google.protobuf";
  *       any.Unpack(foo)
  *       ...
  *
- * Example 4: Pack and unpack a message in Go
+ *  Example 4: Pack and unpack a message in Go
  *
  *      foo := &pb.Foo{...}
  *      any, err := anypb.New(foo)
@@ -65,7 +69,7 @@ export const protobufPackage = "google.protobuf";
  * name "y.z".
  *
  * JSON
- *
+ * ====
  * The JSON representation of an `Any` value uses the regular
  * representation of the deserialized, embedded message, with an
  * additional field `@type` which contains the type URL. Example:
@@ -117,7 +121,8 @@ export interface Any {
    *
    * Note: this functionality is not currently available in the official
    * protobuf release, and it is not used for type URLs beginning with
-   * type.googleapis.com.
+   * type.googleapis.com. As of May 2023, there are no widely used type server
+   * implementations and no plans to implement one.
    *
    * Schemes other than `http`, `https` (or the empty scheme) might be
    * used with implementation specific semantics.
diff --git a/src/postGen/google/protobuf/descriptor.ts b/src/postGen/google/protobuf/descriptor.ts
index 5d043e9..e4b36f4 100644
--- a/src/postGen/google/protobuf/descriptor.ts
+++ b/src/postGen/google/protobuf/descriptor.ts
@@ -10,6 +10,125 @@ import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "google.protobuf";
 
+/** The full set of known editions. */
+export enum Edition {
+  /** EDITION_UNKNOWN - A placeholder for an unknown edition value. */
+  EDITION_UNKNOWN = 0,
+  /**
+   * EDITION_LEGACY - A placeholder edition for specifying default behaviors *before* a feature
+   * was first introduced.  This is effectively an "infinite past".
+   */
+  EDITION_LEGACY = 900,
+  /**
+   * EDITION_PROTO2 - Legacy syntax "editions".  These pre-date editions, but behave much like
+   * distinct editions.  These can't be used to specify the edition of proto
+   * files, but feature definitions must supply proto2/proto3 defaults for
+   * backwards compatibility.
+   */
+  EDITION_PROTO2 = 998,
+  EDITION_PROTO3 = 999,
+  /**
+   * EDITION_2023 - Editions that have been released.  The specific values are arbitrary and
+   * should not be depended on, but they will always be time-ordered for easy
+   * comparison.
+   */
+  EDITION_2023 = 1000,
+  EDITION_2024 = 1001,
+  /**
+   * EDITION_1_TEST_ONLY - Placeholder editions for testing feature resolution.  These should not be
+   * used or relyed on outside of tests.
+   */
+  EDITION_1_TEST_ONLY = 1,
+  EDITION_2_TEST_ONLY = 2,
+  EDITION_99997_TEST_ONLY = 99997,
+  EDITION_99998_TEST_ONLY = 99998,
+  EDITION_99999_TEST_ONLY = 99999,
+  /**
+   * EDITION_MAX - Placeholder for specifying unbounded edition support.  This should only
+   * ever be used by plugins that can expect to never require any changes to
+   * support a new edition.
+   */
+  EDITION_MAX = 2147483647,
+  UNRECOGNIZED = -1,
+}
+
+export function editionFromJSON(object: any): Edition {
+  switch (object) {
+    case 0:
+    case "EDITION_UNKNOWN":
+      return Edition.EDITION_UNKNOWN;
+    case 900:
+    case "EDITION_LEGACY":
+      return Edition.EDITION_LEGACY;
+    case 998:
+    case "EDITION_PROTO2":
+      return Edition.EDITION_PROTO2;
+    case 999:
+    case "EDITION_PROTO3":
+      return Edition.EDITION_PROTO3;
+    case 1000:
+    case "EDITION_2023":
+      return Edition.EDITION_2023;
+    case 1001:
+    case "EDITION_2024":
+      return Edition.EDITION_2024;
+    case 1:
+    case "EDITION_1_TEST_ONLY":
+      return Edition.EDITION_1_TEST_ONLY;
+    case 2:
+    case "EDITION_2_TEST_ONLY":
+      return Edition.EDITION_2_TEST_ONLY;
+    case 99997:
+    case "EDITION_99997_TEST_ONLY":
+      return Edition.EDITION_99997_TEST_ONLY;
+    case 99998:
+    case "EDITION_99998_TEST_ONLY":
+      return Edition.EDITION_99998_TEST_ONLY;
+    case 99999:
+    case "EDITION_99999_TEST_ONLY":
+      return Edition.EDITION_99999_TEST_ONLY;
+    case 2147483647:
+    case "EDITION_MAX":
+      return Edition.EDITION_MAX;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return Edition.UNRECOGNIZED;
+  }
+}
+
+export function editionToJSON(object: Edition): string {
+  switch (object) {
+    case Edition.EDITION_UNKNOWN:
+      return "EDITION_UNKNOWN";
+    case Edition.EDITION_LEGACY:
+      return "EDITION_LEGACY";
+    case Edition.EDITION_PROTO2:
+      return "EDITION_PROTO2";
+    case Edition.EDITION_PROTO3:
+      return "EDITION_PROTO3";
+    case Edition.EDITION_2023:
+      return "EDITION_2023";
+    case Edition.EDITION_2024:
+      return "EDITION_2024";
+    case Edition.EDITION_1_TEST_ONLY:
+      return "EDITION_1_TEST_ONLY";
+    case Edition.EDITION_2_TEST_ONLY:
+      return "EDITION_2_TEST_ONLY";
+    case Edition.EDITION_99997_TEST_ONLY:
+      return "EDITION_99997_TEST_ONLY";
+    case Edition.EDITION_99998_TEST_ONLY:
+      return "EDITION_99998_TEST_ONLY";
+    case Edition.EDITION_99999_TEST_ONLY:
+      return "EDITION_99999_TEST_ONLY";
+    case Edition.EDITION_MAX:
+      return "EDITION_MAX";
+    case Edition.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 /**
  * The protocol compiler can output a FileDescriptorSet containing the .proto
  * files it parses.
@@ -56,9 +175,15 @@ export interface FileDescriptorProto {
     | undefined;
   /**
    * The syntax of the proto file.
-   * The supported values are "proto2" and "proto3".
+   * The supported values are "proto2", "proto3", and "editions".
+   *
+   * If `edition` is present, this value must be "editions".
    */
-  syntax?: string | undefined;
+  syntax?:
+    | string
+    | undefined;
+  /** The edition of the proto file. */
+  edition?: Edition | undefined;
 }
 
 /** Describes a message type. */
@@ -106,6 +231,92 @@ export interface DescriptorProto_ReservedRange {
 export interface ExtensionRangeOptions {
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
+  /**
+   * For external users: DO NOT USE. We are in the process of open sourcing
+   * extension declaration and executing internal cleanups before it can be
+   * used externally.
+   */
+  declaration: ExtensionRangeOptions_Declaration[];
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
+  /**
+   * The verification state of the range.
+   * TODO: flip the default to DECLARATION once all empty ranges
+   * are marked as UNVERIFIED.
+   */
+  verification?: ExtensionRangeOptions_VerificationState | undefined;
+}
+
+/** The verification state of the extension range. */
+export enum ExtensionRangeOptions_VerificationState {
+  /** DECLARATION - All the extensions of the range must be declared. */
+  DECLARATION = 0,
+  UNVERIFIED = 1,
+  UNRECOGNIZED = -1,
+}
+
+export function extensionRangeOptions_VerificationStateFromJSON(object: any): ExtensionRangeOptions_VerificationState {
+  switch (object) {
+    case 0:
+    case "DECLARATION":
+      return ExtensionRangeOptions_VerificationState.DECLARATION;
+    case 1:
+    case "UNVERIFIED":
+      return ExtensionRangeOptions_VerificationState.UNVERIFIED;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return ExtensionRangeOptions_VerificationState.UNRECOGNIZED;
+  }
+}
+
+export function extensionRangeOptions_VerificationStateToJSON(object: ExtensionRangeOptions_VerificationState): string {
+  switch (object) {
+    case ExtensionRangeOptions_VerificationState.DECLARATION:
+      return "DECLARATION";
+    case ExtensionRangeOptions_VerificationState.UNVERIFIED:
+      return "UNVERIFIED";
+    case ExtensionRangeOptions_VerificationState.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export interface ExtensionRangeOptions_Declaration {
+  /** The extension number declared within the extension range. */
+  number?:
+    | number
+    | undefined;
+  /**
+   * The fully-qualified name of the extension field. There must be a leading
+   * dot in front of the full name.
+   */
+  fullName?:
+    | string
+    | undefined;
+  /**
+   * The fully-qualified type name of the extension field. Unlike
+   * Metadata.type, Declaration.type must have a leading dot for messages
+   * and enums.
+   */
+  type?:
+    | string
+    | undefined;
+  /**
+   * If true, indicates that the number is reserved in the extension range,
+   * and any extension field with the number will fail to compile. Set this
+   * when a declared extension field is deleted.
+   */
+  reserved?:
+    | boolean
+    | undefined;
+  /**
+   * If true, indicates that the extension must be defined as repeated.
+   * Otherwise the extension must be defined as optional.
+   */
+  repeated?: boolean | undefined;
 }
 
 /** Describes a field within a message. */
@@ -169,12 +380,12 @@ export interface FieldDescriptorProto {
    * If true, this is a proto3 "optional". When a proto3 field is optional, it
    * tracks presence regardless of field type.
    *
-   * When proto3_optional is true, this field must be belong to a oneof to
-   * signal to old proto3 clients that presence is tracked for this field. This
-   * oneof is known as a "synthetic" oneof, and this field must be its sole
-   * member (each proto3 optional field gets its own synthetic oneof). Synthetic
-   * oneofs exist in the descriptor only, and do not generate any API. Synthetic
-   * oneofs must be ordered after all "real" oneofs.
+   * When proto3_optional is true, this field must belong to a oneof to signal
+   * to old proto3 clients that presence is tracked for this field. This oneof
+   * is known as a "synthetic" oneof, and this field must be its sole member
+   * (each proto3 optional field gets its own synthetic oneof). Synthetic oneofs
+   * exist in the descriptor only, and do not generate any API. Synthetic oneofs
+   * must be ordered after all "real" oneofs.
    *
    * For message fields, proto3_optional doesn't create any semantic change,
    * since non-repeated message fields always track presence. However it still
@@ -215,9 +426,10 @@ export enum FieldDescriptorProto_Type {
   TYPE_STRING = 9,
   /**
    * TYPE_GROUP - Tag-delimited aggregate.
-   * Group type is deprecated and not supported in proto3. However, Proto3
+   * Group type is deprecated and not supported after google.protobuf. However, Proto3
    * implementations should still be able to parse the group wire format and
-   * treat group fields as unknown fields.
+   * treat group fields as unknown fields.  In Editions, the group wire format
+   * can be enabled via the `message_encoding` feature.
    */
   TYPE_GROUP = 10,
   /** TYPE_MESSAGE - Length-delimited aggregate. */
@@ -345,8 +557,13 @@ export function fieldDescriptorProto_TypeToJSON(object: FieldDescriptorProto_Typ
 export enum FieldDescriptorProto_Label {
   /** LABEL_OPTIONAL - 0 is reserved for errors */
   LABEL_OPTIONAL = 1,
-  LABEL_REQUIRED = 2,
   LABEL_REPEATED = 3,
+  /**
+   * LABEL_REQUIRED - The required label is only allowed in google.protobuf.  In proto3 and Editions
+   * it's explicitly prohibited.  In Editions, the `field_presence` feature
+   * can be used to get this behavior.
+   */
+  LABEL_REQUIRED = 2,
   UNRECOGNIZED = -1,
 }
 
@@ -355,12 +572,12 @@ export function fieldDescriptorProto_LabelFromJSON(object: any): FieldDescriptor
     case 1:
     case "LABEL_OPTIONAL":
       return FieldDescriptorProto_Label.LABEL_OPTIONAL;
-    case 2:
-    case "LABEL_REQUIRED":
-      return FieldDescriptorProto_Label.LABEL_REQUIRED;
     case 3:
     case "LABEL_REPEATED":
       return FieldDescriptorProto_Label.LABEL_REPEATED;
+    case 2:
+    case "LABEL_REQUIRED":
+      return FieldDescriptorProto_Label.LABEL_REQUIRED;
     case -1:
     case "UNRECOGNIZED":
     default:
@@ -372,10 +589,10 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La
   switch (object) {
     case FieldDescriptorProto_Label.LABEL_OPTIONAL:
       return "LABEL_OPTIONAL";
-    case FieldDescriptorProto_Label.LABEL_REQUIRED:
-      return "LABEL_REQUIRED";
     case FieldDescriptorProto_Label.LABEL_REPEATED:
       return "LABEL_REPEATED";
+    case FieldDescriptorProto_Label.LABEL_REQUIRED:
+      return "LABEL_REQUIRED";
     case FieldDescriptorProto_Label.UNRECOGNIZED:
     default:
       return "UNRECOGNIZED";
@@ -501,12 +718,16 @@ export interface FileOptions {
     | boolean
     | undefined;
   /**
-   * If set true, then the Java2 code generator will generate code that
-   * throws an exception whenever an attempt is made to assign a non-UTF-8
-   * byte sequence to a string field.
-   * Message reflection will do the same.
-   * However, an extension field still accepts non-UTF-8 byte sequences.
-   * This option has no effect on when used with the lite runtime.
+   * A proto2 file can set this to true to opt in to UTF-8 checking for Java,
+   * which will throw an exception if invalid UTF-8 is parsed from the wire or
+   * assigned to a string field.
+   *
+   * TODO: clarify exactly what kinds of field types this option
+   * applies to, and update these docs accordingly.
+   *
+   * Proto3 files already perform these checks. Setting the option explicitly to
+   * false has no effect: it cannot be used to opt proto3 files out of UTF-8
+   * checks.
    */
   javaStringCheckUtf8?: boolean | undefined;
   optimizeFor?:
@@ -536,8 +757,7 @@ export interface FileOptions {
    */
   ccGenericServices?: boolean | undefined;
   javaGenericServices?: boolean | undefined;
-  pyGenericServices?: boolean | undefined;
-  phpGenericServices?:
+  pyGenericServices?:
     | boolean
     | undefined;
   /**
@@ -607,6 +827,10 @@ export interface FileOptions {
   rubyPackage?:
     | string
     | undefined;
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
   /**
    * The parser stores options it doesn't recognize here.
    * See the documentation for the "Options" section above.
@@ -724,6 +948,27 @@ export interface MessageOptions {
   mapEntry?:
     | boolean
     | undefined;
+  /**
+   * Enable the legacy handling of JSON field name conflicts.  This lowercases
+   * and strips underscored from the fields before comparison in proto3 only.
+   * The new behavior takes `json_name` into account and applies to proto2 as
+   * well.
+   *
+   * This should only be used as a temporary measure against broken builds due
+   * to the change in behavior for JSON field name conflicts.
+   *
+   * TODO This is legacy behavior we plan to remove once downstream
+   * teams have had time to migrate.
+   *
+   * @deprecated
+   */
+  deprecatedLegacyJsonFieldConflicts?:
+    | boolean
+    | undefined;
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
@@ -732,8 +977,10 @@ export interface FieldOptions {
   /**
    * The ctype option instructs the C++ code generator to use a different
    * representation of the field than it normally would.  See the specific
-   * options below.  This option is not yet implemented in the open source
-   * release -- sorry, we'll try to include it in a future version!
+   * options below.  This option is only implemented to support use of
+   * [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of
+   * type "bytes" in the open source release -- sorry, we'll try to include
+   * other types in a future version!
    */
   ctype?:
     | FieldOptions_CType
@@ -743,7 +990,9 @@ export interface FieldOptions {
    * a more efficient representation on the wire. Rather than repeatedly
    * writing the tag and type for each element, the entire array is encoded as
    * a single length-delimited blob. In proto3, only explicit setting it to
-   * false will avoid using packed encoding.
+   * false will avoid using packed encoding.  This option is prohibited in
+   * Editions, but the `repeated_field_encoding` feature can be used to control
+   * the behavior.
    */
   packed?:
     | boolean
@@ -782,22 +1031,11 @@ export interface FieldOptions {
    * call from multiple threads concurrently, while non-const methods continue
    * to require exclusive access.
    *
-   * Note that implementations may choose not to check required fields within
-   * a lazy sub-message.  That is, calling IsInitialized() on the outer message
-   * may return true even if the inner message has missing required fields.
-   * This is necessary because otherwise the inner message would have to be
-   * parsed in order to perform the check, defeating the purpose of lazy
-   * parsing.  An implementation which chooses not to check required fields
-   * must be consistent about it.  That is, for any particular sub-message, the
-   * implementation must either *always* check its required fields, or *never*
-   * check its required fields, regardless of whether or not the message has
-   * been parsed.
-   *
-   * As of 2021, lazy does no correctness checks on the byte stream during
-   * parsing.  This may lead to crashes if and when an invalid byte stream is
-   * finally parsed upon access.
-   *
-   * TODO(b/211906113):  Enable validation on lazy fields.
+   * Note that lazy message fields are still eagerly verified to check
+   * ill-formed wireformat or missing required fields. Calling IsInitialized()
+   * on the outer message would fail if the inner message has missing required
+   * fields. Failed verification would result in parsing failure (except when
+   * uninitialized messages are acceptable).
    */
   lazy?:
     | boolean
@@ -823,6 +1061,19 @@ export interface FieldOptions {
   weak?:
     | boolean
     | undefined;
+  /**
+   * Indicate that the field value should not be printed out when using debug
+   * formats, e.g. when the field contains sensitive credentials.
+   */
+  debugRedact?: boolean | undefined;
+  retention?: FieldOptions_OptionRetention | undefined;
+  targets: FieldOptions_OptionTargetType[];
+  editionDefaults: FieldOptions_EditionDefault[];
+  /** Any features defined in the specific edition. */
+  features?: FeatureSet | undefined;
+  featureSupport?:
+    | FieldOptions_FeatureSupport
+    | undefined;
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
@@ -830,6 +1081,14 @@ export interface FieldOptions {
 export enum FieldOptions_CType {
   /** STRING - Default mode. */
   STRING = 0,
+  /**
+   * CORD - The option [ctype=CORD] may be applied to a non-repeated field of type
+   * "bytes". It indicates that in C++, the data should be stored in a Cord
+   * instead of a string.  For very large strings, this may reduce memory
+   * fragmentation. It may also allow better performance when parsing from a
+   * Cord, or when parsing with aliasing enabled, as the parsed Cord may then
+   * alias the original buffer.
+   */
   CORD = 1,
   STRING_PIECE = 2,
   UNRECOGNIZED = -1,
@@ -909,7 +1168,182 @@ export function fieldOptions_JSTypeToJSON(object: FieldOptions_JSType): string {
   }
 }
 
+/**
+ * If set to RETENTION_SOURCE, the option will be omitted from the binary.
+ * Note: as of January 2023, support for this is in progress and does not yet
+ * have an effect (b/264593489).
+ */
+export enum FieldOptions_OptionRetention {
+  RETENTION_UNKNOWN = 0,
+  RETENTION_RUNTIME = 1,
+  RETENTION_SOURCE = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function fieldOptions_OptionRetentionFromJSON(object: any): FieldOptions_OptionRetention {
+  switch (object) {
+    case 0:
+    case "RETENTION_UNKNOWN":
+      return FieldOptions_OptionRetention.RETENTION_UNKNOWN;
+    case 1:
+    case "RETENTION_RUNTIME":
+      return FieldOptions_OptionRetention.RETENTION_RUNTIME;
+    case 2:
+    case "RETENTION_SOURCE":
+      return FieldOptions_OptionRetention.RETENTION_SOURCE;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FieldOptions_OptionRetention.UNRECOGNIZED;
+  }
+}
+
+export function fieldOptions_OptionRetentionToJSON(object: FieldOptions_OptionRetention): string {
+  switch (object) {
+    case FieldOptions_OptionRetention.RETENTION_UNKNOWN:
+      return "RETENTION_UNKNOWN";
+    case FieldOptions_OptionRetention.RETENTION_RUNTIME:
+      return "RETENTION_RUNTIME";
+    case FieldOptions_OptionRetention.RETENTION_SOURCE:
+      return "RETENTION_SOURCE";
+    case FieldOptions_OptionRetention.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+/**
+ * This indicates the types of entities that the field may apply to when used
+ * as an option. If it is unset, then the field may be freely used as an
+ * option on any kind of entity. Note: as of January 2023, support for this is
+ * in progress and does not yet have an effect (b/264593489).
+ */
+export enum FieldOptions_OptionTargetType {
+  TARGET_TYPE_UNKNOWN = 0,
+  TARGET_TYPE_FILE = 1,
+  TARGET_TYPE_EXTENSION_RANGE = 2,
+  TARGET_TYPE_MESSAGE = 3,
+  TARGET_TYPE_FIELD = 4,
+  TARGET_TYPE_ONEOF = 5,
+  TARGET_TYPE_ENUM = 6,
+  TARGET_TYPE_ENUM_ENTRY = 7,
+  TARGET_TYPE_SERVICE = 8,
+  TARGET_TYPE_METHOD = 9,
+  UNRECOGNIZED = -1,
+}
+
+export function fieldOptions_OptionTargetTypeFromJSON(object: any): FieldOptions_OptionTargetType {
+  switch (object) {
+    case 0:
+    case "TARGET_TYPE_UNKNOWN":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_UNKNOWN;
+    case 1:
+    case "TARGET_TYPE_FILE":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_FILE;
+    case 2:
+    case "TARGET_TYPE_EXTENSION_RANGE":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_EXTENSION_RANGE;
+    case 3:
+    case "TARGET_TYPE_MESSAGE":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_MESSAGE;
+    case 4:
+    case "TARGET_TYPE_FIELD":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_FIELD;
+    case 5:
+    case "TARGET_TYPE_ONEOF":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_ONEOF;
+    case 6:
+    case "TARGET_TYPE_ENUM":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_ENUM;
+    case 7:
+    case "TARGET_TYPE_ENUM_ENTRY":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_ENUM_ENTRY;
+    case 8:
+    case "TARGET_TYPE_SERVICE":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_SERVICE;
+    case 9:
+    case "TARGET_TYPE_METHOD":
+      return FieldOptions_OptionTargetType.TARGET_TYPE_METHOD;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FieldOptions_OptionTargetType.UNRECOGNIZED;
+  }
+}
+
+export function fieldOptions_OptionTargetTypeToJSON(object: FieldOptions_OptionTargetType): string {
+  switch (object) {
+    case FieldOptions_OptionTargetType.TARGET_TYPE_UNKNOWN:
+      return "TARGET_TYPE_UNKNOWN";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_FILE:
+      return "TARGET_TYPE_FILE";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_EXTENSION_RANGE:
+      return "TARGET_TYPE_EXTENSION_RANGE";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_MESSAGE:
+      return "TARGET_TYPE_MESSAGE";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_FIELD:
+      return "TARGET_TYPE_FIELD";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_ONEOF:
+      return "TARGET_TYPE_ONEOF";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_ENUM:
+      return "TARGET_TYPE_ENUM";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_ENUM_ENTRY:
+      return "TARGET_TYPE_ENUM_ENTRY";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_SERVICE:
+      return "TARGET_TYPE_SERVICE";
+    case FieldOptions_OptionTargetType.TARGET_TYPE_METHOD:
+      return "TARGET_TYPE_METHOD";
+    case FieldOptions_OptionTargetType.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export interface FieldOptions_EditionDefault {
+  edition?:
+    | Edition
+    | undefined;
+  /** Textproto value. */
+  value?: string | undefined;
+}
+
+/** Information about the support window of a feature. */
+export interface FieldOptions_FeatureSupport {
+  /**
+   * The edition that this feature was first available in.  In editions
+   * earlier than this one, the default assigned to EDITION_LEGACY will be
+   * used, and proto files will not be able to override it.
+   */
+  editionIntroduced?:
+    | Edition
+    | undefined;
+  /**
+   * The edition this feature becomes deprecated in.  Using this after this
+   * edition may trigger warnings.
+   */
+  editionDeprecated?:
+    | Edition
+    | undefined;
+  /**
+   * The deprecation warning text if this feature is used after the edition it
+   * was marked deprecated in.
+   */
+  deprecationWarning?:
+    | string
+    | undefined;
+  /**
+   * The edition this feature is no longer available in.  In editions after
+   * this one, the last default assigned will be used, and proto files will
+   * not be able to override it.
+   */
+  editionRemoved?: Edition | undefined;
+}
+
 export interface OneofOptions {
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
@@ -931,6 +1365,23 @@ export interface EnumOptions {
   deprecated?:
     | boolean
     | undefined;
+  /**
+   * Enable the legacy handling of JSON field name conflicts.  This lowercases
+   * and strips underscored from the fields before comparison in proto3 only.
+   * The new behavior takes `json_name` into account and applies to proto2 as
+   * well.
+   * TODO Remove this legacy behavior once downstream teams have
+   * had time to migrate.
+   *
+   * @deprecated
+   */
+  deprecatedLegacyJsonFieldConflicts?:
+    | boolean
+    | undefined;
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
@@ -945,11 +1396,31 @@ export interface EnumValueOptions {
   deprecated?:
     | boolean
     | undefined;
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
+  /**
+   * Indicate that fields annotated with this enum value should not be printed
+   * out when using debug formats, e.g. when the field contains sensitive
+   * credentials.
+   */
+  debugRedact?:
+    | boolean
+    | undefined;
+  /** Information about the support window of a feature value. */
+  featureSupport?:
+    | FieldOptions_FeatureSupport
+    | undefined;
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
 
 export interface ServiceOptions {
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
   /**
    * Is this service deprecated?
    * Depending on the target platform, this can emit Deprecated annotations
@@ -974,6 +1445,10 @@ export interface MethodOptions {
   idempotencyLevel?:
     | MethodOptions_IdempotencyLevel
     | undefined;
+  /** Any features defined in the specific edition. */
+  features?:
+    | FeatureSet
+    | undefined;
   /** The parser stores options it doesn't recognize here. See above. */
   uninterpretedOption: UninterpretedOption[];
 }
@@ -1059,77 +1534,374 @@ export interface UninterpretedOption_NamePart {
 }
 
 /**
- * Encapsulates information about the original source file from which a
- * FileDescriptorProto was generated.
+ * TODO Enums in C++ gencode (and potentially other languages) are
+ * not well scoped.  This means that each of the feature enums below can clash
+ * with each other.  The short names we've chosen maximize call-site
+ * readability, but leave us very open to this scenario.  A future feature will
+ * be designed and implemented to handle this, hopefully before we ever hit a
+ * conflict here.
  */
-export interface SourceCodeInfo {
-  /**
-   * A Location identifies a piece of source code in a .proto file which
-   * corresponds to a particular definition.  This information is intended
-   * to be useful to IDEs, code indexers, documentation generators, and similar
-   * tools.
-   *
-   * For example, say we have a file like:
-   *   message Foo {
-   *     optional string foo = 1;
-   *   }
-   * Let's look at just the field definition:
-   *   optional string foo = 1;
-   *   ^       ^^     ^^  ^  ^^^
-   *   a       bc     de  f  ghi
-   * We have the following locations:
-   *   span   path               represents
-   *   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-   *   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-   *   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-   *   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-   *   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-   *
-   * Notes:
-   * - A location may refer to a repeated field itself (i.e. not to any
-   *   particular index within it).  This is used whenever a set of elements are
-   *   logically enclosed in a single code segment.  For example, an entire
-   *   extend block (possibly containing multiple extension definitions) will
-   *   have an outer location whose path refers to the "extensions" repeated
-   *   field without an index.
-   * - Multiple locations may have the same path.  This happens when a single
-   *   logical declaration is spread out across multiple places.  The most
-   *   obvious example is the "extend" block again -- there may be multiple
-   *   extend blocks in the same scope, each of which will have the same path.
-   * - A location's span is not always a subset of its parent's span.  For
-   *   example, the "extendee" of an extension declaration appears at the
-   *   beginning of the "extend" block and is shared by all extensions within
-   *   the block.
-   * - Just because a location's span is a subset of some other location's span
-   *   does not mean that it is a descendant.  For example, a "group" defines
-   *   both a type and a field in a single declaration.  Thus, the locations
-   *   corresponding to the type and field and their components will overlap.
-   * - Code which tries to interpret locations should probably be designed to
-   *   ignore those that it doesn't understand, as more types of locations could
-   *   be recorded in the future.
-   */
-  location: SourceCodeInfo_Location[];
+export interface FeatureSet {
+  fieldPresence?: FeatureSet_FieldPresence | undefined;
+  enumType?: FeatureSet_EnumType | undefined;
+  repeatedFieldEncoding?: FeatureSet_RepeatedFieldEncoding | undefined;
+  utf8Validation?: FeatureSet_Utf8Validation | undefined;
+  messageEncoding?: FeatureSet_MessageEncoding | undefined;
+  jsonFormat?: FeatureSet_JsonFormat | undefined;
 }
 
-export interface SourceCodeInfo_Location {
-  /**
-   * Identifies which part of the FileDescriptorProto was defined at this
-   * location.
-   *
-   * Each element is a field number or an index.  They form a path from
-   * the root FileDescriptorProto to the place where the definition occurs.
-   * For example, this path:
-   *   [ 4, 3, 2, 7, 1 ]
-   * refers to:
-   *   file.message_type(3)  // 4, 3
-   *       .field(7)         // 2, 7
-   *       .name()           // 1
-   * This is because FileDescriptorProto.message_type has field number 4:
-   *   repeated DescriptorProto message_type = 4;
-   * and DescriptorProto.field has field number 2:
-   *   repeated FieldDescriptorProto field = 2;
-   * and FieldDescriptorProto.name has field number 1:
-   *   optional string name = 1;
+export enum FeatureSet_FieldPresence {
+  FIELD_PRESENCE_UNKNOWN = 0,
+  EXPLICIT = 1,
+  IMPLICIT = 2,
+  LEGACY_REQUIRED = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function featureSet_FieldPresenceFromJSON(object: any): FeatureSet_FieldPresence {
+  switch (object) {
+    case 0:
+    case "FIELD_PRESENCE_UNKNOWN":
+      return FeatureSet_FieldPresence.FIELD_PRESENCE_UNKNOWN;
+    case 1:
+    case "EXPLICIT":
+      return FeatureSet_FieldPresence.EXPLICIT;
+    case 2:
+    case "IMPLICIT":
+      return FeatureSet_FieldPresence.IMPLICIT;
+    case 3:
+    case "LEGACY_REQUIRED":
+      return FeatureSet_FieldPresence.LEGACY_REQUIRED;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FeatureSet_FieldPresence.UNRECOGNIZED;
+  }
+}
+
+export function featureSet_FieldPresenceToJSON(object: FeatureSet_FieldPresence): string {
+  switch (object) {
+    case FeatureSet_FieldPresence.FIELD_PRESENCE_UNKNOWN:
+      return "FIELD_PRESENCE_UNKNOWN";
+    case FeatureSet_FieldPresence.EXPLICIT:
+      return "EXPLICIT";
+    case FeatureSet_FieldPresence.IMPLICIT:
+      return "IMPLICIT";
+    case FeatureSet_FieldPresence.LEGACY_REQUIRED:
+      return "LEGACY_REQUIRED";
+    case FeatureSet_FieldPresence.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export enum FeatureSet_EnumType {
+  ENUM_TYPE_UNKNOWN = 0,
+  OPEN = 1,
+  CLOSED = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function featureSet_EnumTypeFromJSON(object: any): FeatureSet_EnumType {
+  switch (object) {
+    case 0:
+    case "ENUM_TYPE_UNKNOWN":
+      return FeatureSet_EnumType.ENUM_TYPE_UNKNOWN;
+    case 1:
+    case "OPEN":
+      return FeatureSet_EnumType.OPEN;
+    case 2:
+    case "CLOSED":
+      return FeatureSet_EnumType.CLOSED;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FeatureSet_EnumType.UNRECOGNIZED;
+  }
+}
+
+export function featureSet_EnumTypeToJSON(object: FeatureSet_EnumType): string {
+  switch (object) {
+    case FeatureSet_EnumType.ENUM_TYPE_UNKNOWN:
+      return "ENUM_TYPE_UNKNOWN";
+    case FeatureSet_EnumType.OPEN:
+      return "OPEN";
+    case FeatureSet_EnumType.CLOSED:
+      return "CLOSED";
+    case FeatureSet_EnumType.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export enum FeatureSet_RepeatedFieldEncoding {
+  REPEATED_FIELD_ENCODING_UNKNOWN = 0,
+  PACKED = 1,
+  EXPANDED = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function featureSet_RepeatedFieldEncodingFromJSON(object: any): FeatureSet_RepeatedFieldEncoding {
+  switch (object) {
+    case 0:
+    case "REPEATED_FIELD_ENCODING_UNKNOWN":
+      return FeatureSet_RepeatedFieldEncoding.REPEATED_FIELD_ENCODING_UNKNOWN;
+    case 1:
+    case "PACKED":
+      return FeatureSet_RepeatedFieldEncoding.PACKED;
+    case 2:
+    case "EXPANDED":
+      return FeatureSet_RepeatedFieldEncoding.EXPANDED;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FeatureSet_RepeatedFieldEncoding.UNRECOGNIZED;
+  }
+}
+
+export function featureSet_RepeatedFieldEncodingToJSON(object: FeatureSet_RepeatedFieldEncoding): string {
+  switch (object) {
+    case FeatureSet_RepeatedFieldEncoding.REPEATED_FIELD_ENCODING_UNKNOWN:
+      return "REPEATED_FIELD_ENCODING_UNKNOWN";
+    case FeatureSet_RepeatedFieldEncoding.PACKED:
+      return "PACKED";
+    case FeatureSet_RepeatedFieldEncoding.EXPANDED:
+      return "EXPANDED";
+    case FeatureSet_RepeatedFieldEncoding.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export enum FeatureSet_Utf8Validation {
+  UTF8_VALIDATION_UNKNOWN = 0,
+  VERIFY = 2,
+  NONE = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function featureSet_Utf8ValidationFromJSON(object: any): FeatureSet_Utf8Validation {
+  switch (object) {
+    case 0:
+    case "UTF8_VALIDATION_UNKNOWN":
+      return FeatureSet_Utf8Validation.UTF8_VALIDATION_UNKNOWN;
+    case 2:
+    case "VERIFY":
+      return FeatureSet_Utf8Validation.VERIFY;
+    case 3:
+    case "NONE":
+      return FeatureSet_Utf8Validation.NONE;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FeatureSet_Utf8Validation.UNRECOGNIZED;
+  }
+}
+
+export function featureSet_Utf8ValidationToJSON(object: FeatureSet_Utf8Validation): string {
+  switch (object) {
+    case FeatureSet_Utf8Validation.UTF8_VALIDATION_UNKNOWN:
+      return "UTF8_VALIDATION_UNKNOWN";
+    case FeatureSet_Utf8Validation.VERIFY:
+      return "VERIFY";
+    case FeatureSet_Utf8Validation.NONE:
+      return "NONE";
+    case FeatureSet_Utf8Validation.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export enum FeatureSet_MessageEncoding {
+  MESSAGE_ENCODING_UNKNOWN = 0,
+  LENGTH_PREFIXED = 1,
+  DELIMITED = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function featureSet_MessageEncodingFromJSON(object: any): FeatureSet_MessageEncoding {
+  switch (object) {
+    case 0:
+    case "MESSAGE_ENCODING_UNKNOWN":
+      return FeatureSet_MessageEncoding.MESSAGE_ENCODING_UNKNOWN;
+    case 1:
+    case "LENGTH_PREFIXED":
+      return FeatureSet_MessageEncoding.LENGTH_PREFIXED;
+    case 2:
+    case "DELIMITED":
+      return FeatureSet_MessageEncoding.DELIMITED;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FeatureSet_MessageEncoding.UNRECOGNIZED;
+  }
+}
+
+export function featureSet_MessageEncodingToJSON(object: FeatureSet_MessageEncoding): string {
+  switch (object) {
+    case FeatureSet_MessageEncoding.MESSAGE_ENCODING_UNKNOWN:
+      return "MESSAGE_ENCODING_UNKNOWN";
+    case FeatureSet_MessageEncoding.LENGTH_PREFIXED:
+      return "LENGTH_PREFIXED";
+    case FeatureSet_MessageEncoding.DELIMITED:
+      return "DELIMITED";
+    case FeatureSet_MessageEncoding.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export enum FeatureSet_JsonFormat {
+  JSON_FORMAT_UNKNOWN = 0,
+  ALLOW = 1,
+  LEGACY_BEST_EFFORT = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function featureSet_JsonFormatFromJSON(object: any): FeatureSet_JsonFormat {
+  switch (object) {
+    case 0:
+    case "JSON_FORMAT_UNKNOWN":
+      return FeatureSet_JsonFormat.JSON_FORMAT_UNKNOWN;
+    case 1:
+    case "ALLOW":
+      return FeatureSet_JsonFormat.ALLOW;
+    case 2:
+    case "LEGACY_BEST_EFFORT":
+      return FeatureSet_JsonFormat.LEGACY_BEST_EFFORT;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return FeatureSet_JsonFormat.UNRECOGNIZED;
+  }
+}
+
+export function featureSet_JsonFormatToJSON(object: FeatureSet_JsonFormat): string {
+  switch (object) {
+    case FeatureSet_JsonFormat.JSON_FORMAT_UNKNOWN:
+      return "JSON_FORMAT_UNKNOWN";
+    case FeatureSet_JsonFormat.ALLOW:
+      return "ALLOW";
+    case FeatureSet_JsonFormat.LEGACY_BEST_EFFORT:
+      return "LEGACY_BEST_EFFORT";
+    case FeatureSet_JsonFormat.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+/**
+ * A compiled specification for the defaults of a set of features.  These
+ * messages are generated from FeatureSet extensions and can be used to seed
+ * feature resolution. The resolution with this object becomes a simple search
+ * for the closest matching edition, followed by proto merges.
+ */
+export interface FeatureSetDefaults {
+  defaults: FeatureSetDefaults_FeatureSetEditionDefault[];
+  /**
+   * The minimum supported edition (inclusive) when this was constructed.
+   * Editions before this will not have defaults.
+   */
+  minimumEdition?:
+    | Edition
+    | undefined;
+  /**
+   * The maximum known edition (inclusive) when this was constructed. Editions
+   * after this will not have reliable defaults.
+   */
+  maximumEdition?: Edition | undefined;
+}
+
+/**
+ * A map from every known edition with a unique set of defaults to its
+ * defaults. Not all editions may be contained here.  For a given edition,
+ * the defaults at the closest matching edition ordered at or before it should
+ * be used.  This field must be in strict ascending order by edition.
+ */
+export interface FeatureSetDefaults_FeatureSetEditionDefault {
+  edition?:
+    | Edition
+    | undefined;
+  /** Defaults of features that can be overridden in this edition. */
+  overridableFeatures?:
+    | FeatureSet
+    | undefined;
+  /** Defaults of features that can't be overridden in this edition. */
+  fixedFeatures?: FeatureSet | undefined;
+}
+
+/**
+ * Encapsulates information about the original source file from which a
+ * FileDescriptorProto was generated.
+ */
+export interface SourceCodeInfo {
+  /**
+   * A Location identifies a piece of source code in a .proto file which
+   * corresponds to a particular definition.  This information is intended
+   * to be useful to IDEs, code indexers, documentation generators, and similar
+   * tools.
+   *
+   * For example, say we have a file like:
+   *   message Foo {
+   *     optional string foo = 1;
+   *   }
+   * Let's look at just the field definition:
+   *   optional string foo = 1;
+   *   ^       ^^     ^^  ^  ^^^
+   *   a       bc     de  f  ghi
+   * We have the following locations:
+   *   span   path               represents
+   *   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
+   *   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
+   *   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
+   *   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
+   *   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
+   *
+   * Notes:
+   * - A location may refer to a repeated field itself (i.e. not to any
+   *   particular index within it).  This is used whenever a set of elements are
+   *   logically enclosed in a single code segment.  For example, an entire
+   *   extend block (possibly containing multiple extension definitions) will
+   *   have an outer location whose path refers to the "extensions" repeated
+   *   field without an index.
+   * - Multiple locations may have the same path.  This happens when a single
+   *   logical declaration is spread out across multiple places.  The most
+   *   obvious example is the "extend" block again -- there may be multiple
+   *   extend blocks in the same scope, each of which will have the same path.
+   * - A location's span is not always a subset of its parent's span.  For
+   *   example, the "extendee" of an extension declaration appears at the
+   *   beginning of the "extend" block and is shared by all extensions within
+   *   the block.
+   * - Just because a location's span is a subset of some other location's span
+   *   does not mean that it is a descendant.  For example, a "group" defines
+   *   both a type and a field in a single declaration.  Thus, the locations
+   *   corresponding to the type and field and their components will overlap.
+   * - Code which tries to interpret locations should probably be designed to
+   *   ignore those that it doesn't understand, as more types of locations could
+   *   be recorded in the future.
+   */
+  location: SourceCodeInfo_Location[];
+}
+
+export interface SourceCodeInfo_Location {
+  /**
+   * Identifies which part of the FileDescriptorProto was defined at this
+   * location.
+   *
+   * Each element is a field number or an index.  They form a path from
+   * the root FileDescriptorProto to the place where the definition appears.
+   * For example, this path:
+   *   [ 4, 3, 2, 7, 1 ]
+   * refers to:
+   *   file.message_type(3)  // 4, 3
+   *       .field(7)         // 2, 7
+   *       .name()           // 1
+   * This is because FileDescriptorProto.message_type has field number 4:
+   *   repeated DescriptorProto message_type = 4;
+   * and DescriptorProto.field has field number 2:
+   *   repeated FieldDescriptorProto field = 2;
+   * and FieldDescriptorProto.name has field number 1:
+   *   optional string name = 1;
    *
    * Thus, the above path gives the location of a field name.  If we removed
    * the last element:
@@ -1232,10 +2004,57 @@ export interface GeneratedCodeInfo_Annotation {
     | undefined;
   /**
    * Identifies the ending offset in bytes in the generated code that
-   * relates to the identified offset. The end offset should be one past
+   * relates to the identified object. The end offset should be one past
    * the last relevant byte (so the length of the text = end - begin).
    */
   end?: number | undefined;
+  semantic?: GeneratedCodeInfo_Annotation_Semantic | undefined;
+}
+
+/**
+ * Represents the identified object's effect on the element in the original
+ * .proto file.
+ */
+export enum GeneratedCodeInfo_Annotation_Semantic {
+  /** NONE - There is no effect or the effect is indescribable. */
+  NONE = 0,
+  /** SET - The element is set or otherwise mutated. */
+  SET = 1,
+  /** ALIAS - An alias to the element is returned. */
+  ALIAS = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function generatedCodeInfo_Annotation_SemanticFromJSON(object: any): GeneratedCodeInfo_Annotation_Semantic {
+  switch (object) {
+    case 0:
+    case "NONE":
+      return GeneratedCodeInfo_Annotation_Semantic.NONE;
+    case 1:
+    case "SET":
+      return GeneratedCodeInfo_Annotation_Semantic.SET;
+    case 2:
+    case "ALIAS":
+      return GeneratedCodeInfo_Annotation_Semantic.ALIAS;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return GeneratedCodeInfo_Annotation_Semantic.UNRECOGNIZED;
+  }
+}
+
+export function generatedCodeInfo_Annotation_SemanticToJSON(object: GeneratedCodeInfo_Annotation_Semantic): string {
+  switch (object) {
+    case GeneratedCodeInfo_Annotation_Semantic.NONE:
+      return "NONE";
+    case GeneratedCodeInfo_Annotation_Semantic.SET:
+      return "SET";
+    case GeneratedCodeInfo_Annotation_Semantic.ALIAS:
+      return "ALIAS";
+    case GeneratedCodeInfo_Annotation_Semantic.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
 }
 
 function createBaseFileDescriptorSet(): FileDescriptorSet {
@@ -1309,6 +2128,7 @@ function createBaseFileDescriptorProto(): FileDescriptorProto {
     options: undefined,
     sourceCodeInfo: undefined,
     syntax: "",
+    edition: 0,
   };
 }
 
@@ -1354,6 +2174,9 @@ export const FileDescriptorProto = {
     if (message.syntax !== undefined && message.syntax !== "") {
       writer.uint32(98).string(message.syntax);
     }
+    if (message.edition !== undefined && message.edition !== 0) {
+      writer.uint32(112).int32(message.edition);
+    }
     return writer;
   },
 
@@ -1468,6 +2291,13 @@ export const FileDescriptorProto = {
 
           message.syntax = reader.string();
           continue;
+        case 14:
+          if (tag !== 112) {
+            break;
+          }
+
+          message.edition = reader.int32() as any;
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1503,6 +2333,7 @@ export const FileDescriptorProto = {
       options: isSet(object.options) ? FileOptions.fromJSON(object.options) : undefined,
       sourceCodeInfo: isSet(object.sourceCodeInfo) ? SourceCodeInfo.fromJSON(object.sourceCodeInfo) : undefined,
       syntax: isSet(object.syntax) ? gt.String(object.syntax) : "",
+      edition: isSet(object.edition) ? editionFromJSON(object.edition) : 0,
     };
   },
 
@@ -1544,6 +2375,9 @@ export const FileDescriptorProto = {
     if (message.syntax !== undefined && message.syntax !== "") {
       obj.syntax = message.syntax;
     }
+    if (message.edition !== undefined && message.edition !== 0) {
+      obj.edition = editionToJSON(message.edition);
+    }
     return obj;
   },
 
@@ -1568,6 +2402,7 @@ export const FileDescriptorProto = {
       ? SourceCodeInfo.fromPartial(object.sourceCodeInfo)
       : undefined;
     message.syntax = object.syntax ?? "";
+    message.edition = object.edition ?? 0;
     return message;
   },
 };
@@ -1963,7 +2798,7 @@ export const DescriptorProto_ReservedRange = {
 };
 
 function createBaseExtensionRangeOptions(): ExtensionRangeOptions {
-  return { uninterpretedOption: [] };
+  return { uninterpretedOption: [], declaration: [], features: undefined, verification: 1 };
 }
 
 export const ExtensionRangeOptions = {
@@ -1971,6 +2806,15 @@ export const ExtensionRangeOptions = {
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
     }
+    for (const v of message.declaration) {
+      ExtensionRangeOptions_Declaration.encode(v!, writer.uint32(18).fork()).ldelim();
+    }
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(402).fork()).ldelim();
+    }
+    if (message.verification !== undefined && message.verification !== 1) {
+      writer.uint32(24).int32(message.verification);
+    }
     return writer;
   },
 
@@ -1988,6 +2832,27 @@ export const ExtensionRangeOptions = {
 
           message.uninterpretedOption.push(UninterpretedOption.decode(reader, reader.uint32()));
           continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.declaration.push(ExtensionRangeOptions_Declaration.decode(reader, reader.uint32()));
+          continue;
+        case 50:
+          if (tag !== 402) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.verification = reader.int32() as any;
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -2002,6 +2867,13 @@ export const ExtensionRangeOptions = {
       uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
         ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
         : [],
+      declaration: gt.Array.isArray(object?.declaration)
+        ? object.declaration.map((e: any) => ExtensionRangeOptions_Declaration.fromJSON(e))
+        : [],
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
+      verification: isSet(object.verification)
+        ? extensionRangeOptions_VerificationStateFromJSON(object.verification)
+        : 1,
     };
   },
 
@@ -2010,6 +2882,15 @@ export const ExtensionRangeOptions = {
     if (message.uninterpretedOption?.length) {
       obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
     }
+    if (message.declaration?.length) {
+      obj.declaration = message.declaration.map((e) => ExtensionRangeOptions_Declaration.toJSON(e));
+    }
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
+    if (message.verification !== undefined && message.verification !== 1) {
+      obj.verification = extensionRangeOptions_VerificationStateToJSON(message.verification);
+    }
     return obj;
   },
 
@@ -2019,14 +2900,142 @@ export const ExtensionRangeOptions = {
   fromPartial<I extends Exact<DeepPartial<ExtensionRangeOptions>, I>>(object: I): ExtensionRangeOptions {
     const message = createBaseExtensionRangeOptions();
     message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
+    message.declaration = object.declaration?.map((e) => ExtensionRangeOptions_Declaration.fromPartial(e)) || [];
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
+    message.verification = object.verification ?? 1;
     return message;
   },
 };
 
-function createBaseFieldDescriptorProto(): FieldDescriptorProto {
-  return {
-    name: "",
-    number: 0,
+function createBaseExtensionRangeOptions_Declaration(): ExtensionRangeOptions_Declaration {
+  return { number: 0, fullName: "", type: "", reserved: false, repeated: false };
+}
+
+export const ExtensionRangeOptions_Declaration = {
+  encode(message: ExtensionRangeOptions_Declaration, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.number !== undefined && message.number !== 0) {
+      writer.uint32(8).int32(message.number);
+    }
+    if (message.fullName !== undefined && message.fullName !== "") {
+      writer.uint32(18).string(message.fullName);
+    }
+    if (message.type !== undefined && message.type !== "") {
+      writer.uint32(26).string(message.type);
+    }
+    if (message.reserved !== undefined && message.reserved !== false) {
+      writer.uint32(40).bool(message.reserved);
+    }
+    if (message.repeated !== undefined && message.repeated !== false) {
+      writer.uint32(48).bool(message.repeated);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ExtensionRangeOptions_Declaration {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseExtensionRangeOptions_Declaration();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.number = reader.int32();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.fullName = reader.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.type = reader.string();
+          continue;
+        case 5:
+          if (tag !== 40) {
+            break;
+          }
+
+          message.reserved = reader.bool();
+          continue;
+        case 6:
+          if (tag !== 48) {
+            break;
+          }
+
+          message.repeated = reader.bool();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ExtensionRangeOptions_Declaration {
+    return {
+      number: isSet(object.number) ? gt.Number(object.number) : 0,
+      fullName: isSet(object.fullName) ? gt.String(object.fullName) : "",
+      type: isSet(object.type) ? gt.String(object.type) : "",
+      reserved: isSet(object.reserved) ? gt.Boolean(object.reserved) : false,
+      repeated: isSet(object.repeated) ? gt.Boolean(object.repeated) : false,
+    };
+  },
+
+  toJSON(message: ExtensionRangeOptions_Declaration): unknown {
+    const obj: any = {};
+    if (message.number !== undefined && message.number !== 0) {
+      obj.number = Math.round(message.number);
+    }
+    if (message.fullName !== undefined && message.fullName !== "") {
+      obj.fullName = message.fullName;
+    }
+    if (message.type !== undefined && message.type !== "") {
+      obj.type = message.type;
+    }
+    if (message.reserved !== undefined && message.reserved !== false) {
+      obj.reserved = message.reserved;
+    }
+    if (message.repeated !== undefined && message.repeated !== false) {
+      obj.repeated = message.repeated;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<ExtensionRangeOptions_Declaration>, I>>(
+    base?: I,
+  ): ExtensionRangeOptions_Declaration {
+    return ExtensionRangeOptions_Declaration.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<ExtensionRangeOptions_Declaration>, I>>(
+    object: I,
+  ): ExtensionRangeOptions_Declaration {
+    const message = createBaseExtensionRangeOptions_Declaration();
+    message.number = object.number ?? 0;
+    message.fullName = object.fullName ?? "";
+    message.type = object.type ?? "";
+    message.reserved = object.reserved ?? false;
+    message.repeated = object.repeated ?? false;
+    return message;
+  },
+};
+
+function createBaseFieldDescriptorProto(): FieldDescriptorProto {
+  return {
+    name: "",
+    number: 0,
     label: 1,
     type: 1,
     typeName: "",
@@ -2861,7 +3870,6 @@ function createBaseFileOptions(): FileOptions {
     ccGenericServices: false,
     javaGenericServices: false,
     pyGenericServices: false,
-    phpGenericServices: false,
     deprecated: false,
     ccEnableArenas: true,
     objcClassPrefix: "",
@@ -2871,6 +3879,7 @@ function createBaseFileOptions(): FileOptions {
     phpNamespace: "",
     phpMetadataNamespace: "",
     rubyPackage: "",
+    features: undefined,
     uninterpretedOption: [],
   };
 }
@@ -2907,9 +3916,6 @@ export const FileOptions = {
     if (message.pyGenericServices !== undefined && message.pyGenericServices !== false) {
       writer.uint32(144).bool(message.pyGenericServices);
     }
-    if (message.phpGenericServices !== undefined && message.phpGenericServices !== false) {
-      writer.uint32(336).bool(message.phpGenericServices);
-    }
     if (message.deprecated !== undefined && message.deprecated !== false) {
       writer.uint32(184).bool(message.deprecated);
     }
@@ -2937,6 +3943,9 @@ export const FileOptions = {
     if (message.rubyPackage !== undefined && message.rubyPackage !== "") {
       writer.uint32(362).string(message.rubyPackage);
     }
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(402).fork()).ldelim();
+    }
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
     }
@@ -3020,13 +4029,6 @@ export const FileOptions = {
 
           message.pyGenericServices = reader.bool();
           continue;
-        case 42:
-          if (tag !== 336) {
-            break;
-          }
-
-          message.phpGenericServices = reader.bool();
-          continue;
         case 23:
           if (tag !== 184) {
             break;
@@ -3090,6 +4092,13 @@ export const FileOptions = {
 
           message.rubyPackage = reader.string();
           continue;
+        case 50:
+          if (tag !== 402) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
         case 999:
           if (tag !== 7994) {
             break;
@@ -3120,7 +4129,6 @@ export const FileOptions = {
       ccGenericServices: isSet(object.ccGenericServices) ? gt.Boolean(object.ccGenericServices) : false,
       javaGenericServices: isSet(object.javaGenericServices) ? gt.Boolean(object.javaGenericServices) : false,
       pyGenericServices: isSet(object.pyGenericServices) ? gt.Boolean(object.pyGenericServices) : false,
-      phpGenericServices: isSet(object.phpGenericServices) ? gt.Boolean(object.phpGenericServices) : false,
       deprecated: isSet(object.deprecated) ? gt.Boolean(object.deprecated) : false,
       ccEnableArenas: isSet(object.ccEnableArenas) ? gt.Boolean(object.ccEnableArenas) : true,
       objcClassPrefix: isSet(object.objcClassPrefix) ? gt.String(object.objcClassPrefix) : "",
@@ -3130,6 +4138,7 @@ export const FileOptions = {
       phpNamespace: isSet(object.phpNamespace) ? gt.String(object.phpNamespace) : "",
       phpMetadataNamespace: isSet(object.phpMetadataNamespace) ? gt.String(object.phpMetadataNamespace) : "",
       rubyPackage: isSet(object.rubyPackage) ? gt.String(object.rubyPackage) : "",
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
       uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
         ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
         : [],
@@ -3168,9 +4177,6 @@ export const FileOptions = {
     if (message.pyGenericServices !== undefined && message.pyGenericServices !== false) {
       obj.pyGenericServices = message.pyGenericServices;
     }
-    if (message.phpGenericServices !== undefined && message.phpGenericServices !== false) {
-      obj.phpGenericServices = message.phpGenericServices;
-    }
     if (message.deprecated !== undefined && message.deprecated !== false) {
       obj.deprecated = message.deprecated;
     }
@@ -3198,6 +4204,9 @@ export const FileOptions = {
     if (message.rubyPackage !== undefined && message.rubyPackage !== "") {
       obj.rubyPackage = message.rubyPackage;
     }
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
     if (message.uninterpretedOption?.length) {
       obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
     }
@@ -3219,7 +4228,6 @@ export const FileOptions = {
     message.ccGenericServices = object.ccGenericServices ?? false;
     message.javaGenericServices = object.javaGenericServices ?? false;
     message.pyGenericServices = object.pyGenericServices ?? false;
-    message.phpGenericServices = object.phpGenericServices ?? false;
     message.deprecated = object.deprecated ?? false;
     message.ccEnableArenas = object.ccEnableArenas ?? true;
     message.objcClassPrefix = object.objcClassPrefix ?? "";
@@ -3229,6 +4237,9 @@ export const FileOptions = {
     message.phpNamespace = object.phpNamespace ?? "";
     message.phpMetadataNamespace = object.phpMetadataNamespace ?? "";
     message.rubyPackage = object.rubyPackage ?? "";
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
     message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
     return message;
   },
@@ -3240,6 +4251,8 @@ function createBaseMessageOptions(): MessageOptions {
     noStandardDescriptorAccessor: false,
     deprecated: false,
     mapEntry: false,
+    deprecatedLegacyJsonFieldConflicts: false,
+    features: undefined,
     uninterpretedOption: [],
   };
 }
@@ -3258,6 +4271,14 @@ export const MessageOptions = {
     if (message.mapEntry !== undefined && message.mapEntry !== false) {
       writer.uint32(56).bool(message.mapEntry);
     }
+    if (
+      message.deprecatedLegacyJsonFieldConflicts !== undefined && message.deprecatedLegacyJsonFieldConflicts !== false
+    ) {
+      writer.uint32(88).bool(message.deprecatedLegacyJsonFieldConflicts);
+    }
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(98).fork()).ldelim();
+    }
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
     }
@@ -3299,6 +4320,20 @@ export const MessageOptions = {
 
           message.mapEntry = reader.bool();
           continue;
+        case 11:
+          if (tag !== 88) {
+            break;
+          }
+
+          message.deprecatedLegacyJsonFieldConflicts = reader.bool();
+          continue;
+        case 12:
+          if (tag !== 98) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
         case 999:
           if (tag !== 7994) {
             break;
@@ -3323,6 +4358,10 @@ export const MessageOptions = {
         : false,
       deprecated: isSet(object.deprecated) ? gt.Boolean(object.deprecated) : false,
       mapEntry: isSet(object.mapEntry) ? gt.Boolean(object.mapEntry) : false,
+      deprecatedLegacyJsonFieldConflicts: isSet(object.deprecatedLegacyJsonFieldConflicts)
+        ? gt.Boolean(object.deprecatedLegacyJsonFieldConflicts)
+        : false,
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
       uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
         ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
         : [],
@@ -3343,6 +4382,14 @@ export const MessageOptions = {
     if (message.mapEntry !== undefined && message.mapEntry !== false) {
       obj.mapEntry = message.mapEntry;
     }
+    if (
+      message.deprecatedLegacyJsonFieldConflicts !== undefined && message.deprecatedLegacyJsonFieldConflicts !== false
+    ) {
+      obj.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts;
+    }
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
     if (message.uninterpretedOption?.length) {
       obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
     }
@@ -3358,6 +4405,10 @@ export const MessageOptions = {
     message.noStandardDescriptorAccessor = object.noStandardDescriptorAccessor ?? false;
     message.deprecated = object.deprecated ?? false;
     message.mapEntry = object.mapEntry ?? false;
+    message.deprecatedLegacyJsonFieldConflicts = object.deprecatedLegacyJsonFieldConflicts ?? false;
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
     message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
     return message;
   },
@@ -3372,6 +4423,12 @@ function createBaseFieldOptions(): FieldOptions {
     unverifiedLazy: false,
     deprecated: false,
     weak: false,
+    debugRedact: false,
+    retention: 0,
+    targets: [],
+    editionDefaults: [],
+    features: undefined,
+    featureSupport: undefined,
     uninterpretedOption: [],
   };
 }
@@ -3399,6 +4456,26 @@ export const FieldOptions = {
     if (message.weak !== undefined && message.weak !== false) {
       writer.uint32(80).bool(message.weak);
     }
+    if (message.debugRedact !== undefined && message.debugRedact !== false) {
+      writer.uint32(128).bool(message.debugRedact);
+    }
+    if (message.retention !== undefined && message.retention !== 0) {
+      writer.uint32(136).int32(message.retention);
+    }
+    writer.uint32(154).fork();
+    for (const v of message.targets) {
+      writer.int32(v);
+    }
+    writer.ldelim();
+    for (const v of message.editionDefaults) {
+      FieldOptions_EditionDefault.encode(v!, writer.uint32(162).fork()).ldelim();
+    }
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(170).fork()).ldelim();
+    }
+    if (message.featureSupport !== undefined) {
+      FieldOptions_FeatureSupport.encode(message.featureSupport, writer.uint32(178).fork()).ldelim();
+    }
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
     }
@@ -3461,6 +4538,58 @@ export const FieldOptions = {
 
           message.weak = reader.bool();
           continue;
+        case 16:
+          if (tag !== 128) {
+            break;
+          }
+
+          message.debugRedact = reader.bool();
+          continue;
+        case 17:
+          if (tag !== 136) {
+            break;
+          }
+
+          message.retention = reader.int32() as any;
+          continue;
+        case 19:
+          if (tag === 152) {
+            message.targets.push(reader.int32() as any);
+
+            continue;
+          }
+
+          if (tag === 154) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.targets.push(reader.int32() as any);
+            }
+
+            continue;
+          }
+
+          break;
+        case 20:
+          if (tag !== 162) {
+            break;
+          }
+
+          message.editionDefaults.push(FieldOptions_EditionDefault.decode(reader, reader.uint32()));
+          continue;
+        case 21:
+          if (tag !== 170) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
+        case 22:
+          if (tag !== 178) {
+            break;
+          }
+
+          message.featureSupport = FieldOptions_FeatureSupport.decode(reader, reader.uint32());
+          continue;
         case 999:
           if (tag !== 7994) {
             break;
@@ -3486,6 +4615,18 @@ export const FieldOptions = {
       unverifiedLazy: isSet(object.unverifiedLazy) ? gt.Boolean(object.unverifiedLazy) : false,
       deprecated: isSet(object.deprecated) ? gt.Boolean(object.deprecated) : false,
       weak: isSet(object.weak) ? gt.Boolean(object.weak) : false,
+      debugRedact: isSet(object.debugRedact) ? gt.Boolean(object.debugRedact) : false,
+      retention: isSet(object.retention) ? fieldOptions_OptionRetentionFromJSON(object.retention) : 0,
+      targets: gt.Array.isArray(object?.targets)
+        ? object.targets.map((e: any) => fieldOptions_OptionTargetTypeFromJSON(e))
+        : [],
+      editionDefaults: gt.Array.isArray(object?.editionDefaults)
+        ? object.editionDefaults.map((e: any) => FieldOptions_EditionDefault.fromJSON(e))
+        : [],
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
+      featureSupport: isSet(object.featureSupport)
+        ? FieldOptions_FeatureSupport.fromJSON(object.featureSupport)
+        : undefined,
       uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
         ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
         : [],
@@ -3515,6 +4656,24 @@ export const FieldOptions = {
     if (message.weak !== undefined && message.weak !== false) {
       obj.weak = message.weak;
     }
+    if (message.debugRedact !== undefined && message.debugRedact !== false) {
+      obj.debugRedact = message.debugRedact;
+    }
+    if (message.retention !== undefined && message.retention !== 0) {
+      obj.retention = fieldOptions_OptionRetentionToJSON(message.retention);
+    }
+    if (message.targets?.length) {
+      obj.targets = message.targets.map((e) => fieldOptions_OptionTargetTypeToJSON(e));
+    }
+    if (message.editionDefaults?.length) {
+      obj.editionDefaults = message.editionDefaults.map((e) => FieldOptions_EditionDefault.toJSON(e));
+    }
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
+    if (message.featureSupport !== undefined) {
+      obj.featureSupport = FieldOptions_FeatureSupport.toJSON(message.featureSupport);
+    }
     if (message.uninterpretedOption?.length) {
       obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
     }
@@ -3533,36 +4692,56 @@ export const FieldOptions = {
     message.unverifiedLazy = object.unverifiedLazy ?? false;
     message.deprecated = object.deprecated ?? false;
     message.weak = object.weak ?? false;
+    message.debugRedact = object.debugRedact ?? false;
+    message.retention = object.retention ?? 0;
+    message.targets = object.targets?.map((e) => e) || [];
+    message.editionDefaults = object.editionDefaults?.map((e) => FieldOptions_EditionDefault.fromPartial(e)) || [];
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
+    message.featureSupport = (object.featureSupport !== undefined && object.featureSupport !== null)
+      ? FieldOptions_FeatureSupport.fromPartial(object.featureSupport)
+      : undefined;
     message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
     return message;
   },
 };
 
-function createBaseOneofOptions(): OneofOptions {
-  return { uninterpretedOption: [] };
+function createBaseFieldOptions_EditionDefault(): FieldOptions_EditionDefault {
+  return { edition: 0, value: "" };
 }
 
-export const OneofOptions = {
-  encode(message: OneofOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    for (const v of message.uninterpretedOption) {
-      UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
+export const FieldOptions_EditionDefault = {
+  encode(message: FieldOptions_EditionDefault, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.edition !== undefined && message.edition !== 0) {
+      writer.uint32(24).int32(message.edition);
+    }
+    if (message.value !== undefined && message.value !== "") {
+      writer.uint32(18).string(message.value);
     }
     return writer;
   },
 
-  decode(input: _m0.Reader | Uint8Array, length?: number): OneofOptions {
+  decode(input: _m0.Reader | Uint8Array, length?: number): FieldOptions_EditionDefault {
     const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseOneofOptions();
+    const message = createBaseFieldOptions_EditionDefault();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
-        case 999:
-          if (tag !== 7994) {
+        case 3:
+          if (tag !== 24) {
             break;
           }
 
-          message.uninterpretedOption.push(UninterpretedOption.decode(reader, reader.uint32()));
+          message.edition = reader.int32() as any;
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = reader.string();
           continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
@@ -3573,77 +4752,90 @@ export const OneofOptions = {
     return message;
   },
 
-  fromJSON(object: any): OneofOptions {
+  fromJSON(object: any): FieldOptions_EditionDefault {
     return {
-      uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
-        ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
-        : [],
+      edition: isSet(object.edition) ? editionFromJSON(object.edition) : 0,
+      value: isSet(object.value) ? gt.String(object.value) : "",
     };
   },
 
-  toJSON(message: OneofOptions): unknown {
+  toJSON(message: FieldOptions_EditionDefault): unknown {
     const obj: any = {};
-    if (message.uninterpretedOption?.length) {
-      obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
+    if (message.edition !== undefined && message.edition !== 0) {
+      obj.edition = editionToJSON(message.edition);
+    }
+    if (message.value !== undefined && message.value !== "") {
+      obj.value = message.value;
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<OneofOptions>, I>>(base?: I): OneofOptions {
-    return OneofOptions.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<FieldOptions_EditionDefault>, I>>(base?: I): FieldOptions_EditionDefault {
+    return FieldOptions_EditionDefault.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<OneofOptions>, I>>(object: I): OneofOptions {
-    const message = createBaseOneofOptions();
-    message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
+  fromPartial<I extends Exact<DeepPartial<FieldOptions_EditionDefault>, I>>(object: I): FieldOptions_EditionDefault {
+    const message = createBaseFieldOptions_EditionDefault();
+    message.edition = object.edition ?? 0;
+    message.value = object.value ?? "";
     return message;
   },
 };
 
-function createBaseEnumOptions(): EnumOptions {
-  return { allowAlias: false, deprecated: false, uninterpretedOption: [] };
+function createBaseFieldOptions_FeatureSupport(): FieldOptions_FeatureSupport {
+  return { editionIntroduced: 0, editionDeprecated: 0, deprecationWarning: "", editionRemoved: 0 };
 }
 
-export const EnumOptions = {
-  encode(message: EnumOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.allowAlias !== undefined && message.allowAlias !== false) {
-      writer.uint32(16).bool(message.allowAlias);
+export const FieldOptions_FeatureSupport = {
+  encode(message: FieldOptions_FeatureSupport, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.editionIntroduced !== undefined && message.editionIntroduced !== 0) {
+      writer.uint32(8).int32(message.editionIntroduced);
     }
-    if (message.deprecated !== undefined && message.deprecated !== false) {
-      writer.uint32(24).bool(message.deprecated);
+    if (message.editionDeprecated !== undefined && message.editionDeprecated !== 0) {
+      writer.uint32(16).int32(message.editionDeprecated);
     }
-    for (const v of message.uninterpretedOption) {
-      UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
+    if (message.deprecationWarning !== undefined && message.deprecationWarning !== "") {
+      writer.uint32(26).string(message.deprecationWarning);
+    }
+    if (message.editionRemoved !== undefined && message.editionRemoved !== 0) {
+      writer.uint32(32).int32(message.editionRemoved);
     }
     return writer;
   },
 
-  decode(input: _m0.Reader | Uint8Array, length?: number): EnumOptions {
+  decode(input: _m0.Reader | Uint8Array, length?: number): FieldOptions_FeatureSupport {
     const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseEnumOptions();
+    const message = createBaseFieldOptions_FeatureSupport();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.editionIntroduced = reader.int32() as any;
+          continue;
         case 2:
           if (tag !== 16) {
             break;
           }
 
-          message.allowAlias = reader.bool();
+          message.editionDeprecated = reader.int32() as any;
           continue;
         case 3:
-          if (tag !== 24) {
+          if (tag !== 26) {
             break;
           }
 
-          message.deprecated = reader.bool();
+          message.deprecationWarning = reader.string();
           continue;
-        case 999:
-          if (tag !== 7994) {
+        case 4:
+          if (tag !== 32) {
             break;
           }
 
-          message.uninterpretedOption.push(UninterpretedOption.decode(reader, reader.uint32()));
+          message.editionRemoved = reader.int32() as any;
           continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
@@ -3654,51 +4846,282 @@ export const EnumOptions = {
     return message;
   },
 
-  fromJSON(object: any): EnumOptions {
+  fromJSON(object: any): FieldOptions_FeatureSupport {
     return {
-      allowAlias: isSet(object.allowAlias) ? gt.Boolean(object.allowAlias) : false,
-      deprecated: isSet(object.deprecated) ? gt.Boolean(object.deprecated) : false,
-      uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
-        ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
-        : [],
+      editionIntroduced: isSet(object.editionIntroduced) ? editionFromJSON(object.editionIntroduced) : 0,
+      editionDeprecated: isSet(object.editionDeprecated) ? editionFromJSON(object.editionDeprecated) : 0,
+      deprecationWarning: isSet(object.deprecationWarning) ? gt.String(object.deprecationWarning) : "",
+      editionRemoved: isSet(object.editionRemoved) ? editionFromJSON(object.editionRemoved) : 0,
     };
   },
 
-  toJSON(message: EnumOptions): unknown {
+  toJSON(message: FieldOptions_FeatureSupport): unknown {
     const obj: any = {};
-    if (message.allowAlias !== undefined && message.allowAlias !== false) {
-      obj.allowAlias = message.allowAlias;
+    if (message.editionIntroduced !== undefined && message.editionIntroduced !== 0) {
+      obj.editionIntroduced = editionToJSON(message.editionIntroduced);
     }
-    if (message.deprecated !== undefined && message.deprecated !== false) {
-      obj.deprecated = message.deprecated;
+    if (message.editionDeprecated !== undefined && message.editionDeprecated !== 0) {
+      obj.editionDeprecated = editionToJSON(message.editionDeprecated);
     }
-    if (message.uninterpretedOption?.length) {
-      obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
+    if (message.deprecationWarning !== undefined && message.deprecationWarning !== "") {
+      obj.deprecationWarning = message.deprecationWarning;
+    }
+    if (message.editionRemoved !== undefined && message.editionRemoved !== 0) {
+      obj.editionRemoved = editionToJSON(message.editionRemoved);
     }
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<EnumOptions>, I>>(base?: I): EnumOptions {
-    return EnumOptions.fromPartial(base ?? ({} as any));
+  create<I extends Exact<DeepPartial<FieldOptions_FeatureSupport>, I>>(base?: I): FieldOptions_FeatureSupport {
+    return FieldOptions_FeatureSupport.fromPartial(base ?? ({} as any));
   },
-  fromPartial<I extends Exact<DeepPartial<EnumOptions>, I>>(object: I): EnumOptions {
-    const message = createBaseEnumOptions();
-    message.allowAlias = object.allowAlias ?? false;
-    message.deprecated = object.deprecated ?? false;
-    message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
+  fromPartial<I extends Exact<DeepPartial<FieldOptions_FeatureSupport>, I>>(object: I): FieldOptions_FeatureSupport {
+    const message = createBaseFieldOptions_FeatureSupport();
+    message.editionIntroduced = object.editionIntroduced ?? 0;
+    message.editionDeprecated = object.editionDeprecated ?? 0;
+    message.deprecationWarning = object.deprecationWarning ?? "";
+    message.editionRemoved = object.editionRemoved ?? 0;
     return message;
   },
 };
 
-function createBaseEnumValueOptions(): EnumValueOptions {
-  return { deprecated: false, uninterpretedOption: [] };
+function createBaseOneofOptions(): OneofOptions {
+  return { features: undefined, uninterpretedOption: [] };
 }
 
-export const EnumValueOptions = {
-  encode(message: EnumValueOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.deprecated !== undefined && message.deprecated !== false) {
-      writer.uint32(8).bool(message.deprecated);
-    }
+export const OneofOptions = {
+  encode(message: OneofOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(10).fork()).ldelim();
+    }
+    for (const v of message.uninterpretedOption) {
+      UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): OneofOptions {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseOneofOptions();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
+        case 999:
+          if (tag !== 7994) {
+            break;
+          }
+
+          message.uninterpretedOption.push(UninterpretedOption.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): OneofOptions {
+    return {
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
+      uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
+        ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
+        : [],
+    };
+  },
+
+  toJSON(message: OneofOptions): unknown {
+    const obj: any = {};
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
+    if (message.uninterpretedOption?.length) {
+      obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<OneofOptions>, I>>(base?: I): OneofOptions {
+    return OneofOptions.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<OneofOptions>, I>>(object: I): OneofOptions {
+    const message = createBaseOneofOptions();
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
+    message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseEnumOptions(): EnumOptions {
+  return {
+    allowAlias: false,
+    deprecated: false,
+    deprecatedLegacyJsonFieldConflicts: false,
+    features: undefined,
+    uninterpretedOption: [],
+  };
+}
+
+export const EnumOptions = {
+  encode(message: EnumOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.allowAlias !== undefined && message.allowAlias !== false) {
+      writer.uint32(16).bool(message.allowAlias);
+    }
+    if (message.deprecated !== undefined && message.deprecated !== false) {
+      writer.uint32(24).bool(message.deprecated);
+    }
+    if (
+      message.deprecatedLegacyJsonFieldConflicts !== undefined && message.deprecatedLegacyJsonFieldConflicts !== false
+    ) {
+      writer.uint32(48).bool(message.deprecatedLegacyJsonFieldConflicts);
+    }
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(58).fork()).ldelim();
+    }
+    for (const v of message.uninterpretedOption) {
+      UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): EnumOptions {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseEnumOptions();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 2:
+          if (tag !== 16) {
+            break;
+          }
+
+          message.allowAlias = reader.bool();
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.deprecated = reader.bool();
+          continue;
+        case 6:
+          if (tag !== 48) {
+            break;
+          }
+
+          message.deprecatedLegacyJsonFieldConflicts = reader.bool();
+          continue;
+        case 7:
+          if (tag !== 58) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
+        case 999:
+          if (tag !== 7994) {
+            break;
+          }
+
+          message.uninterpretedOption.push(UninterpretedOption.decode(reader, reader.uint32()));
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): EnumOptions {
+    return {
+      allowAlias: isSet(object.allowAlias) ? gt.Boolean(object.allowAlias) : false,
+      deprecated: isSet(object.deprecated) ? gt.Boolean(object.deprecated) : false,
+      deprecatedLegacyJsonFieldConflicts: isSet(object.deprecatedLegacyJsonFieldConflicts)
+        ? gt.Boolean(object.deprecatedLegacyJsonFieldConflicts)
+        : false,
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
+      uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
+        ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
+        : [],
+    };
+  },
+
+  toJSON(message: EnumOptions): unknown {
+    const obj: any = {};
+    if (message.allowAlias !== undefined && message.allowAlias !== false) {
+      obj.allowAlias = message.allowAlias;
+    }
+    if (message.deprecated !== undefined && message.deprecated !== false) {
+      obj.deprecated = message.deprecated;
+    }
+    if (
+      message.deprecatedLegacyJsonFieldConflicts !== undefined && message.deprecatedLegacyJsonFieldConflicts !== false
+    ) {
+      obj.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts;
+    }
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
+    if (message.uninterpretedOption?.length) {
+      obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<EnumOptions>, I>>(base?: I): EnumOptions {
+    return EnumOptions.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<EnumOptions>, I>>(object: I): EnumOptions {
+    const message = createBaseEnumOptions();
+    message.allowAlias = object.allowAlias ?? false;
+    message.deprecated = object.deprecated ?? false;
+    message.deprecatedLegacyJsonFieldConflicts = object.deprecatedLegacyJsonFieldConflicts ?? false;
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
+    message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseEnumValueOptions(): EnumValueOptions {
+  return {
+    deprecated: false,
+    features: undefined,
+    debugRedact: false,
+    featureSupport: undefined,
+    uninterpretedOption: [],
+  };
+}
+
+export const EnumValueOptions = {
+  encode(message: EnumValueOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.deprecated !== undefined && message.deprecated !== false) {
+      writer.uint32(8).bool(message.deprecated);
+    }
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(18).fork()).ldelim();
+    }
+    if (message.debugRedact !== undefined && message.debugRedact !== false) {
+      writer.uint32(24).bool(message.debugRedact);
+    }
+    if (message.featureSupport !== undefined) {
+      FieldOptions_FeatureSupport.encode(message.featureSupport, writer.uint32(34).fork()).ldelim();
+    }
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
     }
@@ -3719,6 +5142,27 @@ export const EnumValueOptions = {
 
           message.deprecated = reader.bool();
           continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.debugRedact = reader.bool();
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          message.featureSupport = FieldOptions_FeatureSupport.decode(reader, reader.uint32());
+          continue;
         case 999:
           if (tag !== 7994) {
             break;
@@ -3738,6 +5182,11 @@ export const EnumValueOptions = {
   fromJSON(object: any): EnumValueOptions {
     return {
       deprecated: isSet(object.deprecated) ? gt.Boolean(object.deprecated) : false,
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
+      debugRedact: isSet(object.debugRedact) ? gt.Boolean(object.debugRedact) : false,
+      featureSupport: isSet(object.featureSupport)
+        ? FieldOptions_FeatureSupport.fromJSON(object.featureSupport)
+        : undefined,
       uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
         ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
         : [],
@@ -3749,6 +5198,15 @@ export const EnumValueOptions = {
     if (message.deprecated !== undefined && message.deprecated !== false) {
       obj.deprecated = message.deprecated;
     }
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
+    if (message.debugRedact !== undefined && message.debugRedact !== false) {
+      obj.debugRedact = message.debugRedact;
+    }
+    if (message.featureSupport !== undefined) {
+      obj.featureSupport = FieldOptions_FeatureSupport.toJSON(message.featureSupport);
+    }
     if (message.uninterpretedOption?.length) {
       obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
     }
@@ -3761,17 +5219,27 @@ export const EnumValueOptions = {
   fromPartial<I extends Exact<DeepPartial<EnumValueOptions>, I>>(object: I): EnumValueOptions {
     const message = createBaseEnumValueOptions();
     message.deprecated = object.deprecated ?? false;
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
+    message.debugRedact = object.debugRedact ?? false;
+    message.featureSupport = (object.featureSupport !== undefined && object.featureSupport !== null)
+      ? FieldOptions_FeatureSupport.fromPartial(object.featureSupport)
+      : undefined;
     message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
     return message;
   },
 };
 
 function createBaseServiceOptions(): ServiceOptions {
-  return { deprecated: false, uninterpretedOption: [] };
+  return { features: undefined, deprecated: false, uninterpretedOption: [] };
 }
 
 export const ServiceOptions = {
   encode(message: ServiceOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(274).fork()).ldelim();
+    }
     if (message.deprecated !== undefined && message.deprecated !== false) {
       writer.uint32(264).bool(message.deprecated);
     }
@@ -3788,6 +5256,13 @@ export const ServiceOptions = {
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
+        case 34:
+          if (tag !== 274) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
         case 33:
           if (tag !== 264) {
             break;
@@ -3813,6 +5288,7 @@ export const ServiceOptions = {
 
   fromJSON(object: any): ServiceOptions {
     return {
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
       deprecated: isSet(object.deprecated) ? gt.Boolean(object.deprecated) : false,
       uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
         ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
@@ -3822,6 +5298,9 @@ export const ServiceOptions = {
 
   toJSON(message: ServiceOptions): unknown {
     const obj: any = {};
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
     if (message.deprecated !== undefined && message.deprecated !== false) {
       obj.deprecated = message.deprecated;
     }
@@ -3836,6 +5315,9 @@ export const ServiceOptions = {
   },
   fromPartial<I extends Exact<DeepPartial<ServiceOptions>, I>>(object: I): ServiceOptions {
     const message = createBaseServiceOptions();
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
     message.deprecated = object.deprecated ?? false;
     message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
     return message;
@@ -3843,7 +5325,7 @@ export const ServiceOptions = {
 };
 
 function createBaseMethodOptions(): MethodOptions {
-  return { deprecated: false, idempotencyLevel: 0, uninterpretedOption: [] };
+  return { deprecated: false, idempotencyLevel: 0, features: undefined, uninterpretedOption: [] };
 }
 
 export const MethodOptions = {
@@ -3854,6 +5336,9 @@ export const MethodOptions = {
     if (message.idempotencyLevel !== undefined && message.idempotencyLevel !== 0) {
       writer.uint32(272).int32(message.idempotencyLevel);
     }
+    if (message.features !== undefined) {
+      FeatureSet.encode(message.features, writer.uint32(282).fork()).ldelim();
+    }
     for (const v of message.uninterpretedOption) {
       UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim();
     }
@@ -3881,6 +5366,13 @@ export const MethodOptions = {
 
           message.idempotencyLevel = reader.int32() as any;
           continue;
+        case 35:
+          if (tag !== 282) {
+            break;
+          }
+
+          message.features = FeatureSet.decode(reader, reader.uint32());
+          continue;
         case 999:
           if (tag !== 7994) {
             break;
@@ -3903,6 +5395,7 @@ export const MethodOptions = {
       idempotencyLevel: isSet(object.idempotencyLevel)
         ? methodOptions_IdempotencyLevelFromJSON(object.idempotencyLevel)
         : 0,
+      features: isSet(object.features) ? FeatureSet.fromJSON(object.features) : undefined,
       uninterpretedOption: gt.Array.isArray(object?.uninterpretedOption)
         ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e))
         : [],
@@ -3917,6 +5410,9 @@ export const MethodOptions = {
     if (message.idempotencyLevel !== undefined && message.idempotencyLevel !== 0) {
       obj.idempotencyLevel = methodOptions_IdempotencyLevelToJSON(message.idempotencyLevel);
     }
+    if (message.features !== undefined) {
+      obj.features = FeatureSet.toJSON(message.features);
+    }
     if (message.uninterpretedOption?.length) {
       obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e));
     }
@@ -3930,6 +5426,9 @@ export const MethodOptions = {
     const message = createBaseMethodOptions();
     message.deprecated = object.deprecated ?? false;
     message.idempotencyLevel = object.idempotencyLevel ?? 0;
+    message.features = (object.features !== undefined && object.features !== null)
+      ? FeatureSet.fromPartial(object.features)
+      : undefined;
     message.uninterpretedOption = object.uninterpretedOption?.map((e) => UninterpretedOption.fromPartial(e)) || [];
     return message;
   },
@@ -4166,6 +5665,339 @@ export const UninterpretedOption_NamePart = {
   },
 };
 
+function createBaseFeatureSet(): FeatureSet {
+  return {
+    fieldPresence: 0,
+    enumType: 0,
+    repeatedFieldEncoding: 0,
+    utf8Validation: 0,
+    messageEncoding: 0,
+    jsonFormat: 0,
+  };
+}
+
+export const FeatureSet = {
+  encode(message: FeatureSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.fieldPresence !== undefined && message.fieldPresence !== 0) {
+      writer.uint32(8).int32(message.fieldPresence);
+    }
+    if (message.enumType !== undefined && message.enumType !== 0) {
+      writer.uint32(16).int32(message.enumType);
+    }
+    if (message.repeatedFieldEncoding !== undefined && message.repeatedFieldEncoding !== 0) {
+      writer.uint32(24).int32(message.repeatedFieldEncoding);
+    }
+    if (message.utf8Validation !== undefined && message.utf8Validation !== 0) {
+      writer.uint32(32).int32(message.utf8Validation);
+    }
+    if (message.messageEncoding !== undefined && message.messageEncoding !== 0) {
+      writer.uint32(40).int32(message.messageEncoding);
+    }
+    if (message.jsonFormat !== undefined && message.jsonFormat !== 0) {
+      writer.uint32(48).int32(message.jsonFormat);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): FeatureSet {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseFeatureSet();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 8) {
+            break;
+          }
+
+          message.fieldPresence = reader.int32() as any;
+          continue;
+        case 2:
+          if (tag !== 16) {
+            break;
+          }
+
+          message.enumType = reader.int32() as any;
+          continue;
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.repeatedFieldEncoding = reader.int32() as any;
+          continue;
+        case 4:
+          if (tag !== 32) {
+            break;
+          }
+
+          message.utf8Validation = reader.int32() as any;
+          continue;
+        case 5:
+          if (tag !== 40) {
+            break;
+          }
+
+          message.messageEncoding = reader.int32() as any;
+          continue;
+        case 6:
+          if (tag !== 48) {
+            break;
+          }
+
+          message.jsonFormat = reader.int32() as any;
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): FeatureSet {
+    return {
+      fieldPresence: isSet(object.fieldPresence) ? featureSet_FieldPresenceFromJSON(object.fieldPresence) : 0,
+      enumType: isSet(object.enumType) ? featureSet_EnumTypeFromJSON(object.enumType) : 0,
+      repeatedFieldEncoding: isSet(object.repeatedFieldEncoding)
+        ? featureSet_RepeatedFieldEncodingFromJSON(object.repeatedFieldEncoding)
+        : 0,
+      utf8Validation: isSet(object.utf8Validation) ? featureSet_Utf8ValidationFromJSON(object.utf8Validation) : 0,
+      messageEncoding: isSet(object.messageEncoding) ? featureSet_MessageEncodingFromJSON(object.messageEncoding) : 0,
+      jsonFormat: isSet(object.jsonFormat) ? featureSet_JsonFormatFromJSON(object.jsonFormat) : 0,
+    };
+  },
+
+  toJSON(message: FeatureSet): unknown {
+    const obj: any = {};
+    if (message.fieldPresence !== undefined && message.fieldPresence !== 0) {
+      obj.fieldPresence = featureSet_FieldPresenceToJSON(message.fieldPresence);
+    }
+    if (message.enumType !== undefined && message.enumType !== 0) {
+      obj.enumType = featureSet_EnumTypeToJSON(message.enumType);
+    }
+    if (message.repeatedFieldEncoding !== undefined && message.repeatedFieldEncoding !== 0) {
+      obj.repeatedFieldEncoding = featureSet_RepeatedFieldEncodingToJSON(message.repeatedFieldEncoding);
+    }
+    if (message.utf8Validation !== undefined && message.utf8Validation !== 0) {
+      obj.utf8Validation = featureSet_Utf8ValidationToJSON(message.utf8Validation);
+    }
+    if (message.messageEncoding !== undefined && message.messageEncoding !== 0) {
+      obj.messageEncoding = featureSet_MessageEncodingToJSON(message.messageEncoding);
+    }
+    if (message.jsonFormat !== undefined && message.jsonFormat !== 0) {
+      obj.jsonFormat = featureSet_JsonFormatToJSON(message.jsonFormat);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<FeatureSet>, I>>(base?: I): FeatureSet {
+    return FeatureSet.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<FeatureSet>, I>>(object: I): FeatureSet {
+    const message = createBaseFeatureSet();
+    message.fieldPresence = object.fieldPresence ?? 0;
+    message.enumType = object.enumType ?? 0;
+    message.repeatedFieldEncoding = object.repeatedFieldEncoding ?? 0;
+    message.utf8Validation = object.utf8Validation ?? 0;
+    message.messageEncoding = object.messageEncoding ?? 0;
+    message.jsonFormat = object.jsonFormat ?? 0;
+    return message;
+  },
+};
+
+function createBaseFeatureSetDefaults(): FeatureSetDefaults {
+  return { defaults: [], minimumEdition: 0, maximumEdition: 0 };
+}
+
+export const FeatureSetDefaults = {
+  encode(message: FeatureSetDefaults, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    for (const v of message.defaults) {
+      FeatureSetDefaults_FeatureSetEditionDefault.encode(v!, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.minimumEdition !== undefined && message.minimumEdition !== 0) {
+      writer.uint32(32).int32(message.minimumEdition);
+    }
+    if (message.maximumEdition !== undefined && message.maximumEdition !== 0) {
+      writer.uint32(40).int32(message.maximumEdition);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): FeatureSetDefaults {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseFeatureSetDefaults();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.defaults.push(FeatureSetDefaults_FeatureSetEditionDefault.decode(reader, reader.uint32()));
+          continue;
+        case 4:
+          if (tag !== 32) {
+            break;
+          }
+
+          message.minimumEdition = reader.int32() as any;
+          continue;
+        case 5:
+          if (tag !== 40) {
+            break;
+          }
+
+          message.maximumEdition = reader.int32() as any;
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): FeatureSetDefaults {
+    return {
+      defaults: gt.Array.isArray(object?.defaults)
+        ? object.defaults.map((e: any) => FeatureSetDefaults_FeatureSetEditionDefault.fromJSON(e))
+        : [],
+      minimumEdition: isSet(object.minimumEdition) ? editionFromJSON(object.minimumEdition) : 0,
+      maximumEdition: isSet(object.maximumEdition) ? editionFromJSON(object.maximumEdition) : 0,
+    };
+  },
+
+  toJSON(message: FeatureSetDefaults): unknown {
+    const obj: any = {};
+    if (message.defaults?.length) {
+      obj.defaults = message.defaults.map((e) => FeatureSetDefaults_FeatureSetEditionDefault.toJSON(e));
+    }
+    if (message.minimumEdition !== undefined && message.minimumEdition !== 0) {
+      obj.minimumEdition = editionToJSON(message.minimumEdition);
+    }
+    if (message.maximumEdition !== undefined && message.maximumEdition !== 0) {
+      obj.maximumEdition = editionToJSON(message.maximumEdition);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<FeatureSetDefaults>, I>>(base?: I): FeatureSetDefaults {
+    return FeatureSetDefaults.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<FeatureSetDefaults>, I>>(object: I): FeatureSetDefaults {
+    const message = createBaseFeatureSetDefaults();
+    message.defaults = object.defaults?.map((e) => FeatureSetDefaults_FeatureSetEditionDefault.fromPartial(e)) || [];
+    message.minimumEdition = object.minimumEdition ?? 0;
+    message.maximumEdition = object.maximumEdition ?? 0;
+    return message;
+  },
+};
+
+function createBaseFeatureSetDefaults_FeatureSetEditionDefault(): FeatureSetDefaults_FeatureSetEditionDefault {
+  return { edition: 0, overridableFeatures: undefined, fixedFeatures: undefined };
+}
+
+export const FeatureSetDefaults_FeatureSetEditionDefault = {
+  encode(message: FeatureSetDefaults_FeatureSetEditionDefault, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.edition !== undefined && message.edition !== 0) {
+      writer.uint32(24).int32(message.edition);
+    }
+    if (message.overridableFeatures !== undefined) {
+      FeatureSet.encode(message.overridableFeatures, writer.uint32(34).fork()).ldelim();
+    }
+    if (message.fixedFeatures !== undefined) {
+      FeatureSet.encode(message.fixedFeatures, writer.uint32(42).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): FeatureSetDefaults_FeatureSetEditionDefault {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseFeatureSetDefaults_FeatureSetEditionDefault();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 3:
+          if (tag !== 24) {
+            break;
+          }
+
+          message.edition = reader.int32() as any;
+          continue;
+        case 4:
+          if (tag !== 34) {
+            break;
+          }
+
+          message.overridableFeatures = FeatureSet.decode(reader, reader.uint32());
+          continue;
+        case 5:
+          if (tag !== 42) {
+            break;
+          }
+
+          message.fixedFeatures = FeatureSet.decode(reader, reader.uint32());
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): FeatureSetDefaults_FeatureSetEditionDefault {
+    return {
+      edition: isSet(object.edition) ? editionFromJSON(object.edition) : 0,
+      overridableFeatures: isSet(object.overridableFeatures)
+        ? FeatureSet.fromJSON(object.overridableFeatures)
+        : undefined,
+      fixedFeatures: isSet(object.fixedFeatures) ? FeatureSet.fromJSON(object.fixedFeatures) : undefined,
+    };
+  },
+
+  toJSON(message: FeatureSetDefaults_FeatureSetEditionDefault): unknown {
+    const obj: any = {};
+    if (message.edition !== undefined && message.edition !== 0) {
+      obj.edition = editionToJSON(message.edition);
+    }
+    if (message.overridableFeatures !== undefined) {
+      obj.overridableFeatures = FeatureSet.toJSON(message.overridableFeatures);
+    }
+    if (message.fixedFeatures !== undefined) {
+      obj.fixedFeatures = FeatureSet.toJSON(message.fixedFeatures);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<FeatureSetDefaults_FeatureSetEditionDefault>, I>>(
+    base?: I,
+  ): FeatureSetDefaults_FeatureSetEditionDefault {
+    return FeatureSetDefaults_FeatureSetEditionDefault.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<FeatureSetDefaults_FeatureSetEditionDefault>, I>>(
+    object: I,
+  ): FeatureSetDefaults_FeatureSetEditionDefault {
+    const message = createBaseFeatureSetDefaults_FeatureSetEditionDefault();
+    message.edition = object.edition ?? 0;
+    message.overridableFeatures = (object.overridableFeatures !== undefined && object.overridableFeatures !== null)
+      ? FeatureSet.fromPartial(object.overridableFeatures)
+      : undefined;
+    message.fixedFeatures = (object.fixedFeatures !== undefined && object.fixedFeatures !== null)
+      ? FeatureSet.fromPartial(object.fixedFeatures)
+      : undefined;
+    return message;
+  },
+};
+
 function createBaseSourceCodeInfo(): SourceCodeInfo {
   return { location: [] };
 }
@@ -4434,7 +6266,7 @@ export const GeneratedCodeInfo = {
 };
 
 function createBaseGeneratedCodeInfo_Annotation(): GeneratedCodeInfo_Annotation {
-  return { path: [], sourceFile: "", begin: 0, end: 0 };
+  return { path: [], sourceFile: "", begin: 0, end: 0, semantic: 0 };
 }
 
 export const GeneratedCodeInfo_Annotation = {
@@ -4453,6 +6285,9 @@ export const GeneratedCodeInfo_Annotation = {
     if (message.end !== undefined && message.end !== 0) {
       writer.uint32(32).int32(message.end);
     }
+    if (message.semantic !== undefined && message.semantic !== 0) {
+      writer.uint32(40).int32(message.semantic);
+    }
     return writer;
   },
 
@@ -4501,6 +6336,13 @@ export const GeneratedCodeInfo_Annotation = {
 
           message.end = reader.int32();
           continue;
+        case 5:
+          if (tag !== 40) {
+            break;
+          }
+
+          message.semantic = reader.int32() as any;
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -4516,6 +6358,7 @@ export const GeneratedCodeInfo_Annotation = {
       sourceFile: isSet(object.sourceFile) ? gt.String(object.sourceFile) : "",
       begin: isSet(object.begin) ? gt.Number(object.begin) : 0,
       end: isSet(object.end) ? gt.Number(object.end) : 0,
+      semantic: isSet(object.semantic) ? generatedCodeInfo_Annotation_SemanticFromJSON(object.semantic) : 0,
     };
   },
 
@@ -4533,6 +6376,9 @@ export const GeneratedCodeInfo_Annotation = {
     if (message.end !== undefined && message.end !== 0) {
       obj.end = Math.round(message.end);
     }
+    if (message.semantic !== undefined && message.semantic !== 0) {
+      obj.semantic = generatedCodeInfo_Annotation_SemanticToJSON(message.semantic);
+    }
     return obj;
   },
 
@@ -4545,6 +6391,7 @@ export const GeneratedCodeInfo_Annotation = {
     message.sourceFile = object.sourceFile ?? "";
     message.begin = object.begin ?? 0;
     message.end = object.end ?? 0;
+    message.semantic = object.semantic ?? 0;
     return message;
   },
 };
diff --git a/src/postGen/google/protobuf/timestamp.ts b/src/postGen/google/protobuf/timestamp.ts
index 024e2b7..de58a8c 100644
--- a/src/postGen/google/protobuf/timestamp.ts
+++ b/src/postGen/google/protobuf/timestamp.ts
@@ -98,7 +98,7 @@ export const protobufPackage = "google.protobuf";
  * [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
  * the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
  * the Joda Time's [`ISODateTimeFormat.dateTime()`](
- * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
+ * http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
  * ) to obtain a formatter capable of generating timestamps in this format.
  */
 export interface Timestamp {
diff --git a/src/proto/canine_chain/jklmint/params.proto b/src/proto/canine_chain/jklmint/params.proto
index 34c14ac..32aa636 100644
--- a/src/proto/canine_chain/jklmint/params.proto
+++ b/src/proto/canine_chain/jklmint/params.proto
@@ -11,13 +11,11 @@ message Params {
   string mint_denom = 1 [ (gogoproto.moretags) = "yaml:\"mint_denom\"" ];
 
   int64 dev_grants_ratio = 2 [ (gogoproto.moretags) = "yaml:\"dev_grants_ratio\"" ]; // default 8
-  int64 referral_commission = 3 [ (gogoproto.moretags) = "yaml:\"referral_commission\"" ]; // default 25
-  int64 storage_provider_ratio = 4 [ (gogoproto.moretags) = "yaml:\"storage_provider_ratio\"" ]; // default 12
-  int64 staker_ratio = 5 [ (gogoproto.moretags) = "yaml:\"staker_ratio\"" ]; // default 80 - this includes the community pool allocation
-  int64 tokens_per_block = 6 [ (gogoproto.moretags) = "yaml:\"tokens_per_block\"" ]; // default 4200000
-  int64 pol_ratio = 7 [ (gogoproto.moretags) = "yaml:\"pol_ratio\"" ]; // default 40
+  int64 staker_ratio = 3 [ (gogoproto.moretags) = "yaml:\"staker_ratio\"" ]; // default 80 - this includes the community pool allocation
+  int64 tokens_per_block = 4 [ (gogoproto.moretags) = "yaml:\"tokens_per_block\"" ]; // default 4200000
 
-  int64 mint_decrease = 8 [ (gogoproto.moretags) = "yaml:\"mint_decrease\"" ]; // default 6
-  string storage_stipend_address = 9 [ (gogoproto.moretags) = "yaml:\"storage_stipend_address\"" ]; // multi-sig
+  int64 mint_decrease = 5 [ (gogoproto.moretags) = "yaml:\"mint_decrease\"" ]; // default 6
+  string storage_stipend_address = 6 [ (gogoproto.moretags) = "yaml:\"storage_stipend_address\"" ]; // multi-sig
+  int64 storage_provider_ratio = 7 [ (gogoproto.moretags) = "yaml:\"storage_provider_ratio\"" ]; // default 12
 
 }
diff --git a/src/proto/canine_chain/rns/query.proto b/src/proto/canine_chain/rns/query.proto
index a788bf8..0d1d19f 100644
--- a/src/proto/canine_chain/rns/query.proto
+++ b/src/proto/canine_chain/rns/query.proto
@@ -66,6 +66,11 @@ service Query {
   rpc AllInits(QueryAllInits) returns (QueryAllInitsResponse) {
     option (google.api.http).get = "/jackal/canine-chain/rns/init";
   }
+
+  // Queries a list of Init items.
+  rpc PrimaryName(QueryPrimaryName) returns (QueryPrimaryNameResponse) {
+    option (google.api.http).get = "/jackal/canine-chain/rns/primary/{owner}";
+  }
 }
 
 message QueryParams {}
@@ -78,6 +83,11 @@ message QueryName { string name = 1; }
 
 message QueryNameResponse { Names name = 1 [ (gogoproto.nullable) = false ]; } // TODO: Check if this breaks everything to change it to Name
 
+message QueryPrimaryName { string owner = 1; }
+
+message QueryPrimaryNameResponse { Names name = 1 [ (gogoproto.nullable) = false ]; }
+
+
 message QueryListOwnedNames {
   string address = 1;
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
diff --git a/src/proto/canine_chain/rns/tx.proto b/src/proto/canine_chain/rns/tx.proto
index 6cb608b..1d23697 100644
--- a/src/proto/canine_chain/rns/tx.proto
+++ b/src/proto/canine_chain/rns/tx.proto
@@ -8,6 +8,7 @@ option go_package = "github.com/jackalLabs/canine-chain/x/rns/types";
 
 service Msg {
   rpc Register(MsgRegister) returns (MsgRegisterResponse);
+  rpc RegisterName(MsgRegisterName) returns (MsgRegisterNameResponse);
   rpc Bid(MsgBid) returns (MsgBidResponse);
   rpc AcceptBid(MsgAcceptBid) returns (MsgAcceptBidResponse);
   rpc CancelBid(MsgCancelBid) returns (MsgCancelBidResponse);
@@ -19,8 +20,10 @@ service Msg {
   rpc DelRecord(MsgDelRecord) returns (MsgDelRecordResponse);
   rpc Init(MsgInit) returns (MsgInitResponse);
   rpc Update(MsgUpdate) returns (MsgUpdateResponse);
+  rpc MakePrimary(MsgMakePrimary) returns (MsgMakePrimaryResponse);
 }
 
+// Deprecated! Use MsgRegisterName instead
 message MsgRegister {
   string creator = 1;
   string name = 2;
@@ -30,6 +33,16 @@ message MsgRegister {
 
 message MsgRegisterResponse {}
 
+message MsgRegisterName {
+  string creator = 1;
+  string name = 2;
+  int64 years = 3;
+  string data = 4;
+  bool setPrimary = 5;
+}
+
+message MsgRegisterNameResponse {}
+
 message MsgUpdate {
   string creator = 1;
   string name = 2;
@@ -38,6 +51,13 @@ message MsgUpdate {
 
 message MsgUpdateResponse {}
 
+message MsgMakePrimary {
+  string creator = 1;
+  string name = 2;
+}
+
+message MsgMakePrimaryResponse {}
+
 message MsgBid {
   string creator = 1;
   string name = 2;
diff --git a/src/proto/canine_chain/storage/params.proto b/src/proto/canine_chain/storage/params.proto
index b2e1161..c3a5e24 100644
--- a/src/proto/canine_chain/storage/params.proto
+++ b/src/proto/canine_chain/storage/params.proto
@@ -19,4 +19,8 @@ message Params {
   int64 attestMinToPass = 9; // TODO: fix casing
   int64 collateralPrice = 10; // TODO: fix casing
   int64 check_window = 11;
+
+  int64 pol_ratio = 12 [ (gogoproto.moretags) = "yaml:\"pol_ratio\"" ]; // default 40
+  int64 referral_commission = 13 [ (gogoproto.moretags) = "yaml:\"referral_commission\"" ]; // default 25
+
 }
diff --git a/src/proto/canine_chain/storage/query.proto b/src/proto/canine_chain/storage/query.proto
index 912cbcd..ec0be7c 100644
--- a/src/proto/canine_chain/storage/query.proto
+++ b/src/proto/canine_chain/storage/query.proto
@@ -22,6 +22,12 @@ service Query {
         "/jackal/canine-chain/storage/files/{merkle}/{owner}/{start}";
   }
 
+  // Queries a File by merkle, owner, and start.
+  rpc FilesFromNote(QueryFilesFromNote) returns (QueryFilesFromNoteResponse) {
+    option (google.api.http).get =
+        "/jackal/canine-chain/storage/files/note/{key}/{value}";
+  }
+
   // Queries a list of open files by provider_address.
   rpc OpenFiles(QueryOpenFiles)
       returns (QueryAllFilesResponse) {
@@ -174,6 +180,24 @@ service Query {
     option (google.api.http).get =
         "/jackal/canine-chain/storage/storage_stats";
   }
+
+  // Queries how much storage space is being used on the network at this time.
+  rpc NetworkSize(QueryNetworkSize) returns (QueryNetworkSizeResponse) {
+    option (google.api.http).get =
+        "/jackal/canine-chain/storage/network_size";
+  }
+
+  // Queries the amount of offered storage by active providers
+  rpc AvailableSpace(QueryAvailableSpace) returns (QueryAvailableSpaceResponse) {
+    option (google.api.http).get =
+        "/jackal/canine-chain/storage/available_space";
+  }
+
+  // Queries protocol storage space used and purchased.
+  rpc Gauges(QueryAllGauges) returns (QueryAllGaugesResponse) {
+    option (google.api.http).get =
+        "/jackal/canine-chain/storage/gauges";
+  }
 }
 
 message QueryParams {}
@@ -182,6 +206,7 @@ message QueryParamsResponse {
   Params params = 1 [ (gogoproto.nullable) = false ];
 }
 
+
 message QueryProof {
   string provider_address = 1;
   bytes merkle = 2;
@@ -212,6 +237,16 @@ message QueryAllProofsResponse {
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
+
+message QueryAllGauges {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+message QueryAllGaugesResponse {
+  repeated PaymentGauge gauges = 1 [ (gogoproto.nullable) = false ];
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
 message QueryFile {
   bytes merkle = 1;
   string owner = 2;
@@ -222,6 +257,17 @@ message QueryFileResponse {
   UnifiedFile file = 1 [ (gogoproto.nullable) = false ];
 }
 
+message QueryFilesFromNote {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+  string key = 2;
+  string value = 3;
+}
+
+message QueryFilesFromNoteResponse {
+  repeated UnifiedFile files = 1 [ (gogoproto.nullable) = false ];
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
 message QueryOpenFiles {
   string provider_address= 1;
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
@@ -406,3 +452,15 @@ message QueryStorageStatsResponse {
   uint64 uniqueUsers = 5;
   map<int64, int64> users_by_plan= 6;
 }
+
+message QueryNetworkSize {}
+
+message QueryNetworkSizeResponse {
+  uint64 size = 1;
+}
+
+message QueryAvailableSpace {}
+
+message QueryAvailableSpaceResponse {
+  uint64 size = 1;
+}
\ No newline at end of file
diff --git a/src/snackages/query/rns.ts b/src/snackages/query/rns.ts
index 4e7b48a..d5803a0 100644
--- a/src/snackages/query/rns.ts
+++ b/src/snackages/query/rns.ts
@@ -20,7 +20,9 @@ import type {
   DQueryInit,
   DQueryListOwnedNames,
   DQueryName,
+  DQueryPrimaryName,
   DQueryRnsParams,
+  TQueryPrimaryNameResponseStrict,
 } from '@/types/queries'
 import type {
   TQueryAllBidsResponseStrict,
@@ -135,6 +137,16 @@ export function createRnsExtension(base: QueryClient): IRnsExtension {
         assertDefined(resp.name)
         return resp as TQueryNameResponseStrict
       },
+      primaryName: async (
+        request: DQueryPrimaryName,
+      ): Promise<TQueryPrimaryNameResponseStrict> => {
+        const resp = await queryService.PrimaryName(request).catch((err) => {
+          warnError('[RNS] primaryName', err)
+          throw err
+        })
+        assertDefined(resp.name)
+        return resp as TQueryPrimaryNameResponseStrict
+      },
       params: async (
         request: DQueryRnsParams = {},
       ): Promise<TQueryRnsParamsResponseStrict> => {
diff --git a/src/snackages/query/storage.ts b/src/snackages/query/storage.ts
index a10061d..75200b4 100644
--- a/src/snackages/query/storage.ts
+++ b/src/snackages/query/storage.ts
@@ -1,7 +1,5 @@
 import { createProtobufRpcClient, QueryClient } from '@cosmjs/stargate'
 import { assertDefined } from '@cosmjs/utils'
-import { QueryClientImpl } from '@/postGen/canine_chain/storage/query'
-import { warnError } from '@/utils/misc'
 import type {
   QueryActiveProviders,
   QueryAllAttestations,
@@ -17,19 +15,31 @@ import type {
   QueryProofsByAddress,
   QueryStorageStats,
 } from '@/postGen/canine_chain/storage/query'
+import {
+  QueryAllGauges,
+  QueryAvailableSpace,
+  QueryClientImpl,
+  QueryFilesFromNote,
+  QueryNetworkSize,
+} from '@/postGen/canine_chain/storage/query'
+import { warnError } from '@/utils/misc'
 import type { IStorageExtension } from '@/interfaces/snackages'
 import type {
   DQueryActiveProviders,
   DQueryAllAttestations,
+  DQueryAllGauges,
   DQueryAllProofs,
   DQueryAllProviders,
   DQueryAllReports,
   DQueryAllStoragePaymentInfo,
   DQueryAttestation,
+  DQueryAvailableSpace,
   DQueryClientFreeSpace,
+  DQueryFilesFromNote,
   DQueryFileUploadCheck,
   DQueryFindFile,
   DQueryFreeSpace,
+  DQueryNetworkSize,
   DQueryOpenFiles,
   DQueryPayData,
   DQueryPriceCheck,
@@ -45,6 +55,10 @@ import type {
   DQueryStoragePaymentInfo,
   DQueryStorageStats,
   DQueryStoreCount,
+  TQueryAllGaugesResponseStrict,
+  TQueryAvailableSpaceResponseStrict,
+  TQueryFilesFromNoteResponseStrict,
+  TQueryNetworkSizeResponseStrict,
 } from '@/types/queries'
 import type {
   TQueryActiveProvidersResponseStrict,
@@ -140,6 +154,18 @@ export function createStorageExtension(base: QueryClient): IStorageExtension {
         assertDefined(resp.pagination)
         return resp as TQueryStorageAllFilesByOwnerResponseStrict
       },
+      allGauges: async (
+        request: DQueryAllGauges = {},
+      ): Promise<TQueryAllGaugesResponseStrict> => {
+        const resp = await queryService
+          .Gauges(request as QueryAllGauges)
+          .catch((err) => {
+            warnError('[Storage] allGauges', err)
+            throw err
+          })
+        assertDefined(resp.pagination)
+        return resp as TQueryAllGaugesResponseStrict
+      },
       allProofs: async (
         request: DQueryAllProofs = {},
       ): Promise<TQueryAllProofsResponseStrict> => {
@@ -198,6 +224,18 @@ export function createStorageExtension(base: QueryClient): IStorageExtension {
         assertDefined(resp.attestation)
         return resp as TQueryAttestationResponseStrict
       },
+      availableSpace: async (
+        request: DQueryAvailableSpace = {},
+      ): Promise<TQueryAvailableSpaceResponseStrict> => {
+        const resp = await queryService
+          .AvailableSpace(request as QueryAvailableSpace)
+          .catch((err) => {
+            warnError('[Storage] availableSpace', err)
+            throw err
+          })
+        assertDefined(resp.size)
+        return resp as TQueryAvailableSpaceResponseStrict
+      },
       clientFreeSpace: async (
         request: DQueryClientFreeSpace,
       ): Promise<TQueryClientFreeSpaceResponseStrict> => {
@@ -220,6 +258,18 @@ export function createStorageExtension(base: QueryClient): IStorageExtension {
         assertDefined(resp.file)
         return resp as TQueryStorageFileResponseStrict
       },
+      filesFromNote: async (
+        request: DQueryFilesFromNote,
+      ): Promise<TQueryFilesFromNoteResponseStrict> => {
+        const resp = await queryService
+          .FilesFromNote(request as QueryFilesFromNote)
+          .catch((err) => {
+            warnError('[Storage] filesFromNote', err)
+            throw err
+          })
+        assertDefined(resp.pagination)
+        return resp as TQueryFilesFromNoteResponseStrict
+      },
       fileUploadCheck: async (
         request: DQueryFileUploadCheck,
       ): Promise<TQueryFileUploadCheckResponseStrict> => {
@@ -252,6 +302,18 @@ export function createStorageExtension(base: QueryClient): IStorageExtension {
         assertDefined(resp.space)
         return resp as TQueryFreeSpaceResponseStrict
       },
+      networkSize: async (
+        request: DQueryNetworkSize = {},
+      ): Promise<TQueryNetworkSizeResponseStrict> => {
+        const resp = await queryService
+          .NetworkSize(request as QueryNetworkSize)
+          .catch((err) => {
+            warnError('[Storage] networkSize', err)
+            throw err
+          })
+        assertDefined(resp.size)
+        return resp as TQueryNetworkSizeResponseStrict
+      },
       openFiles: async (
         request: DQueryOpenFiles,
       ): Promise<TQueryStorageAllFilesResponseStrict> => {
diff --git a/src/snackages/tx/rns.ts b/src/snackages/tx/rns.ts
index 461c16c..5477388 100644
--- a/src/snackages/tx/rns.ts
+++ b/src/snackages/tx/rns.ts
@@ -17,15 +17,17 @@ import {
   MsgInitResponse,
   MsgList,
   MsgListResponse,
-  MsgRegister,
-  MsgRegisterResponse,
+  MsgMakePrimary,
+  MsgMakePrimaryResponse,
+  MsgRegisterName,
+  MsgRegisterNameResponse,
   MsgTransfer,
   MsgTransferResponse,
   MsgUpdate,
   MsgUpdateResponse,
   protobufPackage,
 } from '@/postGen/canine_chain/rns/tx'
-import type {
+import {
   DEncodeObject,
   DMsgAcceptBid,
   DMsgAddRecord,
@@ -36,13 +38,16 @@ import type {
   DMsgDelRecord,
   DMsgInit,
   DMsgList,
+  DMsgMakePrimary,
   DMsgRegister,
+  DMsgRegisterName,
   DMsgTransfer,
   DMsgUpdate,
 } from '@/types/msgs'
 import type { TJackalModuleTypeMap, TMsgResponseParsers } from '@/types'
 import _m0 from 'protobufjs/minimal'
 import { uintArrayToString } from '@/utils/converters'
+import { deprecated } from '@/utils/misc'
 
 export const rnsTypes: TJackalModuleTypeMap = {
   acceptBid: [`/${protobufPackage}.MsgAcceptBid`, MsgAcceptBid],
@@ -54,7 +59,8 @@ export const rnsTypes: TJackalModuleTypeMap = {
   delRecord: [`/${protobufPackage}.MsgDelRecord`, MsgDelRecord],
   init: [`/${protobufPackage}.MsgInit`, MsgInit],
   list: [`/${protobufPackage}.MsgList`, MsgList],
-  register: [`/${protobufPackage}.MsgRegister`, MsgRegister],
+  makePrimary: [`/${protobufPackage}.MsgMakePrimary`, MsgMakePrimary],
+  registerName: [`/${protobufPackage}.MsgRegisterName`, MsgRegisterName],
   transfer: [`/${protobufPackage}.MsgTransfer`, MsgTransfer],
   update: [`/${protobufPackage}.MsgUpdate`, MsgUpdate],
 }
@@ -78,8 +84,10 @@ export const rnsResponses: TMsgResponseParsers = {
     MsgInitResponse.decode(_m0.Reader.create(data)),
   [rnsTypes.list[0]]: (data: Uint8Array) =>
     MsgListResponse.decode(_m0.Reader.create(data)),
-  [rnsTypes.register[0]]: (data: Uint8Array) =>
-    MsgRegisterResponse.decode(_m0.Reader.create(data)),
+  [rnsTypes.makePrimary[0]]: (data: Uint8Array) =>
+    MsgMakePrimaryResponse.decode(_m0.Reader.create(data)),
+  [rnsTypes.registerName[0]]: (data: Uint8Array) =>
+    MsgRegisterNameResponse.decode(_m0.Reader.create(data)),
   [rnsTypes.transfer[0]]: (data: Uint8Array) =>
     MsgTransferResponse.decode(_m0.Reader.create(data)),
   [rnsTypes.update[0]]: (data: Uint8Array) =>
@@ -98,7 +106,9 @@ export const rnsResponses: TMsgResponseParsers = {
  * @property {msgDelRecord} msgDelRecord()
  * @property {msgInit} msgInit()
  * @property {msgList} msgList()
+ * @property {msgMakePrimary} msgMakePrimary()
  * @property {msgRegister} msgRegister()
+ * @property {msgRegisterName} msgRegisterName()
  * @property {msgTransfer} msgTransfer()
  * @property {msgUpdate} msgUpdate()
  */
@@ -112,7 +122,9 @@ export type ITxRns = {
   msgDelRecord(data: DMsgDelRecord): DEncodeObject
   msgInit(data: DMsgInit): DEncodeObject
   msgList(data: DMsgList): DEncodeObject
+  msgMakePrimary(data: DMsgMakePrimary): DEncodeObject
   msgRegister(data: DMsgRegister): DEncodeObject
+  msgRegisterName(data: DMsgRegister): DEncodeObject
   msgTransfer(data: DMsgTransfer): DEncodeObject
   msgUpdate(data: DMsgUpdate): DEncodeObject
 
@@ -125,7 +137,9 @@ export type ITxRns = {
   writerDelRecord(data: DMsgDelRecord): DEncodeObject
   writerInit(data: DMsgInit): DEncodeObject
   writerList(data: DMsgList): DEncodeObject
+  writerMakePrimary(data: DMsgMakePrimary): DEncodeObject
   writerRegister(data: DMsgRegister): DEncodeObject
+  writerRegisterName(data: DMsgRegister): DEncodeObject
   writerTransfer(data: DMsgTransfer): DEncodeObject
   writerUpdate(data: DMsgUpdate): DEncodeObject
 }
@@ -185,12 +199,27 @@ export const TxRns: ITxRns = {
       value: rnsTypes.list[1].fromPartial(data),
     }
   },
+  msgMakePrimary(data: DMsgMakePrimary): DEncodeObject {
+    return {
+      typeUrl: rnsTypes.makePrimary[0],
+      value: rnsTypes.makePrimary[1].fromPartial(data),
+    }
+  },
   msgRegister(data: DMsgRegister): DEncodeObject {
+    throw deprecated('[RNS] msgRegister()', 'v2.2.0', {
+      replacement: 'msgRegisterName()',
+    })
     return {
       typeUrl: rnsTypes.register[0],
       value: rnsTypes.register[1].fromPartial(data),
     }
   },
+  msgRegisterName(data: DMsgRegisterName): DEncodeObject {
+    return {
+      typeUrl: rnsTypes.registerName[0],
+      value: rnsTypes.registerName[1].fromPartial(data),
+    }
+  },
   msgTransfer(data: DMsgTransfer): DEncodeObject {
     return {
       typeUrl: rnsTypes.transfer[0],
@@ -320,7 +349,23 @@ export const TxRns: ITxRns = {
       throw err
     }
   },
+  writerMakePrimary(data: DMsgMakePrimary): DEncodeObject {
+    try {
+      const asWriter = rnsTypes.makePrimary[1].encode(data)
+      const asUint = asWriter.finish()
+      const final = btoa(uintArrayToString(asUint))
+      return {
+        typeUrl: rnsTypes.makePrimary[0],
+        value: final,
+      }
+    } catch (err) {
+      throw err
+    }
+  },
   writerRegister(data: DMsgRegister): DEncodeObject {
+    throw deprecated('[RNS] writerRegister()', 'v2.2.0', {
+      replacement: 'writerRegisterName()',
+    })
     try {
       const asWriter = rnsTypes.register[1].encode(data)
       const asUint = asWriter.finish()
@@ -333,6 +378,19 @@ export const TxRns: ITxRns = {
       throw err
     }
   },
+  writerRegisterName(data: DMsgRegisterName): DEncodeObject {
+    try {
+      const asWriter = rnsTypes.registerName[1].encode(data)
+      const asUint = asWriter.finish()
+      const final = btoa(uintArrayToString(asUint))
+      return {
+        typeUrl: rnsTypes.registerName[0],
+        value: final,
+      }
+    } catch (err) {
+      throw err
+    }
+  },
   writerTransfer(data: DMsgTransfer): DEncodeObject {
     try {
       const asWriter = rnsTypes.transfer[1].encode(data)
diff --git a/src/types/msgs/responses/rns.ts b/src/types/msgs/responses/rns.ts
index 2c3ee7d..47d1249 100644
--- a/src/types/msgs/responses/rns.ts
+++ b/src/types/msgs/responses/rns.ts
@@ -8,6 +8,8 @@ import {
   MsgDelRecordResponse,
   MsgInitResponse,
   MsgListResponse,
+  MsgMakePrimaryResponse,
+  MsgRegisterNameResponse,
   MsgRegisterResponse,
   MsgTransferResponse,
   MsgUpdateResponse,
@@ -18,6 +20,19 @@ import {
  */
 export type DMsgRegisterResponse = Documentation<{}, MsgRegisterResponse>
 
+/**
+ * MsgRegisterNameResponse Documentation
+ */
+export type DMsgRegisterNameResponse = Documentation<
+  {},
+  MsgRegisterNameResponse
+>
+
+/**
+ * MsgMakePrimaryResponse Documentation
+ */
+export type DMsgMakePrimaryResponse = Documentation<{}, MsgMakePrimaryResponse>
+
 /**
  * MsgUpdateResponse Documentation
  */
diff --git a/src/types/msgs/rns.ts b/src/types/msgs/rns.ts
index d808054..8440ce5 100644
--- a/src/types/msgs/rns.ts
+++ b/src/types/msgs/rns.ts
@@ -1,18 +1,20 @@
 import type {
-  MsgAcceptBid,
-  MsgAddRecord,
-  MsgBid,
-  MsgBuy,
-  MsgCancelBid,
-  MsgDelist,
-  MsgDelRecord,
-  MsgInit,
-  MsgList,
-  MsgRegister,
-  MsgTransfer,
-  MsgUpdate,
+    MsgAcceptBid,
+    MsgAddRecord,
+    MsgBid,
+    MsgBuy,
+    MsgCancelBid,
+    MsgDelist,
+    MsgDelRecord,
+    MsgInit,
+    MsgList,
+    MsgMakePrimary,
+    MsgRegister,
+    MsgRegisterName,
+    MsgTransfer,
+    MsgUpdate,
 } from '@/postGen/canine_chain/rns/tx'
-import type { DCoin } from '@/types'
+import type {DCoin} from '@/types'
 
 /**
  * MsgAcceptBid Documentation
@@ -141,6 +143,19 @@ export type DMsgList = Documentation<
   MsgList
 >
 
+/**
+ * MsgMakePrimary Documentation
+ * @prop {string} creator - Jackal address of wallet creating the tx.
+ * @prop {string} name - RNS address.
+ */
+export type DMsgMakePrimary = Documentation<
+  {
+    creator: string
+    name: string
+  },
+  MsgMakePrimary
+>
+
 /**
  * MsgRegister Documentation
  * @prop {string} creator - Jackal address of wallet creating the tx.
@@ -158,6 +173,25 @@ export type DMsgRegister = Documentation<
   MsgRegister
 >
 
+/**
+ * MsgRegisterName Documentation
+ * @prop {string} creator - Jackal address of wallet creating the tx.
+ * @prop {string} name - RNS address.
+ * @prop {number} years - Number of years to register new RNS for.
+ * @prop {string} data - Details about the RNS.
+ * @prop {boolean} setPrimary - If RNS is primary for wallet.
+ */
+export type DMsgRegisterName = Documentation<
+  {
+    creator: string
+    name: string
+    years: number
+    data: string
+    setPrimary: boolean
+  },
+  MsgRegisterName
+>
+
 /**
  * MsgTransfer Documentation
  * @prop {string} creator - Jackal address of wallet creating the tx.
diff --git a/src/types/queries/responses/jklMint.ts b/src/types/queries/responses/jklMint.ts
index ae24176..8496e41 100644
--- a/src/types/queries/responses/jklMint.ts
+++ b/src/types/queries/responses/jklMint.ts
@@ -1,5 +1,5 @@
-import type { QueryInflationResponse, QueryParamsResponse } from '@/postGen/canine_chain/jklmint/query'
-import type { Params } from '@/postGen/canine_chain/jklmint/params'
+import type {QueryInflationResponse, QueryParamsResponse} from '@/postGen/canine_chain/jklmint/query'
+import type {Params} from '@/postGen/canine_chain/jklmint/params'
 
 /**
  * This is the response for the [JklMint] Query/Inflation RPC method.
@@ -26,11 +26,19 @@ export type TQueryJklMintParamsResponseStrict = ModifyDeep<
  *
  * JklMintParams defines current parameters of the JklMint module.
  * @prop {string} mintDenom - Denom of token, should be ujkl for Jackal.
- * @prop {number} providerRatio - Portion of emissions diverted to providers.
+ * @prop {number} devGrantsRatio - Portion of emissions diverted to grant pools.
+ * @prop {number} stakerRatio - Portion of emissions diverted to stakers.
  * @prop {number} tokensPerBlock - Token emissions per block.
+ * @prop {number} mintDecrease - Curve of emissions decrease.
+ * @prop {string} storageStipendAddress - Multisig of storage stipends.
+ * @prop {number} storageProviderRatio - Defaults to 12.
  */
 export type DJklMintParams = {
   mintDenom: string
-  providerRatio: number
+  devGrantsRatio: number
+  stakerRatio: number
   tokensPerBlock: number
+  mintDecrease: number
+  storageStipendAddress: string
+  storageProviderRatio: number
 }
diff --git a/src/types/queries/responses/rns.ts b/src/types/queries/responses/rns.ts
index 79fe00c..ef31a22 100644
--- a/src/types/queries/responses/rns.ts
+++ b/src/types/queries/responses/rns.ts
@@ -9,10 +9,11 @@ import type {
   QueryListOwnedNamesResponse,
   QueryNameResponse,
   QueryParamsResponse,
+  QueryPrimaryNameResponse,
 } from '@/postGen/canine_chain/rns/query'
-import type { Params } from '@/postGen/canine_chain/rns/params'
-import type { PageResponse } from '@/postGen/cosmos/base/query/v1beta1/pagination'
-import type { DBid, DForsale, DName } from '@/types/rns'
+import type {Params} from '@/postGen/canine_chain/rns/params'
+import type {PageResponse} from '@/postGen/cosmos/base/query/v1beta1/pagination'
+import type {DBid, DForsale, DName} from '@/types/rns'
 
 /**
  * This is the response for the [RNS] Query/AllBids RPC method.
@@ -109,6 +110,16 @@ export type TQueryNameResponseStrict = ModifyDeep<
   { name: DName }
 >
 
+/**
+ * This is the response for the [RNS] Query/PrimaryName RPC method.
+ *
+ * @prop {DName} name - Single Name item.
+ */
+export type TQueryPrimaryNameResponseStrict = ModifyDeep<
+  QueryPrimaryNameResponse,
+  { name: DName }
+>
+
 /**
  * This is the response for the [RNS] Query/Params RPC method.
  *
diff --git a/src/types/queries/responses/storage.ts b/src/types/queries/responses/storage.ts
index 15224cb..b3d7062 100644
--- a/src/types/queries/responses/storage.ts
+++ b/src/types/queries/responses/storage.ts
@@ -1,21 +1,25 @@
-import type { Params } from '@/postGen/canine_chain/storage/params'
-import type { PageResponse } from '@/postGen/cosmos/base/query/v1beta1/pagination'
+import type {Params} from '@/postGen/canine_chain/storage/params'
+import type {PageResponse} from '@/postGen/cosmos/base/query/v1beta1/pagination'
 import type {
   QueryActiveProvidersResponse,
   QueryAllAttestationsResponse,
   QueryAllFilesByMerkleResponse,
   QueryAllFilesByOwnerResponse,
   QueryAllFilesResponse,
+  QueryAllGaugesResponse,
   QueryAllProofsResponse,
   QueryAllProvidersResponse,
   QueryAllReportsResponse,
   QueryAllStoragePaymentInfoResponse,
   QueryAttestationResponse,
+  QueryAvailableSpaceResponse,
   QueryClientFreeSpaceResponse,
   QueryFileResponse,
+  QueryFilesFromNoteResponse,
   QueryFileUploadCheckResponse,
   QueryFindFileResponse,
   QueryFreeSpaceResponse,
+  QueryNetworkSizeResponse,
   QueryParamsResponse,
   QueryPayDataResponse,
   QueryPriceCheckResponse,
@@ -59,6 +63,28 @@ export type TQueryAllProofsResponseStrict = ModifyDeep<
   { pagination: PageResponse }
 >
 
+/**
+ * This is the response for the [Storage] Query/AllGauges RPC method.
+ *
+ * @prop {DPaymentGauge[]} gauges - Array of PaymentGauge items.
+ * @prop {PageResponse} pagination - Pagination details.
+ */
+export type TQueryAllGaugesResponseStrict = ModifyDeep<
+  QueryAllGaugesResponse,
+  { pagination: PageResponse }
+>
+
+/**
+ * This is the response for the [Storage] Query/FilesFromNote RPC method.
+ *
+ * @prop {DUnifiedFile[]} files - Array of UnifiedFile items.
+ * @prop {PageResponse} pagination - Pagination details.
+ */
+export type TQueryFilesFromNoteResponseStrict = ModifyDeep<
+  QueryFilesFromNoteResponse,
+  { pagination: PageResponse }
+>
+
 /**
  * This is the response for the [Storage] Query/AllFiles RPC method.
  *
@@ -249,6 +275,26 @@ export type TQueryFreeSpaceResponseStrict = ModifyDeep<
   { space: number }
 >
 
+/**
+ * This is the response for the [Storage] Query/NetworkSize RPC method.
+ *
+ * @prop {number} space - Current total space on the network in bytes.
+ */
+export type TQueryNetworkSizeResponseStrict = ModifyDeep<
+  QueryNetworkSizeResponse,
+  { size: number }
+>
+
+/**
+ * This is the response for the [Storage] Query/AvailableSpace RPC method.
+ *
+ * @prop {number} space - Current available space on the network in bytes.
+ */
+export type TQueryAvailableSpaceResponseStrict = ModifyDeep<
+  QueryAvailableSpaceResponse,
+  { size: number }
+>
+
 /**
  * This is the response for the [Storage] Query/StoreCount RPC method.
  *
diff --git a/src/types/queries/rns.ts b/src/types/queries/rns.ts
index 48aaa4f..0afef86 100644
--- a/src/types/queries/rns.ts
+++ b/src/types/queries/rns.ts
@@ -1,17 +1,18 @@
-import type { PageRequest } from '@/postGen/cosmos/base/query/v1beta1/pagination'
+import type {PageRequest} from '@/postGen/cosmos/base/query/v1beta1/pagination'
 import type {
-  QueryAllBids,
-  QueryAllForSale,
-  QueryAllInits,
-  QueryAllNames,
-  QueryBid,
-  QueryForSale,
-  QueryInit,
-  QueryListOwnedNames,
-  QueryName,
-  QueryParams,
+    QueryAllBids,
+    QueryAllForSale,
+    QueryAllInits,
+    QueryAllNames,
+    QueryBid,
+    QueryForSale,
+    QueryInit,
+    QueryListOwnedNames,
+    QueryName,
+    QueryParams,
+    QueryPrimaryName,
 } from '@/postGen/canine_chain/rns/query'
-import { WithOptional } from '@/types/misc'
+import {WithOptional} from '@/types/misc'
 
 /**
  * QueryAllBids Documentation
@@ -114,6 +115,17 @@ export type DQueryName = Documentation<
   QueryName
 >
 
+/**
+ * QueryPrimaryName Documentation
+ * @prop {string} owner - Owning wallet address of RNS.
+ */
+export type DQueryPrimaryName = Documentation<
+  {
+    owner: string
+  },
+  QueryPrimaryName
+>
+
 /**
  * QueryJklMintParams Documentation
  *
diff --git a/src/types/queries/storage.ts b/src/types/queries/storage.ts
index 748aa35..da7e45a 100644
--- a/src/types/queries/storage.ts
+++ b/src/types/queries/storage.ts
@@ -1,33 +1,37 @@
-import type { PageRequest } from '@/postGen/cosmos/base/query/v1beta1/pagination'
+import type {PageRequest} from '@/postGen/cosmos/base/query/v1beta1/pagination'
 import type {
-  QueryActiveProviders,
-  QueryAllAttestations,
-  QueryAllFiles,
-  QueryAllFilesByMerkle,
-  QueryAllFilesByOwner,
-  QueryAllProofs,
-  QueryAllProviders,
-  QueryAllReports,
-  QueryAllStoragePaymentInfo,
-  QueryAttestation,
-  QueryClientFreeSpace,
-  QueryFile,
-  QueryFileUploadCheck,
-  QueryFindFile,
-  QueryFreeSpace,
-  QueryOpenFiles,
-  QueryParams,
-  QueryPayData,
-  QueryPriceCheck,
-  QueryProof,
-  QueryProofsByAddress,
-  QueryProvider,
-  QueryReport,
-  QueryStoragePaymentInfo,
-  QueryStorageStats,
-  QueryStoreCount,
+    QueryActiveProviders,
+    QueryAllAttestations,
+    QueryAllFiles,
+    QueryAllFilesByMerkle,
+    QueryAllFilesByOwner,
+    QueryAllGauges,
+    QueryAllProofs,
+    QueryAllProviders,
+    QueryAllReports,
+    QueryAllStoragePaymentInfo,
+    QueryAttestation,
+    QueryAvailableSpace,
+    QueryClientFreeSpace,
+    QueryFile,
+    QueryFilesFromNote,
+    QueryFileUploadCheck,
+    QueryFindFile,
+    QueryFreeSpace,
+    QueryNetworkSize,
+    QueryOpenFiles,
+    QueryParams,
+    QueryPayData,
+    QueryPriceCheck,
+    QueryProof,
+    QueryProofsByAddress,
+    QueryProvider,
+    QueryReport,
+    QueryStoragePaymentInfo,
+    QueryStorageStats,
+    QueryStoreCount,
 } from '@/postGen/canine_chain/storage/query'
-import { WithOptional } from '@/types/misc'
+import {WithOptional} from '@/types/misc'
 
 /**
  * QueryAllProofs Documentation
@@ -40,6 +44,32 @@ export type DQueryAllProofs = Documentation<
   WithOptional<QueryAllProofs, 'pagination'>
 >
 
+/**
+ * QueryAllGauges Documentation
+ * @prop {PageRequest} [pagination] - Optional pagination, defaults to first 100 results.
+ */
+export type DQueryAllGauges = Documentation<
+  {
+    pagination?: PageRequest
+  },
+  WithOptional<QueryAllGauges, 'pagination'>
+>
+
+/**
+ * QueryFilesFromNote Documentation
+ * @prop {string} key - Key of target note.
+ * @prop {string} value - Value of target note.
+ * @prop {PageRequest} [pagination] - Optional pagination, defaults to first 100 results.
+ */
+export type DQueryFilesFromNote = Documentation<
+  {
+    key: string
+    value: string
+    pagination?: PageRequest
+  },
+  WithOptional<QueryFilesFromNote, 'pagination'>
+>
+
 /**
  * QueryStorageAllFiles Documentation
  * @prop {PageRequest} [pagination] - Optional pagination, defaults to first 100 results.
@@ -336,3 +366,17 @@ export type DQueryStorageStats = Documentation<{}, QueryStorageStats>
  * No parameters.
  */
 export type DQueryStorageParams = Documentation<{}, QueryParams>
+
+/**
+ * QueryNetworkSize Documentation
+ *
+ * No parameters.
+ */
+export type DQueryNetworkSize = Documentation<{}, QueryNetworkSize>
+
+/**
+ * QueryAvailableSpace Documentation
+ *
+ * No parameters.
+ */
+export type DQueryAvailableSpace = Documentation<{}, QueryAvailableSpace>
diff --git a/src/types/storage.ts b/src/types/storage.ts
index e723f05..e4f6ae5 100644
--- a/src/types/storage.ts
+++ b/src/types/storage.ts
@@ -1,13 +1,13 @@
-import type { FileProof, UnifiedFile } from '@/postGen/canine_chain/storage/active_deals'
+import type {FileProof, UnifiedFile} from '@/postGen/canine_chain/storage/active_deals'
 import type {
-  ActiveProviders,
-  Attestation,
-  AttestationForm,
-  Providers,
-  ReportForm,
+    ActiveProviders,
+    Attestation,
+    AttestationForm,
+    Providers,
+    ReportForm,
 } from '@/postGen/canine_chain/storage/providers'
-import type { StoragePaymentInfo } from '@/postGen/canine_chain/storage/payment_info'
-import type { DCoin } from '@/types/msgs'
+import type {PaymentGauge, StoragePaymentInfo} from '@/postGen/canine_chain/storage/payment_info'
+import type {DCoin} from '@/types/msgs'
 
 /**
  * ActiveProvider Documentation
@@ -73,6 +73,32 @@ export type DFileProof = Documentation<
   FileProof
 >
 
+/**
+ * PaymentGauge Documentation
+ * @prop {Uint8Array} id - Id of the payment gauge.
+ * @prop {string} start - Stringified Date storage plan was purchased.
+ * @prop {string} end - Stringified Date storage plan expires.
+ * @prop {DCoin[]} coins - Record of all storage purchases made, used for reward distribution.
+ */
+export type DPaymentGauge = Documentation<
+  {
+    id: Uint8Array
+    start: string
+    end: string
+    coins: DCoin[]
+  },
+  MPaymentGauge
+>
+export type MPaymentGauge = ModifyDeep<
+  PaymentGauge,
+  {
+    id: Uint8Array
+    start: string
+    end: string
+    coins: DCoin[]
+  }
+>
+
 /**
  * Provider Documentation
  * @prop {string} address - Jackal wallet address of provider.
@@ -147,7 +173,6 @@ export type MStoragePaymentInfo = ModifyDeep<
   }
 >
 
-
 /**
  * UnifiedFile Documentation
  * @prop {Uint8Array} merkle - Merkle tree root of file.
@@ -182,6 +207,7 @@ export {
   Attestation,
   AttestationForm,
   FileProof,
+  PaymentGauge,
   Providers,
   ReportForm,
   StoragePaymentInfo,