web3-wizzard-lib 1.8.0__tar.gz → 1.9.0__tar.gz

{web3_wizzard_lib-1.8.0 → web3_wizzard_lib-1.9.0}/PKG-INFO

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

{web3_wizzard_lib-1.8.0 → web3_wizzard_lib-1.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "web3-wizzard-lib"
-version = "1.8.0"
+version = "1.9.0"
 description = "Engine for web3 smart contracts automatization."
 authors = [
     {name = "Indeoo", email = "indeooars@gmail.com"}

web3_wizzard_lib-1.9.0/web3_wizzard_lib/core/contract/compound_v3.py

@@ -0,0 +1,28 @@
+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")
+
+
+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,
+            token_address
+        ).call()[0]

{web3_wizzard_lib-1.8.0 → web3_wizzard_lib-1.9.0}/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-1.8.0 → web3_wizzard_lib-1.9.0}/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-1.8.0 → web3_wizzard_lib-1.9.0}/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 = '0x414354494f4e5f57495448445241575f41535345540000000000000000000000'
+        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-1.8.0 → web3_wizzard_lib-1.9.0}/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 → web3_wizzard_lib-1.9.0}/web3_wizzard_lib.egg-info/PKG-INFO

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

web3_wizzard_lib-1.8.0/web3_wizzard_lib/core/contract/compound_v3.py

@@ -1,15 +0,0 @@
-from sybil_engine.contract.contract import Contract
-from sybil_engine.utils.file_loader import load_abi
-
-abi = load_abi("resources/abi/compound_v3.json")
-
-
-class CompoundV3Contract(Contract):
-    def __init__(self, contract_address, web3):
-        super().__init__(contract_address, web3, abi)
-
-    def user_collateral(self, account, token_address):
-        return self.contract.functions.userCollateral(
-            account.address,
-            token_address
-        ).call()[0]