Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Python Supercircuit #125

Merged
merged 43 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2d7027c
initial commit and mimc7 example
qwang98 Aug 29, 2023
545d651
all updates
qwang98 Aug 29, 2023
8ede657
put mimc7 constants to anothe file
qwang98 Aug 30, 2023
c784a55
merge main
qwang98 Sep 1, 2023
4e937b1
addressed leo's comments
qwang98 Sep 1, 2023
98eb019
updated wit_gen
qwang98 Sep 1, 2023
62c5fae
address leo's comments
qwang98 Sep 10, 2023
6428248
merge main
qwang98 Sep 10, 2023
965b465
dsl
qwang98 Sep 10, 2023
2a1905b
addressed all leo's comments
qwang98 Sep 10, 2023
02a3c24
fmt
qwang98 Sep 10, 2023
d5fdb8e
initial commit
qwang98 Sep 10, 2023
00aba02
ast
qwang98 Sep 10, 2023
a18e578
fixed gen
qwang98 Sep 10, 2023
9dd654a
dsl
qwang98 Sep 10, 2023
912b0f9
partially functional mimc7 example
qwang98 Sep 10, 2023
832923f
black fmt
qwang98 Sep 10, 2023
9a5093f
rust id instead of ast id
qwang98 Sep 10, 2023
38b0a5e
hooked up frontend and backend
qwang98 Sep 10, 2023
f027cde
some fmt
qwang98 Sep 10, 2023
c9f0622
more fmt
qwang98 Sep 10, 2023
3d178b3
minor
qwang98 Sep 10, 2023
c5334fb
fixed Fr issue due to montgomery form; now MiMC7 example fully functions
qwang98 Sep 14, 2023
2c6188c
fmt and upload pypi
qwang98 Sep 14, 2023
76ef232
fixed optional fixed assignments
qwang98 Sep 17, 2023
afe5177
deleted registry
qwang98 Sep 17, 2023
a768216
final fixed
qwang98 Sep 17, 2023
227476d
add flag to lookuptable
qwang98 Sep 17, 2023
5843774
added features for lookuptable
qwang98 Sep 17, 2023
e871c98
merged main
qwang98 Sep 17, 2023
8cdbf27
fix error
qwang98 Sep 17, 2023
f3f181e
fix more errors
qwang98 Sep 17, 2023
987029e
minor
qwang98 Sep 17, 2023
f4c0092
minor
qwang98 Sep 17, 2023
6999d45
final touch
qwang98 Sep 17, 2023
48978de
merge fixed gen branch
qwang98 Sep 18, 2023
bfde1cc
fixed args related errors
qwang98 Sep 18, 2023
06851e2
update pypi
qwang98 Sep 18, 2023
e891154
removed dict of uuid to lookup and modified lookupbuilder to store lo…
qwang98 Sep 19, 2023
9b3186b
pass over super witness rather than storing them
qwang98 Sep 19, 2023
c312a53
Merge branch 'main' into steve/python-supercircuit-v3
qwang98 Sep 19, 2023
3b8f938
update pypi
qwang98 Sep 19, 2023
4a94033
last comments fixed
qwang98 Sep 25, 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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "chiquito"
version = "0.1.2023070800"
version = "0.1.2023091900"
edition = "2021"
license = "MIT OR Apache-2.0"
authors = ["Leo Lara <[email protected]>"]
Expand Down
169 changes: 169 additions & 0 deletions examples/mimc7.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
from __future__ import annotations
from chiquito.dsl import SuperCircuit, Circuit, StepType
from chiquito.cb import eq, table
from chiquito.util import F

from mimc7_constants import ROUND_KEYS

ROUNDS = 91


# It's the best practice to wrap all values in F, even though the `assign` functions automatically wrap values in F.
class Mimc7Constants(Circuit):
def setup(self):
self.pragma_num_steps(ROUNDS)
self.lookup_row = self.fixed("constant row")
self.lookup_c = self.fixed("constant value")
self.lookup_table = self.new_table(
table().add(self.lookup_row).add(self.lookup_c)
)

def fixed_gen(self):
for i, round_key in enumerate(ROUND_KEYS):
self.assign(i, self.lookup_row, F(i))
self.assign(i, self.lookup_c, F(round_key))


class Mimc7Circuit(Circuit):
def setup(self):
self.x = self.forward("x")
self.k = self.forward("k")
self.c = self.forward("c")
self.row = self.forward("row")

self.mimc7_first_step = self.step_type(Mimc7FirstStep(self, "mimc7_first_step"))
self.mimc7_step = self.step_type(Mimc7Step(self, "mimc7_step"))
self.mimc7_last_step = self.step_type(Mimc7LastStep(self, "mimc7_last_step"))

self.pragma_first_step(self.mimc7_first_step)
self.pragma_last_step(self.mimc7_last_step)
self.pragma_num_steps(ROUNDS + 2 - 1)

def trace(self, x_in_value, k_value):
c_value = F(ROUND_KEYS[0])
x_value = F(x_in_value)
row_value = F(0)

self.add(self.mimc7_first_step, x_value, k_value, c_value, row_value)

for i in range(1, ROUNDS):
row_value += F(1)
x_value += F(k_value + c_value)
x_value = F(x_value**7)
c_value = F(ROUND_KEYS[i])

self.add(self.mimc7_step, x_value, k_value, c_value, row_value)

row_value += F(1)
x_value += F(k_value + c_value)
x_value = F(x_value**7)

self.add(self.mimc7_last_step, x_value, k_value, c_value, row_value)


class Mimc7FirstStep(StepType):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@qwang98 I think it is more clear to put the steps before the circuit

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

def setup(self):
self.xkc = self.internal("xkc")
self.y = self.internal("y")

self.constr(eq(self.circuit.x + self.circuit.k + self.circuit.c, self.xkc))
self.constr(
eq(
self.xkc
* self.xkc
* self.xkc
* self.xkc
* self.xkc
* self.xkc
* self.xkc,
self.y,
)
)

self.transition(eq(self.y, self.circuit.x.next()))
self.transition(eq(self.circuit.k, self.circuit.k.next()))
self.transition(eq(self.circuit.row, 0))
self.transition(eq(self.circuit.row + 1, self.circuit.row.next()))

self.add_lookup(
self.circuit.imports.apply(self.circuit.row).apply(self.circuit.c)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@qwang98 I think it makes sense to call it self.circuit.constants_table

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. I replaced the imports parameter for Circuit as **kwargs, so that the user can pass in arbitrarily named parameters for imports.

)

def wg(self, x_value, k_value, c_value, row_value):
self.assign(self.circuit.x, F(x_value))
self.assign(self.circuit.k, F(k_value))
self.assign(self.circuit.c, F(c_value))
self.assign(self.circuit.row, F(row_value))

xkc_value = F(x_value + k_value + c_value)
self.assign(self.xkc, F(xkc_value))
self.assign(self.y, F(xkc_value**7))


class Mimc7Step(StepType):
def setup(self):
self.xkc = self.internal("xkc")
self.y = self.internal("y")

self.constr(eq(self.circuit.x + self.circuit.k + self.circuit.c, self.xkc))
self.constr(
eq(
self.xkc
* self.xkc
* self.xkc
* self.xkc
* self.xkc
* self.xkc
* self.xkc,
self.y,
)
)

self.transition(eq(self.y, self.circuit.x.next()))
self.transition(eq(self.circuit.k, self.circuit.k.next()))
self.transition(eq(self.circuit.row + 1, self.circuit.row.next()))

self.add_lookup(
self.circuit.imports.apply(self.circuit.row).apply(self.circuit.c)
)

def wg(self, x_value, k_value, c_value, row_value):
self.assign(self.circuit.x, F(x_value))
self.assign(self.circuit.k, F(k_value))
self.assign(self.circuit.c, F(c_value))
self.assign(self.circuit.row, F(row_value))

xkc_value = F(x_value + k_value + c_value)
self.assign(self.xkc, F(xkc_value))
self.assign(self.y, F(xkc_value**7))


class Mimc7LastStep(StepType):
def setup(self):
self.out = self.internal("out")

self.constr(eq(self.circuit.x + self.circuit.k, self.out))

def wg(self, x_value, k_value, _, row_value):
self.assign(self.circuit.x, F(x_value))
self.assign(self.circuit.k, F(k_value))
self.assign(self.circuit.row, F(row_value))
self.assign(self.out, F(x_value + k_value))


class Mimc7SuperCircuit(SuperCircuit):
def setup(self):
self.mimc7_constants = self.sub_circuit(Mimc7Constants(self, imports=None))
self.mimc7_circuit = self.sub_circuit(
Mimc7Circuit(self, imports=self.mimc7_constants.lookup_table)
)

def mapping(self, x_in_value, k_value):
self.map(self.mimc7_circuit, x_in_value, k_value)


mimc7 = Mimc7SuperCircuit()
mimc7_super_witness = mimc7.gen_witness(F(1), F(2))
# for key, value in mimc7_super_witness.items():
# print(f"{key}: {str(value)}")
mimc7.halo2_mock_prover(mimc7_super_witness)
93 changes: 93 additions & 0 deletions examples/mimc7_constants.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
ROUND_KEYS = [
0,
20888961410941983456478427210666206549300505294776164667214940546594746570981,
15265126113435022738560151911929040668591755459209400716467504685752745317193,
8334177627492981984476504167502758309043212251641796197711684499645635709656,
1374324219480165500871639364801692115397519265181803854177629327624133579404,
11442588683664344394633565859260176446561886575962616332903193988751292992472,
2558901189096558760448896669327086721003508630712968559048179091037845349145,
11189978595292752354820141775598510151189959177917284797737745690127318076389,
3262966573163560839685415914157855077211340576201936620532175028036746741754,
17029914891543225301403832095880481731551830725367286980611178737703889171730,
4614037031668406927330683909387957156531244689520944789503628527855167665518,
19647356996769918391113967168615123299113119185942498194367262335168397100658,
5040699236106090655289931820723926657076483236860546282406111821875672148900,
2632385916954580941368956176626336146806721642583847728103570779270161510514,
17691411851977575435597871505860208507285462834710151833948561098560743654671,
11482807709115676646560379017491661435505951727793345550942389701970904563183,
8360838254132998143349158726141014535383109403565779450210746881879715734773,
12663821244032248511491386323242575231591777785787269938928497649288048289525,
3067001377342968891237590775929219083706800062321980129409398033259904188058,
8536471869378957766675292398190944925664113548202769136103887479787957959589,
19825444354178182240559170937204690272111734703605805530888940813160705385792,
16703465144013840124940690347975638755097486902749048533167980887413919317592,
13061236261277650370863439564453267964462486225679643020432589226741411380501,
10864774797625152707517901967943775867717907803542223029967000416969007792571,
10035653564014594269791753415727486340557376923045841607746250017541686319774,
3446968588058668564420958894889124905706353937375068998436129414772610003289,
4653317306466493184743870159523234588955994456998076243468148492375236846006,
8486711143589723036499933521576871883500223198263343024003617825616410932026,
250710584458582618659378487568129931785810765264752039738223488321597070280,
2104159799604932521291371026105311735948154964200596636974609406977292675173,
16313562605837709339799839901240652934758303521543693857533755376563489378839,
6032365105133504724925793806318578936233045029919447519826248813478479197288,
14025118133847866722315446277964222215118620050302054655768867040006542798474,
7400123822125662712777833064081316757896757785777291653271747396958201309118,
1744432620323851751204287974553233986555641872755053103823939564833813704825,
8316378125659383262515151597439205374263247719876250938893842106722210729522,
6739722627047123650704294650168547689199576889424317598327664349670094847386,
21211457866117465531949733809706514799713333930924902519246949506964470524162,
13718112532745211817410303291774369209520657938741992779396229864894885156527,
5264534817993325015357427094323255342713527811596856940387954546330728068658,
18884137497114307927425084003812022333609937761793387700010402412840002189451,
5148596049900083984813839872929010525572543381981952060869301611018636120248,
19799686398774806587970184652860783461860993790013219899147141137827718662674,
19240878651604412704364448729659032944342952609050243268894572835672205984837,
10546185249390392695582524554167530669949955276893453512788278945742408153192,
5507959600969845538113649209272736011390582494851145043668969080335346810411,
18177751737739153338153217698774510185696788019377850245260475034576050820091,
19603444733183990109492724100282114612026332366576932662794133334264283907557,
10548274686824425401349248282213580046351514091431715597441736281987273193140,
1823201861560942974198127384034483127920205835821334101215923769688644479957,
11867589662193422187545516240823411225342068709600734253659804646934346124945,
18718569356736340558616379408444812528964066420519677106145092918482774343613,
10530777752259630125564678480897857853807637120039176813174150229243735996839,
20486583726592018813337145844457018474256372770211860618687961310422228379031,
12690713110714036569415168795200156516217175005650145422920562694422306200486,
17386427286863519095301372413760745749282643730629659997153085139065756667205,
2216432659854733047132347621569505613620980842043977268828076165669557467682,
6309765381643925252238633914530877025934201680691496500372265330505506717193,
20806323192073945401862788605803131761175139076694468214027227878952047793390,
4037040458505567977365391535756875199663510397600316887746139396052445718861,
19948974083684238245321361840704327952464170097132407924861169241740046562673,
845322671528508199439318170916419179535949348988022948153107378280175750024,
16222384601744433420585982239113457177459602187868460608565289920306145389382,
10232118865851112229330353999139005145127746617219324244541194256766741433339,
6699067738555349409504843460654299019000594109597429103342076743347235369120,
6220784880752427143725783746407285094967584864656399181815603544365010379208,
6129250029437675212264306655559561251995722990149771051304736001195288083309,
10773245783118750721454994239248013870822765715268323522295722350908043393604,
4490242021765793917495398271905043433053432245571325177153467194570741607167,
19596995117319480189066041930051006586888908165330319666010398892494684778526,
837850695495734270707668553360118467905109360511302468085569220634750561083,
11803922811376367215191737026157445294481406304781326649717082177394185903907,
10201298324909697255105265958780781450978049256931478989759448189112393506592,
13564695482314888817576351063608519127702411536552857463682060761575100923924,
9262808208636973454201420823766139682381973240743541030659775288508921362724,
173271062536305557219323722062711383294158572562695717740068656098441040230,
18120430890549410286417591505529104700901943324772175772035648111937818237369,
20484495168135072493552514219686101965206843697794133766912991150184337935627,
19155651295705203459475805213866664350848604323501251939850063308319753686505,
11971299749478202793661982361798418342615500543489781306376058267926437157297,
18285310723116790056148596536349375622245669010373674803854111592441823052978,
7069216248902547653615508023941692395371990416048967468982099270925308100727,
6465151453746412132599596984628739550147379072443683076388208843341824127379,
16143532858389170960690347742477978826830511669766530042104134302796355145785,
19362583304414853660976404410208489566967618125972377176980367224623492419647,
1702213613534733786921602839210290505213503664731919006932367875629005980493,
10781825404476535814285389902565833897646945212027592373510689209734812292327,
4212716923652881254737947578600828255798948993302968210248673545442808456151,
7594017890037021425366623750593200398174488805473151513558919864633711506220,
18979889247746272055963929241596362599320706910852082477600815822482192194401,
13602139229813231349386885113156901793661719180900395818909719758150455500533,
]
40 changes: 24 additions & 16 deletions src/ast/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
pub mod query;

use std::{collections::HashMap, fmt::Debug, rc::Rc};
use std::{collections::HashMap, fmt::Debug, hash::Hash, rc::Rc};

use crate::{
frontend::dsl::StepTypeHandler,
poly::Expr,
util::{uuid, UUID},
wit_gen::{FixedGenContext, Trace, TraceContext},
wit_gen::{FixedAssignment, FixedGenContext, Trace, TraceContext},
};

use halo2_proofs::plonk::{Advice, Column as Halo2Column, ColumnType, Fixed};
Expand All @@ -28,7 +28,7 @@ pub struct Circuit<F, TraceArgs> {
pub annotations: HashMap<UUID, String>,

pub trace: Option<Rc<Trace<F, TraceArgs>>>,
pub fixed_gen: Option<Rc<FixedGen<F>>>,
pub fixed_assignments: Option<FixedAssignment<F>>,

pub first_step: Option<StepTypeUUID>,
pub last_step: Option<StepTypeUUID>,
Expand All @@ -41,10 +41,19 @@ pub struct Circuit<F, TraceArgs> {
impl<F: Debug, TraceArgs: Debug> Debug for Circuit<F, TraceArgs> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Circuit")
.field("step_types", &self.step_types)
.field("forward_signals", &self.forward_signals)
.field("shared_signals", &self.shared_signals)
.field("fixed_signals", &self.fixed_signals)
.field("halo2_advice", &self.halo2_advice)
.field("step_types", &self.step_types)
.field("halo2_fixed", &self.halo2_fixed)
.field("exposed", &self.exposed)
.field("annotations", &self.annotations)
.field("fixed_assignments", &self.fixed_assignments)
.field("first_step", &self.first_step)
.field("last_step", &self.last_step)
.field("num_steps", &self.num_steps)
.field("q_enable", &self.q_enable)
.finish()
}
}
Expand All @@ -65,7 +74,7 @@ impl<F, TraceArgs> Default for Circuit<F, TraceArgs> {
annotations: Default::default(),

trace: None,
fixed_gen: None,
fixed_assignments: None,

first_step: None,
last_step: None,
Expand Down Expand Up @@ -166,21 +175,20 @@ impl<F, TraceArgs> Circuit<F, TraceArgs> {
}
}

pub fn set_fixed_gen<D>(&mut self, def: D)
where
D: Fn(&mut FixedGenContext<F>) + 'static,
{
match self.fixed_gen {
None => self.fixed_gen = Some(Rc::new(def)),
Some(_) => panic!("circuit cannot have more than one fixed generator"),
}
}

pub fn get_step_type(&self, uuid: UUID) -> Rc<StepType<F>> {
let step_rc = self.step_types.get(&uuid).expect("step type not found");

Rc::clone(step_rc)
}

pub fn set_fixed_assignments(&mut self, assignments: FixedAssignment<F>) {
match self.fixed_assignments {
None => {
self.fixed_assignments = Some(assignments);
}
Some(_) => panic!("circuit cannot have more than one fixed generator"),
}
}
}

pub type FixedGen<F> = dyn Fn(&mut FixedGenContext<F>) + 'static;
Expand Down Expand Up @@ -451,7 +459,7 @@ impl FixedSignal {
}
}

#[derive(Clone, Copy)]
#[derive(Clone, Copy, Debug)]
pub enum ExposeOffset {
First,
Last,
Expand Down
Loading