update contracts

upgrade deployer solc, node, modules

rm selfdestruct (EIP-6780)

redeploy to same address is no longer possible

integration/integration_test.go

@@ -391,7 +391,7 @@ var _ = Describe("Basic integration test", func() {
 			Expect(ipldCountA).To(Equal(slvCountA))
 		})
 
-		It("gets storage after destruction and redeploy", func() {
+		It("gets storage after destruction", func() {
 			slvContract, contractErr := integration.Create2Contract("SLVToken", contractSalt)
 			Expect(contractErr).ToNot(HaveOccurred())
 
@@ -431,21 +431,6 @@ var _ = Describe("Basic integration test", func() {
 			ipldStorage, err := ipldClient.StorageAt(ctx, slvContract.Address, countAIndex, big.NewInt(slvTx.BlockNumber))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(ipldStorage).To(Equal(gethStorage))
-
-			// Redeploy to same address
-			slvContract, contractErr = integration.Create2Contract("SLVToken", contractSalt)
-			Expect(contractErr).ToNot(HaveOccurred())
-
-			gethStorage, err = gethClient.StorageAt(ctx, slvContract.Address, countAIndex, big.NewInt(slvContract.BlockNumber))
-			Expect(err).ToNot(HaveOccurred())
-
-			ipldStorage, err = ipldClient.StorageAt(ctx, slvContract.Address, countAIndex, big.NewInt(slvContract.BlockNumber))
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(gethStorage).To(Equal(ipldStorage))
-			ipldCountA := new(big.Int).SetBytes(ipldStorage)
-			Expect(ipldCountA.String()).To(Equal("0"))
-
 		})
 	})
 

test/contract/Dockerfile

@@ -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 ./

test/contract/contracts/GLDToken.sol

@@ -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));
     }
 }

test/contract/contracts/SLVToken.sol

@@ -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))); */
     }
 }

test/contract/hardhat.config.js

@@ -28,7 +28,7 @@ if (process.env.DEPLOYER_PRIVATE_KEY) {
 
 module.exports = {
   solidity: {
-    version: "0.8.0",
+    version: "0.8.25",
     settings: {
       outputSelection: {
         '*': {

test/contract/package.json

@@ -11,9 +11,9 @@
   "license": "ISC",
   "description": "Solidity contract deployment server for integration testing",
   "dependencies": {
-    "@openzeppelin/contracts": "^4.0.0",
+    "@openzeppelin/contracts": "^5.0.2",
-    "fastify": "^4.0.0",
+    "fastify": "^4.26.2",
-    "hardhat": "^2.14.0",
+    "hardhat": "^2.22.3",
     "solidity-create2-deployer": "^0.4.0"
   },
   "devDependencies": {