@inco/lightning 0.6.8 → 0.6.9

package/src/pasted-dependencies/ICreateX.sol

@@ -7,6 +7,7 @@ pragma solidity ^0.8.4;
  * @custom:coauthor Matt Solomon (https://web.archive.org/web/20230921103335/https://mattsolomon.dev/)
  */
 interface ICreateX {
+
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                            TYPES                           */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -22,10 +23,7 @@ interface ICreateX {
 
     event ContractCreation(address indexed newContract, bytes32 indexed salt);
     event ContractCreation(address indexed newContract);
-    event Create3ProxyContractCreation(
-        address indexed newContract,
-        bytes32 indexed salt
-    );
+    event Create3ProxyContractCreation(address indexed newContract, bytes32 indexed salt);
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                        CUSTOM ERRORS                       */
@@ -41,49 +39,31 @@ interface ICreateX {
     /*                           CREATE                           */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    function deployCreate(
-        bytes memory initCode
-    ) external payable returns (address newContract);
+    function deployCreate(bytes memory initCode) external payable returns (address newContract);
 
-    function deployCreateAndInit(
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values,
-        address refundAddress
-    ) external payable returns (address newContract);
+    function deployCreateAndInit(bytes memory initCode, bytes memory data, Values memory values, address refundAddress)
+        external
+        payable
+        returns (address newContract);
 
-    function deployCreateAndInit(
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values
-    ) external payable returns (address newContract);
+    function deployCreateAndInit(bytes memory initCode, bytes memory data, Values memory values)
+        external
+        payable
+        returns (address newContract);
 
-    function deployCreateClone(
-        address implementation,
-        bytes memory data
-    ) external payable returns (address proxy);
+    function deployCreateClone(address implementation, bytes memory data) external payable returns (address proxy);
 
-    function computeCreateAddress(
-        address deployer,
-        uint256 nonce
-    ) external view returns (address computedAddress);
+    function computeCreateAddress(address deployer, uint256 nonce) external view returns (address computedAddress);
 
-    function computeCreateAddress(
-        uint256 nonce
-    ) external view returns (address computedAddress);
+    function computeCreateAddress(uint256 nonce) external view returns (address computedAddress);
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           CREATE2                          */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    function deployCreate2(
-        bytes32 salt,
-        bytes memory initCode
-    ) external payable returns (address newContract);
+    function deployCreate2(bytes32 salt, bytes memory initCode) external payable returns (address newContract);
 
-    function deployCreate2(
-        bytes memory initCode
-    ) external payable returns (address newContract);
+    function deployCreate2(bytes memory initCode) external payable returns (address newContract);
 
     function deployCreate2AndInit(
         bytes32 salt,
@@ -93,60 +73,45 @@ interface ICreateX {
         address refundAddress
     ) external payable returns (address newContract);
 
-    function deployCreate2AndInit(
-        bytes32 salt,
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values
-    ) external payable returns (address newContract);
+    function deployCreate2AndInit(bytes32 salt, bytes memory initCode, bytes memory data, Values memory values)
+        external
+        payable
+        returns (address newContract);
 
-    function deployCreate2AndInit(
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values,
-        address refundAddress
-    ) external payable returns (address newContract);
+    function deployCreate2AndInit(bytes memory initCode, bytes memory data, Values memory values, address refundAddress)
+        external
+        payable
+        returns (address newContract);
 
-    function deployCreate2AndInit(
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values
-    ) external payable returns (address newContract);
+    function deployCreate2AndInit(bytes memory initCode, bytes memory data, Values memory values)
+        external
+        payable
+        returns (address newContract);
 
-    function deployCreate2Clone(
-        bytes32 salt,
-        address implementation,
-        bytes memory data
-    ) external payable returns (address proxy);
+    function deployCreate2Clone(bytes32 salt, address implementation, bytes memory data)
+        external
+        payable
+        returns (address proxy);
 
-    function deployCreate2Clone(
-        address implementation,
-        bytes memory data
-    ) external payable returns (address proxy);
+    function deployCreate2Clone(address implementation, bytes memory data) external payable returns (address proxy);
 
-    function computeCreate2Address(
-        bytes32 salt,
-        bytes32 initCodeHash,
-        address deployer
-    ) external pure returns (address computedAddress);
+    function computeCreate2Address(bytes32 salt, bytes32 initCodeHash, address deployer)
+        external
+        pure
+        returns (address computedAddress);
 
-    function computeCreate2Address(
-        bytes32 salt,
-        bytes32 initCodeHash
-    ) external view returns (address computedAddress);
+    function computeCreate2Address(bytes32 salt, bytes32 initCodeHash)
+        external
+        view
+        returns (address computedAddress);
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           CREATE3                          */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    function deployCreate3(
-        bytes32 salt,
-        bytes memory initCode
-    ) external payable returns (address newContract);
+    function deployCreate3(bytes32 salt, bytes memory initCode) external payable returns (address newContract);
 
-    function deployCreate3(
-        bytes memory initCode
-    ) external payable returns (address newContract);
+    function deployCreate3(bytes memory initCode) external payable returns (address newContract);
 
     function deployCreate3AndInit(
         bytes32 salt,
@@ -156,32 +121,23 @@ interface ICreateX {
         address refundAddress
     ) external payable returns (address newContract);
 
-    function deployCreate3AndInit(
-        bytes32 salt,
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values
-    ) external payable returns (address newContract);
+    function deployCreate3AndInit(bytes32 salt, bytes memory initCode, bytes memory data, Values memory values)
+        external
+        payable
+        returns (address newContract);
 
-    function deployCreate3AndInit(
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values,
-        address refundAddress
-    ) external payable returns (address newContract);
+    function deployCreate3AndInit(bytes memory initCode, bytes memory data, Values memory values, address refundAddress)
+        external
+        payable
+        returns (address newContract);
 
-    function deployCreate3AndInit(
-        bytes memory initCode,
-        bytes memory data,
-        Values memory values
-    ) external payable returns (address newContract);
+    function deployCreate3AndInit(bytes memory initCode, bytes memory data, Values memory values)
+        external
+        payable
+        returns (address newContract);
 
-    function computeCreate3Address(
-        bytes32 salt,
-        address deployer
-    ) external pure returns (address computedAddress);
+    function computeCreate3Address(bytes32 salt, address deployer) external pure returns (address computedAddress);
+
+    function computeCreate3Address(bytes32 salt) external view returns (address computedAddress);
 
-    function computeCreate3Address(
-        bytes32 salt
-    ) external view returns (address computedAddress);
 }

package/src/periphery/SessionVerifier.sol

@@ -23,9 +23,8 @@ struct Session {
 /// the sharer to one decrypter for a limited time.
 /// @dev define the selector of canUseSession in the voucher to use this verifier
 contract SessionVerifier is UUPSUpgradeable, OwnableUpgradeable, Version {
-    constructor(
-        bytes32 salt
-    )
+
+    constructor(bytes32 salt)
         Version(
             SESSION_VERIFIER_MAJOR_VERSION,
             SESSION_VERIFIER_MINOR_VERSION,
@@ -37,15 +36,13 @@ contract SessionVerifier is UUPSUpgradeable, OwnableUpgradeable, Version {
 
     // todo add text mention of what is being signed
     function canUseSession(
-        bytes32 /* handle */,
+        bytes32, /* handle */
         address account,
         bytes memory sharerArgData,
         bytes memory /* requesterArgData */
     ) external view returns (bytes32) {
         Session memory session = abi.decode(sharerArgData, (Session));
-        if (
-            session.expiresAt >= block.timestamp && session.decrypter == account
-        ) {
+        if (session.expiresAt >= block.timestamp && session.decrypter == account) {
             return ALLOWANCE_GRANTED_MAGIC_VALUE;
         }
         return bytes32(0);
@@ -60,4 +57,5 @@ contract SessionVerifier is UUPSUpgradeable, OwnableUpgradeable, Version {
     }
 
     fallback() external {} // must be included for createX deploy
+
 }

package/src/shared/IOwnable.sol

@@ -4,7 +4,10 @@ pragma solidity ^0.8.0;
 // OpenZeppelin doesn't export any interfaces for ownable so we define our own
 
 interface IOwnable {
+
     function owner() external view returns (address);
     function transferOwnership(address newOwner) external;
+
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+
 }

package/src/shared/IUUPSUpgradable.sol

@@ -4,7 +4,11 @@ pragma solidity ^0.8.0;
 // OpenZeppelin doesn't export any interfaces for uupsUpgradeable so we define our own
 
 interface IUUPSUpgradable {
+
+    // forge-lint: disable-next-line(mixed-case-function)
     function proxiableUUID() external view returns (bytes32);
+    // forge-lint: disable-next-line(mixed-case-function)
     function UPGRADE_INTERFACE_VERSION() external view returns (string memory);
     function upgradeToAndCall(address newImplementation, bytes memory data) external payable;
-}
+
+}

package/src/shared/JsonUtils.sol

@@ -4,13 +4,11 @@ pragma solidity ^0.8;
 import {Script} from "forge-std/Script.sol";
 
 contract JsonUtils is Script {
-    function writeAddressToJson(
-        address toWrite,
-        string memory addressName,
-        string memory destFile
-    ) public {
+
+    function writeAddressToJson(address toWrite, string memory addressName, string memory destFile) public {
         string memory jsonObj = "";
         jsonObj = vm.serializeAddress(jsonObj, addressName, toWrite);
         vm.writeJson(jsonObj, destFile);
     }
+
 }

package/src/shared/TestUtils.sol

@@ -4,6 +4,10 @@ pragma solidity ^0.8;
 import {Test} from "forge-std/Test.sol";
 
 contract TestUtils is Test {
+
+    address private constant ANVIL_ZEROTH_ADDRESS = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266;
+    uint256 private constant ANVIL_ZEROTH_PRIV_KEY = 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80;
+
     uint256 internal alicePrivKey;
     address internal immutable alice;
     uint256 internal bobPrivKey;
@@ -15,36 +19,33 @@ contract TestUtils is Test {
     uint256 internal evePrivKey;
     address internal immutable eve;
 
+    // it is convenient for e2e tests to use these well-known addresses for the TEE
+    address internal constant teeEOA = ANVIL_ZEROTH_ADDRESS;
+    uint256 internal constant teePrivKey = ANVIL_ZEROTH_PRIV_KEY;
+
     constructor() {
         (alicePrivKey, alice) = getLabeledKeyPair("alice");
         (bobPrivKey, bob) = getLabeledKeyPair("bob");
         (carolPrivKey, carol) = getLabeledKeyPair("carol");
         (davePrivKey, dave) = getLabeledKeyPair("dave");
         (evePrivKey, eve) = getLabeledKeyPair("eve");
+        vm.label(teeEOA, "tee");
     }
 
-    function getLabeledAddress(
-        string memory input
-    ) internal returns (address hashGenerated) {
-        hashGenerated = address(
-            uint160(uint256(keccak256(abi.encodePacked(input))))
-        );
+    function getLabeledAddress(string memory input) internal returns (address hashGenerated) {
+        hashGenerated = address(uint160(uint256(keccak256(abi.encodePacked(input)))));
         vm.label(hashGenerated, input);
     }
 
-    function getLabeledKeyPair(
-        string memory input
-    ) internal returns (uint256 privKey, address accountAddress) {
+    function getLabeledKeyPair(string memory input) internal returns (uint256 privKey, address accountAddress) {
         privKey = uint256(keccak256(abi.encodePacked(input)));
         accountAddress = vm.addr(privKey);
         vm.label(accountAddress, input);
     }
 
-    function getSignatureForDigest(
-        bytes32 digest,
-        uint256 privKey
-    ) internal pure returns (bytes memory signature) {
+    function getSignatureForDigest(bytes32 digest, uint256 privKey) internal pure returns (bytes memory signature) {
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(privKey, digest);
         signature = bytes.concat(r, s, bytes1(v));
     }
+
 }

package/src/test/AddTwo.sol

@@ -8,6 +8,7 @@ import {Fee} from "../lightning-parts/Fee.sol";
 // To implement such a contract, we would normally import e form Lib.sol. For test purposes, we take inco as
 // a constructor argument instead, so we can test it from other deployment addresses.
 contract AddTwo is Fee {
+
     IncoLightning inco;
 
     constructor(IncoLightning _inco) {
@@ -28,13 +29,13 @@ contract AddTwo is Fee {
         return inco.eAdd(a, inco.eAdd(one, one));
     }
 
-    function addTwoEOA(
-        bytes memory uint256EInput
-    ) external payable refundUnspent returns (euint256 result, euint256 resultRevealed) {
-        euint256 value = inco.newEuint256{value: getFee()}(
-            uint256EInput,
-            msg.sender
-        );
+    function addTwoEoa(bytes memory uint256EInput)
+        external
+        payable
+        refundUnspent
+        returns (euint256 result, euint256 resultRevealed)
+    {
+        euint256 value = inco.newEuint256{value: getFee()}(uint256EInput, msg.sender);
         result = addTwo(value);
 
         inco.allow(euint256.unwrap(result), address(this));
@@ -55,4 +56,5 @@ contract AddTwo is Fee {
     receive() external payable {
         // Accept ETH payments
     }
+
 }

package/src/test/FakeIncoInfra/FakeComputeServer.sol

@@ -5,11 +5,8 @@ import {EOps, ETypes} from "../../Types.sol";
 import {asBytes32} from "../../shared/TypeUtils.sol";
 
 contract FakeComputeServer {
-    function computeBinaryUintOp(
-        uint256 lhs,
-        uint256 rhs,
-        EOps op
-    ) internal pure returns (uint256) {
+
+    function computeBinaryUintOp(uint256 lhs, uint256 rhs, EOps op) internal pure returns (uint256) {
         if (op == EOps.Add) {
             return lhs + rhs;
         } else if (op == EOps.Sub) {
@@ -43,11 +40,7 @@ contract FakeComputeServer {
         }
     }
 
-    function computeBinaryUintToBoolOp(
-        uint256 lhs,
-        uint256 rhs,
-        EOps op
-    ) internal pure returns (bool) {
+    function computeBinaryUintToBoolOp(uint256 lhs, uint256 rhs, EOps op) internal pure returns (bool) {
         if (op == EOps.Eq) {
             return lhs == rhs;
         } else if (op == EOps.Ne) {
@@ -66,31 +59,13 @@ contract FakeComputeServer {
     }
 
     function isBinaryUintToUintOp(EOps op) internal pure returns (bool) {
-        return
-            op == EOps.Add ||
-            op == EOps.Sub ||
-            op == EOps.Mul ||
-            op == EOps.Div ||
-            op == EOps.Rem ||
-            op == EOps.Min ||
-            op == EOps.Max ||
-            op == EOps.BitAnd ||
-            op == EOps.BitOr ||
-            op == EOps.BitXor ||
-            op == EOps.Shl ||
-            op == EOps.Shr ||
-            op == EOps.Rotl ||
-            op == EOps.Rotr;
+        return op == EOps.Add || op == EOps.Sub || op == EOps.Mul || op == EOps.Div || op == EOps.Rem || op == EOps.Min
+            || op == EOps.Max || op == EOps.BitAnd || op == EOps.BitOr || op == EOps.BitXor || op == EOps.Shl
+            || op == EOps.Shr || op == EOps.Rotl || op == EOps.Rotr;
     }
 
     function isBinaryUintToBoolOp(EOps op) internal pure returns (bool) {
-        return
-            op == EOps.Eq ||
-            op == EOps.Ne ||
-            op == EOps.Ge ||
-            op == EOps.Gt ||
-            op == EOps.Le ||
-            op == EOps.Lt;
+        return op == EOps.Eq || op == EOps.Ne || op == EOps.Ge || op == EOps.Gt || op == EOps.Le || op == EOps.Lt;
     }
 
     function opToResultType(EOps op) internal pure returns (ETypes) {
@@ -107,31 +82,14 @@ contract FakeComputeServer {
         return isBinaryUintToUintOp(op) || isBinaryUintToBoolOp(op);
     }
 
-    function computeBinaryOp(
-        bytes32 encodedLhs,
-        bytes32 encodedRhs,
-        EOps op
-    ) internal pure returns (bytes32) {
+    function computeBinaryOp(bytes32 encodedLhs, bytes32 encodedRhs, EOps op) internal pure returns (bytes32) {
         if (isBinaryUintToUintOp(op)) {
-            return
-                bytes32(
-                    computeBinaryUintOp(
-                        uint256(encodedLhs),
-                        uint256(encodedRhs),
-                        op
-                    )
-                );
+            return bytes32(computeBinaryUintOp(uint256(encodedLhs), uint256(encodedRhs), op));
         } else if (isBinaryUintToBoolOp(op)) {
-            return
-                asBytes32(
-                    computeBinaryUintToBoolOp(
-                        uint256(encodedLhs),
-                        uint256(encodedRhs),
-                        op
-                    )
-                );
+            return asBytes32(computeBinaryUintToBoolOp(uint256(encodedLhs), uint256(encodedRhs), op));
         } else {
             revert("computeBinaryOp Invalid binary op");
         }
     }
+
 }