Add headless execution

foundry.toml

@@ -1,3 +1,5 @@
 [profile.ci.fuzz]
 runs = 10_000
-solc_version = "0.8.23"
+solc_version = "0.8.23"
+[profile.suave]
+whitelist = ["*"]

src/Test.sol

@@ -19,17 +19,12 @@ contract SuaveEnabled is Test {
     ConfidentialStoreI constant confStoreWrapper = ConfidentialStoreI(Registry.confidentialStoreAddr);
 
     function setUp() public {
-        string[] memory inputs = new string[](3);
+        string[] memory inputs = new string[](2);
         inputs[0] = "suave-geth";
-        inputs[1] = "forge";
-        inputs[2] = "status";
+        inputs[1] = "version";
 
         try vm.ffi(inputs) returns (bytes memory response) {
-            // the status call of the `suave-geth forge` command fails with the 'not-ok' prefix
-            // which is '6e6f742d6f6b' in hex
-            if (isPrefix(hex"6e6f742d6f6b", response)) {
-                revert("Local Suave node not detected running");
-            }
+            // TODO: validate versions
         } catch (bytes memory reason) {
             revert(detectErrorMessage(reason));
         }
@@ -47,7 +42,7 @@ contract SuaveEnabled is Test {
 
     function detectErrorMessage(bytes memory reason) internal pure returns (string memory) {
         // Errors from cheatcodes are reported as 'CheatcodeError(string)' events
-        // 'eeaa9e6f' is the signature of the event
+        // 'eeaa9e6f' is the signature of the event. If the error is not a CheatcodeError, return the reason as is
         if (!isPrefix(hex"eeaa9e6f", reason)) {
             return string(reason);
         }

src/Transactions.sol

@@ -303,7 +303,7 @@ library Transactions {
     {
         bytes memory rlp = Transactions.encodeRLP(request);
         bytes memory hash = abi.encodePacked(keccak256(rlp));
-        bytes memory signature = Suave.signMessage(hash, signingKey);
+        bytes memory signature = Suave.signMessage(hash, Suave.CryptoSignature.SECP256, signingKey);
         (uint8 v, bytes32 r, bytes32 s) = decodeSignature(signature);
 
         response.to = request.to;
@@ -328,7 +328,7 @@ library Transactions {
     {
         bytes memory rlp = Transactions.encodeRLP(request);
         bytes memory hash = abi.encodePacked(keccak256(rlp));
-        bytes memory signature = Suave.signMessage(hash, signingKey);
+        bytes memory signature = Suave.signMessage(hash, Suave.CryptoSignature.SECP256, signingKey);
 
         // TODO: check overflow
         uint64 chainIdMul = uint64(request.chainId) * 2;

src/forge/Connector.sol

@@ -5,14 +5,20 @@ import "forge-std/Test.sol";
 
 contract Connector is Test {
     function forgeIt(bytes memory addr, bytes memory data) internal returns (bytes memory) {
+        string memory root = vm.projectRoot();
+        string memory foundryToml = string.concat(root, "/", "foundry.toml");
+
         string memory addrHex = iToHex(addr);
         string memory dataHex = iToHex(data);
 
-        string[] memory inputs = new string[](4);
+        string[] memory inputs = new string[](7);
         inputs[0] = "suave-geth";
         inputs[1] = "forge";
-        inputs[2] = addrHex;
-        inputs[3] = dataHex;
+        inputs[2] = "--local";
+        inputs[3] = "--config";
+        inputs[4] = foundryToml;
+        inputs[5] = addrHex;
+        inputs[6] = dataHex;
 
         bytes memory res = vm.ffi(inputs);
         return res;

src/suavelib/Suave.sol

@@ -4,6 +4,11 @@ pragma solidity ^0.8.8;
 library Suave {
     error PeekerReverted(address, bytes);
 
+    enum CryptoSignature {
+        SECP256,
+        BLS
+    }
+
     type DataId is bytes16;
 
     struct BuildBlockArgs {
@@ -230,8 +235,8 @@ library Suave {
         return abi.decode(data, (DataRecord));
     }
 
-    function privateKeyGen() internal returns (string memory) {
-        (bool success, bytes memory data) = PRIVATE_KEY_GEN.call(abi.encode());
+    function privateKeyGen(CryptoSignature crypto) internal returns (string memory) {
+        (bool success, bytes memory data) = PRIVATE_KEY_GEN.call(abi.encode(crypto));
         if (!success) {
             revert PeekerReverted(PRIVATE_KEY_GEN, data);
         }
@@ -251,9 +256,12 @@ library Suave {
         return abi.decode(data, (bytes));
     }
 
-    function signMessage(bytes memory digest, string memory signingKey) internal returns (bytes memory) {
+    function signMessage(bytes memory digest, CryptoSignature crypto, string memory signingKey)
+        internal
+        returns (bytes memory)
+    {
         require(isConfidential());
-        (bool success, bytes memory data) = SIGN_MESSAGE.call(abi.encode(digest, signingKey));
+        (bool success, bytes memory data) = SIGN_MESSAGE.call(abi.encode(digest, crypto, signingKey));
         if (!success) {
             revert PeekerReverted(SIGN_MESSAGE, data);
         }