Merge branch 'main' into recursive_large_output

NethermindEth · Sep 5, 2024 · 90478a7 · 90478a7
2 parents 5b54509 + 39fde50
commit 90478a7
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/integration_tests/cairozero_test.go b/integration_tests/cairozero_test.go
@@ -288,10 +288,14 @@ func runPythonVm(testFilename, path string) (time.Duration, string, string, erro
  // A file without this suffix will use the default ("plain") layout.
  if strings.HasSuffix(testFilename, ".small.cairo") {
  args = append(args, "--layout", "small")
+ } else if strings.HasSuffix(testFilename, ".dex.cairo") {
+ args = append(args, "--layout", "dex")
  } else if strings.HasSuffix(testFilename, ".starknet_with_keccak.cairo") {
  args = append(args, "--layout", "starknet_with_keccak")
  } else if strings.HasSuffix(testFilename, ".recursive_large_output.cairo") {
  args = append(args, "--layout", "recursive_large_output")
+ } else if strings.HasSuffix(testFilename, ".recursive_with_poseidon.cairo") {
+ args = append(args, "--layout", "recursive_with_poseidon")
  }
 
  cmd := exec.Command("cairo-run", args...)
@@ -323,10 +327,14 @@ func runVm(path string) (time.Duration, string, string, string, error) {
  layout := "plain"
  if strings.Contains(path, ".small") {
  layout = "small"
+ } else if strings.Contains(path, ".dex") {
+ layout = "dex"
  } else if strings.Contains(path, ".starknet_with_keccak") {
  layout = "starknet_with_keccak"
  } else if strings.Contains(path, ".recursive_large_output") {
  layout = "recursive_large_output"
+ } else if strings.Contains(path, ".recursive_with_poseidon") {
+ layout = "recursive_with_poseidon"
  }
 
  cmd := exec.Command(

diff --git a/pkg/vm/builtins/layouts.go b/pkg/vm/builtins/layouts.go
@@ -24,6 +24,10 @@ type Layout struct {
  Builtins []LayoutBuiltin
 }
 
+func getPlainLayout() Layout {
+ return Layout{Name: "plain", RcUnits: 16, Builtins: []LayoutBuiltin{}}
+}
+
 func getSmallLayout() Layout {
  return Layout{Name: "small", RcUnits: 16, Builtins: []LayoutBuiltin{
  {Runner: &Output{}, Builtin: starknet.Output},
@@ -33,8 +37,13 @@ func getSmallLayout() Layout {
  }}
 }
 
-func getPlainLayout() Layout {
- return Layout{Name: "plain", RcUnits: 16, Builtins: []LayoutBuiltin{}}
+func getDexLayout() Layout {
+ return Layout{Name: "dex", RcUnits: 4, Builtins: []LayoutBuiltin{
+ {Runner: &Output{}, Builtin: starknet.Output},
+ {Runner: &Pedersen{ratio: 8}, Builtin: starknet.Pedersen},
+ {Runner: &RangeCheck{ratio: 8, RangeCheckNParts: 8}, Builtin: starknet.RangeCheck},
+ {Runner: &ECDSA{ratio: 512}, Builtin: starknet.ECDSA},
+ }}
 }
 
 func getStarknetWithKeccakLayout() Layout {
@@ -60,16 +69,30 @@ func getRecursiveLargeOutputLayout() Layout {
  }}
 }
 
+func getRecursiveWithPoseidonLayout() Layout {
+ return Layout{Name: "recursive_with_poseidon", RcUnits: 4, Builtins: []LayoutBuiltin{
+ {Runner: &Output{}, Builtin: starknet.Output},
+ {Runner: &Pedersen{ratio: 256}, Builtin: starknet.Pedersen},
+ {Runner: &RangeCheck{ratio: 16, RangeCheckNParts: 8}, Builtin: starknet.RangeCheck},
+ {Runner: &Bitwise{ratio: 16}, Builtin: starknet.Bitwise},
+ {Runner: &Poseidon{ratio: 64, cache: make(map[uint64]fp.Element)}, Builtin: starknet.Poseidon},
+ }}
+}
+
 func GetLayout(layout string) (Layout, error) {
  switch layout {
- case "small":
- return getSmallLayout(), nil
  case "plain":
  return getPlainLayout(), nil
+ case "small":
+ return getSmallLayout(), nil
+ case "dex":
+ return getDexLayout(), nil
  case "starknet_with_keccak":
  return getStarknetWithKeccakLayout(), nil
  case "recursive_large_output":
  return getRecursiveLargeOutputLayout(), nil
+ case "recursive_with_poseidon":
+ return getRecursiveWithPoseidonLayout(), nil
  case "":
  return getPlainLayout(), nil
  default: