Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: clean onchain boilerplates #14

Merged
merged 12 commits into from
Jul 18, 2023
Merged

feat: clean onchain boilerplates #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3b363c1
feat: clean leading zeros on zk proofs, removed vaultId checking and
yum0e Jul 17, 2023
cd0efa3
feat: add contract object instead of wagmi hooks
yum0e Jul 17, 2023
ad9870e
feat: extract contract interaction logic to page.tsx instead of
yum0e Jul 17, 2023
58778a5
feat: remove already claimed error and claimed mapping
yum0e Jul 17, 2023
64184b6
feat: add tests
yum0e Jul 17, 2023
6253f86
feat: remove switch network competition, hide claim button with errors,
yum0e Jul 17, 2023
66d0351
feat: requests source of truth comes from the smart contract instead of
yum0e Jul 18, 2023
ac30692
feat: add new Sismo Solidity library + remove config reader
yum0e Jul 18, 2023
eadc246
feat: simplify reading sismoConnectRequest from contract
yum0e Jul 18, 2023
44f6704
feat: remove config into json logic + add impersonation in page.tsx +
yum0e Jul 18, 2023
fb7f84f
feat: clean wording in frontend to make button behavior more evident
yum0e Jul 18, 2023
b0efc58
feat: simplify storage setup by having null as default
yum0e Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
[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
232 changes: 92 additions & 140 deletions abi/Airdrop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,116 +11,11 @@
"internalType": "string",
"name": "symbol",
"type": "string"
},
{
"internalType": "bytes16",
"name": "appId",
"type": "bytes16"
},
{
"internalType": "bool",
"name": "isImpersonationMode",
"type": "bool"
},
{
"components": [
{
"internalType": "enum AuthType",
"name": "authType",
"type": "uint8"
},
{
"internalType": "uint256",
"name": "userId",
"type": "uint256"
},
{
"internalType": "bool",
"name": "isAnon",
"type": "bool"
},
{
"internalType": "bool",
"name": "isOptional",
"type": "bool"
},
{
"internalType": "bool",
"name": "isSelectableByUser",
"type": "bool"
},
{
"internalType": "bytes",
"name": "extraData",
"type": "bytes"
}
],
"internalType": "struct AuthRequest[]",
"name": "authRequests",
"type": "tuple[]"
},
{
"components": [
{
"internalType": "enum ClaimType",
"name": "claimType",
"type": "uint8"
},
{
"internalType": "bytes16",
"name": "groupId",
"type": "bytes16"
},
{
"internalType": "bytes16",
"name": "groupTimestamp",
"type": "bytes16"
},
{
"internalType": "uint256",
"name": "value",
"type": "uint256"
},
{
"internalType": "bool",
"name": "isOptional",
"type": "bool"
},
{
"internalType": "bool",
"name": "isSelectableByUser",
"type": "bool"
},
{
"internalType": "bytes",
"name": "extraData",
"type": "bytes"
}
],
"internalType": "struct ClaimRequest[]",
"name": "claimRequests",
"type": "tuple[]"
}
],
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"inputs": [],
"name": "AlreadyClaimed",
"type": "error"
},
{
"inputs": [
{
"internalType": "enum AuthType",
"name": "authType",
"type": "uint8"
}
],
"name": "AuthTypeNotFoundInVerifiedResult",
"type": "error"
},
{
"anonymous": false,
"inputs": [
Expand Down Expand Up @@ -399,32 +294,18 @@
"internalType": "bytes",
"name": "response",
"type": "bytes"
},
{
"internalType": "address",
"name": "to",
"type": "address"
}
],
"name": "claimWithSismo",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "claimed",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "config",
Expand Down Expand Up @@ -496,7 +377,7 @@
},
{
"inputs": [],
"name": "getVerifiedAuths",
"name": "getSismoConnectRequest",
"outputs": [
{
"components": [
Expand All @@ -505,28 +386,75 @@
"name": "authType",
"type": "uint8"
},
{
"internalType": "uint256",
"name": "userId",
"type": "uint256"
},
{
"internalType": "bool",
"name": "isAnon",
"type": "bool"
},
{
"internalType": "uint256",
"name": "userId",
"type": "uint256"
"internalType": "bool",
"name": "isOptional",
"type": "bool"
},
{
"internalType": "bool",
"name": "isSelectableByUser",
"type": "bool"
},
{
"internalType": "bytes",
"name": "extraData",
"type": "bytes"
}
],
"internalType": "struct AuthRequest[]",
"name": "",
"type": "tuple[]"
},
{
"components": [
{
"internalType": "enum ClaimType",
"name": "claimType",
"type": "uint8"
},
{
"internalType": "bytes16",
"name": "groupId",
"type": "bytes16"
},
{
"internalType": "bytes16",
"name": "groupTimestamp",
"type": "bytes16"
},
{
"internalType": "uint256",
"name": "value",
"type": "uint256"
},
{
"internalType": "bool",
"name": "isOptional",
"type": "bool"
},
{
"internalType": "bool",
"name": "isSelectableByUser",
"type": "bool"
},
{
"internalType": "bytes",
"name": "proofData",
"name": "extraData",
"type": "bytes"
}
],
"internalType": "struct VerifiedAuth[]",
"internalType": "struct ClaimRequest[]",
"name": "",
"type": "tuple[]"
}
Expand All @@ -536,8 +464,40 @@
},
{
"inputs": [],
"name": "getVerifiedClaims",
"name": "getSismoConnectVerifiedResult",
"outputs": [
{
"components": [
{
"internalType": "enum AuthType",
"name": "authType",
"type": "uint8"
},
{
"internalType": "bool",
"name": "isAnon",
"type": "bool"
},
{
"internalType": "uint256",
"name": "userId",
"type": "uint256"
},
{
"internalType": "bytes",
"name": "extraData",
"type": "bytes"
},
{
"internalType": "bytes",
"name": "proofData",
"type": "bytes"
}
],
"internalType": "struct VerifiedAuth[]",
"name": "",
"type": "tuple[]"
},
{
"components": [
{
Expand Down Expand Up @@ -579,15 +539,7 @@
"internalType": "struct VerifiedClaim[]",
"name": "",
"type": "tuple[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getVerifiedSignedMessage",
"outputs": [
},
{
"internalType": "bytes",
"name": "",
Expand Down
3 changes: 1 addition & 2 deletions front/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "NODE_OPTIONS='--max-http-header-size=24576' next dev -p 3000 & nodemon --watch ./src/app/sismo-connect-config.ts --watch ../src/Airdrop.sol --exec 'npm run config-to-json && npm run deploy-airdrop && sleep 3 && ./script/log.sh'",
"dev": "NODE_OPTIONS='--max-http-header-size=24576' next dev -p 3000 & nodemon --watch ../src/Airdrop.sol --exec 'npm run deploy-airdrop && sleep 3 && ./script/log.sh'",
"build": "next build",
"start": "NODE_OPTIONS='--max-http-header-size=24576' next start",
"lint": "next lint",
"config-to-json": "npx tsx ./script/sismo-config-to-json.ts > ../sismo-connect-config.json",
"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 && ./script/generate-abi-from-front.sh"
},
"browser": {
Expand Down
19 changes: 0 additions & 19 deletions front/script/sismo-config-to-json.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion front/src/app/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Header: React.FC = () => {
the frontend <br />
3. The frontend forwards the response to ERC20 smart contract via claimWithSismo function{" "}
<br />
4. The smart contract the proofs contained in the response, mints ERC20 tokens and stores
4. The smart contract verifies the proofs contained in the response, mints ERC20 tokens and stores
verified claims and auths <br />
5. The frontend reads the verified claims and auths from the contract and displays them
</p>
Expand Down
Loading