0.2.4

deps
Merge pull request #49 from krlosMata/feature/fix-smt-update
2020-08-31 18:30:11 +02:00 · 2020-08-31 18:30:04 +02:00 · 2020-08-31 17:14:45 +02:00 · 2020-08-28 04:29:49 +02:00 · 2020-08-27 16:46:49 +03:00 · 2020-08-25 13:08:53 +02:00
30 changed files with 5137 additions and 1323 deletions
--- a/circuits/README.md
+++ b/circuits/README.md
@@ -49,7 +49,7 @@ Folder containing the circuit implementation of Sparse Merkle Trees.
    - OUTPUT
    - BENCHMARKS
    - EXAMPLE
-    
+
 ### babyjub

 Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby_jubjub) in twisted Edwards form. (TODO: Expose here the characteristics of the curve?)
@@ -58,22 +58,22 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby
 - `BabyAdd()`

    - DESCRIPTION
-    
+
      It adds two points on the Baby Jubjub curve. More specifically, given two points P1 = (`x1`, `y1`) and P2 = (`x2`, `y2`) it returns a point P3 = (`xout`, `yout`)  such that

-        (`xout`, `yout`) =  (`x1`,`y1`) + (`x2`,`y2`) 
+        (`xout`, `yout`) =  (`x1`,`y1`) + (`x2`,`y2`)
             = ((`x1y2`+`y1x2`)/(1+`dx1x2y1y2`)),(`y1y2`-`ax1x2`)/(1-`dx1x2y1y2`))
-    
+
    - SCHEMA
       ```
                                        var a     var d
                                          |         |
                                          |         |
-                                    ______v_________v_______     
+                                    ______v_________v_______
                   input x1 ---->  |                        |
                   input y1 ---->  |        BabyAdd()       | ----> output xout
                   input x2 ---->  |                        | ----> output yout
-                   input y2 ---->  |________________________|     
+                   input y2 ---->  |________________________|
       ```

    - INPUTS
@@ -84,16 +84,16 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby
      | `y1`          | Bigint         | Field element of Fp | Second coordinate of a point (x1, y1) on E. |
      | `x2`          | Bigint         | Field element of Fp | First coordinate of a point (x2, y2) on E.  |
      | `y2`          | Bigint         | Field element of Fp | Second coordinate of a point (x2, y2) on E. |
-   
+
      Requirement: at least `x1`!=`x2` or `y1`!=`y2`.

    - OUTPUT
-        
+
      | Input         | Representation | Description         |                                             |
      | ------------- | -------------  | -------------       | -------------                               |
      | `xout`          | Bigint         | Field element of Fp | First coordinate of the addition point (xout, yout) = (x1, y1) + (x2, y2).  |
      | `yout`          | Bigint         | Field element of Fp | Second coordinate of the addition point (xout, yout) = (x1, y1) + (x2, y2). |
-        
+
    - BENCHMARKS (constraints)

    - EXAMPLE
@@ -108,7 +108,7 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby

 - `BabyCheck()`

-    - DESCRIPTION : checks if a given point is in the curve. 
+    - DESCRIPTION : checks if a given point is in the curve.
    - SCHEMA
    - INPUT
    - OUTPUT
@@ -127,7 +127,7 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby

 ### binsub

- `BinSub(n)`    
+- `BinSub(n)`

    - DESCRIPTION: binary substraction.
    - SCHEMA
@@ -140,7 +140,7 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby

 - `nbits(a)`

-    - DESCRIPTION : binary sum. 
+    - DESCRIPTION : binary sum.
    - SCHEMA
    - INPUT
    - OUTPUT
@@ -149,7 +149,7 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby

 - `BinSum(n, ops)`

-    - DESCRIPTION 
+    - DESCRIPTION
    - SCHEMA
    - INPUT
    - OUTPUT
@@ -169,7 +169,7 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby

 - `Num2Bits_strict()`

-    - DESCRIPTION 
+    - DESCRIPTION
    - SCHEMA
    - INPUT
    - OUTPUT
@@ -259,7 +259,7 @@ Arithmetic on [Baby Jubjub elliptic curve](https://github.com/barryWhiteHat/baby
    - BENCHMARKS
    - EXAMPLE

-### compconstant 
+### compconstant

 - `CompConstant(ct)`

@@ -688,7 +688,7 @@ Implementation of MiMC-7 hash in Fp being...  (link to description of the hash)

 ### pedersen_old

-Old version of the Pedersen hash (do not use any 
+Old version of the Pedersen hash (do not use any
 more?).

 ### pedersen
@@ -720,7 +720,7 @@ more?).
    - BENCHMARKS
    - EXAMPLE

-### pointbits  
+### pointbits

 - `sqrt(n)`

@@ -780,7 +780,7 @@ Implementation of Poseidon hash function (LINK)
    - BENCHMARKS
    - EXAMPLE

- `Ark(t, C)`
+- `Ark(t, C, r)`

    - DESCRIPTION
    - SCHEMA
@@ -798,7 +798,7 @@ Implementation of Poseidon hash function (LINK)
    - BENCHMARKS
    - EXAMPLE

- `Poseidon(nInputs, t, nRoundsF, nRoundsP)`
+- `Poseidon(nInputs)`

    - DESCRIPTION
    - SCHEMA
--- a/circuits/comparators.circom
+++ b/circuits/comparators.circom
@@ -86,10 +86,11 @@ template LessThan(n) {
 */

 template LessThan(n) {
+    assert(n <= 252);
    signal input in[2];
    signal output out;

-    component n2b = Num2Bits(n*2+1);
+    component n2b = Num2Bits(n+1);

    n2b.in <== in[0]+ (1<<n) - in[1];

--- a/circuits/eddsaposeidon.circom
+++ b/circuits/eddsaposeidon.circom
@@ -51,7 +51,7 @@ template EdDSAPoseidonVerifier() {

 // Calculate the h = H(R,A, msg)

-    component hash = Poseidon(5, 6, 8, 57);
+    component hash = Poseidon(5);

    hash.inputs[0] <== R8x;
    hash.inputs[1] <== R8y;
--- a/circuits/pedersen.circom
+++ b/circuits/pedersen.circom
@@ -177,16 +177,17 @@ template Pedersen(n) {
    signal output out[2];

    var BASE[10][2] = [
-        [7688621503272331394947188562469131124099290577812125474996268020905176040083,6637287939860384587467947982369268811366630904563077767287326262235485629411],
-        [11549681895645637778324638856880330712650895608496649854094912415387988201330,5771732722784528537721081267383956005090479808901717812009343940574217488577],
-        [18790245153471844934157747708238883966079935875787657036767664036124524381945,18300275459419441151064576487317481499516933849631632883767173501999997278432],
-        [16301069151422548986850494139112207641738464387919729729324473657161689764196,8215273507373494014441104012907835625670941526105528197815397741007626226499],
-        [12597665704678284488008395353749282149622295037737374782196049599390683534185,4072455241781501621593714139281767473040087753548015968773801065193764079468],
-        [4729410576230735258214831208080552588881894465489299233097088872252465832672,14367731890670510422926552586486424937476635415639602730590517235570020260326],
-        [7546420686025050869200393054526306477146836870617678274607971529534032974471,8663210466512842901413293603100781938253817808912549776944118491282484711929],
-        [6544653022506992755201027646251976600601201151329001772892901529509137954387,5932506509962692832681604586561215780097326378431958035490245111470435106811],
-        [12376274813795671622507230443130412169480807188767687554607910279743333852725,10116389110458158800073166533660211332390835019644001845057351607297889034557],
-        [18268098112071835140361074835791174816144587762778386397940339415400583397725,8120955462199046866292537174552276799123029303901205157708576578886090835495]
+        [10457101036533406547632367118273992217979173478358440826365724437999023779287,19824078218392094440610104313265183977899662750282163392862422243483260492317],
+        [2671756056509184035029146175565761955751135805354291559563293617232983272177,2663205510731142763556352975002641716101654201788071096152948830924149045094],
+        [5802099305472655231388284418920769829666717045250560929368476121199858275951,5980429700218124965372158798884772646841287887664001482443826541541529227896],
+        [7107336197374528537877327281242680114152313102022415488494307685842428166594,2857869773864086953506483169737724679646433914307247183624878062391496185654],
+        [20265828622013100949498132415626198973119240347465898028410217039057588424236,1160461593266035632937973507065134938065359936056410650153315956301179689506],
+        [1487999857809287756929114517587739322941449154962237464737694709326309567994,14017256862867289575056460215526364897734808720610101650676790868051368668003],
+        [14618644331049802168996997831720384953259095788558646464435263343433563860015,13115243279999696210147231297848654998887864576952244320558158620692603342236],
+        [6814338563135591367010655964669793483652536871717891893032616415581401894627,13660303521961041205824633772157003587453809761793065294055279768121314853695],
+        [3571615583211663069428808372184817973703476260057504149923239576077102575715,11981351099832644138306422070127357074117642951423551606012551622164230222506],
+        [18597552580465440374022635246985743886550544261632147935254624835147509493269,6753322320275422086923032033899357299485124665258735666995435957890214041481]
+
    ];

    var nSegments = ((n-1)\200)+1;
--- a/circuits/pedersen_old.circom
+++ b/circuits/pedersen_old.circom
@@ -29,16 +29,17 @@ template Pedersen(n) {
    component escalarMuls[nexps];

    var PBASE[10][2] = [
-        [7688621503272331394947188562469131124099290577812125474996268020905176040083,6637287939860384587467947982369268811366630904563077767287326262235485629411],
-        [11549681895645637778324638856880330712650895608496649854094912415387988201330,5771732722784528537721081267383956005090479808901717812009343940574217488577],
-        [18790245153471844934157747708238883966079935875787657036767664036124524381945,18300275459419441151064576487317481499516933849631632883767173501999997278432],
-        [16301069151422548986850494139112207641738464387919729729324473657161689764196,8215273507373494014441104012907835625670941526105528197815397741007626226499],
-        [12597665704678284488008395353749282149622295037737374782196049599390683534185,4072455241781501621593714139281767473040087753548015968773801065193764079468],
-        [4729410576230735258214831208080552588881894465489299233097088872252465832672,14367731890670510422926552586486424937476635415639602730590517235570020260326],
-        [7546420686025050869200393054526306477146836870617678274607971529534032974471,8663210466512842901413293603100781938253817808912549776944118491282484711929],
-        [6544653022506992755201027646251976600601201151329001772892901529509137954387,5932506509962692832681604586561215780097326378431958035490245111470435106811],
-        [12376274813795671622507230443130412169480807188767687554607910279743333852725,10116389110458158800073166533660211332390835019644001845057351607297889034557],
-        [18268098112071835140361074835791174816144587762778386397940339415400583397725,8120955462199046866292537174552276799123029303901205157708576578886090835495]
+        [10457101036533406547632367118273992217979173478358440826365724437999023779287,19824078218392094440610104313265183977899662750282163392862422243483260492317],
+        [2671756056509184035029146175565761955751135805354291559563293617232983272177,2663205510731142763556352975002641716101654201788071096152948830924149045094],
+        [5802099305472655231388284418920769829666717045250560929368476121199858275951,5980429700218124965372158798884772646841287887664001482443826541541529227896],
+        [7107336197374528537877327281242680114152313102022415488494307685842428166594,2857869773864086953506483169737724679646433914307247183624878062391496185654],
+        [20265828622013100949498132415626198973119240347465898028410217039057588424236,1160461593266035632937973507065134938065359936056410650153315956301179689506],
+        [1487999857809287756929114517587739322941449154962237464737694709326309567994,14017256862867289575056460215526364897734808720610101650676790868051368668003],
+        [14618644331049802168996997831720384953259095788558646464435263343433563860015,13115243279999696210147231297848654998887864576952244320558158620692603342236],
+        [6814338563135591367010655964669793483652536871717891893032616415581401894627,13660303521961041205824633772157003587453809761793065294055279768121314853695],
+        [3571615583211663069428808372184817973703476260057504149923239576077102575715,11981351099832644138306422070127357074117642951423551606012551622164230222506],
+        [18597552580465440374022635246985743886550544261632147935254624835147509493269,6753322320275422086923032033899357299485124665258735666995435957890214041481]
+
    ];

    var i;
--- a/circuits/poseidon.circom
+++ b/circuits/poseidon.circom
@@ -1,3 +1,4 @@
+include "./poseidon_constants.circom";

 template Sigma() {
    signal input in;
@@ -12,169 +13,53 @@ template Sigma() {
    out <== in4*in;
 }

-template Ark(t, C) {
+template Ark(t, C, r) {
    signal input in[t];
    signal output out[t];
+
    for (var i=0; i<t; i++) {
-        out[i] <== in[i] + C;
+        out[i] <== in[i] + C[i + r];
    }
 }

 template Mix(t, M) {
    signal input in[t];
    signal output out[t];
+
    var lc;
-
-    var i;
-    var j;
-
-    for (i=0; i<t; i++) {
+    for (var i=0; i<t; i++) {
        lc = 0;
-        for (j=0; j<t; j++) {
-            lc = lc + M[i][j]*in[j];
+        for (var j=0; j<t; j++) {
+            lc += M[j][i]*in[j];
        }
        out[i] <== lc;
    }
 }

-//    var nRoundsF = 8;
-//    var nRoundsP = 57;
-//    var t = 6;
-
-template Poseidon(nInputs, t, nRoundsF, nRoundsP) {
-
-    var C[65] = [
-        14397397413755236225575615486459253198602422701513067526754101844196324375522,
-        10405129301473404666785234951972711717481302463898292859783056520670200613128,
-        5179144822360023508491245509308555580251733042407187134628755730783052214509,
-        9132640374240188374542843306219594180154739721841249568925550236430986592615,
-        20360807315276763881209958738450444293273549928693737723235350358403012458514,
-        17933600965499023212689924809448543050840131883187652471064418452962948061619,
-        3636213416533737411392076250708419981662897009810345015164671602334517041153,
-        2008540005368330234524962342006691994500273283000229509835662097352946198608,
-        16018407964853379535338740313053768402596521780991140819786560130595652651567,
-        20653139667070586705378398435856186172195806027708437373983929336015162186471,
-        17887713874711369695406927657694993484804203950786446055999405564652412116765,
-        4852706232225925756777361208698488277369799648067343227630786518486608711772,
-        8969172011633935669771678412400911310465619639756845342775631896478908389850,
-        20570199545627577691240476121888846460936245025392381957866134167601058684375,
-        16442329894745639881165035015179028112772410105963688121820543219662832524136,
-        20060625627350485876280451423010593928172611031611836167979515653463693899374,
-        16637282689940520290130302519163090147511023430395200895953984829546679599107,
-        15599196921909732993082127725908821049411366914683565306060493533569088698214,
-        16894591341213863947423904025624185991098788054337051624251730868231322135455,
-        1197934381747032348421303489683932612752526046745577259575778515005162320212,
-        6172482022646932735745595886795230725225293469762393889050804649558459236626,
-        21004037394166516054140386756510609698837211370585899203851827276330669555417,
-        15262034989144652068456967541137853724140836132717012646544737680069032573006,
-        15017690682054366744270630371095785995296470601172793770224691982518041139766,
-        15159744167842240513848638419303545693472533086570469712794583342699782519832,
-        11178069035565459212220861899558526502477231302924961773582350246646450941231,
-        21154888769130549957415912997229564077486639529994598560737238811887296922114,
-        20162517328110570500010831422938033120419484532231241180224283481905744633719,
-        2777362604871784250419758188173029886707024739806641263170345377816177052018,
-        15732290486829619144634131656503993123618032247178179298922551820261215487562,
-        6024433414579583476444635447152826813568595303270846875177844482142230009826,
-        17677827682004946431939402157761289497221048154630238117709539216286149983245,
-        10716307389353583413755237303156291454109852751296156900963208377067748518748,
-        14925386988604173087143546225719076187055229908444910452781922028996524347508,
-        8940878636401797005293482068100797531020505636124892198091491586778667442523,
-        18911747154199663060505302806894425160044925686870165583944475880789706164410,
-        8821532432394939099312235292271438180996556457308429936910969094255825456935,
-        20632576502437623790366878538516326728436616723089049415538037018093616927643,
-        71447649211767888770311304010816315780740050029903404046389165015534756512,
-        2781996465394730190470582631099299305677291329609718650018200531245670229393,
-        12441376330954323535872906380510501637773629931719508864016287320488688345525,
-        2558302139544901035700544058046419714227464650146159803703499681139469546006,
-        10087036781939179132584550273563255199577525914374285705149349445480649057058,
-        4267692623754666261749551533667592242661271409704769363166965280715887854739,
-        4945579503584457514844595640661884835097077318604083061152997449742124905548,
-        17742335354489274412669987990603079185096280484072783973732137326144230832311,
-        6266270088302506215402996795500854910256503071464802875821837403486057988208,
-        2716062168542520412498610856550519519760063668165561277991771577403400784706,
-        19118392018538203167410421493487769944462015419023083813301166096764262134232,
-        9386595745626044000666050847309903206827901310677406022353307960932745699524,
-        9121640807890366356465620448383131419933298563527245687958865317869840082266,
-        3078975275808111706229899605611544294904276390490742680006005661017864583210,
-        7157404299437167354719786626667769956233708887934477609633504801472827442743,
-        14056248655941725362944552761799461694550787028230120190862133165195793034373,
-        14124396743304355958915937804966111851843703158171757752158388556919187839849,
-        11851254356749068692552943732920045260402277343008629727465773766468466181076,
-        9799099446406796696742256539758943483211846559715874347178722060519817626047,
-        10156146186214948683880719664738535455146137901666656566575307300522957959544,
-        19908645952733301583346063785055921934459499091029406575311417879963332475861,
-        11766105336238068471342414351862472329437473380853789942065610694000443387471,
-        11002137593249972174092192767251572171769044073555430468487809799220351297047,
-        284136377911685911941431040940403846843630064858778505937392780738953624163,
-        19448733709802908339787967270452055364068697565906862913410983275341804035680,
-        14423660424692802524250720264041003098290275890428483723270346403986712981505,
-        10635360132728137321700090133109897687122647659471659996419791842933639708516
-    ];
-
-    var M[6][6] = [
-        [
-            19167410339349846567561662441069598364702008768579734801591448511131028229281,
-            14183033936038168803360723133013092560869148726790180682363054735190196956789,
-            9067734253445064890734144122526450279189023719890032859456830213166173619761,
-            16378664841697311562845443097199265623838619398287411428110917414833007677155,
-            12968540216479938138647596899147650021419273189336843725176422194136033835172,
-            3636162562566338420490575570584278737093584021456168183289112789616069756675
-        ],[
-            17034139127218860091985397764514160131253018178110701196935786874261236172431,
-            2799255644797227968811798608332314218966179365168250111693473252876996230317,
-            2482058150180648511543788012634934806465808146786082148795902594096349483974,
-            16563522740626180338295201738437974404892092704059676533096069531044355099628,
-            10468644849657689537028565510142839489302836569811003546969773105463051947124,
-            3328913364598498171733622353010907641674136720305714432354138807013088636408
-        ],[
-            18985203040268814769637347880759846911264240088034262814847924884273017355969,
-            8652975463545710606098548415650457376967119951977109072274595329619335974180,
-            970943815872417895015626519859542525373809485973005165410533315057253476903,
-            19406667490568134101658669326517700199745817783746545889094238643063688871948,
-            17049854690034965250221386317058877242629221002521630573756355118745574274967,
-            4964394613021008685803675656098849539153699842663541444414978877928878266244
-        ],[
-            19025623051770008118343718096455821045904242602531062247152770448380880817517,
-            9077319817220936628089890431129759976815127354480867310384708941479362824016,
-            4770370314098695913091200576539533727214143013236894216582648993741910829490,
-            4298564056297802123194408918029088169104276109138370115401819933600955259473,
-            6905514380186323693285869145872115273350947784558995755916362330070690839131,
-            4783343257810358393326889022942241108539824540285247795235499223017138301952
-        ],[
-            16205238342129310687768799056463408647672389183328001070715567975181364448609,
-            8303849270045876854140023508764676765932043944545416856530551331270859502246,
-            20218246699596954048529384569730026273241102596326201163062133863539137060414,
-            1712845821388089905746651754894206522004527237615042226559791118162382909269,
-            13001155522144542028910638547179410124467185319212645031214919884423841839406,
-            16037892369576300958623292723740289861626299352695838577330319504984091062115
-        ],[
-            15162889384227198851506890526431746552868519326873025085114621698588781611738,
-            13272957914179340594010910867091459756043436017766464331915862093201960540910,
-            9416416589114508529880440146952102328470363729880726115521103179442988482948,
-            8035240799672199706102747147502951589635001418759394863664434079699838251138,
-            21642389080762222565487157652540372010968704000567605990102641816691459811717,
-            20261355950827657195644012399234591122288573679402601053407151083849785332516
-        ]
-    ];
-
-
+template Poseidon(nInputs) {
    signal input inputs[nInputs];
    signal output out;

-    component ark[nRoundsF + nRoundsP];
-    component sigmaF[nRoundsF][t];
-    component sigmaP[nRoundsP];
-    component mix[nRoundsF + nRoundsP];
+    // Using recommended parameters from whitepaper https://eprint.iacr.org/2019/458.pdf (table 2, table 8)
+    // Generated by https://extgit.iaik.tugraz.at/krypto/hadeshash/-/blob/master/code/calc_round_numbers.py
+    // And rounded up to nearest integer that divides by t
+    var N_ROUNDS_P[8] = [56, 57, 56, 60, 60, 63, 64, 63];
+    var t = nInputs + 1;
+    var nRoundsF = 8;
+    var nRoundsP = N_ROUNDS_P[t - 2];
+    var C[t*(nRoundsF + nRoundsP)] = POSEIDON_C(t);
+    var M[t][t] = POSEIDON_M(t);
+
+    component ark[nRoundsF + nRoundsP - 1];
+    component sigmaF[nRoundsF - 1][t];
+    component sigmaP[nRoundsP];
+    component mix[nRoundsF + nRoundsP - 1];

-    var i;
-    var j;
    var k;

-    for (i=0; i<(nRoundsF + nRoundsP); i++) {
-        ark[i] = Ark(t, C[i]);
-        mix[i] = Mix(t, M);
-
-        for (j=0; j<t; j++) {
+    for (var i=0; i<nRoundsF + nRoundsP - 1; i++) {
+        ark[i] = Ark(t, C, t*i);
+        for (var j=0; j<t; j++) {
            if (i==0) {
                if (j<nInputs) {
                    ark[i].in[j] <== inputs[j];
@@ -186,23 +71,28 @@ template Poseidon(nInputs, t, nRoundsF, nRoundsP) {
            }
        }

-        if ((i<(nRoundsF/2)) || (i>= (nRoundsP + nRoundsF/2))) {
-            k= i<nRoundsF/2 ? i : (i-nRoundsP);
-            for (j=0; j<t; j++) {
+        if (i < nRoundsF/2 || i >= nRoundsP + nRoundsF/2) {
+            k = i < nRoundsF/2 ? i : i - nRoundsP;
+            mix[i] = Mix(t, M);
+            for (var j=0; j<t; j++) {
                sigmaF[k][j] = Sigma();
                sigmaF[k][j].in <== ark[i].out[j];
                mix[i].in[j] <== sigmaF[k][j].out;
            }
        } else {
-            k= i-nRoundsF/2;
+            k = i - nRoundsF/2;
+            mix[i] = Mix(t, M);
            sigmaP[k] = Sigma();
            sigmaP[k].in <== ark[i].out[0];
            mix[i].in[0] <== sigmaP[k].out;
-            for (j=1; j<t; j++) {
+            for (var j=1; j<t; j++) {
                mix[i].in[j] <== ark[i].out[j];
            }
        }
    }

-    out <== mix[nRoundsF + nRoundsP -1].out[0];
+    // last round is done only for the first word, so we do it manually to save constraints
+    component lastSigmaF = Sigma();
+    lastSigmaF.in <== mix[nRoundsF + nRoundsP - 2].out[0] + C[t*(nRoundsF + nRoundsP - 1)];
+    out <== lastSigmaF.out;
 }
--- a/circuits/poseidon_constants.circom
+++ b/circuits/poseidon_constants.circom
--- a/circuits/smt/smthash_poseidon.circom
+++ b/circuits/smt/smthash_poseidon.circom
@@ -29,7 +29,7 @@ template SMTHash1() {
    signal input value;
    signal output out;

-    component h = Poseidon(3, 6, 8, 57);   // Constant
+    component h = Poseidon(3);   // Constant
    h.inputs[0] <== key;
    h.inputs[1] <== value;
    h.inputs[2] <== 1;
@@ -48,7 +48,7 @@ template SMTHash2() {
    signal input R;
    signal output out;

-    component h = Poseidon(2, 6, 8, 57);   // Constant
+    component h = Poseidon(2);   // Constant
    h.inputs[0] <== L;
    h.inputs[1] <== R;

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "circomlib",
-  "version": "0.2.0",
+  "version": "0.2.4",
  "description": "Basic circuits library for Circom",
  "main": "index.js",
  "directories": {
@@ -24,14 +24,15 @@
  "author": "0Kims",
  "license": "GPL-3.0",
  "dependencies": {
+    "blake-hash": "^1.1.0",
    "blake2b": "^2.1.3",
-    "circom": "0.5.8",
-    "ffjavascript": "0.1.0",
-    "web3": "^1.2.6"
+    "circom": "0.5.21",
+    "ffjavascript": "0.1.0"
  },
  "devDependencies": {
    "eslint": "^6.8.0",
-    "ganache-cli": "^6.9.1",
-    "mocha": "^7.1.1"
+    "ganache-cli": "^6.10.1",
+    "mocha": "^7.1.1",
+    "web3": "^1.2.11"
  }
 }
--- a/src/eddsa.js
+++ b/src/eddsa.js
@@ -1,4 +1,4 @@
-const blake2b = require("blake2b");
+const createBlakeHash = require("blake-hash");
 const Scalar = require("ffjavascript").Scalar;
 const F1Field = require("ffjavascript").F1Field;
 const babyJub = require("./babyjub");
@@ -32,19 +32,19 @@ function pruneBuffer(_buff) {
 }

 function prv2pub(prv) {
-    const sBuff = pruneBuffer(blake2b(64).update(prv).digest().slice(0,32));
+    const sBuff = pruneBuffer(createBlakeHash("blake512").update(prv).digest().slice(0,32));
    let s = utils.leBuff2int(sBuff);
    const A = babyJub.mulPointEscalar(babyJub.Base8, Scalar.shr(s,3));
    return A;
 }

 function sign(prv, msg) {
-    const h1 = Buffer.from(blake2b(64).update(prv).digest());
+    const h1 = createBlakeHash("blake512").update(prv).digest();
    const sBuff = pruneBuffer(h1.slice(0,32));
    const s = utils.leBuff2int(sBuff);
    const A = babyJub.mulPointEscalar(babyJub.Base8, Scalar.shr(s, 3));

-    const rBuff = Buffer.from(blake2b(64).update(Buffer.concat([h1.slice(32,64), msg])).digest());
+    const rBuff = createBlakeHash("blake512").update(Buffer.concat([h1.slice(32,64), msg])).digest();
    let r = utils.leBuff2int(rBuff);
    const Fr = new F1Field(babyJub.subOrder);
    r = Fr.e(r);
@@ -61,13 +61,13 @@ function sign(prv, msg) {
 }

 function signMiMC(prv, msg) {
-    const h1 = Buffer.from(blake2b(64).update(prv).digest());
+    const h1 = createBlakeHash("blake512").update(prv).digest();
    const sBuff = pruneBuffer(h1.slice(0,32));
    const s = utils.leBuff2int(sBuff);
    const A = babyJub.mulPointEscalar(babyJub.Base8, Scalar.shr(s, 3));

    const msgBuff = utils.leInt2Buff(msg, 32);
-    const rBuff = Buffer.from(blake2b(64).update(Buffer.concat([h1.slice(32,64), msgBuff])).digest());
+    const rBuff = createBlakeHash("blake512").update(Buffer.concat([h1.slice(32,64), msgBuff])).digest();
    let r = utils.leBuff2int(rBuff);
    const Fr = new F1Field(babyJub.subOrder);
    r = Fr.e(r);
@@ -81,13 +81,13 @@ function signMiMC(prv, msg) {
 }

 function signMiMCSponge(prv, msg) {
-    const h1 = Buffer.from(blake2b(64).update(prv).digest());
+    const h1 = createBlakeHash("blake512").update(prv).digest();
    const sBuff = pruneBuffer(h1.slice(0,32));
    const s = utils.leBuff2int(sBuff);
    const A = babyJub.mulPointEscalar(babyJub.Base8, Scalar.shr(s, 3));

    const msgBuff = utils.leInt2Buff(msg, 32);
-    const rBuff = Buffer.from(blake2b(64).update(Buffer.concat([h1.slice(32,64), msgBuff])).digest());
+    const rBuff = createBlakeHash("blake512").update(Buffer.concat([h1.slice(32,64), msgBuff])).digest();
    let r = utils.leBuff2int(rBuff);
    const Fr = new F1Field(babyJub.subOrder);
    r = Fr.e(r);
@@ -101,19 +101,18 @@ function signMiMCSponge(prv, msg) {
 }

 function signPoseidon(prv, msg) {
-    const h1 = Buffer.from(blake2b(64).update(prv).digest());
+    const h1 = createBlakeHash("blake512").update(prv).digest();
    const sBuff = pruneBuffer(h1.slice(0,32));
    const s = utils.leBuff2int(sBuff);
    const A = babyJub.mulPointEscalar(babyJub.Base8, Scalar.shr(s, 3));

    const msgBuff = utils.leInt2Buff(msg, 32);
-    const rBuff = Buffer.from(blake2b(64).update(Buffer.concat([h1.slice(32,64), msgBuff])).digest());
+    const rBuff = createBlakeHash("blake512").update(Buffer.concat([h1.slice(32,64), msgBuff])).digest();
    let r = utils.leBuff2int(rBuff);
    const Fr = new F1Field(babyJub.subOrder);
    r = Fr.e(r);
    const R8 = babyJub.mulPointEscalar(babyJub.Base8, r);
-    const hash = poseidon.createHash(6, 8, 57);
-    const hm = hash([R8[0], R8[1], A[0], A[1], msg]);
+    const hm = poseidon([R8[0], R8[1], A[0], A[1], msg]);
    const S = Fr.add(r , Fr.mul(hm, s));
    return {
        R8: R8,
@@ -180,8 +179,7 @@ function verifyPoseidon(msg, sig, A) {
    if (!babyJub.inCurve(A)) return false;
    if (sig.S>= babyJub.subOrder) return false;

-    const hash = poseidon.createHash(6, 8, 57);
-    const hm = hash([sig.R8[0], sig.R8[1], A[0], A[1], msg]);
+    const hm = poseidon([sig.R8[0], sig.R8[1], A[0], A[1], msg]);

    const Pleft = babyJub.mulPointEscalar(babyJub.Base8, sig.S);
    let Pright = babyJub.mulPointEscalar(A, Scalar.mul(hm, 8));
--- a/src/evmasm.js
+++ b/src/evmasm.js
@@ -154,6 +154,17 @@ class Contract {
    }

    push(data) {
+        if (typeof data === "number") {
+            let isNeg;
+            if (data<0) {
+                isNeg = true;
+                data = -data;
+            }
+            data = data.toString(16);
+            if (data.length % 2 == 1) data = "0" + data;
+            data = "0x" + data;
+            if (isNeg) data = "-"+data;
+        }
        const d = Web3Utils.hexToBytes(Web3Utils.toHex(data));
        if (d.length == 0 || d.length > 32) {
            throw new Error("Assertion failed");
--- a/src/pedersenHash.js
+++ b/src/pedersenHash.js
@@ -1,4 +1,5 @@
 const babyJub = require("./babyjub");
+const createBlakeHash = require("blake-hash");
 const blake2b = require("blake2b");
 const Scalar = require("ffjavascript").Scalar;

@@ -9,7 +10,17 @@ const nWindowsPerSegment = 50;
 exports.hash = pedersenHash;
 exports.getBasePoint = getBasePoint;

-function pedersenHash(msg) {
+function baseHash(type, S) {
+    if (type == "blake") {
+        return createBlakeHash("blake256").update(S).digest();
+    } else if (type == "blake2b") {
+        return Buffer.from(blake2b(32).update(Buffer.from(S)).digest());
+    }
+}
+
+function pedersenHash(msg, options) {
+    options = options || {};
+    options.baseHash = options.baseHash || "blake";
    const bitsPerSegment = windowSize*nWindowsPerSegment;
    const bits = buffer2bits(msg);

@@ -49,7 +60,7 @@ function pedersenHash(msg) {
            escalar = Scalar.add( escalar, babyJub.subOrder);
        }

-        accP = babyJub.addPoint(accP, babyJub.mulPointEscalar(getBasePoint(s), escalar));
+        accP = babyJub.addPoint(accP, babyJub.mulPointEscalar(getBasePoint(options.baseHash, s), escalar));
    }

    return babyJub.packPoint(accP);
@@ -57,13 +68,13 @@ function pedersenHash(msg) {

 let bases = [];

-function getBasePoint(pointIdx) {
+function getBasePoint(baseHashType, pointIdx) {
    if (pointIdx<bases.length) return bases[pointIdx];
    let p= null;
    let tryIdx = 0;
    while (p==null) {
        const S = GENPOINT_PREFIX + "_" + padLeftZeros(pointIdx, 32) + "_" + padLeftZeros(tryIdx, 32);
-        const h = Buffer.from(blake2b(32).update(Buffer.from(S)).digest());
+        const h = baseHash(baseHashType, S);
        h[31] = h[31] & 0xBF;  // Set 255th bit to 0 (256th is the signal and 254th is the last possible bit to 1)
        p = babyJub.unpackPoint(h);
        tryIdx++;
--- a/src/pedersen_printbases.js
+++ b/src/pedersen_printbases.js
@@ -7,7 +7,15 @@ if (typeof process.argv[2] != "undefined") {
    nBases = 5;
 }

+let baseHash;
+if (typeof process.argv[3] != "undefined") {
+    baseHash = process.argv[3];
+} else {
+    baseHash = "blake";
+}
+
+
 for (let i=0; i < nBases; i++) {
-    const p = pedersenHash.getBasePoint(i);
+    const p = pedersenHash.getBasePoint(baseHash, i);
    console.log(`[${p[0]},${p[1]}]`);
 }
--- a/src/poseidon.js
+++ b/src/poseidon.js
@@ -1,121 +1,49 @@
-const Scalar = require("ffjavascript").Scalar;
-const blake2b = require("blake2b");
 const assert = require("assert");
+const Scalar = require("ffjavascript").Scalar;
 const ZqField = require("ffjavascript").ZqField;
-const utils = require("ffjavascript").utils;
+const { unstringifyBigInts } = require("ffjavascript").utils;

+// Prime 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
 const F = new ZqField(Scalar.fromString("21888242871839275222246405745257275088548364400416034343698204186575808495617"));
-exports.F = F;

-const SEED = "poseidon";
-const NROUNDSF = 8;
-const NROUNDSP = 57;
-const T = 6;
+// Parameters are generated by a reference script https://extgit.iaik.tugraz.at/krypto/hadeshash/-/blob/master/code/generate_parameters_grain.sage
+// Used like so: sage generate_parameters_grain.sage 1 0 254 2 8 56 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
+const { C, M } = unstringifyBigInts(require("./poseidon_constants.json"));

-function getPseudoRandom(seed, n) {
-    const res = [];
-    let input = Buffer.from(seed);
-    let h = blake2b(32).update(input).digest();
-    while (res.length<n) {
-        const n = F.normalize(utils.leBuff2int(Buffer.from(h)));
-        res.push(n);
-        h = blake2b(32).update(h).digest();
-    }
+// Using recommended parameters from whitepaper https://eprint.iacr.org/2019/458.pdf (table 2, table 8)
+// Generated by https://extgit.iaik.tugraz.at/krypto/hadeshash/-/blob/master/code/calc_round_numbers.py
+// And rounded up to nearest integer that divides by t
+const N_ROUNDS_F = 8;
+const N_ROUNDS_P = [56, 57, 56, 60, 60, 63, 64, 63];

-    return res;
-}
+const pow5 = a => F.mul(a, F.square(F.square(a, a)));

-function allDifferent(v) {
-    for (let i=0; i<v.length; i++) {
-        if (F.isZero(v[i])) return false;
-        for (let j=i+1; j<v.length; j++) {
-            if (F.eq(v[i],v[j])) return false;
+function poseidon(inputs) {
+    assert(inputs.length > 0);
+    assert(inputs.length < N_ROUNDS_P.length - 1);
+
+    const t = inputs.length + 1;
+    const nRoundsF = N_ROUNDS_F;
+    const nRoundsP = N_ROUNDS_P[t - 2];
+
+    let state = [...inputs.map(a => F.e(a)), F.zero];
+    for (let r = 0; r < nRoundsF + nRoundsP; r++) {
+        state = state.map((a, i) => F.add(a, C[t - 2][r * t + i]));
+
+        if (r < nRoundsF / 2 || r >= nRoundsF / 2 + nRoundsP) {
+            state = state.map(a => pow5(a));
+        } else {
+            state[0] = pow5(state[0]);
+        }
+
+        // no matrix multiplication in the last round
+        if (r < nRoundsF + nRoundsP - 1) {
+            state = state.map((_, i) =>
+                state.reduce((acc, a, j) => F.add(acc, F.mul(M[t - 2][j][i], a)), F.zero)
+            );
        }
    }
-    return true;
+    return F.normalize(state[0]);
 }

-exports.getMatrix = (t, seed, nRounds) => {
-    if (typeof seed === "undefined") seed = SEED;
-    if (typeof nRounds === "undefined") nRounds = NROUNDSF + NROUNDSP;
-    if (typeof t === "undefined") t = T;
-    assert(t<=6);  // Force the same matrix for all.
-    t=6;
-    let nonce = "0000";
-    let cmatrix = getPseudoRandom(seed+"_matrix_"+nonce, t*2);
-    while (!allDifferent(cmatrix)) {
-        nonce = (Number(nonce)+1)+"";
-        while(nonce.length<4) nonce = "0"+nonce;
-        cmatrix = getPseudoRandom(seed+"_matrix_"+nonce, t*2);
-    }
-
-    const M = new Array(t);
-    for (let i=0; i<t; i++) {
-        M[i] = new Array(t);
-        for (let j=0; j<t; j++) {
-            M[i][j] = F.normalize(F.inv(F.sub(cmatrix[i], cmatrix[t+j])));
-        }
-    }
-    return M;
-};
-
-exports.getConstants = (t, seed, nRounds) => {
-    if (typeof seed === "undefined") seed = SEED;
-    if (typeof nRounds === "undefined") nRounds = NROUNDSF + NROUNDSP;
-    if (typeof t === "undefined") t = T;
-    const cts = getPseudoRandom(seed+"_constants", nRounds);
-    return cts;
-};
-
-function ark(state, c) {
-    for (let j=0; j<state.length; j++ ) {
-        state[j] = F.add(state[j], c);
-    }
-}
-
-function sigma(a) {
-    return F.mul(a, F.square(F.square(a,a)));
-}
-
-function mix(state, M) {
-    const newState = new Array(state.length);
-    for (let i=0; i<state.length; i++) {
-        newState[i] = F.zero;
-        for (let j=0; j<state.length; j++) {
-            newState[i] = F.add(newState[i], F.mul(M[i][j], state[j]) );
-        }
-    }
-    for (let i=0; i<state.length; i++) state[i] = newState[i];
-}
-
-exports.createHash = (t, nRoundsF, nRoundsP, seed) => {
-
-    if (typeof seed === "undefined") seed = SEED;
-    if (typeof nRoundsF === "undefined") nRoundsF = NROUNDSF;
-    if (typeof nRoundsP === "undefined") nRoundsP = NROUNDSP;
-    if (typeof t === "undefined") t = T;
-
-    assert(nRoundsF % 2 == 0);
-    const C = exports.getConstants(t, seed, nRoundsF + nRoundsP);
-    const M = exports.getMatrix(t, seed, nRoundsF + nRoundsP);
-    return function(inputs) {
-        let state = [];
-        assert(inputs.length <= t);
-        assert(inputs.length > 0);
-        for (let i=0; i<inputs.length; i++) state[i] = F.e(inputs[i]);
-        for (let i=inputs.length; i<t; i++) state[i] = F.zero;
-
-        for (let i=0; i< nRoundsF + nRoundsP; i++) {
-            ark(state, C[i]);
-            if ((i<nRoundsF/2) || (i >= nRoundsF/2 + nRoundsP)) {
-                for (let j=0; j<t; j++) state[j] = sigma(state[j]);
-            } else {
-                state[0] = sigma(state[0]);
-            }
-            mix(state, M);
-        }
-        return F.normalize(state[0]);
-    };
-};
-
-
+module.exports = poseidon;
--- a/src/poseidon_constants.json
+++ b/src/poseidon_constants.json
--- a/src/poseidon_gencontract.js
+++ b/src/poseidon_gencontract.js
@@ -2,14 +2,13 @@
 // License: LGPL-3.0+
 //

-const Poseidon = require("./poseidon.js");
-
 const Contract = require("./evmasm");
+const { unstringifyBigInts } = require("ffjavascript").utils;

-const SEED = "poseidon";
-const NROUNDSF = 8;
-const NROUNDSP = 57;
-const T = 6;
+const { C:K, M } = unstringifyBigInts(require("./poseidon_constants.json"));
+
+const N_ROUNDS_F = 8;
+const N_ROUNDS_P = [56, 57, 56, 60, 60, 63, 64, 63];

 function toHex256(a) {
    let S = a.toString(16);
@@ -17,38 +16,34 @@ function toHex256(a) {
    return "0x" + S;
 }

-function createCode(t, nRoundsF, nRoundsP, seed) {
-    if (typeof seed === "undefined") seed = SEED;
-    if (typeof nRoundsF === "undefined") nRoundsF = NROUNDSF;
-    if (typeof nRoundsP === "undefined") nRoundsP = NROUNDSP;
-    if (typeof t === "undefined") t = T;
+function createCode(nInputs) {

-    const K = Poseidon.getConstants(t, seed, nRoundsP + nRoundsF);
-    const M = Poseidon.getMatrix(t, seed, nRoundsP + nRoundsF);
+    if (( nInputs<1) || (nInputs>8)) throw new Error("Invalid number of inputs. Must be 1<=nInputs<=8");
+    const t = nInputs + 1;
+    const nRoundsF = N_ROUNDS_F;
+    const nRoundsP = N_ROUNDS_P[t - 2];

    const C = new Contract();

    function saveM() {
        for (let i=0; i<t; i++) {
            for (let j=0; j<t; j++) {
-                C.push(toHex256(M[i][j]));
+                C.push(toHex256(M[t-2][j][i]));
                C.push((1+i*t+j)*32);
                C.mstore();
            }
        }
    }

-    function ark(r) {
-        C.push(toHex256(K[r])); // K, st, q
+    function ark(r) {   // st, q
        for (let i=0; i<t; i++) {
-            C.dup(1+t); // q, K, st, q
-            C.dup(1);   // K, q, K, st, q
-            C.dup(3+i); // st[i], K, q, K, st, q
-            C.addmod(); // newSt[i], K, st, q
-            C.swap(2 + i); // xx, K, st, q
+            C.dup(t); // q, st, q
+            C.push(toHex256(K[t-2][r*t+i]));  // K, q, st, q
+            C.dup(2+i); // st[i], K, q, st, q
+            C.addmod(); // newSt[i], st, q
+            C.swap(1 + i); // xx, st, q
            C.pop();
        }
-        C.pop();
    }

    function sigma(p) {
@@ -115,17 +110,17 @@ function createCode(t, nRoundsF, nRoundsP, seed) {

    C.push("0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");  // q

-    // Load 6 values from the call data.
+    // Load t values from the call data.
    // The function has a single array param param
    // [Selector (4)] [Pointer (32)][Length (32)] [data1 (32)] ....
-    // We ignore the pointer and the length and just load 6 values to the state
-    // (Stack positions 0-5) If the array is shorter, we just set zeros.
+    // We ignore the pointer and the length and just load t values to the state
+    // (Stack positions 0-{t-1}) If the array is shorter, we just set zeros.
    for (let i=0; i<t; i++) {
        C.push(0x44+(0x20*(t-1-i)));
        C.calldataload();
    }

-    for (let i=0; i<nRoundsF+nRoundsP; i++) {
+    for (let i=0; i<nRoundsF+nRoundsP-1; i++) {
        ark(i);
        if ((i<nRoundsF/2) || (i>=nRoundsP+nRoundsF/2)) {
            for (let j=0; j<t; j++) {
@@ -142,6 +137,13 @@ function createCode(t, nRoundsF, nRoundsP, seed) {
        C.label(strLabel);
    }

+    C.push(toHex256(K[t-2][(nRoundsF+nRoundsP-1)*t]));  // K, st, q
+    C.dup(t+1); // q, K, st, q
+    C.swap(2);  // st[0], K, q, st\st[0]
+    C.addmod();  // st q
+
+    sigma(0);
+
    C.push("0x00");
    C.mstore();     // Save it to pos 0;
    C.push("0x20");
--- a/src/poseidon_printconstants.js
+++ b/src/poseidon_printconstants.js
@@ -1,16 +0,0 @@
-
-
-const Poseidon = require("./poseidon.js");
-
-const C = Poseidon.getConstants();
-
-let S = "[\n";
-
-for (let i=0; i<C.length; i++) {
-    S = S + "    " + C[i].toString();
-    if (i<C.length-1) S = S + ",";
-    S = S + "\n";
-}
-S=S+ "]\n";
-
-console.log(S);
--- a/src/poseidon_printcontract.js
+++ b/src/poseidon_printcontract.js
@@ -1,5 +1,13 @@
 const poseidonGenContract = require("./poseidon_gencontract");

+if (process.argv.length != 3) {
+    console.log("Usage: node poseidon_gencontract.js [numberOfInputs]");
+    process.exit(1);
+}

-console.log(poseidonGenContract.createCode(6, 8, 57));
+const nInputs = Number(process.argv[2]);
+
+console.log(nInputs);
+
+console.log(poseidonGenContract.createCode(nInputs));

--- a/src/smt.js
+++ b/src/smt.js
@@ -58,10 +58,10 @@ class SMT {

        res.newRoot = rtNew;

+        await this.db.multiDel(dels);
        await this.db.multiIns(ins);
        await this.db.setRoot(rtNew);
        this.root = rtNew;
-        await this.db.multiDel(dels);

        return res;
    }
--- a/src/smt_hashes_poseidon.js
+++ b/src/smt_hashes_poseidon.js
@@ -1,13 +1,18 @@
-const Poseidon = require("./poseidon");

-const hash = Poseidon.createHash(6, 8, 57);
+const ZqField = require("ffjavascript").ZqField;
+const Scalar = require("ffjavascript").Scalar;
+
+const poseidon = require("./poseidon");
+
+const F = new ZqField(Scalar.fromString("21888242871839275222246405745257275088548364400416034343698204186575808495617"));
+

 exports.hash0 = function (left, right) {
-    return hash([left, right]);
+    return poseidon([left, right]);
 };

 exports.hash1 = function(key, value) {
-    return hash([key, value, Poseidon.F.one]);
+    return poseidon([key, value, F.one]);
 };

-exports.F = Poseidon.F;
+exports.F = F;
--- a/src/smt_memdb.js
+++ b/src/smt_memdb.js
@@ -1,6 +1,9 @@

-const F = require("./poseidon.js").F;
 const Scalar = require("ffjavascript").Scalar;
+const ZqField = require("ffjavascript").ZqField;
+
+// Prime 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
+const F = new ZqField(Scalar.fromString("21888242871839275222246405745257275088548364400416034343698204186575808495617"));

 class SMTMemDb {
    constructor() {
@@ -14,7 +17,7 @@ class SMTMemDb {

    _key2str(k) {
        // const keyS = bigInt(key).leInt2Buff(32).toString("hex");
-        const keyS = Scalar.e(k);
+        const keyS = k.toString();
        return keyS;
    }

--- a/test/babyjub.js
+++ b/test/babyjub.js
@@ -1,7 +1,7 @@
 const chai = require("chai");
 const path = require("path");

-const blake2b = require("blake2b");
+const createBlakeHash = require("blake-hash");
 const eddsa = require("../src/eddsa.js");
 const F = require("../src/babyjub.js").F;

@@ -94,7 +94,7 @@ describe("Baby Jub test", function () {
    it("Should extract the public key from the private one", async () => {

        const rawpvk = Buffer.from("0001020304050607080900010203040506070809000102030405060708090021", "hex");
-        const pvk    = eddsa.pruneBuffer(Buffer.from(blake2b(64).update(rawpvk).digest().slice(0,32)));
+        const pvk    = eddsa.pruneBuffer(createBlakeHash("blake512").update(rawpvk).digest().slice(0,32));
        const S      = Scalar.shr(utils.leBuff2int(pvk), 3);

        const A      = eddsa.prv2pub(rawpvk);
--- a/test/circuits/poseidon3_test.circom
+++ b/test/circuits/poseidon3_test.circom
@@ -1,3 +1,3 @@
 include "../../circuits/poseidon.circom"

-component main = Poseidon(2, 3, 8, 57);
+component main = Poseidon(2);
--- a/test/circuits/poseidon6_test.circom
+++ b/test/circuits/poseidon6_test.circom
@@ -1,3 +1,3 @@
 include "../../circuits/poseidon.circom"

-component main = Poseidon(2, 6, 8, 57);
+component main = Poseidon(5);
--- a/test/eddsa_js.js
+++ b/test/eddsa_js.js
@@ -22,24 +22,24 @@ describe("EdDSA js test", function () {
        const pubKey = eddsa.prv2pub(prvKey);

        assert.equal(pubKey[0].toString(),
-            "17579234973106307986399040784563986669343100608865726413246909559198451825625");
+            "13277427435165878497778222415993513565335242147425444199013288855685581939618");
        assert.equal(pubKey[1].toString(),
-            "21581828029826859845363968476425861244058376747493285816141526544272562145486");
+            "13622229784656158136036771217484571176836296686641868549125388198837476602820");

        const pPubKey = babyJub.packPoint(pubKey);

        const signature = eddsa.signMiMC(prvKey, msg);
        assert.equal(signature.R8[0].toString(),
-            "12672422877531089818651367820728973438446851190471722610781936061829103362897");
+            "11384336176656855268977457483345535180380036354188103142384839473266348197733");
        assert.equal(signature.R8[1].toString(),
-            "12052234579439634484237590306927118446073354173341433290934144373261241958718");
+            "15383486972088797283337779941324724402501462225528836549661220478783371668959");
        assert.equal(signature.S.toString(),
-            "1582013862333331285840015273849085014739146294568319205499642618291614907374");
+            "2523202440825208709475937830811065542425109372212752003460238913256192595070");

        const pSignature = eddsa.packSignature(signature);
        assert.equal(pSignature.toString("hex"), ""+
-            "3e417cd811f9c9c545a680b962e45d22ccb62b2284b4fe4bbc9fdb50b252a59a" +
-            "eefbebe2b895393fa0e9b5b31b19e65a63fee5d7b6261d8d5b6b847c5b637f03");
+            "dfedb4315d3f2eb4de2d3c510d7a987dcab67089c8ace06308827bf5bcbe02a2"+
+            "7ed40dab29bf993c928e789d007387998901a24913d44fddb64b1f21fc149405");

        const uSignature = eddsa.unpackSignature(pSignature);
        assert(eddsa.verifyMiMC(msg, uSignature, pubKey));
@@ -55,24 +55,24 @@ describe("EdDSA js test", function () {
        const pubKey = eddsa.prv2pub(prvKey);

        assert.equal(pubKey[0].toString(),
-            "17579234973106307986399040784563986669343100608865726413246909559198451825625");
+            "13277427435165878497778222415993513565335242147425444199013288855685581939618");
        assert.equal(pubKey[1].toString(),
-            "21581828029826859845363968476425861244058376747493285816141526544272562145486");
+            "13622229784656158136036771217484571176836296686641868549125388198837476602820");

        const pPubKey = babyJub.packPoint(pubKey);

        const signature = eddsa.signPoseidon(prvKey, msg);
        assert.equal(signature.R8[0].toString(),
-            "12672422877531089818651367820728973438446851190471722610781936061829103362897");
+            "11384336176656855268977457483345535180380036354188103142384839473266348197733");
        assert.equal(signature.R8[1].toString(),
-            "12052234579439634484237590306927118446073354173341433290934144373261241958718");
+            "15383486972088797283337779941324724402501462225528836549661220478783371668959");
        assert.equal(signature.S.toString(),
-            "2318334603430781860679872910160434499077270843466490702990199622594868564504");
+            "1398758333392199195742243841591064350253744445503462896781493968760929513778");

        const pSignature = eddsa.packSignature(signature);
        assert.equal(pSignature.toString("hex"), ""+
-            "3e417cd811f9c9c545a680b962e45d22ccb62b2284b4fe4bbc9fdb50b252a59a" +
-            "1852c049fc6286138a0ddb57718049a09374fdf0390686c7ac5637b481212005");
+            "dfedb4315d3f2eb4de2d3c510d7a987dcab67089c8ace06308827bf5bcbe02a2"+
+            "32f16b0f2f4c4e1169aa59685637e1429b6581a9531d058d65f4ab224eab1703");

        const uSignature = eddsa.unpackSignature(pSignature);
        assert(eddsa.verifyPoseidon(msg, uSignature, pubKey));
--- a/test/pedersen.js
+++ b/test/pedersen.js
@@ -8,11 +8,11 @@ const babyJub = require("../src/babyjub.js");

 const PBASE =
    [
-        [Fr.e("7688621503272331394947188562469131124099290577812125474996268020905176040083"),Fr.e("6637287939860384587467947982369268811366630904563077767287326262235485629411")],
-        [Fr.e("11549681895645637778324638856880330712650895608496649854094912415387988201330"),Fr.e("5771732722784528537721081267383956005090479808901717812009343940574217488577")],
-        [Fr.e("18790245153471844934157747708238883966079935875787657036767664036124524381945"),Fr.e("18300275459419441151064576487317481499516933849631632883767173501999997278432")],
-        [Fr.e("16301069151422548986850494139112207641738464387919729729324473657161689764196"),Fr.e("8215273507373494014441104012907835625670941526105528197815397741007626226499")],
-        [Fr.e("12597665704678284488008395353749282149622295037737374782196049599390683534185"),Fr.e("4072455241781501621593714139281767473040087753548015968773801065193764079468")]
+        [Fr.e("10457101036533406547632367118273992217979173478358440826365724437999023779287"),Fr.e("19824078218392094440610104313265183977899662750282163392862422243483260492317")],
+        [Fr.e("2671756056509184035029146175565761955751135805354291559563293617232983272177"),Fr.e("2663205510731142763556352975002641716101654201788071096152948830924149045094")],
+        [Fr.e("5802099305472655231388284418920769829666717045250560929368476121199858275951"),Fr.e("5980429700218124965372158798884772646841287887664001482443826541541529227896")],
+        [Fr.e("7107336197374528537877327281242680114152313102022415488494307685842428166594"),Fr.e("2857869773864086953506483169737724679646433914307247183624878062391496185654")],
+        [Fr.e("20265828622013100949498132415626198973119240347465898028410217039057588424236"),Fr.e("1160461593266035632937973507065134938065359936056410650153315956301179689506")]
    ];

 describe("Double Pedersen test", function() {
--- a/test/poseidoncircuit.js
+++ b/test/poseidoncircuit.js
@@ -1,21 +1,11 @@
 const chai = require("chai");
 const path = require("path");
-var blake2b = require("blake2b");
 const tester = require("circom").tester;

 const poseidon = require("../src/poseidon.js");

 const assert = chai.assert;

-describe("Blake2b version test", function() {
-    it("Should give the expected output for blake2b version", async () => {
-        var output = new Uint8Array(32);
-        var input = Buffer.from("poseidon_constants");
-        const h = blake2b(output.length).update(input).digest("hex");
-        assert.equal("e57ba154fb2c47811dc1a2369b27e25a44915b4e4ece4eb8ec74850cb78e01b1", h);
-    });
-});
-
 describe("Poseidon Circuit test", function () {
    let circuit6;
    let circuit3;
@@ -28,24 +18,20 @@ describe("Poseidon Circuit test", function () {
    });

    it("Should check constrain of hash([1, 2]) t=6", async () => {
-        const w = await circuit6.calculateWitness({inputs: [1, 2]}, true);
+        const w = await circuit6.calculateWitness({inputs: [1, 2, 0,0,0]}, true);

-        const hash = poseidon.createHash(6, 8, 57);
-
-        const res2 = hash([1,2]);
-        assert.equal("12242166908188651009877250812424843524687801523336557272219921456462821518061", res2.toString());
+        const res2 = poseidon([1,2,0,0,0]);
+        assert.equal("3975478831357328722254985704342968745327876719981393787143845259590563829094", res2.toString());
        await circuit6.assertOut(w, {out : res2});
        await circuit6.checkConstraints(w);
    });

    it("Should check constrain of hash([3, 4]) t=6", async () => {
-        const w = await circuit6.calculateWitness({inputs: [3, 4]});
+        const w = await circuit6.calculateWitness({inputs: [3, 4,5,10,23]});

-        const hash = poseidon.createHash(6, 8, 57);
+        const res2 = poseidon([3, 4,5,10,23]);

-        const res2 = hash([3, 4]);
-
-        assert.equal("17185195740979599334254027721507328033796809509313949281114643312710535000993", res2.toString());
+        assert.equal("18540626624821144952552691894137986276337186174352554475896834101336254024067", res2.toString());
        await circuit6.assertOut(w, {out : res2});
        await circuit6.checkConstraints(w);
    });
@@ -54,10 +40,8 @@ describe("Poseidon Circuit test", function () {
    it("Should check constrain of hash([1, 2]) t=3", async () => {
        const w = await circuit3.calculateWitness({inputs: [1, 2]});

-        const hash = poseidon.createHash(3, 8, 57);
-
-        const res2 = hash([1,2]);
-        assert.equal("2104035019328376391822106787753454168168617545136592089411833517434990977743", res2.toString());
+        const res2 = poseidon([1,2]);
+        assert.equal("17117985411748610629288516079940078114952304104811071254131751175361957805920", res2.toString());
        await circuit3.assertOut(w, {out : res2});
        await circuit3.checkConstraints(w);
    });
@@ -65,10 +49,8 @@ describe("Poseidon Circuit test", function () {
    it("Should check constrain of hash([3, 4]) t=3", async () => {
        const w = await circuit3.calculateWitness({inputs: [3, 4]});

-        const hash = poseidon.createHash(3, 8, 57);
-
-        const res2 = hash([3, 4]);
-        assert.equal("12456141564250880945411182508630957604732712316993112736876413121277158512223", res2.toString());
+        const res2 = poseidon([3, 4]);
+        assert.equal("21867347236198497199818917118739170715216974132230970409806500217655788551452", res2.toString());
        await circuit3.assertOut(w, {out : res2});
        await circuit3.checkConstraints(w);
    });
--- a/test/poseidoncontract.js
+++ b/test/poseidoncontract.js
@@ -2,7 +2,7 @@ const ganache = require("ganache-cli");
 const Web3 = require("web3");
 const chai = require("chai");
 const poseidonGenContract = require("../src/poseidon_gencontract.js");
-const Poseidon = require("../src/poseidon.js");
+const poseidon = require("../src/poseidon.js");

 const assert = chai.assert;
 const log = (msg) => { if (process.env.MOCHA_VERBOSE) console.log(msg); };
@@ -24,28 +24,26 @@ describe("Poseidon Smart contract test", function () {
        const C = new web3.eth.Contract(poseidonGenContract.abi);

        poseidon6 = await C.deploy({
-            data: poseidonGenContract.createCode(6)
+            data: poseidonGenContract.createCode(5)
        }).send({
-            gas: 2500000,
+            gas: 5000000,
            from: accounts[0]
        });
        poseidon3 = await C.deploy({
-            data: poseidonGenContract.createCode(3)
+            data: poseidonGenContract.createCode(2)
        }).send({
-            gas: 2500000,
+            gas: 5000000,
            from: accounts[0]
        });
    });

    it("Shold calculate the poseidon correctly t=6", async () => {

-        const res = await poseidon6.methods.poseidon([1,2]).call();
+        const res = await poseidon6.methods.poseidon([1,2, 0, 0, 0]).call();

        // console.log("Cir: " + bigInt(res.toString(16)).toString(16));

-        const hash = Poseidon.createHash(6, 8, 57);
-
-        const res2 = hash([1,2]);
+        const res2 = poseidon([1,2, 0, 0, 0]);
        // console.log("Ref: " + bigInt(res2).toString(16));

        assert.equal(res.toString(), res2.toString());
@@ -56,9 +54,7 @@ describe("Poseidon Smart contract test", function () {

        // console.log("Cir: " + bigInt(res.toString(16)).toString(16));

-        const hash = Poseidon.createHash(3, 8, 57);
-
-        const res2 = hash([1,2]);
+        const res2 = poseidon([1,2]);
        // console.log("Ref: " + bigInt(res2).toString(16));

        assert.equal(res.toString(), res2.toString());
--- a/test/smtjs.js
+++ b/test/smtjs.js
@@ -161,4 +161,13 @@ describe("SMT Javascript test", function () {
        assert(Fr.eq(tree1.root, tree2.root));
    });

+    it("Should test update with same key-value", async () => {
+        const tree1 = await smt.newMemEmptyTrie();
+
+        await tree1.insert(8,88);
+        await tree1.update(8,88);
+
+        const res = await tree1.db.get(tree1.root);
+        assert.notEqual(res, undefined);
+    });
 });
Author	SHA1	Message	Date
Jordi Baylina	6bcbf3370e	0.2.4	2020-08-31 18:30:11 +02:00
Jordi Baylina	9d876a1b32	deps	2020-08-31 18:30:04 +02:00
Jordi Baylina	d422471b5b	Merge pull request #49 from krlosMata/feature/fix-smt-update fix smt update	2020-08-31 17:14:45 +02:00
Jordi Baylina	01da5f90db	Merge pull request #50 from tornadocash/poseidon-pr-2 add poseidon comments and refactorings	2020-08-28 04:29:49 +02:00
poma	fabc586fea	add poseidon comments and refactorings	2020-08-27 16:46:49 +03:00
krlosMata	7e93b3fcf8	fix smt update	2020-08-25 13:08:53 +02:00
Jordi Baylina	3f4734d4dd	Merge pull request #48 from kobigurk/kobigurk/fix_and_assert_less_than fix: improve LessThan and adds assert	2020-08-24 11:12:11 +02:00
Kobi Gurkan	1cd3d203c5	fix LessThan and adds assert	2020-08-24 10:46:37 +03:00
Jordi Baylina	01e3f0d680	Poseidon genContract nInputs as parameters	2020-08-09 17:19:53 +02:00
Jordi Baylina	86c6a2a6f5	New Version of Poseidon	2020-08-09 17:13:04 +02:00
Jordi Baylina	5269afee0a	0.2.3	2020-04-20 11:01:20 +02:00
Jordi Baylina	48c721c8af	smtdb key string	2020-04-20 11:01:11 +02:00
Jordi Baylina	0efecf16fa	0.2.2	2020-04-19 18:46:11 +02:00
Jordi Baylina	7705fe8339	deps	2020-04-19 18:45:43 +02:00
Jordi Baylina	401c9e0728	0.2.1	2020-04-19 12:24:04 +02:00
Jordi Baylina	d5ed1c3ce4	Go back to blake	2020-04-19 12:23:55 +02:00