Skip to content

fix: gracefully pass through provider requests when FHEVM is not init… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hpmaxi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: gracefully pass through provider requests when FHEVM is not init… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions packages/hardhat-plugin/src/internal/FhevmEnvironment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,11 @@ export class FhevmEnvironment {
return this._contractsRepository;
}

// Non-throwing variant for use in error-handling paths where FHEVM may not be initialized.
public tryGetContractsRepository(): contracts.FhevmContractsRepository | undefined {
return this._contractsRepository;
}

public get isDeployed(): boolean {
return this._deployCompleted;
}
Expand Down
33 changes: 22 additions & 11 deletions packages/hardhat-plugin/src/internal/errors/FhevmContractError.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,12 @@ function _parseEdrError(
return undefined;
}

const fhevmContractEntry = fhevmEnv
.getContractsRepository()
.getContractFromAddress(lastCallContractAddress)?.properties;
const repo = fhevmEnv.tryGetContractsRepository();
if (!repo) {
return undefined;
}

const fhevmContractEntry = repo.getContractFromAddress(lastCallContractAddress)?.properties;
if (!fhevmContractEntry) {
return undefined;
}
Expand Down Expand Up @@ -308,14 +311,17 @@ export async function mutateErrorInPlace(fhevmEnv: FhevmEnvironment, e: Error, a
const i = err.stack.indexOf("\n");
err.stack = "Error: " + err.message + err.stack.substring(i);

const map = fhevmEnv.getContractsRepository().addressToContractMap();
const repo = fhevmEnv.tryGetContractsRepository();
if (repo) {
const map = repo.addressToContractMap();

Object.keys(map).forEach((contractAddress) => {
err.stack = err.stack?.replaceAll(
`at <UnrecognizedContract>.<unknown> (${contractAddress})`,
`at ${map[contractAddress].name}.<unknown> (${contractAddress}, ${map[contractAddress].package}/contracts/${map[contractAddress].name}.sol:0:0)`,
);
});
Object.keys(map).forEach((contractAddress) => {
err.stack = err.stack?.replaceAll(
`at <UnrecognizedContract>.<unknown> (${contractAddress})`,
`at ${map[contractAddress].name}.<unknown> (${contractAddress}, ${map[contractAddress].package}/contracts/${map[contractAddress].name}.sol:0:0)`,
);
});
}
}

/**
Expand Down Expand Up @@ -417,7 +423,12 @@ async function __formatFhevmErrorMessages(
txHash?: string,
txFromTo?: { from: string; to: string | null },
): Promise<FhevmErrorMessages | undefined> {
const map = fhevmEnv.getContractsRepository().addressToContractMap();
const repo = fhevmEnv.tryGetContractsRepository();
if (!repo) {
return undefined;
}

const map = repo.addressToContractMap();
const res: {
errorDesc: EthersT.ErrorDescription;
contractWrapper: contracts.FhevmContractWrapper;
Expand Down
10 changes: 8 additions & 2 deletions packages/hardhat-plugin/src/internal/provider/FhevmProviderExtender.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ export class FhevmProviderExtender extends ProviderWrapper {
}

public async request(args: RequestArguments) {
// test init
// if not init forward!
// When FHEVM is not deployed, pass all requests through unchanged.
// This allows non-FHE tasks and scripts to work without initializing
// the FHEVM module (e.g. contract.pause(), custom hardhat tasks, etc.)
// See: https://github.com/zama-ai/fhevm-mocks/issues/80
if (!fhevmContext.fhevmEnv?.isDeployed) {
return this._wrappedProvider.request(args);
}

switch (args.method) {
// window.ethereum
case "eth_estimateGas":
Expand Down