From 7b5f2d0c4d864002438fd2391226cf767fe3e961 Mon Sep 17 00:00:00 2001
From: Sam Alws <sam.alws@trailofbits.com>
Date: Thu, 12 Sep 2024 14:04:04 -0400
Subject: [PATCH] symExec support for tuple type (hevm PR 522)

---
 lib/Echidna/SymExec.hs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Echidna/SymExec.hs b/lib/Echidna/SymExec.hs
index 2c192abc7..69e61fc30 100644
--- a/lib/Echidna/SymExec.hs
+++ b/lib/Echidna/SymExec.hs
@@ -174,6 +174,7 @@ modelToTx dst method senders fallbackSender result =
               AbiBytesType _ -> grabNormalArg t
               AbiAddressType -> grabAddressArg
               AbiArrayType n mt -> grabArrayArg n mt
+              AbiTupleType mt -> grabTupleArg mt
               _ -> error "Unexpected ABI type in `modelToTx`"
 
         grabNormalArg argType name
@@ -185,7 +186,9 @@ modelToTx dst method senders fallbackSender result =
 
         grabAddressArg name = AbiAddress $ fromMaybe 0 $ Map.lookup (SymAddr name) cex.addrs
 
-        grabArrayArg nElem memberType name = AbiArray nElem memberType $ fromList [grabArg memberType $ name <> T.pack (show n) | n <- [0..nElem] :: [Int]]
+        grabArrayArg nElem memberType name = AbiArray nElem memberType $ fromList [grabArg memberType $ name <> "-a-" <> T.pack (show n) | n <- [0..nElem] :: [Int]]
+
+        grabTupleArg memberTypes name = AbiTuple $ fromList [grabArg t $ name <> "-t-" <> T.pack (show n) | (n, t) <- zip ([0..] :: [Int]) (toList memberTypes)]
 
         src_ = fromMaybe 0 $ Map.lookup (SymAddr "sender") cex.addrs
         src = if Set.member src_ senders then src_ else fallbackSender
@@ -217,7 +220,8 @@ genSubsts (Tx { call = SolCall (_, abiVals), src, value }) = addOnFinalValues $
   genVal (AbiBool b) name = ([(name, if b then 1 else 0)], [])
   genVal (AbiAddress addr) name = ([], [(name, addr)])
   genVal (AbiBytes n b) name | n > 0 && n <= 32 = ([(name, word b)], [])
-  genVal (AbiArray _ _ vals) name = fold $ zipWith genVal (toList vals) [name <> T.pack (show n) | n <- [0..] :: [Int]]
+  genVal (AbiArray _ _ vals) name = fold $ zipWith genVal (toList vals) [name <> "-a-" <> T.pack (show n) | n <- [0..] :: [Int]]
+  genVal (AbiTuple vals) name = fold $ zipWith genVal (toList vals) [name <> "-t-" <> T.pack (show n) | n <- [0..] :: [Int]]
   genVal _ _ = error "`genSubsts` is not implemented for all API types, mirroring hevm's `symAbiArg` function"
 genSubsts _ = error "`genSubsts` should only be called with a `SolCall` transaction argument"