web3-wizzard-lib 1.8.0__py3-none-any.whl → 1.9.1__py3-none-any.whl

web3_wizzard_lib/core/contract/compound_v3.py

@@ -1,4 +1,5 @@
 from sybil_engine.contract.contract import Contract
+from sybil_engine.contract.transaction_executor import evm_transaction
 from sybil_engine.utils.file_loader import load_abi
 
 abi = load_abi("resources/abi/compound_v3.json")
@@ -8,6 +9,18 @@ class CompoundV3Contract(Contract):
     def __init__(self, contract_address, web3):
         super().__init__(contract_address, web3, abi)
 
+    def borrow_balance_of(self, account):
+        return self.contract.functions.borrowBalanceOf(account.address).call()
+
+    @evm_transaction
+    def supply(self, account, amount, token_address):
+        txn_params = self.build_generic_data(account.address, set_contract_address=False)
+
+        return self.contract.functions.supply(
+            token_address,
+            amount
+        ).build_transaction(txn_params)
+
     def user_collateral(self, account, token_address):
         return self.contract.functions.userCollateral(
             account.address,

web3_wizzard_lib/core/contract/compund_v3_bulker.py

@@ -1,3 +1,5 @@
+from loguru import logger
+
 from sybil_engine.contract.contract import Contract
 from sybil_engine.contract.transaction_executor import evm_transaction
 from sybil_engine.utils.file_loader import load_abi
@@ -15,11 +17,14 @@ class CompoundV3BulkerContract(Contract):
         hex_amount = decimal_to_padded_hexadecimal(amount, 32)
         data = f'0x000000000000000000000000b2f97c1bd3bf02f5e74d13f02e3e26f93d77ce44000000000000000000000000ef0f48dadd0abe4f99b4c14862df303ba956bd1300000000000000000000000000000000{hex_amount}'
 
-        return self.contract.functions.invoke(
+        txn = self.contract.functions.invoke(
             [hex_to_bytes(actions)],
             [hex_to_bytes(data)]
-        ).build_transaction(self.build_generic_data(account.address, False))
+        )
+
+        contract_txn = txn.build_transaction(self.build_generic_data(account.address, False))
 
+        return contract_txn
 
 def hex_to_bytes(hex_string):
     """

web3_wizzard_lib/core/modules/bank/bank.py

@@ -5,6 +5,9 @@ class Bank:
     def borrow(self, account, amount):
         pass
 
+    def get_repay_borrow_amount(self, account):
+        pass
+
     def repay_borrow(self, account, amount):
         pass
 

web3_wizzard_lib/core/modules/bank/cog_bank.py

@@ -1,5 +1,4 @@
 from sybil_engine.data.contracts import get_contracts_for_chain
-from sybil_engine.data.networks import get_ids_chain
 from sybil_engine.utils.utils import ConfigurationException
 
 from web3_wizzard_lib.core.contract.cog_erc20 import CogErc20Contract
@@ -11,8 +10,8 @@ class Cog(Bank):
     supported_chains = ['SCROLL']
 
     def __init__(self, chain, web3):
-        contract_address = get_contracts_for_chain(chain)[self.app_name]
-        self.contract = CogErc20Contract(contract_address, web3)
+        self.contract_address = get_contracts_for_chain(chain)[self.app_name]
+        self.contract = CogErc20Contract(self.contract_address, web3)
 
     def supply(self, account, amount):
         raise ConfigurationException("Only redeem supported for Compound V3")
@@ -21,6 +20,4 @@ class Cog(Bank):
         self.contract.redeem(account, amount)
 
     def get_deposit_amount(self, account, token):
-        cog_usdc_token = get_contracts_for_chain(get_ids_chain()[self.contract.web3.eth.chain_id])['COG_USDC']
-
-        return CogErc20Contract(cog_usdc_token, self.contract.web3).balance_of(account)
+        return self.contract.balance_of(account)

web3_wizzard_lib/core/modules/bank/compound_v3.py

@@ -1,6 +1,7 @@
 from sybil_engine.data.contracts import get_contracts_for_chain
 from sybil_engine.data.networks import get_ids_chain
 from sybil_engine.data.tokens import get_tokens_for_chain
+from sybil_engine.domain.balance.tokens import Erc20Token
 from sybil_engine.utils.utils import ConfigurationException
 
 from web3_wizzard_lib.core.contract.compound_v3 import CompoundV3Contract
@@ -21,8 +22,20 @@ class CompoundV3(Bank):
     def supply(self, account, amount):
         raise ConfigurationException("Only redeem supported for Compound V3")
 
+    def get_repay_borrow_amount(self, account):
+        return self.contract.borrow_balance_of(account)
+
+    def repay_borrow(self, account, amount):
+        erc20_token = Erc20Token(self.contract.chain_instance['chain'], "USDC", self.contract.web3)
+
+        if erc20_token.allowance(account, self.contract.contract_address) < 100:
+            erc20_token.approve(account, self.contract.contract_address)
+
+        return self.contract.supply(account, amount, erc20_token.erc20_contract.contract_address)
+
     def redeem(self, account, amount, token):
-        self.contract_bulker.invoke(account, amount)
+        actions = '0x414354494f4e5f57495448445241575f4e41544956455f544f4b454e00000000'
+        self.contract_bulker.invoke(account, amount, actions)
 
     def get_deposit_amount(self, account, token):
         token_address = get_tokens_for_chain(get_ids_chain()[self.contract.web3.eth.chain_id])[token]

web3_wizzard_lib/core/modules/bank_module.py

@@ -49,7 +49,13 @@ class Banking(Module):
         elif action == 'BORROW':
             bank_app.borrow(account, amount)
         elif action == 'REPAY':
-            bank_app.repay_borrow(account, amount)
+            amount = bank_app.get_repay_borrow_amount(account)
+
+            if amount > 0:
+                logger.info(f"Repay {amount} {token} in {bank_app.app_name}")
+                bank_app.repay_borrow(account, amount)
+            else:
+                logger.info(f"{token} borrow balance is 0")
         elif action == 'REDEEM':
             amount = bank_app.get_deposit_amount(account, token)
 
@@ -57,7 +63,7 @@ class Banking(Module):
                 logger.info(f"Redeem {amount} of {token} from {bank_app.app_name}")
                 bank_app.redeem(account, amount, token)
             else:
-                logger.info(f"{account.address} does not have {token}")
+                logger.info(f"{token} balance is 0")
         else:
             raise ConfigurationException("Unsupported action")
 

{web3_wizzard_lib-1.8.0.dist-info → web3_wizzard_lib-1.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: web3-wizzard-lib
-Version: 1.8.0
+Version: 1.9.1
 Summary: Engine for web3 smart contracts automatization.
 Author-email: Indeoo <indeooars@gmail.com>
 License: MIT

{web3_wizzard_lib-1.8.0.dist-info → web3_wizzard_lib-1.9.1.dist-info}/RECORD

@@ -10,8 +10,8 @@ web3_wizzard_lib/core/contract/basiliskcontract.py,sha256=-r8nvZnLu9C5Y-CF_2NLyd
 web3_wizzard_lib/core/contract/bilinear_contract.py,sha256=pCTkNQa4I1TqIAn_J6WgBWi8KF-iaBqJfSDI72CH2bw,729
 web3_wizzard_lib/core/contract/bungee.py,sha256=vkuZmLhtdqvGOTkVe7MnIHsDGHUtm8zdqD-YYxVfkQ8,891
 web3_wizzard_lib/core/contract/cog_erc20.py,sha256=wkfKC7bqBHpgZGL5xZ4737pMaD5m8oEw0huw36ssX1M,1674
-web3_wizzard_lib/core/contract/compound_v3.py,sha256=azu1MaC6wn90elY5FY0MsBSG4ZQ1qvfXdgWkuv853xI,480
-web3_wizzard_lib/core/contract/compund_v3_bulker.py,sha256=HLfBLIgJ3zCDW64XGyq18uVCcVACMQenB6BAl2cR020,1408
+web3_wizzard_lib/core/contract/compound_v3.py,sha256=ehsO6o53Av5s1dUknxj_6X4FBP4eNtZ_ZVMtvBzfTus,973
+web3_wizzard_lib/core/contract/compund_v3_bulker.py,sha256=88yUywma_Njzjm3B9U0p59UZYZtRRMP3Fii9Evb62M0,1490
 web3_wizzard_lib/core/contract/coredao_contract.py,sha256=-M7gBYtVCxHLtoPfhNOwUaC9gHWuZMbd_xAbt7N66Tc,1035
 web3_wizzard_lib/core/contract/coredao_from_contract.py,sha256=cvQlLGjuri-1lhNKtnKJ79MDFcp_wXRFWlJRORt4ZEA,1221
 web3_wizzard_lib/core/contract/dmail_send_mail.py,sha256=_MVsSvrG17uMQTXNogrfxxKBeBsO8gq6zhaVc5w2AjQ,627
@@ -92,7 +92,7 @@ web3_wizzard_lib/core/contract/zks.py,sha256=QN9dKfWfA4cFKxzA8qcMnNBcdKmBmZMPeNq
 web3_wizzard_lib/core/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web3_wizzard_lib/core/modules/ads_import_proxy.py,sha256=6i_ZJ400Wg1_CLVqnhVHgRoJsjEYyOpMDUDNwtd2wIQ,1809
 web3_wizzard_lib/core/modules/airdrop_printer.py,sha256=k1w1m8WAS9MnQ7LkKaYlx5xgi10pf12lcGJ0SrVA1OE,2862
-web3_wizzard_lib/core/modules/bank_module.py,sha256=zew_umtpVPZsL4kUI_wft4jdKQQ1p2Hh0YBXkEa5Qc8,3997
+web3_wizzard_lib/core/modules/bank_module.py,sha256=UFwHoN1ncsWywzoxTiBnFDi9_mmjwPGST2VtD02L6dk,4229
 web3_wizzard_lib/core/modules/bridge_module.py,sha256=ZoO80ody9cP_ezhah680ezTAEdM2VyxRqmmUH7b2xHE,2011
 web3_wizzard_lib/core/modules/bungee.py,sha256=CVjZH5_nmBWO5Vg5Xx-_dDzfaJ7oCDgFp0gG8VHd76E,4881
 web3_wizzard_lib/core/modules/cex_sender.py,sha256=2akfVhaMvHnuKUBfiCTqnVuP3VWrJIStArBqQKpiU2I,2723
@@ -127,10 +127,10 @@ web3_wizzard_lib/core/modules/wrapping.py,sha256=mlk5id2_rpsIJ-j90LdjfyS1Qc407v5
 web3_wizzard_lib/core/modules/zkdx.py,sha256=ao3JHla_iRv0r9cmUj0QVq8yw9q2kiqWIv5COt6z5Iw,2310
 web3_wizzard_lib/core/modules/bank/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web3_wizzard_lib/core/modules/bank/aave.py,sha256=q8dR64TviR5o8NzJJXIgbWkLqPxin93WrSTHb2TPIyU,874
-web3_wizzard_lib/core/modules/bank/bank.py,sha256=t2CigGNE_rDMW8Z7pK_YvEit3h977TiDHYYrYaHl7T8,300
+web3_wizzard_lib/core/modules/bank/bank.py,sha256=LNz1C720_dG2gih2w4nG5dtRL-q43_yep5mv1Okc2qw,362
 web3_wizzard_lib/core/modules/bank/basilisk.py,sha256=IsfylmROKyqssosF-ouCA_vkm5kVIRIM3L9Uam461gM,909
-web3_wizzard_lib/core/modules/bank/cog_bank.py,sha256=g3NKYZLSOYqDNFM1_rBx6a4IfkvxH0CYc-WxPqCsDtU,1022
-web3_wizzard_lib/core/modules/bank/compound_v3.py,sha256=WdmrNZpmB2jjo9a08jWiyvpBhtCyi257Y_iUfqa5VOg,1546
+web3_wizzard_lib/core/modules/bank/cog_bank.py,sha256=v12iY78EESqJmZX3dJghU9HulkrK9G6T2H7tDOm3q0o,828
+web3_wizzard_lib/core/modules/bank/compound_v3.py,sha256=57-1JNfg76TyKOIjaF7X65e15mOBsfnI5JzYTlz0oVc,2205
 web3_wizzard_lib/core/modules/bank/eralend.py,sha256=2aVH4KMYCBwTYSslaULF0t_pQQwq9YBNOVV1_ailXS4,887
 web3_wizzard_lib/core/modules/bank/layerbank.py,sha256=btJr2GA8MY7R9jLoppTLddbtgHATKIck6sbhCeKUl_I,4547
 web3_wizzard_lib/core/modules/bank/mendi_finance.py,sha256=GAaTMop6tyxBe3HvsFxChNM4mNFk9vLzec5BpN0RcK0,1958
@@ -371,7 +371,7 @@ web3_wizzard_lib/resources/main/pairs.json,sha256=uvIFvY46Ctiw8hjGd9e-1WE0qLf_du
 web3_wizzard_lib/resources/main/tokens.json,sha256=AoZz_I6AVoZuecNdyX5L-SnGm6TREuPrsYd2i9PJr7U,5707
 web3_wizzard_lib/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web3_wizzard_lib/utils/debank_utils.py,sha256=CE2SUN9RpFK_j9KjJgxf7a__VRJ75tLIw9tLrVNrn3c,484
-web3_wizzard_lib-1.8.0.dist-info/METADATA,sha256=ot9UYhr2bXWu22QUH4DEPDJEcA9XFhcOs6oeYOnypJw,339
-web3_wizzard_lib-1.8.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-web3_wizzard_lib-1.8.0.dist-info/top_level.txt,sha256=31sEPHxuJ1p5fpc75vHQJ8eJdSs80aCZeeT3L8YAHNg,17
-web3_wizzard_lib-1.8.0.dist-info/RECORD,,
+web3_wizzard_lib-1.9.1.dist-info/METADATA,sha256=paWNbxRuIme-PEPrp6mzRsFIoRieGPCqyRRAOEUqedY,339
+web3_wizzard_lib-1.9.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+web3_wizzard_lib-1.9.1.dist-info/top_level.txt,sha256=31sEPHxuJ1p5fpc75vHQJ8eJdSs80aCZeeT3L8YAHNg,17
+web3_wizzard_lib-1.9.1.dist-info/RECORD,,