Remove metasv provider

Signed-off-by: aaron67 <[email protected]>

Author: gitzhou

README.md

@@ -12,7 +12,7 @@ A Bitcoin SV (BSV) Python Library that is extremely simple to use but more.
 - P2PKH, P2PK, and bare-multisig supported
 - All the SIGHASH flags supported
 - Additional script types can be customized
-- [MetaSV](https://metasv.com/) and [WhatsOnChain](https://developers.whatsonchain.com/) API integrated
+- [WhatsOnChain](https://developers.whatsonchain.com/) API integrated
 - Ability to adapt to different service providers
 - Fully ECDSA implementation
 - ECDH and Electrum ECIES (aka BIE1) implementation

bsvlib/constants.py

@@ -1,6 +1,6 @@
 import os
 from enum import Enum
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 TRANSACTION_SEQUENCE: int = int(os.getenv('BSVLIB_TRANSACTION_SEQUENCE') or 0xffffffff)
 TRANSACTION_VERSION: int = int(os.getenv('BSVLIB_TRANSACTION_VERSION') or 1)
@@ -11,7 +11,6 @@
 THREAD_POOL_MAX_EXECUTORS: int = int(os.getenv('BSVLIB_THREAD_POOL_MAX_EXECUTORS') or 10)
 BIP39_ENTROPY_BIT_LENGTH: int = int(os.getenv('BSVLIB_BIP39_ENTROPY_BIT_LENGTH') or 128)
 BIP44_DERIVATION_PATH = os.getenv('BSVLIB_BIP44_DERIVATION_PATH') or "m/44'/236'/0'"
-METASV_TOKEN: Optional[str] = os.getenv('BSVLIB_METASV_TOKEN') or os.getenv('METASV_TOKEN')
 
 
 class Chain(str, Enum):

bsvlib/service/__init__.py

@@ -1,4 +1,3 @@
-from .metasv import MetaSV
 from .provider import Provider, BroadcastResult
 from .service import Service
 from .whatsonchain import WhatsOnChain

bsvlib/service/metasv.py

@@ -1,9 +1,8 @@
 from typing import List, Dict, Optional
 
-from .metasv import MetaSV
 from .provider import Provider, BroadcastResult
 from .whatsonchain import WhatsOnChain
-from ..constants import Chain, METASV_TOKEN
+from ..constants import Chain
 
 
 class Service:
@@ -13,7 +12,7 @@ def __init__(self, chain: Optional[Chain] = None, provider: Optional[Provider] =
             self.provider = provider
         else:
             chain = chain or Chain.MAIN
-            self.provider = MetaSV(token=METASV_TOKEN) if chain == Chain.MAIN and METASV_TOKEN else WhatsOnChain(chain)
+            self.provider = WhatsOnChain(chain)
         self.chain = self.provider.chain
 
     def get_unspents(self, **kwargs) -> List[Dict]:

bsvlib/service/service.py

@@ -3,7 +3,6 @@
 import requests
 
 from bsvlib import Transaction, Key, Unspent
-from bsvlib.service import MetaSV
 
 MIN_CONSOLIDATION_INPUTS = 100
 MERGE_COUNT = 3000
@@ -13,11 +12,11 @@
 
 
 def get_block_height() -> int:
-    return requests.get('https://apiv2.metasv.com/block/info').json()['blocks']
+    return requests.get('https://api.whatsonchain.com/v1/bsv/main/chain/info').json()['blocks']
 
 
 def pick_confirmed(wif):
-    unspents = Unspent.get_unspents(provider=MetaSV(), private_keys=[Key(wif)])
+    unspents = Unspent.get_unspents(private_keys=[Key(wif)])
     print(f'total {len(unspents)}')
     current_height = get_block_height()
     picked = []

examples/merge_unspents.py

@@ -1,6 +1,5 @@
 from bsvlib.constants import Chain
 from bsvlib.keys import Key
-from bsvlib.script.type import P2pkScriptType
 from bsvlib.service.whatsonchain import WhatsOnChain
 from bsvlib.wallet import Wallet
 
@@ -45,12 +44,4 @@ def test():
     w2.get_unspents(refresh=True)
     assert w2.get_balance() == w2.get_balance(refresh=True)
 
-    has_p2pk = False
-    for unspent in w2.get_unspents():
-        if unspent.script_type == P2pkScriptType():
-            has_p2pk = True
-            break
-    if has_p2pk:
-        assert w1.get_balance() < w2.get_balance()
-    else:
-        assert w1.get_balance() == w2.get_balance()
+    assert w1.get_balance() == w2.get_balance()