Skip to content

Commit

Permalink
fixed the bug in the permutation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Soleimani193
Soleimani193 committed Oct 7, 2024
1 parent 3f9b0d9 commit b714e11
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 14 deletions.
2 changes: 1 addition & 1 deletion prover/protocol/compiler/permutation/compiler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func dispatchPermutation(
)

if isMultiColumn {
factor = wizardutils.RandLinCombColSymbolic(alpha, q.A[frag])
factor = wizardutils.RandLinCombColSymbolic(alpha, aOrB[frag])
}

factor = symbolic.Add(factor, beta)
Expand Down
135 changes: 122 additions & 13 deletions prover/protocol/compiler/permutation/compiler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ import (
func TestPermutationPass(t *testing.T) {

testCases := []struct {
Define func(*wizard.Builder)
Prove func(*wizard.ProverRuntime)
Title string
Define func(*wizard.Builder)
Prove func(*wizard.ProverRuntime)
Title string
ShouldPass bool
}{
{
Define: func(builder *wizard.Builder) {
Expand All @@ -28,7 +29,8 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("B", smartvectors.ForTest(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
},

Title: "single-column",
Title: "single-column",
ShouldPass: true,
},
{
Define: func(builder *wizard.Builder) {
Expand All @@ -40,6 +42,7 @@ func TestPermutationPass(t *testing.T) {
builder.RegisterCommit("B1", 16),
builder.RegisterCommit("B2", 16),
}
// the same permutation amon columns of a and b
builder.Permutation("PERM", a, b)
},

Expand All @@ -50,7 +53,8 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("B2", smartvectors.ForTest(115, 114, 113, 112, 111, 110, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10))
},

Title: "two-columnss",
Title: "two-columnss",
ShouldPass: true,
},
{
Define: func(builder *wizard.Builder) {
Expand All @@ -62,6 +66,7 @@ func TestPermutationPass(t *testing.T) {
builder.RegisterCommit("B1", 16),
builder.RegisterCommit("B2", 16),
}
// PERM1 does not have to be the same permutations as PERM2
builder.Permutation("PERM1", a[:1], b[:1])
builder.Permutation("PERM2", a[1:], b[1:])
},
Expand All @@ -73,7 +78,8 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("B2", smartvectors.ForTest(115, 114, 113, 112, 111, 110, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10))
},

Title: "two queries for one column",
Title: "two queries for one column",
ShouldPass: true,
},
{
Define: func(builder *wizard.Builder) {
Expand Down Expand Up @@ -106,7 +112,8 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("B4", smartvectors.ForTest(1225, 1224, 1223, 1222, 1222, 1220, 129, 128, 127, 126, 125, 124, 123, 122, 122, 120))
},

Title: "4 queries for one column, all on one column",
Title: "4 queries for one column, all on one column",
ShouldPass: true,
},
{
Define: func(builder *wizard.Builder) {
Expand All @@ -130,6 +137,7 @@ func TestPermutationPass(t *testing.T) {
builder.RegisterCommit("B7", 8),
builder.RegisterCommit("B8", 8),
}
// the permutation between a[0] and b [0] is the same permutation as the one between a[1] and b[1]
builder.Permutation("PERM1", a[0:2], b[0:2])
builder.Permutation("PERM2", a[2:4], b[2:4])
builder.Permutation("PERM3", a[4:6], b[4:6])
Expand All @@ -156,7 +164,8 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("B8", smartvectors.ForTest(14, 15, 16, 17, 18, 19, 110, 13))
},

Title: "4 queries for one column, all on two columns",
Title: "4 queries for one column, all on two columns",
ShouldPass: true,
},
{
Define: func(builder *wizard.Builder) {
Expand Down Expand Up @@ -206,7 +215,8 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("B8", smartvectors.ForTest(14, 15, 16, 17, 18, 19, 110, 13))
},

Title: "4 queries for one column, all on two columns",
Title: "4 queries for one column, all on two columns",
ShouldPass: true,
},
{
Define: func(builder *wizard.Builder) {
Expand All @@ -230,6 +240,7 @@ func TestPermutationPass(t *testing.T) {
builder.RegisterCommit("B7", 8),
builder.RegisterCommit("B8", 8),
}
// each fragment has its own permutation, but the permutation is the same for the columns from the same fragment.
builder.CompiledIOP.InsertFragmentedPermutation(0, "PERM1", [][]ifaces.Column{a[0:2], a[2:4]}, [][]ifaces.Column{b[0:2], b[2:4]})
builder.CompiledIOP.InsertFragmentedPermutation(0, "PERM2", [][]ifaces.Column{a[4:6], a[6:8]}, [][]ifaces.Column{b[4:6], b[6:8]})
},
Expand All @@ -244,6 +255,98 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("A7", smartvectors.ForTest(12, 13, 14, 15, 16, 17, 18, 19))
run.AssignColumn("A8", smartvectors.ForTest(13, 14, 15, 16, 17, 18, 19, 110))

run.AssignColumn("B1", smartvectors.ForTest(1, 2, 3, 0))
run.AssignColumn("B2", smartvectors.ForTest(2, 3, 4, 1))
run.AssignColumn("B3", smartvectors.ForTest(2, 4, 3, 5))
run.AssignColumn("B4", smartvectors.ForTest(3, 5, 4, 6))
run.AssignColumn("B5", smartvectors.ForTest(11, 12, 13, 14, 15, 16, 17, 10))
run.AssignColumn("B6", smartvectors.ForTest(12, 13, 14, 15, 16, 17, 18, 11))
run.AssignColumn("B7", smartvectors.ForTest(13, 14, 15, 16, 17, 18, 19, 12))
run.AssignColumn("B8", smartvectors.ForTest(14, 15, 16, 17, 18, 19, 110, 13))
},

Title: "2 fragmented multi-column queries using different sizes",
ShouldPass: true,
},
{
Define: func(builder *wizard.Builder) {
a := [][]ifaces.Column{
{builder.RegisterCommit("A1", 4)},
{builder.RegisterCommit("A2", 4)},
{builder.RegisterCommit("A3", 4)},
{builder.RegisterCommit("A4", 4)},
}
b := [][]ifaces.Column{
{builder.RegisterCommit("B1", 16)},
}
builder.CompiledIOP.InsertFragmentedPermutation(0, "PERM1", a, b)
},

Prove: func(run *wizard.ProverRuntime) {
run.AssignColumn("A1", smartvectors.ForTest(0, 1, 2, 3))
run.AssignColumn("A2", smartvectors.ForTest(4, 5, 6, 7))
run.AssignColumn("A3", smartvectors.ForTest(8, 9, 10, 11))
run.AssignColumn("A4", smartvectors.ForTest(12, 13, 14, 15))

run.AssignColumn("B1", smartvectors.ForTest(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15))
},

Title: "dissymetric fractional query",
ShouldPass: true,
},

// test cases that should Not Pass
{
Define: func(builder *wizard.Builder) {
a := builder.RegisterCommit("A", 16)
b := builder.RegisterCommit("B", 16)
builder.Permutation("PERM", []ifaces.Column{a}, []ifaces.Column{b})
},

Prove: func(run *wizard.ProverRuntime) {
run.AssignColumn("A", smartvectors.ForTest(0, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15))
run.AssignColumn("B", smartvectors.ForTest(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
},

Title: "single-column, should not pass",
ShouldPass: false,
},
{
Define: func(builder *wizard.Builder) {
a := []ifaces.Column{
builder.RegisterCommit("A1", 4),
builder.RegisterCommit("A2", 4),
builder.RegisterCommit("A3", 4),
builder.RegisterCommit("A4", 4),
builder.RegisterCommit("A5", 8),
builder.RegisterCommit("A6", 8),
builder.RegisterCommit("A7", 8),
builder.RegisterCommit("A8", 8),
}
b := []ifaces.Column{
builder.RegisterCommit("B1", 4),
builder.RegisterCommit("B2", 4),
builder.RegisterCommit("B3", 4),
builder.RegisterCommit("B4", 4),
builder.RegisterCommit("B5", 8),
builder.RegisterCommit("B6", 8),
builder.RegisterCommit("B7", 8),
builder.RegisterCommit("B8", 8),
}
builder.CompiledIOP.InsertFragmentedPermutation(0, "PERM1", [][]ifaces.Column{a[0:2], a[2:4]}, [][]ifaces.Column{b[0:2], b[2:4]})
builder.CompiledIOP.InsertFragmentedPermutation(0, "PERM2", [][]ifaces.Column{a[4:6], a[6:8]}, [][]ifaces.Column{b[4:6], b[6:8]})
},

Prove: func(run *wizard.ProverRuntime) {
run.AssignColumn("A1", smartvectors.ForTest(0, 1, 2, 3))
run.AssignColumn("A2", smartvectors.ForTest(2, 2, 3, 4))
run.AssignColumn("A3", smartvectors.ForTest(2, 3, 4, 5))
run.AssignColumn("A4", smartvectors.ForTest(3, 4, 5, 6))
run.AssignColumn("A5", smartvectors.ForTest(10, 11, 12, 13, 14, 15, 16, 17))
run.AssignColumn("A6", smartvectors.ForTest(11, 12, 13, 14, 15, 16, 17, 18))
run.AssignColumn("A7", smartvectors.ForTest(12, 13, 14, 15, 16, 17, 18, 19))
run.AssignColumn("A8", smartvectors.ForTest(13, 14, 15, 16, 17, 18, 19, 110))

run.AssignColumn("B1", smartvectors.ForTest(1, 2, 3, 0))
run.AssignColumn("B2", smartvectors.ForTest(2, 3, 4, 1))
run.AssignColumn("B3", smartvectors.ForTest(3, 4, 5, 2))
Expand All @@ -254,8 +357,10 @@ func TestPermutationPass(t *testing.T) {
run.AssignColumn("B8", smartvectors.ForTest(14, 15, 16, 17, 18, 19, 110, 13))
},

Title: "2 fragmented multi-column queries using different sizes",
Title: "2 fragmented multi-column queries using different sizes, should not pass",
ShouldPass: false,
},

{
Define: func(builder *wizard.Builder) {
a := [][]ifaces.Column{
Expand All @@ -271,25 +376,29 @@ func TestPermutationPass(t *testing.T) {
},

Prove: func(run *wizard.ProverRuntime) {
run.AssignColumn("A1", smartvectors.ForTest(0, 1, 2, 3))
run.AssignColumn("A1", smartvectors.ForTest(1, 1, 2, 3))
run.AssignColumn("A2", smartvectors.ForTest(4, 5, 6, 7))
run.AssignColumn("A3", smartvectors.ForTest(8, 9, 10, 11))
run.AssignColumn("A4", smartvectors.ForTest(12, 13, 14, 15))

run.AssignColumn("B1", smartvectors.ForTest(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15))
},

Title: "dissymetric fractional query",
Title: "dissymetric fractional query, should not pass",
ShouldPass: false,
},
}

for _, testCase := range testCases {
t.Run(testCase.Title, func(t *testing.T) {
comp := wizard.Compile(testCase.Define, CompileGrandProduct, dummy.Compile)
proof := wizard.Prove(comp, testCase.Prove)
if err := wizard.Verify(comp, proof); err != nil {
if err := wizard.Verify(comp, proof); err != nil && testCase.ShouldPass {
t.Fatalf("verifier did not pass: %v", err.Error())
}
if err := wizard.Verify(comp, proof); err == nil && !testCase.ShouldPass {
t.Fatalf("verifier is passing for a false claim")
}
})
}
}

0 comments on commit b714e11

Please sign in to comment.