add changes and deploy new sepolia

ethersphere · Oct 30, 2023 · 7c041e3 · 7c041e3
1 parent 4debb0b
commit 7c041e3
Show file tree

Hide file tree

Showing 27 changed files with 131 additions and 27 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.solhint.json b/.solhint.json
diff --git a/.solhintignore b/.solhintignore
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile.abigen b/Dockerfile.abigen
diff --git a/README.md b/README.md
@@ -58,11 +58,10 @@ Swap is deployed on the following networks:
 
 Swap is deployed on the following testnets:
 
-| Network         | Factory                                                                                                                       | Token                                                                                                                         |
-| --------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| Sepolia         | [0x9B3C8D7f0994A336B71b5d35FC0Cff8AEC95DEDA](https://sepolia.etherscan.io/address/0x9B3C8D7f0994A336B71b5d35FC0Cff8AEC95DEDA) | [0xa66be4A7De4DfA5478Cb2308469D90115C45aA23](https://sepolia.etherscan.io/address/0xa66be4A7De4DfA5478Cb2308469D90115C45aA23) |
-| Goerli          | [0x73c412512E1cA0be3b89b77aB3466dA6A1B9d273](https://goerli.etherscan.io/address/0x73c412512E1cA0be3b89b77aB3466dA6A1B9d273)  | [0x2aC3c1d3e24b45c6C310534Bc2Dd84B5ed576335](https://goerli.etherscan.io/address/0x2aC3c1d3e24b45c6C310534Bc2Dd84B5ed576335)  |
-| Goerli (Legacy) | [0xf0277caffea72734853b834afc9892461ea18474](https://goerli.etherscan.io/address/0xf0277caffea72734853b834afc9892461ea18474)  | [0x2aC3c1d3e24b45c6C310534Bc2Dd84B5ed576335](https://goerli.etherscan.io/address/0x2aC3c1d3e24b45c6C310534Bc2Dd84B5ed576335)  |
+| Network | Factory                                                                                                                       | Token                                                                                                                         |
+| ------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| Sepolia | [0x989F4d301d7333249362B2484BeE0D501AB01DCa](https://sepolia.etherscan.io/address/0x989F4d301d7333249362B2484BeE0D501AB01DCa) | [0x543dDb01Ba47acB11de34891cD86B675F04840db](https://sepolia.etherscan.io/address/0x543dDb01Ba47acB11de34891cD86B675F04840db) |
+| Goerli  | [0x73c412512E1cA0be3b89b77aB3466dA6A1B9d273](https://goerli.etherscan.io/address/0x73c412512E1cA0be3b89b77aB3466dA6A1B9d273)  | [0x2aC3c1d3e24b45c6C310534Bc2Dd84B5ed576335](https://goerli.etherscan.io/address/0x2aC3c1d3e24b45c6C310534Bc2Dd84B5ed576335)  |
 
 ## Overview
 
@@ -122,3 +121,9 @@ For signing purposes the chequebook uses EIP-712 Ethereum typed structured data
 ## Swear and Swindle
 
 `Swear` and `Swindle` are the contracts for the trial system of sw3. You can find them in the `experimental` branch.
+
+## Releasing
+
+To release a new stable version, tag the commit without the `-rcX` suffix.
+For example, to release `v0.4.0`, execute the following command: `git tag v0.4.0 && git push origin v0.4.0`.
+This will generate Golang source code for the smart contracts and publish it to the [`ethersphere/go-sw3-abi/`](https://github.com/ethersphere/go-sw3-abi/) repository.
diff --git a/abigen/code.go.js b/abigen/code.go.js
diff --git a/contracts/ERC20SimpleSwap.sol b/contracts/ERC20SimpleSwap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity =0.8.10;
+pragma solidity =0.8.19;
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

diff --git a/contracts/SimpleSwapFactory.sol b/contracts/SimpleSwapFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity =0.8.10;
+pragma solidity =0.8.19;
 import "./ERC20SimpleSwap.sol";
 import "@openzeppelin/contracts/proxy/Clones.sol";
 

diff --git a/contracts/TestToken.sol b/contracts/TestToken.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity =0.8.10;
+pragma solidity =0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
 

diff --git a/deploy/000_deploy.js b/deploy/000_deploy.js
@@ -9,7 +9,8 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
   const waitBlockConfirmations = network.name != "testnet" ? 1 : 6;
 
   log("----------------------------------------------------");
-  const arguments = ["0xa66be4A7De4DfA5478Cb2308469D90115C45aA23"];
+  // sBZZ token address
+  const arguments = ["0x543dDb01Ba47acB11de34891cD86B675F04840db"];
   const factory = await deploy("SimpleSwapFactory", {
     from: deployer,
     args: arguments,
@@ -26,4 +27,4 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
   }
 };
 
-module.exports.tags = ["all", "factory"];
+module.exports.tags = ["factory"];
diff --git a/deployments/testnet/.chainId b/deployments/testnet/.chainId
diff --git a/deployments/testnet/SimpleSwapFactory.json b/deployments/testnet/SimpleSwapFactory.json
diff --git a/deployments/testnet/solcInputs/91f5cbb4dd7fedf177ab9b96b0007658.json b/deployments/testnet/solcInputs/91f5cbb4dd7fedf177ab9b96b0007658.json
diff --git a/deployments/testnet/solcInputs/f656f862769d0cd3f7cb268b1e93df89.json b/deployments/testnet/solcInputs/f656f862769d0cd3f7cb268b1e93df89.json
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -28,7 +28,7 @@ const accounts =
 module.exports = {
   defaultNetwork: "hardhat",
   solidity: {
-    version: "0.8.10",
+    version: "0.8.19",
     settings: {
       optimizer: {
         enabled: true,
@@ -44,7 +44,7 @@ module.exports = {
     testnet: {
       url: PRIVATE_RPC_TESTNET
         ? PRIVATE_RPC_TESTNET
-        : "https://rpc2.sepolia.org",
+        : "https://1rpc.io/sepolia",
       accounts,
       chainId: 11155111,
     },

diff --git a/package.json b/package.json
diff --git a/test/ERC20SimpleSwap.behavior.js b/test/ERC20SimpleSwap.behavior.js
diff --git a/test/ERC20SimpleSwap.should.js b/test/ERC20SimpleSwap.should.js
diff --git a/test/ERC20SimpleSwap.test.js b/test/ERC20SimpleSwap.test.js
diff --git a/test/SimpleSwapFactory.test.js b/test/SimpleSwapFactory.test.js
diff --git a/test/swutils.js b/test/swutils.js
diff --git a/test/testutils.js b/test/testutils.js
diff --git a/utils/verify.js b/utils/verify.js