diff --git a/examples/app.ts b/examples/app.ts
index aff36e26b..a041e0ff1 100644
--- a/examples/app.ts
+++ b/examples/app.ts
@@ -70,7 +70,7 @@ async function main() {
     3
   );
   // Grab app id from confirmed transaction result
-  const appId = result['application-index'];
+  const appId = result.applicationIndex;
   console.log(`Created app with index: ${appId}`);
   // example: APP_CREATE
 
@@ -148,7 +148,7 @@ async function main() {
 
   // example: APP_READ_STATE
   const appInfo = await algodClient.getApplicationByID(appId).do();
-  const globalState = appInfo.params['global-state'][0];
+  const globalState = appInfo.params.globalState[0];
   console.log(`Raw global state - ${JSON.stringify(globalState)}`);
 
   // decode b64 string key with Buffer
@@ -162,7 +162,7 @@ async function main() {
     .accountApplicationInformation(caller.addr, appId)
     .do();
 
-  const localState = accountAppInfo['app-local-state']['key-value'][0];
+  const localState = accountAppInfo.appLocalState.keyValue[0];
   console.log(`Raw local state - ${JSON.stringify(localState)}`);
 
   // decode b64 string key with Buffer
diff --git a/examples/asa.ts b/examples/asa.ts
index 842522d85..64f75dc55 100644
--- a/examples/asa.ts
+++ b/examples/asa.ts
@@ -39,7 +39,7 @@ async function main() {
     3
   );
 
-  const assetIndex = result['asset-index'];
+  const { assetIndex } = result;
   console.log(`Asset ID created: ${assetIndex}`);
   // example: ASSET_CREATE
 
@@ -49,7 +49,7 @@ async function main() {
   console.log(`Asset Params: ${JSON.stringify(assetInfo.params)}`);
   // example: ASSET_INFO
 
-  await new Promise((f) => setTimeout(f, 5000)); // sleep to ensure indexer is caught up
+  await new Promise((f) => setTimeout(f, 45000)); // sleep to ensure indexer is caught up
 
   // example: INDEXER_LOOKUP_ASSET
   const indexer = getLocalIndexerClient();
@@ -79,7 +79,7 @@ async function main() {
     txn.txID().toString(),
     3
   );
-  console.log(`Result confirmed in round: ${configResult['confirmed-round']}`);
+  console.log(`Result confirmed in round: ${configResult.confirmedRound}`);
   // example: ASSET_CONFIG
 
   const receiver = accounts[2];
diff --git a/examples/atc.ts b/examples/atc.ts
index ba35bcc00..a54a94d49 100644
--- a/examples/atc.ts
+++ b/examples/atc.ts
@@ -45,7 +45,7 @@ async function main() {
     createTxn.txID().toString(),
     3
   );
-  const appIndex = response['application-index'];
+  const appIndex = response.applicationIndex;
 
   // example: ATC_CREATE
   const atc = new algosdk.AtomicTransactionComposer();
diff --git a/examples/block_fetcher/index.ts b/examples/block_fetcher/index.ts
index 695c732fc..04d5a6676 100644
--- a/examples/block_fetcher/index.ts
+++ b/examples/block_fetcher/index.ts
@@ -29,7 +29,7 @@ function removeNulls(obj) {
 
   while (true) {
     // Get latest round number
-    let lastRound = status['last-round'];
+    let { lastRound } = status;
     console.log(`Round: ${lastRound}`);
 
     // Fetch block
diff --git a/examples/debug.ts b/examples/debug.ts
index ed5515bf2..7fbfa00c2 100644
--- a/examples/debug.ts
+++ b/examples/debug.ts
@@ -49,8 +49,7 @@ async function main() {
   // example: DEBUG_DRYRUN_SUBMIT
   const dryrunResponse = await algodClient.dryrun(dryrunRequest).do();
   dryrunResponse.txns.forEach((txn) => {
-    console.log('Txn:', txn.txn);
-    console.log('Txn Results:', txn.txnresults);
+    console.log('Txn:', txn);
   });
   // example: DEBUG_DRYRUN_SUBMIT
 }
diff --git a/examples/overview.ts b/examples/overview.ts
index 2d90a998d..a94d863ca 100644
--- a/examples/overview.ts
+++ b/examples/overview.ts
@@ -35,8 +35,8 @@ async function main() {
   // example: TRANSACTION_PAYMENT_SIGN
 
   // example: TRANSACTION_PAYMENT_SUBMIT
-  const { txId } = await algodClient.sendRawTransaction(signedTxn).do();
-  const result = await algosdk.waitForConfirmation(algodClient, txId, 4);
+  const { txid } = await algodClient.sendRawTransaction(signedTxn).do();
+  const result = await algosdk.waitForConfirmation(algodClient, txid, 4);
   console.log(result);
   console.log(`Transaction Information: ${JSON.stringify(result.txn)}`);
   console.log(
diff --git a/examples/utils.ts b/examples/utils.ts
index d09e42608..7c9133c55 100644
--- a/examples/utils.ts
+++ b/examples/utils.ts
@@ -130,6 +130,6 @@ export async function deployCalculatorApp(
     appCreateTxn.txID().toString(),
     3
   );
-  const appId = result['application-index'];
+  const appId = Number(result.applicationIndex);
   return appId;
 }
diff --git a/package-lock.json b/package-lock.json
index f79fa8545..846f516d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,17 +23,17 @@
       "devDependencies": {
         "@types/json-bigint": "^1.0.0",
         "@types/mocha": "^8.2.2",
-        "@typescript-eslint/eslint-plugin": "^4.26.1",
-        "@typescript-eslint/parser": "^4.26.1",
+        "@typescript-eslint/eslint-plugin": "^5.59.2",
+        "@typescript-eslint/parser": "^5.59.2",
         "assert": "^2.0.0",
         "chromedriver": "^116.0.0",
         "concurrently": "^6.2.0",
         "cucumber": "^5.1.0",
         "es-abstract": "^1.18.3",
-        "eslint": "^7.21.0",
-        "eslint-config-airbnb-base": "^14.2.1",
+        "eslint": "8.22.0",
+        "eslint-config-airbnb-base": "^15.0.0",
         "eslint-config-prettier": "^8.1.0",
-        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-import": "^2.25.2",
         "eslint-plugin-tsdoc": "^0.2.11",
         "express": "^4.17.1",
         "geckodriver": "^3.0.1",
@@ -192,26 +192,118 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-      "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
+      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/gitignore-to-minimatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -324,9 +416,9 @@
       }
     },
     "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -488,6 +580,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/semver": {
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "dev": true
+    },
     "node_modules/@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -499,30 +597,32 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz",
-      "integrity": "sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.26.1",
-        "@typescript-eslint/scope-manager": "4.26.1",
-        "debug": "^4.3.1",
-        "functional-red-black-tree": "^1.0.1",
-        "lodash": "^4.17.21",
-        "regexpp": "^3.1.0",
-        "semver": "^7.3.5",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz",
+      "integrity": "sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.59.2",
+        "@typescript-eslint/type-utils": "5.59.2",
+        "@typescript-eslint/utils": "5.59.2",
+        "debug": "^4.3.4",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^4.0.0",
-        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -530,50 +630,43 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz",
-      "integrity": "sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.26.1",
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/typescript-estree": "4.26.1",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=6.0"
       },
-      "peerDependencies": {
-        "eslint": "*"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz",
-      "integrity": "sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.2.tgz",
+      "integrity": "sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "4.26.1",
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/typescript-estree": "4.26.1",
-        "debug": "^4.3.1"
+        "@typescript-eslint/scope-manager": "5.59.2",
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/typescript-estree": "5.59.2",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -581,30 +674,91 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz",
-      "integrity": "sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz",
+      "integrity": "sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/visitor-keys": "4.26.1"
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/visitor-keys": "5.59.2"
       },
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz",
+      "integrity": "sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.59.2",
+        "@typescript-eslint/utils": "5.59.2",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@typescript-eslint/types": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz",
-      "integrity": "sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.2.tgz",
+      "integrity": "sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==",
       "dev": true,
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -612,21 +766,21 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz",
-      "integrity": "sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz",
+      "integrity": "sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/visitor-keys": "4.26.1",
-        "debug": "^4.3.1",
-        "globby": "^11.0.3",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.5",
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/visitor-keys": "5.59.2",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -638,17 +792,60 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.2.tgz",
+      "integrity": "sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.59.2",
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/typescript-estree": "5.59.2",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz",
-      "integrity": "sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz",
+      "integrity": "sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.26.1",
-        "eslint-visitor-keys": "^2.0.0"
+        "@typescript-eslint/types": "5.59.2",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -883,9 +1080,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -895,9 +1092,9 @@
       }
     },
     "node_modules/acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -1073,15 +1270,6 @@
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
       "dev": true
     },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
@@ -1241,6 +1429,25 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/becke-ch--regex--s0-0-v1--base--pl--lib": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz",
@@ -1381,6 +1588,29 @@
         "url": "https://opencollective.com/browserslist"
       }
     },
+    "node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -2442,48 +2672,48 @@
       }
     },
     "node_modules/eslint": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz",
-      "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
+      "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.2",
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.10.4",
+        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
+        "debug": "^4.3.2",
         "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.3",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -2491,28 +2721,38 @@
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-config-airbnb-base": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz",
-      "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
       "dependencies": {
         "confusing-browser-globals": "^1.0.10",
         "object.assign": "^4.1.2",
-        "object.entries": "^1.1.2"
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^10.12.0 || >=12.0.0"
       },
       "peerDependencies": {
-        "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0",
-        "eslint-plugin-import": "^2.22.1"
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
     "node_modules/eslint-config-prettier": {
@@ -2673,7 +2913,7 @@
         "eslint": ">=5"
       }
     },
-    "node_modules/eslint-visitor-keys": {
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
@@ -2682,25 +2922,155 @@
         "node": ">=10"
       }
     },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
     "node_modules/eslint/node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/eslint/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
       "engines": {
         "node": ">=10"
       },
@@ -2708,28 +3078,28 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+    "node_modules/eslint/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/eslint/node_modules/path-key": {
@@ -2778,45 +3148,26 @@
       }
     },
     "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
+      "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
       "dev": true,
       "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -2826,9 +3177,9 @@
       }
     },
     "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "engines": {
         "node": ">=4.0"
@@ -3158,20 +3509,19 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6.0"
       }
     },
     "node_modules/fast-json-stable-stringify": {
@@ -3196,9 +3546,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -3587,9 +3937,9 @@
       "dev": true
     },
     "node_modules/globals": {
-      "version": "13.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-      "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -3617,16 +3967,16 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -3636,15 +3986,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby/node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -3688,6 +4029,12 @@
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
     "node_modules/growl": {
       "version": "1.10.5",
       "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
@@ -4000,10 +4347,29 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -4649,19 +5015,6 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/json-bigint": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
@@ -4862,24 +5215,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -5476,6 +5817,12 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -5641,14 +5988,14 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz",
-      "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6106,9 +6453,9 @@
       }
     },
     "node_modules/regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -6135,15 +6482,6 @@
         "node": ">=0.10.0"
       }
     },
-    "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.2",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
@@ -6662,12 +7000,6 @@
       "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
       "dev": true
     },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
     "node_modules/stack-chain": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz",
@@ -6840,12 +7172,12 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -6908,76 +7240,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/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/table/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/table/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -7085,18 +7347,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/terser/node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -7249,18 +7499,6 @@
         }
       }
     },
-    "node_modules/ts-node/node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/ts-node/node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -7788,18 +8026,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/webpack/node_modules/acorn-import-assertions": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
@@ -8164,23 +8390,87 @@
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true
     },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+      "dev": true
+    },
     "@eslint/eslintrc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-      "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
+      }
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
+      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
       }
     },
+    "@humanwhocodes/gitignore-to-minimatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -8277,9 +8567,9 @@
       "dev": true
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -8429,6 +8719,12 @@
         "@types/node": "*"
       }
     },
+    "@types/semver": {
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "dev": true
+    },
     "@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -8440,86 +8736,146 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz",
-      "integrity": "sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "4.26.1",
-        "@typescript-eslint/scope-manager": "4.26.1",
-        "debug": "^4.3.1",
-        "functional-red-black-tree": "^1.0.1",
-        "lodash": "^4.17.21",
-        "regexpp": "^3.1.0",
-        "semver": "^7.3.5",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz",
+      "integrity": "sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.59.2",
+        "@typescript-eslint/type-utils": "5.59.2",
+        "@typescript-eslint/utils": "5.59.2",
+        "debug": "^4.3.4",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
       }
     },
-    "@typescript-eslint/experimental-utils": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz",
-      "integrity": "sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==",
+    "@typescript-eslint/parser": {
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.2.tgz",
+      "integrity": "sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==",
       "dev": true,
       "requires": {
-        "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.26.1",
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/typescript-estree": "4.26.1",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "@typescript-eslint/scope-manager": "5.59.2",
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/typescript-estree": "5.59.2",
+        "debug": "^4.3.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
       }
     },
-    "@typescript-eslint/parser": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz",
-      "integrity": "sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==",
+    "@typescript-eslint/scope-manager": {
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz",
+      "integrity": "sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.26.1",
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/typescript-estree": "4.26.1",
-        "debug": "^4.3.1"
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/visitor-keys": "5.59.2"
       }
     },
-    "@typescript-eslint/scope-manager": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz",
-      "integrity": "sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==",
+    "@typescript-eslint/type-utils": {
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz",
+      "integrity": "sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/visitor-keys": "4.26.1"
+        "@typescript-eslint/typescript-estree": "5.59.2",
+        "@typescript-eslint/utils": "5.59.2",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz",
-      "integrity": "sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.2.tgz",
+      "integrity": "sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz",
-      "integrity": "sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz",
+      "integrity": "sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.26.1",
-        "@typescript-eslint/visitor-keys": "4.26.1",
-        "debug": "^4.3.1",
-        "globby": "^11.0.3",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.5",
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/visitor-keys": "5.59.2",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/utils": {
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.2.tgz",
+      "integrity": "sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.59.2",
+        "@typescript-eslint/types": "5.59.2",
+        "@typescript-eslint/typescript-estree": "5.59.2",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz",
-      "integrity": "sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==",
+      "version": "5.59.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz",
+      "integrity": "sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.26.1",
-        "eslint-visitor-keys": "^2.0.0"
+        "@typescript-eslint/types": "5.59.2",
+        "eslint-visitor-keys": "^3.3.0"
       }
     },
     "@ungap/promise-all-settled": {
@@ -8724,15 +9080,15 @@
       }
     },
     "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
       "dev": true
     },
     "acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
       "requires": {}
     },
@@ -8859,15 +9215,6 @@
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
       "dev": true
     },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
     "array-buffer-byte-length": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
@@ -8991,6 +9338,11 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
     "becke-ch--regex--s0-0-v1--base--pl--lib": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz",
@@ -9104,6 +9456,15 @@
         "node-releases": "^1.1.71"
       }
     },
+    "buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -9934,52 +10295,58 @@
       "dev": true
     },
     "eslint": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz",
-      "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
+      "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.2",
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.10.4",
+        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
+        "debug": "^4.3.2",
         "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.3",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
         "cross-spawn": {
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -9991,29 +10358,98 @@
             "which": "^2.0.1"
           }
         },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+        "eslint-scope": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+          "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
           "dev": true,
           "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          },
-          "dependencies": {
-            "eslint-visitor-keys": {
-              "version": "1.3.0",
-              "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-              "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-              "dev": true
-            }
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
+          }
+        },
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "glob-parent": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
           }
         },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -10047,14 +10483,23 @@
       }
     },
     "eslint-config-airbnb-base": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz",
-      "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
       "requires": {
         "confusing-browser-globals": "^1.0.10",
         "object.assign": "^4.1.2",
-        "object.entries": "^1.1.2"
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "eslint-config-prettier": {
@@ -10182,52 +10627,46 @@
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
       "dev": true
     },
     "espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
+      "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
       "dev": true,
       "requires": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        }
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.0"
       }
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
           "dev": true
         }
       }
@@ -10479,17 +10918,16 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       }
     },
     "fast-json-stable-stringify": {
@@ -10511,9 +10949,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -10800,9 +11238,9 @@
       "dev": true
     },
     "globals": {
-      "version": "13.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-      "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -10818,25 +11256,17 @@
       }
     },
     "globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-          "dev": true
-        }
       }
     },
     "gopd": {
@@ -10873,6 +11303,12 @@
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
     "growl": {
       "version": "1.10.5",
       "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
@@ -11087,10 +11523,15 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
     "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "immediate": {
@@ -11546,16 +11987,6 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
     "json-bigint": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
@@ -11728,24 +12159,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
     "log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -12173,6 +12592,12 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -12290,14 +12715,14 @@
       }
     },
     "object.entries": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz",
-      "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "object.values": {
@@ -12627,9 +13052,9 @@
       }
     },
     "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
     "repeat-string": {
@@ -12644,12 +13069,6 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "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
-    },
     "resolve": {
       "version": "1.22.2",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
@@ -13047,12 +13466,6 @@
       "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
       "dev": true
     },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
     "stack-chain": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz",
@@ -13194,12 +13607,12 @@
       }
     },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-bom": {
@@ -13235,62 +13648,6 @@
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true
     },
-    "table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
-      "dev": true,
-      "requires": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "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
-        },
-        "slice-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -13331,14 +13688,6 @@
         "acorn": "^8.5.0",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "8.8.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-          "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-          "dev": true
-        }
       }
     },
     "terser-webpack-plugin": {
@@ -13483,12 +13832,6 @@
         "yn": "3.1.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "8.7.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-          "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-          "dev": true
-        },
         "diff": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -13796,12 +14139,6 @@
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-          "dev": true
-        },
         "acorn-import-assertions": {
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
diff --git a/package.json b/package.json
index b64b63d4f..d73f91b07 100644
--- a/package.json
+++ b/package.json
@@ -34,17 +34,17 @@
   "devDependencies": {
     "@types/json-bigint": "^1.0.0",
     "@types/mocha": "^8.2.2",
-    "@typescript-eslint/eslint-plugin": "^4.26.1",
-    "@typescript-eslint/parser": "^4.26.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
     "assert": "^2.0.0",
     "chromedriver": "^116.0.0",
     "concurrently": "^6.2.0",
     "cucumber": "^5.1.0",
     "es-abstract": "^1.18.3",
-    "eslint": "^7.21.0",
-    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint": "8.22.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-tsdoc": "^0.2.11",
     "express": "^4.17.1",
     "geckodriver": "^3.0.1",
diff --git a/src/client/client.ts b/src/client/client.ts
index 21db84ec4..32d0fa173 100644
--- a/src/client/client.ts
+++ b/src/client/client.ts
@@ -255,8 +255,8 @@ export default class HTTPClient {
   async post(
     relativePath: string,
     data: any,
-    requestHeaders: Record<string, string> = {},
     query?: Query<any>,
+    requestHeaders: Record<string, string> = {},
     parseBody: boolean = true
   ): Promise<HTTPClientResponse> {
     const fullHeaders = {
diff --git a/src/client/v2/algod/accountApplicationInformation.ts b/src/client/v2/algod/accountApplicationInformation.ts
index 26ec531c5..563e8fe04 100644
--- a/src/client/v2/algod/accountApplicationInformation.ts
+++ b/src/client/v2/algod/accountApplicationInformation.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { AccountApplicationResponse } from './models/types';
 
-export default class AccountApplicationInformation extends JSONRequest {
+export default class AccountApplicationInformation extends JSONRequest<
+  AccountApplicationResponse,
+  Record<string, any>
+> {
   constructor(
     c: HTTPClient,
     intDecoding: IntDecoding,
@@ -17,4 +21,9 @@ export default class AccountApplicationInformation extends JSONRequest {
   path() {
     return `/v2/accounts/${this.account}/applications/${this.applicationID}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): AccountApplicationResponse {
+    return AccountApplicationResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/accountAssetInformation.ts b/src/client/v2/algod/accountAssetInformation.ts
index f05e2f8da..93394e1c5 100644
--- a/src/client/v2/algod/accountAssetInformation.ts
+++ b/src/client/v2/algod/accountAssetInformation.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { AccountAssetResponse } from './models/types';
 
-export default class AccountAssetInformation extends JSONRequest {
+export default class AccountAssetInformation extends JSONRequest<
+  AccountAssetResponse,
+  Record<string, any>
+> {
   constructor(
     c: HTTPClient,
     intDecoding: IntDecoding,
@@ -17,4 +21,9 @@ export default class AccountAssetInformation extends JSONRequest {
   path() {
     return `/v2/accounts/${this.account}/assets/${this.assetID}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): AccountAssetResponse {
+    return AccountAssetResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/accountInformation.ts b/src/client/v2/algod/accountInformation.ts
index bbff87182..d50598d54 100644
--- a/src/client/v2/algod/accountInformation.ts
+++ b/src/client/v2/algod/accountInformation.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { Account } from './models/types';
 
-export default class AccountInformation extends JSONRequest {
+export default class AccountInformation extends JSONRequest<
+  Account,
+  Record<string, any>
+> {
   constructor(
     c: HTTPClient,
     intDecoding: IntDecoding,
@@ -34,4 +38,9 @@ export default class AccountInformation extends JSONRequest {
     this.query.exclude = exclude;
     return this;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): Account {
+    return Account.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/algod.ts b/src/client/v2/algod/algod.ts
index 6a8a1a46f..3b0d146ec 100644
--- a/src/client/v2/algod/algod.ts
+++ b/src/client/v2/algod/algod.ts
@@ -789,7 +789,7 @@ export default class AlgodClient extends ServiceClient {
    * @param round the round number to be searched for
    * @category GET
    */
-  getLedgerStateDelta(round: bigint) {
+  getLedgerStateDelta(round: number) {
     return new GetLedgerStateDelta(this.c, this.intDecoding, round);
   }
 
@@ -806,7 +806,7 @@ export default class AlgodClient extends ServiceClient {
    * @param round the round number to be searched for
    * @category GET
    */
-  getTransactionGroupLedgerStateDeltasForRound(round: bigint) {
+  getTransactionGroupLedgerStateDeltasForRound(round: number) {
     return new GetTransactionGroupLedgerStateDeltasForRound(
       this.c,
       this.intDecoding,
diff --git a/src/client/v2/algod/block.ts b/src/client/v2/algod/block.ts
index 24dc2e271..7d0b5d911 100644
--- a/src/client/v2/algod/block.ts
+++ b/src/client/v2/algod/block.ts
@@ -1,17 +1,16 @@
 import * as encoding from '../../../encoding/encoding';
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
+import { BlockResponse } from './models/types';
 
 /**
  * block gets the block info for the given round. this call may block
  */
-export default class Block extends JSONRequest {
+export default class Block extends JSONRequest<BlockResponse, Uint8Array> {
   private round: number;
 
   constructor(c: HTTPClient, roundNumber: number) {
     super(c);
-    if (!Number.isInteger(roundNumber))
-      throw Error('roundNumber should be an integer');
     this.round = roundNumber;
     this.query = { format: 'msgpack' };
   }
@@ -21,9 +20,9 @@ export default class Block extends JSONRequest {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  prepare(body: Uint8Array) {
+  prepare(body: Uint8Array): BlockResponse {
     if (body && body.byteLength > 0) {
-      return encoding.decode(body) as Record<string, any>;
+      return BlockResponse.from_obj_for_encoding(encoding.decode(body));
     }
     return undefined;
   }
diff --git a/src/client/v2/algod/compile.ts b/src/client/v2/algod/compile.ts
index f69ce59f9..1c9c125d6 100644
--- a/src/client/v2/algod/compile.ts
+++ b/src/client/v2/algod/compile.ts
@@ -1,5 +1,6 @@
 import { coerceToBytes } from '../../../encoding/binarydata';
 import HTTPClient from '../../client';
+import { CompileResponse } from './models/types';
 import JSONRequest from '../jsonrequest';
 
 /**
@@ -18,7 +19,10 @@ export function setHeaders(headers = {}) {
 /**
  * Executes compile
  */
-export default class Compile extends JSONRequest {
+export default class Compile extends JSONRequest<
+  CompileResponse,
+  Record<string, any>
+> {
   constructor(c: HTTPClient, private source: string | Uint8Array) {
     super(c);
     this.source = source;
@@ -43,9 +47,14 @@ export default class Compile extends JSONRequest {
     const res = await this.c.post(
       this.path(),
       coerceToBytes(this.source),
-      txHeaders,
-      this.query
+      this.query,
+      txHeaders
     );
     return res.body;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): CompileResponse {
+    return CompileResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/disassemble.ts b/src/client/v2/algod/disassemble.ts
index 291a04040..29f1e486a 100644
--- a/src/client/v2/algod/disassemble.ts
+++ b/src/client/v2/algod/disassemble.ts
@@ -1,5 +1,6 @@
 import { coerceToBytes } from '../../../encoding/binarydata';
 import HTTPClient from '../../client';
+import { DisassembleResponse } from './models/types';
 import JSONRequest from '../jsonrequest';
 
 /**
@@ -18,7 +19,10 @@ export function setHeaders(headers = {}) {
 /**
  * Executes disassemble
  */
-export default class Disassemble extends JSONRequest {
+export default class Disassemble extends JSONRequest<
+  DisassembleResponse,
+  Record<string, any>
+> {
   constructor(c: HTTPClient, private source: string | Uint8Array) {
     super(c);
     this.source = source;
@@ -38,9 +42,14 @@ export default class Disassemble extends JSONRequest {
     const res = await this.c.post(
       this.path(),
       coerceToBytes(this.source),
-      txHeaders,
-      this.query
+      this.query,
+      txHeaders
     );
     return res.body;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): DisassembleResponse {
+    return DisassembleResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/dryrun.ts b/src/client/v2/algod/dryrun.ts
index 23089d977..9674d1e17 100644
--- a/src/client/v2/algod/dryrun.ts
+++ b/src/client/v2/algod/dryrun.ts
@@ -2,9 +2,13 @@ import * as encoding from '../../../encoding/encoding';
 import HTTPClient from '../../client';
 import JSONRequest from '../jsonrequest';
 import { setHeaders } from './compile';
+import { DryrunResponse } from './models/types';
 import * as modelsv2 from './models/types';
 
-export default class Dryrun extends JSONRequest {
+export default class Dryrun extends JSONRequest<
+  DryrunResponse,
+  Record<string, any>
+> {
   private blob: Uint8Array;
 
   constructor(c: HTTPClient, dr: modelsv2.DryrunRequest) {
@@ -23,7 +27,12 @@ export default class Dryrun extends JSONRequest {
    */
   async do(headers = {}) {
     const txHeaders = setHeaders(headers);
-    const res = await this.c.post(this.path(), this.blob, txHeaders);
-    return res.body;
+    const res = await this.c.post(this.path(), this.blob, null, txHeaders);
+    return this.prepare(res.body);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): DryrunResponse {
+    return DryrunResponse.from_obj_for_encoding(body);
   }
 }
diff --git a/src/client/v2/algod/getApplicationByID.ts b/src/client/v2/algod/getApplicationByID.ts
index 91e1c12e1..1bb55b3a2 100644
--- a/src/client/v2/algod/getApplicationByID.ts
+++ b/src/client/v2/algod/getApplicationByID.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { Application } from './models/types';
 
-export default class GetApplicationByID extends JSONRequest {
+export default class GetApplicationByID extends JSONRequest<
+  Application,
+  Record<string, any>
+> {
   constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) {
     super(c, intDecoding);
     this.index = index;
@@ -11,4 +15,9 @@ export default class GetApplicationByID extends JSONRequest {
   path() {
     return `/v2/applications/${this.index}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): Application {
+    return Application.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/getAssetByID.ts b/src/client/v2/algod/getAssetByID.ts
index 3abb5696d..38f1068e1 100644
--- a/src/client/v2/algod/getAssetByID.ts
+++ b/src/client/v2/algod/getAssetByID.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { Asset } from './models/types';
 
-export default class GetAssetByID extends JSONRequest {
+export default class GetAssetByID extends JSONRequest<
+  Asset,
+  Record<string, any>
+> {
   constructor(c: HTTPClient, intDecoding: IntDecoding, private index: number) {
     super(c, intDecoding);
     this.index = index;
@@ -11,4 +15,9 @@ export default class GetAssetByID extends JSONRequest {
   path() {
     return `/v2/assets/${this.index}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): Asset {
+    return Asset.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/getBlockHash.ts b/src/client/v2/algod/getBlockHash.ts
index 40d01b499..032e30c89 100644
--- a/src/client/v2/algod/getBlockHash.ts
+++ b/src/client/v2/algod/getBlockHash.ts
@@ -1,18 +1,25 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { BlockHashResponse } from './models/types';
 
-export default class GetBlockHash extends JSONRequest {
-  round: number;
+export default class GetBlockHash extends JSONRequest<
+  BlockHashResponse,
+  Record<string, any>
+> {
+  round: number | bigint;
 
   constructor(c: HTTPClient, intDecoding: IntDecoding, roundNumber: number) {
     super(c, intDecoding);
-    if (!Number.isInteger(roundNumber))
-      throw Error('roundNumber should be an integer');
     this.round = roundNumber;
   }
 
   path() {
     return `/v2/blocks/${this.round}/hash`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): BlockHashResponse {
+    return BlockHashResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/getLedgerStateDelta.ts b/src/client/v2/algod/getLedgerStateDelta.ts
index ac69daeab..7570c5e3c 100644
--- a/src/client/v2/algod/getLedgerStateDelta.ts
+++ b/src/client/v2/algod/getLedgerStateDelta.ts
@@ -3,7 +3,7 @@ import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
 
 export default class GetLedgerStateDelta extends JSONRequest {
-  constructor(c: HTTPClient, intDecoding: IntDecoding, private round: bigint) {
+  constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) {
     super(c, intDecoding);
     this.round = round;
     this.query = { format: 'json' };
diff --git a/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts b/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts
index 1c1776034..c5550ecdc 100644
--- a/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts
+++ b/src/client/v2/algod/getTransactionGroupLedgerStateDeltasForRound.ts
@@ -7,7 +7,7 @@ export default class GetTransactionGroupLedgerStateDeltasForRound extends JSONRe
   TransactionGroupLedgerStateDeltasForRoundResponse,
   Record<string, any>
 > {
-  constructor(c: HTTPClient, intDecoding: IntDecoding, private round: bigint) {
+  constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) {
     super(c, intDecoding);
     this.round = round;
     this.query = { format: 'json' };
diff --git a/src/client/v2/algod/getTransactionProof.ts b/src/client/v2/algod/getTransactionProof.ts
index 398039a43..6f67660d9 100644
--- a/src/client/v2/algod/getTransactionProof.ts
+++ b/src/client/v2/algod/getTransactionProof.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { TransactionProofResponse } from './models/types';
 
-export default class GetTransactionProof extends JSONRequest {
+export default class GetTransactionProof extends JSONRequest<
+  TransactionProofResponse,
+  Record<string, any>
+> {
   constructor(
     c: HTTPClient,
     intDecoding: IntDecoding,
@@ -40,4 +44,9 @@ export default class GetTransactionProof extends JSONRequest {
     this.query.hashtype = hashType;
     return this;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): TransactionProofResponse {
+    return TransactionProofResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/lightBlockHeaderProof.ts b/src/client/v2/algod/lightBlockHeaderProof.ts
index ac3794c36..cfa594a64 100644
--- a/src/client/v2/algod/lightBlockHeaderProof.ts
+++ b/src/client/v2/algod/lightBlockHeaderProof.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { LightBlockHeaderProof as LBHP } from './models/types';
 
-export default class LightBlockHeaderProof extends JSONRequest {
+export default class LightBlockHeaderProof extends JSONRequest<
+  LBHP,
+  Record<string, any>
+> {
   constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) {
     super(c, intDecoding);
 
@@ -12,4 +16,9 @@ export default class LightBlockHeaderProof extends JSONRequest {
   path() {
     return `/v2/blocks/${this.round}/lightheader/proof`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): LBHP {
+    return LBHP.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/pendingTransactionInformation.ts b/src/client/v2/algod/pendingTransactionInformation.ts
index 75d2527ee..f3dcadd3b 100644
--- a/src/client/v2/algod/pendingTransactionInformation.ts
+++ b/src/client/v2/algod/pendingTransactionInformation.ts
@@ -1,11 +1,15 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import * as encoding from '../../../encoding/encoding';
+import { PendingTransactionResponse } from './models/types';
 
 /**
  * returns the transaction information for a specific txid of a pending transaction
  */
-export default class PendingTransactionInformation extends JSONRequest {
+export default class PendingTransactionInformation extends JSONRequest<
+  PendingTransactionResponse,
+  Uint8Array
+> {
   constructor(c: HTTPClient, private txid: string) {
     super(c);
     this.txid = txid;
@@ -15,7 +19,9 @@ export default class PendingTransactionInformation extends JSONRequest {
   // eslint-disable-next-line class-methods-use-this
   prepare(body: Uint8Array) {
     if (body && body.byteLength > 0) {
-      return encoding.decode(body) as Record<string, any>;
+      return PendingTransactionResponse.from_obj_for_encoding(
+        encoding.decode(body)
+      );
     }
     return undefined;
   }
diff --git a/src/client/v2/algod/pendingTransactions.ts b/src/client/v2/algod/pendingTransactions.ts
index bf8754812..97f457fb8 100644
--- a/src/client/v2/algod/pendingTransactions.ts
+++ b/src/client/v2/algod/pendingTransactions.ts
@@ -1,11 +1,15 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import * as encoding from '../../../encoding/encoding';
+import { PendingTransactionsResponse } from './models/types';
 
 /**
  * pendingTransactionsInformation returns transactions that are pending in the pool
  */
-export default class PendingTransactions extends JSONRequest {
+export default class PendingTransactions extends JSONRequest<
+  PendingTransactionsResponse,
+  Uint8Array
+> {
   constructor(c: HTTPClient) {
     super(c);
     this.query.format = 'msgpack';
@@ -18,7 +22,9 @@ export default class PendingTransactions extends JSONRequest {
 
   prepare(body: Uint8Array) {
     if (body && body.byteLength > 0) {
-      return encoding.decode(body) as Record<string, any>;
+      return PendingTransactionsResponse.from_obj_for_encoding(
+        encoding.decode(body)
+      );
     }
     return undefined;
   }
diff --git a/src/client/v2/algod/pendingTransactionsByAddress.ts b/src/client/v2/algod/pendingTransactionsByAddress.ts
index b9710ccb7..c3dff4636 100644
--- a/src/client/v2/algod/pendingTransactionsByAddress.ts
+++ b/src/client/v2/algod/pendingTransactionsByAddress.ts
@@ -1,11 +1,15 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import * as encoding from '../../../encoding/encoding';
+import { PendingTransactionsResponse } from './models/types';
 
 /**
  * returns all transactions for a PK [addr] in the [first, last] rounds range.
  */
-export default class PendingTransactionsByAddress extends JSONRequest {
+export default class PendingTransactionsByAddress extends JSONRequest<
+  PendingTransactionsResponse,
+  Uint8Array
+> {
   constructor(c: HTTPClient, private address: string) {
     super(c);
     this.address = address;
@@ -13,9 +17,11 @@ export default class PendingTransactionsByAddress extends JSONRequest {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  prepare(body: Uint8Array): Record<string, any> {
+  prepare(body: Uint8Array): PendingTransactionsResponse {
     if (body && body.byteLength > 0) {
-      return encoding.decode(body) as Record<string, any>;
+      return PendingTransactionsResponse.from_obj_for_encoding(
+        encoding.decode(body)
+      );
     }
     return undefined;
   }
diff --git a/src/client/v2/algod/sendRawTransaction.ts b/src/client/v2/algod/sendRawTransaction.ts
index 4c1629393..f422eef2b 100644
--- a/src/client/v2/algod/sendRawTransaction.ts
+++ b/src/client/v2/algod/sendRawTransaction.ts
@@ -1,4 +1,5 @@
 import { concatArrays } from '../../../utils/utils';
+import { PostTransactionsResponse } from './models/types';
 import HTTPClient from '../../client';
 import JSONRequest from '../jsonrequest';
 
@@ -23,7 +24,10 @@ function isByteArray(array: any): array is Uint8Array {
 /**
  * broadcasts the passed signed txns to the network
  */
-export default class SendRawTransaction extends JSONRequest {
+export default class SendRawTransaction extends JSONRequest<
+  PostTransactionsResponse,
+  Record<string, any>
+> {
   private txnBytesToPost: Uint8Array;
 
   constructor(c: HTTPClient, stxOrStxs: Uint8Array | Uint8Array[]) {
@@ -49,7 +53,17 @@ export default class SendRawTransaction extends JSONRequest {
 
   async do(headers = {}) {
     const txHeaders = setSendTransactionHeaders(headers);
-    const res = await this.c.post(this.path(), this.txnBytesToPost, txHeaders);
-    return res.body;
+    const res = await this.c.post(
+      this.path(),
+      this.txnBytesToPost,
+      null,
+      txHeaders
+    );
+    return this.prepare(res.body);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): PostTransactionsResponse {
+    return PostTransactionsResponse.from_obj_for_encoding(body);
   }
 }
diff --git a/src/client/v2/algod/setBlockOffsetTimestamp.ts b/src/client/v2/algod/setBlockOffsetTimestamp.ts
index 840228132..d7091a0c5 100644
--- a/src/client/v2/algod/setBlockOffsetTimestamp.ts
+++ b/src/client/v2/algod/setBlockOffsetTimestamp.ts
@@ -14,7 +14,7 @@ export default class SetBlockOffsetTimestamp extends JSONRequest {
   }
 
   async do(headers = {}) {
-    const res = await this.c.post(this.path(), headers);
+    const res = await this.c.post(this.path(), null, null, headers);
     return res.body;
   }
 }
diff --git a/src/client/v2/algod/setSyncRound.ts b/src/client/v2/algod/setSyncRound.ts
index fdc32c75c..f6427a734 100644
--- a/src/client/v2/algod/setSyncRound.ts
+++ b/src/client/v2/algod/setSyncRound.ts
@@ -14,7 +14,7 @@ export default class SetSyncRound extends JSONRequest {
   }
 
   async do(headers = {}) {
-    const res = await this.c.post(this.path(), headers);
+    const res = await this.c.post(this.path(), null, null, headers);
     return res.body;
   }
 }
diff --git a/src/client/v2/algod/simulateTransaction.ts b/src/client/v2/algod/simulateTransaction.ts
index 471b40855..1167b8f8b 100644
--- a/src/client/v2/algod/simulateTransaction.ts
+++ b/src/client/v2/algod/simulateTransaction.ts
@@ -42,8 +42,8 @@ export default class SimulateRawTransactions extends JSONRequest<
     const res = await this.c.post(
       this.path(),
       this.requestBytes,
-      txHeaders,
       this.query,
+      txHeaders,
       false
     );
     return this.prepare(res.body);
diff --git a/src/client/v2/algod/stateproof.ts b/src/client/v2/algod/stateproof.ts
index 98bab12a7..4f527df20 100644
--- a/src/client/v2/algod/stateproof.ts
+++ b/src/client/v2/algod/stateproof.ts
@@ -1,8 +1,9 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { StateProof as SP } from './models/types';
 
-export default class StateProof extends JSONRequest {
+export default class StateProof extends JSONRequest<SP, Record<string, any>> {
   constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) {
     super(c, intDecoding);
 
@@ -12,4 +13,9 @@ export default class StateProof extends JSONRequest {
   path() {
     return `/v2/stateproofs/${this.round}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): SP {
+    return SP.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/status.ts b/src/client/v2/algod/status.ts
index c8dcd4524..ab203c389 100644
--- a/src/client/v2/algod/status.ts
+++ b/src/client/v2/algod/status.ts
@@ -1,8 +1,17 @@
 import JSONRequest from '../jsonrequest';
+import { NodeStatusResponse } from './models/types';
 
-export default class Status extends JSONRequest {
+export default class Status extends JSONRequest<
+  NodeStatusResponse,
+  Record<string, any>
+> {
   // eslint-disable-next-line class-methods-use-this
   path() {
     return '/v2/status';
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): NodeStatusResponse {
+    return NodeStatusResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/statusAfterBlock.ts b/src/client/v2/algod/statusAfterBlock.ts
index 5d340c6fd..1daf58ea1 100644
--- a/src/client/v2/algod/statusAfterBlock.ts
+++ b/src/client/v2/algod/statusAfterBlock.ts
@@ -1,8 +1,12 @@
 import JSONRequest from '../jsonrequest';
 import HTTPClient from '../../client';
 import IntDecoding from '../../../types/intDecoding';
+import { NodeStatusResponse } from './models/types';
 
-export default class StatusAfterBlock extends JSONRequest {
+export default class StatusAfterBlock extends JSONRequest<
+  NodeStatusResponse,
+  Record<string, any>
+> {
   constructor(c: HTTPClient, intDecoding: IntDecoding, private round: number) {
     super(c, intDecoding);
     if (!Number.isInteger(round)) throw Error('round should be an integer');
@@ -12,4 +16,9 @@ export default class StatusAfterBlock extends JSONRequest {
   path() {
     return `/v2/status/wait-for-block-after/${this.round}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): NodeStatusResponse {
+    return NodeStatusResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/suggestedParams.ts b/src/client/v2/algod/suggestedParams.ts
index dde16b550..24cbecda6 100644
--- a/src/client/v2/algod/suggestedParams.ts
+++ b/src/client/v2/algod/suggestedParams.ts
@@ -4,7 +4,10 @@ import { SuggestedParamsWithMinFee } from '../../../types/transactions/base';
 /**
  * Returns the common needed parameters for a new transaction, in a format the transaction builder expects
  */
-export default class SuggestedParamsRequest extends JSONRequest<SuggestedParamsWithMinFee> {
+export default class SuggestedParamsRequest extends JSONRequest<
+  SuggestedParamsWithMinFee,
+  Record<string, any>
+> {
   /* eslint-disable class-methods-use-this */
   path() {
     return '/v2/transactions/params';
diff --git a/src/client/v2/algod/supply.ts b/src/client/v2/algod/supply.ts
index 0e30f56e2..21f350307 100644
--- a/src/client/v2/algod/supply.ts
+++ b/src/client/v2/algod/supply.ts
@@ -1,8 +1,17 @@
 import JSONRequest from '../jsonrequest';
+import { SupplyResponse } from './models/types';
 
-export default class Supply extends JSONRequest {
+export default class Supply extends JSONRequest<
+  SupplyResponse,
+  Record<string, any>
+> {
   // eslint-disable-next-line class-methods-use-this
   path() {
     return '/v2/ledger/supply';
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): SupplyResponse {
+    return SupplyResponse.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/algod/versions.ts b/src/client/v2/algod/versions.ts
index 31bcabb16..05b77d554 100644
--- a/src/client/v2/algod/versions.ts
+++ b/src/client/v2/algod/versions.ts
@@ -1,11 +1,20 @@
 import JSONRequest from '../jsonrequest';
+import { Version } from './models/types';
 
 /**
  * retrieves the VersionResponse from the running node
  */
-export default class Versions extends JSONRequest {
+export default class Versions extends JSONRequest<
+  Version,
+  Record<string, any>
+> {
   // eslint-disable-next-line class-methods-use-this
   path() {
     return '/versions';
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(body: Record<string, any>): Version {
+    return Version.from_obj_for_encoding(body);
+  }
 }
diff --git a/src/client/v2/serviceClient.ts b/src/client/v2/serviceClient.ts
index 14fae2922..877818b29 100644
--- a/src/client/v2/serviceClient.ts
+++ b/src/client/v2/serviceClient.ts
@@ -15,8 +15,8 @@ export type TokenHeaderIdentifier =
  * @param headerIdentifier - An identifier for the token header
  */
 function convertTokenStringToTokenHeader(
-  token: string = '',
-  headerIdentifier: TokenHeaderIdentifier
+  headerIdentifier: TokenHeaderIdentifier,
+  token: string = ''
 ): TokenHeader {
   const tokenHeader = {};
   if (token === '') {
@@ -57,8 +57,8 @@ export default abstract class ServiceClient {
       let tokenHeader: TokenHeader;
       if (typeof tokenHeaderOrStrOrBaseClient === 'string') {
         tokenHeader = convertTokenStringToTokenHeader(
-          tokenHeaderOrStrOrBaseClient,
-          tokenHeaderIdentifier
+          tokenHeaderIdentifier,
+          tokenHeaderOrStrOrBaseClient
         );
       } else {
         tokenHeader = tokenHeaderOrStrOrBaseClient;
diff --git a/src/composer.ts b/src/composer.ts
index b8ec5f4d2..0bc9d0669 100644
--- a/src/composer.ts
+++ b/src/composer.ts
@@ -14,9 +14,9 @@ import Algodv2 from './client/v2/algod/algod';
 import {
   SimulateRequest,
   SimulateRequestTransactionGroup,
+  PendingTransactionResponse,
   SimulateResponse,
 } from './client/v2/algod/models/types';
-import { base64ToBytes } from './encoding/binarydata';
 import * as encoding from './encoding/encoding';
 import { assignGroupID } from './group';
 import { makeApplicationCallTxnFromObject } from './makeTxn';
@@ -64,7 +64,7 @@ export interface ABIResult {
   /** If the SDK was unable to decode a return value, the error will be here. */
   decodeError?: Error;
   /** The pending transaction information from the method transaction */
-  txInfo?: Record<string, any>;
+  txInfo?: PendingTransactionResponse;
 }
 
 export enum AtomicTransactionComposerStatus {
@@ -672,7 +672,7 @@ export class AtomicTransactionComposer {
         AtomicTransactionComposer.parseMethodResponse(
           method,
           methodResult,
-          pendingInfo.get_obj_for_encoding()
+          pendingInfo
         )
       );
     }
@@ -726,7 +726,7 @@ export class AtomicTransactionComposer {
     );
     this.status = AtomicTransactionComposerStatus.COMMITTED;
 
-    const confirmedRound: number = confirmedTxnInfo['confirmed-round'];
+    const confirmedRound = Number(confirmedTxnInfo.confirmedRound);
 
     const methodResults: ABIResult[] = [];
 
@@ -776,7 +776,7 @@ export class AtomicTransactionComposer {
   static parseMethodResponse(
     method: ABIMethod,
     methodResult: ABIResult,
-    pendingInfo: Record<string, any>
+    pendingInfo: PendingTransactionResponse
   ): ABIResult {
     const returnedResult: ABIResult = methodResult;
     try {
@@ -790,12 +790,7 @@ export class AtomicTransactionComposer {
             )}`
           );
         }
-        let lastLog: Uint8Array;
-        if (typeof logs[logs.length - 1] === 'string') {
-          lastLog = base64ToBytes(logs[logs.length - 1]);
-        } else {
-          lastLog = Uint8Array.from(logs[logs.length - 1]);
-        }
+        const lastLog = logs[logs.length - 1];
         if (
           lastLog.byteLength < 4 ||
           !arrayEqual(lastLog.slice(0, 4), RETURN_PREFIX)
diff --git a/src/dryrun.ts b/src/dryrun.ts
index f57b162e0..49faacbde 100644
--- a/src/dryrun.ts
+++ b/src/dryrun.ts
@@ -17,30 +17,6 @@ import { TransactionType } from './types/transactions';
 const defaultAppId = 1380011588;
 const defaultMaxWidth = 30;
 
-// When writing the DryrunRequest object as msgpack the output needs to be the byte arrays not b64 string
-interface AppParamsWithPrograms {
-  ['approval-program']: string | Uint8Array;
-  ['clear-state-program']: string | Uint8Array;
-  ['creator']: string;
-}
-
-interface AppWithAppParams {
-  ['params']: AppParamsWithPrograms;
-}
-
-function decodePrograms(ap: AppWithAppParams): AppWithAppParams {
-  // eslint-disable-next-line no-param-reassign
-  ap.params['approval-program'] = base64ToBytes(
-    ap.params['approval-program'].toString()
-  );
-  // eslint-disable-next-line no-param-reassign
-  ap.params['clear-state-program'] = base64ToBytes(
-    ap.params['clear-state-program'].toString()
-  );
-
-  return ap;
-}
-
 /**
  * createDryrun takes an Algod Client (from algod.AlgodV2Client) and an array of Signed Transactions
  * from (transaction.SignedTransaction) and creates a DryrunRequest object with relevant balances
@@ -48,6 +24,8 @@ function decodePrograms(ap: AppWithAppParams): AppWithAppParams {
  * @param txns - the array of SignedTransaction to use for generating the DryrunRequest object
  * @param protocolVersion - the string representing the protocol version to use
  * @param latestTimestamp - the timestamp
+ * @param round - the round available to some TEAL scripts. Defaults to the current round on the network.
+ * @param sources - TEAL source text that gets uploaded, compiled, and inserted into transactions or application state.
  * @returns the DryrunRequest object constructed from the SignedTransactions passed
  */
 export async function createDryrun({
@@ -138,9 +116,8 @@ export async function createDryrun({
         .getApplicationByID(appId)
         .do()
         .then((appInfo) => {
-          const ai = decodePrograms(appInfo as AppWithAppParams);
-          appInfos.push(ai);
-          accts.push(ai.params.creator);
+          appInfos.push(appInfo);
+          accts.push(appInfo.params.creator);
         })
     );
   }
@@ -153,12 +130,6 @@ export async function createDryrun({
         .accountInformation(acct)
         .do()
         .then((acctInfo) => {
-          if ('created-apps' in acctInfo) {
-            // eslint-disable-next-line no-param-reassign
-            acctInfo['created-apps'] = acctInfo['created-apps'].map((app) =>
-              decodePrograms(app)
-            );
-          }
           acctInfos.push(acctInfo);
         })
     );
diff --git a/src/makeTxn.ts b/src/makeTxn.ts
index a83dd569c..761a02c25 100644
--- a/src/makeTxn.ts
+++ b/src/makeTxn.ts
@@ -350,7 +350,6 @@ export function makeAssetCreateTxnWithSuggestedParamsFromObject(
  * @param reserve - string representation of new reserve Algorand address
  * @param freeze - string representation of new freeze manager Algorand address
  * @param clawback - string representation of new revocation manager Algorand address
- * @param strictEmptyAddressChecking - boolean - throw an error if any of manager, reserve, freeze, or clawback are undefined. optional, defaults to true.
  * @param suggestedParams - a dict holding common-to-all-txns args:
  * fee - integer fee per byte, in microAlgos. for a flat fee, set flatFee to true
  * flatFee - bool optionally set this to true to specify fee as microalgos-per-txn
@@ -360,6 +359,7 @@ export function makeAssetCreateTxnWithSuggestedParamsFromObject(
  * genesisHash - string specifies hash genesis block of network in use
  * genesisID - string specifies genesis ID of network in use
  * @param rekeyTo - rekeyTo address, optional
+ * @param strictEmptyAddressChecking - boolean - throw an error if any of manager, reserve, freeze, or clawback are undefined. optional, defaults to true.
  */
 export function makeAssetConfigTxnWithSuggestedParams(
   sender: AssetConfigTxn['sender'],
@@ -370,8 +370,8 @@ export function makeAssetConfigTxnWithSuggestedParams(
   freeze: AssetConfigTxn['assetFreeze'],
   clawback: AssetConfigTxn['assetClawback'],
   suggestedParams: MustHaveSuggestedParams<AssetConfigTxn>['suggestedParams'],
-  strictEmptyAddressChecking = true,
-  rekeyTo?: AssetConfigTxn['rekeyTo']
+  rekeyTo?: AssetConfigTxn['rekeyTo'],
+  strictEmptyAddressChecking = true
 ) {
   if (
     strictEmptyAddressChecking &&
@@ -436,8 +436,8 @@ export function makeAssetConfigTxnWithSuggestedParamsFromObject(
     o.freeze,
     o.clawback,
     o.suggestedParams,
-    o.strictEmptyAddressChecking,
-    o.rekeyTo
+    o.rekeyTo,
+    o.strictEmptyAddressChecking
   );
 }
 
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 620644b3a..9ae6932f8 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,7 +1,10 @@
 import JSONbigWithoutConfig from 'json-bigint';
 import IntDecoding from '../types/intDecoding';
 
-const JSONbig = JSONbigWithoutConfig({ useNativeBigInt: true, strict: true });
+const JSONbig = JSONbigWithoutConfig({
+  useNativeBigInt: true,
+  strict: true,
+});
 
 export interface JSONOptions {
   intDecoding?: IntDecoding;
diff --git a/src/wait.ts b/src/wait.ts
index 5ade09d5e..6aa43e261 100644
--- a/src/wait.ts
+++ b/src/wait.ts
@@ -1,4 +1,5 @@
 import Algodv2 from './client/v2/algod/algod';
+import { PendingTransactionResponse } from './client/v2/algod/models/types';
 
 /**
  * Wait until a transaction has been confirmed or rejected by the network, or
@@ -13,7 +14,7 @@ export async function waitForConfirmation(
   client: Algodv2,
   txid: string,
   waitRounds: number
-): Promise<Record<string, any>> {
+): Promise<PendingTransactionResponse> {
   // Wait until the transaction is confirmed or rejected, or until 'waitRounds'
   // number of rounds have passed.
 
@@ -21,7 +22,7 @@ export async function waitForConfirmation(
   if (typeof status === 'undefined') {
     throw new Error('Unable to get node status');
   }
-  const startRound = status['last-round'] + 1;
+  const startRound = Number(status.lastRound) + 1;
   let currentRound = startRound;
 
   /* eslint-disable no-await-in-loop */
@@ -30,15 +31,15 @@ export async function waitForConfirmation(
     try {
       const pendingInfo = await client.pendingTransactionInformation(txid).do();
 
-      if (pendingInfo['confirmed-round']) {
+      if (pendingInfo.confirmedRound) {
         // Got the completed Transaction
         return pendingInfo;
       }
 
-      if (pendingInfo['pool-error']) {
+      if (pendingInfo.poolError) {
         // If there was a pool error, then the transaction has been rejected
         poolError = true;
-        throw new Error(`Transaction Rejected: ${pendingInfo['pool-error']}`);
+        throw new Error(`Transaction Rejected: ${pendingInfo.poolError}`);
       }
     } catch (err) {
       // Ignore errors from PendingTransactionInformation, since it may return 404 if the algod
diff --git a/tests/5.Transaction.js b/tests/5.Transaction.js
index 0cc7e7955..797b92179 100644
--- a/tests/5.Transaction.js
+++ b/tests/5.Transaction.js
@@ -1375,8 +1375,8 @@ describe('Sign', () => {
         freeze,
         clawback,
         suggestedParams,
-        true,
-        rekeyTo
+        rekeyTo,
+        true
       );
       assert.deepStrictEqual(expectedTxn, actualTxn);
     });
diff --git a/tests/cucumber/steps/steps.js b/tests/cucumber/steps/steps.js
index 0e30f34ff..b7856a28c 100644
--- a/tests/cucumber/steps/steps.js
+++ b/tests/cucumber/steps/steps.js
@@ -180,6 +180,22 @@ module.exports = function getSteps(options) {
     return boxRefArray;
   }
 
+  /*
+  doRaw and the associated functions are used to allow test servers to return unexpected response data in cases where
+  we're not testing the functionality of the response. It is the responsibility of the mocking step to set the doRaw
+  variable to true if it intends to send bad responses.
+  By default, we you `do` which will throw an exception if malformed response data is returned.
+   */
+  let doRaw = false;
+
+  async function doOrDoRaw(req) {
+    if (doRaw === true) {
+      doRaw = false;
+      return req.doRaw();
+    }
+    return req.do();
+  }
+
   function concatArrays(...arrs) {
     const size = arrs.reduce((sum, arr) => sum + arr.length, 0);
     const c = new Uint8Array(size);
@@ -781,14 +797,14 @@ module.exports = function getSteps(options) {
 
   When('I send the transaction', async function () {
     const txid = await this.v2Client.sendRawTransaction(this.stx).do();
-    this.txid = txid.txId;
+    this.txid = txid.txid;
     this.appTxid = txid; // Alias to use in waitForTransaction.
     return this.txid;
   });
 
   When('I send the kmd-signed transaction', async function () {
     const txid = await this.v2Client.sendRawTransaction(this.stxKmd).do();
-    this.txid = txid.txId;
+    this.txid = txid.txid;
     this.appTxid = txid; // Alias to use in waitForTransaction.
     return this.txid;
   });
@@ -1137,7 +1153,7 @@ module.exports = function getSteps(options) {
     const accountResponse = await this.v2Client
       .accountInformation(this.assetTestFixture.creator)
       .do();
-    const heldAssets = accountResponse['created-assets'];
+    const heldAssets = accountResponse.createdAssets;
     let assetIds = heldAssets.map((asset) => asset.index);
     assetIds = assetIds.sort(sortKeysAscending);
     const assetIndex = assetIds[assetIds.length - 1];
@@ -1350,7 +1366,7 @@ module.exports = function getSteps(options) {
         .accountInformation(this.assetTestFixture.creator)
         .do();
       for (const asset of accountInformation.assets) {
-        if (asset['asset-id'] === this.assetTestFixture.index) {
+        if (asset.assetId === this.assetTestFixture.index) {
           assert.deepStrictEqual(asset.amount, parseInt(expectedTotal));
         }
       }
@@ -1479,6 +1495,7 @@ module.exports = function getSteps(options) {
   Given(
     'mock http responses in {string} loaded from {string}',
     function (expectedBody, format) {
+      doRaw = false;
       if (expectedBody !== null) {
         expectedMockResponse = expectedBody;
         if (format === 'msgp') {
@@ -1506,6 +1523,7 @@ module.exports = function getSteps(options) {
   Given(
     'mock http responses in {string} loaded from {string} with status {int}.',
     function (expectedBody, status, format) {
+      doRaw = false;
       if (expectedBody !== null) {
         expectedMockResponse = expectedBody;
         if (format === 'msgp') {
@@ -1539,9 +1557,10 @@ module.exports = function getSteps(options) {
         if (client === 'algod') {
           // endpoints are ignored by mock server, see setupMockServerForResponses
           if (responseFormat === 'msgp') {
-            this.actualMockResponse = await this.v2Client.block(0).do();
+            const response = await this.v2Client.block(0).do();
+            this.actualMockResponse = response.get_obj_for_encoding(true);
           } else {
-            this.actualMockResponse = await this.v2Client.status().do();
+            this.actualMockResponse = await this.v2Client.genesis().do();
           }
         } else if (client === 'indexer') {
           // endpoints are ignored by mock server, see setupMockServerForResponses
@@ -1596,6 +1615,7 @@ module.exports = function getSteps(options) {
   });
 
   Given('mock server recording request paths', function () {
+    doRaw = true;
     this.v2Client = new algosdk.Algodv2(
       '',
       `http://${mockAlgodPathRecorderHost}`,
@@ -1692,7 +1712,7 @@ module.exports = function getSteps(options) {
       if (format !== 'msgpack') {
         assert.fail('this SDK only supports format msgpack for this function');
       }
-      await this.v2Client.pendingTransactionInformation(txid).do();
+      await doOrDoRaw(this.v2Client.pendingTransactionInformation(txid));
     }
   );
 
@@ -1702,14 +1722,16 @@ module.exports = function getSteps(options) {
       if (format !== 'msgpack') {
         assert.fail('this SDK only supports format msgpack for this function');
       }
-      await this.v2Client.pendingTransactionsInformation().max(max).do();
+      await doOrDoRaw(this.v2Client.pendingTransactionsInformation().max(max));
     }
   );
 
   When(
     'we make a Pending Transactions By Address call against account {string} and max {int}',
-    function (account, max) {
-      this.v2Client.pendingTransactionByAddress(account).max(max).do();
+    async function (account, max) {
+      await doOrDoRaw(
+        this.v2Client.pendingTransactionByAddress(account).max(max)
+      );
     }
   );
 
@@ -1719,51 +1741,55 @@ module.exports = function getSteps(options) {
       if (format !== 'msgpack') {
         assert.fail('this SDK only supports format msgpack for this function');
       }
-      await this.v2Client.pendingTransactionByAddress(account).max(max).do();
+      await doOrDoRaw(
+        this.v2Client.pendingTransactionByAddress(account).max(max)
+      );
     }
   );
 
   When(
     'we make a Status after Block call with round {int}',
     async function (round) {
-      await this.v2Client.statusAfterBlock(round).do();
+      await doOrDoRaw(this.v2Client.statusAfterBlock(round));
     }
   );
 
   When(
     'we make an Account Information call against account {string} with exclude {string}',
     async function (account, exclude) {
-      await this.v2Client.accountInformation(account).exclude(exclude).do();
+      await doOrDoRaw(
+        this.v2Client.accountInformation(account).exclude(exclude)
+      );
     }
   );
 
   When(
     'we make an Account Information call against account {string}',
     async function (account) {
-      await this.v2Client.accountInformation(account).do();
+      await doOrDoRaw(this.v2Client.accountInformation(account));
     }
   );
 
   When(
     'we make an Account Asset Information call against account {string} assetID {int}',
     async function (account, assetID) {
-      await this.v2Client.accountAssetInformation(account, assetID).do();
+      await doOrDoRaw(this.v2Client.accountAssetInformation(account, assetID));
     }
   );
 
   When(
     'we make an Account Application Information call against account {string} applicationID {int}',
     async function (account, applicationID) {
-      await this.v2Client
-        .accountApplicationInformation(account, applicationID)
-        .do();
+      await doOrDoRaw(
+        this.v2Client.accountApplicationInformation(account, applicationID)
+      );
     }
   );
 
   When(
     'we make a Get Block call against block number {int}',
-    function (blockNum) {
-      this.v2Client.block(blockNum).do();
+    async function (blockNum) {
+      await doOrDoRaw(this.v2Client.block(blockNum));
     }
   );
 
@@ -1773,18 +1799,18 @@ module.exports = function getSteps(options) {
       if (format !== 'msgpack') {
         assert.fail('this SDK only supports format msgpack for this function');
       }
-      await this.v2Client.block(blockNum).do();
+      await doOrDoRaw(this.v2Client.block(blockNum));
     }
   );
 
   When('we make a GetAssetByID call for assetID {int}', async function (index) {
-    await this.v2Client.getAssetByID(index).do();
+    await doOrDoRaw(this.v2Client.getAssetByID(index));
   });
 
   When(
     'we make a GetApplicationByID call for applicationID {int}',
     async function (index) {
-      await this.v2Client.getApplicationByID(index).do();
+      await doOrDoRaw(this.v2Client.getApplicationByID(index));
     }
   );
 
@@ -1806,9 +1832,9 @@ module.exports = function getSteps(options) {
   let anyPendingTransactionInfoResponse;
 
   When('we make any Pending Transaction Information call', async function () {
-    anyPendingTransactionInfoResponse = await this.v2Client
-      .pendingTransactionInformation()
-      .do();
+    anyPendingTransactionInfoResponse = await doOrDoRaw(
+      this.v2Client.pendingTransactionInformation()
+    );
   });
 
   Then(
@@ -1824,9 +1850,9 @@ module.exports = function getSteps(options) {
   let anyPendingTransactionsInfoResponse;
 
   When('we make any Pending Transactions Information call', async function () {
-    anyPendingTransactionsInfoResponse = await this.v2Client
-      .pendingTransactionsInformation()
-      .do();
+    anyPendingTransactionsInfoResponse = await doOrDoRaw(
+      this.v2Client.pendingTransactionsInformation()
+    );
   });
 
   Then(
@@ -1834,13 +1860,13 @@ module.exports = function getSteps(options) {
     (len, idx, sender) => {
       assert.strictEqual(
         len,
-        anyPendingTransactionsInfoResponse['top-transactions'].length
+        anyPendingTransactionsInfoResponse.topTransactions.length
       );
       if (len !== 0) {
         assert.strictEqual(
           sender,
           algosdk.encodeAddress(
-            anyPendingTransactionsInfoResponse['top-transactions'][idx].txn.snd
+            anyPendingTransactionsInfoResponse.topTransactions[idx].txn.snd
           )
         );
       }
@@ -1850,24 +1876,24 @@ module.exports = function getSteps(options) {
   let anySendRawTransactionResponse;
 
   When('we make any Send Raw Transaction call', async function () {
-    anySendRawTransactionResponse = await this.v2Client
-      .sendRawTransaction(makeUint8Array(0))
-      .do();
+    anySendRawTransactionResponse = await doOrDoRaw(
+      this.v2Client.sendRawTransaction(makeUint8Array(0))
+    );
   });
 
   Then(
     'the parsed Send Raw Transaction response should have txid {string}',
     (txid) => {
-      assert.strictEqual(txid, anySendRawTransactionResponse.txId);
+      assert.strictEqual(txid, anySendRawTransactionResponse.txid);
     }
   );
 
   let anyPendingTransactionsByAddressResponse;
 
   When('we make any Pending Transactions By Address call', async function () {
-    anyPendingTransactionsByAddressResponse = await this.v2Client
-      .pendingTransactionByAddress()
-      .do();
+    anyPendingTransactionsByAddressResponse = await doOrDoRaw(
+      this.v2Client.pendingTransactionByAddress()
+    );
   });
 
   Then(
@@ -1875,14 +1901,13 @@ module.exports = function getSteps(options) {
     (len, idx, sender) => {
       assert.strictEqual(
         len,
-        anyPendingTransactionsByAddressResponse['total-transactions']
+        anyPendingTransactionsByAddressResponse.totalTransactions
       );
       if (len === 0) {
         return;
       }
       let actualSender =
-        anyPendingTransactionsByAddressResponse['top-transactions'][idx].txn
-          .snd;
+        anyPendingTransactionsByAddressResponse.topTransactions[idx].txn.snd;
       actualSender = algosdk.encodeAddress(actualSender);
       assert.strictEqual(sender, actualSender);
     }
@@ -1891,48 +1916,63 @@ module.exports = function getSteps(options) {
   let anyNodeStatusResponse;
 
   When('we make any Node Status call', async function () {
-    anyNodeStatusResponse = await this.v2Client.status().do();
+    anyNodeStatusResponse = await doOrDoRaw(this.v2Client.status());
   });
 
   Then(
     'the parsed Node Status response should have a last round of {int}',
     (lastRound) => {
-      assert.strictEqual(lastRound, anyNodeStatusResponse['last-round']);
+      assert.strictEqual(
+        lastRound.toString(),
+        anyNodeStatusResponse.lastRound.toString()
+      );
     }
   );
 
   let anyLedgerSupplyResponse;
 
   When('we make any Ledger Supply call', async function () {
-    anyLedgerSupplyResponse = await this.v2Client.supply().do();
+    anyLedgerSupplyResponse = await doOrDoRaw(this.v2Client.supply());
   });
 
   Then(
     'the parsed Ledger Supply response should have totalMoney {int} onlineMoney {int} on round {int}',
     (totalMoney, onlineMoney, round) => {
-      assert.strictEqual(totalMoney, anyLedgerSupplyResponse['total-money']);
-      assert.strictEqual(onlineMoney, anyLedgerSupplyResponse['online-money']);
-      assert.strictEqual(round, anyLedgerSupplyResponse.current_round);
+      assert.strictEqual(
+        totalMoney.toString(),
+        anyLedgerSupplyResponse.totalMoney.toString()
+      );
+      assert.strictEqual(
+        onlineMoney.toString(),
+        anyLedgerSupplyResponse.onlineMoney.toString()
+      );
+      assert.strictEqual(
+        round.toString(),
+        anyLedgerSupplyResponse.currentRound.toString()
+      );
     }
   );
 
   When('we make any Status After Block call', async function () {
-    anyNodeStatusResponse = await this.v2Client.statusAfterBlock(1).do();
+    anyNodeStatusResponse = await doOrDoRaw(this.v2Client.statusAfterBlock(1));
   });
 
   Then(
     'the parsed Status After Block response should have a last round of {int}',
     (lastRound) => {
-      assert.strictEqual(lastRound, anyNodeStatusResponse['last-round']);
+      assert.strictEqual(
+        lastRound.toString(),
+        anyNodeStatusResponse.lastRound.toString()
+      );
     }
   );
 
   let anyAccountInformationResponse;
 
   When('we make any Account Information call', async function () {
-    anyAccountInformationResponse = await this.v2Client
-      .accountInformation()
-      .do();
+    anyAccountInformationResponse = await doOrDoRaw(
+      this.v2Client.accountInformation()
+    );
   });
 
   Then(
@@ -1945,7 +1985,7 @@ module.exports = function getSteps(options) {
   let anyBlockResponse;
 
   When('we make any Get Block call', async function () {
-    anyBlockResponse = await this.v2Client.block(1).do();
+    anyBlockResponse = await doOrDoRaw(this.v2Client.block(1));
   });
 
   Then(
@@ -1961,9 +2001,9 @@ module.exports = function getSteps(options) {
   let anySuggestedTransactionsResponse;
 
   When('we make any Suggested Transaction Parameters call', async function () {
-    anySuggestedTransactionsResponse = await this.v2Client
-      .getTransactionParams()
-      .do();
+    anySuggestedTransactionsResponse = await doOrDoRaw(
+      this.v2Client.getTransactionParams()
+    );
   });
 
   Then(
@@ -1985,12 +2025,13 @@ module.exports = function getSteps(options) {
       currencyGreater,
       currencyLesser
     ) {
-      await this.indexerClient
-        .lookupAssetBalances(index)
-        .currencyGreaterThan(currencyGreater)
-        .currencyLessThan(currencyLesser)
-        .limit(limit)
-        .do();
+      await doOrDoRaw(
+        this.indexerClient
+          .lookupAssetBalances(index)
+          .currencyGreaterThan(currencyGreater)
+          .currencyLessThan(currencyLesser)
+          .limit(limit)
+      );
     }
   );
 
@@ -2550,8 +2591,8 @@ module.exports = function getSteps(options) {
     'the parsed LookupAccountTransactions response should be valid on round {int}, and contain an array of len {int} and element number {int} should have sender {string}',
     (round, length, idx, sender) => {
       assert.strictEqual(
-        round,
-        anyLookupAccountTransactionsResponse['current-round']
+        round.toString(),
+        anyLookupAccountTransactionsResponse['current-round'].toString()
       );
       assert.strictEqual(
         length,
@@ -2620,7 +2661,10 @@ module.exports = function getSteps(options) {
   Then(
     'the parsed SearchAccounts response should be valid on round {int} and the array should be of len {int} and the element at index {int} should have address {string}',
     (round, length, idx, address) => {
-      assert.strictEqual(round, anySearchAccountsResponse['current-round']);
+      assert.strictEqual(
+        round.toString(),
+        anySearchAccountsResponse['current-round'].toString()
+      );
       assert.strictEqual(length, anySearchAccountsResponse.accounts.length);
       if (length === 0) {
         return;
@@ -2659,8 +2703,8 @@ module.exports = function getSteps(options) {
     'the parsed SearchForTransactions response should be valid on round {int} and the array should be of len {int} and the element at index {int} should have sender {string}',
     (round, length, idx, sender) => {
       assert.strictEqual(
-        round,
-        anySearchForTransactionsResponse['current-round']
+        round.toString(),
+        anySearchForTransactionsResponse['current-round'].toString()
       );
       assert.strictEqual(
         length,
@@ -2708,14 +2752,17 @@ module.exports = function getSteps(options) {
   Then(
     'the parsed SearchForAssets response should be valid on round {int} and the array should be of len {int} and the element at index {int} should have asset index {int}',
     (round, length, idx, assetIndex) => {
-      assert.strictEqual(round, anySearchForAssetsResponse['current-round']);
+      assert.strictEqual(
+        round.toString(),
+        anySearchForAssetsResponse['current-round'].toString()
+      );
       assert.strictEqual(length, anySearchForAssetsResponse.assets.length);
       if (length === 0) {
         return;
       }
       assert.strictEqual(
-        assetIndex,
-        anySearchForAssetsResponse.assets[idx].index
+        assetIndex.toString(),
+        anySearchForAssetsResponse.assets[idx].index.toString()
       );
     }
   );
@@ -2751,9 +2798,9 @@ module.exports = function getSteps(options) {
   Then(
     'the parsed Dryrun Response should have global delta {string} with {int}',
     (key, action) => {
-      assert.strictEqual(dryrunResponse.txns[0]['global-delta'][0].key, key);
+      assert.strictEqual(dryrunResponse.txns[0].globalDelta[0].key, key);
       assert.strictEqual(
-        dryrunResponse.txns[0]['global-delta'][0].value.action,
+        dryrunResponse.txns[0].globalDelta[0].value.action,
         action
       );
     }
@@ -2810,16 +2857,13 @@ module.exports = function getSteps(options) {
   Then('I get execution result {string}', (result) => {
     let msgs;
     const res = dryrunResponse.txns[0];
-    if (
-      res['logic-sig-messages'] !== undefined &&
-      res['logic-sig-messages'].length > 0
-    ) {
-      msgs = res['logic-sig-messages'];
+    if (res.logicSigMessages !== undefined && res.logicSigMessages.length > 0) {
+      msgs = res.logicSigMessages;
     } else if (
-      res['app-call-messages'] !== undefined &&
-      res['app-call-messages'].length > 0
+      res.appCallMessages !== undefined &&
+      res.appCallMessages.length > 0
     ) {
-      msgs = res['app-call-messages'];
+      msgs = res.appCallMessages;
     }
     assert.ok(msgs.length > 0);
     assert.strictEqual(msgs[0], result);
@@ -2971,10 +3015,10 @@ module.exports = function getSteps(options) {
       const fundingResponse = await this.v2Client.sendRawTransaction(stxn).do();
       const info = await algosdk.waitForConfirmation(
         this.v2Client,
-        fundingResponse.txId,
+        fundingResponse.txid,
         1
       );
-      assert.ok(info['confirmed-round'] > 0);
+      assert.ok(info.confirmedRound > 0);
     }
   );
 
@@ -3351,10 +3395,10 @@ module.exports = function getSteps(options) {
         .do();
       const info = await algosdk.waitForConfirmation(
         this.v2Client,
-        fundingResponse.txId,
+        fundingResponse.txid,
         1
       );
-      assert.ok(info['confirmed-round'] > 0);
+      assert.ok(info.confirmedRound > 0);
     }
   );
 
@@ -3479,10 +3523,10 @@ module.exports = function getSteps(options) {
   Given('I wait for the transaction to be confirmed.', async function () {
     const info = await algosdk.waitForConfirmation(
       this.v2Client,
-      this.appTxid.txId,
+      this.appTxid.txid,
       1
     );
-    assert.ok(info['confirmed-round'] > 0);
+    assert.ok(info.confirmedRound > 0);
   });
 
   Given('I reset the array of application IDs to remember.', async function () {
@@ -3491,9 +3535,9 @@ module.exports = function getSteps(options) {
 
   Given('I remember the new application ID.', async function () {
     const info = await this.v2Client
-      .pendingTransactionInformation(this.appTxid.txId)
+      .pendingTransactionInformation(this.appTxid.txid)
       .do();
-    this.currentApplicationIndex = info['application-index'];
+    this.currentApplicationIndex = info.applicationIndex;
 
     if (!Object.prototype.hasOwnProperty.call(this, 'appIDs')) {
       this.appIDs = [];
@@ -3515,12 +3559,18 @@ module.exports = function getSteps(options) {
       const accountInfo = await this.v2Client
         .accountInformation(this.transientAccount.addr)
         .do();
-      const appTotalSchema = accountInfo['apps-total-schema'];
-      assert.strictEqual(appTotalSchema['num-byte-slice'], numByteSlices);
-      assert.strictEqual(appTotalSchema['num-uint'], numUints);
+      const appTotalSchema = accountInfo.appsTotalSchema;
+      assert.strictEqual(
+        appTotalSchema.numByteSlice.toString(),
+        numByteSlices.toString()
+      );
+      assert.strictEqual(
+        appTotalSchema.numUint.toString(),
+        numUints.toString()
+      );
 
       const appCreated = appCreatedBoolAsString === 'true';
-      const createdApps = accountInfo['created-apps'];
+      const { createdApps } = accountInfo;
       //  If we don't expect the app to exist, verify that it isn't there and exit.
       if (!appCreated) {
         for (let i = 0; i < createdApps.length; i++) {
@@ -3535,7 +3585,9 @@ module.exports = function getSteps(options) {
       let foundApp = false;
       for (let i = 0; i < createdApps.length; i++) {
         foundApp =
-          foundApp || createdApps[i].id === this.currentApplicationIndex;
+          foundApp ||
+          createdApps[i].id.toString() ===
+            this.currentApplicationIndex.toString();
       }
       assert.ok(foundApp);
 
@@ -3548,20 +3600,24 @@ module.exports = function getSteps(options) {
       let keyValues = [];
       if (applicationState === 'local') {
         let counter = 0;
-        for (let i = 0; i < accountInfo['apps-local-state'].length; i++) {
-          const localState = accountInfo['apps-local-state'][i];
-          if (localState.id === this.currentApplicationIndex) {
-            keyValues = localState['key-value'];
+        for (let i = 0; i < accountInfo.appsLocalState.length; i++) {
+          const localState = accountInfo.appsLocalState[i];
+          if (
+            localState.id.toString() === this.currentApplicationIndex.toString()
+          ) {
+            keyValues = localState.keyValue;
             counter += 1;
           }
         }
         assert.strictEqual(counter, 1);
       } else if (applicationState === 'global') {
         let counter = 0;
-        for (let i = 0; i < accountInfo['created-apps'].length; i++) {
-          const createdApp = accountInfo['created-apps'][i];
-          if (createdApp.id === this.currentApplicationIndex) {
-            keyValues = createdApp.params['global-state'];
+        for (let i = 0; i < accountInfo.createdApps.length; i++) {
+          const createdApp = accountInfo.createdApps[i];
+          if (
+            createdApp.id.toString() === this.currentApplicationIndex.toString()
+          ) {
+            keyValues = createdApp.params.globalState;
             counter += 1;
           }
         }
@@ -4322,7 +4378,7 @@ module.exports = function getSteps(options) {
     function (index, pathString, expectedResult) {
       let actualResult = this.composerExecuteResponse.methodResults[index]
         .txInfo;
-      actualResult = glom(actualResult, pathString);
+      actualResult = glom(actualResult.get_obj_for_encoding(), pathString);
 
       assert.strictEqual(expectedResult, actualResult.toString());
     }
@@ -4342,7 +4398,7 @@ module.exports = function getSteps(options) {
           if (j === 0) {
             actualResults = actualResults[itxnIndex].txInfo;
           } else {
-            actualResults = actualResults['inner-txns'][itxnIndex];
+            actualResults = actualResults.innerTxns[itxnIndex];
           }
 
           const thisGroupID = actualResults.txn.txn.group;
@@ -4573,7 +4629,10 @@ module.exports = function getSteps(options) {
   Then(
     'I sleep for {int} milliseconds for indexer to digest things down.',
     async (milliseconds) => {
-      const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+      const sleep = (ms) =>
+        new Promise((r) => {
+          setTimeout(r, ms);
+        });
       await sleep(milliseconds);
     }
   );
@@ -4647,18 +4706,18 @@ module.exports = function getSteps(options) {
   When(
     'we make a GetLightBlockHeaderProof call for round {int}',
     async function (int) {
-      await this.v2Client.getLightBlockHeaderProof(int).do();
+      await doOrDoRaw(this.v2Client.getLightBlockHeaderProof(int));
     }
   );
 
   When('we make a GetStateProof call for round {int}', async function (int) {
-    await this.v2Client.getStateProof(int).do();
+    await doOrDoRaw(this.v2Client.getStateProof(int));
   });
 
   When(
     'we make a Lookup Block Hash call against round {int}',
     async function (int) {
-      await this.v2Client.getBlockHash(int).do();
+      await doOrDoRaw(this.v2Client.getBlockHash(int));
     }
   );