make contracts compiler version agnostic

crytic · Aug 14, 2019 · 30bb707 · 30bb707
1 parent f9ded9c
commit 30bb707
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/examples/solidity/abiv2/Ballot.sol b/examples/solidity/abiv2/Ballot.sol
@@ -1,5 +1,4 @@
 pragma experimental ABIEncoderV2;
-pragma solidity ^0.4.25;
 
 contract Ballot {
   struct Voter { // Struct

diff --git a/examples/solidity/abiv2/Dynamic.sol b/examples/solidity/abiv2/Dynamic.sol
@@ -1,5 +1,4 @@
 pragma experimental ABIEncoderV2;
-pragma solidity ^0.4.25;
 
 contract Dynamic {
   struct Yolo { // Struct
@@ -11,7 +10,7 @@ contract Dynamic {
   bool cond = true;
 
   function yolo(Yolo memory y) public returns (bool) {
-    if (keccak256(y.s) == keccak256("yolo")) {
+    if (keccak256(abi.encodePacked(y.s)) == keccak256(abi.encodePacked("yolo"))) {
       cond = false;
     }
     return(true);

diff --git a/examples/solidity/abiv2/Dynamic2.sol b/examples/solidity/abiv2/Dynamic2.sol
@@ -1,10 +1,8 @@
-pragma solidity ^0.4.25;
-
 contract Dynamic {
   bool cond = true;
 
   function yolo(uint256 x, string memory s, uint256 y) public returns (bool) {
-    if (keccak256(s) == keccak256("yolo")) {
+    if (keccak256(abi.encodePacked(s)) == keccak256(abi.encodePacked("yolo"))) {
       cond = false;
     }
     return(true);