From e0e0f2acf4a51375c60f0c400c9e41b61ecd3b60 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Feb 2022 10:36:32 +0100 Subject: [PATCH 01/16] add wallet command --- internal/tools/wallet.go | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 internal/tools/wallet.go diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go new file mode 100644 index 000000000..de56ef9fb --- /dev/null +++ b/internal/tools/wallet.go @@ -0,0 +1,33 @@ +package tools + +import ( + "github.com/onflow/flow-cli/internal/command" + "github.com/onflow/flow-cli/pkg/flowkit" + "github.com/onflow/flow-cli/pkg/flowkit/services" + "github.com/spf13/cobra" +) + +type FlagsWallet struct { +} + +var walletFlags = FlagsWallet{} + +var DevWallet = &command.Command{ + Cmd: &cobra.Command{ + Use: "dev-wallet", + Short: "Start a dev wallet", + }, + Flags: &walletFlags, + RunS: wallet, +} + +func wallet( + _ []string, + _ flowkit.ReaderWriter, + globalFlags command.GlobalFlags, + services *services.Services, + _ *flowkit.State, +) (command.Result, error) { + + return nil, nil +} From fa876247959820a05dfaeec9fc16b4d91ff9af2b Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Feb 2022 12:16:36 +0100 Subject: [PATCH 02/16] implement wallet start --- go.mod | 1 + go.sum | 2 ++ internal/tools/wallet.go | 32 ++++++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index e6079fb7e..60e583f5a 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/manifoldco/promptui v0.9.0 github.com/onflow/cadence v0.21.1 github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831 + github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 // indirect github.com/onflow/flow-core-contracts/lib/go/templates v0.10.1 github.com/onflow/flow-emulator v0.28.2 github.com/onflow/flow-go v0.23.2-0.20220203200919-d4d4cae0de36 diff --git a/go.sum b/go.sum index ccb9baf3c..f97a949f7 100644 --- a/go.sum +++ b/go.sum @@ -1399,6 +1399,8 @@ github.com/onflow/cadence/languageserver v0.16.0/go.mod h1:UPV1so9LcMrhj27IegrTu github.com/onflow/cadence/languageserver v0.18.2/go.mod h1:ehuDCUevEEavUzgJqLevcZPjfmTzMBX7Sglbi5ur9uU= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831 h1:89apbCF/MbTL5ldqYKvwnt8OLN+NuCkdMMJN5clEgrE= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831/go.mod h1:sOABh+6LBUWgY6r5iYhu98mDgfiBVTXAKVYHPQV/nvo= +github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 h1:tTtfROT6EIlWvn8b7uynYBFfd3pWCHBxpkbPFTtaGoY= +github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0/go.mod h1:tfpb4ZNC9WZM2dSb+XMDeovkWN9YtxGkXpRz5n5/3B8= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621 h1:owMor9/wFpw3fua47UkUeDaFwyySK/dIPiNCCyhoO7c= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c= github.com/onflow/flow-cli v0.20.3-0.20210512000809-474effb7e7db/go.mod h1:Yh4dgrNiZdXhbU+3UVUmo4gRM0TEBVvhW4ITKVo82dg= diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index de56ef9fb..59d7b0707 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -1,6 +1,7 @@ package tools import ( + devWallet "github.com/onflow/fcl-dev-wallet" "github.com/onflow/flow-cli/internal/command" "github.com/onflow/flow-cli/pkg/flowkit" "github.com/onflow/flow-cli/pkg/flowkit/services" @@ -15,7 +16,7 @@ var walletFlags = FlagsWallet{} var DevWallet = &command.Command{ Cmd: &cobra.Command{ Use: "dev-wallet", - Short: "Start a dev wallet", + Short: "Starts a dev wallet", }, Flags: &walletFlags, RunS: wallet, @@ -26,8 +27,35 @@ func wallet( _ flowkit.ReaderWriter, globalFlags command.GlobalFlags, services *services.Services, - _ *flowkit.State, + state *flowkit.State, ) (command.Result, error) { + service, err := state.EmulatorServiceAccount() + if err != nil { + return nil, err + } + // todo check if this is ok and make sure emulator is running + emulator, err := state.Networks().ByName("emulator") + if err != nil { + return nil, err + } + + key := service.Key().ToConfig() + conf := devWallet.Config{ + Address: service.Address().String(), + PrivateKey: key.PrivateKey.String(), + PublicKey: key.PrivateKey.PublicKey().String(), + AccessNode: emulator.Host, + } + + srv, err := devWallet.NewHTTPServer(1234, &conf) + if err != nil { + return nil, err + } + + err = srv.Start() + if err != nil { + return nil, err + } return nil, nil } From 0ff0b661d8207f863fdb0ebcaa18cbb4c8336ca3 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Feb 2022 12:17:16 +0100 Subject: [PATCH 03/16] remove unused var --- internal/tools/wallet.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index 59d7b0707..ef2f67b01 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -25,8 +25,8 @@ var DevWallet = &command.Command{ func wallet( _ []string, _ flowkit.ReaderWriter, - globalFlags command.GlobalFlags, - services *services.Services, + _ command.GlobalFlags, + _ *services.Services, state *flowkit.State, ) (command.Result, error) { service, err := state.EmulatorServiceAccount() From 1e43d558d0d3edf8b3d08a030da0ff5240ee4e51 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Feb 2022 13:43:10 +0100 Subject: [PATCH 04/16] add dev wallet command --- cmd/flow/main.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/flow/main.go b/cmd/flow/main.go index 8984dcb00..8b4862bee 100644 --- a/cmd/flow/main.go +++ b/cmd/flow/main.go @@ -36,6 +36,7 @@ import ( "github.com/onflow/flow-cli/internal/signatures" "github.com/onflow/flow-cli/internal/snapshot" "github.com/onflow/flow-cli/internal/status" + "github.com/onflow/flow-cli/internal/tools" "github.com/onflow/flow-cli/internal/transactions" "github.com/onflow/flow-cli/internal/version" "github.com/onflow/flow-cli/pkg/flowkit/util" @@ -53,7 +54,10 @@ func main() { quick.InitCommand.AddToParent(cmd) quick.DeployCommand.AddToParent(cmd) quick.RunCommand.AddToParent(cmd) + + // single commands status.Command.AddToParent(cmd) + tools.DevWallet.AddToParent(cmd) // structured commands cmd.AddCommand(cadence.Cmd) From 7e1739d4c855651d9da3790be462e44b045ee305 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Feb 2022 13:43:33 +0100 Subject: [PATCH 05/16] emulator port --- internal/tools/wallet.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index ef2f67b01..059d17961 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -1,22 +1,28 @@ package tools import ( + "fmt" devWallet "github.com/onflow/fcl-dev-wallet" "github.com/onflow/flow-cli/internal/command" "github.com/onflow/flow-cli/pkg/flowkit" + "github.com/onflow/flow-cli/pkg/flowkit/output" "github.com/onflow/flow-cli/pkg/flowkit/services" "github.com/spf13/cobra" ) type FlagsWallet struct { + Port uint `default:"8081" flag:"port" info:"Dev wallet port to listen on"` + EmulatorPort uint `default:"3569" flag:"emulator-port" info:"The port emulator is listening on"` } var walletFlags = FlagsWallet{} var DevWallet = &command.Command{ Cmd: &cobra.Command{ - Use: "dev-wallet", - Short: "Starts a dev wallet", + Use: "dev-wallet", + Short: "Starts a dev wallet", + Example: "flow dev-wallet", + Args: cobra.ExactArgs(0), }, Flags: &walletFlags, RunS: wallet, @@ -25,7 +31,7 @@ var DevWallet = &command.Command{ func wallet( _ []string, _ flowkit.ReaderWriter, - _ command.GlobalFlags, + global command.GlobalFlags, _ *services.Services, state *flowkit.State, ) (command.Result, error) { @@ -33,25 +39,23 @@ func wallet( if err != nil { return nil, err } - // todo check if this is ok and make sure emulator is running - emulator, err := state.Networks().ByName("emulator") - if err != nil { - return nil, err - } key := service.Key().ToConfig() conf := devWallet.Config{ Address: service.Address().String(), PrivateKey: key.PrivateKey.String(), PublicKey: key.PrivateKey.PublicKey().String(), - AccessNode: emulator.Host, + AccessNode: fmt.Sprintf("localhost:%d", walletFlags.EmulatorPort), } - srv, err := devWallet.NewHTTPServer(1234, &conf) + srv, err := devWallet.NewHTTPServer(walletFlags.Port, &conf) if err != nil { return nil, err } + fmt.Printf("%s Starting dev wallet server on port %d\n", output.SuccessEmoji(), walletFlags.Port) + fmt.Printf("%s Make sure the emulator is running and listening on port %d\n", output.WarningEmoji(), walletFlags.EmulatorPort) + err = srv.Start() if err != nil { return nil, err From 40b762a8a250c194efae8bb4da191f405e94f0b4 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Feb 2022 14:05:17 +0100 Subject: [PATCH 06/16] add docs for the dev-wallet --- docs/tools.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 docs/tools.md diff --git a/docs/tools.md b/docs/tools.md new file mode 100644 index 000000000..b454b494d --- /dev/null +++ b/docs/tools.md @@ -0,0 +1,55 @@ +--- +title: Start Development Tools with the Flow CLI +sidebar_title: Development Tools +description: How to start development tools using the Flow CLI +--- + +The Flow CLI integrates different development tools, which can now be easily started +and managed from a single place. + +Currently the CLI supports starting: +- [FCL Development Wallet](https://github.com/onflow/fcl-dev-wallet) + + +### FCL Development Wallet +The FCL dev wallet is a mock Flow wallet that simulates the protocols used by FCL to interact with the Flow blockchain on behalf of simulated user accounts. + +**Be sure you have the emulator running before starting this command** +_You can start it using the `flow emulator` command_. + +```shell +flow dev-wallet +``` +_⚠️ This project implements an FCL compatible +interface, but should **not** be used as a reference for +building a production grade wallet._ + +## Flags + +### Port + +- Flag: `--port` +- Valid inputs: Number + +Port on which the dev wallet server will listen on. + +### Emulator Port + +- Flag: `--emulator-port` +- Valid inputs: Number + +Port on which the emulator is listening on. + +### Configuration + +- Flag: `--config-path` +- Short Flag: `-f` +- Valid inputs: valid filename + +Specify a filename for the configuration files, you can provide multiple configuration +files by using `-f` flag multiple times. + + + + + From 3d3006faf2d93d4d725e79f7ac9c71a4f31cae19 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Wed, 23 Feb 2022 10:18:24 +0100 Subject: [PATCH 07/16] change default port for fcl dev wallet --- docs/tools.md | 1 + internal/tools/wallet.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/tools.md b/docs/tools.md index b454b494d..a37fc83af 100644 --- a/docs/tools.md +++ b/docs/tools.md @@ -30,6 +30,7 @@ building a production grade wallet._ - Flag: `--port` - Valid inputs: Number +- Default: `8701` Port on which the dev wallet server will listen on. diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index 059d17961..e5f52551f 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -11,7 +11,7 @@ import ( ) type FlagsWallet struct { - Port uint `default:"8081" flag:"port" info:"Dev wallet port to listen on"` + Port uint `default:"8701" flag:"port" info:"Dev wallet port to listen on"` EmulatorPort uint `default:"3569" flag:"emulator-port" info:"The port emulator is listening on"` } From 8dcd92570022006a379739f6467d4e1d9cb6b987 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 7 Mar 2022 13:22:31 +0100 Subject: [PATCH 08/16] wip fcl --- go.mod | 4 +++- go.sum | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 60e583f5a..317793af4 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/manifoldco/promptui v0.9.0 github.com/onflow/cadence v0.21.1 github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831 - github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 // indirect + github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 github.com/onflow/flow-core-contracts/lib/go/templates v0.10.1 github.com/onflow/flow-emulator v0.28.2 github.com/onflow/flow-go v0.23.2-0.20220203200919-d4d4cae0de36 @@ -25,3 +25,5 @@ require ( gonum.org/v1/gonum v0.9.3 google.golang.org/grpc v1.43.0 ) + +replace github.com/onflow/fcl-dev-wallet => /Users/dapper/Dev/fcl-dev-wallet diff --git a/go.sum b/go.sum index f97a949f7..ccb9baf3c 100644 --- a/go.sum +++ b/go.sum @@ -1399,8 +1399,6 @@ github.com/onflow/cadence/languageserver v0.16.0/go.mod h1:UPV1so9LcMrhj27IegrTu github.com/onflow/cadence/languageserver v0.18.2/go.mod h1:ehuDCUevEEavUzgJqLevcZPjfmTzMBX7Sglbi5ur9uU= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831 h1:89apbCF/MbTL5ldqYKvwnt8OLN+NuCkdMMJN5clEgrE= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831/go.mod h1:sOABh+6LBUWgY6r5iYhu98mDgfiBVTXAKVYHPQV/nvo= -github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 h1:tTtfROT6EIlWvn8b7uynYBFfd3pWCHBxpkbPFTtaGoY= -github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0/go.mod h1:tfpb4ZNC9WZM2dSb+XMDeovkWN9YtxGkXpRz5n5/3B8= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621 h1:owMor9/wFpw3fua47UkUeDaFwyySK/dIPiNCCyhoO7c= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c= github.com/onflow/flow-cli v0.20.3-0.20210512000809-474effb7e7db/go.mod h1:Yh4dgrNiZdXhbU+3UVUmo4gRM0TEBVvhW4ITKVo82dg= From 5183693884df51b4e38b6c8afa003fa00f81157c Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 14 Mar 2022 12:17:08 +0100 Subject: [PATCH 09/16] fix grpc proxy port --- internal/tools/wallet.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index e5f52551f..bb198a4ff 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -2,6 +2,7 @@ package tools import ( "fmt" + devWallet "github.com/onflow/fcl-dev-wallet" "github.com/onflow/flow-cli/internal/command" "github.com/onflow/flow-cli/pkg/flowkit" @@ -11,8 +12,7 @@ import ( ) type FlagsWallet struct { - Port uint `default:"8701" flag:"port" info:"Dev wallet port to listen on"` - EmulatorPort uint `default:"3569" flag:"emulator-port" info:"The port emulator is listening on"` + Port uint `default:"8701" flag:"port" info:"Dev wallet port to listen on"` } var walletFlags = FlagsWallet{} @@ -31,7 +31,7 @@ var DevWallet = &command.Command{ func wallet( _ []string, _ flowkit.ReaderWriter, - global command.GlobalFlags, + _ command.GlobalFlags, _ *services.Services, state *flowkit.State, ) (command.Result, error) { @@ -45,7 +45,7 @@ func wallet( Address: service.Address().String(), PrivateKey: key.PrivateKey.String(), PublicKey: key.PrivateKey.PublicKey().String(), - AccessNode: fmt.Sprintf("localhost:%d", walletFlags.EmulatorPort), + AccessNode: fmt.Sprintf("http://localhost:8080"), } srv, err := devWallet.NewHTTPServer(walletFlags.Port, &conf) @@ -54,7 +54,7 @@ func wallet( } fmt.Printf("%s Starting dev wallet server on port %d\n", output.SuccessEmoji(), walletFlags.Port) - fmt.Printf("%s Make sure the emulator is running and listening on port %d\n", output.WarningEmoji(), walletFlags.EmulatorPort) + fmt.Printf("%s Make sure the emulator is running\n", output.WarningEmoji()) err = srv.Start() if err != nil { From f8288be8fc8b48379d5a8b31e31787eeb483da0a Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 14 Mar 2022 12:24:28 +0100 Subject: [PATCH 10/16] fix prefixes for config --- internal/tools/wallet.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index bb198a4ff..ba6031bf8 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -2,6 +2,7 @@ package tools import ( "fmt" + "strings" devWallet "github.com/onflow/fcl-dev-wallet" "github.com/onflow/flow-cli/internal/command" @@ -41,10 +42,11 @@ func wallet( } key := service.Key().ToConfig() + fmt.Println(key.PrivateKey.PublicKey().String(), key.PrivateKey.String(), key.PrivateKey.PublicKey().String()) conf := devWallet.Config{ - Address: service.Address().String(), - PrivateKey: key.PrivateKey.String(), - PublicKey: key.PrivateKey.PublicKey().String(), + Address: fmt.Sprintf("0x%s", service.Address().String()), + PrivateKey: strings.TrimPrefix(key.PrivateKey.String(), "0x"), + PublicKey: strings.TrimPrefix(key.PrivateKey.PublicKey().String(), "0x"), AccessNode: fmt.Sprintf("http://localhost:8080"), } From 9a818b42a0fdd7d1164a765ea8f3e4d82f337947 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 14 Mar 2022 12:25:07 +0100 Subject: [PATCH 11/16] remove local replace --- go.mod | 2 -- go.sum | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 317793af4..f715bfbd0 100644 --- a/go.mod +++ b/go.mod @@ -25,5 +25,3 @@ require ( gonum.org/v1/gonum v0.9.3 google.golang.org/grpc v1.43.0 ) - -replace github.com/onflow/fcl-dev-wallet => /Users/dapper/Dev/fcl-dev-wallet diff --git a/go.sum b/go.sum index ccb9baf3c..f97a949f7 100644 --- a/go.sum +++ b/go.sum @@ -1399,6 +1399,8 @@ github.com/onflow/cadence/languageserver v0.16.0/go.mod h1:UPV1so9LcMrhj27IegrTu github.com/onflow/cadence/languageserver v0.18.2/go.mod h1:ehuDCUevEEavUzgJqLevcZPjfmTzMBX7Sglbi5ur9uU= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831 h1:89apbCF/MbTL5ldqYKvwnt8OLN+NuCkdMMJN5clEgrE= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831/go.mod h1:sOABh+6LBUWgY6r5iYhu98mDgfiBVTXAKVYHPQV/nvo= +github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 h1:tTtfROT6EIlWvn8b7uynYBFfd3pWCHBxpkbPFTtaGoY= +github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0/go.mod h1:tfpb4ZNC9WZM2dSb+XMDeovkWN9YtxGkXpRz5n5/3B8= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621 h1:owMor9/wFpw3fua47UkUeDaFwyySK/dIPiNCCyhoO7c= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c= github.com/onflow/flow-cli v0.20.3-0.20210512000809-474effb7e7db/go.mod h1:Yh4dgrNiZdXhbU+3UVUmo4gRM0TEBVvhW4ITKVo82dg= From e20fc7e561fd56f8bda1a9349598d0851cab5c33 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 14 Mar 2022 12:30:20 +0100 Subject: [PATCH 12/16] lint fixes --- internal/tools/wallet.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index ba6031bf8..1172abfb9 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -4,11 +4,12 @@ import ( "fmt" "strings" - devWallet "github.com/onflow/fcl-dev-wallet" "github.com/onflow/flow-cli/internal/command" "github.com/onflow/flow-cli/pkg/flowkit" "github.com/onflow/flow-cli/pkg/flowkit/output" "github.com/onflow/flow-cli/pkg/flowkit/services" + + devWallet "github.com/onflow/fcl-dev-wallet" "github.com/spf13/cobra" ) @@ -47,7 +48,7 @@ func wallet( Address: fmt.Sprintf("0x%s", service.Address().String()), PrivateKey: strings.TrimPrefix(key.PrivateKey.String(), "0x"), PublicKey: strings.TrimPrefix(key.PrivateKey.PublicKey().String(), "0x"), - AccessNode: fmt.Sprintf("http://localhost:8080"), + AccessNode: "http://localhost:8080", } srv, err := devWallet.NewHTTPServer(walletFlags.Port, &conf) From 0ac445655d0bafd3dc2ef860c7c5ef700c6915e7 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 14 Mar 2022 12:39:11 +0100 Subject: [PATCH 13/16] header fix --- internal/tools/wallet.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index 1172abfb9..87f7963b1 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -1,3 +1,21 @@ +/* + * Flow CLI + * + * Copyright 2019-2022 Dapper Labs, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package tools import ( From 7901d6a364b355cb51713ab4cf659bcb93721d5e Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 14 Mar 2022 12:50:26 +0100 Subject: [PATCH 14/16] docs update --- docs/tools.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/tools.md b/docs/tools.md index a37fc83af..e69789c64 100644 --- a/docs/tools.md +++ b/docs/tools.md @@ -11,7 +11,8 @@ Currently the CLI supports starting: - [FCL Development Wallet](https://github.com/onflow/fcl-dev-wallet) -### FCL Development Wallet +## FCL Development Wallet + The FCL dev wallet is a mock Flow wallet that simulates the protocols used by FCL to interact with the Flow blockchain on behalf of simulated user accounts. **Be sure you have the emulator running before starting this command** @@ -24,6 +25,20 @@ _⚠️ This project implements an FCL compatible interface, but should **not** be used as a reference for building a production grade wallet._ +After starting dev-wallet, you can set your fcl config to use it like below: + +```javascript +import * as fcl from "@onflow/fcl" + +fcl.config() + // Point App at Emulator + .put("accessNode.api", "http://localhost:8080") + // Point FCL at dev-wallet (default port) + .put("discovery.wallet", "http://localhost:8701/fcl/authn") +``` +You can read more about setting up dev-wallet at [FCL Dev Wallet Project](https://github.com/onflow/fcl-dev-wallet) + + ## Flags ### Port From a029e7e5c616034d2bf50659ccc4c823f5e062a4 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Mar 2022 11:51:26 +0100 Subject: [PATCH 15/16] remove unused log --- internal/tools/wallet.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/tools/wallet.go b/internal/tools/wallet.go index 87f7963b1..72dcb64b3 100644 --- a/internal/tools/wallet.go +++ b/internal/tools/wallet.go @@ -61,7 +61,6 @@ func wallet( } key := service.Key().ToConfig() - fmt.Println(key.PrivateKey.PublicKey().String(), key.PrivateKey.String(), key.PrivateKey.PublicKey().String()) conf := devWallet.Config{ Address: fmt.Sprintf("0x%s", service.Address().String()), PrivateKey: strings.TrimPrefix(key.PrivateKey.String(), "0x"), From 58b2accdbe2c24a548c66c79ebea5c62927b9af5 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Mon, 21 Mar 2022 12:58:05 +0100 Subject: [PATCH 16/16] update dep --- go.mod | 13 ++++++------- go.sum | 61 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index f715bfbd0..32e91c9f0 100644 --- a/go.mod +++ b/go.mod @@ -9,19 +9,18 @@ require ( github.com/gosuri/uilive v0.0.4 github.com/joho/godotenv v1.4.0 github.com/manifoldco/promptui v0.9.0 - github.com/onflow/cadence v0.21.1 + github.com/onflow/cadence v0.23.0 github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831 - github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 + github.com/onflow/fcl-dev-wallet v0.4.0 github.com/onflow/flow-core-contracts/lib/go/templates v0.10.1 - github.com/onflow/flow-emulator v0.28.2 - github.com/onflow/flow-go v0.23.2-0.20220203200919-d4d4cae0de36 + github.com/onflow/flow-emulator v0.30.0 + github.com/onflow/flow-go v0.23.2-0.20220304145234-bf10d55c40fa github.com/onflow/flow-go-sdk v0.24.0 - github.com/onflow/flow-go/crypto v0.24.3-0.20220203200919-d4d4cae0de36 // indirect github.com/psiemens/sconfig v0.1.0 github.com/spf13/afero v1.8.0 github.com/spf13/cobra v1.3.0 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.7.1-0.20210824115523-ab6dc3262822 github.com/thoas/go-funk v0.7.0 gonum.org/v1/gonum v0.9.3 - google.golang.org/grpc v1.43.0 + google.golang.org/grpc v1.44.0 ) diff --git a/go.sum b/go.sum index f97a949f7..4d8ad1713 100644 --- a/go.sum +++ b/go.sum @@ -283,6 +283,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0= github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TIRis= github.com/dapperlabs/testingdock v0.4.2/go.mod h1:S45YfB1J1mbOeLHhJROx3dFZfMCVSxTgSU9vZ15Oq18= +github.com/dapperlabs/testingdock v0.4.4/go.mod h1:HeTbuHG1J4yt4n7NlZSyuk5c5fmyz6hECbyV+36Ku7Q= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -386,8 +387,9 @@ github.com/fxamacker/cbor/v2 v2.2.1-0.20210510192846-c3f3c69e7bc8/go.mod h1:TA1x github.com/fxamacker/cbor/v2 v2.2.1-0.20210927235116-3d6d5d1de29b/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= github.com/fxamacker/cbor/v2 v2.3.1-0.20211029162100-5d5d7c3edd41 h1:adk2SdM72B9LVdNPVgLDO+UBdGW5JmDIJEdzlI2ZYC8= github.com/fxamacker/cbor/v2 v2.3.1-0.20211029162100-5d5d7c3edd41/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= -github.com/fxamacker/circlehash v0.1.0 h1:wXK52nkcBzGM+FyYc3wFYshm+0523BfX7h1XsUJLl70= github.com/fxamacker/circlehash v0.1.0/go.mod h1:3aq3OfVvsWtkWMb6A1owjOQFA+TLsD5FgJflnaQwtMM= +github.com/fxamacker/circlehash v0.2.0 h1:IFBaLm/4NChHcIptw/A7Ha/DemC8M9jGbjWzsN6XDrc= +github.com/fxamacker/circlehash v0.2.0/go.mod h1:3aq3OfVvsWtkWMb6A1owjOQFA+TLsD5FgJflnaQwtMM= github.com/gammazero/deque v0.1.0 h1:f9LnNmq66VDeuAlSAapemq/U7hJ2jpIWa4c09q8Dlik= github.com/gammazero/deque v0.1.0/go.mod h1:KQw7vFau1hHuM8xmI9RbgKFbAsQFWmBpqQ2KenFLk6M= github.com/gammazero/workerpool v1.1.2 h1:vuioDQbgrz4HoaCi2q1HLlOXdpbap5AET7xu5/qj87g= @@ -1381,8 +1383,9 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:v github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onflow/atree v0.1.0-beta1.0.20211027184039-559ee654ece9/go.mod h1:+6x071HgCF/0v5hQcaE5qqjc2UqN5gCU8h5Mk6uqpOg= -github.com/onflow/atree v0.1.1 h1:KTJt70E3FEhDDLf6ViyKypqI3iVMlR6gsieOsN4Ewu4= github.com/onflow/atree v0.1.1/go.mod h1:95SqSEPgfijF1ZkLKbVgYVrfQzvP0fhayh555v1oLbs= +github.com/onflow/atree v0.2.0 h1:2Ea0PEDuOL48oOUlVEb7ry8W8HCkRUEnNQZ0W9IfIAk= +github.com/onflow/atree v0.2.0/go.mod h1:f4/LWn5dJiD63/BK35gnw8sNYWAXHapuekslfrmKvLo= github.com/onflow/cadence v0.14.2/go.mod h1:EEXKRNuW5C2E1wRM4fLhfqoTgXohPFieXwOGJubz1Jg= github.com/onflow/cadence v0.15.0/go.mod h1:KMzDF6cIv6nb5PJW9aITaqazbmJX8MMeibFcpPP385M= github.com/onflow/cadence v0.15.1/go.mod h1:KMzDF6cIv6nb5PJW9aITaqazbmJX8MMeibFcpPP385M= @@ -1392,15 +1395,15 @@ github.com/onflow/cadence v0.18.0/go.mod h1:iR/tZpP+1YhM8iRnOBPiBIs7on5dE3hk2Zfu github.com/onflow/cadence v0.18.1-0.20210617175100-225316245130/go.mod h1:iR/tZpP+1YhM8iRnOBPiBIs7on5dE3hk2ZfunCRQswE= github.com/onflow/cadence v0.20.1/go.mod h1:7mzUvPZUIJztIbr9eTvs+fQjWWHTF8veC+yk4ihcNIA= github.com/onflow/cadence v0.21.0/go.mod h1:KBxn7AyO+R2RFpFHjsWKJFAokyJaCZXc9Hr9MlEOq9g= -github.com/onflow/cadence v0.21.1 h1:zAry4ss4SxQyt6harwxTaIy1DzLeXg0GdbnoykdLzpA= -github.com/onflow/cadence v0.21.1/go.mod h1:KBxn7AyO+R2RFpFHjsWKJFAokyJaCZXc9Hr9MlEOq9g= +github.com/onflow/cadence v0.23.0 h1:pzvzR+ekPEl2+57cMw3RVi2/sNA3Nm3WVbXpyoICCzU= +github.com/onflow/cadence v0.23.0/go.mod h1:Y++seAx3qsNjjZYTQhClD86D5aF951cMHVPL94Z64J8= github.com/onflow/cadence/languageserver v0.15.2/go.mod h1:hQGE8dYH5CfQ1Oe0nXglchgURzZwR3JQhmuXtv4ROHs= github.com/onflow/cadence/languageserver v0.16.0/go.mod h1:UPV1so9LcMrhj27IegrTucoyS4TLRVjNr4DJqjqBhFA= github.com/onflow/cadence/languageserver v0.18.2/go.mod h1:ehuDCUevEEavUzgJqLevcZPjfmTzMBX7Sglbi5ur9uU= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831 h1:89apbCF/MbTL5ldqYKvwnt8OLN+NuCkdMMJN5clEgrE= github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831/go.mod h1:sOABh+6LBUWgY6r5iYhu98mDgfiBVTXAKVYHPQV/nvo= -github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0 h1:tTtfROT6EIlWvn8b7uynYBFfd3pWCHBxpkbPFTtaGoY= -github.com/onflow/fcl-dev-wallet v0.3.1-0.20220221111038-638595290db0/go.mod h1:tfpb4ZNC9WZM2dSb+XMDeovkWN9YtxGkXpRz5n5/3B8= +github.com/onflow/fcl-dev-wallet v0.4.0 h1:lmjp4tO57m2LCbJ0P79u4BxpGca8bcFtBJrmtxV39LY= +github.com/onflow/fcl-dev-wallet v0.4.0/go.mod h1:xWVEyGZgdDt4/+PLSlpuqhtzobjnWy5giceIGoErPzs= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621 h1:owMor9/wFpw3fua47UkUeDaFwyySK/dIPiNCCyhoO7c= github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c= github.com/onflow/flow-cli v0.20.3-0.20210512000809-474effb7e7db/go.mod h1:Yh4dgrNiZdXhbU+3UVUmo4gRM0TEBVvhW4ITKVo82dg= @@ -1410,8 +1413,8 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.2/go.mod h1:IZ2e7UyL github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.3-0.20210527134022-58c25247091a/go.mod h1:IZ2e7UyLCYmpQ8Kd7k0A32uXqdqfiV1r2sKs5/riblo= github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.3/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk= github.com/onflow/flow-core-contracts/lib/go/contracts v0.9.0/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.10.1 h1:W0zlLxatN88pC+U2eJ7F517KiI4B+kk3lpguyp8rEsQ= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.10.1/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk= +github.com/onflow/flow-core-contracts/lib/go/contracts v0.10.2-0.20220303222312-6b9de4f3fea5 h1:gHDpP4ARoOYHktuPxTv8mp8RRh37nMxA2U1mjXzIoIg= +github.com/onflow/flow-core-contracts/lib/go/contracts v0.10.2-0.20220303222312-6b9de4f3fea5/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk= github.com/onflow/flow-core-contracts/lib/go/templates v0.6.0/go.mod h1:fLJbjGUHrlHdrjaeRDgKG9nZJ6spiCScc+Q5SARgH38= github.com/onflow/flow-core-contracts/lib/go/templates v0.6.0/go.mod h1:fLJbjGUHrlHdrjaeRDgKG9nZJ6spiCScc+Q5SARgH38= github.com/onflow/flow-core-contracts/lib/go/templates v0.9.0/go.mod h1:ckE1lQ18DQVLH9gI63JnGLmBJL/Bo8FPsgYefcWpWhg= @@ -1421,8 +1424,8 @@ github.com/onflow/flow-emulator v0.19.0/go.mod h1:k5un51XlFJavboagCqTxd6x8Gle7lx github.com/onflow/flow-emulator v0.20.3/go.mod h1:xNdVsrMJiAaYJ59Dwo+xvj0ENdvk/bI14zkGN4V0ozs= github.com/onflow/flow-emulator v0.21.0/go.mod h1:/2dNG6K4fKtpZsazdIeK8Fs0IWXUzqvO3qK5467pYsc= github.com/onflow/flow-emulator v0.28.1-0.20220202131242-21a2c6e3eac7/go.mod h1:75iLaCkteYi8VsRnPH7RC9jeKjOIXogFq4TkPU71r1c= -github.com/onflow/flow-emulator v0.28.2 h1:Wy/8IL9UnZ5Mmx2kk+LjfeIDclztophzMxouhzzqTpc= -github.com/onflow/flow-emulator v0.28.2/go.mod h1:F2LpwJZXijqmO11nWnZavq60zHdriITcjSIJHGhzYAY= +github.com/onflow/flow-emulator v0.30.0 h1:czxxhtFWv5wYUiNG1KXWuwXrx2JaIHE+yDBsDKGSsuU= +github.com/onflow/flow-emulator v0.30.0/go.mod h1:jhun5qkwgdkJnmJpG6ghNKbSMfPWZPDSMWhNzqCTuDA= github.com/onflow/flow-ft/lib/go/contracts v0.5.0 h1:Cg4gHGVblxcejfNNG5Mfj98Wf4zbY76O0Y28QB0766A= github.com/onflow/flow-ft/lib/go/contracts v0.5.0/go.mod h1:1zoTjp1KzNnOPkyqKmWKerUyf0gciw+e6tAEt0Ks3JE= github.com/onflow/flow-go v0.16.3-0.20210427194927-6050c2a3ae42/go.mod h1:9GUEbBhOGDVf91ZJB6QWqVNQkrM3INEudNyDtIttOu0= @@ -1430,8 +1433,8 @@ github.com/onflow/flow-go v0.17.1/go.mod h1:j8zCo01+2pJL00qpOnwdOqU7spTgOLHFRUp9 github.com/onflow/flow-go v0.18.0/go.mod h1:cQpvFoqth9PR7tarWDa36R/dDOqUK5QYfeYzCdXPLII= github.com/onflow/flow-go v0.18.2-canary/go.mod h1:mGzTPbzG1YrckrFQfjCw6NzfflP1o3TjRxI9LRWZbpc= github.com/onflow/flow-go v0.23.2-0.20220201222302-cff34195a61a/go.mod h1:ci9UXmbx+2nloojjgXCaBCFhpYjssgRNH/s+HEATuzA= -github.com/onflow/flow-go v0.23.2-0.20220203200919-d4d4cae0de36 h1:VMPxbLYIVOXO1bScbDESji/iZ4pv39dBDR6awbkqLv8= -github.com/onflow/flow-go v0.23.2-0.20220203200919-d4d4cae0de36/go.mod h1:wdlbdj0duU0s0DPhJ/tPGQfImJbzTxAANe6zEHsjwRM= +github.com/onflow/flow-go v0.23.2-0.20220304145234-bf10d55c40fa h1:tO3RWPEdrWf811ojr4P/bKtw19sy19bMrGhDBVS0ycQ= +github.com/onflow/flow-go v0.23.2-0.20220304145234-bf10d55c40fa/go.mod h1:/+XZUjcmP7J/P0Zi428oNjGK94lNVoE9G/vu9UTRSKI= github.com/onflow/flow-go-sdk v0.18.0/go.mod h1:AjXHdxguP/PK5P8tWKHH4jR6oLISTgLoXXQrbQsHY+E= github.com/onflow/flow-go-sdk v0.19.0/go.mod h1:52QZyLwU3p3UZ2FXOy+sRl4JPdtvJoae1spIUBOFxA8= github.com/onflow/flow-go-sdk v0.20.0-alpha.1/go.mod h1:52QZyLwU3p3UZ2FXOy+sRl4JPdtvJoae1spIUBOFxA8= @@ -1443,15 +1446,16 @@ github.com/onflow/flow-go/crypto v0.18.0/go.mod h1:3Ah843iPyjIL+7nH9EillV3OWNptr github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ= github.com/onflow/flow-go/crypto v0.21.4-0.20211125190211-7b31c986316e/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ= github.com/onflow/flow-go/crypto v0.24.2/go.mod h1:dkVL98P6GHR48iD9zCB6XlnkJX8IQd00FKgt1reV90w= -github.com/onflow/flow-go/crypto v0.24.3-0.20220203200919-d4d4cae0de36 h1:o7OHWWFXl+nRH8rSYjyuZQX94OHoMErP8qEoO/0ehWI= -github.com/onflow/flow-go/crypto v0.24.3-0.20220203200919-d4d4cae0de36/go.mod h1:dkVL98P6GHR48iD9zCB6XlnkJX8IQd00FKgt1reV90w= +github.com/onflow/flow-go/crypto v0.24.3 h1:5puosmiy853m1GPmBLJr4PiLVcCzE4n5o60hRPo9kYA= +github.com/onflow/flow-go/crypto v0.24.3/go.mod h1:dkVL98P6GHR48iD9zCB6XlnkJX8IQd00FKgt1reV90w= github.com/onflow/flow-nft/lib/go/contracts v0.0.0-20210915191154-12ee8c507a0e h1:svZJ1NydwvNGfkJfJXIeECcKecnYC1CtC/BMzdfEI0U= github.com/onflow/flow-nft/lib/go/contracts v0.0.0-20210915191154-12ee8c507a0e/go.mod h1:epgW8P53PDpHaqBQCmMgJqdet4h7ONaoIL3kVD/nnzU= github.com/onflow/flow/protobuf/go/flow v0.1.9/go.mod h1:kRugbzZjwQqvevJhrnnCFMJZNmoSJmxlKt6hTGXZojM= github.com/onflow/flow/protobuf/go/flow v0.2.0/go.mod h1:kRugbzZjwQqvevJhrnnCFMJZNmoSJmxlKt6hTGXZojM= github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= -github.com/onflow/flow/protobuf/go/flow v0.2.3 h1:Ql+IjlhyVzCg5L+jHtE7J7xjFIk6D+tQN6SfTJhgZ5U= github.com/onflow/flow/protobuf/go/flow v0.2.3/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= +github.com/onflow/flow/protobuf/go/flow v0.2.4-0.20220215173423-e60766c65a21 h1:t8i7BdbZC+8PbCdTJRxgSoaNsN5SpCfZp0n6WsQcAUA= +github.com/onflow/flow/protobuf/go/flow v0.2.4-0.20220215173423-e60766c65a21/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= github.com/onflow/fusd/lib/go/contracts v0.0.0-20211021081023-ae9de8fb2c7e h1:RHaXPHvWCy3VM62+HTyu6DYq5T8rrK1gxxqogKuJ4S4= github.com/onflow/fusd/lib/go/contracts v0.0.0-20211021081023-ae9de8fb2c7e/go.mod h1:CRX9eXtc9zHaRVTW1Xh4Cf5pZgKkQuu1NuSEVyHXr/0= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1586,8 +1590,9 @@ github.com/psiemens/sconfig v0.1.0 h1:xfWqW+TRpih7mXZIqKYTmpRhlZLQ1kbxV8EjllPv76 github.com/psiemens/sconfig v0.1.0/go.mod h1:+MLKqdledP/8G3rOBpknbLh0IclCf4WneJUtS26JB2U= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.2.1-0.20211004051800-57c86be7915a h1:s7GrsqeorVkFR1vGmQ6WVL9nup0eyQCC+YVUeSQLH/Q= +github.com/rivo/uniseg v0.2.1-0.20211004051800-57c86be7915a/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/robertkrimen/otto v0.0.0-20170205013659-6a77b7cbc37d/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -1718,8 +1723,9 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1-0.20210824115523-ab6dc3262822 h1:pIU41i94FHtbh//ijmB0WYWGN8l7lCoMaOPcq/T9Vdc= +github.com/stretchr/testify v1.7.1-0.20210824115523-ab6dc3262822/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/supranational/blst v0.3.4 h1:iZE9lBMoywK2uy2U/5hDOvobQk9FnOQ2wNlu9GmRCoA= @@ -1802,10 +1808,12 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY= github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= -github.com/zeebo/blake3 v0.2.0 h1:1SGx3IvKWFUU/xl+/7kjdcjjMcvVSm+3dMo/N42afC8= github.com/zeebo/blake3 v0.2.0/go.mod h1:G9pM4qQwjRzF1/v7+vabMj/c5mWpGZ2Wzo3Eb4z0pb4= -github.com/zeebo/pcg v1.0.0 h1:dt+dx+HvX8g7Un32rY9XWoYnd0NmKmrIzpHF7qiTDj0= +github.com/zeebo/blake3 v0.2.2 h1:ddH9fUIlef5r+pqvJShGgSXFd6c7k54eQXZ48hNjotQ= +github.com/zeebo/blake3 v0.2.2/go.mod h1:TSQ0KjMH+pht+bRyvVooJ1rBpvvngSGaPISafq9MxJk= github.com/zeebo/pcg v1.0.0/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= +github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= +github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -2020,8 +2028,9 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 h1:0qxwC5n+ttVOINCBeRHO0nq9X7uy8SDsPoi5OaCdIEI= golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2178,13 +2187,15 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2420,8 +2431,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220211171837-173942840c17 h1:2X+CNIheCutWRyKRte8szGxrE5ggtV4U+NKAbh/oLhg= +google.golang.org/genproto v0.0.0-20220211171837-173942840c17/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -2457,8 +2469,9 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=