Skip to content

Release to wizard #37

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

Merged
MCarlomagno merged 2 commits into from
Feb 18, 2025
Merged

Release to wizard #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1953aa
Add Wizard message parameter enforceDeterministicReason
ericglau Feb 14, 2025
1205c67
Merge pull request #36 from ericglau/deterministicreason
ericglau Feb 18, 2025
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
1 change: 1 addition & 0 deletions src/lib/models/ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export type GlobalState = {
source?: CompilationFileSources | null | SourceWithTarget,
version?: string,
data?: CompilationResult | null,
enforceDeterministicReason?: string,
}
form: {
network?: string | TenantNetworkResponse;
Expand Down
13 changes: 11 additions & 2 deletions src/lib/wizard/components/Deploy.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
let enforceDeterministic = $derived.by(() => {
const selectedMultisig = globalState.form.approvalType === 'existing' && isMultisig(globalState.form.approvalProcessSelected?.viaType);
const toCreateMultisig = globalState.form.approvalType === 'new' && isMultisig(globalState.form.approvalProcessToCreate?.viaType);
return selectedMultisig || toCreateMultisig;
const hasReasonMessage = globalState.contract?.enforceDeterministicReason !== undefined;
return selectedMultisig || toCreateMultisig || hasReasonMessage;
});

const deploymentUrl = $derived(
Expand Down Expand Up @@ -97,6 +98,10 @@

if (globalState.contract?.target && compilationResult) {
inputs = getConstructorInputsWizard(globalState.contract.target, compilationResult.output.contracts);

// Clear deploy status messages
successMessage = "";
errorMessage = "";
}
isCompiling = false;
}
Expand Down Expand Up @@ -226,7 +231,11 @@
}

if ((isDeterministic || enforceDeterministic) && !salt) {
displayMessage("Salt is required", "error");
if (globalState.contract?.enforceDeterministicReason) {
displayMessage(`Salt is required: ${globalState.contract.enforceDeterministicReason}`, "error");
} else {
displayMessage("Salt is required", "error");
}
return;
}

Expand Down
4 changes: 3 additions & 1 deletion src/lib/wizard/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { globalState } from "$lib/state/state.svelte";
export interface DefenderDeployMessage {
kind: 'oz-wizard-defender-deploy';
sources: ContractSources;
enforceDeterministicReason?: string;
}

export const initWizardPlugin = () => {
Expand All @@ -18,7 +19,8 @@ function listenToContracts() {
source: {
sources: e.data.sources,
},
target: getMainContractName(e.data.sources)
target: getMainContractName(e.data.sources),
enforceDeterministicReason: e.data.enforceDeterministicReason,
};
}
});
Expand Down