Merge branch 'main' into general-cleanup

Author: talentlessguy

.changeset/hot-spoons-sparkle.md

@@ -0,0 +1,5 @@
+---
+"hardhat": minor
+---
+
+Remove support for `console.log` selectors that wrongly use "(u)int" type aliases in the selector calculation

docs/src/content/ignition/docs/config/index.md

@@ -14,6 +14,7 @@ module.exports = {
     timeBeforeBumpingFees: 3 * 60 * 1_000,
     maxFeeBumps: 4,
     requiredConfirmations: 5,
+    disableFeeBumping: false,
   },
 };
 ```
@@ -44,6 +45,12 @@ The number of confirmations Hardhat Ignition waits before considering a transact
 
 Default value: 5
 
+### `disableFeeBumping`
+
+If set to `true`, Hardhat Ignition will not bump the fee for unconfirmed transactions. Overrides the `disableFeeBumping` option in the network configuration.
+
+Default value: false
+
 ## Network configuration options
 
 You can use the `ignition` field under specific network configurations to customize deployments on a per-network basis:
@@ -57,6 +64,8 @@ module.exports = {
       ignition: {
         maxFeePerGasLimit: 50_000_000_000n, // 50 gwei
         maxPriorityFeePerGas: 2_000_000_000n, // 2 gwei
+        gasPrice: 50_000_000_000n, // 50 gwei
+        disableFeeBumping: false,
       },
       // ...
     },
@@ -77,3 +86,15 @@ Default value: undefined
 The maximum priority fee per gas, in wei, that Hardhat Ignition will use for gas fee calculations when sending transactions. If not set then Hardhat Ignition will try to use `eth_maxPriorityFeePerGas` if available, or default to 1 gwei.
 
 Default value: undefined
+
+### `gasPrice`
+
+The gas price, in wei, that Hardhat Ignition will use for gas fee calculations when sending transactions. **This field only applies to deployments on the Polygon network. It will not be used on other networks even if set.**
+
+Default value: undefined
+
+### `disableFeeBumping`
+
+If set to `true`, Hardhat Ignition will not bump the fee for unconfirmed transactions on this network. Is overridden by the top-level `disableFeeBumping` option.
+
+Default value: false

packages/hardhat-core/scripts/console-library-generator.ts

@@ -101,27 +101,15 @@ const CONSOLE_LOG_FUNCTIONS =
     );
 
 /** Maps from a 4-byte function selector to a signature (argument types) */
-const CONSOLE_LOG_SIGNATURES: Map<string, string[]> =
-  CONSOLE_LOG_FUNCTIONS.reduce((acc, { params }) => {
-    // We always use `log` for the selector, even if it's logUint, for example.
+const CONSOLE_LOG_SIGNATURES = Object.fromEntries(
+  CONSOLE_LOG_FUNCTIONS.map(({ params }) => {
+    // We always use "log" for the selector, even if it's logUint, for example.
     const signature = toHex(selector({ name: "log", params }));
     const types = params.map((p) => p.type);
-    acc.set(signature, types);
-
-    // For backwards compatibility, we additionally support the (invalid)
-    // selectors that contain the `int`/`uint` aliases in the selector calculation.
-    if (params.some((p) => ["uint256", "int256"].includes(p.type))) {
-      const aliased = params.map((p) => ({
-        ...p,
-        type: p.type.replace("int256", "int"),
-      }));
-
-      const signature = toHex(selector({ name: "log", params: aliased }));
-      acc.set(signature, types);
-    }
 
-    return acc;
-  }, new Map());
+    return [signature, types];
+  })
+);
 
 // Finally, render and save the console.sol and logger.ts files
 const consoleSolFile = `\
@@ -190,7 +178,7 @@ ${Array.from(SINGLE_TYPES.map((param) => capitalize(param.type)))
 
 /** Maps from a 4-byte function selector to a signature (argument types) */
 export const CONSOLE_LOG_SIGNATURES: Record<number, string[]> = {
-${Array.from(CONSOLE_LOG_SIGNATURES)
+${Object.entries(CONSOLE_LOG_SIGNATURES)
   .map(([sig, types]) => {
     const typeNames = types.map((type) => `${capitalize(type)}Ty`).join(", ");
     return `  ${sig}: [${typeNames}],`;