Merge pull request #603 from onflow/petera/fix-forking-master

Reenable forked mainnet

Author: peterargue

Makefile

@@ -15,7 +15,7 @@ GOPATH ?= $(HOME)/go
 install-tools:
 	mkdir -p ${GOPATH}; \
 	cd ${GOPATH}; \
-	GO111MODULE=on go install github.com/golang/mock/mockgen@v1.6.0; \
+	GO111MODULE=on go install go.uber.org/mock/mockgen@latest; \
 	GO111MODULE=on go install github.com/axw/gocov/gocov@latest; \
 	GO111MODULE=on go install github.com/matm/gocov-html@latest; \
 	GO111MODULE=on go install github.com/sanderhahn/gozip/cmd/gozip@latest;
@@ -46,6 +46,8 @@ generate: generate-mocks
 generate-mocks:
 	GO111MODULE=on ${GOPATH}/bin/mockgen -destination=emulator/mocks/emulator.go -package=mocks github.com/onflow/flow-emulator/emulator Emulator
 	GO111MODULE=on ${GOPATH}/bin/mockgen -destination=storage/mocks/store.go -package=mocks github.com/onflow/flow-emulator/storage Store
+	GO111MODULE=on ${GOPATH}/bin/mockgen -destination=internal/mocks/access.go -package=mocks github.com/onflow/flow-emulator/internal AccessAPIClient
+	GO111MODULE=on ${GOPATH}/bin/mockgen -destination=internal/mocks/executiondata.go -package=mocks github.com/onflow/flow-emulator/internal ExecutionDataAPIClient
 
 .PHONY: ci
 ci: install-tools test check-tidy test coverage check-headers

README.md

@@ -68,10 +68,10 @@ and if you plan to run the emulator with Docker you must use the environment var
 | `--contract-removal`          | `FLOW_CONTRACTREMOVAL`            | `true`         | Allow removal of already deployed contracts, used for updating during development                                                                                                                                                                 |
 | `--skip-tx-validation` | `FLOW_SKIPTRANSACTIONVALIDATION` | `false`        | Skip verification of transaction signatures and sequence numbers                                                                                                                                                                                  |
 | `--host`                      | `FLOW_HOST`                  | ` `            | Host to listen on for emulator GRPC/REST/Admin servers (default: All Interfaces)                                                                                                                                                                                            |
-| `--chain-id`                  | `FLOW_CHAINID`               | `emulator`     | Chain to simulate, if 'mainnet' or 'testnet' values are used, you will be able to run transactions against that network and a local fork will be created..  Valid values are: 'emulator', 'testnet', 'mainnet'                                     |
+| `--chain-id`                  | `FLOW_CHAINID`               | `emulator`     | Chain to simulate, if 'mainnet' or 'testnet' values are used, you will be able to run transactions against that network and a local fork will be created.  Valid values are: 'emulator', 'testnet', 'mainnet'                                     |
 | `--redis-url`                 | `FLOW_REDIS_URL`             | ''             | Redis-server URL for persisting redis storage backend ( `redis://[[username:]password@]host[:port][/database]` )                                                                                                                                  |
 | `--start-block-height`        | `FLOW_STARTBLOCKHEIGHT`             | `0`             | Start block height to use when starting the network using 'testnet' or 'mainnet' as the chain-id    |
-
+| `--rpc-host`                  | `FLOW_RPCHOST`             | ''             | RPC host (access node) to query for previous state when starting the network using 'testnet' or 'mainnet' as the chain-id    |
 | `--legacy-upgrade` | `FLOW_LEGACYUPGRADE` | `false`         | Enable upgrading of legacy contracts |
 
 ## Running the emulator with the Flow CLI
@@ -225,20 +225,27 @@ flow keys generate
 ```
 
 ## Emulating mainnet and testnet transactions
-The emulator allows you to simulate the execution of transactions as if they were 
-performed on the mainnet or testnet. In order to activate this feature, 
-you must specify the network name for the chain ID flag in the following manner:
+The emulator allows you to simulate the execution of transactions as if they were
+performed on the Mainnet or Testnet. In order to activate this feature,
+you must specify the network name for the chain ID flag as well as the RPC host
+to connect to.
+
 ```
-flow emulator --chain-id mainnet
+flow emulator --chain-id mainnet --rpc-host access-008.mainnet24.nodes.onflow.org:9000
+flow emulator --chain-id mainnet --rpc-host access-002.devnet49.nodes.onflow.org:9000
 ```
-Please note, the actual execution on the real network may differ.
+
+Please note, the actual execution on the real network may differ depending on the exact state when the transaction is executed.
 
 By default, the forked network will start from the latest sealed block when the emulator
 is started. You can specify a different starting block height by using the `--start-block-height` flag.
 
-You can also store all of your changes and cached registers to a persistent db using the `--persist` flag,
+You can also store all of your changes and cached registers to a persistent db by using the `--persist` flag,
 along with the other sqlite settings.
 
+To submit transactions as a different account, you can use the `--skip-tx-validation` flag to disable transaction signature
+verification. Then submit transactions from any account using any valid private key.
+
 ## Debugging
 To debug any transactions sent via VSCode or Flow CLI, you can use the `debugger` pragma. 
 This will cause execution to pause at the debugger for any transaction or script which includes that pragma.

adapters/access.go

@@ -53,22 +53,22 @@ func NewAccessAdapter(logger *zerolog.Logger, emulator emulator.Emulator) *Acces
 	}
 }
 
-func convertError(err error) error {
+func convertError(err error, defaultStatusCode codes.Code) error {
 	if err != nil {
 		switch err.(type) {
 		case types.InvalidArgumentError:
 			return status.Error(codes.InvalidArgument, err.Error())
 		case types.NotFoundError:
 			return status.Error(codes.NotFound, err.Error())
 		default:
-			return status.Error(codes.Internal, err.Error())
+			return status.Error(defaultStatusCode, err.Error())
 		}
 	}
 	return nil
 }
 
 func (a *AccessAdapter) Ping(_ context.Context) error {
-	return convertError(a.emulator.Ping())
+	return convertError(a.emulator.Ping(), codes.Internal)
 }
 
 func (a *AccessAdapter) GetNetworkParameters(_ context.Context) access.NetworkParameters {
@@ -78,7 +78,7 @@ func (a *AccessAdapter) GetNetworkParameters(_ context.Context) access.NetworkPa
 func (a *AccessAdapter) GetLatestBlockHeader(_ context.Context, _ bool) (*flowgo.Header, flowgo.BlockStatus, error) {
 	block, err := a.emulator.GetLatestBlock()
 	if err != nil {
-		return nil, flowgo.BlockStatusUnknown, convertError(err)
+		return nil, flowgo.BlockStatusUnknown, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().Fields(map[string]any{
@@ -92,7 +92,7 @@ func (a *AccessAdapter) GetLatestBlockHeader(_ context.Context, _ bool) (*flowgo
 func (a *AccessAdapter) GetBlockHeaderByHeight(_ context.Context, height uint64) (*flowgo.Header, flowgo.BlockStatus, error) {
 	block, err := a.emulator.GetBlockByHeight(height)
 	if err != nil {
-		return nil, flowgo.BlockStatusUnknown, convertError(err)
+		return nil, flowgo.BlockStatusUnknown, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().Fields(map[string]any{
@@ -106,7 +106,7 @@ func (a *AccessAdapter) GetBlockHeaderByHeight(_ context.Context, height uint64)
 func (a *AccessAdapter) GetBlockHeaderByID(_ context.Context, id flowgo.Identifier) (*flowgo.Header, flowgo.BlockStatus, error) {
 	block, err := a.emulator.GetBlockByID(id)
 	if err != nil {
-		return nil, flowgo.BlockStatusUnknown, convertError(err)
+		return nil, flowgo.BlockStatusUnknown, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().Fields(map[string]any{
@@ -120,7 +120,7 @@ func (a *AccessAdapter) GetBlockHeaderByID(_ context.Context, id flowgo.Identifi
 func (a *AccessAdapter) GetLatestBlock(_ context.Context, _ bool) (*flowgo.Block, flowgo.BlockStatus, error) {
 	block, err := a.emulator.GetLatestBlock()
 	if err != nil {
-		return nil, flowgo.BlockStatusUnknown, convertError(err)
+		return nil, flowgo.BlockStatusUnknown, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().Fields(map[string]any{
@@ -134,7 +134,7 @@ func (a *AccessAdapter) GetLatestBlock(_ context.Context, _ bool) (*flowgo.Block
 func (a *AccessAdapter) GetBlockByHeight(_ context.Context, height uint64) (*flowgo.Block, flowgo.BlockStatus, error) {
 	block, err := a.emulator.GetBlockByHeight(height)
 	if err != nil {
-		return nil, flowgo.BlockStatusUnknown, convertError(err)
+		return nil, flowgo.BlockStatusUnknown, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().Fields(map[string]any{
@@ -148,7 +148,7 @@ func (a *AccessAdapter) GetBlockByHeight(_ context.Context, height uint64) (*flo
 func (a *AccessAdapter) GetBlockByID(_ context.Context, id flowgo.Identifier) (*flowgo.Block, flowgo.BlockStatus, error) {
 	block, err := a.emulator.GetBlockByID(id)
 	if err != nil {
-		return nil, flowgo.BlockStatusUnknown, convertError(err)
+		return nil, flowgo.BlockStatusUnknown, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().Fields(map[string]any{
@@ -162,7 +162,7 @@ func (a *AccessAdapter) GetBlockByID(_ context.Context, id flowgo.Identifier) (*
 func (a *AccessAdapter) GetCollectionByID(_ context.Context, id flowgo.Identifier) (*flowgo.LightCollection, error) {
 	collection, err := a.emulator.GetCollectionByID(id)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().
@@ -175,7 +175,7 @@ func (a *AccessAdapter) GetCollectionByID(_ context.Context, id flowgo.Identifie
 func (a *AccessAdapter) GetTransaction(_ context.Context, id flowgo.Identifier) (*flowgo.TransactionBody, error) {
 	tx, err := a.emulator.GetTransaction(id)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().
@@ -197,14 +197,14 @@ func (a *AccessAdapter) GetTransactionResult(
 ) {
 	result, err := a.emulator.GetTransactionResult(id)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	// Convert CCF events to JSON events, else return CCF encoded version
 	if requiredEventEncodingVersion == entities.EventEncodingVersion_JSON_CDC_V0 {
 		result.Events, err = ConvertCCFEventsToJsonEvents(result.Events)
 		if err != nil {
-			return nil, convertError(err)
+			return nil, convertError(err, codes.Internal)
 		}
 	}
 	a.logger.Debug().
@@ -217,7 +217,7 @@ func (a *AccessAdapter) GetTransactionResult(
 func (a *AccessAdapter) GetAccount(_ context.Context, address flowgo.Address) (*flowgo.Account, error) {
 	account, err := a.emulator.GetAccount(address)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().
@@ -230,7 +230,7 @@ func (a *AccessAdapter) GetAccount(_ context.Context, address flowgo.Address) (*
 func (a *AccessAdapter) GetAccountAtLatestBlock(ctx context.Context, address flowgo.Address) (*flowgo.Account, error) {
 	account, err := a.GetAccount(ctx, address)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	a.logger.Debug().
@@ -253,7 +253,7 @@ func (a *AccessAdapter) GetAccountAtBlockHeight(
 
 	account, err := a.emulator.GetAccountAtBlockHeight(address, height)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 	return account, nil
 }
@@ -264,12 +264,12 @@ func convertScriptResult(result *types.ScriptResult, err error) ([]byte, error)
 	}
 
 	if !result.Succeeded() {
-		return nil, result.Error
+		return nil, status.Error(codes.InvalidArgument, result.Error.Error())
 	}
 
 	valueBytes, err := jsoncdc.Encode(result.Value)
 	if err != nil {
-		return nil, status.Error(codes.Internal, err.Error())
+		return nil, convertError(err, codes.InvalidArgument)
 	}
 
 	return valueBytes, nil
@@ -280,7 +280,14 @@ func (a *AccessAdapter) ExecuteScriptAtLatestBlock(
 	script []byte,
 	arguments [][]byte,
 ) ([]byte, error) {
-	a.logger.Debug().Msg("👤  ExecuteScriptAtLatestBlock called")
+	latestBlock, err := a.emulator.GetLatestBlock()
+	if err != nil {
+		return nil, err
+	}
+	a.logger.Debug().
+		Uint64("blockHeight", latestBlock.Header.Height).
+		Msg("👤  ExecuteScriptAtLatestBlock called")
+
 	result, err := a.emulator.ExecuteScript(script, arguments)
 	if err == nil {
 		utils.PrintScriptResult(a.logger, result)
@@ -332,7 +339,7 @@ func (a *AccessAdapter) GetEventsForHeightRange(
 ) ([]flowgo.BlockEvents, error) {
 	events, err := a.emulator.GetEventsForHeightRange(eventType, startHeight, endHeight)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	eventCount := 0
@@ -343,7 +350,7 @@ func (a *AccessAdapter) GetEventsForHeightRange(
 			events[i].Events, err = ConvertCCFEventsToJsonEvents(events[i].Events)
 			eventCount = eventCount + len(events[i].Events)
 			if err != nil {
-				return nil, convertError(err)
+				return nil, convertError(err, codes.Internal)
 			}
 		}
 	}
@@ -366,7 +373,7 @@ func (a *AccessAdapter) GetEventsForBlockIDs(
 ) ([]flowgo.BlockEvents, error) {
 	events, err := a.emulator.GetEventsForBlockIDs(eventType, blockIDs)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	eventCount := 0
@@ -377,7 +384,7 @@ func (a *AccessAdapter) GetEventsForBlockIDs(
 			events[i].Events, err = ConvertCCFEventsToJsonEvents(events[i].Events)
 			eventCount = eventCount + len(events[i].Events)
 			if err != nil {
-				return nil, convertError(err)
+				return nil, convertError(err, codes.Internal)
 			}
 		}
 	}
@@ -426,18 +433,18 @@ func (a *AccessAdapter) GetTransactionResultByIndex(
 ) (*access.TransactionResult, error) {
 	results, err := a.emulator.GetTransactionResultsByBlockID(blockID)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 	if len(results) <= int(index) {
-		return nil, convertError(&types.TransactionNotFoundError{ID: flowgo.Identifier{}})
+		return nil, convertError(&types.TransactionNotFoundError{ID: flowgo.Identifier{}}, codes.Internal)
 	}
 
 	// Convert CCF events to JSON events, else return CCF encoded version
 	if requiredEventEncodingVersion == entities.EventEncodingVersion_JSON_CDC_V0 {
 		for i := range results {
 			results[i].Events, err = ConvertCCFEventsToJsonEvents(results[i].Events)
 			if err != nil {
-				return nil, convertError(err)
+				return nil, convertError(err, codes.Internal)
 			}
 		}
 	}
@@ -448,7 +455,7 @@ func (a *AccessAdapter) GetTransactionResultByIndex(
 func (a *AccessAdapter) GetTransactionsByBlockID(_ context.Context, blockID flowgo.Identifier) ([]*flowgo.TransactionBody, error) {
 	result, err := a.emulator.GetTransactionsByBlockID(blockID)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 	return result, nil
 }
@@ -460,15 +467,15 @@ func (a *AccessAdapter) GetTransactionResultsByBlockID(
 ) ([]*access.TransactionResult, error) {
 	result, err := a.emulator.GetTransactionResultsByBlockID(blockID)
 	if err != nil {
-		return nil, convertError(err)
+		return nil, convertError(err, codes.Internal)
 	}
 
 	// Convert CCF events to JSON events, else return CCF encoded version
 	if requiredEventEncodingVersion == entities.EventEncodingVersion_JSON_CDC_V0 {
 		for i := range result {
 			result[i].Events, err = ConvertCCFEventsToJsonEvents(result[i].Events)
 			if err != nil {
-				return nil, convertError(err)
+				return nil, convertError(err, codes.Internal)
 			}
 		}
 	}
@@ -481,7 +488,7 @@ func (a *AccessAdapter) SendTransaction(_ context.Context, tx *flowgo.Transactio
 		Str("txID", tx.ID().String()).
 		Msg(`✉️   Transaction submitted`)
 
-	return convertError(a.emulator.SendTransaction(tx))
+	return convertError(a.emulator.SendTransaction(tx), codes.Internal)
 }
 
 func (a *AccessAdapter) GetNodeVersionInfo(

adapters/access_test.go

@@ -23,20 +23,20 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/onflow/flow/protobuf/go/flow/entities"
-
+	"github.com/rs/zerolog"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 
-	"github.com/golang/mock/gomock"
 	"github.com/onflow/cadence"
 	"github.com/onflow/cadence/encoding/ccf"
-	"github.com/onflow/flow-emulator/emulator/mocks"
-	"github.com/onflow/flow-emulator/types"
 	"github.com/onflow/flow-go/access"
 	"github.com/onflow/flow-go/engine/common/rpc/convert"
 	flowgo "github.com/onflow/flow-go/model/flow"
-	"github.com/rs/zerolog"
-	"github.com/stretchr/testify/assert"
+	"github.com/onflow/flow/protobuf/go/flow/entities"
+
+	"github.com/onflow/flow-emulator/emulator/mocks"
+	"github.com/onflow/flow-emulator/types"
 )
 
 func accessTest(f func(t *testing.T, adapter *AccessAdapter, emu *mocks.MockEmulator)) func(t *testing.T) {
@@ -451,6 +451,12 @@ func TestAccess(t *testing.T) {
 		emulatorResult := types.ScriptResult{Value: stringValue}
 		expected, _ := convertScriptResult(&emulatorResult, nil)
 
+		// called once for each script execution
+		emu.EXPECT().
+			GetLatestBlock().
+			Return(&flowgo.Block{Header: &flowgo.Header{}}, nil).
+			Times(2)
+
 		//success
 		emu.EXPECT().
 			ExecuteScript(script, arguments).

adapters/sdk_test.go

@@ -23,16 +23,18 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/golang/mock/gomock"
+	"github.com/rs/zerolog"
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
+
 	"github.com/onflow/cadence"
-	"github.com/onflow/flow-emulator/convert"
-	"github.com/onflow/flow-emulator/emulator/mocks"
-	"github.com/onflow/flow-emulator/types"
 	flowgosdk "github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go/access"
 	flowgo "github.com/onflow/flow-go/model/flow"
-	"github.com/rs/zerolog"
-	"github.com/stretchr/testify/assert"
+
+	"github.com/onflow/flow-emulator/convert"
+	"github.com/onflow/flow-emulator/emulator/mocks"
+	"github.com/onflow/flow-emulator/types"
 )
 
 func sdkTest(f func(t *testing.T, adapter *SDKAdapter, emu *mocks.MockEmulator)) func(t *testing.T) {