show us the encrypted data

analyzer/queries/queries.go

@@ -254,8 +254,8 @@ const (
       VALUES ($1, $2, $3, $4)`
 
 	RuntimeTransactionInsert = `
-    INSERT INTO chain.runtime_transactions (runtime, round, tx_index, tx_hash, tx_eth_hash, fee, gas_limit, gas_used, size, timestamp, method, body, "to", amount, success, error_module, error_code, error_message)
-      VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)`
+    INSERT INTO chain.runtime_transactions (runtime, round, tx_index, tx_hash, tx_eth_hash, fee, gas_limit, gas_used, size, timestamp, method, body, "to", amount, evm_encrypted_format, evm_encrypted_public_key, evm_encrypted_data_nonce, evm_encrypted_data_data, evm_encrypted_result_nonce, evm_encrypted_result_data, success, error_module, error_code, error_message)
+      VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24)`
 
 	RuntimeEventInsert = `
     INSERT INTO chain.runtime_events (runtime, round, tx_index, tx_hash, type, body, evm_log_name, evm_log_params, related_accounts)

analyzer/runtime/evm.go

@@ -8,9 +8,12 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	ethCommon "github.com/ethereum/go-ethereum/common"
+	"github.com/oasisprotocol/oasis-core/go/common/cbor"
 	"github.com/oasisprotocol/oasis-core/go/common/errors"
+	sdkTypes "github.com/oasisprotocol/oasis-sdk/client-sdk/go/types"
 
 	"github.com/oasisprotocol/oasis-indexer/analyzer/evmabi"
+	"github.com/oasisprotocol/oasis-indexer/common"
 	"github.com/oasisprotocol/oasis-indexer/log"
 	"github.com/oasisprotocol/oasis-indexer/storage"
 )
@@ -50,6 +53,15 @@ type EVMTokenBalanceData struct {
 	Balance *big.Int
 }
 
+type EVMEncryptedData struct {
+	Format      common.CallFormat
+	PublicKey   []byte
+	DataNonce   []byte
+	DataData    []byte
+	ResultNonce []byte
+	ResultData  []byte
+}
+
 type EVMDeterministicError struct {
 	// Note: .error is the implementation of .Error, .Unwrap etc. It is not
 	// in the Unwrap chain. Use something like
@@ -290,3 +302,54 @@ func EVMDownloadTokenBalance(ctx context.Context, logger *log.Logger, source sto
 		return nil, fmt.Errorf("download stale token balance type %v not handled", tokenType)
 	}
 }
+
+// EVMMaybeUnmarshalEncryptedData breaks down a possibly encrypted data +
+// result into their encryption envelope fields. If the data is not encrypted,
+// it returns nil with no error.
+func EVMMaybeUnmarshalEncryptedData(data []byte, result *[]byte) (*EVMEncryptedData, error) {
+	var encryptedData EVMEncryptedData
+	var call sdkTypes.Call
+	if cbor.Unmarshal(data, &call) != nil {
+		// Invalid CBOR means it's bare Ethereum format data. This is normal.
+		// https://github.com/oasisprotocol/oasis-sdk/blob/runtime-sdk/v0.3.0/runtime-sdk/modules/evm/src/lib.rs#L626
+		return nil, nil
+	}
+	encryptedData.Format = common.CallFormat(call.Format.String())
+	switch call.Format {
+	case sdkTypes.CallFormatEncryptedX25519DeoxysII:
+		var callEnvelope sdkTypes.CallEnvelopeX25519DeoxysII
+		if err := cbor.Unmarshal(call.Body, &callEnvelope); err != nil {
+			return nil, fmt.Errorf("outer call format %s unmarshal body: %w", call.Format, err)
+		}
+		encryptedData.PublicKey = callEnvelope.Pk[:]
+		encryptedData.DataNonce = callEnvelope.Nonce[:]
+		encryptedData.DataData = callEnvelope.Data
+	// If you are adding new call formats, remember to add them to the
+	// database call_format enum too.
+	default:
+		return nil, fmt.Errorf("outer call format %s (%d) not supported", call.Format, call.Format)
+	}
+	var callResult sdkTypes.CallResult
+	if result != nil {
+		if err := cbor.Unmarshal(*result, &callResult); err != nil {
+			return nil, fmt.Errorf("unmarshal outer call result: %w", err)
+		}
+		if callResult.IsUnknown() {
+			switch call.Format {
+			case sdkTypes.CallFormatEncryptedX25519DeoxysII:
+				var resultEnvelope sdkTypes.ResultEnvelopeX25519DeoxysII
+				if err := cbor.Unmarshal(callResult.Unknown, &resultEnvelope); err != nil {
+					return nil, fmt.Errorf("outer call result unmarshal unknown: %w", err)
+				}
+				encryptedData.ResultNonce = resultEnvelope.Nonce[:]
+				encryptedData.ResultData = resultEnvelope.Data
+			default:
+				// We have already checked when decoding the call envelope,
+				// but I'm keeping this default case here so we don't forget
+				// if this code gets restructured.
+				return nil, fmt.Errorf("outer call format %s (%d) not supported", call.Format, call.Format)
+			}
+		}
+	}
+	return &encryptedData, nil
+}

analyzer/runtime/extract.go

@@ -53,6 +53,7 @@ type BlockTransactionData struct {
 	Body                    interface{}
 	To                      *apiTypes.Address // Extracted from the body for convenience. Semantics vary by tx type.
 	Amount                  *common.BigInt    // Extracted from the body for convenience. Semantics vary by tx type.
+	EVMEncrypted            *EVMEncryptedData
 	Success                 *bool
 	Error                   *TxError
 }
@@ -375,6 +376,18 @@ func ExtractRound(blockHeader nodeapi.RuntimeBlockHeader, txrs []nodeapi.Runtime
 							return fmt.Errorf("created contract: %w", err)
 						}
 					}
+					var evmEncrypted *EVMEncryptedData
+					evmEncrypted, err = EVMMaybeUnmarshalEncryptedData(body.InitCode, ok)
+					if err == nil {
+						blockTransactionData.EVMEncrypted = evmEncrypted
+					} else {
+						logger.Error("error unmarshalling encrypted init code and result, omitting encrypted fields",
+							"round", blockHeader.Round,
+							"tx_index", txIndex,
+							"tx_hash", txr.Tx.Hash(),
+							"err", err,
+						)
+					}
 					return nil
 				},
 				EVMCall: func(body *evm.Call, ok *[]byte) error {
@@ -383,6 +396,18 @@ func ExtractRound(blockHeader nodeapi.RuntimeBlockHeader, txrs []nodeapi.Runtime
 					if to, err = registerRelatedEthAddress(blockData.AddressPreimages, blockTransactionData.RelatedAccountAddresses, body.Address); err != nil {
 						return fmt.Errorf("address: %w", err)
 					}
+					var evmEncrypted *EVMEncryptedData
+					evmEncrypted, err = EVMMaybeUnmarshalEncryptedData(body.Data, ok)
+					if err == nil {
+						blockTransactionData.EVMEncrypted = evmEncrypted
+					} else {
+						logger.Error("error unmarshalling encrypted data and result, omitting encrypted fields",
+							"round", blockHeader.Round,
+							"tx_index", txIndex,
+							"tx_hash", txr.Tx.Hash(),
+							"err", err,
+						)
+					}
 					// todo: maybe parse known token methods
 					return nil
 				},

analyzer/runtime/runtime.go

@@ -276,6 +276,22 @@ func (m *Main) queueDbUpdates(batch *storage.QueryBatch, data *BlockData) {
 		for addr := range transactionData.RelatedAccountAddresses {
 			batch.Queue(queries.RuntimeRelatedTransactionInsert, m.cfg.RuntimeName, addr, data.Header.Round, transactionData.Index)
 		}
+		var (
+			evmEncryptedFormat      *common.CallFormat
+			evmEncryptedPublicKey   *[]byte
+			evmEncryptedDataNonce   *[]byte
+			evmEncryptedDataData    *[]byte
+			evmEncryptedResultNonce *[]byte
+			evmEncryptedResultData  *[]byte
+		)
+		if transactionData.EVMEncrypted != nil {
+			evmEncryptedFormat = &transactionData.EVMEncrypted.Format
+			evmEncryptedPublicKey = &transactionData.EVMEncrypted.PublicKey
+			evmEncryptedDataNonce = &transactionData.EVMEncrypted.DataNonce
+			evmEncryptedDataData = &transactionData.EVMEncrypted.DataData
+			evmEncryptedResultNonce = &transactionData.EVMEncrypted.ResultNonce
+			evmEncryptedResultData = &transactionData.EVMEncrypted.ResultData
+		}
 		var error_module string
 		var error_code uint32
 		var error_message *string
@@ -300,6 +316,12 @@ func (m *Main) queueDbUpdates(batch *storage.QueryBatch, data *BlockData) {
 			transactionData.Body,
 			transactionData.To,
 			transactionData.Amount,
+			evmEncryptedFormat,
+			evmEncryptedPublicKey,
+			evmEncryptedDataNonce,
+			evmEncryptedDataData,
+			evmEncryptedResultNonce,
+			evmEncryptedResultData,
 			transactionData.Success,
 			error_module,
 			error_code,

common/types.go

@@ -144,3 +144,5 @@ const (
 	RuntimeSapphire Runtime = "sapphire"
 	RuntimeUnknown  Runtime = "unknown"
 )
+
+type CallFormat string

storage/migrations/02_runtimes.up.sql

@@ -3,6 +3,7 @@
 BEGIN;
 
 CREATE TYPE runtime AS ENUM ('emerald', 'sapphire', 'cipher');
+CREATE TYPE call_format AS ENUM ('encrypted/x25519-deoxysii');
 
 CREATE TABLE chain.runtime_blocks
 (
@@ -48,11 +49,19 @@ CREATE TABLE chain.runtime_transactions
   size UINT31 NOT NULL,
 
   -- Transaction contents.
-  method      TEXT,         -- accounts.Transter, consensus.Deposit, consensus.Withdraw, evm.Create, evm.Call. NULL for malformed and encrypted txs.
+  method      TEXT,         -- accounts.Transfer, consensus.Deposit, consensus.Withdraw, evm.Create, evm.Call. NULL for malformed and encrypted txs.
   body        JSONB,        -- For EVM txs, the EVM method and args are encoded in here. NULL for malformed and encrypted txs.
   "to"        oasis_addr,   -- Exact semantics depend on method. Extracted from body; for convenience only.
   amount      UINT_NUMERIC, -- Exact semantics depend on method. Extracted from body; for convenience only.
 
+  -- Encrypted data in encrypted Ethereum-format transactions.
+  evm_encrypted_format call_format,
+  evm_encrypted_public_key BYTEA,
+  evm_encrypted_data_nonce BYTEA,
+  evm_encrypted_data_data BYTEA,
+  evm_encrypted_result_nonce BYTEA,
+  evm_encrypted_result_data BYTEA,
+
   -- Error information.
   success       BOOLEAN,  -- NULL means success is unknown (can happen in confidential runtimes)
   error_module  TEXT,