Path update for conf and workflow

safe-global · Sep 20, 2024 · 5821323 · 5821323
1 parent cc95356
commit 5821323
Show file tree

Hide file tree

Showing 23 changed files with 43 additions and 43 deletions.
diff --git a/...y/certora/confs/GetConfigurationConf.conf → ...ey/certora/conf/GetConfigurationConf.conf b/...y/certora/confs/GetConfigurationConf.conf → ...ey/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 → modules/passkey/certora/conf/GetSigner.conf b/modules/passkey/certora/confs/GetSigner.conf → 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/...passkey/certora/confs/ProxySimulator.conf → .../passkey/certora/conf/ProxySimulator.conf b/...passkey/certora/confs/ProxySimulator.conf → .../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/...tora/confs/SafeWebAuthnSignerFactory.conf → ...rtora/conf/SafeWebAuthnSignerFactory.conf b/...tora/confs/SafeWebAuthnSignerFactory.conf → ...rtora/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/...ertora/confs/SafeWebAuthnSignerProxy.conf → ...certora/conf/SafeWebAuthnSignerProxy.conf b/...ertora/confs/SafeWebAuthnSignerProxy.conf → ...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/...ra/confs/SafeWebAuthnSignerSingleton.conf → ...ora/conf/SafeWebAuthnSignerSingleton.conf b/...ra/confs/SafeWebAuthnSignerSingleton.conf → ...ora/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/...ora/confs/SignerCreationCantOverride.conf → ...tora/conf/SignerCreationCantOverride.conf b/...ora/confs/SignerCreationCantOverride.conf → ...tora/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/...nIsValidSignatureRevertingConditions.conf → ...nIsValidSignatureRevertingConditions.conf b/...nIsValidSignatureRevertingConditions.conf → ...nIsValidSignatureRevertingConditions.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/...nfs/ValidSignatureForSignerIntegrity.conf → ...onf/ValidSignatureForSignerIntegrity.conf b/...nfs/ValidSignatureForSignerIntegrity.conf → ...onf/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/.../VerifyEQtoIsValidSignatureForSigner.conf → .../VerifyEQtoIsValidSignatureForSigner.conf b/.../VerifyEQtoIsValidSignatureForSigner.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 → modules/passkey/certora/conf/WebAuthn.conf b/modules/passkey/certora/confs/WebAuthn.conf → modules/passkey/certora/conf/WebAuthn.conf
diff --git a/modules/passkey/certora/harnesses/FactoryHarnessForSignerConsistency.sol b/modules/passkey/certora/harnesses/FactoryHarnessForSignerConsistency.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.0;
 
 import {SafeWebAuthnSignerFactory} from "../munged/FactoryForSignerConsistency.sol";
-import {P256} from "../../modules/passkey/contracts/libraries/P256.sol";
-import {SafeWebAuthnSignerProxy} from "../../modules/passkey/contracts/SafeWebAuthnSignerProxy.sol";
+import {P256} from "../../contracts/libraries/P256.sol";
+import {SafeWebAuthnSignerProxy} from "../../contracts/SafeWebAuthnSignerProxy.sol";
 
 contract FactoryHarnessForSignerConsistency is SafeWebAuthnSignerFactory {
     //Harness

diff --git a/modules/passkey/certora/harnesses/GetConfigurationProxyHarness.sol b/modules/passkey/certora/harnesses/GetConfigurationProxyHarness.sol
@@ -2,7 +2,7 @@
 /* solhint-disable no-complex-fallback */
 pragma solidity >=0.8.0;
 
-import {P256} from "modules/passkey/contracts/libraries/WebAuthn.sol";
+import {P256} from "../../contracts/libraries/WebAuthn.sol";
 
 /**
  * @title Safe WebAuthn Signer Proxy

diff --git a/modules/passkey/certora/harnesses/GetSignerHarness.sol b/modules/passkey/certora/harnesses/GetSignerHarness.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.0;
 
 import {SafeWebAuthnSignerFactory} from "../munged/SafeWebAuthnSignerFactory.sol";
-import {P256} from "../../modules/passkey/contracts/libraries/P256.sol";
-import {SafeWebAuthnSignerProxy} from "../../modules/passkey/contracts/SafeWebAuthnSignerProxy.sol";
+import {P256} from "../../contracts/libraries/P256.sol";
+import {SafeWebAuthnSignerProxy} from "../../contracts/SafeWebAuthnSignerProxy.sol";
 
 contract GetSignerHarness is SafeWebAuthnSignerFactory {
     function getSignerHarnessed(uint256 x, uint256 y, P256.Verifiers verifiers) public view returns (uint256 value) {

diff --git a/modules/passkey/certora/harnesses/ProxySimulator.sol b/modules/passkey/certora/harnesses/ProxySimulator.sol
@@ -2,7 +2,7 @@
 /* solhint-disable no-complex-fallback */
 pragma solidity >=0.8.0;
 
-import {SafeWebAuthnSignerProxy} from "../../modules/passkey/contracts/SafeWebAuthnSignerProxy.sol";
+import {SafeWebAuthnSignerProxy} from "../../contracts/SafeWebAuthnSignerProxy.sol";
 
 contract ProxySimulator {
     address internal _proxy;

diff --git a/modules/passkey/certora/harnesses/SafeWebAuthnSignerFactoryHarness.sol b/modules/passkey/certora/harnesses/SafeWebAuthnSignerFactoryHarness.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.0;
 
 import {SafeWebAuthnSignerFactory} from "../munged/SafeWebAuthnSignerFactory.sol";
-import {P256} from "../../modules/passkey/contracts/libraries/P256.sol";
-import {SafeWebAuthnSignerProxy} from "../../modules/passkey/contracts/SafeWebAuthnSignerProxy.sol";
+import {P256} from "../../contracts/libraries/P256.sol";
+import {SafeWebAuthnSignerProxy} from "../../contracts/SafeWebAuthnSignerProxy.sol";
 
 contract SafeWebAuthnSignerFactoryHarness is SafeWebAuthnSignerFactory {
     //Harness

diff --git a/modules/passkey/certora/harnesses/Utilities.sol b/modules/passkey/certora/harnesses/Utilities.sol
@@ -1,4 +1,4 @@
-import {P256} from "../../modules/passkey/contracts/libraries/WebAuthn.sol";
+import {P256} from "../../contracts/libraries/WebAuthn.sol";
 
 interface IConfigHolder {
     function getConfiguration() external pure returns (uint256 x, uint256 y, P256.Verifiers verifiers);

diff --git a/modules/passkey/certora/harnesses/WebAuthnHarness.sol b/modules/passkey/certora/harnesses/WebAuthnHarness.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity ^0.8.0;
 
-import {P256, WebAuthn} from "../../modules/passkey/contracts/libraries/WebAuthn.sol";
+import {P256, WebAuthn} from "../../contracts/libraries/WebAuthn.sol";
 
 contract WebAuthnHarness {
     mapping(bytes32 => mapping(bytes32 => string)) symbolicClientDataJson;

diff --git a/modules/passkey/certora/munged/FactoryForSignerConsistency.sol b/modules/passkey/certora/munged/FactoryForSignerConsistency.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.8.0;
 
-import {ISafeSignerFactory} from "../../modules/passkey/contracts/interfaces/ISafeSignerFactory.sol";
-import {SafeWebAuthnSignerProxy} from "../../modules/passkey/contracts/SafeWebAuthnSignerProxy.sol";
-import {SafeWebAuthnSignerSingleton} from "../../modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol";
-import {P256} from "../../modules/passkey/contracts/libraries/P256.sol";
+import {ISafeSignerFactory} from "../../contracts/interfaces/ISafeSignerFactory.sol";
+import {SafeWebAuthnSignerProxy} from "../../contracts/SafeWebAuthnSignerProxy.sol";
+import {SafeWebAuthnSignerSingleton} from "../../contracts/SafeWebAuthnSignerSingleton.sol";
+import {P256} from "../../contracts/libraries/P256.sol";
 
 /**
  * @title Safe WebAuthn Signer Factory

diff --git a/modules/passkey/certora/munged/SafeWebAuthnSignerFactory.sol b/modules/passkey/certora/munged/SafeWebAuthnSignerFactory.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.8.0;
 
-import {ISafeSignerFactory} from "../../modules/passkey/contracts/interfaces/ISafeSignerFactory.sol";
+import {ISafeSignerFactory} from "../../contracts/interfaces/ISafeSignerFactory.sol";
 import {SafeWebAuthnSignerProxy} from "./SafeWebAuthnSignerProxy.sol";
 import {SafeWebAuthnSignerSingleton} from "./SafeWebAuthnSignerSingleton.sol";
-import {P256} from "../../modules/passkey/contracts/libraries/P256.sol";
+import {P256} from "../../contracts/libraries/P256.sol";
 
 /**
  * @title Safe WebAuthn Signer Factory

diff --git a/modules/passkey/certora/munged/SafeWebAuthnSignerSingleton.sol b/modules/passkey/certora/munged/SafeWebAuthnSignerSingleton.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.8.0;
 
-import {SignatureValidator} from "../../modules/passkey/contracts/base/SignatureValidator.sol";
-import {P256, WebAuthn} from "../../modules/passkey/contracts/libraries/WebAuthn.sol";
+import {SignatureValidator} from "../../contracts/base/SignatureValidator.sol";
+import {P256, WebAuthn} from "../../contracts/libraries/WebAuthn.sol";
 
 /**
  * @title Safe WebAuthn Signer Singleton

diff --git a/modules/passkey/certora/munged/WebAuthn.sol b/modules/passkey/certora/munged/WebAuthn.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity ^0.8.0;
 
-import {P256} from "../../modules/passkey/contracts/libraries/P256.sol";
+import {P256} from "../../contracts/libraries/P256.sol";
 
 /**
  * @title WebAuthn Signature Verification

diff --git a/modules/passkey/certora/requirements.txt b/modules/passkey/certora/requirements.txt
@@ -1 +1 @@
-certora-cli==7.10.1
+certora-cli==7.14.2