Update to Cadence 1.0 RC1

.github/workflows/build-release.yaml

@@ -22,7 +22,7 @@ jobs:
         continue-on-error: true
         uses: snyk/actions/golang@master
         with:
-          go-version: '1.19'
+          go-version: '1.20'
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
       - uses: wangyoucao577/go-release-action@v1.40

.github/workflows/ci.yml

@@ -22,15 +22,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-go@v1
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
-      - uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: '1.20'
       - name: Run tests
         run: |
           make ci
@@ -47,9 +41,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: "1.20"
       - name: generate
         run: make generate
       - uses: golangci/golangci-lint-action@v3.7.0

.github/workflows/flowkit-release.yml

@@ -0,0 +1,18 @@
+name: Flowkit Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  flowkit-release:
+    if: "!github.event.release.prerelease"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: tag flowkit release
+        env:
+          FLOWKIT_RELEASE_TAG: flowkit/${{ github.event.release.tag_name }}
+        run: |
+          git tag "$FLOWKIT_RELEASE_TAG" 
+          git push origin "$FLOWKIT_RELEASE_TAG"

.github/workflows/publish-release.yml

@@ -9,10 +9,8 @@ jobs:
     name: Bump Homebrew formula
     runs-on: ubuntu-latest
     steps:
-      - uses: mislav/bump-homebrew-formula-action@v1
+      - uses: mislav/bump-homebrew-formula-action@v3
         with:
           formula-name: flow-cli
-          # https://github.com/mislav/bump-homebrew-formula-action/issues/58
-          formula-path: Formula/f/flow-cli.rb
         env:
           COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}

CODEOWNERS

@@ -1 +1 @@
-* @Kay-Zee @janezpodhostnik @sideninja @DylanTinianov @chasefleming @nvdtf @bluesign @bjartek @jribbink
+* @Kay-Zee @janezpodhostnik @sideninja @chasefleming @nvdtf @bluesign @bjartek @jribbink

Makefile

@@ -27,9 +27,9 @@ install-tools:
 	cd ${GOPATH}; \
 	mkdir -p ${GOPATH}; \
 	GO111MODULE=on go install github.com/axw/gocov/gocov@latest; \
-	GO111MODULE=on go install github.com/matm/gocov-html@latest; \
+	GO111MODULE=on go install github.com/matm/gocov-html/cmd/gocov-html@latest; \
 	GO111MODULE=on go install github.com/sanderhahn/gozip/cmd/gozip@latest; \
-	GO111MODULE=on go install github.com/vektra/mockery/v2@latest;
+	GO111MODULE=on go install github.com/vektra/mockery/v2@v2.38.0;
 
 .PHONY: test
 test:
@@ -113,4 +113,4 @@ generate-schema:
 .PHONY: generate
 generate: install-tools
 	cd flowkit; \
- 	go generate ./...
+ 	go generate ./...

README.md

@@ -36,23 +36,42 @@ Read about supported commands in the [CLI documentation website](https://develop
 Usage:
   flow [command]
 
-Available Commands:
-  accounts     Utilities to manage accounts
-  blocks       Utilities to read blocks
+👋 Welcome Flow developer!
+   If you are starting a new flow project try running 'flow setup <project_name>'. 
+
+🔥 Super Commands
+  dev          Build your Flow project
+  flix         Execute FLIX template with a given id, name, or local filename
+  generate     Generate new boilerplate files
+  setup        Start a new Flow project
+
+📦 Flow Entities
+  accounts     Create and retrieve accounts and deploy contracts
+  blocks       Retrieve blocks
+  collections  Retrieve collections
+  events       Retrieve events
+
+💬 Flow Interactions
+  scripts      Execute Cadence scripts
+  transactions Build, sign, send and retrieve transactions
+
+🔨 Flow Tools
   cadence      Execute Cadence code
-  collections  Utilities to read collections
-  config       Utilities to manage configuration
-  emulator     Starts the Flow emulator server
+  dev-wallet   Run a development wallet
+  emulator     Run Flow network for development
+  flowser      Run Flowser project explorer
   test         Run Cadence tests
-  events       Utilities to read events
-  help         Help about any command
+
+🏄 Flow Project
+  deploy       Deploy all project contracts
   init         Initialize a new configuration
-  keys         Utilities to manage keys
   project      Manage your Cadence project
-  scripts      Utilities to execute scripts
-  status       Display the status of the Flow network
-  transactions Utilities to send transactions
-  version      View version and commit information
+  run          Start emulator and deploy all project contracts
+
+🔒 Flow Security
+  keys         Generate and decode Flow keys
+  signatures   Signature verification and creation
+
 ```
 
 The Flow CLI includes several commands to interact with Flow networks, such as querying account information, or sending transactions. It also includes the [Flow Emulator](https://developers.flow.com/tools/emulator).

cmd/flow/main.go

@@ -68,7 +68,6 @@ func main() {
 	// super commands
 	super.SetupCommand.AddToParent(cmd)
 	super.DevCommand.AddToParent(cmd)
-	super.FlixCommand.AddToParent(cmd)
 
 	// structured commands
 	cmd.AddCommand(settings.Cmd)
@@ -86,6 +85,8 @@ func main() {
 	cmd.AddCommand(config.Cmd)
 	cmd.AddCommand(signatures.Cmd)
 	cmd.AddCommand(snapshot.Cmd)
+	cmd.AddCommand(super.FlixCmd)
+	cmd.AddCommand(super.GenerateCommand)
 
 	command.InitFlags(cmd)
 	cmd.AddGroup(&cobra.Group{

flowkit/arguments/arguments_test.go

@@ -149,6 +149,8 @@ func Test_ParseWithoutType(t *testing.T) {
 				Name: "variable-sized array",
 				Value: cadence.NewArray([]cadence.Value{
 					cadence.String("42"),
+				}).WithType(&cadence.VariableSizedArrayType{
+					ElementType: cadence.StringType,
 				}),
 				Type: &cadence.VariableSizedArrayType{
 					ElementType: cadence.StringType,
@@ -158,6 +160,9 @@ func Test_ParseWithoutType(t *testing.T) {
 				Name: "constant-sized array",
 				Value: cadence.NewArray([]cadence.Value{
 					cadence.String("42"),
+				}).WithType(&cadence.ConstantSizedArrayType{
+					ElementType: cadence.StringType,
+					Size:        1,
 				}),
 				Type: &cadence.ConstantSizedArrayType{
 					ElementType: cadence.StringType,

flowkit/config/config_test.go

@@ -325,10 +325,11 @@ func Test_DefaultConfig(t *testing.T) {
 	assert.Len(t, cfg.Emulators, 1)
 	assert.Equal(t, cfg.Emulators[0].Name, "default")
 	assert.Equal(t, cfg.Emulators[0].ServiceAccount, "emulator-account")
-	assert.Len(t, cfg.Networks, 3)
+	assert.Len(t, cfg.Networks, 4)
 	assert.Equal(t, "emulator", cfg.Networks[0].Name)
-	assert.Equal(t, "testnet", cfg.Networks[1].Name)
-	assert.Equal(t, "mainnet", cfg.Networks[2].Name)
+	assert.Equal(t, "testing", cfg.Networks[1].Name)
+	assert.Equal(t, "testnet", cfg.Networks[2].Name)
+	assert.Equal(t, "mainnet", cfg.Networks[3].Name)
 }
 
 func Test_DefaultPath(t *testing.T) {

flowkit/config/network.go

@@ -28,6 +28,10 @@ var (
 		Name: "emulator",
 		Host: "127.0.0.1:3569",
 	}
+	TestingNetwork = Network{
+		Name: "testing",
+		Host: "127.0.0.1:3569",
+	}
 	TestnetNetwork = Network{
 		Name: "testnet",
 		Host: "access.devnet.nodes.onflow.org:9000",
@@ -38,6 +42,7 @@ var (
 	}
 	DefaultNetworks = Networks{
 		EmulatorNetwork,
+		TestingNetwork,
 		TestnetNetwork,
 		MainnetNetwork,
 	}

flowkit/flowkit.go

@@ -27,6 +27,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	goeth "github.com/ethereum/go-ethereum/accounts"
 	"github.com/lmars/go-slip10"
 	"github.com/onflow/cadence"
@@ -220,7 +221,6 @@ func (f *Flowkit) prepareTransaction(
 	tx *transactions.Transaction,
 	account *accounts.Account,
 ) (*transactions.Transaction, error) {
-
 	block, err := f.gateway.GetLatestBlock()
 	if err != nil {
 		return nil, err
@@ -308,6 +308,7 @@ func (f *Flowkit) AddContract(
 	}
 
 	f.logger.StartProgress(fmt.Sprintf("Checking contract '%s' on account '%s'...", name, account.Address))
+	defer f.logger.StopProgress()
 
 	// check if contract exists on account
 	flowAccount, err := f.gateway.GetAccount(account.Address)
@@ -360,10 +361,19 @@ func (f *Flowkit) AddContract(
 	}
 
 	d := state.Deployments().ByAccountAndNetwork(account.Name, f.network.Name)
+	cd := config.ContractDeployment{
+		Name: name,
+		Args: contract.Args,
+	}
 	if d != nil {
-		d.AddContract(config.ContractDeployment{
-			Name: name,
-		})
+		d.AddContract(cd)
+	} else {
+		deployment := config.Deployment{
+			Network:   f.network.Name,
+			Account:   account.Name,
+			Contracts: []config.ContractDeployment{cd},
+		}
+		state.Deployments().AddOrUpdate(deployment)
 	}
 
 	// don't add contract if it already exists because it might overwrite existing data
@@ -549,7 +559,7 @@ func makeEventQueries(
 ) []grpc.EventRangeQuery {
 	var queries []grpc.EventRangeQuery
 	for startHeight <= endHeight {
-		suggestedEndHeight := startHeight + blockCount - 1 //since we are inclusive
+		suggestedEndHeight := startHeight + blockCount - 1 // since we are inclusive
 		end := endHeight
 		if suggestedEndHeight < endHeight {
 			end = suggestedEndHeight
@@ -564,7 +574,6 @@ func makeEventQueries(
 		startHeight = suggestedEndHeight + 1
 	}
 	return queries
-
 }
 
 // GenerateKey using the signature algorithm and optional seed. If seed is not provided a random safe seed will be generated.
@@ -854,6 +863,7 @@ func (f *Flowkit) GetTransactionByID(
 
 	if waitSeal {
 		f.logger.StartProgress("Waiting for transaction to be sealed...")
+		defer f.logger.StopProgress()
 	}
 
 	result, err := f.gateway.GetTransactionResult(ID, waitSeal)
@@ -1025,6 +1035,7 @@ func (f *Flowkit) SendTransaction(
 
 	f.logger.Info(fmt.Sprintf("Transaction ID: %s", tx.FlowTransaction().ID()))
 	f.logger.StartProgress("Sending transaction...")
+	defer f.logger.StopProgress()
 
 	sentTx, err := f.gateway.SendSignedTransaction(tx.FlowTransaction())
 	if err != nil {
@@ -1039,3 +1050,8 @@ func (f *Flowkit) SendTransaction(
 
 	return sentTx, res, err
 }
+
+// this is added to resolve the issue with chainhash ambiguous import,
+// the code is not used, but it's needed to force go.mod specify and retain chainhash version
+// workaround for issue: https://github.com/golang/go/issues/27899
+var _ = chainhash.Hash{}