Fix merge issues

ChainSafe · Apr 4, 2022 · ab8bd7e · ab8bd7e
1 parent 08af0be
commit ab8bd7e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/packages/api/src/keymanager/routes.ts b/packages/api/src/keymanager/routes.ts
@@ -154,8 +154,8 @@ export function getReqSerializers(): ReqSerializers<Api, ReqTypes> {
 /* eslint-disable @typescript-eslint/naming-convention */
 export function getReturnTypes(): ReturnTypes<Api> {
   return {
-    listKeys: jsonType(),
-    importKeystores: jsonType(),
-    deleteKeystores: jsonType(),
+    listKeys: jsonType("camel"),
+    importKeystores: jsonType("camel"),
+    deleteKeystores: jsonType("camel"),
   };
 }
diff --git a/packages/lodestar/src/network/peers/peerManager.ts b/packages/lodestar/src/network/peers/peerManager.ts
@@ -25,7 +25,6 @@ import {
   renderIrrelevantPeerType,
 } from "./utils";
 import {SubnetType} from "../metadata";
-import {ATTESTATION_SUBNET_COUNT} from "@chainsafe/lodestar-params";
 
 /** heartbeat performs regular updates such as updating reputations and performing discovery requests */
 const HEARTBEAT_INTERVAL_MS = 30 * 1000;
@@ -637,7 +636,7 @@ function countAttnets(peerData?: PeerData): number {
 
   let count = 0;
   for (let i = 0; i < ATTESTATION_SUBNET_COUNT; i++) {
-    if (attNets[i]) count++;
+    if (attNets.get(i)) count++;
   }
 
   return count;

diff --git a/yarn.lock b/yarn.lock
@@ -59,6 +59,11 @@
   resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.1.tgz#4a157406309e212ab27ed3ae30e8c1d641686a66"
   integrity sha512-Qi4JoKXjmE0O67wAOH6y0n26QXhMKMFo7GD/4IXNVcrtLjUlGjGuVys6pQgwF3ArfGTQu0XpqaNr0YhED2RaRA==
 
+"@assemblyscript/loader@^0.9.2":
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.9.4.tgz#a483c54c1253656bb33babd464e3154a173e1577"
+  integrity sha512-HazVq9zwTVwGmqdwYzu7WyQ6FQVZ7SwET0KKQuKm55jD0IfUpZgN0OPIiZG3zV1iSrVYcN0bdwLRXI/VNCYsUA==
+
 "@azure/abort-controller@^1.0.0":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.4.tgz#fd3c4d46c8ed67aace42498c8e2270960250eafd"
@@ -380,6 +385,14 @@
   dependencies:
     event-target-shim "^5.0.0"
 
+"@chainsafe/as-sha256@^0.2.3", "@chainsafe/as-sha256@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.2.4.tgz#17e78d32c71c836160bb55fd79c3daad93d9abf0"
+  integrity sha512-rYfIOaQm0OlFcHdJFUu5VyYOA1HVeQXxOivUsawBjd7WXc3lMQ0bXMfCgN50gPPLWT92G4ioZ0EZz8RnH+YT/g==
+  dependencies:
+    "@assemblyscript/loader" "^0.9.2"
+    buffer "^5.4.3"
+
 "@chainsafe/as-sha256@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.3.0.tgz#ba7d4b85a77c51a50c071856ea6ead4066583b74"
@@ -481,6 +494,13 @@
     protobufjs "^6.11.2"
     uint8arrays "^3.0.0"
 
+"@chainsafe/persistent-merkle-tree@^0.3.7":
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.3.7.tgz#d257674fcacf1770e54df1e7e476bb55efcb3ed4"
+  integrity sha512-UXXzvCN8P4eQWCsaTaHRrNa+2sTwY3NB0Vf+uWgM4cU1qf8LOsTU7aU2CeXFAGJag5W/xEQfVGNh463kXTYAgg==
+  dependencies:
+    "@chainsafe/as-sha256" "^0.2.3"
+
 "@chainsafe/persistent-merkle-tree@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.4.0.tgz#249abef9623d45889d71f0f7e807d3aa93472d21"
@@ -505,6 +525,15 @@
     buffer-from "^1.1.1"
     snappy "^6.3.5"
 
+"@chainsafe/ssz@^0.8.20":
+  version "0.8.20"
+  resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.8.20.tgz#2c8e70e173a2540c8e4e0bad7c44fd836b8b256b"
+  integrity sha512-SjD/GqkByWbC5JC2W4cvaFjok6kfZeZDLLzr9k0Kn4sIOZPBfuRTumvV6ihqgn7ItOFpZRXMz0u4DgH+lr28WQ==
+  dependencies:
+    "@chainsafe/as-sha256" "^0.2.4"
+    "@chainsafe/persistent-merkle-tree" "^0.3.7"
+    case "^1.6.3"
+
 "@chainsafe/ssz@^0.9.0":
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.9.0.tgz#27e40fa3316ef8736bbae898bdf90c1dce4a7045"