antimev: internal\ethapi: return declared transaction hash for antimev envelopes

Author: txhsl

antimev/envelope.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"crypto/aes"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/systemcontracts"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto/tpke"
@@ -23,13 +24,17 @@ var (
 	// encryption takes in the Envelope's data byte slice (the size of Uint64).
 	EncryptedDataRoundLen = 4
 
+	// EncryptedDataHashLen is the amount of bytes that represents the hash of an
+	// encrypted transaction.
+	EncryptedDataHashLen = common.HashLength
+
 	// minEncryptedDataSize is the minimum size of encrypted data stored in the
 	// Envelope transaction. It consists of the constant-length prefix,
 	// constant-length CipherText and variable-length encrypted message. The size of
 	// a simple gas transfer with 1 gwei (105 bytes) is taken as a reference point
 	// for evaluation of variable-length part; it is padded to be even to the AES
 	// block size as required by AES encryption rules.
-	minEncryptedDataSize = EncryptedDataPrefixLen + EncryptedDataRoundLen + tpke.CipherTextSize + 105 + (aes.BlockSize - 105%aes.BlockSize)
+	minEncryptedDataSize = EncryptedDataPrefixLen + EncryptedDataRoundLen + EncryptedDataHashLen + tpke.CipherTextSize + 105 + (aes.BlockSize - 105%aes.BlockSize)
 )
 
 // isEnvelope checks whether a transaction is an Envelope transaction. The criteria

consensus/dbft/amev.go

@@ -31,7 +31,7 @@ type envelopeData struct {
 func decodeEnvelopeData(buf []byte) (envelopeData, error) {
 	var (
 		key              = new(tpke.CipherText)
-		keyOffset        = antimev.EncryptedDataPrefixLen + antimev.EncryptedDataRoundLen
+		keyOffset        = antimev.EncryptedDataPrefixLen + antimev.EncryptedDataRoundLen + antimev.EncryptedDataHashLen
 		cipherTextOffset = keyOffset + tpke.CipherTextSize
 	)
 	// It's guaranteed by Envelope definition that buf has a proper length.

internal/ethapi/api.go

@@ -30,6 +30,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/accounts/scwallet"
+	"github.com/ethereum/go-ethereum/antimev"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/lru"
@@ -1889,7 +1890,14 @@ func SubmitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (c
 	} else {
 		log.Info("Submitted transaction", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "recipient", tx.To(), "value", tx.Value())
 	}
-	return tx.Hash(), nil
+
+	// If the transaction is an antimev envelope, then return the declared transaction hash instead of its own.
+	if antimev.IsEnvelope(tx) {
+		hashOffSet := antimev.EncryptedDataPrefixLen + antimev.EncryptedDataRoundLen
+		return common.Hash(tx.Data()[hashOffSet : hashOffSet+antimev.EncryptedDataHashLen]), nil
+	} else {
+		return tx.Hash(), nil
+	}
 }
 
 // SendTransaction creates a transaction for the given argument, sign it and submit it to the