Update to latest FCL + fmt and CI improvement

.gas-snapshot

@@ -1,6 +1,6 @@
 WebAuthnFuzzTest:test_Verify_ShoulReturnFalse_WhenSAboveP256_N_DIV_2() (gas: 429635068)
 WebAuthnFuzzTest:test_Verify_ShoulReturnFalse_WhenTheUpFlagIsNotSet() (gas: 435310864)
 WebAuthnFuzzTest:test_Verify_ShoulReturnFalse_WhenUserVerifictionIsRequiredButTestWasNotPerformed() (gas: 432573571)
-WebAuthnFuzzTest:test_Verify_ShoulReturnTrue_WhenSBelowP256_N_DIV_2() (gas: 456300088)
-WebAuthnTest:test_chrome() (gas: 225627)
-WebAuthnTest:test_safari() (gas: 221874)
+WebAuthnFuzzTest:test_Verify_ShoulReturnTrue_WhenSBelowP256_N_DIV_2() (gas: 456301488)
+WebAuthnTest:test_chrome() (gas: 225641)
+WebAuthnTest:test_safari() (gas: 221888)

.github/workflows/test.yml

@@ -40,3 +40,8 @@ jobs:
  run: |
  forge fmt --check
  id: fmt
+
+ - name: Check snapshot
+ run: |
+ forge snapshot --check
+ id: snapshot

foundry.toml

@@ -3,6 +3,9 @@ src = "src"
 out = "out"
 libs = ["lib"]
 optimizer_runs = 999999
-
-# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 fs_permissions = [{ access = "read", path = "test/fixtures" }]
+
+[fmt]
+sort_imports = true
+wrap_comments = true
+line_length = 140

src/WebAuthn.sol

@@ -113,17 +113,16 @@ library WebAuthn {
  }
 
  // 11. Verify that the value of C.type is the string webauthn.get.
- // bytes("type":"webauthn.get").length = 21
+ //  bytes("type":"webauthn.get").length = 21
  string memory _type = webAuthnAuth.clientDataJSON.slice(webAuthnAuth.typeIndex, webAuthnAuth.typeIndex + 21);
  if (keccak256(bytes(_type)) != _EXPECTED_TYPE_HASH) {
  return false;
  }
 
  // 12. Verify that the value of C.challenge equals the base64url encoding of options.challenge.
  bytes memory expectedChallenge = bytes(string.concat('"challenge":"', Base64.encodeURL(challenge), '"'));
- string memory actualChallenge = webAuthnAuth.clientDataJSON.slice(
- webAuthnAuth.challengeIndex, webAuthnAuth.challengeIndex + expectedChallenge.length
- );
+ string memory actualChallenge =
+ webAuthnAuth.clientDataJSON.slice(webAuthnAuth.challengeIndex, webAuthnAuth.challengeIndex + expectedChallenge.length);
  if (keccak256(bytes(actualChallenge)) != keccak256(expectedChallenge)) {
  return false;
  }
@@ -135,7 +134,8 @@ library WebAuthn {
  return false;
  }
 
- // 17. If user verification is required for this assertion, verify that the User Verified bit of the flags in authData is set.
+ // 17. If user verification is required for this assertion, verify that the User Verified bit of the flags in
+ // authData is set.
  if (requireUV && (webAuthnAuth.authenticatorData[32] & _AUTH_DATA_FLAGS_UV) != _AUTH_DATA_FLAGS_UV) {
  return false;
  }
@@ -145,7 +145,8 @@ library WebAuthn {
  // 19. Let hash be the result of computing a hash over the cData using SHA-256.
  bytes32 clientDataJSONHash = sha256(bytes(webAuthnAuth.clientDataJSON));
 
- // 20. Using credentialPublicKey, verify that sig is a valid signature over the binary concatenation of authData and hash.
+ // 20. Using credentialPublicKey, verify that sig is a valid signature over the binary concatenation of authData
+ // and hash.
  bytes32 messageHash = sha256(abi.encodePacked(webAuthnAuth.authenticatorData, clientDataJSONHash));
  bytes memory args = abi.encode(messageHash, webAuthnAuth.r, webAuthnAuth.s, x, y);
  // try the RIP-7212 precompile address

test/Utils.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Base64Url} from "FreshCryptoLib/utils/Base64Url.sol";
 import {FCL_Elliptic_ZZ} from "FreshCryptoLib/FCL_elliptic.sol";
+import {Base64Url} from "FreshCryptoLib/utils/Base64Url.sol";
 
 struct WebAuthnInfo {
  bytes authenticatorData;
@@ -17,9 +17,7 @@ library Utils {
  string memory challengeb64url = Base64Url.encode(abi.encode(challenge));
  string memory clientDataJSON = string(
  abi.encodePacked(
- '{"type":"webauthn.get","challenge":"',
- challengeb64url,
- '","origin":"https://sign.coinbase.com","crossOrigin":false}'
+ '{"type":"webauthn.get","challenge":"', challengeb64url, '","origin":"https://sign.coinbase.com","crossOrigin":false}'
  )
  );
 

test/WebAuthn.t.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import {Base64Url} from "FreshCryptoLib/utils/Base64Url.sol";
 import {Test, console2} from "forge-std/Test.sol";
+
 import {WebAuthn} from "../src/WebAuthn.sol";
-import {Base64Url} from "FreshCryptoLib/utils/Base64Url.sol";
 
 contract WebAuthnTest is Test {
  bytes challenge = abi.encode(0xf631058a3ba1116acce12396fad0a125b5041c43f8e15723709f81aa8d5f4ccf);
@@ -15,7 +16,7 @@ contract WebAuthnTest is Test {
  authenticatorData: hex"49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000101",
  clientDataJSON: string.concat(
  '{"type":"webauthn.get","challenge":"', Base64Url.encode(challenge), '","origin":"http://localhost:3005"}'
-  ),
+ ),
  challengeIndex: 23,
  typeIndex: 1,
  r: 43684192885701841787131392247364253107519555363555461570655060745499568693242,
@@ -30,10 +31,8 @@ contract WebAuthnTest is Test {
  WebAuthn.WebAuthnAuth memory auth = WebAuthn.WebAuthnAuth({
  authenticatorData: hex"49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d9763050000010a",
  clientDataJSON: string.concat(
- '{"type":"webauthn.get","challenge":"',
- Base64Url.encode(challenge),
- '","origin":"http://localhost:3005","crossOrigin":false}'
- ),
+ '{"type":"webauthn.get","challenge":"', Base64Url.encode(challenge), '","origin":"http://localhost:3005","crossOrigin":false}'
+ ),
  challengeIndex: 23,
  typeIndex: 1,
  r: 29739767516584490820047863506833955097567272713519339793744591468032609909569,

test/Webauthn.fuzz.t.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.0;
 
 import {FCL_ecdsa} from "FreshCryptoLib/FCL_ecdsa.sol";
+import {Test, Vm, console, stdJson} from "forge-std/Test.sol";
 
 import {WebAuthn} from "../src/WebAuthn.sol";
 
-import "forge-std/Test.sol";
 import "./Utils.sol";
 
 contract WebAuthnFuzzTest is Test {
@@ -114,7 +114,8 @@ contract WebAuthnFuzzTest is Test {
  y: y
  });
 
- // Assert the verification failed because user verification was required but not performed by the authenticator.
+ // Assert the verification failed because user verification was required but not performed by the
+ // authenticator.
  assertEq(res, false, string.concat("Failed on ", jsonCaseSelector));
 
  console.log("------------------------------------");
@@ -174,9 +175,7 @@ contract WebAuthnFuzzTest is Test {
  webAuthnAuth = WebAuthn.WebAuthnAuth({
  authenticatorData: abi.decode(json.parseRaw(string.concat(jsonCaseSelector, ".authenticator_data")), (bytes)),
  clientDataJSON: abi.decode(json.parseRaw(string.concat(jsonCaseSelector, ".client_data_json.json")), (string)),
- challengeIndex: abi.decode(
- json.parseRaw(string.concat(jsonCaseSelector, ".client_data_json.challenge_index")), (uint256)
- ),
+ challengeIndex: abi.decode(json.parseRaw(string.concat(jsonCaseSelector, ".client_data_json.challenge_index")), (uint256)),
  typeIndex: abi.decode(json.parseRaw(string.concat(jsonCaseSelector, ".client_data_json.type_index")), (uint256)),
  r: abi.decode(json.parseRaw(string.concat(jsonCaseSelector, ".r")), (uint256)),
  s: abi.decode(json.parseRaw(string.concat(jsonCaseSelector, ".s")), (uint256))