Merge pull request #62 from onflow/cf/update-flowkit

Update Flowkit to v1.18.0
onflow · May 14, 2024 · 6f9d48c · 6f9d48c
2 parents 8c773ac + 5356621
commit 6f9d48c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/hexops/autogold/v2 v2.2.1
 	github.com/onflow/cadence v0.42.10
 	github.com/onflow/flow-go-sdk v0.46.2
-	github.com/onflow/flowkit v1.17.3
+	github.com/onflow/flowkit v1.18.0
 	github.com/onflow/go-ethereum v1.13.4
 	github.com/spf13/afero v1.10.0
 	github.com/stoewer/go-strcase v1.3.0

diff --git a/go.sum b/go.sum
@@ -747,8 +747,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9j
 github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E=
 github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flowkit v1.17.3 h1:0Fi3tLnieWOYq95A3ySk3TZ0GUPtKaX8ofssgve9e58=
-github.com/onflow/flowkit v1.17.3/go.mod h1:laapt1diM4Pbqt0dotKMH+LbUAOEqgugpH1p4+sPhcw=
+github.com/onflow/flowkit v1.18.0 h1:8FmnLcfc5lUuUrKPHr9Z1YQVh50P33l+Ac7DhUNbiaw=
+github.com/onflow/flowkit v1.18.0/go.mod h1:laapt1diM4Pbqt0dotKMH+LbUAOEqgugpH1p4+sPhcw=
 github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
 github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
 github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead h1:2j1Unqs76Z1b95Gu4C3Y28hzNUHBix7wL490e61SMSw=

diff --git a/internal/v1_1/generator.go b/internal/v1_1/generator.go
@@ -6,13 +6,15 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/onflow/flow-go-sdk/crypto"
+	"github.com/onflow/flowkit/accounts"
+
 	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/cmd"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/flixkit-go/internal/contracts"
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/crypto"
 	"github.com/onflow/flowkit"
 	"github.com/onflow/flowkit/config"
 	"github.com/onflow/flowkit/gateway"
@@ -50,10 +52,17 @@ func NewTemplateGenerator(contractInfos ContractInfos, logger output.Logger) (*G
 		return nil, fmt.Errorf("could not create grpc gateway for mainnet %w", err)
 	}
 
-	state, err := flowkit.Init(loader, crypto.ECDSA_P256, crypto.SHA3_256)
+	state, err := flowkit.Init(loader)
 	if err != nil {
 		return nil, fmt.Errorf("could not initialize flowkit state %w", err)
 	}
+
+	emulatorAccount, err := accounts.NewEmulatorAccount(loader, crypto.ECDSA_P256, crypto.SHA3_256, "")
+	if err != nil {
+		return nil, fmt.Errorf("could not create emulator account %w", err)
+	}
+	state.Accounts().AddOrUpdate(emulatorAccount)
+
 	testnetClient := flowkit.NewFlowkit(state, config.TestnetNetwork, gwt, logger)
 	mainnetClient := flowkit.NewFlowkit(state, config.MainnetNetwork, gwm, logger)
 	// add core contracts to deployed contracts

diff --git a/internal/v1_1/generator_test.go b/internal/v1_1/generator_test.go
@@ -418,10 +418,12 @@ func newAccount(name string, address string, seed string) *accounts.Account {
 }
 
 func setup(rw flowkit.ReaderWriter) (*flowkit.State, *flowkit.Flowkit, *mocks.TestGateway) {
-	state, err := flowkit.Init(rw, crypto.ECDSA_P256, crypto.SHA3_256)
+	state, err := flowkit.Init(rw)
 	if err != nil {
 		panic(err)
 	}
+	emulatorServiceAccount, _ := accounts.NewEmulatorAccount(rw, crypto.ECDSA_P256, crypto.SHA3_256, "")
+	state.Accounts().AddOrUpdate(emulatorServiceAccount)
 	gw := mocks.DefaultMockGateway()
 	logger := output.NewStdoutLogger(output.NoneLog)
 	flowkit := flowkit.NewFlowkit(state, config.TestnetNetwork, gw.Mock, logger)