Merge pull request #1578 from onflow/chasefleming/1577

Fix gas limit issue automatically running emulator on `flow dev`
onflow · May 6, 2024 · d2c8455 · d2c8455
2 parents f6ba575 + 85d7e1f
commit d2c8455
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/internal/dependencymanager/install.go b/internal/dependencymanager/install.go
@@ -20,6 +20,7 @@ package dependencymanager
 
 import (
 	"fmt"
+
 	"github.com/onflow/flow-cli/internal/util"
 
 	"github.com/spf13/cobra"

diff --git a/internal/super/dev.go b/internal/super/dev.go
@@ -27,6 +27,8 @@ import (
 	"strings"
 	"syscall"
 
+	flowGo "github.com/onflow/flow-go/model/flow"
+
 	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/flow-emulator/server"
 	"github.com/onflow/flowkit"
@@ -82,10 +84,13 @@ func dev(
 		log := zerolog.New(consoleWriter).With().Timestamp().Logger()
 
 		emulatorServer := server.NewEmulatorServer(&log, &server.Config{
-			ServicePublicKey:   (*privateKey).PublicKey(),
-			ServicePrivateKey:  *privateKey,
-			ServiceKeySigAlgo:  serviceAccount.Key.SigAlgo(),
-			ServiceKeyHashAlgo: serviceAccount.Key.HashAlgo(),
+			ChainID:                flowGo.Emulator,
+			ServicePublicKey:       (*privateKey).PublicKey(),
+			ServicePrivateKey:      *privateKey,
+			ServiceKeySigAlgo:      serviceAccount.Key.SigAlgo(),
+			ServiceKeyHashAlgo:     serviceAccount.Key.HashAlgo(),
+			ScriptGasLimit:         100000,
+			TransactionMaxGasLimit: 9999,
 		})
 
 		emuErr := emulatorServer.Listen()