Merge remote-tracking branch 'origin/master' into jribbink/readme

go.mod

@@ -14,18 +14,18 @@ require (
 	github.com/gosuri/uilive v0.0.4
 	github.com/logrusorgru/aurora/v4 v4.0.0
 	github.com/manifoldco/promptui v0.9.0
-	github.com/onflow/cadence v1.0.0-preview.52
-	github.com/onflow/cadence-tools/languageserver v1.0.0-preview.39
-	github.com/onflow/cadence-tools/lint v1.0.0-preview.42
-	github.com/onflow/cadence-tools/test v1.0.0-preview.39
+	github.com/onflow/cadence v1.0.0
+	github.com/onflow/cadence-tools/languageserver v1.0.0
+	github.com/onflow/cadence-tools/lint v1.0.0
+	github.com/onflow/cadence-tools/test v1.0.0
 	github.com/onflow/fcl-dev-wallet v0.8.0
-	github.com/onflow/flixkit-go/v2 v2.0.0
+	github.com/onflow/flixkit-go/v2 v2.0.1
 	github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1
-	github.com/onflow/flow-emulator v1.0.0
-	github.com/onflow/flow-evm-gateway v0.36.4
-	github.com/onflow/flow-go v0.37.10
-	github.com/onflow/flow-go-sdk v1.0.0-preview.56
-	github.com/onflow/flowkit/v2 v2.0.0
+	github.com/onflow/flow-emulator v1.0.1
+	github.com/onflow/flow-evm-gateway v0.36.5-0.20241005010031-1f3f5439d553
+	github.com/onflow/flow-go v0.38.0-preview.0.0.20241002124048-21cfe5aea5a8
+	github.com/onflow/flow-go-sdk v1.0.0
+	github.com/onflow/flowkit/v2 v2.0.1
 	github.com/onflow/go-ethereum v1.14.7
 	github.com/onflowser/flowser/v3 v3.2.1-0.20240131200229-7d4d22715f48
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
@@ -210,7 +210,7 @@ require (
 	github.com/onflow/flow-ft/lib/go/templates v1.0.0 // indirect
 	github.com/onflow/flow-nft/lib/go/contracts v1.2.1 // indirect
 	github.com/onflow/flow-nft/lib/go/templates v1.2.0 // indirect
-	github.com/onflow/flow/protobuf/go/flow v0.4.6 // indirect
+	github.com/onflow/flow/protobuf/go/flow v0.4.7 // indirect
 	github.com/onflow/sdks v0.6.0-preview.1 // indirect
 	github.com/onflow/wal v1.0.2 // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect

go.sum

@@ -2157,47 +2157,47 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs
 github.com/onflow/atree v0.8.0-rc.6 h1:GWgaylK24b5ta2Hq+TvyOF7X5tZLiLzMMn7lEt59fsA=
 github.com/onflow/atree v0.8.0-rc.6/go.mod h1:yccR+LR7xc1Jdic0mrjocbHvUD7lnVvg8/Ct1AA5zBo=
 github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8=
-github.com/onflow/cadence v1.0.0-preview.52 h1:hZ92e6lL2+PQa3C1i5jJh0zZYFdW89+X1MS0Bkd6Ayo=
-github.com/onflow/cadence v1.0.0-preview.52/go.mod h1:7wvvecnAZtYOspLOS3Lh+FuAmMeSrXhAWiycC3kQ1UU=
-github.com/onflow/cadence-tools/languageserver v1.0.0-preview.39 h1:rVuWZ8iwMJSWOhOTzLV1Tgpor2I/gNKT9s7pbvB5too=
-github.com/onflow/cadence-tools/languageserver v1.0.0-preview.39/go.mod h1:Hlee1Rgl+hbFsljfcLJByUmEFVpJSgt70uRQe+j+OIs=
-github.com/onflow/cadence-tools/lint v1.0.0-preview.42 h1:dVigvKe5Wmn5tNJMD52ILfAFdXQAeda0fZAzSJTvWNs=
-github.com/onflow/cadence-tools/lint v1.0.0-preview.42/go.mod h1:W7meYo/pOyDX7KirNCpE0hCrapq/yBMfay9SxLlJUko=
-github.com/onflow/cadence-tools/test v1.0.0-preview.39 h1:P1IWj1qk4Jf4Qfa4aHjzFwizUDwjsNIqCrkL/AkZxjg=
-github.com/onflow/cadence-tools/test v1.0.0-preview.39/go.mod h1:80FKugYHr/xo98e1y/6fKGyPOJI0RbyIblupQysz0v8=
+github.com/onflow/cadence v1.0.0 h1:bvT75F2LZJvDCBmmajAv7QLISK6Qp30FAKcSwqNNH+o=
+github.com/onflow/cadence v1.0.0/go.mod h1:7wvvecnAZtYOspLOS3Lh+FuAmMeSrXhAWiycC3kQ1UU=
+github.com/onflow/cadence-tools/languageserver v1.0.0 h1:kDzpLjVD3CxcyhPDoFaE9rtX8NgzhjJmTiTAaRNKNtg=
+github.com/onflow/cadence-tools/languageserver v1.0.0/go.mod h1:tYtv4HwyfSCxO2oSMBQ1C1Bmf3A54xHFcVp9efUioyk=
+github.com/onflow/cadence-tools/lint v1.0.0 h1:Sk+E1x259blZ35zddD8BP5iPq6CO6O/n4bUX/bySebA=
+github.com/onflow/cadence-tools/lint v1.0.0/go.mod h1:jaVQmuNCjAzP4Pl8VERC+GbhET5wjXyGFBdqww01bs0=
+github.com/onflow/cadence-tools/test v1.0.0 h1:WrjCf/md/mnS5lYEtFlSP4OmnwORyKEOVVBUA0WiTlk=
+github.com/onflow/cadence-tools/test v1.0.0/go.mod h1:mduUH1TboBGUmk2w2PTnx9/heloFgNLp/Dy1lu0I0lk=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/crypto v0.25.2 h1:GjHunqVt+vPcdqhxxhAXiMIF3YiLX7gTuTR5O+VG2ns=
 github.com/onflow/crypto v0.25.2/go.mod h1:fY7eLqUdMKV8EGOw301unP8h7PvLVy8/6gVR++/g0BY=
 github.com/onflow/fcl-dev-wallet v0.8.0 h1:8TWHhJBWrzS6RCZI3eVjRT+SaUBqO6eygUNDaJV/B7s=
 github.com/onflow/fcl-dev-wallet v0.8.0/go.mod h1:kc42jkiuoPJmxMRFjfbRO9XvnR/3XLheaOerxVMDTiw=
-github.com/onflow/flixkit-go/v2 v2.0.0 h1:HimfYMXuZSAfiaLscNOlyAWb/CeEt7bBr63qD+xojFg=
-github.com/onflow/flixkit-go/v2 v2.0.0/go.mod h1:5m4QaRtDab3qJbAX0tmB2cJaLQ8r0gHRWPhP5HhHKXE=
+github.com/onflow/flixkit-go/v2 v2.0.1 h1:hbGiP5mdi9HPlsGSSnPtsTmQiaZXDkcpV3Cfn4+ffUA=
+github.com/onflow/flixkit-go/v2 v2.0.1/go.mod h1:TVF6tdM5AMVhRtq1LcYqjOJDoz54TUyrMZvZUHNrX+o=
 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4bmSrhtTkyc2cZF4/gH11ix9E3F5k=
 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg=
 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8=
 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30=
-github.com/onflow/flow-emulator v1.0.0 h1:CCE9mFUYidb4YPQWFSBHzcBGggs5bXVqIh02wF2wRr0=
-github.com/onflow/flow-emulator v1.0.0/go.mod h1:sHbe9e1RG7Y6LA/dFyLEoBnKyjJ4iHeOdkXIobMjjrE=
-github.com/onflow/flow-evm-gateway v0.36.4 h1:AvPahikqfSN8SCMHn16ZkPz5Vvg60F1HkMHsFsQzkus=
-github.com/onflow/flow-evm-gateway v0.36.4/go.mod h1:LWeu5hyXWU9mWPlKgeJOGcHRO67/hMtiyxtMFxRTZY4=
+github.com/onflow/flow-emulator v1.0.1 h1:yQc/YOzj4jJ4hPhWtzDTR4KXTq02LNXySMsU1ZK1uEw=
+github.com/onflow/flow-emulator v1.0.1/go.mod h1:xDln3yR7WNfv+45RojHlezV0N8QziMrII16agWaOwFE=
+github.com/onflow/flow-evm-gateway v0.36.5-0.20241005010031-1f3f5439d553 h1:FCDMPsHKT59j0AkwloTG05D4jvz+hGAYlep/OyoiCgs=
+github.com/onflow/flow-evm-gateway v0.36.5-0.20241005010031-1f3f5439d553/go.mod h1:Wmk1Lc/dUjRNfXVAkRoD1pJNic0rV3lZx/WcuCkBWg8=
 github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0=
 github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
 github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs=
 github.com/onflow/flow-ft/lib/go/templates v1.0.0/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
-github.com/onflow/flow-go v0.37.10 h1:Nz2Gp63+0ubb9FuQaEZgCsXNXM5WsXq/j0ukC74N5Vw=
-github.com/onflow/flow-go v0.37.10/go.mod h1:bfOCsCk0v1J93vXd+zrYkCmRIVOaL9oAXvNFWgVOujE=
+github.com/onflow/flow-go v0.38.0-preview.0.0.20241002124048-21cfe5aea5a8 h1:gQcr59aPL9YjsUkgYwcc8ec8h2bw3ttX03553S/aW34=
+github.com/onflow/flow-go v0.38.0-preview.0.0.20241002124048-21cfe5aea5a8/go.mod h1:kdaRKWlvm1vC8Lhf2uI4XvDxS+AvfWvrWZr2CFOz8y8=
 github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo=
-github.com/onflow/flow-go-sdk v1.0.0-preview.56 h1:ZnFznUXI1V8iZ+cKxoJRIeQwJTHItriKpnoKf8hFFso=
-github.com/onflow/flow-go-sdk v1.0.0-preview.56/go.mod h1:rBRNboXaTprn7M0MeO6/R1bxNpctbrx66I2FLp0V6fM=
+github.com/onflow/flow-go-sdk v1.0.0 h1:Ha4fQm1MMKsyaqMkQLCN3rA/yaQKG6DGwiIfx06j40c=
+github.com/onflow/flow-go-sdk v1.0.0/go.mod h1:iZkW2IWieVUZKK06mQCxpjJzPDgS0VtGpTaP/rKu6J4=
 github.com/onflow/flow-nft/lib/go/contracts v1.2.1 h1:woAAS5z651sDpi7ihAHll8NvRS9uFXIXkL6xR+bKFZY=
 github.com/onflow/flow-nft/lib/go/contracts v1.2.1/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE=
 github.com/onflow/flow-nft/lib/go/templates v1.2.0 h1:JSQyh9rg0RC+D1930BiRXN8lrtMs+ubVMK6aQPon6Yc=
 github.com/onflow/flow-nft/lib/go/templates v1.2.0/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0=
 github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flow/protobuf/go/flow v0.4.6 h1:KE/CsRVfyG5lGBtm1aNcjojMciQyS5GfPF3ixOWRfi0=
-github.com/onflow/flow/protobuf/go/flow v0.4.6/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flowkit/v2 v2.0.0 h1:n7+arT3MpGJhqNNu81t3i7ZUk43n+WhV3wzt+EUc2II=
-github.com/onflow/flowkit/v2 v2.0.0/go.mod h1:I4xtVtBNKE4+1V8sIVOxPgmvPa7JccGxjWH8dPw/A5c=
+github.com/onflow/flow/protobuf/go/flow v0.4.7 h1:iP6DFx4wZ3ETORsyeqzHu7neFT3d1CXF6wdK+AOOjmc=
+github.com/onflow/flow/protobuf/go/flow v0.4.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
+github.com/onflow/flowkit/v2 v2.0.1 h1:GIZ2irR7OTO8wXx7ntYkQp/aaqX6M6Tg5I8wR6xWFI8=
+github.com/onflow/flowkit/v2 v2.0.1/go.mod h1:vT6Ml14Vti69UW3n5jbW/kY4a1Qyc/NwM1jT7Tcr/sQ=
 github.com/onflow/go-ethereum v1.14.7 h1:gg3awYqI02e3AypRdpJKEvNTJ6kz/OhAqRti0h54Wlc=
 github.com/onflow/go-ethereum v1.14.7/go.mod h1:zV14QLrXyYu5ucvcwHUA0r6UaqveqbXaehAVQJlSW+I=
 github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=

internal/accounts/create-interactive.go

@@ -50,7 +50,9 @@ import (
 //
 // This process takes the user through couple of steps with prompts asking for them to provide name and network,
 // and it then uses account creation APIs to automatically create the account on the network as well as save it.
-func createInteractive(state *flowkit.State) (*accountResult, error) {
+func createInteractive(
+	state *flowkit.State,
+) (*accountResult, error) {
 	log := output.NewStdoutLogger(output.InfoLog)
 	name := prompt.AccountNamePrompt(state.Accounts().Names())
 	networkName, selectedNetwork := prompt.CreateAccountNetworkPrompt()
@@ -110,12 +112,14 @@ func createInteractive(state *flowkit.State) (*accountResult, error) {
 	}
 	outputList(log, items, false)
 
+	// Get account details from the network
+	networkAccount, err := flow.GetAccount(context.Background(), account.Address)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get details for created account %s: %w", account.Address, err)
+	}
+
 	return &accountResult{
-		Account: &flowsdk.Account{
-			Address: account.Address,
-			Balance: 0,
-			Keys:    []*flowsdk.AccountKey{flowsdk.NewAccountKey().FromPrivateKey(key)},
-		},
+		Account: networkAccount,
 		include: nil,
 	}, nil
 }