update solc version

tubackkhoa · tubackkhoa · commit 013cd57bb8ba · 2023-08-16T14:19:12.000+07:00
diff --git a/solidity/contracts/CosmosToken.sol b/solidity/contracts/CosmosToken.sol
@@ -1,9 +1,9 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract CosmosERC20 is ERC20 {
-	uint256 constant MAX_UINT = 2**256 - 1;
+	uint256 constant MAX_UINT = 2 ** 256 - 1;
 	uint8 private cosmosDecimals;
 	address private gravityAddress;
 
diff --git a/solidity/contracts/DummyToken.sol b/solidity/contracts/DummyToken.sol
@@ -1,6 +1,6 @@
 // contracts/GLDToken.sol
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity 0.8.16;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
diff --git a/solidity/contracts/Gravity.sol b/solidity/contracts/Gravity.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
diff --git a/solidity/contracts/GravityERC721.sol b/solidity/contracts/GravityERC721.sol
@@ -1,15 +1,13 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "./Gravity.sol";
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { ERC721Holder } from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 
-
 contract GravityERC721 is ERC721Holder, ReentrancyGuard {
-	
 	uint256 public state_lastERC721EventNonce = 1;
 	address public state_gravitySolAddress;
 
@@ -26,7 +24,7 @@ contract GravityERC721 is ERC721Holder, ReentrancyGuard {
 		address _gravitySolAddress
 	) {
 		state_gravitySolAddress = _gravitySolAddress;
-		}
+	}
 
 	function sendERC721ToCosmos(
 		address _tokenContract,
@@ -40,19 +38,23 @@ contract GravityERC721 is ERC721Holder, ReentrancyGuard {
 			_tokenContract,
 			msg.sender,
 			_destination,
-			_tokenId, 
+			_tokenId,
 			state_lastERC721EventNonce
 		);
 	}
 
-	function withdrawERC721 (
+	function withdrawERC721(
 		address _ERC721TokenContract,
 		uint256[] calldata _tokenIds,
 		address[] calldata _destinations
 	) external {
 		require(msg.sender == state_gravitySolAddress, "Can only call from Gravity.sol");
 		for (uint256 i = 0; i < _tokenIds.length; i++) {
-			ERC721(_ERC721TokenContract).safeTransferFrom(address(this), _destinations[i], _tokenIds[i]);
+			ERC721(_ERC721TokenContract).safeTransferFrom(
+				address(this),
+				_destinations[i],
+				_tokenIds[i]
+			);
 		}
 		state_lastERC721EventNonce = state_lastERC721EventNonce + 1;
 	}
diff --git a/solidity/contracts/HashingTest.sol b/solidity/contracts/HashingTest.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 
 import "hardhat/console.sol";
 
diff --git a/solidity/contracts/ReentrantERC20.sol b/solidity/contracts/ReentrantERC20.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "./Gravity.sol";
 
diff --git a/solidity/contracts/SigningTest.sol b/solidity/contracts/SigningTest.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 
 import "hardhat/console.sol";
 
diff --git a/solidity/contracts/SimpleLogicBatch.sol b/solidity/contracts/SimpleLogicBatch.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
diff --git a/solidity/contracts/TestERC20A.sol b/solidity/contracts/TestERC20A.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // One of three testing coins
diff --git a/solidity/contracts/TestERC20B.sol b/solidity/contracts/TestERC20B.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // One of three testing coins
diff --git a/solidity/contracts/TestERC20C.sol b/solidity/contracts/TestERC20C.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // One of three testing coins
diff --git a/solidity/contracts/TestERC721A.sol b/solidity/contracts/TestERC721A.sol
@@ -1,23 +1,23 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 
 // Generate NFTs with token ids 1-10 and 190-195
 contract TestERC721A is ERC721 {
 	constructor() ERC721("NFT PUNK", "NFTPUNK") {
-	  uint i=0;
-	  // mint group 1 of nfts starting at token id 1, to 10
-      for (i = 1; i <= 10; i += 1) { 
-         _mint(0xc783df8a850f42e7F7e57013759C285caa701eB6, i);
-      }
-	  // mint group 2 of nfts starting at token id 190, to 199
-	  for (i = 190; i < 200; i += 1) { 
-         _mint(0xc783df8a850f42e7F7e57013759C285caa701eB6, i);
-	  }
-	  // mint group 3 of nfts token id 200, 201, 202
-	  _mint(0xBf660843528035a5A4921534E156a27e64B231fE, 200);
-	  _mint(0xBf660843528035a5A4921534E156a27e64B231fE, 201);
-	  _mint(0xBf660843528035a5A4921534E156a27e64B231fE, 202);
-	  _mint(0xBf660843528035a5A4921534E156a27e64B231fE, 203);
+		uint i = 0;
+		// mint group 1 of nfts starting at token id 1, to 10
+		for (i = 1; i <= 10; i += 1) {
+			_mint(0xc783df8a850f42e7F7e57013759C285caa701eB6, i);
+		}
+		// mint group 2 of nfts starting at token id 190, to 199
+		for (i = 190; i < 200; i += 1) {
+			_mint(0xc783df8a850f42e7F7e57013759C285caa701eB6, i);
+		}
+		// mint group 3 of nfts token id 200, 201, 202
+		_mint(0xBf660843528035a5A4921534E156a27e64B231fE, 200);
+		_mint(0xBf660843528035a5A4921534E156a27e64B231fE, 201);
+		_mint(0xBf660843528035a5A4921534E156a27e64B231fE, 202);
+		_mint(0xBf660843528035a5A4921534E156a27e64B231fE, 203);
 	}
 }
diff --git a/solidity/contracts/TestFakeGravity.sol b/solidity/contracts/TestFakeGravity.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.10;
+pragma solidity 0.8.16;
 
 import "hardhat/console.sol";
 import "./Gravity.sol";
diff --git a/solidity/contracts/TestLogicContract.sol b/solidity/contracts/TestLogicContract.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.10;
+pragma solidity 0.8.16;
 
 import "hardhat/console.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
@@ -12,11 +12,7 @@ contract TestLogicContract is Ownable {
 		state_tokenContract = _tokenContract;
 	}
 
-	function transferTokens(
-		address _to,
-		uint256 _a,
-		uint256 _b
-	) public onlyOwner {
+	function transferTokens(address _to, uint256 _a, uint256 _b) public onlyOwner {
 		IERC20(state_tokenContract).transfer(_to, _a + _b);
 		console.log("Sent Tokens");
 	}
diff --git a/solidity/contracts/TestTokenBatchMiddleware.sol b/solidity/contracts/TestTokenBatchMiddleware.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.10;
+pragma solidity 0.8.16;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
diff --git a/solidity/contracts/VulnerableERC20.sol b/solidity/contracts/VulnerableERC20.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Apache-2.0
-pragma solidity 0.8.10;
+pragma solidity 0.8.16;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // A test ERC20 with a really bad method called steal which permissionlessly allows transfers from an account
@@ -17,10 +17,10 @@ contract VulnerableERC20 is ERC20 {
 	}
 
 	/**
-     *	Attepmts to transfer `amount` from `from` to `to`, bypassing the normal checks
+	 *	Attepmts to transfer `amount` from `from` to `to`, bypassing the normal checks
 	 *  essentially allowing anyone to steal funds from anyone else
-     */
-    function steal(address from, address to, uint256 amount) public {
-        _transfer(from, to, amount);
+	 */
+	function steal(address from, address to, uint256 amount) public {
+		_transfer(from, to, amount);
 	}
 }
diff --git a/solidity/hardhat-first-fork.config.ts b/solidity/hardhat-first-fork.config.ts
@@ -28,37 +28,42 @@ task("accounts", "Prints the list of accounts", async (args, hre) => {
 module.exports = {
   // This is a sample solc configuration that specifies which version of solc to use
   solidity: {
-    version: "0.8.10",
+    version: "0.8.16",
     settings: {
       optimizer: {
-        enabled: true
-      }
-    }
+        enabled: true,
+      },
+    },
   },
   networks: {
     hardhat: {
       chainId: 420,
-      accounts: [{ privateKey: "0xbbfb76c92cd13796899f63dc6ead6d2420e8d0bc502d42bd5773c2d4b8897f08", balance: "10000000000000000000000" }],
+      accounts: [
+        {
+          privateKey:
+            "0xbbfb76c92cd13796899f63dc6ead6d2420e8d0bc502d42bd5773c2d4b8897f08",
+          balance: "10000000000000000000000",
+        },
+      ],
       forking: {
         url: "https://rpc.ankr.com/eth_goerli",
-        blockNumber: 8218229
+        blockNumber: 8218229,
       },
       mining: {
         auto: false,
-        interval: 2000
-      }
-    }
-
+        interval: 2000,
+      },
+    },
   },
   typechain: {
     outDir: "typechain",
     target: "ethers-v5",
-    runOnCompile: true
+    runOnCompile: true,
   },
   gasReporter: {
-    enabled: true
+    enabled: true,
   },
   mocha: {
-    timeout: 2000000
-  }
+    timeout: 2000000,
+  },
 };
diff --git a/solidity/hardhat-second-fork.config.ts b/solidity/hardhat-second-fork.config.ts
@@ -28,37 +28,42 @@ task("accounts", "Prints the list of accounts", async (args, hre) => {
 module.exports = {
   // This is a sample solc configuration that specifies which version of solc to use
   solidity: {
-    version: "0.8.10",
+    version: "0.8.16",
     settings: {
       optimizer: {
-        enabled: true
-      }
-    }
+        enabled: true,
+      },
+    },
   },
   networks: {
     hardhat: {
       chainId: 421,
-      accounts: [{ privateKey: "0xbbfb76c92cd13796899f63dc6ead6d2420e8d0bc502d42bd5773c2d4b8897f08", balance: "10000000000000000000000" }],
+      accounts: [
+        {
+          privateKey:
+            "0xbbfb76c92cd13796899f63dc6ead6d2420e8d0bc502d42bd5773c2d4b8897f08",
+          balance: "10000000000000000000000",
+        },
+      ],
       forking: {
         url: "https://1rpc.io/bnb",
-        blockNumber: 24882604
+        blockNumber: 24882604,
       },
       mining: {
         auto: false,
-        interval: 2000
-      }
-    }
-
+        interval: 2000,
+      },
+    },
   },
   typechain: {
     outDir: "typechain",
     target: "ethers-v5",
-    runOnCompile: true
+    runOnCompile: true,
   },
   gasReporter: {
-    enabled: true
+    enabled: true,
   },
   mocha: {
-    timeout: 2000000
-  }
+    timeout: 2000000,
+  },
 };
diff --git a/solidity/hardhat.config.ts b/solidity/hardhat.config.ts
@@ -44,7 +44,7 @@ const config: HardhatUserConfig = {
   solidity: {
     compilers: [
       {
-        version: "0.8.10",
+        version: "0.8.16",
         settings: {
           optimizer: {
             enabled: true,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`//SPDX-License-Identifier: Apache-2.0`
`2`		`-pragma solidity 0.8.10;`
	`2`	`+pragma solidity 0.8.16;`
`3`	`3`	`import "@openzeppelin/contracts/token/ERC20/ERC20.sol";`
`4`	`4`
`5`	`5`	`// A test ERC20 with a really bad method called steal which permissionlessly allows transfers from an account`
`@@ -17,10 +17,10 @@ contract VulnerableERC20 is ERC20 {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
`20`		- * Attepmts to transfer `amount` from `from` to `to`, bypassing the normal checks
	`20`	+ * Attepmts to transfer `amount` from `from` to `to`, bypassing the normal checks
`21`	`21`	`* essentially allowing anyone to steal funds from anyone else`
`22`		`- */`
`23`		`- function steal(address from, address to, uint256 amount) public {`
`24`		`- _transfer(from, to, amount);`
	`22`	`+ */`
	`23`	`+ function steal(address from, address to, uint256 amount) public {`
	`24`	`+ _transfer(from, to, amount);`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ const config: HardhatUserConfig = {`
`44`	`44`	`solidity: {`
`45`	`45`	`compilers: [`
`46`	`46`	`{`
`47`		`- version: "0.8.10",`
	`47`	`+ version: "0.8.16",`
`48`	`48`	`settings: {`
`49`	`49`	`optimizer: {`
`50`	`50`	`enabled: true,`