contract instead of library

stroomnetwork · Jul 8, 2024 · 694da6c · 694da6c
1 parent 78aae62
commit 694da6c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/BTCDepositAddressDeriver.sol b/src/BTCDepositAddressDeriver.sol
@@ -17,7 +17,7 @@ error CannotParseBtcAddress(
 
 // Types of Bitcoin Network
 
-contract BTCDepositAddressDeriver {
+contract BTCDepositAddressDeriver is Bech32m, Deriver {
 
     event SeedChanged(string btcAddr1, string btcAddr2, string hrp);
 

diff --git a/src/Bech32m.sol b/src/Bech32m.sol
@@ -7,7 +7,7 @@ pragma solidity ^0.8.24;
 
 error EncodingIsUnknown();
 
-library Bech32m {
+contract Bech32m {
 
     enum BechEncoding {
         // Used is SegWit v.0
@@ -617,7 +617,7 @@ library Bech32m {
 
     // Decode a segwit address
     function decodeSegwitAddress(
-        bytes calldata expectedHrp,
+        bytes memory expectedHrp,
         bytes calldata addr
     ) public pure returns (uint8, bytes memory, DecodeError) {
         (

diff --git a/src/Deriver.sol b/src/Deriver.sol
@@ -6,7 +6,7 @@ import {EllipticCurve} from "../lib/elliptic-curve-solidity/contracts/EllipticCu
 
 import {Bech32m} from "./Bech32m.sol";
 
-library Deriver {
+contract Deriver is Bech32m {
 
     // BEGIN SECP256k1 CONSTANTS
     uint256 public constant GX =