From 523091e17c8f2280ecf5d598b5563f3465393ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex?= Date: Sat, 30 May 2026 22:35:08 +0200 Subject: [PATCH] fix: remove session (#34) * remove session * Update poq's sample input. * Bump circuits version * Update lock file --------- Co-authored-by: thomaslavaur Co-authored-by: Antonio Antonino --- blend/generate_inputs_for_poq.py | 12 +- blend/poq.circom | 5 +- rust/Cargo.lock | 80 ++++----- rust/Cargo.toml | 2 +- .../sample.input.json | 159 +++++++++--------- 5 files changed, 122 insertions(+), 136 deletions(-) diff --git a/blend/generate_inputs_for_poq.py b/blend/generate_inputs_for_poq.py index 4d94a2a..c364be6 100644 --- a/blend/generate_inputs_for_poq.py +++ b/blend/generate_inputs_for_poq.py @@ -206,14 +206,13 @@ def PoseidonSponge(data, capacity, output_len): # ——————————————————————— # Main # ——————————————————————— -if len(sys.argv) != 5: - print("Usage: python3 generate_inputs_for_poq.py ") +if len(sys.argv) != 4: + print("Usage: python3 generate_inputs_for_poq.py ") sys.exit(1) -session = int(sys.argv[1]) -Qc = int(sys.argv[2]) -Ql = int(sys.argv[3]) -core_or_leader = int(sys.argv[4]) +Qc = int(sys.argv[1]) +Ql = int(sys.argv[2]) +core_or_leader = int(sys.argv[3]) if not core_or_leader in [0,1]: print("core or leader must be 0 or 1") sys.exit(1) @@ -280,7 +279,6 @@ K_two = F(654321) # 5) Assemble JSON inp = { - "session": str(session), "core_quota": str(Qc), "leader_quota": str(Ql), "core_root": str(core_root), diff --git a/blend/poq.circom b/blend/poq.circom index ba2d9c9..79b19fd 100644 --- a/blend/poq.circom +++ b/blend/poq.circom @@ -17,7 +17,6 @@ include "../ledger/notes.circom"; */ template ProofOfQuota(nLevelsPK, nLevelsPol, bitsQuota) { // Public Inputs - signal input session; // session s signal input core_quota; signal input leader_quota; signal input core_root; @@ -115,7 +114,7 @@ template ProofOfQuota(nLevelsPK, nLevelsPol, bitsQuota) { // choose core_sk or pol.secret_key: selection_randomness.inp[1] <== selector * (would_win.secret_key - core_sk ) + core_sk; selection_randomness.inp[2] <== index; - selection_randomness.inp[3] <== selector * (would_win.slot - session) + session; + selection_randomness.inp[3] <== selector * (would_win.slot - pol_epoch_nonce) + pol_epoch_nonce; // Derive key_nullifier @@ -127,5 +126,5 @@ template ProofOfQuota(nLevelsPK, nLevelsPol, bitsQuota) { } // Instantiate with chosen depths: 20 for core PK tree, 25 for PoL secret slot tree -component main { public [ session, core_quota, leader_quota, core_root, K_part_one, K_part_two, pol_epoch_nonce, pol_t0, pol_t1, pol_ledger_aged ] } +component main { public [ core_quota, leader_quota, core_root, K_part_one, K_part_two, pol_epoch_nonce, pol_t0, pol_t1, pol_ledger_aged ] } = ProofOfQuota(20, 25, 20); diff --git a/rust/Cargo.lock b/rust/Cargo.lock index d896bb1..dc1e310 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -28,9 +28,9 @@ checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "cc" -version = "1.2.61" +version = "1.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" +checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f" dependencies = [ "find-msvc-tools", "shlex", @@ -90,18 +90,17 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" dependencies = [ "cfg-if", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "filetime" -version = "0.2.27" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" +checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759" dependencies = [ "cfg-if", "libc", - "libredox", ] [[package]] @@ -133,9 +132,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0" dependencies = [ "bytes", "itoa", @@ -161,14 +160,11 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libredox" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" dependencies = [ - "bitflags", "libc", - "plain", - "redox_syscall", ] [[package]] @@ -179,13 +175,13 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "log" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5" [[package]] name = "logos-blockchain-circuits-build" -version = "0.5.0" +version = "0.5.1" dependencies = [ "dirs", "fd-lock", @@ -196,14 +192,14 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-common" -version = "0.5.0" +version = "0.5.1" dependencies = [ "logos-blockchain-circuits-types", ] [[package]] name = "logos-blockchain-circuits-poc-sys" -version = "0.5.0" +version = "0.5.1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -213,7 +209,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-pol-sys" -version = "0.5.0" +version = "0.5.1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -223,7 +219,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-poq-sys" -version = "0.5.0" +version = "0.5.1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -233,14 +229,14 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-rapidsnark-sys" -version = "0.5.0" +version = "0.5.1" dependencies = [ "logos-blockchain-circuits-build", ] [[package]] name = "logos-blockchain-circuits-signature-sys" -version = "0.5.0" +version = "0.5.1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -249,7 +245,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-tests" -version = "0.5.0" +version = "0.5.1" dependencies = [ "logos-blockchain-circuits-pol-sys", "logos-blockchain-circuits-poq-sys", @@ -257,7 +253,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-types" -version = "0.5.0" +version = "0.5.1" dependencies = [ "bytes", "libc", @@ -297,12 +293,6 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "proc-macro2" version = "1.0.106" @@ -321,15 +311,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "redox_syscall" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a" -dependencies = [ - "bitflags", -] - [[package]] name = "redox_users" version = "0.5.2" @@ -370,9 +351,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.39" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2c118cb077cca2822033836dfb1b975355dfb784b5e8da48f7b6c5db74e60e" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "log", "once_cell", @@ -447,9 +428,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "simd-adler32" @@ -476,9 +457,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" dependencies = [ "filetime", "libc", @@ -582,6 +563,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.61.2" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 98b69e2..0d97a60 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -6,7 +6,7 @@ keywords = ["blockchain", "privacy"] license = "MIT or Apache-2.0" readme = "README.md" repository = "https://github.com/logos-blockchain/logos-blockchain-circuits" -version = "0.5.0" +version = "0.5.1" [workspace] members = [ diff --git a/rust/logos-blockchain-circuits-poq-sys/sample.input.json b/rust/logos-blockchain-circuits-poq-sys/sample.input.json index 6f20ef8..1b3de15 100644 --- a/rust/logos-blockchain-circuits-poq-sys/sample.input.json +++ b/rust/logos-blockchain-circuits-poq-sys/sample.input.json @@ -1,132 +1,131 @@ { - "session": "1", - "core_quota": "10", - "leader_quota": "5", - "core_root": "20423847801203321296654759690878714805328777188198550442842378955293864405749", - "pol_ledger_aged": "17903920406556048980238705683215862296511171897974321387437239009873416173088", + "core_quota": "1", + "leader_quota": "10", + "core_root": "7358626607131214682586253304523946160071850873054090941932251900116552785280", + "pol_ledger_aged": "17848125288774642501089540435944460903456646006482467944234533252194069877439", "K_part_one": "123456", "K_part_two": "654321", "selector": "0", - "index": "4", - "core_sk": "9648814259696994178754585280937762562521917479862309330976828088416086689502", + "index": "0", + "core_sk": "5209097897605387010620715638071336554739532569559254565820554506540253382985", "core_path": [ - "7444981793259323545028230817540266139574655346498587207322690091155864366514", - "11906618682557735136285409970678605865823718647884839058358264586062323572931", - "20134132405688011859463119692951856666179032704702165461712292610201307937895", - "14957940720199233077855574470291237736607251243547208306826060526364053594567", - "9960019677323356900045391326995069522689045788302673979918902013710931552405", - "66857460143066791244205132003829555578944395751024287435105865077587183768", - "9684190057075151027164519297536804034845411696380043986044825589786854843890", - "5454398284364625202375600088042852298143548338598297694708920725120268102172", - "17717838934596276392301608861658238780702831838416312046180761451761658981677", - "21049060929819155971068746329904761210986436808741330971979776532239897765447", - "11774149665086408677974469133186402228920447314607286251417731337331983592621", - "20730401134454070553472357967443459347591806294042271432905369723302561196146", - "8683835652829558567596368905844156962511421729430671198119438457363223237488", - "15354188356303619925782257044335868802108846851399355235348014093341533049042", - "4726038353749363201132655543916148764086757634128462972437143285566298790278", - "19793785327783426164764238122458972627129812758755648364664517341770465698137", - "12144554112696250636735897359535254161697584560941692171669941649860599557215", - "4391930156296016129347969147731784916200749354398548728573386759785083449305", - "9056244932796998900758180921717949733339642790698415152308909239074793689860", - "20440861423381563032522290464977155181939164858308810772959774388792060977834" + "17752527643973599850200907158162123421789260288064138808502494798954742404252", + "9379040520123190857535767357874915976437372612793835521471488439298616464898", + "11461160392054216243349156621447102558626723421191357594357394425037175166169", + "3182242865768248001269339794622535742230729277933857812114267231466538272261", + "41157462735450030613212285008103098053283605796552310012335933058594828282", + "8898673234425133025293665335457180035350271106069250532827291493857168761759", + "18766378158080024089872252637601531399756739865331521032970871047107782887362", + "14709123862686005445799988261383261045618207742980203024957694596134833354170", + "12539068583558967267354286296156973269525180111643591810825608135058830839617", + "2952140069158700175322849316704490984440476314038184524603021326977347497633", + "19916770065367293705239216606330751387464165697267859810762847788327722568906", + "7948654779419894653933606281103324343210718942161723582735280359580292203550", + "7264791723462141620611889823641111379865151760782616092505714756552728385391", + "4424801921131821282099543195147450132688717583294774094660090715609317256454", + "17802155476919415332620083104640696574649670233080626578708654591914878198079", + "1597726376193255010119909130845298012629844879455812137043558490423866814607", + "10747414478615691590826244547850573302598774066750987081388130509746066651454", + "2488080958694083728975011168315936693544896511710871375745261690957753282778", + "12587207496859064371585343104907844688634654080593414910704311330996345850073", + "9011965812552988689042552183119939764346306368045046136578647356489304004079" ], "core_path_selectors": [ "0", - "1", - "1", "0", - "1", "0", "1", "1", "1", "0", + "0", + "1", + "0", + "0", + "1", + "0", "1", "1", "0", "1", "1", - "0", - "0", "1", - "0", - "1" + "0" ], - "pol_sl": "2999142337", - "pol_epoch_nonce": "13416107872788342879859909752417297479970876884105393946206193406636245124924", + "pol_sl": "3013712891", + "pol_epoch_nonce": "8171879639839015143681394409352721472619633422995827998462084091591385426956", "pol_t0": "148409079361904587837471709956458430342187235603420891378597419711486680", "pol_t1": "21888242871336145414933615591437256729835795974444825699352339602896135814447", - "pol_secret_key": "5888730225944530149138538772959785628943021630629194621324636699030154327779", + "pol_secret_key": "6126637502529733622553644490130144254637143551164579001080245009353780575007", "pol_noteid_path": [ - "11417212955939342484156122492131731680470736064572423108264714804692982132423", - "13195529687976077417120457189120231305870945642160590995096417385531885506527", - "8472612035444494025196025434618086294389115909303446215474787216226075733233", - "4395544485586958768290328184233580023235668872384703046186144832197262227824", - "4155097203117131499585729150758272768367941952959383568978188417941807061285", - "12408098106443635130911956104856030560309651099061156514970962447957027050139", - "18743723426188623742373733557975920292757537418376825891131826727792647674843", - "8921759404097162857845142647448014820935511584403450140750072994549272153730", - "12780803834914504736250867272694468211504307499239030290058679926157641539231", - "14426829036224566782069722269326129726234814130810124541609677896636347739469", - "12104693267449791844517047312768375964966170218283608605832423892888932116836", - "4883118865130876989815011894870188012768758733041802381045504888060618022896", - "221076344526264664133449802750892395792062472746642224588395874880886057862", - "5113214819332200669368049090534645222011919607097424838023324847441692662817", - "11190105598795402691316927391391967636268949446132854344954730333558274776561", - "9497071318258212130830107535590335197992746719505860281792486969560303727415", - "748420254289718676536943619836584348410332952487466816579920043963946022247", - "14115148735545746869495305176487552481901196697644225252711231121645192222529", - "9825912699605171279245430402178700385570068146465368260071935364769450924475", - "1501769250930508362584740947030050914124963948804793138968307230445384260381", - "17449384761389191557925767178974603169885098072345898391638302374310429932515", - "15254499277889636076581272515864557232200527228506352325296439482258130354292", - "17609649632230164263025759476016886422378093160688512447628349616375377913864", - "3796675673265260264289049510567646443858253346231355244420810954931342727796", - "16421896950452608279534605320939669191650110271813875344999112106538557831552", - "17833913909116979902116409442832814514923484644816639363063290974377083565699", - "6674420083709581276404439792277275401604929658229769714363091874557852768901", - "413703733576599351434912508015408034175577472292919474661639467491474199758", - "8269883007022448705723402393227587978527160373548295017073655056451421211755", - "2524601535002894286006232081527402693925618141420537796447547436812892177839", - "18128917825606990579294624696080518601859437342124614427642120271129736700878", - "20950332433104838321486108855942309235493780674594737746438717221993421294744" + "19523824649949991640733122947360702509103041363669816679057385364738421595015", + "12866666617515056434713078270449819897384244639781006359356789833314185927838", + "11625639580345575538484816180557570964945391956488823097035206927083221136468", + "20226255359058832675561975090219300090365857140011178158245766997070168517469", + "18813427405198187795956307215265079090781176499247795858545231544178484217866", + "15766907329056392732794090849724343177841163100119953466631081758056929337948", + "17057158578543256597782968109615591935074658555700581656458754063375286870186", + "21457251238439122598821661852540315218889340232511640285013028985121142979333", + "9128215354950884953309627273828546566295438177920370966436497949954814238497", + "20288706412130899283418094935877773217895597010453936089261773933373007493383", + "12055453394895462303717909161807277467700266603645297853006114217274670515655", + "1880351095200712608342626474768098992025128037897480861848664497268036645889", + "2973403713563861625695098059351335085647761102443779148469958543166054209071", + "4660863892593605241418106640974813915082681670472315847356569438898721198482", + "10903654216970603525134439847801343597200169667399563708733758526237377018871", + "13389260358886784745360395536715767115411755346451908828998142366539206075409", + "370280185919542099068307227941311295572788226727071709701562477680091313056", + "3784132268409681725912464386667280427177972428543216309893364320011234526466", + "13476088136042569917637353606671246226021176584799646402720393180175313805559", + "12770961249095889110301649901401191384192511679656780753566119020016794642155", + "11003304181442192733666619866226916287215837695042295458228063938564974776167", + "19189717042404551802583935432102545049698388880308877895767488888240836031919", + "15591294614531392075874106964998847554065820397346788637176452429094943367699", + "4827378731315067812213685579248590219382039112909765258979828340851280796018", + "6543426291589641158414400854021080125216814111662177895659872749860114321432", + "13837522293851119725630707772117741568041717917918117000070026934483600034622", + "6025729186733182842212217493627090176913471786304421868658591113329060605538", + "251525172609920268281780324534432402935669617032589659964900108178277276778", + "596267738366722809676427452556707976028498742561750319839370279387905290524", + "3943892203924871636006744100492889189566061675558068101719931566368634467516", + "11776765250297403040627918225511998354804920327502786739933006880387064898343", + "15217403801244457874885447650899805327179971643807412929371341251150084200348" ], "pol_noteid_path_selectors": [ - "1", - "1", + "0", "1", "0", "0", "0", + "0", "1", "1", "1", "1", + "1", + "0", + "1", + "1", + "1", "0", "1", "0", "0", - "1", - "0", - "1", - "1", - "1", - "1", "0", "1", "0", "1", "1", + "1", "0", "0", "1", "1", - "1", + "0", "0", "0" ], - "pol_note_tx_hash": "10190023498178194208361021687460995025878664681917212352967702284591462728108", - "pol_note_output_number": "449", + "pol_note_tx_hash": "6762192302225204907638506437779482371825535174735792388658890099668611185173", + "pol_note_output_number": "331", "pol_note_value": "50" } \ No newline at end of file