Merge pull request #8 from NilFoundation/shard-id

add shard setting

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nilfoundation/hardhat-plugin",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Custom Hardhat plugin to enable seamless deployment and interaction with applications within =nil;",
   "repository": {
     "type": "git",

src/handlers/getBlockByNumber.ts

@@ -1,12 +1,13 @@
 import type { HandlerContext } from "../context";
 import { executeOriginalFunction } from "../interceptors";
+import { shardNumber } from "../utils/conversion";
 
 export async function getBlockByNumber(
   method: string,
   params: any[],
   context: HandlerContext,
 ) {
-  const preparedParams = prepareInput(params);
+  const preparedParams = prepareInput(params, context);
   const response = await executeOriginalFunction(
     method,
     preparedParams,
@@ -15,8 +16,8 @@ export async function getBlockByNumber(
   return adaptResponse(response);
 }
 
-function prepareInput(params: any[]): any[] {
-  return [1, ...params];
+function prepareInput(params: any[], context: HandlerContext): any[] {
+  return [shardNumber(context.wallet.getAddressHex()), ...params];
 }
 
 function adaptResponse(response: any): any {

src/handlers/getTransactionByHash.ts

@@ -1,12 +1,17 @@
 import type { HandlerContext } from "../context";
 import { executeOriginalFunction } from "../interceptors";
+import { shardNumber } from "../utils/conversion";
 
 export async function getTransactionByHash(
   method: string,
   params: any[],
   context: HandlerContext,
 ) {
-  const [preparedMethod, preparedParams] = prepareInput(method, params);
+  const [preparedMethod, preparedParams] = prepareInput(
+    method,
+    params,
+    context,
+  );
   const result = await executeOriginalFunction(
     preparedMethod,
     preparedParams,
@@ -15,9 +20,16 @@ export async function getTransactionByHash(
   return adaptResult(result);
 }
 
-function prepareInput(method: string, params: any[]): [string, any[]] {
+function prepareInput(
+  method: string,
+  params: any[],
+  context: HandlerContext,
+): [string, any[]] {
   const preparedMethod = "eth_getInMessageByHash";
-  const preparedParams = [1, ...params];
+  const preparedParams = [
+    context.hre.config.shardId ?? shardNumber(context.wallet.getAddressHex()),
+    ...params,
+  ];
   return [preparedMethod, preparedParams];
 }
 

src/handlers/getTransactionReceipt.ts

@@ -1,12 +1,17 @@
 import type { HandlerContext } from "../context";
 import { executeOriginalFunction } from "../interceptors";
+import { shardNumber } from "../utils/conversion";
 
 export async function getTransactionReceipt(
   method: string,
   params: any[],
   context: HandlerContext,
 ) {
-  const [preparedMethod, preparedParams] = prepareInput(method, params);
+  const [preparedMethod, preparedParams] = prepareInput(
+    method,
+    params,
+    context,
+  );
   const result = await executeOriginalFunction(
     preparedMethod,
     preparedParams,
@@ -15,8 +20,18 @@ export async function getTransactionReceipt(
   return adaptResponse(result, preparedParams);
 }
 
-function prepareInput(method: string, params: any[]): [string, any[]] {
-  return ["eth_getInMessageReceipt", [1, ...params]];
+function prepareInput(
+  method: string,
+  params: any[],
+  context: HandlerContext,
+): [string, any[]] {
+  return [
+    "eth_getInMessageReceipt",
+    [
+      context.hre.config.shardId ?? shardNumber(context.wallet.getAddressHex()),
+      ...params,
+    ],
+  ];
 }
 
 function adaptResponse(result: any, params: any[]): any {

src/handlers/sendTransaction.ts

@@ -20,19 +20,27 @@ async function prepareDeployment(
   );
   await waitTillCompleted(
     context.client,
-    1,
+    shardNumber(context.wallet.getAddressHex()),
     `0x${Buffer.from(hash).toString("hex")}`,
   );
 
   const deployed = await context.wallet.deployContract({
-    shardId: shardNumber(context.wallet.getAddressHex()),
+    shardId:
+      context.hre.config.shardId ?? shardNumber(context.wallet.getAddressHex()),
     bytecode: hexStringToUint8Array(params[0].data),
     args: [bytesToHex(context.wallet.pubkey)],
     salt: BigInt(Math.floor(Math.random() * 1024)),
     gas: context.gasLimit,
     value: context.gasLimit * 10n,
   });
-  return deployed.hash;
+
+  const receipt = await waitTillCompleted(
+    context.client,
+    shardNumber(context.wallet.getAddressHex()),
+    deployed.hash,
+  );
+
+  return receipt[0].outMessages?.[0] ?? "";
 }
 
 async function handleDirectTransaction(

src/index.ts

@@ -24,4 +24,6 @@ extendEnvironment(async (hre) => {
 
 export interface NilHardhatUserConfig extends HardhatUserConfig {
   walletAddress?: string;
+  gasLimit?: number;
+  shardId?: number;
 }

src/setup.ts

@@ -33,7 +33,7 @@ function isHttpNetworkConfig(
 export async function setupWalletAndClient(
   hre: HardhatRuntimeEnvironment,
 ): Promise<HandlerContext> {
-  const networkName = "nil_cluster";
+  const networkName = "nil";
   const networkConfig = hre.config.networks[networkName];
 
   // Error handling if the network configuration is not HTTP or is missing

src/types.d.ts

@@ -6,6 +6,7 @@ declare module "hardhat/types/config" {
   export interface NilHardhatUserConfig extends HardhatUserConfig {
     walletAddress?: string;
     gasLimit?: number;
+    shardId?: number;
   }
 
   interface HardhatConfig extends NilHardhatUserConfig {} // Augmenting existing type