Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: implement dex layout #649

Merged
merged 2 commits into from
Sep 5, 2024
Merged

feat: implement dex layout #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c84d769
dex layout
TAdev0 Sep 5, 2024
4dcc5cc
fix
TAdev0 Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions integration_tests/cairozero_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ 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")
}
Expand Down Expand Up @@ -321,6 +323,8 @@ 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"
}
Expand Down
19 changes: 15 additions & 4 deletions pkg/vm/builtins/layouts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand All @@ -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 {
Expand All @@ -52,10 +61,12 @@ func getStarknetWithKeccakLayout() Layout {

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 "":
Expand Down
Loading