Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/changeset_pass-config-to-ignition-helpers.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nomicfoundation/hardhat-ignition-ethers": patch
"@nomicfoundation/hardhat-ignition-viem": patch
---

Fixed a bug preventing Ignition from using the `hre.config.ignition` settings when deploying via script ([#7641](https://github.com/NomicFoundation/hardhat/issues/7641))
3 changes: 3 additions & 0 deletions v-next/hardhat-ignition-ethers/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,6 @@ dist

# npm lockfile since we use pnpm now
package-lock.json

artifacts
cache
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,8 @@ export class EthersIgnitionHelperImpl<ChainTypeT extends ChainType | string>
this.#artifactsManager,
);

const resolvedConfig: Partial<DeployConfig> = {
...this.#config,
...perDeployConfig,
};
const resolvedConfig: Partial<DeployConfig> =
this.getResolvedConfig(perDeployConfig);

const resolvedStrategyConfig = this.#resolveStrategyConfig<StrategyT>(
this.#hardhatConfig,
Expand Down Expand Up @@ -213,6 +211,15 @@ export class EthersIgnitionHelperImpl<ChainTypeT extends ChainType | string>
}
}

public getResolvedConfig(
perDeployConfig: Partial<DeployConfig>,
): Partial<DeployConfig> {
return {
...this.#config,
...perDeployConfig,
};
}

async #toEthersContracts<
ModuleIdT extends string,
ContractNameT extends string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default async (): Promise<Partial<NetworkHooks>> => {
context.config,
context.artifacts,
connection,
context.config.ignition,
);

return connection;
Expand Down
4 changes: 4 additions & 0 deletions v-next/hardhat-ignition-ethers/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ export interface EthersIgnitionHelper {
IgnitionModuleResultsT
>
>;

getResolvedConfig(
perDeployConfig: Partial<DeployConfig>,
): Partial<DeployConfig>;
}

export type IgnitionModuleResultsTToEthersContracts<
Expand Down
22 changes: 22 additions & 0 deletions v-next/hardhat-ignition-ethers/test/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import assert from "node:assert/strict";
import { describe, it } from "node:test";

import { useEphemeralFixtureProject } from "@nomicfoundation/hardhat-test-utils";

import { createConnection } from "./test-helpers/create-hre.js";
import "@nomicfoundation/hardhat-ethers";

describe("config", () => {
useEphemeralFixtureProject("config");

it("should resolve config in the correct priority", async function () {
const connection = await createConnection();

const resolvedConfig = connection.ignition.getResolvedConfig({
maxFeeBumps: 7,
});

assert.equal(resolvedConfig.requiredConfirmations, 42);
assert.equal(resolvedConfig.maxFeeBumps, 7);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default {
solidity: "0.8.19",
networks: {
default: {
mining: {
auto: false,
},
},
},
ignition: {
requiredConfirmations: 42,
maxFeeBumps: 1234,
},
};
3 changes: 3 additions & 0 deletions v-next/hardhat-ignition-viem/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,6 @@ dist

# npm lockfile since we use pnpm now
package-lock.json

artifacts
cache
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default async (): Promise<Partial<NetworkHooks>> => {
context.config,
context.artifacts,
connection,
context.config.ignition,
);

return connection;
Expand Down
15 changes: 11 additions & 4 deletions v-next/hardhat-ignition-viem/src/internal/viem-ignition-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,8 @@ export class ViemIgnitionHelperImpl<ChainTypeT extends ChainType | string>
this.#artifactsManager,
);

const resolvedConfig: Partial<DeployConfig> = {
...this.#config,
...perDeployConfig,
};
const resolvedConfig: Partial<DeployConfig> =
this.getResolvedConfig(perDeployConfig);

const resolvedStrategyConfig =
ViemIgnitionHelperImpl.#resolveStrategyConfig<StrategyT>(
Expand Down Expand Up @@ -216,6 +214,15 @@ export class ViemIgnitionHelperImpl<ChainTypeT extends ChainType | string>
}
}

public getResolvedConfig(
perDeployConfig: Partial<DeployConfig>,
): Partial<DeployConfig> {
return {
...this.#config,
...perDeployConfig,
};
}

async #toViemContracts<
ModuleIdT extends string,
ContractNameT extends string,
Expand Down
4 changes: 4 additions & 0 deletions v-next/hardhat-ignition-viem/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ export interface ViemIgnitionHelper {
): Promise<
IgnitionModuleResultsToViemContracts<ContractNameT, IgnitionModuleResultsT>
>;

getResolvedConfig(
perDeployConfig: Partial<DeployConfig>,
): Partial<DeployConfig>;
}

export type IgnitionModuleResultsToViemContracts<
Expand Down
22 changes: 22 additions & 0 deletions v-next/hardhat-ignition-viem/test/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import assert from "node:assert/strict";
import { describe, it } from "node:test";

import { useEphemeralFixtureProject } from "@nomicfoundation/hardhat-test-utils";

import { createConnection } from "./test-helpers/create-hre.js";
import "@nomicfoundation/hardhat-viem";

describe("config", () => {
useEphemeralFixtureProject("config");

it("should resolve config in the correct priority", async function () {
const connection = await createConnection();

const resolvedConfig = connection.ignition.getResolvedConfig({
maxFeeBumps: 7,
});

assert.equal(resolvedConfig.requiredConfirmations, 42);
assert.equal(resolvedConfig.maxFeeBumps, 7);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default {
solidity: "0.8.19",
networks: {
default: {
mining: {
auto: false,
},
},
},
ignition: {
requiredConfirmations: 42,
maxFeeBumps: 1234,
},
};