Fixed transaction signature, use native autogas

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conduitxyz/hardhat-gcp-kms-signer",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Sign Hardhat deployment transactions using KMS key",
   "repository": "github:conduitxyz/hardhat-gcp-kms-signer",
   "author": "Conduit XYZ",

src/index.ts

@@ -1,6 +1,6 @@
 import { extendConfig, extendEnvironment } from "hardhat/config";
 import { BackwardsCompatibilityProviderAdapter } from "hardhat/internal/core/providers/backwards-compatibility";
-import { AutomaticGasProvider } from "hardhat/internal/core/providers/gas-providers";
+import { AutomaticGasPriceProvider, AutomaticGasProvider, GanacheGasMultiplierProvider } from "hardhat/internal/core/providers/gas-providers";
 import { HttpProvider } from "hardhat/internal/core/providers/http";
 import {
   EIP1193Provider,
@@ -9,7 +9,6 @@ import {
   HttpNetworkUserConfig,
 } from "hardhat/types";
 
-import { AutomaticGasPriceProvider } from "./gasProvider";
 import { KMSSigner } from "./provider";
 import "./type-extensions";
 
@@ -40,22 +39,23 @@ extendEnvironment((hre) => {
       httpNetConfig.httpHeaders,
       httpNetConfig.timeout
     );
-    let wrappedProvider: EIP1193Provider;
+    let wrappedProvider: EIP1193Provider = eip1193Provider;
+
     wrappedProvider = new KMSSigner(
       eip1193Provider,
       hre.network.config.gcpKmsKeyName
     );
-    if (hre.network.config.minMaxFeePerGas || hre.network.config.minMaxPriorityFeePerGas) {
-      wrappedProvider = new AutomaticGasProvider(
-        wrappedProvider,
-        hre.network.config.gasMultiplier
-      );
-      wrappedProvider = new AutomaticGasPriceProvider(
-        wrappedProvider,
-        hre.network.config.minMaxFeePerGas,
-        hre.network.config.minMaxPriorityFeePerGas
-      );
-    }
+
+    wrappedProvider = new AutomaticGasProvider(
+      wrappedProvider,
+      hre.network.config.gasMultiplier
+    );
+
+    wrappedProvider = new AutomaticGasPriceProvider(
+      wrappedProvider,
+    );    
+    wrappedProvider = new GanacheGasMultiplierProvider(wrappedProvider);
+
     hre.network.provider = new BackwardsCompatibilityProviderAdapter(
       wrappedProvider
     );

src/provider.ts

@@ -1,4 +1,4 @@
-import { GcpKmsSigner, GcpKmsSignerCredentials} from "ethers-gcp-kms-signer";
+import { GcpKmsSigner, GcpKmsSignerCredentials } from "ethers-gcp-kms-signer";
 
 import { BigNumber, utils } from "ethers";
 import { keccak256 } from "ethers/lib/utils";
@@ -13,7 +13,7 @@ import { assert } from "console";
 export class KMSSigner extends ProviderWrapperWithChainId {
   public kmsSigner: GcpKmsSigner;
   public kmsCredentials: GcpKmsSignerCredentials;
-  
+
 
   constructor(provider: EIP1193Provider, gcpKmsKeyName: string) {
     super(provider);
@@ -24,12 +24,13 @@ export class KMSSigner extends ProviderWrapperWithChainId {
   public async request(args: RequestArguments): Promise<unknown> {
     const method = args.method;
     const params = this._getParams(args);
-    const sender = await this._getSender();
+    const sender = await this._getSender()
+
     if (method === "eth_sendTransaction") {
       const [txRequest] = validateParams(params, rpcTransactionRequest);
       const tx = await utils.resolveProperties(txRequest);
       const nonce = tx.nonce ?? (await this._getNonce(sender));
-      const baseTx: utils.UnsignedTransaction = {
+      const baseTx = {
         chainId: (await this._getChainId()) || undefined,
         data: tx.data,
         gasLimit: tx.gas?.toString(),
@@ -51,13 +52,7 @@ export class KMSSigner extends ProviderWrapperWithChainId {
         delete baseTx.maxPriorityFeePerGas;
       }
 
-      console.log("TX", baseTx);
-
-      const unsignedTx = utils.serializeTransaction(baseTx);
-      const hash = keccak256(utils.arrayify(unsignedTx));
-      const sig = await this.kmsSigner.signMessage(hash);
-
-      const rawTx = utils.serializeTransaction(baseTx, sig);
+      const rawTx = await this.kmsSigner.signTransaction(baseTx);
 
       return this._wrappedProvider.request({
         method: "eth_sendRawTransaction",
@@ -87,10 +82,10 @@ export class KMSSigner extends ProviderWrapperWithChainId {
   }
 }
 
-function parseKmsKey(gcpKmsKeyName: string): GcpKmsSignerCredentials {  
+function parseKmsKey(gcpKmsKeyName: string): GcpKmsSignerCredentials {
   let parts = gcpKmsKeyName.split("/");
   assert(gcpKmsKeyName, "gcpKmsKeyName is missing.")
-  assert(parts.length === 10, `Incorrect gcp kms key format: ${ gcpKmsKeyName }. ` + 
+  assert(parts.length === 10, `Incorrect gcp kms key format: ${gcpKmsKeyName}. ` +
     `Expected: projects/<projectId>/locations/<locationId>/keyRings/<keyRingId>/cryptoKeys/<keyId>/cryptoKeyVersions/<keyVersion>`);
   return {
     projectId: parts[1], // your project id in gcp