diff --git a/circuits/metadata.go b/circuits/metadata.go index a3a2dff..ce81c7e 100644 --- a/circuits/metadata.go +++ b/circuits/metadata.go @@ -5,5 +5,5 @@ const ( KYCBySignaturePublicSignalsSchema string = `{"user_identifier":0,"challenge":1,"countryClaimIssuerId":2,"countryClaimIssuerBBJIdenState":3,"countryBlacklist_1":4,"countryBlacklist_2":5,"countryBlacklist_3":6,"countryBlacklist_4":7,"countryBlacklist_5":8,"countryBlacklist_6":9,"countryBlacklist_7":10,"countryBlacklist_8":11,"countryBlacklist_9":12,"countryBlacklist_10":13,"countryBlacklist_11":14,"countryBlacklist_12":15,"countryBlacklist_13":16,"countryBlacklist_14":17,"countryBlacklist_15":18,"countryBlacklist_16":19,"birthdayClaimIssuerId":20,"birthdayClaimIssuerBBJIdenState":21,"currentYear":22,"currentMonth":23,"currentDay":24,"minAge":25}` // AuthenticationPublicSignalsSchema is schema to parse json data for additional information in auth circuit - AuthenticationPublicSignalsSchema string = `{"user_identifier":0,"challenge":1,"user_state":2}` + AuthenticationPublicSignalsSchema string = `{"challenge":0,"user_state":1,"user_identifier":2}` ) diff --git a/circuits/verification_keys.go b/circuits/verification_keys.go index dc9f731..9414805 100644 --- a/circuits/verification_keys.go +++ b/circuits/verification_keys.go @@ -8,5 +8,5 @@ const ( // KYCBySignatureVerificationKey is verification key to verify kycBysSignature circuit KYCBySignatureVerificationKey types.VerificationKeyJSON = `{"protocol":"groth16","curve":"bn128","nPublic":26,"vk_alfa_1":["20491192805390485299153009773594534940189261866228447918068658471970481763042","9383485363053290200918347156157836566562967994039712273449902621266178545958","1"],"vk_beta_2":[["6375614351688725206403948262868962793625744043794305715222011528459656738731","4252822878758300859123897981450591353533073413197771768651442665752259397132"],["10505242626370262277552901082094356697409835680220590971873171140371331206856","21847035105528745403288232691147584728191162732299865338377159692350059136679"],["1","0"]],"vk_gamma_2":[["10857046999023057135944570762232829481370756359578518086990519993285655852781","11559732032986387107991004021392285783925812861821192530917403151452391805634"],["8495653923123431417604973247489272438418190587263600148770280649306958101930","4082367875863433681332203403145435568316851327593401208105741076214120093531"],["1","0"]],"vk_delta_2":[["19128064920055492247805374985983083930165378749179480909913816724406615335296","19288160050156725733802379244448689099841958569866762821564854312784709506393"],["17428331044619925399916395861726985657968925788307219189262474327320267761426","2419828576521667459164020710642577668561374285085862557553780257161628012160"],["1","0"]],"vk_alphabeta_12":[[["2029413683389138792403550203267699914886160938906632433982220835551125967885","21072700047562757817161031222997517981543347628379360635925549008442030252106"],["5940354580057074848093997050200682056184807770593307860589430076672439820312","12156638873931618554171829126792193045421052652279363021382169897324752428276"],["7898200236362823042373859371574133993780991612861777490112507062703164551277","7074218545237549455313236346927434013100842096812539264420499035217050630853"]],[["7077479683546002997211712695946002074877511277312570035766170199895071832130","10093483419865920389913245021038182291233451549023025229112148274109565435465"],["4595479056700221319381530156280926371456704509942304414423590385166031118820","19831328484489333784475432780421641293929726139240675179672856274388269393268"],["11934129596455521040620786944827826205713621633706285934057045369193958244500","8037395052364110730298837004334506829870972346962140206007064471173334027475"]]],"IC":[["939914628341458097516560836826640061417412666479488218276452351605045261272","15618548428001333556505887616624363833376841092682878676319870665446762679381","1"],["19702481984208948066905921949401701892622081248277421181828805140556810527961","591249296144528568644572307700485352989887758126147542074984634824580349790","1"],["21597213372011691592118423761747260467136980646123047205544845233948785583454","5196511894272462787215205652324772860730227888212475230176185917563588975089","1"],["19947365043590033317698858174466422267665557198488278124968639335975352349566","6888103996945586203623646000310666601467283622375764292824085463872350533111","1"],["929770654496063678443820024355937299267629214892684305904187689767724951073","6221018702137222207323223468439959521912038660689132882244771195851036027436","1"],["15310074104932801501644246260897669637226023081793799067952914365167212169682","5879166969760669151358319200626715484518003603727122733880632094958992877599","1"],["17971643265209741168572406785554242786918944839698650229434685581374741153049","3868842795321072870819307332638694135310027298425990065378780298275327376227","1"],["495745971801346882197336692718840760523647268109405134318265470241548603318","21130030807975271815094195118605945442199078822769333781275642658294010578431","1"],["15761017688632999952168047278435514149120694920182536586342231270126590704103","21392966441954723879763377537982650705338045410646499550683341262986076462497","1"],["14761637176340383428252649965810248295683877890169419113056281631580002773413","6731526493847224925576121390364151881861699044372365347469588873402831839941","1"],["15851835685574472775862827117616441786754152565801802145266865670177972669062","15874065945662487959415069605527499236937033588760848794428995176829519629867","1"],["17373726396273537796870417619744542499830071779785286088433182026540191523591","9161378079365747151628520286205749938233800006194631547321283555989284857225","1"],["13312905596080705851601635638064751396651919659332733234631412807907395745857","1260373832423040695616485404682224203278851493376258227901013628705543689541","1"],["6131427624040614882789546287840649427398137387259427267973401956189842853429","3972267586492425100185156855077534857818312507309978391302972105444087606453","1"],["21198228523344347205296190384150182495468439418409269811101629880033140307176","15096741571751104933099141427282568324191338977008173304759099173470273098928","1"],["3222590932508072780326303585610580402925045277262286309448642463994919513778","16639917920181277326312669550618803226863219580774101180998300717248211138561","1"],["2087448661411056266461299935931047190539985050070525918870157796554208345315","7856861375719716246409097742827048670200813977983835009772546370489019665395","1"],["19937371855088628377463856848053459016326089130102447720252506729674313901644","8472010261302839748150687516534356087779781288686922969203004672254591955186","1"],["554270891896844532066866172748318370009985132578090355693920520674291649645","10699156451760641087986249338477737746414757627181053986536524135969186196189","1"],["5465061226051267980642510344843071304798020617742311187173887598903006967820","11893193670297230058362002712839315440501820807975395434613315133500764621711","1"],["14641687371361924497352317469887183845134509606912861194557692030600273165435","17270925897527243275922678840690882543817991761890068516463770595105142817757","1"],["17297740399105498043635452523970204725442613466771891216931543851047613222062","11970135855505351357087071704234862227389490581222449923825910728832852829134","1"],["13963696747816354569374969450817020976298346550369939668146041309950121851602","3334597054598802667360397783523455682253476471939428640736044957691532983596","1"],["16921733156938179995722747086695678352508229050490088523030962286491935657587","19580663880552112182040173817092822585729774224638798300122624436719055011580","1"],["3332736485186613668142732636026375877311430630177998823651523088195510999347","8443620575343412122110287749388130100175803277925508709171151849001928250366","1"],["11005060412361570098083562497542120757858345364067259480244409487317856148376","20901994404640877101828132182462220444734163309092115188931910219812283716947","1"],["1367787598278437985643819431598330931335252418212065257020911130676301915360","7732341683215070702836276408170949477995243447094745409006552425064825017753","1"]]}` // AuthenticationVerificationKey is verification key to verify auth circuit - AuthenticationVerificationKey types.VerificationKeyJSON = `{"protocol":"groth16","curve":"bn128","nPublic":3,"vk_alfa_1":["20491192805390485299153009773594534940189261866228447918068658471970481763042","9383485363053290200918347156157836566562967994039712273449902621266178545958","1"],"vk_beta_2":[["6375614351688725206403948262868962793625744043794305715222011528459656738731","4252822878758300859123897981450591353533073413197771768651442665752259397132"],["10505242626370262277552901082094356697409835680220590971873171140371331206856","21847035105528745403288232691147584728191162732299865338377159692350059136679"],["1","0"]],"vk_gamma_2":[["10857046999023057135944570762232829481370756359578518086990519993285655852781","11559732032986387107991004021392285783925812861821192530917403151452391805634"],["8495653923123431417604973247489272438418190587263600148770280649306958101930","4082367875863433681332203403145435568316851327593401208105741076214120093531"],["1","0"]],"vk_delta_2":[["16387671798576480847932379819368843257678774489163367102047295322423178277439","15478621310993617330780932378621004627680344811935882106064140147879135785043"],["4146651263272097482536403796145548707747481190068871240594136126762097388871","11898970623369189142377715638481376908544077570871221847177598703669075982080"],["1","0"]],"vk_alphabeta_12":[[["2029413683389138792403550203267699914886160938906632433982220835551125967885","21072700047562757817161031222997517981543347628379360635925549008442030252106"],["5940354580057074848093997050200682056184807770593307860589430076672439820312","12156638873931618554171829126792193045421052652279363021382169897324752428276"],["7898200236362823042373859371574133993780991612861777490112507062703164551277","7074218545237549455313236346927434013100842096812539264420499035217050630853"]],[["7077479683546002997211712695946002074877511277312570035766170199895071832130","10093483419865920389913245021038182291233451549023025229112148274109565435465"],["4595479056700221319381530156280926371456704509942304414423590385166031118820","19831328484489333784475432780421641293929726139240675179672856274388269393268"],["11934129596455521040620786944827826205713621633706285934057045369193958244500","8037395052364110730298837004334506829870972346962140206007064471173334027475"]]],"IC":[["19297919417399184394532324181597658329834075232866100019152812814859397268431","14699022357013157061045807542966925633990406674376276222050022522196639447960","1"],["6388362365563994994798769018624399476157773300166350845180279774476505983730","1217648947419151894183447372833203907938938673770764619682641601131531973167","1"],["3126272743831125875461477201504235660379019590657876897422768240259895227533","2925084377602205004508382849819352668757030527242022365611757402467366851533","1"],["17387847174228245327715232848798152616407267392716933941868769226711928740481","1096675226219651075629157873641324617572268342063247490094549328342254389311","1"]]}` + AuthenticationVerificationKey types.VerificationKeyJSON = `{"protocol":"groth16","curve":"bn128","nPublic":3,"vk_alfa_1":["20491192805390485299153009773594534940189261866228447918068658471970481763042","9383485363053290200918347156157836566562967994039712273449902621266178545958","1"],"vk_beta_2":[["6375614351688725206403948262868962793625744043794305715222011528459656738731","4252822878758300859123897981450591353533073413197771768651442665752259397132"],["10505242626370262277552901082094356697409835680220590971873171140371331206856","21847035105528745403288232691147584728191162732299865338377159692350059136679"],["1","0"]],"vk_gamma_2":[["10857046999023057135944570762232829481370756359578518086990519993285655852781","11559732032986387107991004021392285783925812861821192530917403151452391805634"],["8495653923123431417604973247489272438418190587263600148770280649306958101930","4082367875863433681332203403145435568316851327593401208105741076214120093531"],["1","0"]],"vk_delta_2":[["19694263744434434662724824697610631339084654192900997472125021883402560407122","7861516624790726285321211364348795773080487514138687489443597142499575141223"],["2738876604716648816741967772262011243969429981897396346763792678515398737972","21386973009415629609546452238599061674594919669070866590041058173504901396409"],["1","0"]],"vk_alphabeta_12":[[["2029413683389138792403550203267699914886160938906632433982220835551125967885","21072700047562757817161031222997517981543347628379360635925549008442030252106"],["5940354580057074848093997050200682056184807770593307860589430076672439820312","12156638873931618554171829126792193045421052652279363021382169897324752428276"],["7898200236362823042373859371574133993780991612861777490112507062703164551277","7074218545237549455313236346927434013100842096812539264420499035217050630853"]],[["7077479683546002997211712695946002074877511277312570035766170199895071832130","10093483419865920389913245021038182291233451549023025229112148274109565435465"],["4595479056700221319381530156280926371456704509942304414423590385166031118820","19831328484489333784475432780421641293929726139240675179672856274388269393268"],["11934129596455521040620786944827826205713621633706285934057045369193958244500","8037395052364110730298837004334506829870972346962140206007064471173334027475"]]],"IC":[["17106623245692425956938737408190428079269158118494909826258629366553945000817","5430348565976904452109171918773528334998905574289654814288520531596137709732","1"],["10376150657283408998543492940147842012290824680973705593630312295929730955410","14543961308140721984691165741782161567998615144065930003017623924213750141700","1"],["17036534721794983710577402339956438378421190230553161791275783292975666533053","12862827264959742106747210232665645900777105462960034836246666324057493136628","1"],["7076160623399853813933611440860748924000296430145098675956287428972591911044","14940642046125918972520475476477034359157249292423870416949994409267426896641","1"]]}` ) diff --git a/communication/auth/service_test.go b/communication/auth/service_test.go index bb7c8aa..1d1f934 100644 --- a/communication/auth/service_test.go +++ b/communication/auth/service_test.go @@ -203,32 +203,32 @@ func TestVerifyMessageWithAuthProof(t *testing.T) { zkpProof.ProofData = &types.ProofData{ A: []string{ - "18936271973117240691705559585769592974936923569213179030272017872877809039923", - "18422345941126925346404589344471685526481812474926428421192486541362664918772", + "11130843150540789299458990586020000719280246153797882843214290541980522375072", + "1300841912943781723022032355836893831132920783788455531838254465784605762713", "1"}, B: [][]string{ { - "21330507917605771112737495332384182754017872671331663255035774134477307177657", - "11462448334617588029347704885403867272225695665465848309095217964693916030466", + "20615768536988438336537777909042352056392862251785722796637590212160561351656", + "10371144806107778890538857700855108667622042215096971747203105997454625814080", }, { - "6840720762741964372185603768831031763412571244452731103935719626324813065968", - "21706573949504402596589372160652940106962129670251783730794239678073827564253", + "19598541350804478549141207835028671111063915635580679694907635914279928677812", + "15264553045517065669171584943964322117397645147006909167427809837929458012913", }, { "1", "0", }}, C: []string{ - "17548802242159422756497011319050257549779839182737330954154562317224853077096", - "16720285840459139191823107762843332365012723866736056448880671648502165007589", + "16443309279825508893086251290003936935077348754097470818523558082502364822049", + "2984180227766048100510120407150752052334571876681304999595544138155611963273", "1", }, } zkpProof.PubSignals = []string{ - "360506537017543098982364518145035624387547643177965411252793105868750389248", - "12345", - "12051733342209181702880711377819237050140862582923079913097401558944144010618", + "1", + "18311560525383319719311394957064820091354976310599818797157189568621466950811", + "323416925264666217617288569742564703632850816035761084002720090377353297920", } message.Data.Scope = []interface{}{zkpProof} @@ -237,10 +237,10 @@ func TestVerifyMessageWithAuthProof(t *testing.T) { token, err := ExtractMetadata(&message) assert.Nil(t, err) - assert.Equal(t, "12051733342209181702880711377819237050140862582923079913097401558944144010618", token.State) - assert.Equal(t, "116KTvTKY7cQHDf2yUTkuuUTSfLmsrGYzHhUSFrrXu", token.ID) + assert.Equal(t, "18311560525383319719311394957064820091354976310599818797157189568621466950811", token.State) + assert.Equal(t, "1182P96d4eBnRAUWvGyj5QiPLL5U1TiNyJwcspt478", token.ID) - state, err := token.VerifyState(context.Background(), os.Getenv("RPC_URL"), "0x09872d45c8109FC85478827967B6fEa0f59C05c2") + state, err := token.VerifyState(context.Background(), os.Getenv("RPC_URL"), "0x035C4DBC897D203483D942696CE1dF5a9f933FcC") assert.Nil(t, err) assert.Equal(t, true, state.Latest) diff --git a/communication/packer/plain_test.go b/communication/packer/plain_test.go index 04a8785..c4455c5 100644 --- a/communication/packer/plain_test.go +++ b/communication/packer/plain_test.go @@ -37,7 +37,7 @@ func TestPlainMessagePacker_Pack(t *testing.T) { func TestPlainMessagePacker_Unpack(t *testing.T) { packer := PlainMessagePacker{} - msgBytes := []byte(`{"type":"https://iden3-communication.io/authorization-response/v1","data":{"scope":[{"type":"zeroknowledge","circuit_id":"auth","pub_signals":["360506537017543098982364518145035624387547643177965411252793105868750389248","12345","12051733342209181702880711377819237050140862582923079913097401558944144010618"],"proof_data":{"pi_a":["18936271973117240691705559585769592974936923569213179030272017872877809039923","18422345941126925346404589344471685526481812474926428421192486541362664918772","1"],"pi_b":[["21330507917605771112737495332384182754017872671331663255035774134477307177657","11462448334617588029347704885403867272225695665465848309095217964693916030466"],["6840720762741964372185603768831031763412571244452731103935719626324813065968","21706573949504402596589372160652940106962129670251783730794239678073827564253"],["1","0"]],"pi_c":["17548802242159422756497011319050257549779839182737330954154562317224853077096","16720285840459139191823107762843332365012723866736056448880671648502165007589","1"],"protocol":"groth16"}}]}}`) + msgBytes := []byte(`{"type":"https://iden3-communication.io/authorization-response/v1","data":{"scope":[{"type":"zeroknowledge","circuit_id":"auth","pub_signals":["1","18311560525383319719311394957064820091354976310599818797157189568621466950811","323416925264666217617288569742564703632850816035761084002720090377353297920"],"proof_data":{"pi_a":["11130843150540789299458990586020000719280246153797882843214290541980522375072","1300841912943781723022032355836893831132920783788455531838254465784605762713","1"],"pi_b":[["20615768536988438336537777909042352056392862251785722796637590212160561351656","10371144806107778890538857700855108667622042215096971747203105997454625814080"],["19598541350804478549141207835028671111063915635580679694907635914279928677812","15264553045517065669171584943964322117397645147006909167427809837929458012913"],["1","0"]],"pi_c":["16443309279825508893086251290003936935077348754097470818523558082502364822049","2984180227766048100510120407150752052334571876681304999595544138155611963273","1"],"protocol":""}}]}}`) message, err := packer.Unpack(msgBytes) assert.Nil(t, err) assert.Equal(t, auth.AuthorizationResponseMessageType, message.GetType()) @@ -47,7 +47,7 @@ func TestPlainMessagePacker_Unpack(t *testing.T) { token, err := auth.ExtractMetadata(message) assert.Nil(t, err) - assert.Equal(t, "116KTvTKY7cQHDf2yUTkuuUTSfLmsrGYzHhUSFrrXu", token.ID) + assert.Equal(t, "1182P96d4eBnRAUWvGyj5QiPLL5U1TiNyJwcspt478", token.ID) } func TestPlainMessagePacker_PackAuthorizationResponse(t *testing.T) { @@ -63,21 +63,33 @@ func TestPlainMessagePacker_PackAuthorizationResponse(t *testing.T) { } zkpProof.ProofData = &types2.ProofData{ - A: []string{"14146277947056297753840642586002829867111675410988595047766001252156753371528", "14571022849315211248046007113544986624773029852663683182064313232057584750907", "1"}, + A: []string{ + "11130843150540789299458990586020000719280246153797882843214290541980522375072", + "1300841912943781723022032355836893831132920783788455531838254465784605762713", + "1"}, B: [][]string{ - {"16643510334478363316178974136322830670001098048711963846055396047727066595515", "10398230582752448515583571758866992012509398625081722188208617704185602394573"}, - {"6754852150473185509183929580585027939167256175425095292505368999953776521762", "4988338043999536569468301597030911639875135237017470300699903062776921637682"}, + { + "20615768536988438336537777909042352056392862251785722796637590212160561351656", + "10371144806107778890538857700855108667622042215096971747203105997454625814080", + }, + { + "19598541350804478549141207835028671111063915635580679694907635914279928677812", + "15264553045517065669171584943964322117397645147006909167427809837929458012913", + }, { "1", "0", }}, - Protocol: "groth16", C: []string{ - "17016608018243685488662035612576776697709541343999980909476169114486580874935", "1344455328868272682523157740509602348889110849570014394831093852006878298645", "1"}, + "16443309279825508893086251290003936935077348754097470818523558082502364822049", + "2984180227766048100510120407150752052334571876681304999595544138155611963273", + "1", + }, } zkpProof.PubSignals = []string{ - "383481829333688262229762912714748186426235428103586432827469388069546950656", - "12345", + "1", + "18311560525383319719311394957064820091354976310599818797157189568621466950811", + "323416925264666217617288569742564703632850816035761084002720090377353297920", } message.Data.Scope = []interface{}{zkpProof} diff --git a/proofs/zeroknowledge/proof_test.go b/proofs/zeroknowledge/proof_test.go index 3747f0b..32de44b 100644 --- a/proofs/zeroknowledge/proof_test.go +++ b/proofs/zeroknowledge/proof_test.go @@ -76,32 +76,32 @@ func TestVerifyAuthProof(t *testing.T) { proofMessage.ProofData = &types.ProofData{ A: []string{ - "18936271973117240691705559585769592974936923569213179030272017872877809039923", - "18422345941126925346404589344471685526481812474926428421192486541362664918772", + "11130843150540789299458990586020000719280246153797882843214290541980522375072", + "1300841912943781723022032355836893831132920783788455531838254465784605762713", "1"}, B: [][]string{ { - "21330507917605771112737495332384182754017872671331663255035774134477307177657", - "11462448334617588029347704885403867272225695665465848309095217964693916030466", + "20615768536988438336537777909042352056392862251785722796637590212160561351656", + "10371144806107778890538857700855108667622042215096971747203105997454625814080", }, { - "6840720762741964372185603768831031763412571244452731103935719626324813065968", - "21706573949504402596589372160652940106962129670251783730794239678073827564253", + "19598541350804478549141207835028671111063915635580679694907635914279928677812", + "15264553045517065669171584943964322117397645147006909167427809837929458012913", }, { "1", "0", }}, C: []string{ - "17548802242159422756497011319050257549779839182737330954154562317224853077096", - "16720285840459139191823107762843332365012723866736056448880671648502165007589", + "16443309279825508893086251290003936935077348754097470818523558082502364822049", + "2984180227766048100510120407150752052334571876681304999595544138155611963273", "1", }, } proofMessage.PubSignals = []string{ - "360506537017543098982364518145035624387547643177965411252793105868750389248", - "12345", - "12051733342209181702880711377819237050140862582923079913097401558944144010618", + "1", + "18311560525383319719311394957064820091354976310599818797157189568621466950811", + "323416925264666217617288569742564703632850816035761084002720090377353297920", } proofMessage.Type = "zeroknowledge" diff --git a/verification/state_test.go b/verification/state_test.go index 708bba8..0478fef 100644 --- a/verification/state_test.go +++ b/verification/state_test.go @@ -19,7 +19,6 @@ var mockPublishedLatestState, _ = new(big.Int).SetString("1476532253358095781467 var mockContractAddressForTransitionTest = "0x09872d45c8109FC85478827967B6fEa0f59C05c2" // before transition var mockIDForTransitionTest, _ = new(big.Int).SetString("349912091150981483812509429015839673754123522366181619685146358068005306368", 10) -// var mockGenesisStateForTransitionTest = "7602009011174143348823679941387689526272854949172451092389303080731259578764" var mockGenesisFistStateForTransitionTest, _ = new(big.Int).SetString("1481800847075148494788055749726405573285086688210266986684281846223884620384", 10) var mockGenesisSecondStateForTransitionTest, _ = new(big.Int).SetString("11430153088007774047880202669458681328220551152129038501672597735901360891613", 10)