Skip to content

Commit

Permalink
supported new grammar and unify env creation
Browse files Browse the repository at this point in the history
  • Loading branch information
@chyanju
chyanju committed Mar 5, 2024
1 parent 445d745 commit 82d063a
Show file tree
Hide file tree
Showing 17 changed files with 479 additions and 73 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ from .vanguard.aleo.detectors import detector_divz
project_name = "divz0"
function_name = "ex1"
build_path = f"./tests/public/{project_name}/build/"
env = AleoEnvironment(build_path) # load project
env = AleoEnvironment.from_project(build_path) # load project
detector_divz(env, env.main.id, function_name, readable=True) # detect
```

Expand All @@ -140,7 +140,7 @@ from vanguard.aleo.detectors import detector_divz
project_name = "divz0"
function_name = "ex1"
build_path = f"./tests/public/{project_name}/build/"
env = AleoEnvironment(build_path) # load project
env = AleoEnvironment.from_project(build_path) # load project
detector_divz(env, env.main.id, function_name, readable=True) # detect
```

Expand Down
167 changes: 167 additions & 0 deletions tests/environment-test.ipynb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 1,
"id": "0c1a1d20-18ec-451f-a739-eddb4c4265cf",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"# parsing: treasure_hunt_v006.aleo ... 0.36554503440856934s\n",
"# parsing: aleo_monopoly_workshop.aleo ... 0.1255810260772705s\n",
"# parsing: treasure_hunt_v010.aleo ... 0.24871206283569336s\n",
"# parsing: zk_sra_encryption_v0_0_2.aleo ... 0.16360116004943848s\n",
"# parsing: aleo_monopoly_workshop4.aleo ... 0.1220407485961914s\n",
"# parsing: football_game_v008.aleo ... 0.5778369903564453s\n",
"# parsing: uniswap_v5.aleo ... 0.22901225090026855s\n",
"# parsing: wheres_alex_v018.aleo ... 0.12906479835510254s\n",
"# parsing: aleo_name_service_registry_v2.aleo ... 0.2705061435699463s\n",
"# parsing: aleo_monopoly_game4.aleo ... 0.10615396499633789s\n",
"# parsing: arcane_rfq_amm_v000004.aleo ... 0.15807294845581055s\n",
"# parsing: aleo_monopoly_workshop8.aleo ... 0.17359280586242676s\n",
"# parsing: aleo_monopoly_workshop10.aleo ... 0.16000795364379883s\n",
"# parsing: football_game_v004.aleo ... 0.47535204887390137s\n",
"# parsing: who_is_dash_pash_v20203.aleo ... 0.12885785102844238s\n",
"# parsing: wheres_alex_v014.aleo ... 0.14920496940612793s\n",
"# parsing: football_game_v012.aleo ... 0.467663049697876s\n",
"# parsing: tyron_app_test1.aleo ... 0.12160015106201172s\n",
"# parsing: distrofund_private_transfer_v2.aleo ... 0.2230231761932373s\n",
"# parsing: wheres_alex_v015.aleo ... 0.12886977195739746s\n",
"# parsing: football_game_v005.aleo ... 0.5462970733642578s\n",
"# parsing: zk_deck_shuffle_v0_0_1.aleo ... 3.310209035873413s\n",
"# parsing: aleo_monopoly_workshop9.aleo ... 0.4012451171875s\n",
"# parsing: arcane_rfq_amm_v000005.aleo ... 0.14769268035888672s\n",
"# parsing: aleo_name_service_registry_v3.aleo ... 0.24764513969421387s\n",
"# parsing: wheres_the_babycat.aleo ... 0.12900996208190918s\n",
"# parsing: wheres_alex_v019.aleo ... 0.15206503868103027s\n",
"# parsing: football_game_v009.aleo ... 0.5451600551605225s\n",
"# parsing: aleo_monopoly_workshop5.aleo ... 0.1286182403564453s\n",
"# parsing: credits.aleo ... 0.07400774955749512s\n",
"# parsing: treasure_hunt_v007.aleo ... 0.3282780647277832s\n",
"# parsing: council_v0001.aleo ... 0.10122108459472656s\n",
"# parsing: arcane_rfq_amm_v000002.aleo ... 0.24701595306396484s\n",
"# parsing: aleoswap05.aleo ... 0.324937105178833s\n",
"# parsing: aleo_game_shop.aleo ... 0.14039397239685059s\n",
"# parsing: football_game_v002.aleo ... 0.32152605056762695s\n",
"# parsing: wheres_alex_v012.aleo ... 0.1226961612701416s\n",
"# parsing: aleo_store_nft.aleo ... 0.16280078887939453s\n",
"# parsing: whos_the_father_v002.aleo ... 0.15648913383483887s\n",
"# parsing: graph_coloring_v1.aleo ... 0.9867310523986816s\n",
"# parsing: whoes_the_dragon_v01.aleo ... 0.20185399055480957s\n",
"# parsing: aleo_monopoly_workshop2.aleo ... 0.11683821678161621s\n",
"# parsing: zk_bitwise_stack_v0_0_1.aleo ... 0.4006638526916504s\n",
"# parsing: distrofund_private_transfer.aleo ... 0.2171032428741455s\n",
"# parsing: wheres_luna_v020.aleo ... 0.1642930507659912s\n",
"# parsing: aleo_monopoly_workshop3.aleo ... 0.12447500228881836s\n",
"# parsing: king_of_cat_v001.aleo ... 0.12898683547973633s\n",
"# parsing: treasure_hunt_v001.aleo ... 0.2535240650177002s\n",
"# parsing: whos_the_father_v003.aleo ... 0.12888002395629883s\n",
"# parsing: graph_coloring.aleo ... 1.1264252662658691s\n",
"# parsing: wheres_alex_v013.aleo ... 0.12445330619812012s\n",
"# parsing: aleo_monopoly_game16.aleo ... 0.1283130645751953s\n",
"# parsing: arcane_rfq_amm_v000003.aleo ... 0.14718389511108398s\n",
"# parsing: zk_ml_dna_v0.aleo ... 0.15928435325622559s\n",
"# parsing: double_color_ball.aleo ... 2.7822608947753906s\n",
"# parsing: wheres_alex_v010.aleo ... 0.11071991920471191s\n",
"# parsing: lymphography_decision_tree_v1.aleo ... 0.17121195793151855s\n",
"# parsing: arcane_amm_v2_0.aleo ... 0.2006239891052246s\n",
"# parsing: zk_bitwise_stack_v0_0_3.aleo ... 0.7765522003173828s\n",
"# parsing: imma_find_alex_v01.aleo ... 0.13179302215576172s\n",
"# parsing: sklearn_mlp_mnist_1.aleo ... 0.12671494483947754s\n",
"# parsing: treasure_hunt_v002.aleo ... 0.257781982421875s\n",
"# parsing: wheres_luna_v019.aleo ... 0.12881684303283691s\n",
"# parsing: whos_the_father_v001.aleo ... 0.12896108627319336s\n",
"# parsing: treasure_hunt_v003.aleo ... 0.29941868782043457s\n",
"# parsing: zk_bitwise_stack_v0_0_2.aleo ... 0.3985929489135742s\n",
"# parsing: wheres_jojo_v008.aleo ... 0.12965607643127441s\n",
"# parsing: arcane_rfq_amm_v000001.aleo ... 0.16470789909362793s\n",
"# parsing: zk_ml_dna_1700237585_v0.aleo ... 0.15587306022644043s\n",
"# parsing: aleoswap06.aleo ... 0.3032219409942627s\n",
"# parsing: nft_store_yong.aleo ... 0.16216278076171875s\n",
"# parsing: wheres_alex_v011.aleo ... 0.10870790481567383s\n",
"# parsing: football_random_v011.aleo ... 0.4026451110839844s\n",
"# parsing: testalphav1x1.aleo ... 0.4599008560180664s\n",
"# parsing: zk_bitwise_stack_v0_0_5.aleo ... 0.9710831642150879s\n",
"# parsing: hialstestv1.aleo ... 0.3415040969848633s\n",
"# parsing: what_does_gary_do_v001.aleo ... 0.1300978660583496s\n",
"# parsing: aleo_monopoly_workshop6.aleo ... 0.150360107421875s\n",
"# parsing: treasure_hunt_v004.aleo ... 0.2849142551422119s\n",
"# parsing: zk_ml_dna_1700246715_v0.aleo ... 0.15957093238830566s\n",
"# parsing: football_game_v010.aleo ... 0.5442087650299072s\n",
"# parsing: wheres_alex_v016.aleo ... 0.12591171264648438s\n",
"# parsing: football_game_v006.aleo ... 0.5015170574188232s\n",
"# parsing: arcane_rfq_amm_v000006.aleo ... 0.17210102081298828s\n",
"# parsing: treasure_hunt_v008.aleo ... 0.2880980968475342s\n",
"# parsing: aleo_name_service_registry_v1.aleo ... 0.2518031597137451s\n",
"# parsing: treasure_hunt_v009.aleo ... 0.3172299861907959s\n",
"# parsing: lymphography_xgboost_v1.aleo ... 0.3400380611419678s\n",
"# parsing: football_game_v007.aleo ... 0.5114998817443848s\n",
"# parsing: wheres_alex_v017.aleo ... 0.12790989875793457s\n",
"# parsing: wheres_alex_probably_weeds.aleo ... 0.1284809112548828s\n",
"# parsing: treasure_hunt_v005.aleo ... 0.3078649044036865s\n",
"# parsing: zk_sra_encryption_v0_0_1.aleo ... 0.0902097225189209s\n",
"# parsing: twoalkilining.aleo ... 0.1731257438659668s\n",
"# parsing: zkhack_mnist_v2.aleo ... 0.1536550521850586s\n",
"# parsing: wheres_joe_v019.aleo ... 0.13042306900024414s\n",
"# parsing: wheres_alex_by_joey11_v1.aleo ... 0.12970590591430664s\n",
"# parsing: aleo_monopoly_workshop7.aleo ... 0.12551403045654297s\n",
"# parsing: zk_bitwise_stack_v0_0_4.aleo ... 0.7628638744354248s\n",
"# parsing: alphaswap_v1.aleo ... 0.5072779655456543s\n"
]
}
],
"source": [
"import os\n",
"import time\n",
"os.chdir(\"..\")\n",
"\n",
"from vanguard.aleo.grammar import AleoEnvironment\n",
"\n",
"# for dp, _, fns in os.walk(\"tests/explorer/haruka/\"):\n",
"for dp, _, fns in os.walk(\"tests/explorer/aleo/\"):\n",
" for fn in fns:\n",
" p = os.path.abspath(os.path.join(dp, fn))\n",
" # print(f\"# parsing: {p} ... \", end=\"\")\n",
" print(f\"# parsing: {fn} ... \", end=\"\")\n",
" s = time.time()\n",
"\n",
" _env = AleoEnvironment.from_program(p)\n",
" \n",
" e = time.time()\n",
" print(f\"{e-s}s\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "c75a2be4-e814-40fc-a128-8d879df646b5",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.0"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
2 changes: 1 addition & 1 deletion tests/parser-test.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"lexer = AleoLexer(input_stream)\n",
"stream = CommonTokenStream(lexer)\n",
"parser = AleoParser(stream)\n",
"tree = parser.start()\n"
"tree = parser.start()"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion tests/public/divz0/src/main.leo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ program divz0.aleo {

// compilable, runnable
// label: bad
const label_ex7: bool = false;
const label_ex7: bool = true;
transition ex7() -> u8 {
let a: u8 = 225u8;
let b: u8 = 0u8;
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/parsing.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
if __name__ == "__main__":
project_name = "divz0"
build_path = f"./tests/public/{project_name}/build/"
env = AleoEnvironment(build_path)
env = AleoEnvironment.from_project(build_path)
main = env.main
print("# Done.")
2 changes: 1 addition & 1 deletion tests/scripts/test-divz.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
if __name__ == "__main__":
project_name = "divz0"
build_path = f"./tests/public/{project_name}/build/"
env = AleoEnvironment(build_path)
env = AleoEnvironment.from_project(build_path)
main = env.main
fid = "ex0"
res, info = detector_divz(env, main.id, fid)
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/test-infoleak.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
if __name__ == "__main__":
project_name = "infoleak0"
build_path = f"./tests/public/{project_name}/build/"
env = AleoEnvironment(build_path)
env = AleoEnvironment.from_project(build_path)
main = env.main

fid = "ex0"
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/test-rtcnst.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
if __name__ == "__main__":
project_name = "rtcnst0"
build_path = f"./tests/public/{project_name}/build/"
env = AleoEnvironment(build_path)
env = AleoEnvironment.from_project(build_path)
main = env.main
fid = "ex0"
res, info = detector_rtcnst(env, main.id, fid)
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/test-unused.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
if __name__ == "__main__":
project_name = "unused0"
build_path = f"./tests/public/{project_name}/build/"
env = AleoEnvironment(build_path)
env = AleoEnvironment.from_project(build_path)
main = env.main

fid = "ex0"
Expand Down
81 changes: 39 additions & 42 deletions tests/test4.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 2,
"id": "b34815c6-9610-4ef1-a7d2-4ee62cd30ae7",
"metadata": {},
"outputs": [],
Expand All @@ -40,18 +40,17 @@
"name": "stdout",
"output_type": "stream",
"text": [
"# [debug] deploy: main.aleo\n",
"# [debug] deploy: helpers.aleo\n"
"# [debug] deploy: main.aleo\n"
]
}
],
"source": [
"project_name = \"divz0\"\n",
"# project_name = \"infoleak0\"\n",
"# project_name = \"divz0\"\n",
"project_name = \"infoleak0\"\n",
"# project_name = \"unused0\"\n",
"# project_name = \"rtcnst0\"\n",
"build_path = f\"./tests/public/{project_name}/build/\"\n",
"env = AleoEnvironment(build_path)\n",
"env = AleoEnvironment.from_project(build_path)\n",
"main = env.main"
]
},
Expand All @@ -73,7 +72,7 @@
}
],
"source": [
"fid = \"ex1\"\n",
"fid = \"ex5\"\n",
"detector_infoleak(env, main.id, fid, readable=True)"
]
},
Expand All @@ -87,7 +86,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 3,
"id": "a983f9b5-286c-4748-b2c7-b450ff0d7948",
"metadata": {},
"outputs": [
Expand All @@ -96,50 +95,48 @@
"output_type": "stream",
"text": [
"# [debug] deploy: main.aleo\n",
"# [debug] deploy: helpers.aleo\n",
"# [✓][test] pid: divz0.aleo, fid: ex0, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex1, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex2, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex3, expected: True, actual: True\n",
"# [✗][test] pid: divz0.aleo, fid: ex4, expected: False, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex5, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex6, expected: True, actual: True\n",
"# [✗][test] pid: divz0.aleo, fid: ex7, expected: False, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex8, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex9, expected: False, actual: False\n",
"# [✓][test] pid: divz0.aleo, fid: ex10, expected: False, actual: False\n",
"# [✓][test] pid: divz0.aleo, fid: ex11, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex12, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex13, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex14, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex15, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex16, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex17, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex18, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex19, expected: True, actual: True\n",
"# [✗][test] pid: divz0.aleo, fid: ex20, expected: True, actual: False\n",
"# [✓][test] pid: divz0.aleo, fid: ex21, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex22, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex23, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex24, expected: True, actual: True\n",
"# [✓][test] pid: divz0.aleo, fid: ex25, expected: True, actual: True\n",
"# [test] accuracy: 23/26 (0.8846)\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex0, expected: True, actual: True\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex1, expected: False, actual: False\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex2, expected: True, actual: True\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex3, expected: True, actual: True\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex4, expected: True, actual: True\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex5, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex6, expected: True, actual: False\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex7, expected: False, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex8, expected: True, actual: False\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex9, expected: True, actual: True\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex10, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex11, expected: False, actual: True\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex12, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex13, expected: True, actual: False\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex14, expected: True, actual: True\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex15, expected: True, actual: True\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex16, expected: True, actual: True\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex17, expected: True, actual: False\n",
"# [✓][test] pid: infoleak0.aleo, fid: ex18, expected: True, actual: True\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex19, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex20, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex21, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex22, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex23, expected: True, actual: False\n",
"# [✗][test] pid: infoleak0.aleo, fid: ex24, expected: True, actual: False\n",
"# [test] accuracy: 11/25 (0.4400)\n",
"# [test] confusion matrix:\n",
" actual False True \n",
"expected \n",
"False 2 2\n",
"True 1 21\n",
"False 2 1\n",
"True 13 9\n",
"# [test] normalized confusion matrix:\n",
" actual False True \n",
"expected \n",
"False 0.500000 0.500000\n",
"True 0.045455 0.954545\n"
"False 0.666667 0.333333\n",
"True 0.590909 0.409091\n"
]
}
],
"source": [
"r = run_test_suite(\"./tests/public/divz0/build/\", detector_divz, verbose=True)\n",
"# r = run_test_suite(\"./tests/public/infoleak0/build/\", detector_infoleak, verbose=True)\n",
"# r = run_test_suite(\"./tests/public/divz0/build/\", detector_divz, verbose=True)\n",
"r = run_test_suite(\"./tests/public/infoleak0/build/\", detector_infoleak, verbose=True)\n",
"# r = run_test_suite(\"./tests/public/rtcnst0/build/\", detector_rtcnst, verbose=True)\n",
"# r = run_test_suite(\"./tests/public/unused0/build/\", detector_unused, verbose=True)"
]
Expand Down
2 changes: 1 addition & 1 deletion vanguard/aleo/common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def detect(build_path: Union[str, Path], pid: str=None, fids: List=None, detecto
from .grammar import AleoEnvironment
from . import detectors as dlib

env = AleoEnvironment(build_path)
env = AleoEnvironment.from_project(build_path)
_detector = getattr(dlib, "detector_infoleak") if detector is None else getattr(dlib, f"detector_{detector}")

prog = env.main if pid is None else env.programs[pid]
Expand Down
Loading

0 comments on commit 82d063a

Please sign in to comment.