Merge pull request #59 from nevermined-io/fix/mumbai-gas-fees

Updated version of contracts-lib

nevermined_sdk_py/nevermined/nfts.py

@@ -41,7 +41,7 @@ def transfer_nft(self, did, address, amount, account):
         :param account: Account executing the action
 
         """
-        return self._keeper.did_registry.transfer_nft(did_to_id(did), address, amount, account)
+        return self._keeper.nft_upgradeable.transfer_nft(did_to_id(did), address, amount, account)
 
     def balance(self, address, did):
         """
@@ -50,6 +50,6 @@ def balance(self, address, did):
         :param address: ethereum account address, hex str
         :param did: the id of an asset on-chain, hex str
         """
-        return self._keeper.did_registry.balance(address, convert_to_bytes(did))
+        return self._keeper.nft_upgradeable.balance(address, did_to_id(did))
 
 

setup.py

@@ -21,7 +21,7 @@
     'PyJWT',  # not jwt
     'PyYAML>=5.2',
     'common-utils-py==0.7.7',
-    'contracts-lib-py==0.7.17',
+    'contracts-lib-py==0.10.1',
     'nevermined-secret-store==0.1.1',
     'requests>=2.21.0',
     'deprecated',
@@ -89,6 +89,6 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/nevermined-io/sdk-py',
-    version='0.10.7',
+    version='0.11.0',
     zip_safe=False,
 )

tests/metadata/test_metadata.py

@@ -106,13 +106,22 @@ def test_query_search(asset1, asset2, metadata_provider_instance):
     num_matches = 0
     metadata_provider_instance.publish_asset_ddo(asset1)
 
-    assert len(metadata_provider_instance.query_search(search_query={"query": {"type": ["dataset"]}},
+    search_query = {
+        "query": {
+            "bool": {
+                "must": [{
+                    "match": {"service.attributes.main.type": "dataset"}
+                }]
+            }
+        }
+    }
+    assert len(metadata_provider_instance.query_search(search_query=search_query,
                                               offset=10000)['results']) == (
                    num_matches + 1)
 
     metadata_provider_instance.publish_asset_ddo(asset2)
 
-    assert len(metadata_provider_instance.query_search(search_query={"query": {"type": ["dataset"]}},
+    assert len(metadata_provider_instance.query_search(search_query=search_query,
                                               offset=10000)['results']) == (
                    num_matches + 2)
     metadata_provider_instance.retire_asset_ddo(asset1.did)

tests/nevermined/test_artifacts.py

@@ -16,7 +16,7 @@
     [f"https://mainnet.infura.io/v3/{INFURA_TOKEN}", "mainnet"],
     [f"https://rinkeby.infura.io/v3/{INFURA_TOKEN}", "rinkeby"],
     ("http://localhost:8545", "spree"),
-    ("https://rpc-mumbai.matic.today", "mumbai"),
+    (f"https://polygon-mumbai.infura.io/v3/{INFURA_TOKEN}", "mumbai"),
     ("https://alfajores-forno.celo-testnet.org", "celo-alfajores"),
     ("https://baklava-forno.celo-testnet.org", "celo-baklava")
 ])

tests/nevermined/test_nfts.py

@@ -72,7 +72,7 @@ def test_nfts_flow(publisher_instance_no_init, consumer_instance_no_init):
     assert keeper.condition_manager.get_condition_state(access_cond_id) == 2, ''
     assert keeper.condition_manager.get_condition_state(escrow_cond_id) == 2, ''
 
-    assert keeper.did_registry.balance(consumer_account.address, asset_id) >= number_nfts
+    assert keeper.nft_upgradeable.balance(consumer_account.address, asset_id) >= number_nfts
 
 
     # CHECK ACCESS CREATING THE AGREEMENT