Merge branch 'develop' into op-program-pre-image-comms

op-node/eth/transactions.go

@@ -34,7 +34,8 @@ func DecodeTransactions(data []hexutil.Bytes) ([]*types.Transaction, error) {
 	return dest, nil
 }
 
-func HashTransactions(elems []*types.Transaction) []common.Hash {
+// TransactionsToHashes computes the transaction-hash for every transaction in the input.
+func TransactionsToHashes(elems []*types.Transaction) []common.Hash {
 	out := make([]common.Hash, len(elems))
 	for i, el := range elems {
 		out[i] = el.Hash()

op-node/sources/eth_client.go

@@ -356,7 +356,7 @@ func (s *EthClient) FetchReceipts(ctx context.Context, blockHash common.Hash) (e
 	if v, ok := s.receiptsCache.Get(blockHash); ok {
 		job = v.(*receiptsFetchingJob)
 	} else {
-		txHashes := eth.HashTransactions(txs)
+		txHashes := eth.TransactionsToHashes(txs)
 		job = NewReceiptsFetchingJob(s, s.client, s.maxBatchSize, eth.ToBlockID(info), info.ReceiptHash(), txHashes)
 		s.receiptsCache.Add(blockHash, job)
 	}

op-program/client/l1/oracle.go

@@ -78,7 +78,7 @@ func (p *PreimageOracle) ReceiptsByBlockHash(blockHash common.Hash) (eth.BlockIn
 		return p.oracle.Get(preimage.Keccak256Key(key))
 	})
 
-	txHashes := eth.HashTransactions(txs)
+	txHashes := eth.TransactionsToHashes(txs)
 	receipts, err := eth.DecodeRawReceipts(eth.ToBlockID(info), opaqueReceipts, txHashes)
 	if err != nil {
 		panic(fmt.Errorf("bad receipts data for block %s: %w", blockHash, err))

op-program/preimage/iface.go

@@ -32,7 +32,7 @@ const (
 	// The zero key type is illegal to use, ensuring all keys are non-zero.
 	_ KeyType = 0
 	// LocalKeyType is for input-type pre-images, specific to the local program instance.
-	LocalKeyType KeyType = 0
+	LocalKeyType KeyType = 1
 	// Keccak25Key6Type is for keccak256 pre-images, for any global shared pre-images.
 	Keccak25Key6Type KeyType = 2
 )