Merge pull request #302 from onflow/release/v024

Release v0.24.0

Author: devbugging

.github/workflows/cd.yml

@@ -0,0 +1,25 @@
+name: CD Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-go@v1
+        with:
+          go-version: '1.16.2'
+      - name: Build Binaries
+        run: make versioned-binaries
+      - name: Uploading Binaries
+        uses: google-github-actions/upload-cloud-storage@main
+        with:
+          credentials: ${{ secrets.FLOW_TEST_SA }}
+          path: cmd/flow/flow-*
+          destination: flow-cli-test/

.github/workflows/ci.yml

@@ -24,10 +24,16 @@ jobs:
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
           ${{ runner.os }}-go-
-    - run: |
+    - name: Run tests
+      run: |
         make ci
         make check-tidy
         make check-headers
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v1
+      with:
+        file: ./coverage.txt
+        flags: unittests
 
   lint:
     runs-on: ubuntu-latest

.gitignore

@@ -6,6 +6,7 @@
 
 # Coverage artifacts
 coverage.zip
+coverage.txt
 cover.json
 cover-summary
 index.html

Makefile

@@ -5,7 +5,7 @@ COMMIT := $(shell git rev-parse HEAD)
 # The tag of the current commit, otherwise empty
 VERSION := $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
 # Name of the cover profile
-COVER_PROFILE := cover.out
+COVER_PROFILE := coverage.txt
 # Disable go sum database lookup for private repos
 GOPRIVATE := github.com/dapperlabs/*
 # Ensure go bin path is in path (Especially for CI)
@@ -32,10 +32,6 @@ install-tools:
 test:
 	GO111MODULE=on go test -coverprofile=$(COVER_PROFILE) $(if $(JSON_OUTPUT),-json,) ./...
 
-.PHONY: test-e2e
-test-e2e:
-	GO111MODULE=on E2E=1 go test tests/e2e_test.go
-
 .PHONY: test-e2e-emulator
 test-e2e-emulator:
 	flow -f tests/flow.json emulator start

cmd/flow/main.go

@@ -37,7 +37,7 @@ import (
 	"github.com/onflow/flow-cli/internal/status"
 	"github.com/onflow/flow-cli/internal/transactions"
 	"github.com/onflow/flow-cli/internal/version"
-	"github.com/onflow/flow-cli/pkg/flowcli/util"
+	"github.com/onflow/flow-cli/pkg/flowkit/util"
 )
 
 func main() {

docs/configuration.md

@@ -32,7 +32,7 @@ Flow configuration (`flow.json`) file will contain the following properties:
   "accounts": {
     "emulator-account": {
       "address": "f8d6e0586b0a20c7",
-      "keys": "ae1b44c0f5e8f6992ef2348898a35e50a8b0b9684000da8b1dade1b3bcd6ebee",
+      "key": "ae1b44c0f5e8f6992ef2348898a35e50a8b0b9684000da8b1dade1b3bcd6ebee",
     }
   },
   "deployments": {},
@@ -79,15 +79,15 @@ We'll walk through each property one by one.
   "accounts": {
     "admin-account": {
       "address": "3ae53cb6e3f42a79",
-      "keys": "12332967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
+      "key": "12332967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
     },
     "user-account": {
       "address": "e2a8b7f23e8b548f",
-      "keys": "22232967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
+      "key": "22232967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
     },
     "emulator-account": {
       "address": "f8d6e0586b0a20c7",
-      "keys": "2eae2f31cb5b756151fa11d82949c634b8f28796a711d7eb1e52cc301ed11111",
+      "key": "2eae2f31cb5b756151fa11d82949c634b8f28796a711d7eb1e52cc301ed11111",
     }
   },
 
@@ -167,7 +167,7 @@ private key.
 "accounts": {
   "admin-account": {
     "address": "3ae53cb6e3f42a79",
-    "keys": "12332967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
+    "key": "12332967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
   }
 }
 
@@ -186,28 +186,15 @@ value that is defined on the run time to the default service address on the emul
 ...
 
 "accounts": {
-  "admin-account-multiple-keys": {
+  "admin-account": {
     "address": "service",
-    "keys": [
-      {
+    "key":{
         "type": "hex",
         "index": 0,
         "signatureAlgorithm": "ECDSA_P256",
         "hashAlgorithm": "SHA3_256",
-        "context": {
-          "privateKey": "12332967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
-        }
-      },
-      {
-        "type": "hex",
-        "index": 1,
-        "signatureAlgorithm": "ECDSA_P256",
-        "hashAlgorithm": "SHA3_256",
-        "context": {
-          "privateKey": "333332967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
-        }
+        "privateKey": "12332967fd2bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
       }
-    ]
   }
 }
 

docs/create-accounts.md

@@ -40,7 +40,7 @@ In the above example, the `flow.json` file would look something like this:
   "accounts": {
     "my-testnet-account": {
       "address": "a2c4941b5f3c7151",
-      "keys": "12c5dfde...bb2e542f1af710bd1d40b2"
+      "key": "12c5dfde...bb2e542f1af710bd1d40b2"
     }
   }
 }

docs/decode-keys.md

@@ -1,29 +1,62 @@
 ---
-title: Decode Account Key with the Flow CLI
-sidebar_title: Decode Account Keys
-description: How to decode rlp encoded key pair from the command line
+title: Decode Public Keys with the Flow CLI
+sidebar_title: Decode Public Keys
+description: How to decode Flow public keys from the command line
 ---
 
-The Flow CLI provides a command to decode RLP encoded account key.
+The Flow CLI provides a command to decode encoded public account keys.
 
 ```shell
-flow keys decode <rlp encoded account key>
+flow keys decode <rlp|pem> <encoded public key>
 ```
 
 ## Example Usage
 
+### Decode RLP Encoded Public Key
 ```shell
-> flow keys decode f847b84084d716c14b051ad6b001624f738f5d302636e6b07cc75e4530af7776a4368a2b586dbefc0564ee28384c2696f178cbed52e62811bcc9ecb59568c996d342db2402038203e8
+> flow keys decode rlp f847b84084d716c14b051ad6b001624f738f5d302636e6b07cc75e4530af7776a4368a2b586dbefc0564ee28384c2696f178cbed52e62811bcc9ecb59568c996d342db2402038203e8
 
-Public Key 		 84d716c14b051ad6b001624f738f5d302636e6b07cc75e4530af7776a4368a2b586dbefc0564ee28384c2696f178cbed52e62811bcc9ecb59568c996d342db24 
+Public Key 		 84d716c1...bcc9ecb59568c996d342db24 
 Signature algorithm 	 ECDSA_P256
 Hash algorithm 		 SHA3_256
 Weight 			 1000
 Revoked 		 false
 ```
 
+### Decode PEM Encoded Public Key From File
+```shell
+> flow keys decode pem --from-file key.pem
+
+Public Key 		 d479b3c...c4615360039a6660a366a95f 
+Signature algorithm 	 ECDSA_P256
+Hash algorithm 		 UNKNOWN
+Revoked 		 false
+
+```
+
+## Arguments
+
+### Encoding
+- Valid inputs: `rlp`, `pem` 
+
+First argument specifies a valid encoding of the public key provided.
+
+### Optional: Public Key
+- Name: `encoded public key`
+- Valid inputs: valid encoded key content
+
+Optional second argument provides content of the encoded public key. 
+If this argument is omitted the `--from-file` must be used instead.  
+
 ## Flags
 
+### From File
+
+- Flag: `--from-file`
+- Valid inputs: valid filepath
+
+Provide file with the encoded public key. 
+
 ### Filter
 
 - Flag: `--filter`

docs/developer-updates/release-notes-v24.md

@@ -0,0 +1,47 @@
+## ⬆️ Install or Upgrade
+
+Follow the [Flow CLI installation guide](https://docs.onflow.org/flow-cli/install/) for instructions on how to install or upgrade the CLI.
+
+## 💥 Breaking Changes
+
+### Cadence and Language Server Update
+Cadence was updated to version v0.18.0 and language server to version v0.18.2 which implements the breaking changes from flowkit library.
+
+### FlowKit API Changes
+CLI implements a flowkit utility library which can be reused in other services. This is early stage development and the API for this library was refactored and improved. 
+
+## ⭐ Features
+
+### Decode PEM Public Key
+New command for decoding PEM encoded public key. You can use the decoding command like so:
+```bash
+flow keys decode pem --from-file key.pem
+
+Public Key 		 d479b3cdc9edbddb195cb12b35161ade826b032a64bdd4062cc87fb3ba7e71c9cf646ff23990bb4532ca45c445c7e908cef278b2c4615360039a6660a366a95f 
+Signature algorithm 	 ECDSA_P256
+Revoked 		 false
+
+```
+
+## 🎉 Improvements
+
+### Validate Configuration
+Configuration validation has been improved and will provide better feedback when there are wrong values set in the `flow.json`.
+
+### Updated Cobra
+Cobra library was updated to the latest version.
+
+### Refactored Testing
+Testing suite was completely refactored and improved which will provide better code coverage and more reliable codebase.
+
+## 🐞 Bug Fixes
+
+### Refactored Event Display
+Events output on the transaction command was refactored, so it better handles special values in the events.
+
+### Flow Init Warning
+Flow init command incorrectly displayed a warning which is now removed.
+
+### Transaction IDs Output
+All commands that send transactions to the network now display that transaction ID for better visibility.
+

docs/security.md

@@ -46,7 +46,7 @@ that is not checked into source control (e.g. excluded with `.gitignore`).
   "accounts": {
     "my-testnet-account": {
       "address": "3ae53cb6e3f42a79",
-      "keys": "334232967f52bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
+      "key": "334232967f52bd75234ae9037dd4694c1f00baad63a10c35172bf65fbb8ad1111"
     }
   }
 }
@@ -69,7 +69,7 @@ PRIVATE_KEY=key flow project deploy
   "accounts": {
     "my-testnet-account": {
       "address": "3ae53cb6e3f42a79",
-      "keys": "$PRIVATE_KEY"
+      "key": "$PRIVATE_KEY"
     }
   }
   ...