Support for multiple contracts per account

access/legacy/convert/convert.go

@@ -77,7 +77,7 @@ func MessageToTransaction(m *entitiesproto.Transaction, chain flow.Chain) (flow.
 func TransactionToMessage(tb flow.TransactionBody) *entitiesproto.Transaction {
 	proposalKeyMessage := &entitiesproto.Transaction_ProposalKey{
 		Address:        tb.ProposalKey.Address.Bytes(),
-		KeyId:          uint32(tb.ProposalKey.KeyID),
+		KeyId:          uint32(tb.ProposalKey.KeyIndex),
 		SequenceNumber: tb.ProposalKey.SequenceNumber,
 	}
 
@@ -91,7 +91,7 @@ func TransactionToMessage(tb flow.TransactionBody) *entitiesproto.Transaction {
 	for i, sig := range tb.PayloadSignatures {
 		payloadSigMessages[i] = &entitiesproto.Transaction_Signature{
 			Address:   sig.Address.Bytes(),
-			KeyId:     uint32(sig.KeyID),
+			KeyId:     uint32(sig.KeyIndex),
 			Signature: sig.Signature,
 		}
 	}
@@ -101,7 +101,7 @@ func TransactionToMessage(tb flow.TransactionBody) *entitiesproto.Transaction {
 	for i, sig := range tb.EnvelopeSignatures {
 		envelopeSigMessages[i] = &entitiesproto.Transaction_Signature{
 			Address:   sig.Address.Bytes(),
-			KeyId:     uint32(sig.KeyID),
+			KeyId:     uint32(sig.KeyIndex),
 			Signature: sig.Signature,
 		}
 	}
@@ -231,7 +231,7 @@ func AccountToMessage(a *flow.Account) (*entitiesproto.Account, error) {
 	return &entitiesproto.Account{
 		Address: a.Address.Bytes(),
 		Balance: a.Balance,
-		Code:    a.Code,
+		Code:    nil,
 		Keys:    keys,
 	}, nil
 }

cmd/util/cmd/exec-data-json-export/transaction_exporter.go

@@ -32,7 +32,7 @@ type transactionInContext struct {
 	ProposalSequenceNumber uint64   `json:"proposal_sequence_number"`
 	AuthorizersAddressHex  []string `json:"authorizers_address_hex"`
 	EnvelopeSize           int      `json:"envelope_size"`
-	// Address(hex) + ~ + SignerIndex + ~ + KeyID + ~ + Signature(hex)
+	// Address(hex) + ~ + SignerIndex + ~ + KeyIndex + ~ + Signature(hex)
 	CompactPayloadSignatures  []string `json:"compact_payload_signatures"`
 	CompactEnvelopeSignatures []string `json:"compact_envelope_signatures"`
 	// ErrorMessage              string   `json:"error_message"`
@@ -102,13 +102,13 @@ func ExportExecutedTransactions(blockID flow.Identifier, dbPath string, outputPa
 
 				psig := make([]string, 0)
 				for _, s := range tx.PayloadSignatures {
-					cs := hex.EncodeToString(s.Address[:]) + "~" + fmt.Sprint(s.SignerIndex) + "~" + fmt.Sprint(s.KeyID) + "~" + hex.EncodeToString(s.Signature)
+					cs := hex.EncodeToString(s.Address[:]) + "~" + fmt.Sprint(s.SignerIndex) + "~" + fmt.Sprint(s.KeyIndex) + "~" + hex.EncodeToString(s.Signature)
 					psig = append(psig, cs)
 				}
 
 				esig := make([]string, 0)
 				for _, s := range tx.EnvelopeSignatures {
-					cs := hex.EncodeToString(s.Address[:]) + "~" + fmt.Sprint(s.SignerIndex) + "~" + fmt.Sprint(s.KeyID) + "~" + hex.EncodeToString(s.Signature)
+					cs := hex.EncodeToString(s.Address[:]) + "~" + fmt.Sprint(s.SignerIndex) + "~" + fmt.Sprint(s.KeyIndex) + "~" + hex.EncodeToString(s.Signature)
 					esig = append(esig, cs)
 				}
 
@@ -125,7 +125,7 @@ func ExportExecutedTransactions(blockID flow.Identifier, dbPath string, outputPa
 					GasLimit:                  tx.GasLimit,
 					PayerAddressHex:           hex.EncodeToString(tx.Payer[:]),
 					ProposalKeyAddressHex:     hex.EncodeToString(tx.ProposalKey.Address[:]),
-					ProposalKeyID:             tx.ProposalKey.KeyID,
+					ProposalKeyID:             tx.ProposalKey.KeyIndex,
 					ProposalSequenceNumber:    tx.ProposalKey.SequenceNumber,
 					AuthorizersAddressHex:     auths,
 					EnvelopeSize:              computeEnvelopeSize(tx),

engine/common/rpc/convert/convert.go

@@ -74,7 +74,7 @@ func MessageToTransaction(m *entities.Transaction, chain flow.Chain) (flow.Trans
 func TransactionToMessage(tb flow.TransactionBody) *entities.Transaction {
 	proposalKeyMessage := &entities.Transaction_ProposalKey{
 		Address:        tb.ProposalKey.Address.Bytes(),
-		KeyId:          uint32(tb.ProposalKey.KeyID),
+		KeyId:          uint32(tb.ProposalKey.KeyIndex),
 		SequenceNumber: tb.ProposalKey.SequenceNumber,
 	}
 
@@ -88,7 +88,7 @@ func TransactionToMessage(tb flow.TransactionBody) *entities.Transaction {
 	for i, sig := range tb.PayloadSignatures {
 		payloadSigMessages[i] = &entities.Transaction_Signature{
 			Address:   sig.Address.Bytes(),
-			KeyId:     uint32(sig.KeyID),
+			KeyId:     uint32(sig.KeyIndex),
 			Signature: sig.Signature,
 		}
 	}
@@ -98,7 +98,7 @@ func TransactionToMessage(tb flow.TransactionBody) *entities.Transaction {
 	for i, sig := range tb.EnvelopeSignatures {
 		envelopeSigMessages[i] = &entities.Transaction_Signature{
 			Address:   sig.Address.Bytes(),
-			KeyId:     uint32(sig.KeyID),
+			KeyId:     uint32(sig.KeyIndex),
 			Signature: sig.Signature,
 		}
 	}
@@ -244,10 +244,10 @@ func MessageToAccount(m *entities.Account) (*flow.Account, error) {
 	}
 
 	return &flow.Account{
-		Address: flow.BytesToAddress(m.GetAddress()),
-		Balance: m.GetBalance(),
-		Code:    m.GetCode(),
-		Keys:    accountKeys,
+		Address:   flow.BytesToAddress(m.GetAddress()),
+		Balance:   m.GetBalance(),
+		Keys:      accountKeys,
+		Contracts: m.Contracts,
 	}, nil
 }
 
@@ -262,10 +262,11 @@ func AccountToMessage(a *flow.Account) (*entities.Account, error) {
 	}
 
 	return &entities.Account{
-		Address: a.Address.Bytes(),
-		Balance: a.Balance,
-		Code:    a.Code,
-		Keys:    keys,
+		Address:   a.Address.Bytes(),
+		Balance:   a.Balance,
+		Code:      nil,
+		Keys:      keys,
+		Contracts: a.Contracts,
 	}, nil
 }
 

engine/execution/state/bootstrap/bootstrap_test.go

@@ -44,7 +44,7 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	var expectedStateCommitment, _ = hex.DecodeString("207ef54cec1605ff02a82d0382fe9a8851971007d2ef4a2e94426fd76cf8f133")
+	var expectedStateCommitment, _ = hex.DecodeString("49c03e8ca43c3925e8744f48a24d345d98f5b28fa6705c2e1b48d186f746b39c")
 
 	unittest.RunWithTempDir(t, func(dbDir string) {
 

engine/execution/testutil/fixtures.go

@@ -21,29 +21,29 @@ import (
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
-func CreateContractDeploymentTransaction(contract string, authorizer flow.Address, chain flow.Chain) *flow.TransactionBody {
+func CreateContractDeploymentTransaction(contractName string, contract string, authorizer flow.Address, chain flow.Chain) *flow.TransactionBody {
 	encoded := hex.EncodeToString([]byte(contract))
 
 	return flow.NewTransactionBody().
 		SetScript([]byte(fmt.Sprintf(`transaction {
               prepare(signer: AuthAccount, service: AuthAccount) {
-                signer.setCode("%s".decodeHex())
+                signer.contracts.add(name: "%s", code: "%s".decodeHex())
               }
-            }`, encoded)),
+            }`, contractName, encoded)),
 		).
 		AddAuthorizer(authorizer).
 		AddAuthorizer(chain.ServiceAddress())
 }
 
-func CreateUnauthorizedContractDeploymentTransaction(contract string, authorizer flow.Address) *flow.TransactionBody {
+func CreateUnauthorizedContractDeploymentTransaction(contractName string, contract string, authorizer flow.Address) *flow.TransactionBody {
 	encoded := hex.EncodeToString([]byte(contract))
 
 	return flow.NewTransactionBody().
 		SetScript([]byte(fmt.Sprintf(`transaction {
               prepare(signer: AuthAccount) {
-                signer.setCode("%s".decodeHex())
+                signer.contracts.add(name: "%s", code: "%s".decodeHex())
               }
-            }`, encoded)),
+            }`, contractName, encoded)),
 		).
 		AddAuthorizer(authorizer)
 }

engine/execution/testutil/fixtures_counter.go

@@ -25,11 +25,11 @@ access(all) contract Container {
 `
 
 func DeployCounterContractTransaction(authorizer flow.Address, chain flow.Chain) *flow.TransactionBody {
-	return CreateContractDeploymentTransaction(CounterContract, authorizer, chain)
+	return CreateContractDeploymentTransaction("Container", CounterContract, authorizer, chain)
 }
 
 func DeployUnauthorizedCounterContractTransaction(authorizer flow.Address) *flow.TransactionBody {
-	return CreateUnauthorizedContractDeploymentTransaction(CounterContract, authorizer)
+	return CreateUnauthorizedContractDeploymentTransaction("Container", CounterContract, authorizer)
 }
 
 func CreateCounterTransaction(counter, signer flow.Address) *flow.TransactionBody {

fvm/astCache_test.go

@@ -416,7 +416,7 @@ func TestProgramASTCacheAvoidRaceCondition(t *testing.T) {
 	}
 	wg.Wait()
 
-	location := runtime.AddressLocation(fvm.FlowTokenAddress(chain).Bytes())
+	location := runtime.AddressContractLocation{AddressLocation: fvm.FlowTokenAddress(chain).Bytes(), Name: "FlowToken"}
 
 	// Get cached program
 	var program *ast.Program

fvm/bootstrap.go

@@ -85,7 +85,7 @@ func (b *BootstrapProcedure) deployFungibleToken() flow.Address {
 
 	err := b.vm.invokeMetaTransaction(
 		b.ctx,
-		deployContractTransaction(fungibleToken, contracts.FungibleToken()),
+		deployContractTransaction(fungibleToken, contracts.FungibleToken(), "FungibleToken"),
 		b.ledger,
 	)
 	if err != nil {
@@ -141,7 +141,7 @@ func (b *BootstrapProcedure) deployServiceAccount(service, fungibleToken, flowTo
 
 	err := b.vm.invokeMetaTransaction(
 		b.ctx,
-		deployContractTransaction(service, contract),
+		deployContractTransaction(service, contract, "FlowServiceAccount"),
 		b.ledger,
 	)
 	if err != nil {
@@ -166,7 +166,7 @@ func (b *BootstrapProcedure) mintInitialTokens(
 const deployContractTransactionTemplate = `
 transaction {
   prepare(signer: AuthAccount) {
-    signer.setCode("%s".decodeHex())
+    signer.contracts.add(name: "%s", code: "%s".decodeHex())
   }
 }
 `
@@ -175,7 +175,7 @@ const deployFlowTokenTransactionTemplate = `
 transaction {
   prepare(flowTokenAccount: AuthAccount, serviceAccount: AuthAccount) {
     let adminAccount = serviceAccount
-    flowTokenAccount.setCode("%s".decodeHex(), adminAccount)
+    flowTokenAccount.contracts.add(name: "FlowToken", code: "%s".decodeHex(), adminAccount: adminAccount)
   }
 }
 `
@@ -184,7 +184,7 @@ const deployFlowFeesTransactionTemplate = `
 transaction {
   prepare(flowFeesAccount: AuthAccount, serviceAccount: AuthAccount) {
     let adminAccount = serviceAccount
-    flowFeesAccount.setCode("%s".decodeHex(), adminAccount)
+    flowFeesAccount.contracts.add(name: "FlowFees", code: "%s".decodeHex(), adminAccount: adminAccount)
   }
 }
 `
@@ -220,10 +220,10 @@ transaction(amount: UFix64) {
 }
 `
 
-func deployContractTransaction(address flow.Address, contract []byte) *TransactionProcedure {
+func deployContractTransaction(address flow.Address, contract []byte, contractName string) *TransactionProcedure {
 	return Transaction(
 		flow.NewTransactionBody().
-			SetScript([]byte(fmt.Sprintf(deployContractTransactionTemplate, hex.EncodeToString(contract)))).
+			SetScript([]byte(fmt.Sprintf(deployContractTransactionTemplate, contractName, hex.EncodeToString(contract)))).
 			AddAuthorizer(address),
 	)
 }