refactoring DSS deployment continued

Author: jeannettemcd

chief_keeper/chief_keeper.py

@@ -31,9 +31,9 @@
 from chief_keeper.database import SimpleDatabase
 from chief_keeper.spell import DSSSpell
 
-from .utils.keeper_lifecycle import Lifecycle
-from. utils.register_keys import register_keys
-from .utils.blockchain import initialize_blockchain_connection
+from chief_keeper.utils.keeper_lifecycle import Lifecycle
+
+from chief_keeper.utils.blockchain import initialize_blockchain_connection
 
 # from pymaker import Address, web3_via_http
 # from pymaker.util import is_contract_at

chief_keeper/database.py

@@ -25,8 +25,9 @@
 
 from chief_keeper.spell import DSSSpell
 
-from pymaker import Address
-from pymaker.util import is_contract_at
+from chief_keeper.utils.address import Address
+from chief_keeper.utils.address import Address
+from chief_keeper.utils.utils import is_contract_at
 from pymaker.deployment import DssDeployment
 
 

chief_keeper/makerdao_utils/auctions.py

@@ -29,12 +29,13 @@
 from chief_keeper.utils.address import Address
 from chief_keeper.utils.contract import Contract
 from chief_keeper.utils.transact import Transact
+from chief_keeper.utils.big_number import Wad, Rad, Ray
 
+from chief_keeper.makerdao_utils.dss import Dog, Vat
+from chief_keeper.makerdao_utils.token import ERC20Token
 
-from pymaker.dss import Dog, Vat
 from pymaker.logging import LogNote
-from pymaker.numeric import Wad, Rad, Ray
-from pymaker.token import ERC20Token
+
 
 
 def toBytes(string: str):

chief_keeper/makerdao_utils/collateral.py

@@ -0,0 +1,73 @@
+# This file is part of Maker Keeper Framework.
+#
+# Copyright (C) 2019-2021 EdNoepel
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from chief_keeper.utils.address import Address
+from chief_keeper.utils.contract import Contract
+
+from chief_keeper.makerdao_utils.auctions import AuctionContract, Clipper, Flipper
+from chief_keeper.makerdao_utils.join import GemJoin
+from chief_keeper.makerdao_utils.token import ERC20Token
+
+from pymaker.approval import directly, hope_directly
+
+from pymaker.ilk import Ilk
+from pymaker.gas import DefaultGasPrice
+
+
+
+logger = logging.getLogger()
+
+
+class Collateral:
+    """The `Collateral` object wraps accounting information in the Ilk with token-wide artifacts shared across
+    multiple collateral types for the same token.  For example, ETH-A and ETH-B are represented by different Ilks,
+    but will share the same gem (WETH token), GemJoin instance, and Flipper contract.
+    """
+
+    def __init__(self, ilk: Ilk, gem: ERC20Token, adapter: GemJoin, auction: AuctionContract, pip, vat: Contract):
+        assert isinstance(ilk, Ilk)
+        assert isinstance(gem, ERC20Token)
+        assert isinstance(adapter, GemJoin)
+        assert isinstance(auction, AuctionContract)
+        assert isinstance(vat, Contract)
+
+        self.ilk = ilk
+        self.gem = gem
+        self.adapter = adapter
+        if isinstance(auction, Flipper):
+            self.flipper = auction
+            self.clipper = None
+        elif isinstance(auction, Clipper):
+            self.flipper = None
+            self.clipper = auction
+        # Points to `median` for official deployments, `DSValue` for testing purposes.
+        # Users generally have no need to interact with the pip.
+        self.pip = pip
+        self.vat = vat
+
+    def approve(self, usr: Address, **kwargs):
+        """
+        Allows the user to move this collateral into and out of their CDP.
+
+        Args
+            usr: User making transactions with this collateral
+        """
+        gas_strategy = kwargs['gas_strategy'] if 'gas_strategy' in kwargs else DefaultGasPrice()
+        self.adapter.approve(hope_directly(from_address=usr, gas_strategy=gas_strategy), self.vat.address)
+        self.adapter.approve_token(directly(from_address=usr, gas_strategy=gas_strategy))