feat: use new solidity library and fix impersonation with leo accounts (

#3)
sismo-core · Jul 19, 2023 · 7825ba6 · 7825ba6
1 parent 650979e
commit 7825ba6
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 178 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/sismo-connect-packages"]
-	path = lib/sismo-connect-packages
-	url = https://github.com/sismo-core/sismo-connect-packages
+[submodule "lib/sismo-connect-solidity"]
+	path = lib/sismo-connect-solidity
+	url = https://github.com/sismo-core/sismo-connect-solidity
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ forge install
 ```bash
 # in another terminal
 # starts a local fork of Mumbai
-yarn anvil
+yarn chain
 ```
 
 ### Launch the local application

diff --git a/abi/Airdrop.json b/abi/Airdrop.json
@@ -201,170 +201,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "isSelectableByUser",
-        "type": "bool"
-      }
-    ],
-    "name": "buildSignature",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bytes",
-            "name": "message",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bool",
-            "name": "isSelectableByUser",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "extraData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct SignatureRequest",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "message",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes",
-        "name": "extraData",
-        "type": "bytes"
-      }
-    ],
-    "name": "buildSignature",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bytes",
-            "name": "message",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bool",
-            "name": "isSelectableByUser",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "extraData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct SignatureRequest",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "isSelectableByUser",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "extraData",
-        "type": "bytes"
-      }
-    ],
-    "name": "buildSignature",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bytes",
-            "name": "message",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bool",
-            "name": "isSelectableByUser",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "extraData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct SignatureRequest",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "message",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bool",
-        "name": "isSelectableByUser",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "extraData",
-        "type": "bytes"
-      }
-    ],
-    "name": "buildSignature",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bytes",
-            "name": "message",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bool",
-            "name": "isSelectableByUser",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "extraData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct SignatureRequest",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {

diff --git a/front/src/app/page.tsx b/front/src/app/page.tsx
@@ -48,7 +48,7 @@ const sismoConnectConfig: SismoConnectConfig = {
     // For development purposes
     // insert any account that you want to impersonate  here
     // Never use this in production
-    impersonate: ["dhadrien.sismo.eth", "twitter:dhadrien_", "github:dhadrien"],
+    impersonate: ["leo21.sismo.eth", "twitter:leo21_eth", "github:leo21"],
   },
 };
 

diff --git a/lib/sismo-connect-packages b/lib/sismo-connect-packages
diff --git a/lib/sismo-connect-solidity b/lib/sismo-connect-solidity
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "anvil": "anvil --fork-url https://rpc.ankr.com/polygon_mumbai --chain-id 5151111",
+    "chain": "anvil --fork-url https://rpc.ankr.com/polygon_mumbai --chain-id 5151111",
     "deploy-local": "yarn deploy-airdrop && yarn generate-abi",
     "generate-abi": "front/script/generate-abi.sh",
     "deploy-airdrop": "forge script DeployAirdrop --rpc-url http://localhost:8545 -vv --mnemonics 'test test test test test test test test test test test junk' --sender '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266' --broadcast",

diff --git a/remappings.txt b/remappings.txt
@@ -1,3 +1,3 @@
 forge-std/=lib/forge-std/src/
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
-sismo-connect-solidity/=lib/sismo-connect-packages/packages/sismo-connect-solidity/src/
+sismo-connect-solidity/=lib/sismo-connect-solidity/src/
diff --git a/src/Airdrop.sol b/src/Airdrop.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.17;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "forge-std/console.sol";
-import "sismo-connect-solidity/SismoLib.sol"; // <--- add a Sismo Connect import
+import "sismo-connect-solidity/SismoConnectLib.sol"; // <--- add a Sismo Connect import
 
 /*
  * @title Airdrop
@@ -34,16 +34,16 @@ contract Airdrop is ERC20, SismoConnect {
     SismoConnectVerifiedResult memory result = verify({
       responseBytes: response,
       // we want the user to prove that he owns a Sismo Vault
-      // we are recreating the auth request made in the frontend to be sure that 
+      // we are recreating the auth request made in the frontend to be sure that
       // the proofs provided in the response are valid with respect to this auth request
       auth: buildAuth({authType: AuthType.VAULT}),
       // we also want to check if the signed message provided in the response is the signature of the user's address
-      signature:  buildSignature({message: abi.encode(msg.sender)})
+      signature: buildSignature({message: abi.encode(msg.sender)})
     });
 
     // if the proofs and signed message are valid, we take the userId from the verified result
-    // in this case the userId is the vaultId (since we used AuthType.VAULT in the auth request), 
-    // it is the anonymous identifier of a user's vault for a specific app 
+    // in this case the userId is the vaultId (since we used AuthType.VAULT in the auth request),
+    // it is the anonymous identifier of a user's vault for a specific app
     // --> vaultId = hash(userVaultSecret, appId)
     uint256 vaultId = result.getUserId(AuthType.VAULT);
 

diff --git a/tests/base/BaseTest.t.sol b/tests/base/BaseTest.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
 import "forge-std/console.sol";
-import {IAddressesProvider} from "sismo-connect-solidity/SismoLib.sol";
+import {IAddressesProvider} from "sismo-connect-solidity/SismoConnectLib.sol";
 
 interface IAvailableRootsRegistry {
   event RegisteredRoot(uint256 root);