Update to Cadence v1.2.1, Move Cadence Crypto contract on-chain

cmd/bootstrap/utils/key_generation.go

@@ -13,6 +13,7 @@ import (
 
 	sdk "github.com/onflow/flow-go-sdk"
 	sdkcrypto "github.com/onflow/flow-go-sdk/crypto"
+
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/model/bootstrap"
 	model "github.com/onflow/flow-go/model/bootstrap"

cmd/collection/main.go

@@ -9,6 +9,7 @@ import (
 
 	client "github.com/onflow/flow-go-sdk/access/grpc"
 	sdkcrypto "github.com/onflow/flow-go-sdk/crypto"
+
 	"github.com/onflow/flow-go/admin/commands"
 	collectionCommands "github.com/onflow/flow-go/admin/commands/collection"
 	storageCommands "github.com/onflow/flow-go/admin/commands/storage"

cmd/consensus/main.go

@@ -12,6 +12,7 @@ import (
 
 	client "github.com/onflow/flow-go-sdk/access/grpc"
 	"github.com/onflow/flow-go-sdk/crypto"
+
 	"github.com/onflow/flow-go/cmd"
 	"github.com/onflow/flow-go/cmd/util/cmd/common"
 	"github.com/onflow/flow-go/consensus"

cmd/util/cmd/common/snapshot.go

@@ -9,9 +9,10 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/sethvargo/go-retry"
 
+	"github.com/onflow/flow-go-sdk/access/grpc"
+
 	"github.com/onflow/flow-go/utils/logging"
 
-	"github.com/onflow/flow-go-sdk/access/grpc"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/state/protocol"
 	"github.com/onflow/flow-go/state/protocol/inmem"

cmd/util/ledger/migrations/account_based_migration_test.go

@@ -3,7 +3,6 @@ package migrations
 import (
 	"context"
 	"fmt"
-
 	"testing"
 
 	"github.com/onflow/cadence/common"

cmd/util/ledger/migrations/migrator_runtime.go

@@ -16,6 +16,7 @@ import (
 	"github.com/onflow/flow-go/fvm/evm"
 	evmStdlib "github.com/onflow/flow-go/fvm/evm/stdlib"
 	"github.com/onflow/flow-go/fvm/storage/state"
+	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/model/flow"
 )
 
@@ -111,8 +112,11 @@ func (c InterpreterMigrationRuntimeConfig) NewRuntimeInterface(
 		}
 	}
 
+	sc := systemcontracts.SystemContractsForChain(chainID)
+
 	return util.NewMigrationRuntimeInterface(
 		chainID,
+		common.Address(sc.Crypto.Address),
 		getCodeFunc,
 		getContractNames,
 		getOrLoadProgram,

cmd/util/ledger/util/migration_runtime_interface.go

@@ -38,6 +38,7 @@ type GerOrLoadProgramListenerFunc func(
 type MigrationRuntimeInterface struct {
 	runtime.EmptyRuntimeInterface
 	chainID                      flow.ChainID
+	CryptoContractAddress        common.Address
 	GetContractCodeFunc          GetContractCodeFunc
 	GetContractNamesFunc         GetContractNamesFunc
 	GetOrLoadProgramFunc         GetOrLoadProgramFunc
@@ -48,13 +49,15 @@ var _ runtime.Interface = &MigrationRuntimeInterface{}
 
 func NewMigrationRuntimeInterface(
 	chainID flow.ChainID,
+	cryptoContractAddress common.Address,
 	getCodeFunc GetContractCodeFunc,
 	getContractNamesFunc GetContractNamesFunc,
 	getOrLoadProgramFunc GetOrLoadProgramFunc,
 	getOrLoadProgramListenerFunc GerOrLoadProgramListenerFunc,
 ) *MigrationRuntimeInterface {
 	return &MigrationRuntimeInterface{
 		chainID:                      chainID,
+		CryptoContractAddress:        cryptoContractAddress,
 		GetContractCodeFunc:          getCodeFunc,
 		GetContractNamesFunc:         getContractNamesFunc,
 		GetOrLoadProgramFunc:         getOrLoadProgramFunc,
@@ -67,65 +70,12 @@ func (m *MigrationRuntimeInterface) ResolveLocation(
 	location runtime.Location,
 ) ([]runtime.ResolvedLocation, error) {
 
-	addressLocation, isAddress := location.(common.AddressLocation)
-
-	// if the location is not an address location, e.g. an identifier location (`import Crypto`),
-	// then return a single resolved location which declares all identifiers.
-	if !isAddress {
-		return []runtime.ResolvedLocation{
-			{
-				Location:    location,
-				Identifiers: identifiers,
-			},
-		}, nil
-	}
-
-	// if the location is an address,
-	// and no specific identifiers where requested in the import statement,
-	// then fetch all identifiers at this address
-	if len(identifiers) == 0 {
-		address := flow.Address(addressLocation.Address)
-
-		getContractNames := m.GetContractNamesFunc
-		if getContractNames == nil {
-			return nil, errors.New("GetContractNamesFunc missing")
-		}
-
-		contractNames, err := getContractNames(address)
-		if err != nil {
-			return nil, fmt.Errorf("ResolveLocation failed: %w", err)
-		}
-
-		// if there are no contractNames deployed,
-		// then return no resolved locations
-		if len(contractNames) == 0 {
-			return nil, nil
-		}
-
-		identifiers = make([]runtime.Identifier, len(contractNames))
-
-		for i := range identifiers {
-			identifiers[i] = runtime.Identifier{
-				Identifier: contractNames[i],
-			}
-		}
-	}
-
-	// return one resolved location per identifier.
-	// each resolved location is an address contract location
-	resolvedLocations := make([]runtime.ResolvedLocation, len(identifiers))
-	for i := range resolvedLocations {
-		identifier := identifiers[i]
-		resolvedLocations[i] = runtime.ResolvedLocation{
-			Location: common.AddressLocation{
-				Address: addressLocation.Address,
-				Name:    identifier.Identifier,
-			},
-			Identifiers: []runtime.Identifier{identifier},
-		}
-	}
-
-	return resolvedLocations, nil
+	return environment.ResolveLocation(
+		identifiers,
+		location,
+		m.GetContractNamesFunc,
+		m.CryptoContractAddress,
+	)
 }
 
 func (m *MigrationRuntimeInterface) GetCode(location runtime.Location) ([]byte, error) {

consensus/hotstuff/verification/common.go

@@ -1,15 +1,14 @@
 package verification
 
 import (
+	"encoding/binary"
 	"fmt"
 
 	"github.com/onflow/crypto"
 	"github.com/onflow/crypto/hash"
 
 	"github.com/onflow/flow-go/consensus/hotstuff/model"
 	"github.com/onflow/flow-go/model/flow"
-
-	"encoding/binary"
 )
 
 // MakeVoteMessage generates the message we have to sign in order to be able

engine/execution/state/bootstrap/bootstrap_test.go

@@ -53,7 +53,7 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("edc0ffd7e797e2383bc68b694645e6b62b0d996498bcff9b492bf4d426798ec5")
+	expectedStateCommitmentBytes, _ := hex.DecodeString("543fa7112081094b66871692c5a7784f40a9e5cdb9cfda10d1d9b81653966409")
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 

fvm/bootstrap.go

@@ -351,6 +351,7 @@ func (b *bootstrapExecutor) Execute() error {
 
 	b.deployViewResolver(service, &env)
 	b.deployBurner(service, &env)
+	b.deployCrypto(service, &env)
 
 	err = expectAccounts(1)
 	if err != nil {
@@ -523,6 +524,22 @@ func (b *bootstrapExecutor) deployBurner(deployTo flow.Address, env *templates.E
 	panicOnMetaInvokeErrf("failed to deploy burner contract: %s", txError, err)
 }
 
+func (b *bootstrapExecutor) deployCrypto(deployTo flow.Address, env *templates.Environment) {
+	contract := contracts.Crypto()
+
+	txError, err := b.invokeMetaTransaction(
+		b.ctx,
+		Transaction(
+			blueprints.DeployContractTransaction(
+				deployTo,
+				contract,
+				"Crypto"),
+			0),
+	)
+	env.CryptoAddress = deployTo.String()
+	panicOnMetaInvokeErrf("failed to deploy crypto contract: %s", txError, err)
+}
+
 func (b *bootstrapExecutor) deployMetadataViews(fungibleToken, nonFungibleToken flow.Address, env *templates.Environment) {
 
 	mvContract := contracts.MetadataViews(*env)

fvm/crypto/hash_test.go

@@ -2,10 +2,9 @@ package crypto_test
 
 import (
 	"crypto/rand"
-	"testing"
-
 	"crypto/sha256"
 	"crypto/sha512"
+	"testing"
 
 	"github.com/onflow/crypto/hash"
 	"github.com/stretchr/testify/assert"

fvm/environment/contract_reader.go

@@ -6,6 +6,7 @@ import (
 	"github.com/onflow/cadence/ast"
 	"github.com/onflow/cadence/common"
 	"github.com/onflow/cadence/runtime"
+	"github.com/onflow/cadence/stdlib"
 
 	"github.com/onflow/flow-go/fvm/errors"
 	"github.com/onflow/flow-go/fvm/tracing"
@@ -15,21 +16,23 @@ import (
 
 // ContractReader provide read access to contracts.
 type ContractReader struct {
-	tracer tracing.TracerSpan
-	meter  Meter
-
-	accounts Accounts
+	tracer                tracing.TracerSpan
+	meter                 Meter
+	accounts              Accounts
+	cryptoContractAddress common.Address
 }
 
 func NewContractReader(
 	tracer tracing.TracerSpan,
 	meter Meter,
 	accounts Accounts,
+	cryptoContractAddress common.Address,
 ) *ContractReader {
 	return &ContractReader{
-		tracer:   tracer,
-		meter:    meter,
-		accounts: accounts,
+		tracer:                tracer,
+		meter:                 meter,
+		accounts:              accounts,
+		cryptoContractAddress: cryptoContractAddress,
 	}
 }
 
@@ -69,12 +72,37 @@ func (reader *ContractReader) ResolveLocation(
 		return nil, fmt.Errorf("resolve location failed: %w", err)
 	}
 
+	return ResolveLocation(
+		identifiers,
+		location,
+		reader.accounts.GetContractNames,
+		reader.cryptoContractAddress,
+	)
+}
+
+func ResolveLocation(
+	identifiers []ast.Identifier,
+	location common.Location,
+	getContractNames func(flow.Address) ([]string, error),
+	cryptoContractAddress common.Address,
+) ([]runtime.ResolvedLocation, error) {
+
 	addressLocation, isAddress := location.(common.AddressLocation)
 
 	// if the location is not an address location, e.g. an identifier location
-	// (`import Crypto`), then return a single resolved location which declares
-	// all identifiers.
+	// then return a single resolved location which declares all identifiers.
 	if !isAddress {
+
+		// if the location is the Crypto contract,
+		// translate it to the address of the Crypto contract on the chain
+
+		if location == stdlib.CryptoContractLocation {
+			location = common.AddressLocation{
+				Address: cryptoContractAddress,
+				Name:    string(stdlib.CryptoContractLocation),
+			}
+		}
+
 		return []runtime.ResolvedLocation{
 			{
 				Location:    location,
@@ -87,9 +115,13 @@ func (reader *ContractReader) ResolveLocation(
 	// and no specific identifiers where requested in the import statement,
 	// then fetch all identifiers at this address
 	if len(identifiers) == 0 {
+		if getContractNames == nil {
+			return nil, fmt.Errorf("no identifiers provided")
+		}
+
 		address := flow.ConvertAddress(addressLocation.Address)
 
-		contractNames, err := reader.accounts.GetContractNames(address)
+		contractNames, err := getContractNames(address)
 		if err != nil {
 			return nil, fmt.Errorf("resolving location failed: %w", err)
 		}

fvm/environment/facade_env.go

@@ -11,6 +11,7 @@ import (
 	"github.com/onflow/flow-go/fvm/storage"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	"github.com/onflow/flow-go/fvm/storage/state"
+	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/fvm/tracing"
 )
 
@@ -63,12 +64,15 @@ func newFacadeEnvironment(
 	accounts := NewAccounts(txnState)
 	logger := NewProgramLogger(tracer, params.ProgramLoggerParams)
 	runtime := NewRuntime(params.RuntimeParams)
+	chain := params.Chain
 	systemContracts := NewSystemContracts(
-		params.Chain,
+		chain,
 		tracer,
 		logger,
 		runtime)
 
+	sc := systemcontracts.SystemContractsForChain(chain.ChainID())
+
 	env := &facadeEnvironment{
 		Runtime: runtime,
 
@@ -130,6 +134,7 @@ func newFacadeEnvironment(
 			tracer,
 			meter,
 			accounts,
+			common.Address(sc.Crypto.Address),
 		),
 		ContractUpdater: NoContractUpdater{},
 		Programs: NewPrograms(