Merge pull request #17 from NilFoundation/fix-hardhat-test-deploy

src/handlers/blockNumber.ts

@@ -1,13 +1,40 @@
 import type { HandlerContext } from "../context";
+import { executeOriginalFunction } from "../interceptors";
+import { shardNumber } from "../utils/conversion";
 
 export async function blockNumber(
   method: string,
   params: any[],
   context: HandlerContext,
 ) {
+  const preparedMethod = "eth_getBlockByNumber";
   if (context.debug) {
-    console.log(`Method ${method} params ${JSON.stringify(params)}`);
-    console.log("Response 0x0");
+    console.log("Method", preparedMethod);
   }
-  return "0x0";
+  const result = await executeOriginalFunction(
+    preparedMethod,
+    prepareInput(context),
+    context,
+  );
+  const adaptResponse = adaptResult(result);
+  if (context.debug) {
+    console.log("Response", JSON.stringify(adaptResponse));
+  }
+  return adaptResponse;
+}
+
+function prepareInput(context: HandlerContext): any[] {
+  return [
+    context.hre.config.shardId ?? shardNumber(context.wallet.getAddressHex()),
+    "latest",
+    false,
+  ];
+}
+
+function adaptResult(result: any): any {
+  if (!result) {
+    return "0x0";
+  }
+
+  return result.number;
 }

src/handlers/getTransactionByHash.ts

@@ -24,7 +24,7 @@ export async function getTransactionByHash(
   );
   const adaptResponse = adaptResult(result);
   if (context.debug) {
-    console.log(`Response ${adaptResponse}`);
+    console.log(`Response ${JSON.stringify(adaptResponse)}`);
   }
   return adaptResponse;
 }
@@ -76,6 +76,11 @@ function adaptResult(result: any): any {
     }
   }
 
+  if (result.signature === "0x") {
+    // Hardhat wants a signature, so we'll give it a fake one.
+    result.signature = `0x${"00".repeat(64)}`;
+  }
+
   result.nonce = result.seqno;
   return result;
 }