Add contract unit tests

.github/workflows/pytest.yml

@@ -21,20 +21,47 @@ jobs:
       - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8'
+          python-version: "3.8"
+
+      - uses: actions/checkout@v2
+        name: Checkout Barge
+        with:
+          repository: "oceanprotocol/barge"
+          ref: "issue374-replace-pdr-components-with-pdr-backend"
+          path: "barge"
+
+      - name: Run Barge
+        working-directory: ${{ github.workspace }}/barge
+        env:
+          SUBGRAPH_VERSION: main
+        run: |
+          bash -x start_ocean.sh --no-aquarius --no-elasticsearch --no-provider --no-dashboard --with-thegraph --predictoor > start_ocean.log &
+
+      - name: Wait for contracts deployment
+        working-directory: ${{ github.workspace }}/barge
+        run: |
+          for i in $(seq 1 250); do
+            sleep 5
+            [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" ] && break
+            done
+
       - name: Install dependencies
         working-directory: ${{ github.workspace }}
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install pytest       
+          pip install pytest
+
+      - name: Set env variables
+        run: |
+          echo "ADDRESS_FILE=${{env.HOME}}/.ocean/ocean-contracts/artifacts/address.json" >> $GITHUB_ENV
+
       - name: Test with pytest
         id: pytest
         env:
-          ADDRESS_FILE: "${{env.HOME}}/.ocean/ocean-contracts/artifacts/address.json"
           RPC_URL: "http://127.0.0.1:8545"
           SUBGRAPH_URL: "http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph"
           PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
         run: |
           coverage run --omit="*test*" -m pytest
-          coverage report
+          coverage report

pdr_backend/publisher/main.py

@@ -1,5 +1,19 @@
 from pdr_backend.publisher.publish import publish, fund_dev_accounts
+from pdr_backend.utils.contract import (
+    DataNft,
+    Web3Config,
+    Token,
+    get_address,
+)
+from pdr_backend.utils import env
+
+rpc_url = env.get_rpc_url_or_exit()
+private_key = env.get_private_key_or_exit()
+web3_config = Web3Config(rpc_url, private_key)
+ocean_address = get_address(web3_config.w3.eth.chain_id, "Ocean")
+
 
+OCEAN = Token(web3_config, ocean_address)
 
 accounts_to_fund = [
     #    account_key_env,   OCEAN_to_send
@@ -12,7 +26,7 @@
     ("PDR_MM_USER", 10000.0),
 ]
 
-fund_dev_accounts(accounts_to_fund)
+fund_dev_accounts(accounts_to_fund, web3_config.owner, OCEAN)
 
 publish(
     s_per_epoch=300,
@@ -25,6 +39,7 @@
     feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
     rate=3,
     cut=0.2,
+    web3_config=web3_config,
 )
 
 publish(
@@ -38,6 +53,7 @@
     feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
     rate=3,
     cut=0.2,
+    web3_config=web3_config,
 )
 
 publish(
@@ -51,4 +67,5 @@
     feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
     rate=3,
     cut=0.2,
+    web3_config=web3_config,
 )

pdr_backend/publisher/publish.py

@@ -5,32 +5,20 @@
 from pdr_backend.utils.contract import (
     DataNft,
     ERC721Factory,
-    Web3Config,
-    Token,
     get_address,
 )
-from pdr_backend.utils import env
-
-rpc_url = env.get_rpc_url_or_exit()
-private_key = env.get_private_key_or_exit()
-web3_config = Web3Config(rpc_url, private_key)
-owner = web3_config.owner
-ocean_address = get_address(web3_config.w3.eth.chain_id, "Ocean")
-fre_address = get_address(web3_config.w3.eth.chain_id, "FixedPrice")
-factory = ERC721Factory(web3_config)
-OCEAN = Token(web3_config, ocean_address)
 
 MAX_UINT256 = 2**256 - 1
 
 
-def fund_dev_accounts(accounts_to_fund):
+def fund_dev_accounts(accounts_to_fund, owner, token):
     for env_key, amount in accounts_to_fund:
         if env_key in os.environ:
             account = Account.from_key(os.getenv(env_key))
             print(
                 f"Sending OCEAN to account defined by envvar key {env_key}, with address {account.address}"
             )
-            OCEAN.transfer(account.address, amount * 1e18, owner)
+            token.transfer(account.address, amount * 1e18, owner)
 
 
 def publish(
@@ -44,9 +32,14 @@ def publish(
     feeCollector_addr,
     rate,
     cut,
+    web3_config,
 ):
     pair = base + "/" + quote
     trueval_timeout = 4 * 12 * s_per_epoch
+    owner = web3_config.owner
+    ocean_address = get_address(web3_config.w3.eth.chain_id, "Ocean")
+    fre_address = get_address(web3_config.w3.eth.chain_id, "FixedPrice")
+    factory = ERC721Factory(web3_config)
 
     feeCollector = web3_config.w3.to_checksum_address(feeCollector_addr)
     trueval_submiter = web3_config.w3.to_checksum_address(trueval_submitter_addr)
@@ -79,9 +72,10 @@ def publish(
         [18, 18, rate, cut, 1],
     )
 
-    data_nft_address = factory.createNftWithErc20WithFixedRate(
+    logs_nft, logs_erc = factory.createNftWithErc20WithFixedRate(
         nft_data, erc_data, fre_data
     )
+    data_nft_address = logs_nft["newTokenAddress"]
     print(f"Deployed NFT: {data_nft_address}")
     data_nft = DataNft(web3_config, data_nft_address)
     tx = data_nft.set_data("pair", pair)
@@ -96,3 +90,5 @@ def publish(
     print(f"timeframe set to {timeframe} in {tx.hex()}")
     tx = data_nft.add_erc20_deployer(trueval_submiter)
     print(f"Erc20Deployer set to {trueval_submiter} in {tx.hex()}")
+
+    return (nft_data, erc_data, fre_data, logs_nft, logs_erc)

pdr_backend/utils/contract.py

@@ -157,7 +157,7 @@ def string_to_bytes32(self, data):
         return bytes(myBytes32, "utf-8")
 
     def get_auth_signature(self):
-        valid_until = int(time.time()) + 3600
+        valid_until = self.config.w3.eth.get_block("latest").timestamp + 3600
         message_hash = self.config.w3.solidity_keccak(
             ["address", "uint256"],
             [self.config.owner, valid_until],
@@ -419,10 +419,11 @@ def submit_prediction(
     def get_trueValSubmitTimeout(self):
         return self.contract_instance.functions.trueValSubmitTimeout().call()
 
-    def get_prediction(self, slot):
-        return self.contract_instance.functions.getPrediction(slot).call(
-            {"from": self.config.owner}
-        )
+    def get_prediction(self, slot: int, address: str):
+        auth_signature = self.get_auth_signature()
+        return self.contract_instance.functions.getPrediction(
+            slot, address, auth_signature
+        ).call({"from": self.config.owner})
 
     def submit_trueval(
         self, true_val, timestamp, float_value, cancel_round, wait_for_receipt=True
@@ -501,10 +502,13 @@ def createNftWithErc20WithFixedRate(self, NftCreateData, ErcCreateData, FixedDat
         if receipt["status"] != 1:
             raise ValueError(f"createNftWithErc20WithFixedRate failed in {tx.hex()}")
         # print(receipt)
-        logs = self.contract_instance.events.NFTCreated().process_receipt(
+        logs_nft = self.contract_instance.events.NFTCreated().process_receipt(
+            receipt, errors=DISCARD
+        )
+        logs_erc = self.contract_instance.events.TokenCreated().process_receipt(
             receipt, errors=DISCARD
         )
-        return logs[0]["args"]["newTokenAddress"]
+        return logs_nft[0]["args"], logs_erc[0]["args"]
 
 
 class DataNft:
@@ -580,12 +584,13 @@ def get_addresses(chain_id):
     address_filename = os.getenv("ADDRESS_FILE")
     path = None
     if address_filename:
+        address_filename = os.path.expanduser(address_filename)
         path = Path(address_filename)
     else:
         path = Path(str(os.path.dirname(addresses.__file__)) + "/address.json")
 
     if not path.exists():
-        raise TypeError("Cannot find address.json")
+        raise TypeError(f"Cannot find address.json file at {path}")
 
     with open(path) as f:
         data = json.load(f)
@@ -616,6 +621,7 @@ def get_contract_filename(contract_name):
     address_filename = os.getenv("ADDRESS_FILE")
     path = None
     if address_filename:
+        address_filename = os.path.expanduser(address_filename)
         address_dir = os.path.dirname(address_filename)
         root_dir = os.path.join(address_dir, "..")
         os.chdir(root_dir)

pdr_backend/utils/test/conftest.py

@@ -0,0 +1,43 @@
+import os
+import pytest
+from pdr_backend.utils.contract import (
+    Token,
+    Web3Config,
+    get_address,
+)
+
+_BARGE_ADDRESS_FILE = "~/.ocean/ocean-contracts/artifacts/address.json"
+
+
+@pytest.fixture(autouse=True)
+def barge_address_file():
+    os.environ["ADDRESS_FILE"] = os.path.expanduser(_BARGE_ADDRESS_FILE)
+
+
+@pytest.fixture(scope="session")
+def rpc_url():
+    return os.environ.get("TEST_RPC_URL", default="http://127.0.0.1:8545")
+
+
+@pytest.fixture(scope="session")
+def private_key():
+    return os.environ.get(
+        "TEST_PRIVATE_KEY",
+        default="0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58",
+    )
+
+
+@pytest.fixture(scope="session")
+def chain_id():
+    return 8996
+
+
+@pytest.fixture(scope="session")
+def web3_config(rpc_url, private_key):
+    return Web3Config(rpc_url, private_key)
+
+
+@pytest.fixture(scope="session")
+def ocean_token(web3_config, chain_id) -> Token:
+    token_address = get_address(chain_id, "Ocean")
+    return Token(web3_config, token_address)