Skip to content

Commit

Permalink
Merge branch 'master' into feat/add-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
szhygulin authored Jun 20, 2024
2 parents d811ae5 + 7425822 commit 89429a9
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 7 deletions.
2 changes: 2 additions & 0 deletions script/AddressReaderWriter.s.sol
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.25;

import {Script} from "forge-std/Script.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/Deploy.s.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-LICENSE-IDENTIFIER: MIT
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.25;

Expand Down
1 change: 1 addition & 0 deletions src/Bech32m.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +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.25;

error EncodingIsUnknown();
Expand Down
3 changes: 2 additions & 1 deletion src/Deriver.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.25;

import {EllipticCurve} from "../lib/elliptic-curve-solidity/contracts/EllipticCurve.sol";
Expand Down
2 changes: 2 additions & 0 deletions src/Tools.sol
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.25;

import {Script} from "forge-std/Script.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/BTCDepositAddressDeriver.t.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.19;
pragma solidity ^0.8.25;

import {console} from "forge-std/console.sol";
import {Test} from "forge-std/Test.sol";
Expand Down
5 changes: 3 additions & 2 deletions test/Bech32m.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Solidity Version: ^0.8.13
pragma solidity ^0.8.19;
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.25;

import {Test, console} from "forge-std/Test.sol";
import {Bech32m} from "../src/Bech32m.sol";
Expand Down
5 changes: 3 additions & 2 deletions test/Deriver.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.13;
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.25;

import {Test, console} from "forge-std/Test.sol";
import {Deriver} from "../src/Deriver.sol";
Expand Down

0 comments on commit 89429a9

Please sign in to comment.