Merge branch 'main' into inputs

NethermindEth · Jan 16, 2025 · b54e9bb · b54e9bb
2 parents 734d1e7 + fae330d
commit b54e9bb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/hintrunner/core/hint.go b/pkg/hintrunner/core/hint.go
@@ -1235,7 +1235,6 @@ func (hint *InitSquashData) String() string {
 }
 
 func (hint *InitSquashData) Execute(vm *VM.VirtualMachine, ctx *hinter.HintRunnerContext) error {
-	// todo(rodro): Don't know if it could be called multiple times, or
 	err := hinter.InitializeSquashedDictionaryManager(ctx)
 	if err != nil {
 		ctx.SquashedDictionaryManager = hinter.SquashedDictionaryManager{}

diff --git a/pkg/runner/gas.go b/pkg/runner/gas.go
@@ -50,8 +50,8 @@ func gasInitialization(memory *mem.Memory) error {
 	if err != nil {
 		return err
 	}
-
-	preCostTokenTypes := []TokenGasCost{PedersenToken, BitwiseToken, EcOpToken, PoseidonToken, AddModToken, MulModToken}
+	// The order of the tokens is relevant, source: https://github.com/starkware-libs/cairo/blob/f6aaaa306804257bfc15d65b5ab6b90e141b54ec/crates/cairo-lang-sierra/src/extensions/modules/gas.rs#L194
+	preCostTokenTypes := []TokenGasCost{PedersenToken, PoseidonToken, BitwiseToken, EcOpToken, AddModToken, MulModToken}
 
 	for _, token := range preCostTokenTypes {
 		cost, err := getTokenGasCost(token)

diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -601,6 +601,7 @@ func GetEntryCodeInstructions(function starknet.EntryPointByFunction) ([]*fp.Ele
 		paramsSize += param.Size
 	}
 	apOffset += paramsSize
+
 	for _, builtin := range function.Builtins {
 		if offset, isBuiltin := builtinsOffsetsMap[builtin]; isBuiltin {
 			ctx.AddInlineCASM(