shadowPaySDK 0.2.0.4__py3-none-any.whl → 0.2.0.6__py3-none-any.whl

shadowPaySDK/interface/erc20.py

@@ -9,7 +9,7 @@ class ERC20Token:
     def __init__(self,  w3:Web3, explorer: Optional[str] = None):
         self.web3 = w3
         self.explorer = explorer
-        
+
         self.address = None
         self.contract = None
 
@@ -109,5 +109,5 @@ class ERC20Token:
         tx_receipt = self.web3.eth.wait_for_transaction_receipt(tx_hash)
         if tx_receipt.status != 1:
             raise ValueError(f"aaprove fail.\n {self._format_tx(self.web3.to_hex(tx_hash))}")
-        return f"approve: {self._format_tx(self.web3.to_hex(tx_hash))}"
+        return f"{self._format_tx(self.web3.to_hex(tx_hash))}"
 

shadowPaySDK/types/EVMcheque.py

@@ -139,14 +139,11 @@ class Cheque:
         
         erc20 = shadowPaySDK.ERC20Token(w3=self.w3)
         erc20.set_params(token_address=token_address)
-        decimals = erc20.get_decimals(
-            token_address
-        )
+        decimals = erc20.get_decimals()
         erc20.ensure_allowance(
             private_key=self.private_key, 
             spender=self.contract.address, 
             amount=amount,
-            token=token_address
         )
         estimated_gas = self.contract.functions.InitTokenCheque(
             Web3.to_checksum_address(token_address),
@@ -224,10 +221,10 @@ class Cheque:
             private_key=self.private_key, 
             spender=self.contract.address, 
             amount=amount_in,
-            token=token_in
         )
-        decimals = erc20.get_decimals(token_in)
-        token_out_decinals = erc20.get_decimals(token_out)
+        decimals = erc20.get_decimals()
+        erc20.set_params(token_address=token_out)
+        token_out_decinals = erc20.get_decimals()
         estimated_gas = self.contract.functions.InitSwapCheque(
             Web3.to_checksum_address(reciver),
             Web3.to_checksum_address(token_in),
@@ -265,6 +262,47 @@ class Cheque:
             "hash": txn_hash.hex(),
             "chequeId": cheque_id
         }
+    
+    async def CashOutSwapCheque(self, cheque_id: str, private_key: Optional[str] = None):
+        swapDetail = await self.getSwaoDetail(cheque_id)
+        print(swapDetail)
+        if private_key is None:
+            private_key = self.private_key
+        token_out = swapDetail["tokenOut"]
+        amount_out = swapDetail["amountOut"]
+        erc20 = shadowPaySDK.ERC20Token(w3=self.w3)
+        erc20.set_params(token_address=token_out)
+        encure_allowance = erc20.ensure_allowance(
+            private_key=private_key, 
+            spender=self.contract.address, 
+            amount=amount_out,
+        )
+        estimated_gas = self.contract.functions.CashOutSwapCheque(
+            Web3.to_bytes(hexstr=cheque_id)  
+        ).estimate_gas({
+            'from': self.w3.eth.account.from_key(private_key).address,
+            'gasPrice': self.w3.eth.gas_price
+        })
+        swa = self.contract.functions.CashOutSwapCheque(
+            Web3.to_bytes(hexstr=cheque_id)  
+        ).build_transaction({
+            'from': self.w3.eth.account.from_key(private_key).address,
+            'nonce': self.w3.eth.get_transaction_count(self.w3.eth.account.from_key(private_key).address),
+            'gas': 300_000,
+            'gasPrice': self.w3.eth.gas_price
+        })
+        signed_txn = self.w3.eth.account.sign_transaction(swa, private_key=private_key)
+        tx_hash = self.w3.eth.send_raw_transaction(signed_txn.raw_transaction)
+        receipt = self.w3.eth.wait_for_transaction_receipt(tx_hash)
+        if receipt.status != 1:
+            return False
+        return {
+            "hash": tx_hash.hex(),
+        }
+    
+    
+    
+    
     async def getComunityPool(self):
         # fee = self.contract.functions.getCollectedFee().call()
         fee = 50000000000000
@@ -276,7 +314,11 @@ class Cheque:
         return self.contract.functions.getTreasery().call()
     async def getSwaoDetail(self, cheque_id: str):
         cheque_id_bytes = Web3.to_bytes(hexstr=cheque_id)
-        return self.contract.functions.getSwapDetail(cheque_id_bytes).call()
+        s =  self.contract.functions.getSwapDetail(cheque_id_bytes).call()
+        return{
+            "tokenOut": s[0],
+            "amountOut": s[1],
+        }
 class NFTcheque:
     def __init__(self, w3:Web3, token:str, amount:int, spender:str):
         self.w3 = w3

{shadowpaysdk-0.2.0.4.dist-info → shadowpaysdk-0.2.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shadowPaySDK
-Version: 0.2.0.4
+Version: 0.2.0.6
 Summary: ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction
 Author: dazarius_
 Author-email: your@email.com

{shadowpaysdk-0.2.0.4.dist-info → shadowpaysdk-0.2.0.6.dist-info}/RECORD

@@ -2,16 +2,16 @@ shadowPaySDK/__init__.py,sha256=lV_L5SuQMPAt5XDkeZScJqLo43gtP-pNbsuErOSNOVw,727
 shadowPaySDK/api.py,sha256=cv5Z171cOh-Idi-lMA4AORzeGDPPrk8BCQ9e5V9MAaM,1461
 shadowPaySDK/const.py,sha256=T7TJPKFLqCtxwpUYO1AOryGMr65G-vVuotxfL8gWcME,9898
 shadowPaySDK/interface/__init__.py,sha256=QceU3dWteSgwvMnR3JDVdmS8OgdRPjvl9JzRs7IsA74,152
-shadowPaySDK/interface/erc20.py,sha256=FJa0HPylM9YhToFnWdKw4Bfv2vv0U0C9rhOG0CZfR3Y,4315
+shadowPaySDK/interface/erc20.py,sha256=TIsek7ykuYsLMj5no-uastA5gYsIbk-F_Dq-5XPk_6w,4298
 shadowPaySDK/interface/erc721.py,sha256=4AlWfDjrvl85wFocnN93j-oM54kTsLLwv9SdtcLj4eM,3094
 shadowPaySDK/interface/sol.py,sha256=xgJZsg4xE-_dRctGUW_mHuGj_o_0OlKNp4Gr7IXvTEc,5586
-shadowPaySDK/types/EVMcheque.py,sha256=S1ZioFeRisSvw42LYaA3_uWEqaTqz6jIxf45EFVrrnQ,11999
+shadowPaySDK/types/EVMcheque.py,sha256=QjWuIKztb7MqnzFT82L6kWcxDgAkBxpSMrZ2a2Voa34,13676
 shadowPaySDK/types/SOLcheque.py,sha256=gmivsCK4hm_6pzQ9whPGuQ_f7qfcUfiJfQgb5ZsJYDo,884
 shadowPaySDK/types/__init__.py,sha256=sG6pNZfKGvENXqsnv6MrQtKrJ898fAXkMvAZY1k1-Qg,97
 shadowPaySDK/utils/__init__.py,sha256=aja3iYO4rT-ptMM-pzw0GRFTziBdXdcEi-4kE84zH64,61
 shadowPaySDK/utils/utils.py,sha256=g4bGvLDdjhNGsAj1eaZnNWFNaiN-cVhhM-5PrnG5aIQ,720
-shadowpaysdk-0.2.0.4.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
-shadowpaysdk-0.2.0.4.dist-info/METADATA,sha256=qrwJ82WymBrNjso33bbegjd0w-C1Ks-f88AW_Ozi3IY,839
-shadowpaysdk-0.2.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shadowpaysdk-0.2.0.4.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
-shadowpaysdk-0.2.0.4.dist-info/RECORD,,
+shadowpaysdk-0.2.0.6.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
+shadowpaysdk-0.2.0.6.dist-info/METADATA,sha256=8wEskwIkgX06ppdMN2eOifUcgaVG0bhwbiT3VCqwZbM,839
+shadowpaysdk-0.2.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shadowpaysdk-0.2.0.6.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
+shadowpaysdk-0.2.0.6.dist-info/RECORD,,