diff --git a/circuits/lib/query/modifiers.circom b/circuits/lib/query/modifiers.circom index d11bb438..b9fa8347 100644 --- a/circuits/lib/query/modifiers.circom +++ b/circuits/lib/query/modifiers.circom @@ -7,7 +7,6 @@ include "../../../node_modules/circomlib/circuits/mux4.circom"; /* Modifier/computation operators: 16 - selective disclosure (16 = 10000 binary) - 17 - nullify (17 = 10001 binary) */ // modifierValidatorOutputSelector validates modifier operation and selects output value @@ -25,8 +24,7 @@ template modifierValidatorOutputSelector() { modifierOpValid.s <== [opBits[0], opBits[1], opBits[2], opBits[3]]; modifierOpValid.c <== [ 1, // valid operator: 16 - selective disclosure (16-16 = index 0) - 1, // valid operator: 17 - nullify (17-16 = index 1) - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; ForceEqualIfEnabled()( diff --git a/test/offchain/credentialAtomicQueryV3OffChain.test.ts b/test/offchain/credentialAtomicQueryV3OffChain.test.ts index 296adfb6..940805c7 100644 --- a/test/offchain/credentialAtomicQueryV3OffChain.test.ts +++ b/test/offchain/credentialAtomicQueryV3OffChain.test.ts @@ -38,7 +38,7 @@ describe("Test credentialAtomicQueryV3OffChain.circom", function () { require(`${sigBasePath}/between_operator.json`), require(`${sigBasePath}/less_than_eq_operator.json`), require(`${sigBasePath}/selective_disclosure.json`), - require(`${sigBasePath}/nullify_modifier.json`), + require(`${sigBasePath}/nullify.json`), require(`${sigBasePath}/revoked_claim_without_revocation_check.json`), require(`${sigBasePath}/jsonld_non_inclusion.json`), diff --git a/test/onchain/credentialAtomicQueryV3OnChain.test.ts b/test/onchain/credentialAtomicQueryV3OnChain.test.ts index 929731ef..e20a5270 100644 --- a/test/onchain/credentialAtomicQueryV3OnChain.test.ts +++ b/test/onchain/credentialAtomicQueryV3OnChain.test.ts @@ -39,7 +39,7 @@ describe("Test credentialAtomicQueryV3OnChain.circom", function () { require(`${sigBasePath}/between_operator.json`), require(`${sigBasePath}/less_than_eq_operator.json`), require(`${sigBasePath}/selective_disclosure.json`), - require(`${sigBasePath}/nullify_modifier.json`), + require(`${sigBasePath}/nullify.json`), require(`${sigBasePath}/revoked_claim_without_revocation_check.json`), require(`${sigBasePath}/jsonld_non_inclusion.json`), @@ -53,7 +53,7 @@ describe("Test credentialAtomicQueryV3OnChain.circom", function () { require(`${mtpBasePath}/between_operator.json`), require(`${mtpBasePath}/less_than_eq_operator.json`), require(`${mtpBasePath}/selective_disclosure.json`), - require(`${mtpBasePath}/nullify_modifier.json`), + require(`${mtpBasePath}/nullify.json`), require(`${mtpBasePath}/revoked_claim_without_revocation_check.json`), ]; diff --git a/testvectorgen/credentials/onchain/v3/testdata/mtp/nullify.json b/testvectorgen/credentials/onchain/v3/testdata/mtp/nullify.json index 63bafcb9..d9c9f721 100644 --- a/testvectorgen/credentials/onchain/v3/testdata/mtp/nullify.json +++ b/testvectorgen/credentials/onchain/v3/testdata/mtp/nullify.json @@ -1 +1 @@ -{"desc":"Nullify","inputs":{"requestID":"41","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","authClaim":["80551937543569765027552589160822318028","0","4720763745722683616702324599137259461509439547324750011830105416383780791263","4844030361230692908091131578688419341633213823133966379083981236400104720538","16547485850637761685","0","0","0"],"authClaimIncMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtpAuxHi":"0","authClaimNonRevMtpAuxHv":"0","authClaimNonRevMtpNoAux":"1","challenge":"12345","challengeSignatureR8x":"15829360093371098546177008474519342171461782120259125067189481965541223738777","challengeSignatureR8y":"10840522802382821290541462398953040493080116495308402635486440290351677745960","challengeSignatureS":"1196477404779941775725836688033485533497812196897664950083199167075327114562","userClaimsTreeRoot":"8162166103065016664685834856644195001371303013149727027131225893397958846382","userRevTreeRoot":"0","userRootsTreeRoot":"0","userState":"8039964009611210398788855768060749920589777058607598891238307089541758339342","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","gistMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"gistMtpAuxHi":"1","gistMtpAuxHv":"1","gistMtpNoAux":"0","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["20643387758736831799596675626240785455902781070167728593409367019626753600795","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"0","issuerClaimSignatureR8y":"0","issuerClaimSignatureS":"0","issuerAuthClaim":["0","0","0","0","0","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"0","issuerAuthClaimsTreeRoot":"0","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"0","proofType":"2","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0"},"expOut":{"requestID":"41","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","circuitQueryHash":"16929011653967426149256244096750351485659084384352753564748867879165864687778","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","timestamp":"1642074362","merklized":"0","proofType":"2","isRevocationChecked":"1","challenge":"12345","issuerState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0","operatorOutput":"0","nullifier":"0"}} \ No newline at end of file +{"desc":"Nullify","inputs":{"requestID":"41","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","authClaim":["80551937543569765027552589160822318028","0","4720763745722683616702324599137259461509439547324750011830105416383780791263","4844030361230692908091131578688419341633213823133966379083981236400104720538","16547485850637761685","0","0","0"],"authClaimIncMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtpAuxHi":"0","authClaimNonRevMtpAuxHv":"0","authClaimNonRevMtpNoAux":"1","challenge":"12345","challengeSignatureR8x":"15829360093371098546177008474519342171461782120259125067189481965541223738777","challengeSignatureR8y":"10840522802382821290541462398953040493080116495308402635486440290351677745960","challengeSignatureS":"1196477404779941775725836688033485533497812196897664950083199167075327114562","userClaimsTreeRoot":"8162166103065016664685834856644195001371303013149727027131225893397958846382","userRevTreeRoot":"0","userRootsTreeRoot":"0","userState":"8039964009611210398788855768060749920589777058607598891238307089541758339342","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","gistMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"gistMtpAuxHi":"1","gistMtpAuxHv":"1","gistMtpNoAux":"0","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["20643387758736831799596675626240785455902781070167728593409367019626753600795","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"0","issuerClaimSignatureR8y":"0","issuerClaimSignatureS":"0","issuerAuthClaim":["0","0","0","0","0","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"0","issuerAuthClaimsTreeRoot":"0","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"0","proofType":"2","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123"},"expOut":{"requestID":"41","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","circuitQueryHash":"16929011653967426149256244096750351485659084384352753564748867879165864687778","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","timestamp":"1642074362","merklized":"0","proofType":"2","isRevocationChecked":"1","challenge":"12345","issuerState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123","operatorOutput":"0","nullifier":"16321897390546343714174413659582254042752392145999028505097676701328201511519"}} \ No newline at end of file diff --git a/testvectorgen/credentials/onchain/v3/testdata/sig/nullify.json b/testvectorgen/credentials/onchain/v3/testdata/sig/nullify.json index f5135de1..71c7cebe 100644 --- a/testvectorgen/credentials/onchain/v3/testdata/sig/nullify.json +++ b/testvectorgen/credentials/onchain/v3/testdata/sig/nullify.json @@ -1 +1 @@ -{"desc":"Nullify","inputs":{"requestID":"41","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","authClaim":["80551937543569765027552589160822318028","0","4720763745722683616702324599137259461509439547324750011830105416383780791263","4844030361230692908091131578688419341633213823133966379083981236400104720538","16547485850637761685","0","0","0"],"authClaimIncMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtpAuxHi":"0","authClaimNonRevMtpAuxHv":"0","authClaimNonRevMtpNoAux":"1","challenge":"12345","challengeSignatureR8x":"15829360093371098546177008474519342171461782120259125067189481965541223738777","challengeSignatureR8y":"10840522802382821290541462398953040493080116495308402635486440290351677745960","challengeSignatureS":"1196477404779941775725836688033485533497812196897664950083199167075327114562","userClaimsTreeRoot":"8162166103065016664685834856644195001371303013149727027131225893397958846382","userRevTreeRoot":"0","userRootsTreeRoot":"0","userState":"8039964009611210398788855768060749920589777058607598891238307089541758339342","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","gistMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"gistMtpAuxHi":"1","gistMtpAuxHv":"1","gistMtpNoAux":"0","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"0","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"0","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"11221199059266033346696372859164397393316023025954763347270597698827371711841","issuerClaimSignatureR8y":"19675485663244684775237271147053428214373844060473703154227364177372816797062","issuerClaimSignatureS":"298573753508821631530446708193654355877879863469793002793580841887040246743","issuerAuthClaim":["80551937543569765027552589160822318028","0","18843627616807347027405965102907494712213509184168391784663804560181782095821","21769574296201138406688395494914474950554632404504713590270198507141791084591","17476719578317212277","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"1","issuerAuthClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"2943483356559152311923412925436024635269538717812859789851139200242297094","proofType":"1","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0"},"expOut":{"requestID":"41","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","circuitQueryHash":"16929011653967426149256244096750351485659084384352753564748867879165864687778","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","timestamp":"1642074362","merklized":"0","proofType":"1","isRevocationChecked":"1","challenge":"12345","issuerState":"2943483356559152311923412925436024635269538717812859789851139200242297094","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0","operatorOutput":"0","nullifier":"0"}} \ No newline at end of file +{"desc":"Nullify","inputs":{"requestID":"41","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","authClaim":["80551937543569765027552589160822318028","0","4720763745722683616702324599137259461509439547324750011830105416383780791263","4844030361230692908091131578688419341633213823133966379083981236400104720538","16547485850637761685","0","0","0"],"authClaimIncMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"authClaimNonRevMtpAuxHi":"0","authClaimNonRevMtpAuxHv":"0","authClaimNonRevMtpNoAux":"1","challenge":"12345","challengeSignatureR8x":"15829360093371098546177008474519342171461782120259125067189481965541223738777","challengeSignatureR8y":"10840522802382821290541462398953040493080116495308402635486440290351677745960","challengeSignatureS":"1196477404779941775725836688033485533497812196897664950083199167075327114562","userClaimsTreeRoot":"8162166103065016664685834856644195001371303013149727027131225893397958846382","userRevTreeRoot":"0","userRootsTreeRoot":"0","userState":"8039964009611210398788855768060749920589777058607598891238307089541758339342","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","gistMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"gistMtpAuxHi":"1","gistMtpAuxHv":"1","gistMtpNoAux":"0","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"0","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"0","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"11221199059266033346696372859164397393316023025954763347270597698827371711841","issuerClaimSignatureR8y":"19675485663244684775237271147053428214373844060473703154227364177372816797062","issuerClaimSignatureS":"298573753508821631530446708193654355877879863469793002793580841887040246743","issuerAuthClaim":["80551937543569765027552589160822318028","0","18843627616807347027405965102907494712213509184168391784663804560181782095821","21769574296201138406688395494914474950554632404504713590270198507141791084591","17476719578317212277","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"1","issuerAuthClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"2943483356559152311923412925436024635269538717812859789851139200242297094","proofType":"1","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123"},"expOut":{"requestID":"41","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","circuitQueryHash":"16929011653967426149256244096750351485659084384352753564748867879165864687778","gistRoot":"1243904711429961858774220647610724273798918457991486031567244100767259239747","timestamp":"1642074362","merklized":"0","proofType":"1","isRevocationChecked":"1","challenge":"12345","issuerState":"2943483356559152311923412925436024635269538717812859789851139200242297094","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123","operatorOutput":"0","nullifier":"16321897390546343714174413659582254042752392145999028505097676701328201511519"}} \ No newline at end of file diff --git a/testvectorgen/credentials/onchain/v3/v3_test.go b/testvectorgen/credentials/onchain/v3/v3_test.go index 24c2c386..43693aac 100644 --- a/testvectorgen/credentials/onchain/v3/v3_test.go +++ b/testvectorgen/credentials/onchain/v3/v3_test.go @@ -236,9 +236,8 @@ func Test_Nullify(t *testing.T) { isUserIDProfile := true isSubjectIDProfile := true value := utils.PrepareStrArray([]string{"94313"}, 64) - // FIXME: pass verifier session id - generateTestDataWithOperator(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "mtp/nullify", utils.NOOP, &value, Mtp) - generateTestDataWithOperator(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "sig/nullify", utils.NOOP, &value, Sig) + generateTestDataWithOperatorAndRevCheck(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "123", "mtp/nullify", utils.NOOP, &value, false, 1, false, Mtp) + generateTestDataWithOperatorAndRevCheck(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "123", "sig/nullify", utils.NOOP, &value, false, 1, false, Sig) } func Test_Selective_Disclosure(t *testing.T) { diff --git a/testvectorgen/credentials/v3/testdata/mtp/nullify.json b/testvectorgen/credentials/v3/testdata/mtp/nullify.json index 0ef82333..c05b05d5 100644 --- a/testvectorgen/credentials/v3/testdata/mtp/nullify.json +++ b/testvectorgen/credentials/v3/testdata/mtp/nullify.json @@ -1 +1 @@ -{"desc":"Nullify","inputs":{"requestID":"23","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["20643387758736831799596675626240785455902781070167728593409367019626753600795","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"0","issuerClaimSignatureR8y":"0","issuerClaimSignatureS":"0","issuerAuthClaim":["0","0","0","0","0","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"0","issuerAuthClaimsTreeRoot":"0","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"0","proofType":"2","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0"},"expOut":{"requestID":"23","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","claimSchema":"180410020913331409885634153623124536270","slotIndex":"2","operator":0,"claimPathKey":"0","claimPathNotExists":"0","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"timestamp":"1642074362","merklized":"0","proofType":"2","isRevocationChecked":"1","issuerState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0","operatorOutput":"0","nullifier":"0"}} \ No newline at end of file +{"desc":"Nullify","inputs":{"requestID":"23","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["20643387758736831799596675626240785455902781070167728593409367019626753600795","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"7419045039042237863070569122551615300550939785675873357832492568184510137025","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"0","issuerClaimSignatureR8y":"0","issuerClaimSignatureS":"0","issuerAuthClaim":["0","0","0","0","0","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"0","issuerAuthClaimsTreeRoot":"0","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"0","proofType":"2","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123"},"expOut":{"requestID":"23","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","claimSchema":"180410020913331409885634153623124536270","slotIndex":"2","operator":0,"claimPathKey":"0","claimPathNotExists":"0","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"timestamp":"1642074362","merklized":"0","proofType":"2","isRevocationChecked":"1","issuerState":"4575193482325603893215142619623809490166676718476384166883471046672443708329","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123","operatorOutput":"0","nullifier":"16321897390546343714174413659582254042752392145999028505097676701328201511519"}} \ No newline at end of file diff --git a/testvectorgen/credentials/v3/testdata/sig/nullify.json b/testvectorgen/credentials/v3/testdata/sig/nullify.json index 294bc8ee..c1e3f177 100644 --- a/testvectorgen/credentials/v3/testdata/sig/nullify.json +++ b/testvectorgen/credentials/v3/testdata/sig/nullify.json @@ -1 +1 @@ -{"desc":"Nullify","inputs":{"requestID":"23","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"0","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"0","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"11221199059266033346696372859164397393316023025954763347270597698827371711841","issuerClaimSignatureR8y":"19675485663244684775237271147053428214373844060473703154227364177372816797062","issuerClaimSignatureS":"298573753508821631530446708193654355877879863469793002793580841887040246743","issuerAuthClaim":["80551937543569765027552589160822318028","0","18843627616807347027405965102907494712213509184168391784663804560181782095821","21769574296201138406688395494914474950554632404504713590270198507141791084591","17476719578317212277","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"1","issuerAuthClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"2943483356559152311923412925436024635269538717812859789851139200242297094","proofType":"1","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0"},"expOut":{"requestID":"23","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","claimSchema":"180410020913331409885634153623124536270","slotIndex":"2","operator":0,"claimPathKey":"0","claimPathNotExists":"0","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"timestamp":"1642074362","merklized":"0","proofType":"1","isRevocationChecked":"1","issuerState":"2943483356559152311923412925436024635269538717812859789851139200242297094","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"0","operatorOutput":"0","nullifier":"0"}} \ No newline at end of file +{"desc":"Nullify","inputs":{"requestID":"23","userGenesisID":"23273167900576580892722615617815475823351560716009055944677723144398443009","profileNonce":"10","claimSubjectProfileNonce":"999","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaim":["3583233690122716044519380227940806650830","28275098119780158026040482722477442169764247619454891891569161278093595137","10","0","30803922965249841627828060161","0","0","0"],"issuerClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimClaimsTreeRoot":"0","issuerClaimRevTreeRoot":"0","issuerClaimRootsTreeRoot":"0","issuerClaimIdenState":"0","isRevocationChecked":1,"issuerClaimNonRevClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerClaimNonRevRevTreeRoot":"0","issuerClaimNonRevRootsTreeRoot":"0","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","issuerClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimNonRevMtpAuxHi":"0","issuerClaimNonRevMtpAuxHv":"0","issuerClaimNonRevMtpNoAux":"1","claimSchema":"180410020913331409885634153623124536270","claimPathNotExists":"0","claimPathMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"claimPathMtpNoAux":"0","claimPathMtpAuxHi":"0","claimPathMtpAuxHv":"0","claimPathKey":"0","claimPathValue":"0","operator":0,"slotIndex":2,"timestamp":"1642074362","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerClaimSignatureR8x":"11221199059266033346696372859164397393316023025954763347270597698827371711841","issuerClaimSignatureR8y":"19675485663244684775237271147053428214373844060473703154227364177372816797062","issuerClaimSignatureS":"298573753508821631530446708193654355877879863469793002793580841887040246743","issuerAuthClaim":["80551937543569765027552589160822318028","0","18843627616807347027405965102907494712213509184168391784663804560181782095821","21769574296201138406688395494914474950554632404504713590270198507141791084591","17476719578317212277","0","0","0"],"issuerAuthClaimMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtp":["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"issuerAuthClaimNonRevMtpAuxHi":"0","issuerAuthClaimNonRevMtpAuxHv":"0","issuerAuthClaimNonRevMtpNoAux":"1","issuerAuthClaimsTreeRoot":"20643387758736831799596675626240785455902781070167728593409367019626753600795","issuerAuthRevTreeRoot":"0","issuerAuthRootsTreeRoot":"0","issuerAuthState":"2943483356559152311923412925436024635269538717812859789851139200242297094","proofType":"1","linkNonce":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123"},"expOut":{"requestID":"23","userID":"22547885961380641656890522948966953732133055194604876766672713705832321537","issuerID":"22057981499787921734624217749308316644136637822444794206796063681866502657","issuerClaimNonRevState":"2943483356559152311923412925436024635269538717812859789851139200242297094","claimSchema":"180410020913331409885634153623124536270","slotIndex":"2","operator":0,"claimPathKey":"0","claimPathNotExists":"0","value":["94313","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"],"timestamp":"1642074362","merklized":"0","proofType":"1","isRevocationChecked":"1","issuerState":"2943483356559152311923412925436024635269538717812859789851139200242297094","linkID":"0","verifierID":"21929109382993718606847853573861987353620810345503358891473103689157378049","verifierSessionID":"123","operatorOutput":"0","nullifier":"16321897390546343714174413659582254042752392145999028505097676701328201511519"}} \ No newline at end of file diff --git a/testvectorgen/credentials/v3/v3_test.go b/testvectorgen/credentials/v3/v3_test.go index c77f06a6..21936a00 100644 --- a/testvectorgen/credentials/v3/v3_test.go +++ b/testvectorgen/credentials/v3/v3_test.go @@ -215,9 +215,8 @@ func Test_Nullify(t *testing.T) { isUserIDProfile := true isSubjectIDProfile := true value := utils.PrepareStrArray([]string{"94313"}, 64) - // FIXME: pass verifier session id - generateTestDataWithOperator(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "mtp/nullify", utils.NOOP, &value, Mtp) - generateTestDataWithOperator(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "sig/nullify", utils.NOOP, &value, Sig) + generateTestDataWithOperatorAndRevCheck(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "123", "mtp/nullify", utils.NOOP, &value, false, 1, false, Mtp) + generateTestDataWithOperatorAndRevCheck(t, desc, isUserIDProfile, isSubjectIDProfile, "0", "123", "sig/nullify", utils.NOOP, &value, false, 1, false, Sig) } func Test_Selective_Disclosure(t *testing.T) { diff --git a/testvectorgen/utils/constants.go b/testvectorgen/utils/constants.go index 77501635..4d759ed5 100644 --- a/testvectorgen/utils/constants.go +++ b/testvectorgen/utils/constants.go @@ -14,8 +14,7 @@ const ( LTE GTE BETWEEN - SD = 16 - NULLIFY = 17 + SD = 16 ) var (