From b99e3aab8e9dd9e5aab7b4eb8ba524765eef78a6 Mon Sep 17 00:00:00 2001 From: Shebin John Date: Fri, 20 Sep 2024 11:30:43 +0200 Subject: [PATCH] Path update for conf and workflow --- .github/workflows/certora_passkey.yml | 2 +- .../certora/{confs => conf}/GetConfigurationConf.conf | 2 +- modules/passkey/certora/{confs => conf}/GetSigner.conf | 4 ++-- modules/passkey/certora/{confs => conf}/ProxySimulator.conf | 6 +++--- .../certora/{confs => conf}/SafeWebAuthnSignerFactory.conf | 4 ++-- .../certora/{confs => conf}/SafeWebAuthnSignerProxy.conf | 6 +++--- .../{confs => conf}/SafeWebAuthnSignerSingleton.conf | 6 +++--- .../certora/{confs => conf}/SignerCreationCantOverride.conf | 6 +++--- .../SingletonIsValidSignatureRevertingConditions.conf | 6 +++--- .../{confs => conf}/ValidSignatureForSignerIntegrity.conf | 4 ++-- .../VerifyEQtoIsValidSignatureForSigner.conf | 2 +- modules/passkey/certora/{confs => conf}/WebAuthn.conf | 0 12 files changed, 24 insertions(+), 24 deletions(-) rename modules/passkey/certora/{confs => conf}/GetConfigurationConf.conf (91%) rename modules/passkey/certora/{confs => conf}/GetSigner.conf (81%) rename modules/passkey/certora/{confs => conf}/ProxySimulator.conf (80%) rename modules/passkey/certora/{confs => conf}/SafeWebAuthnSignerFactory.conf (87%) rename modules/passkey/certora/{confs => conf}/SafeWebAuthnSignerProxy.conf (75%) rename modules/passkey/certora/{confs => conf}/SafeWebAuthnSignerSingleton.conf (75%) rename modules/passkey/certora/{confs => conf}/SignerCreationCantOverride.conf (81%) rename modules/passkey/certora/{confs => conf}/SingletonIsValidSignatureRevertingConditions.conf (75%) rename modules/passkey/certora/{confs => conf}/ValidSignatureForSignerIntegrity.conf (84%) rename modules/passkey/certora/{confs => conf}/VerifyEQtoIsValidSignatureForSigner.conf (93%) rename modules/passkey/certora/{confs => conf}/WebAuthn.conf (100%) diff --git a/.github/workflows/certora_passkey.yml b/.github/workflows/certora_passkey.yml index 23f3abd2..486d42fb 100644 --- a/.github/workflows/certora_passkey.yml +++ b/.github/workflows/certora_passkey.yml @@ -58,7 +58,7 @@ jobs: run: pnpm install - name: Verify rule ${{ matrix.rule }} - working-directory: ./modules/4337 + working-directory: ./modules/passkey run: | echo "Certora key length" ${#CERTORAKEY} certoraRun certora/conf/${{ matrix.rule }}.conf --wait_for_results=all diff --git a/modules/passkey/certora/confs/GetConfigurationConf.conf b/modules/passkey/certora/conf/GetConfigurationConf.conf similarity index 91% rename from modules/passkey/certora/confs/GetConfigurationConf.conf rename to modules/passkey/certora/conf/GetConfigurationConf.conf index 20aebd2f..13e8417f 100644 --- a/modules/passkey/certora/confs/GetConfigurationConf.conf +++ b/modules/passkey/certora/conf/GetConfigurationConf.conf @@ -3,7 +3,7 @@ "files": [ "certora/munged/SafeWebAuthnSignerSingleton.sol", "certora/harnesses/GetConfigurationProxyHarness.sol", - "modules/passkey/contracts/SafeWebAuthnSignerFactory.sol" + "contracts/SafeWebAuthnSignerFactory.sol" ], "link": [ "GetConfigurationProxyHarness:_SINGLETON=SafeWebAuthnSignerSingleton" diff --git a/modules/passkey/certora/confs/GetSigner.conf b/modules/passkey/certora/conf/GetSigner.conf similarity index 81% rename from modules/passkey/certora/confs/GetSigner.conf rename to modules/passkey/certora/conf/GetSigner.conf index b5e6ef93..6b7129e7 100644 --- a/modules/passkey/certora/confs/GetSigner.conf +++ b/modules/passkey/certora/conf/GetSigner.conf @@ -2,8 +2,8 @@ "assert_autofinder_success": true, "files": [ "certora/harnesses/GetSignerHarness.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/SafeWebAuthnSignerProxy.sol" + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/SafeWebAuthnSignerProxy.sol" ], "hashing_length_bound": "4694", "link": [ diff --git a/modules/passkey/certora/confs/ProxySimulator.conf b/modules/passkey/certora/conf/ProxySimulator.conf similarity index 80% rename from modules/passkey/certora/confs/ProxySimulator.conf rename to modules/passkey/certora/conf/ProxySimulator.conf index c70bb3af..2f82f8ca 100644 --- a/modules/passkey/certora/confs/ProxySimulator.conf +++ b/modules/passkey/certora/conf/ProxySimulator.conf @@ -2,9 +2,9 @@ "assert_autofinder_success": true, "files": [ "certora/harnesses/ProxySimulator.sol", - "modules/passkey/contracts/SafeWebAuthnSignerProxy.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/libraries/P256.sol", + "contracts/SafeWebAuthnSignerProxy.sol", + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/libraries/P256.sol", "certora/harnesses/WebAuthnHarnessWithMunge.sol" ], "hashing_length_bound": "2048", diff --git a/modules/passkey/certora/confs/SafeWebAuthnSignerFactory.conf b/modules/passkey/certora/conf/SafeWebAuthnSignerFactory.conf similarity index 87% rename from modules/passkey/certora/confs/SafeWebAuthnSignerFactory.conf rename to modules/passkey/certora/conf/SafeWebAuthnSignerFactory.conf index 33490caf..4c822338 100644 --- a/modules/passkey/certora/confs/SafeWebAuthnSignerFactory.conf +++ b/modules/passkey/certora/conf/SafeWebAuthnSignerFactory.conf @@ -3,8 +3,8 @@ "files": [ "certora/harnesses/FactoryHarnessForSignerConsistency.sol", "certora/harnesses/WebAuthnHarnessWithMunge.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/SafeWebAuthnSignerProxy.sol" + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/SafeWebAuthnSignerProxy.sol" ], "link": [ "FactoryHarnessForSignerConsistency:SINGLETON=SafeWebAuthnSignerSingleton" diff --git a/modules/passkey/certora/confs/SafeWebAuthnSignerProxy.conf b/modules/passkey/certora/conf/SafeWebAuthnSignerProxy.conf similarity index 75% rename from modules/passkey/certora/confs/SafeWebAuthnSignerProxy.conf rename to modules/passkey/certora/conf/SafeWebAuthnSignerProxy.conf index 2affd152..c8f57c86 100644 --- a/modules/passkey/certora/confs/SafeWebAuthnSignerProxy.conf +++ b/modules/passkey/certora/conf/SafeWebAuthnSignerProxy.conf @@ -1,9 +1,9 @@ { "assert_autofinder_success": true, "files": [ - "modules/passkey/contracts/SafeWebAuthnSignerProxy.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/libraries/P256.sol" + "contracts/SafeWebAuthnSignerProxy.sol", + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/libraries/P256.sol" ], "link": [ "SafeWebAuthnSignerProxy:_VERIFIERS=P256", diff --git a/modules/passkey/certora/confs/SafeWebAuthnSignerSingleton.conf b/modules/passkey/certora/conf/SafeWebAuthnSignerSingleton.conf similarity index 75% rename from modules/passkey/certora/confs/SafeWebAuthnSignerSingleton.conf rename to modules/passkey/certora/conf/SafeWebAuthnSignerSingleton.conf index 892ba415..078e8d80 100644 --- a/modules/passkey/certora/confs/SafeWebAuthnSignerSingleton.conf +++ b/modules/passkey/certora/conf/SafeWebAuthnSignerSingleton.conf @@ -1,9 +1,9 @@ { "assert_autofinder_success": true, "files": [ - "modules/passkey/contracts/SafeWebAuthnSignerFactory.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/libraries/P256.sol", + "contracts/SafeWebAuthnSignerFactory.sol", + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/libraries/P256.sol", "certora/harnesses/WebAuthnHarnessWithMunge.sol" ], "link": [ diff --git a/modules/passkey/certora/confs/SignerCreationCantOverride.conf b/modules/passkey/certora/conf/SignerCreationCantOverride.conf similarity index 81% rename from modules/passkey/certora/confs/SignerCreationCantOverride.conf rename to modules/passkey/certora/conf/SignerCreationCantOverride.conf index 5ca4866b..afdffaab 100644 --- a/modules/passkey/certora/confs/SignerCreationCantOverride.conf +++ b/modules/passkey/certora/conf/SignerCreationCantOverride.conf @@ -5,9 +5,9 @@ ], "files": [ "certora/harnesses/SafeWebAuthnSignerFactoryHarness.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/SafeWebAuthnSignerProxy.sol", - "modules/passkey/contracts/libraries/P256.sol", + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/SafeWebAuthnSignerProxy.sol", + "contracts/libraries/P256.sol", "certora/harnesses/WebAuthnHarnessWithMunge.sol" ], "hashing_length_bound": "912", diff --git a/modules/passkey/certora/confs/SingletonIsValidSignatureRevertingConditions.conf b/modules/passkey/certora/conf/SingletonIsValidSignatureRevertingConditions.conf similarity index 75% rename from modules/passkey/certora/confs/SingletonIsValidSignatureRevertingConditions.conf rename to modules/passkey/certora/conf/SingletonIsValidSignatureRevertingConditions.conf index 967f03bf..41adb169 100644 --- a/modules/passkey/certora/confs/SingletonIsValidSignatureRevertingConditions.conf +++ b/modules/passkey/certora/conf/SingletonIsValidSignatureRevertingConditions.conf @@ -1,9 +1,9 @@ { "assert_autofinder_success": true, "files": [ - "modules/passkey/contracts/SafeWebAuthnSignerFactory.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/libraries/P256.sol", + "contracts/SafeWebAuthnSignerFactory.sol", + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/libraries/P256.sol", "certora/harnesses/WebAuthnHarnessWithMunge.sol" ], "loop_iter": "6", diff --git a/modules/passkey/certora/confs/ValidSignatureForSignerIntegrity.conf b/modules/passkey/certora/conf/ValidSignatureForSignerIntegrity.conf similarity index 84% rename from modules/passkey/certora/confs/ValidSignatureForSignerIntegrity.conf rename to modules/passkey/certora/conf/ValidSignatureForSignerIntegrity.conf index a1be3ce2..0552db59 100644 --- a/modules/passkey/certora/confs/ValidSignatureForSignerIntegrity.conf +++ b/modules/passkey/certora/conf/ValidSignatureForSignerIntegrity.conf @@ -3,8 +3,8 @@ "files": [ "certora/harnesses/SafeWebAuthnSignerFactoryHarness.sol", "certora/harnesses/WebAuthnHarnessWithMunge.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", - "modules/passkey/contracts/SafeWebAuthnSignerProxy.sol" + "contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/SafeWebAuthnSignerProxy.sol" ], "link": [ "SafeWebAuthnSignerFactoryHarness:SINGLETON=SafeWebAuthnSignerSingleton" diff --git a/modules/passkey/certora/confs/VerifyEQtoIsValidSignatureForSigner.conf b/modules/passkey/certora/conf/VerifyEQtoIsValidSignatureForSigner.conf similarity index 93% rename from modules/passkey/certora/confs/VerifyEQtoIsValidSignatureForSigner.conf rename to modules/passkey/certora/conf/VerifyEQtoIsValidSignatureForSigner.conf index d0700ebb..0192eaa7 100644 --- a/modules/passkey/certora/confs/VerifyEQtoIsValidSignatureForSigner.conf +++ b/modules/passkey/certora/conf/VerifyEQtoIsValidSignatureForSigner.conf @@ -3,7 +3,7 @@ "dynamic_bound": "1", "files": [ "certora/harnesses/SafeWebAuthnSignerFactoryHarness.sol", - "modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol", + "contracts/SafeWebAuthnSignerSingleton.sol", "certora/munged/SafeWebAuthnSignerProxy.sol", "certora/munged/WebAuthn.sol", "certora/harnesses/WebAuthnHarnessWithMunge.sol" diff --git a/modules/passkey/certora/confs/WebAuthn.conf b/modules/passkey/certora/conf/WebAuthn.conf similarity index 100% rename from modules/passkey/certora/confs/WebAuthn.conf rename to modules/passkey/certora/conf/WebAuthn.conf