forked from cerc-io/ipld-eth-server
Geth 1.13 (Deneb/Cancun) update (#264)
Most notable changes are the updates to the test contracts: due to https://eips.ethereum.org/EIPS/eip-6780, SELFDESTRUCT no longer destroys a contract (unless it occurs in the creating transaction), so CREATE2 can no longer redeploy contracts to the same address. Reviewed-on: cerc-io/ipld-eth-server#264
This commit is contained in:
1 parent
671868aac6
commit
688b5c817a
32 files changed
+2111
-2960
No files matched your search
@@ -1,5 +1,5 @@
|
||||
# Downgrade from 18.16, see https://github.com/NomicFoundation/hardhat/issues/3877
|
||||
FROM node:18.15-slim
|
||||
FROM node:20-slim
|
||||
|
||||
WORKDIR /usr/src/app
|
||||
COPY package*.json ./
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
pragma solidity ^0.8.0;
|
||||
pragma solidity ^0.8.25;
|
||||
|
||||
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
|
||||
|
||||
contract GLDToken is ERC20 {
|
||||
constructor() ERC20("Gold", "GLD") {
|
||||
_mint(msg.sender, 1000000000000000000000);
|
||||
}
|
||||
|
||||
function destroy() public {
|
||||
selfdestruct(payable(msg.sender));
|
||||
(bool ok, ) = payable(msg.sender).call{value: address(this).balance}("");
|
||||
require(ok, "ETH transfer failed");
|
||||
|
||||
_burn(msg.sender, balanceOf(msg.sender));
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0
|
||||
pragma solidity ^0.8.0;
|
||||
pragma solidity ^0.8.25;
|
||||
|
||||
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
|
||||
|
||||
@@ -7,7 +7,9 @@ contract SLVToken is ERC20 {
|
||||
uint256 private countA;
|
||||
uint256 private countB;
|
||||
|
||||
constructor() ERC20("Silver", "SLV") {}
|
||||
constructor() ERC20("Silver", "SLV") {
|
||||
/* _mint(address(this), 1); */
|
||||
}
|
||||
|
||||
function incrementCountA() public {
|
||||
countA = countA + 1;
|
||||
@@ -20,6 +22,9 @@ contract SLVToken is ERC20 {
|
||||
receive() external payable {}
|
||||
|
||||
function destroy() public {
|
||||
selfdestruct(payable(msg.sender));
|
||||
(bool ok, ) = payable(msg.sender).call{value: address(this).balance}("");
|
||||
require(ok, "ETH transfer failed");
|
||||
|
||||
/* _burn(address(this), balanceOf(address(this))); */
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@ if (process.env.DEPLOYER_PRIVATE_KEY) {
|
||||
|
||||
module.exports = {
|
||||
solidity: {
|
||||
version: "0.8.0",
|
||||
version: "0.8.25",
|
||||
settings: {
|
||||
outputSelection: {
|
||||
'*': {
|
||||
|
||||
Generated
+989
-1123
File diff suppressed because it is too large.
Load diff
@@ -11,9 +11,9 @@
|
||||
"license": "ISC",
|
||||
"description": "Solidity contract deployment server for integration testing",
|
||||
"dependencies": {
|
||||
"@openzeppelin/contracts": "^4.0.0",
|
||||
"fastify": "^4.0.0",
|
||||
"hardhat": "^2.14.0",
|
||||
"@openzeppelin/contracts": "^5.0.2",
|
||||
"fastify": "^4.26.2",
|
||||
"hardhat": "^2.22.3",
|
||||
"solidity-create2-deployer": "^0.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
Reference in new issue
Block a user