Enable debug revert strings in some of the existing calldata/encoding tests

cameel · cameel · commit 511cdc067c56 · 2026-04-30T18:35:47.000+02:00
diff --git a/test/libsolidity/semanticTests/abicoder/abi_decode_offset_overflow_in_array.sol b/test/libsolidity/semanticTests/abicoder/abi_decode_offset_overflow_in_array.sol
@@ -24,5 +24,7 @@ contract Test {
 		return decoded[1][0];
 	}
 }
+// ====
+// revertStrings: debug
 // ----
-// test() -> FAILURE
+// test() -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/abicoder/abi_decode_offset_overflow_in_array_2.sol b/test/libsolidity/semanticTests/abicoder/abi_decode_offset_overflow_in_array_2.sol
@@ -24,5 +24,7 @@ contract Test {
 		return decoded[0][0] + decoded[1][0];
 	}
 }
+// ====
+// revertStrings: debug
 // ----
-// withinArray() -> FAILURE
+// withinArray() -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/abicoder/abi_decode_offset_overflow_in_array_3.sol b/test/libsolidity/semanticTests/abicoder/abi_decode_offset_overflow_in_array_3.sol
@@ -17,5 +17,7 @@ contract Test {
 		return decoded[1][0];
 	}
 }
+// ====
+// revertStrings: debug
 // ----
-// test() -> FAILURE
+// test() -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray offset"
diff --git a/test/libsolidity/semanticTests/abicoder/validation/array_exceeds_calldatasize_v1.sol b/test/libsolidity/semanticTests/abicoder/validation/array_exceeds_calldatasize_v1.sol
@@ -0,0 +1,13 @@
+pragma abicoder v1;
+
+contract C {
+	function f(uint[] calldata) public {}
+}
+// ====
+// ABIEncoderV1Only: true
+// compileViaYul: false
+// revertStrings: debug
+// ----
+// f(uint256[]): 0x20, 0 ->
+// f(uint256[]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI calldata decoding: invalid d", "ata pointer"
+// f(uint256[]): 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI calldata decoding: invalid d", "ata pointer"
diff --git a/test/libsolidity/semanticTests/abicoder/validation/array_exceeds_size_limit_for_calldata_types_v1.sol b/test/libsolidity/semanticTests/abicoder/validation/array_exceeds_size_limit_for_calldata_types_v1.sol
@@ -0,0 +1,13 @@
+pragma abicoder v1;
+
+contract C {
+    function f(uint a, uint[] calldata b, uint c) external pure returns (uint) {
+        return 7;
+    }
+}
+// ====
+// ABIEncoderV1Only: true
+// compileViaYul: false
+// revertStrings: debug
+// ----
+// f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI calldata decoding: invalid d", "ata pointer"
diff --git a/test/libsolidity/semanticTests/abicoder/validation/array_exceeds_size_limit_for_calldata_types_v2.sol b/test/libsolidity/semanticTests/abicoder/validation/array_exceeds_size_limit_for_calldata_types_v2.sol
@@ -1,7 +1,11 @@
+pragma abicoder v2;
+
 contract C {
     function f(uint a, uint[] calldata b, uint c) external pure returns (uint) {
         return 7;
     }
 }
+// ====
+// revertStrings: debug
 // ----
-// f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE
+// f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray length"
diff --git a/test/libsolidity/semanticTests/abicoder/validation/calldata_array_dynamic_invalid_static_middle_v2.sol b/test/libsolidity/semanticTests/abicoder/validation/calldata_array_dynamic_invalid_static_middle_v2.sol
@@ -1,5 +1,4 @@
-pragma abicoder               v2;
-
+pragma abicoder v2;
 
 contract C {
     function f(uint256[][1][] calldata a) external returns (uint256) {
@@ -16,14 +15,16 @@ contract C {
         return 42;
     }
 }
+// ====
+// revertStrings: debug
 // ----
 // f(uint256[][1][]): 0x20, 0x0 -> 42 # valid access stub #
-// f(uint256[][1][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
+// f(uint256[][1][]): 0x20, 0x1 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride" # invalid on argument decoding #
 // f(uint256[][1][]): 0x20, 0x1, 0x20 -> 42 # invalid on outer access #
-// g(uint256[][1][]): 0x20, 0x1, 0x20 -> FAILURE
+// g(uint256[][1][]): 0x20, 0x1, 0x20 -> FAILURE, hex"08c379a0", 0x20, 0x1c, "Invalid calldata tail offset"
 // f(uint256[][1][]): 0x20, 0x1, 0x20, 0x20 -> 42 # invalid on inner access #
 // g(uint256[][1][]): 0x20, 0x1, 0x20, 0x20 -> 42
-// h(uint256[][1][]): 0x20, 0x1, 0x20, 0x20 -> FAILURE
+// h(uint256[][1][]): 0x20, 0x1, 0x20, 0x20 -> FAILURE, hex"08c379a0", 0x20, 0x1c, "Invalid calldata tail offset"
 // f(uint256[][1][]): 0x20, 0x1, 0x20, 0x20, 0x1 -> 42
 // g(uint256[][1][]): 0x20, 0x1, 0x20, 0x20, 0x1 -> 42
-// h(uint256[][1][]): 0x20, 0x1, 0x20, 0x20, 0x1 -> FAILURE
+// h(uint256[][1][]): 0x20, 0x1, 0x20, 0x20, 0x1 -> FAILURE, hex"08c379a0", 0x20, 0x17, "Calldata tail too short"
diff --git a/test/libsolidity/semanticTests/abicoder/validation/calldata_array_dynamic_invalid_v2.sol b/test/libsolidity/semanticTests/abicoder/validation/calldata_array_dynamic_invalid_v2.sol
@@ -1,5 +1,4 @@
-pragma abicoder               v2;
-
+pragma abicoder v2;
 
 contract C {
     function f(uint256[][] calldata a) external returns (uint256) {
@@ -11,10 +10,12 @@ contract C {
         return 42;
     }
 }
+// ====
+// revertStrings: debug
 // ----
 // f(uint256[][]): 0x20, 0x0 -> 42 # valid access stub #
-// f(uint256[][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
+// f(uint256[][]): 0x20, 0x1 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride" # invalid on argument decoding #
 // f(uint256[][]): 0x20, 0x1, 0x20 -> 42 # invalid on outer access #
-// g(uint256[][]): 0x20, 0x1, 0x20 -> FAILURE
+// g(uint256[][]): 0x20, 0x1, 0x20 -> FAILURE, hex"08c379a0", 0x20, 0x1c, "Invalid calldata tail offset"
 // f(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x42 -> 42 # invalid on inner access #
-// g(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x42 -> FAILURE
+// g(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x42 -> FAILURE, hex"08c379a0", 0x20, 0x17, "Calldata tail too short"
diff --git a/test/libsolidity/semanticTests/abicoder/validation/calldata_with_garbage_v2.sol b/test/libsolidity/semanticTests/abicoder/validation/calldata_with_garbage_v2.sol
@@ -39,28 +39,30 @@ contract C {
         return (a[which], b[0]);
     }
 }
+// ====
+// revertStrings: debug
 // ----
 // f_memory(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0
 // f_memory(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 1, 7
-// f_memory(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
+// f_memory(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
 // f_encode(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0x40, 0x20, 0
 // f_encode(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 0x60, 0x20, 1, 7
-// f_encode(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
+// f_encode(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
 // f_storage(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0x40, 0x20, 0
 // f_storage(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 0x60, 0x20, 1, 7
-// f_storage(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
+// f_storage(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
 // f_index(uint256[],uint256): 0xa0, 0, 9, 9, 9, 2, 7, 8 -> 7
 // f_index(uint256[],uint256): 0xa0, 1, 9, 9, 9, 2, 7, 8 -> 8
 // f_index(uint256[],uint256): 0xa0, 2, 9, 9, 9, 2, 7, 8 -> FAILURE, hex"4e487b71", 0x32
 // g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x60, 1, 2, 0
 // g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x60, 1, 2, 1, 7
-// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
+// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
 // g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x20, 0x80, 0x60, 1, 2, 0
 // g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x20, 0xa0, 0x60, 1, 2, 1, 7
-// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
+// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
 // g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x20, 0x80, 0x60, 1, 2, 0
 // g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x20, 0xa0, 0x60, 1, 2, 1, 7
-// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
+// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
 // g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 0, 9, 9, 9, 2, 7, 8 -> 7, 1
 // g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 1, 9, 9, 9, 2, 7, 8 -> 8, 1
-// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 1, 9, 9, 9, 2, 7 -> FAILURE
+// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 1, 9, 9, 9, 2, 7 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/abicoder/validation/external_function_type_inside_struct_v2.sol b/test/libsolidity/semanticTests/abicoder/validation/external_function_type_inside_struct_v2.sol
@@ -1,11 +1,13 @@
-pragma abicoder               v2;
+pragma abicoder v2;
 
 contract C {
     struct S { function () external x; }
     function f(S memory) public pure returns (uint r) { r = 1; }
     function g(S calldata) external pure returns (uint r) { r = 2; }
     function h(S calldata s) external pure returns (uint r) { s.x; r = 3; }
 }
+// ====
+// revertStrings: debug
 // ----
 // f((function)): "01234567890123456789abcd" -> 1
 // f((function)): "01234567890123456789abcdX" -> FAILURE
diff --git a/test/libsolidity/semanticTests/abicoder/validation/static_struct_v2.sol b/test/libsolidity/semanticTests/abicoder/validation/static_struct_v2.sol
@@ -1,4 +1,4 @@
-pragma abicoder               v2;
+pragma abicoder v2;
 
 contract C {
 	struct S { int16 a; uint8 b; bytes2 c; }
@@ -10,6 +10,8 @@ contract C {
 		}
 	}
 }
+// ====
+// revertStrings: debug
 // ----
 // f((int16,uint8,bytes2)): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab" -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab"
 // f((int16,uint8,bytes2)): 0xff010, 0xff, "ab" -> FAILURE

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,7 @@ contract Test {`
`24`	`24`	`return decoded[1][0];`
`25`	`25`	`}`
`26`	`26`	`}`
	`27`	`+// ====`
	`28`	`+// revertStrings: debug`
`27`	`29`	`// ----`
`28`		`-// test() -> FAILURE`
	`30`	`+// test() -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,7 @@ contract Test {`
`17`	`17`	`return decoded[1][0];`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+// ====`
	`21`	`+// revertStrings: debug`
`20`	`22`	`// ----`
`21`		`-// test() -> FAILURE`
	`23`	`+// test() -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray offset"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,11 @@`
	`1`	`+pragma abicoder v2;`
	`2`	`+`
`1`	`3`	`contract C {`
`2`	`4`	`function f(uint a, uint[] calldata b, uint c) external pure returns (uint) {`
`3`	`5`	`return 7;`
`4`	`6`	`}`
`5`	`7`	`}`
	`8`	`+// ====`
	`9`	`+// revertStrings: debug`
`6`	`10`	`// ----`
`7`		`-// f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE`
	`11`	`+// f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray length"`