Merge pull request #11 from quilt/aa-tests-retesteth

Update Retesteth Integration to Support AA
lightclient · Jun 8, 2020 · f8e1997 · f8e1997
2 parents 3ddc462 + 46ef9c2
commit f8e1997
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/core/types/transaction.go b/core/types/transaction.go
@@ -409,6 +409,7 @@ type Message struct {
 }
 
 func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte, checkNonce bool) Message {
+	isAA := from.IsEntryPoint()
 	return Message{
 		from:       from,
 		to:         to,
@@ -417,7 +418,8 @@ func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *b
 		gasLimit:   gasLimit,
 		gasPrice:   gasPrice,
 		data:       data,
-		checkNonce: checkNonce,
+		checkNonce: checkNonce && !isAA,
+		isAA:       isAA,
 	}
 }
 

diff --git a/tests/state_test_util.go b/tests/state_test_util.go
@@ -244,11 +244,15 @@ func (tx *stTransaction) toMessage(ps stPostState) (core.Message, error) {
 	// Derive sender from private key if present.
 	var from common.Address
 	if len(tx.PrivateKey) > 0 {
-		key, err := crypto.ToECDSA(tx.PrivateKey)
-		if err != nil {
-			return nil, fmt.Errorf("invalid private key: %v", err)
+		if len(tx.PrivateKey) == 1 && tx.PrivateKey[0] == 0xAA {
+			from = common.NewEntryPointAddress()
+		} else {
+			key, err := crypto.ToECDSA(tx.PrivateKey)
+			if err != nil {
+				return nil, fmt.Errorf("invalid private key: %v", err)
+			}
+			from = crypto.PubkeyToAddress(key.PublicKey)
 		}
-		from = crypto.PubkeyToAddress(key.PublicKey)
 	}
 	// Parse recipient if present.
 	var to *common.Address

diff --git a/tests/testdata b/tests/testdata
+8 −15		GeneralStateTests/stExample/paygasRevert.json
+8 −11		src/GeneralStateTestsFiller/stExample/paygasRevertFiller.json