Merge pull request #418 from bane-labs/change-submit-tx

antimev: return declared transaction hash for envelope transactions

Author: AnnaShaleva

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

antimev/tpke_test.go

@@ -82,6 +82,8 @@ func TestTPKE(t *testing.T) {
 
 	// Generate an example envelope for privnet verification
 	var envelopeData = EncryptedDataPrefix
+	envelopeData = binary.LittleEndian.AppendUint32(envelopeData, 0)
+	envelopeData = append(envelopeData, common.MaxHash[:]...)
 	envelopeData = append(envelopeData, encryptedKey.ToBytes()...)
 	envelopeData = append(envelopeData, encryptedMsg...)
 	t.Logf("encryptedKey: %s\nencryptedMsg: %s\nenvelopeData: 0x%s", hex.EncodeToString(encryptedKey.ToBytes()), hex.EncodeToString(encryptedMsg), hex.EncodeToString(envelopeData))
@@ -153,6 +155,7 @@ func TestGenerateEncryptedTx(t *testing.T) {
 	// Generate envelope.
 	var envelopeData = EncryptedDataPrefix
 	envelopeData = binary.LittleEndian.AppendUint32(envelopeData, epoch)
+	envelopeData = append(envelopeData, tx.Hash().Bytes()...)
 	envelopeData = append(envelopeData, encryptedKey.ToBytes()...)
 	envelopeData = append(envelopeData, encryptedMsg...)
 	t.Logf("encryptedKey: %s\nencryptedMsg: %s\nenvelopeData: 0x%s\nencrypted tx hash: %s\n",

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

privnet/README.md

@@ -342,7 +342,7 @@ from: '5e6D9680428e6fe62a09BBb6AC23Df5bFE069AE8',
 to: '1212000000000000000000000000000000000003',
 value: 250,
 gas_price: 10,
-data: '0xffffffff01000000828b448503d5444f5ad70dbfb9d5eefc942dcdf9c25805ae928854e9a0aecfbcca2636a739dd432908623a19007b89ea9208c61cf65e341d1359b524dbfd8bf3b6a05813f7ffea1a05da38c78e897dce6dcb03be6647565839c08299d04c22d1b12e2b99f04a2ac2b0ac5e27d656afb3a84fcf97b3777832b51bc8844a47c4d897b604626279d2207aa152089295822e19bc5ea54b3e32522dc7ccab8780ab5c4aebe941d5c8adee7ba60dffd72dc04c219955b72ba57475e619ef726ab79012957e6aa04f63e837e845720755e21c9cd0420c316071386b00f91a16135ec435313d54853aae15b7678cc3c7ea1187fbd48ad2a3a9b95d73d391577276ac4c8503dbd004d20c31ca63aa426e245a6cd38bfb171ee53063108105b1d9b3e7dda2cb8b384805e00faef2faab647db83d43'
+data: '0xffffffff01000000777bbe0bb1e4c34310c50160c1a22e66bfab8531c54b9bc87739a17eff6fd15a902eeed7615e060e8620866d05e73c41f864150a545954f908e3e9d4be7c46eeeefd7c41c6be8e88aa01bd241df090b1ab1c0cb95a5ec5b8a70ff23d8918849ed6f9c74d6ee8a43a560e4b8fb4326cbf1ea71900119d5713f1a25286e0f48321ab1c4d37d03ed991191ea2d9d94198c9761b65fae7a755bfba1d6a2794ddffaa21d0e98f5f7e93620ab43343b43f50b916813972a31c4c0cc34a7eac7e48d7835b92c36b5e0b962a5c95d42f574349705eda3f70282160c308049967e39b5e179fc3f4d750b429b3a75c0a3932e801d044721da5a88e2a77a14ff1f916578202c3af4f960d0554c30fa1df3e8f1061a9630d8646db5a84c50dc2dd5c47a18dcc434756e0be2116c42872619c8065424b68a223fdb7e9666fbdc59ee8325ec4ab9d7e9e97c704feefaac54f8bbd1c7a2b'
 });
 ```