Merge pull request #346 from onflow/improvement/create-fund

Create and fund account

Author: devbugging

go.mod

@@ -5,10 +5,10 @@ go 1.18
 require (
 	cloud.google.com/go/kms v1.4.0
 	github.com/ethereum/go-ethereum v1.9.13
-	github.com/onflow/cadence v0.34.0
-	github.com/onflow/flow-go/crypto v0.24.3
+	github.com/onflow/cadence v0.31.3
+	github.com/onflow/flow-go/crypto v0.24.4
 	github.com/onflow/flow/protobuf/go/flow v0.3.1
-	github.com/onflow/sdks v0.4.4
+	github.com/onflow/sdks v0.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.5
 	google.golang.org/api v0.70.0

go.sum

@@ -286,14 +286,14 @@ github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXW
 github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onflow/atree v0.4.0 h1:+TbNisavAkukAKhgQ4plWnvR9o5+SkwPIsi3jaeAqKs=
 github.com/onflow/atree v0.4.0/go.mod h1:7Qe1xaW0YewvouLXrugzMFUYXNoRQ8MT/UsVAWx1Ndo=
-github.com/onflow/cadence v0.34.0 h1:e8qtl73snt7ZTmOtzird9+tdLXGWqJ00RhIlVxlN53U=
-github.com/onflow/cadence v0.34.0/go.mod h1:hhktaaXlJmxnfLgH2HG0cftcUWScdfjO/CTZkzaom/g=
-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/cadence v0.31.3 h1:lTHTBnoFi/ahGk1cQ9JAC+tfYir4kjRVIqtTVCjbe6E=
+github.com/onflow/cadence v0.31.3/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
+github.com/onflow/flow-go/crypto v0.24.4 h1:SwEtoVS2TidCIHYCZMgQ7U2YsqhI9upnw94fhdHTubM=
+github.com/onflow/flow-go/crypto v0.24.4/go.mod h1:dkVL98P6GHR48iD9zCB6XlnkJX8IQd00FKgt1reV90w=
 github.com/onflow/flow/protobuf/go/flow v0.3.1 h1:4I8ykG6naR3n8Or6eXrZDaGVaoztb3gP2KJ6XKyDufg=
 github.com/onflow/flow/protobuf/go/flow v0.3.1/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
-github.com/onflow/sdks v0.4.4 h1:aJPGJJLAN+mlBWAQxsyuJXeRRMFeLwU6Mp4e/YL6bdU=
-github.com/onflow/sdks v0.4.4/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
+github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8=
+github.com/onflow/sdks v0.5.0/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=

templates/accounts.go

@@ -21,6 +21,7 @@ package templates
 import (
 	"encoding/hex"
 	"fmt"
+	"strings"
 
 	"github.com/onflow/cadence"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
@@ -123,11 +124,13 @@ func newPublicKeyValue(pubKey crypto.PublicKey) (cadence.Struct, error) {
 //
 // example:
 // ```go
-// 	key := AccountKeyToCadenceCryptoKey(accountKey)
+//
+//	key := AccountKeyToCadenceCryptoKey(accountKey)
 //
 //	return flow.NewTransaction().
 //		SetScript([]byte(templates.AddAccountKey)).
 //		AddRawArgument(jsoncdc.MustEncode(key))
+//
 // ```
 func AccountKeyToCadenceCryptoKey(key *flow.AccountKey) (cadence.Value, error) {
 	weight, _ := cadence.NewUFix64(fmt.Sprintf("%d.0", key.Weight))
@@ -178,6 +181,16 @@ func AccountKeyToCadenceCryptoKey(key *flow.AccountKey) (cadence.Value, error) {
 // The final argument is the address of the account that will pay the account creation fee.
 // This account is added as a transaction authorizer and therefore must sign the resulting transaction.
 func CreateAccount(accountKeys []*flow.AccountKey, contracts []Contract, payer flow.Address) (*flow.Transaction, error) {
+	return CreateAccountAndFund(accountKeys, contracts, payer, "", "")
+}
+
+func CreateAccountAndFund(
+	accountKeys []*flow.AccountKey,
+	contracts []Contract,
+	payer flow.Address,
+	amount string,
+	network flow.ChainID,
+) (*flow.Transaction, error) {
 	keyList := make([]cadence.Value, len(accountKeys))
 
 	contractKeyPairs := make([]cadence.KeyValuePair, len(contracts))
@@ -199,12 +212,52 @@ func CreateAccount(accountKeys []*flow.AccountKey, contracts []Contract, payer f
 
 	cadencePublicKeys := cadence.NewArray(keyList)
 	cadenceContracts := cadence.NewDictionary(contractKeyPairs)
+	script := templates.CreateAccount
 
-	return flow.NewTransaction().
-		SetScript([]byte(templates.CreateAccount)).
-		AddAuthorizer(payer).
-		AddRawArgument(jsoncdc.MustEncode(cadencePublicKeys)).
-		AddRawArgument(jsoncdc.MustEncode(cadenceContracts)), nil
+	args := [][]byte{
+		jsoncdc.MustEncode(cadencePublicKeys),
+		jsoncdc.MustEncode(cadenceContracts),
+	}
+
+	// if we have provided amount and network then we do funding as well
+	if amount != "" && network == flow.Mainnet || network == flow.Testnet {
+		script = templates.CreateAccountFunding
+		// replace the imports on supported networks
+		replaces := map[flow.ChainID]map[string]string{
+			flow.Testnet: {
+				"FlowToken":     "0x7e60df042a9c0868", // https://developers.flow.com/flow/core-contracts/flow-token
+				"FungibleToken": "0x9a0766d93b6608b7", // https://developers.flow.com/flow/core-contracts/fungible-token
+			},
+			flow.Mainnet: {
+				"FlowToken":     "0x1654653399040a61",
+				"FungibleToken": "0xf233dcee88fe0abe",
+			},
+		}[network]
+
+		for contract, address := range replaces {
+			script = strings.ReplaceAll(
+				script,
+				fmt.Sprintf(`"%s"`, contract),
+				fmt.Sprintf(`%s from %s`, contract, address),
+			)
+		}
+
+		val, err := cadence.NewUFix64(amount)
+		if err != nil {
+			return nil, err
+		}
+		args = append(args, jsoncdc.MustEncode(val))
+	}
+
+	tx := flow.NewTransaction().
+		SetScript([]byte(script)).
+		AddAuthorizer(payer)
+
+	for _, arg := range args {
+		tx.AddRawArgument(arg)
+	}
+
+	return tx, nil
 }
 
 // UpdateAccountContract generates a transaction that updates a contract deployed at an account.