Skip to content

Commit

Permalink
Merge pull request #109 from hyperledger-labs/update-circom-v2.2.1
Browse files Browse the repository at this point in the history 
updating circom version to v2.2.1
  • Loading branch information
@jimthematrix
jimthematrix authored Dec 10, 2024
2 parents 7698c1c + e8e3c32 commit ca202cf
Show file tree
Hide file tree
Showing 93 changed files with 1,521 additions and 1,442 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/circuit-unit-tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- name: Install circom
uses: supplypike/setup-bin@v4
with:
uri: https://github.com/iden3/circom/releases/download/v2.1.9/circom-linux-amd64
uri: https://github.com/iden3/circom/releases/download/v2.2.1/circom-linux-amd64
name: circom
version: 2.1.9
version: 2.2.1

- name: Checkout circuits
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- name: Install circom
uses: supplypike/setup-bin@v4
with:
uri: https://github.com/iden3/circom/releases/download/v2.1.9/circom-linux-amd64
uri: https://github.com/iden3/circom/releases/download/v2.2.1/circom-linux-amd64
name: circom
version: 2.1.9
version: 2.2.1

- name: Setup node.js
uses: actions/setup-node@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- name: Install circom
uses: supplypike/setup-bin@v4
with:
uri: https://github.com/iden3/circom/releases/download/v2.1.9/circom-linux-amd64
uri: https://github.com/iden3/circom/releases/download/v2.2.1/circom-linux-amd64
name: circom
version: 2.1.9
version: 2.2.1

- name: Setup node.js
uses: actions/setup-node@v4
Expand Down
10 changes: 5 additions & 5 deletions go-sdk/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
)

Expand All @@ -46,8 +46,8 @@ require (
github.com/iden3/go-rapidsnark/types v0.0.2 // indirect
github.com/iden3/go-rapidsnark/witness/v2 v2.0.0
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/crypto v0.30.0 // indirect
golang.org/x/sys v0.28.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/postgres v1.5.9
gorm.io/driver/sqlite v1.5.6
Expand Down
20 changes: 10 additions & 10 deletions go-sdk/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,21 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg=
github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Expand Down
20 changes: 10 additions & 10 deletions solidity/contracts/lib/verifier_anon.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ contract Groth16Verifier_Anon {
uint256 constant deltay2 = 8495653923123431417604973247489272438418190587263600148770280649306958101930;


uint256 constant IC0x = 1902294708609438766644796849204928803663740221366415953958959671322392851564;
uint256 constant IC0y = 12303706229402770227626541861677666866256980943367923556129762158140843548287;
uint256 constant IC0x = 9951854304440957729970048255417847267132931648166621883720076413912489896527;
uint256 constant IC0y = 14409176055818543230693338142067842611649413262894612537199808888445023112373;

uint256 constant IC1x = 6203750222123167001680138260485388290509753949796409294680745274528939225218;
uint256 constant IC1y = 14273694985744114904153451898553819231835595683225898188370999467603823889120;
uint256 constant IC1x = 5259573331603891045109512098668147509749008117612868524737824308087424702574;
uint256 constant IC1y = 19525471913445311889626897591512951562906439006910912392554279452294201846276;

uint256 constant IC2x = 13851857796635439596347101558854032349005376871103497746213823704338073021460;
uint256 constant IC2y = 7967526762804365938696698938751824648449736305244161041844814326643079898090;
uint256 constant IC2x = 11117692645622336630958982687810991395188114569363058873106896045606988623896;
uint256 constant IC2y = 14276217142757598463675207289976891700417433194631189996761010950688853664150;

uint256 constant IC3x = 12245690231014470786603136099602124408674587253367196875598058296083705481696;
uint256 constant IC3y = 11623815329524890470474756993864782999204409209062428531060410020655296376735;
uint256 constant IC3x = 3527562448445671453901857866044085741707077263419661700847282228715451090636;
uint256 constant IC3y = 7570409468150382685653626446363808187419423223162341311148036786121924318272;

uint256 constant IC4x = 12465556430374686644611513936282716496357430439429402691697005880009555085162;
uint256 constant IC4y = 19628482398819988298416397224449752871272762208876492653622728381407269132622;
uint256 constant IC4x = 10841264388322700588655341388056493072376766887069865783096807172059689381322;
uint256 constant IC4y = 14972730259646309083115284299844029307953343465611976912389044052401119428032;


// Memory data
Expand Down
84 changes: 42 additions & 42 deletions solidity/contracts/lib/verifier_anon_batch.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,68 +43,68 @@ contract Groth16Verifier_AnonBatch {
uint256 constant deltay2 = 8495653923123431417604973247489272438418190587263600148770280649306958101930;


uint256 constant IC0x = 14401916694900248086984454610617645117186037810025870355725588875905411527905;
uint256 constant IC0y = 21823139981972768925181597835606667363291590735926744185425609626967895836641;
uint256 constant IC0x = 7758301571899264877858754209612844662929165192234301276158382789434660892099;
uint256 constant IC0y = 20632936968362880899162931340576490861576728872145653907427377112607300400193;

uint256 constant IC1x = 18152399282716158169629531201439344161063103224251361362440246670930516009303;
uint256 constant IC1y = 6080278265173093538537246863599160169974109935068305121259074193384775431363;
uint256 constant IC1x = 11615633327966345713615297610659165892904591672955619465704759244989408557001;
uint256 constant IC1y = 11186083397042268510557524401993206529996465593457554173588486016199204963108;

uint256 constant IC2x = 8297218266848061835807071945554336477046207943620428501160290285825071517363;
uint256 constant IC2y = 15656222378314004248176477825191755476212778291146638786091437963148762568128;
uint256 constant IC2x = 8348765224084098251357619259739427533816923339846196710158525531859046678780;
uint256 constant IC2y = 13275877206982799746427248891798232762186295800333350577705405457097216734459;

uint256 constant IC3x = 3047434740237115324297422001872346293290441872228378409771516453051049454159;
uint256 constant IC3y = 10541096522864074461757896295030226941094097575004052502097468583817879074093;
uint256 constant IC3x = 6746129276191106098256682894727980301235667747387375602345851232220273184371;
uint256 constant IC3y = 14163114090067731644944353946434704913998144273454075038752642892877528059742;

uint256 constant IC4x = 18415204963750428001366853480098284329225951295307528124155234247674301562276;
uint256 constant IC4y = 18206845444283706289783054066424364156383540489856915668759698699066029015528;
uint256 constant IC4x = 17375983988601669407845120504503759147294838178582839613615315961449819607570;
uint256 constant IC4y = 20608650540530367815716369390757456255847070161889545613408042418171720449928;

uint256 constant IC5x = 5848632330022221449217083844906849578988699882267611916943101169293886327152;
uint256 constant IC5y = 8525192717750394881723959129538639054882628564239664911410730246619999848599;
uint256 constant IC5x = 749245697896346907446760524347394022947856349424268788233876301031650409625;
uint256 constant IC5y = 4684890715991811318708982639949298037366574514016217005572331962357269457587;

uint256 constant IC6x = 18737933721565426341245741788052591666191809520781288299820522320094073877002;
uint256 constant IC6y = 17893060166280487897808816982590615297284643156483941137846260492062460760617;
uint256 constant IC6x = 7874899580488011619193479877107427619540065860386960382786115058214736472961;
uint256 constant IC6y = 21059542981556940483486320687985908778783940542633255975679963765277339962530;

uint256 constant IC7x = 19098445952237615276849115001752018549598132495817554411626726814628060269826;
uint256 constant IC7y = 12055887832584514874540928561552980046792594771344397625875810924512944008940;
uint256 constant IC7x = 18621252523739397617877641120503087117872370301811965092932817827739479796166;
uint256 constant IC7y = 2404706837034131897192868270261182964291037415010772829788848732084770430933;

uint256 constant IC8x = 14049087315628302176692100175044083505908130478745651601589669404557285071536;
uint256 constant IC8y = 11760483736571233695765389297508375430401740670321979310551162352220705482170;
uint256 constant IC8x = 19814455545966466244689909235181383129301797961567922579961058010657327968486;
uint256 constant IC8y = 21732937296348543826379078094630887156087124289621375908739315093071402119752;

uint256 constant IC9x = 13933845163646305706487746770461738555628647435735733692423741028126085769120;
uint256 constant IC9y = 5906072330325167864469019724869377799273255560000238774314064772801265008600;
uint256 constant IC9x = 3184933453132988447670846134646492920686989562672153511835240095854316620300;
uint256 constant IC9y = 17413345587156768674470638887481028062872057504530236831890435886323321898876;

uint256 constant IC10x = 13705817542782816555899655377219516947625498453397622184137502850319776285664;
uint256 constant IC10y = 9042948681425040255034970979470429950080719583285309041655605511548953117983;
uint256 constant IC10x = 5000106956091632287751063138709579166413938917310811757141112192144129568670;
uint256 constant IC10y = 1880348007105019492687842362718936462113830541362164189075767828637837156158;

uint256 constant IC11x = 21219849026857904949098640161461967736586495130286899335070690044195456905584;
uint256 constant IC11y = 9738292818521877248157023071103026883633012472866114286481112790569861434809;
uint256 constant IC11x = 8807954911100293836538771942181421664913270197244831130761279808674931518790;
uint256 constant IC11y = 17508285927575586166782465486539407240181248723581605802158685783096894314205;

uint256 constant IC12x = 16821584442373432772708439871996312879436027142106307298789026044142912059297;
uint256 constant IC12y = 18179456728684141852474805451524977640053894307290781083105544127773978083590;
uint256 constant IC12x = 3654376290557405870314166762121655305171208827771868156654718356459126930544;
uint256 constant IC12y = 20239761678262685978011314532733399292107569046790346152735028075018156700430;

uint256 constant IC13x = 18644980581060530311357977147481430713902817828375295403067823676395599257852;
uint256 constant IC13y = 4274710606613794907868577617888070748913495219029409238664182414438828140774;
uint256 constant IC13x = 13942381491409863805481129234212748957659615129674051368293399772120904898982;
uint256 constant IC13y = 7198633752550957979404220877302240993107152862622048009001689469103843899379;

uint256 constant IC14x = 1670061012290661486355607450319597799823993362799528125098867249745378187092;
uint256 constant IC14y = 17357067744661529049119254714176244266487122291167133704079413719073749738908;
uint256 constant IC14x = 3766314971418353237905318803668630234242341545507796164075802769154870704226;
uint256 constant IC14y = 14974832509202270872448631093591036606262174404532714792580142674109071695963;

uint256 constant IC15x = 20214070364826093890785202955205369405718408221128285777814067171054281417142;
uint256 constant IC15y = 6676623764796503794882178144016983490948422057538987148553778809368627351866;
uint256 constant IC15x = 20947173756075288500532552138514879254082296280245805744255404875099965748043;
uint256 constant IC15y = 9331697681780124201113946858352287328081503582349105929394155825802825000361;

uint256 constant IC16x = 19188803159885638492346037355574861082584717060749055884680169327249938506224;
uint256 constant IC16y = 14635030226769140385410527971428459895270353563660740462654337932363700995073;
uint256 constant IC16x = 7300226697596210203589783066188655095148224146210870452762470970590113642422;
uint256 constant IC16y = 15434827597932208119730923859852051718913724437592285448477549023216201752648;

uint256 constant IC17x = 1032439080446701812081769707385444592210021579802000978244234134167421120896;
uint256 constant IC17y = 20080022736872634490249028574119868255366821827646688359584040403863693869436;
uint256 constant IC17x = 5685940285584773620760683269200203911989978110659531751061416671909138714474;
uint256 constant IC17y = 15785546174838346980960122130367445559612201196193666672728019685818460974515;

uint256 constant IC18x = 6320239074134649680926373071446503578744317667951777657870688787798460814779;
uint256 constant IC18y = 4076247364427329948398771036551813672936759695367436275660900533153237218613;
uint256 constant IC18x = 3859778659788676546935882657936598886646060245911905264500747043376967810059;
uint256 constant IC18y = 17039854261944757383765020449971388088475800222706489689867778970566740056221;

uint256 constant IC19x = 18319045025948706149806565908584079240069485862781923810594761414646236403507;
uint256 constant IC19y = 1443810282819553906570438933381282835687988434540658729326313586117183414978;
uint256 constant IC19x = 5414480314443480403627606306388852112232833717157489873490336243185795801707;
uint256 constant IC19y = 16921562134849518673444351383039591413750914511601115431854754554128317214351;

uint256 constant IC20x = 17616701033046011221658156058153126401552902469497703215789359069808206367708;
uint256 constant IC20y = 7948235851932996085506931557727991080994605820774849180821643683325993620091;
uint256 constant IC20x = 15646585249462056626437462646343781302537700830271537725821045027953668154242;
uint256 constant IC20y = 3913813741211312494939390488791420933329920903419211488786784367298336191807;


// Memory data
Expand Down
Loading

0 comments on commit ca202cf

Please sign in to comment.