From a61305988ae7d4e7527a90761d32fdb7e6878a8f Mon Sep 17 00:00:00 2001 From: Marko Arambasic Date: Fri, 13 Dec 2024 12:54:01 +0100 Subject: [PATCH 1/4] feat: add support for EraVM Extensions --- packages/app/src/locales/en.json | 8 +++++ packages/app/src/locales/uk.json | 8 +++++ packages/app/src/types.ts | 2 ++ .../src/views/ContractVerificationView.vue | 31 ++++++++++++++++++- .../useContractVerification.spec.ts | 1 + packages/app/tests/e2e/testId.json | 1 + 6 files changed, 50 insertions(+), 1 deletion(-) diff --git a/packages/app/src/locales/en.json b/packages/app/src/locales/en.json index b70c6f0998..b33845b9ce 100644 --- a/packages/app/src/locales/en.json +++ b/packages/app/src/locales/en.json @@ -456,6 +456,14 @@ }, "underline": "If you enabled optimization during compilation, select yes." }, + "enableEraVMExtensionsUsed": { + "label": "Enable EraVM Extensions", + "options": { + "yes": "Yes", + "no": "No" + }, + "underline": "If you enabled EraVM Extensions during compilation, select yes." + }, "solcVersion": { "label": "Solc Version", "placeholder": "Choose version", diff --git a/packages/app/src/locales/uk.json b/packages/app/src/locales/uk.json index d12592ab63..8143b853c4 100644 --- a/packages/app/src/locales/uk.json +++ b/packages/app/src/locales/uk.json @@ -263,6 +263,14 @@ }, "underline": "Якщо ви ввімкнули оптимізацію під час компіляції, виберіть так." }, + "enableEraVMExtensionsUsed": { + "label": "Ввімкнути EraVM Extensions", + "options": { + "yes": "Так", + "no": "Ні" + }, + "underline": "Якщо ви ввімкнули EraVM Extensions під час компіляції, виберіть так." + }, "solcVersion": { "label": "Solc версія", "placeholder": "Вибрати версію", diff --git a/packages/app/src/types.ts b/packages/app/src/types.ts index d0c87863c2..c6ce0df9b8 100644 --- a/packages/app/src/types.ts +++ b/packages/app/src/types.ts @@ -38,6 +38,7 @@ export type ContractVerificationData = { contractAddress: string; contractName: string; optimizationUsed: boolean; + enableEraVMExtensionsUsed: boolean; sourceCode: | string | { @@ -48,6 +49,7 @@ export type ContractVerificationData = { }; }; settings: { + enableEraVMExtensions: boolean; optimizer: { enabled: boolean; }; diff --git a/packages/app/src/views/ContractVerificationView.vue b/packages/app/src/views/ContractVerificationView.vue index 2bc9272bfa..4b3d3e0cae 100644 --- a/packages/app/src/views/ContractVerificationView.vue +++ b/packages/app/src/views/ContractVerificationView.vue @@ -154,7 +154,33 @@ - + +
+ + {{ t("contractVerification.form.enableEraVMExtensionsUsed.options.yes") }} + + + {{ t("contractVerification.form.enableEraVMExtensionsUsed.options.no") }} + +
+ +

Contract info

{ contractAddress: "", contractName: "", optimizationUsed: false, + enableEraVMExtensionsUsed: false, sourceCode: "", zkCompilerVersion: "", compilerVersion: "", diff --git a/packages/app/tests/e2e/testId.json b/packages/app/tests/e2e/testId.json index 23625394d9..182888402e 100644 --- a/packages/app/tests/e2e/testId.json +++ b/packages/app/tests/e2e/testId.json @@ -11,6 +11,7 @@ "initiatorsAddress": "initiators-address", "fromAddress": "from-address", "optimizationRadioButtons": "radio-buttons", + "enableEraVMExtensionsRadioButtons": "radio-buttons", "pageTitle": "page-title", "previousInstructionButton": "previous-instruction-navigation-button", "showInstructionMetadataButton": "show-instruction-metadata-button", From 48d91e310979b336a8e310aea4736162bf419394 Mon Sep 17 00:00:00 2001 From: Marko Arambasic Date: Mon, 27 Jan 2025 16:29:26 +0100 Subject: [PATCH 2/4] fix: add proper testId names --- .../app/tests/e2e/features/artifacts/artifactsSet1.feature | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature index 1940aad64b..1cf76fdafb 100644 --- a/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature +++ b/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature @@ -207,7 +207,8 @@ Feature: Main Page | Selector type | Element | Assertion | | id | contractAddress | visible | | id | contractName | visible | - | testId | radio-buttons | visible | + | testId.optimizationRadioButtons | radio-buttons | visible | + | testId.enableEraVMExtensionsRadioButtons | radio-buttons | visible | | id | compilerVersion | visible | | id | zkCompilerVersion | visible | | id | sourceCode | visible | From 7b14ab60ed547b374cb8473000c4a7571506dd81 Mon Sep 17 00:00:00 2001 From: Marko Arambasic Date: Mon, 27 Jan 2025 16:57:33 +0100 Subject: [PATCH 3/4] fix: add proper testId values and change feature file --- .../features/artifacts/artifactsSet1.feature | 22 +++++++++---------- packages/app/tests/e2e/testId.json | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature index 1cf76fdafb..5e2bc4354b 100644 --- a/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature +++ b/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature @@ -204,14 +204,14 @@ Feature: Main Page Then Element with "" "" should be "" Examples: - | Selector type | Element | Assertion | - | id | contractAddress | visible | - | id | contractName | visible | - | testId.optimizationRadioButtons | radio-buttons | visible | - | testId.enableEraVMExtensionsRadioButtons | radio-buttons | visible | - | id | compilerVersion | visible | - | id | zkCompilerVersion | visible | - | id | sourceCode | visible | - | id | constructorArguments | visible | - | text | Verify Smart Contract | clickable | - | text | Clear | clickable | + | Selector type | Element | Assertion | + | id | contractAddress | visible | + | id | contractName | visible | + | testId | radio-buttons-optimization | visible | + | testId | radio-buttons-enable-era-extensions | visible | + | id | compilerVersion | visible | + | id | zkCompilerVersion | visible | + | id | sourceCode | visible | + | id | constructorArguments | visible | + | text | Verify Smart Contract | clickable | + | text | Clear | clickable | diff --git a/packages/app/tests/e2e/testId.json b/packages/app/tests/e2e/testId.json index 182888402e..eaa511ccdd 100644 --- a/packages/app/tests/e2e/testId.json +++ b/packages/app/tests/e2e/testId.json @@ -10,8 +10,8 @@ "direction": "direction", "initiatorsAddress": "initiators-address", "fromAddress": "from-address", - "optimizationRadioButtons": "radio-buttons", - "enableEraVMExtensionsRadioButtons": "radio-buttons", + "optimizationRadioButtons": "radio-buttons-optimization", + "enableEraVMExtensionsRadioButtons": "radio-buttons-enable-era-extensions", "pageTitle": "page-title", "previousInstructionButton": "previous-instruction-navigation-button", "showInstructionMetadataButton": "show-instruction-metadata-button", From 510493c0b43f13c9d6a0d658c5214234603c4563 Mon Sep 17 00:00:00 2001 From: Marko Arambasic Date: Wed, 26 Feb 2025 14:33:01 +0100 Subject: [PATCH 4/4] fix: rename enableEraVMExtensionsUsed to enableEraVMExtensions --- packages/app/src/locales/en.json | 2 +- packages/app/src/locales/uk.json | 2 +- packages/app/src/types.ts | 2 +- .../src/views/ContractVerificationView.vue | 30 ++++++++----------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/packages/app/src/locales/en.json b/packages/app/src/locales/en.json index b97f34d3d4..dee0e225f9 100644 --- a/packages/app/src/locales/en.json +++ b/packages/app/src/locales/en.json @@ -461,7 +461,7 @@ }, "underline": "If you enabled optimization during compilation, select yes." }, - "enableEraVMExtensionsUsed": { + "enableEraVMExtensions": { "label": "Enable EraVM Extensions", "options": { "yes": "Yes", diff --git a/packages/app/src/locales/uk.json b/packages/app/src/locales/uk.json index d792417033..ffaf43a04a 100644 --- a/packages/app/src/locales/uk.json +++ b/packages/app/src/locales/uk.json @@ -266,7 +266,7 @@ }, "underline": "Якщо ви ввімкнули оптимізацію під час компіляції, виберіть так." }, - "enableEraVMExtensionsUsed": { + "enableEraVMExtensions": { "label": "Ввімкнути EraVM Extensions", "options": { "yes": "Так", diff --git a/packages/app/src/types.ts b/packages/app/src/types.ts index 5c0f0c44db..30643827dc 100644 --- a/packages/app/src/types.ts +++ b/packages/app/src/types.ts @@ -38,7 +38,7 @@ export type ContractVerificationData = { contractAddress: string; contractName: string; optimizationUsed: boolean; - enableEraVMExtensionsUsed: boolean; + enableEraVMExtensions: boolean; sourceCode: | string | { diff --git a/packages/app/src/views/ContractVerificationView.vue b/packages/app/src/views/ContractVerificationView.vue index 4b3d3e0cae..7845787fa7 100644 --- a/packages/app/src/views/ContractVerificationView.vue +++ b/packages/app/src/views/ContractVerificationView.vue @@ -154,32 +154,28 @@ - +
- {{ t("contractVerification.form.enableEraVMExtensionsUsed.options.yes") }} + {{ t("contractVerification.form.enableEraVMExtensions.options.yes") }} - {{ t("contractVerification.form.enableEraVMExtensionsUsed.options.no") }} + {{ t("contractVerification.form.enableEraVMExtensions.options.no") }}
- +

Contract info

@@ -429,7 +425,7 @@ const defaultValues = computed< contractName: "", contractPath: "", optimizationUsed: true, - enableEraVMExtensionsUsed: false, + enableEraVMExtensions: false, zkCompilerVersion: selectedZkCompiler.value.versions[0] || "", compilerVersion: selectedCompiler.value.versions[0] || "", sourceCode: "", @@ -572,7 +568,7 @@ async function submitForm() { codeFormat: ContractVerificationCodeFormatEnum[selectedCompilationType.value], contractAddress: form.value.contractAddress, optimizationUsed: form.value.optimizationUsed, - enableEraVMExtensionsUsed: form.value.enableEraVMExtensionsUsed, + enableEraVMExtensions: form.value.enableEraVMExtensions, zkCompilerVersion: form.value.zkCompilerVersion, compilerVersion: form.value.compilerVersion, constructorArguments: form.value.constructorArguments, @@ -604,7 +600,7 @@ async function submitForm() { optimizer: { enabled: form.value.optimizationUsed, }, - enableEraVMExtensions: form.value.enableEraVMExtensionsUsed, + enableEraVMExtensions: form.value.enableEraVMExtensions, }, }, ...commonData,