refactor

stroomnetwork · Jun 20, 2024 · 0b68d38 · 0b68d38
1 parent 436e2fe
commit 0b68d38
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/src/AddressReaderWriter.sol → script/AddressReaderWriter.s.sol b/src/AddressReaderWriter.sol → script/AddressReaderWriter.s.sol
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -7,7 +7,7 @@ import {console} from "forge-std/console.sol";
 import {BTCDepositAddressDeriver} from "../src/BTCDepositAddressDeriver.sol";
 import {Tools} from "../src/Tools.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-import {AddressReaderWriter} from "../src/AddressReaderWriter.sol";
+import {AddressReaderWriter} from "./AddressReaderWriter.s.sol";
 
 contract Deploy is Script, AddressReaderWriter {
     function run() external returns (BTCDepositAddressDeriver) {

diff --git a/script/GetBtcAddr.s.sol b/script/GetBtcAddr.s.sol
@@ -6,7 +6,7 @@ import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
 import {BTCDepositAddressDeriver} from "../src/BTCDepositAddressDeriver.sol";
 import {Tools} from "../src/Tools.sol";
-import {AddressReaderWriter} from "../src/AddressReaderWriter.sol";
+import {AddressReaderWriter} from "./AddressReaderWriter.s.sol";
 
 contract GetBtcAddr is Script, AddressReaderWriter {
     function run() external {

diff --git a/script/SetSeed.s.sol b/script/SetSeed.s.sol
@@ -7,7 +7,7 @@ import {console} from "forge-std/console.sol";
 import {BTCDepositAddressDeriver} from "../src/BTCDepositAddressDeriver.sol";
 import {Tools} from "../src/Tools.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-import {AddressReaderWriter} from "../src/AddressReaderWriter.sol";
+import {AddressReaderWriter} from "./AddressReaderWriter.s.sol";
 import {console} from "forge-std/console.sol";
 
 contract SetSeed is Script, AddressReaderWriter {
@@ -45,7 +45,6 @@ contract SetSeed is Script, AddressReaderWriter {
         BTCDepositAddressDeriver deriver = BTCDepositAddressDeriver(
             contractAddress
         );
-        console.log("deriver", address(deriver));
 
         // set validators' pubkeys and network prefix
         vm.startBroadcast();

diff --git a/src/Bech32m.sol b/src/Bech32m.sol
@@ -2,7 +2,7 @@
 // https://github.com/gregdhill/bech32-sol/blob/master/src/Bech32.sol
 // based on https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki
 // https://github.com/sipa/bech32/blob/master/ref/python/segwit_addr.py
-pragma solidity ^0.8.18;
+pragma solidity ^0.8.25;
 
 error EncodingIsUnknown();
 

diff --git a/src/Deriver.sol b/src/Deriver.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.18;
+pragma solidity ^0.8.25;
 
 import {EllipticCurve} from "../lib/elliptic-curve-solidity/contracts/EllipticCurve.sol";