Merge pull request #79 from valory-xyz/fix/misc

Fix/misc

.gitleaksignore

@@ -24,4 +24,6 @@ d6a9fc51493bdf246f5f857dfc0ebd6b4e7207c8:packages/valory/skills/market_creator_a
 32e26ca806ca67db802d9ca33d47b9de09819edb:packages/valory/skills/market_validation_abci/skill.yaml:generic-api-key:77
 d256f9c02981a48df2b4a9b2ec4ccd042d154e40:README.md:generic-api-key:100
 d256f9c02981a48df2b4a9b2ec4ccd042d154e40:README.md:generic-api-key:102
-a769fb99249b5b342728639361ea70cea0033118:packages/valory/skills/market_approval_manager_abci/skill.yaml:generic-api-key:95
+a769fb99249b5b342728639361ea70cea0033118:packages/valory/skills/market_approval_manager_abci/skill.yaml:generic-api-key:95
+fa8d6f16abeecd8c963e74d08cca4ac70cfc50bd:packages/valory/skills/market_maker_abci/skill.yaml:generic-api-key:202
+fa8d6f16abeecd8c963e74d08cca4ac70cfc50bd:packages/valory/skills/market_creation_manager_abci/skill.yaml:generic-api-key:103

packages/packages.json

@@ -3,10 +3,10 @@
         "contract/valory/conditional_tokens/0.1.0": "bafybeifbhritgoqecuilj35uzrrokm2ngfmwkoafbmzxgvpa4q3wpi6i64",
         "contract/valory/fpmm_deterministic_factory/0.1.0": "bafybeih5yb4df6plwsxicp4jtywvpqmjnvfw55zw35yuycwxrx7mehoowy",
         "contract/valory/realtio/0.1.0": "bafybeihfdvkrjkhezqeaxj3eluv2v4syvnxni6jbuc3knqb4rawrcivcke",
-        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeibcaibxcnza7yovemtr2b24dr5fjjyowcj32vymu4ltnz7xut5xt4",
-        "skill/valory/market_maker_abci/0.1.0": "bafybeifzjlqhksee2vurv2vllz7ztks3hhwiyrnqst3t4diabomwnccnru",
-        "agent/valory/market_maker/0.1.0": "bafybeiglbnqnpryz5dsuc2c2qynja3ms2luemcywktflwjxbfazsq33hdy",
-        "service/valory/market_maker/0.1.0": "bafybeidcec23o4gyjah2vdj73ceobhqov6lrdbupq6ppcy5iwdj5r4rtbu",
+        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeihkyzxbg5mrnlwmt3csivxvvy4zj7hxltjrvkkfel4yljmcz2simm",
+        "skill/valory/market_maker_abci/0.1.0": "bafybeia25bkwhsxavpbw67elnfwfycsxrt2sxjthc7ca2hj2m2yuae2unu",
+        "agent/valory/market_maker/0.1.0": "bafybeibnm24if7torhyqewizdbznogjujtfharnb3iclmk53ygapco2jo4",
+        "service/valory/market_maker/0.1.0": "bafybeich6hdh4w2ic6l5thyqoil2bhlg43z3t7aidhzxjxzz7vcps2wx4m",
         "contract/valory/wxdai/0.1.0": "bafybeidalocwbhmbto6ii6adldtpcughtdt6j3v4tv36utevjk2wrdyqie",
         "contract/valory/fpmm/0.1.0": "bafybeiai2ruj27nnglvn7yc5atojyojo3fkmofw6wrjgz2ybps2uwdizx4"
     },

packages/valory/agents/market_maker/aea-config.yaml

@@ -37,9 +37,9 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi
 - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq
-- valory/market_maker_abci:0.1.0:bafybeifzjlqhksee2vurv2vllz7ztks3hhwiyrnqst3t4diabomwnccnru
+- valory/market_maker_abci:0.1.0:bafybeia25bkwhsxavpbw67elnfwfycsxrt2sxjthc7ca2hj2m2yuae2unu
 - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am
-- valory/market_creation_manager_abci:0.1.0:bafybeibcaibxcnza7yovemtr2b24dr5fjjyowcj32vymu4ltnz7xut5xt4
+- valory/market_creation_manager_abci:0.1.0:bafybeihkyzxbg5mrnlwmt3csivxvvy4zj7hxltjrvkkfel4yljmcz2simm
 - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba
 - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa
 - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja
@@ -204,4 +204,5 @@ models:
       light_slash_unit_amount: ${int:5000000000000000}
       serious_slash_unit_amount: ${int:8000000000000000}
       xdai_threshold: ${int:1000000000000000000}
+      market_closing_newsapi_api_key: ${str:f1ea36ae6175474bbcbae11eca64d0b9}
 is_abstract: false

packages/valory/services/market_maker/service.yaml

@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeibwz3af6326msp4h3kqehijvmyhaytvyfbo3o2npc2w4b6zrg6pfq
 fingerprint_ignore_patterns: []
-agent: valory/market_maker:0.1.0:bafybeiglbnqnpryz5dsuc2c2qynja3ms2luemcywktflwjxbfazsq33hdy
+agent: valory/market_maker:0.1.0:bafybeibnm24if7torhyqewizdbznogjujtfharnb3iclmk53ygapco2jo4
 number_of_agents: 1
 deployment:
   agent:
@@ -95,6 +95,7 @@ models:
       slash_threshold_amount: ${SLASH_THRESHOLD_AMOUNT:int:10000000000000000}
       light_slash_unit_amount: ${LIGHT_SLASH_UNIT_AMOUNT:int:5000000000000000}
       serious_slash_unit_amount: ${SERIOUS_SLASH_UNIT_AMOUNT:int:8000000000000000}
+      market_closing_newsapi_api_key: ${MARKET_CLOSING_NEWSAPI_API_KEY:str:f1ea36ae6175474bbcbae11eca64d0b9}
 ---
 public_id: valory/ledger:0.19.0
 type: connection

packages/valory/skills/market_creation_manager_abci/behaviours.py

@@ -932,7 +932,7 @@ def get_payload(self) -> Generator[None, None, str]:
             return DepositDaiRound.ERROR_PAYLOAD
 
         safe_tx_hash = yield from self._get_safe_tx_hash(
-            to_address=wxdai_address, value=balance, data=tx_data
+            to_address=wxdai_address, value=balance_to_deposit, data=tx_data
         )
         if safe_tx_hash is None:
             # something went wrong
@@ -2228,7 +2228,7 @@ def _get_news(
         self, query: str
     ) -> Generator[None, None, Optional[List[Dict[str, Any]]]]:
         """Auxiliary method to collect data from endpoint."""
-        headers = {"X-Api-Key": self.params.newsapi_api_key}
+        headers = {"X-Api-Key": self.params.market_closing_newsapi_api_key}
 
         parameters = {
             "q": query,

packages/valory/skills/market_creation_manager_abci/models.py

@@ -148,6 +148,9 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         self.market_proposal_round_timeout_seconds_per_day = self._ensure(
             "market_proposal_round_timeout_seconds_per_day", kwargs, type_=int
         )
+        self.market_closing_newsapi_api_key = self._ensure(
+            "market_closing_newsapi_api_key", kwargs, type_=str
+        )
         self.initial_funds = self._ensure("initial_funds", kwargs, type_=float)
         self.xdai_threshold = self._ensure("xdai_threshold", kwargs, type_=int)
         super().__init__(*args, **kwargs)

packages/valory/skills/market_creation_manager_abci/skill.yaml

@@ -10,11 +10,11 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   .gitignore: bafybeihdfdezgtr3s2lzq5y3oaitfrdy4u4pehionju2bdez35wcjgqx6y
   __init__.py: bafybeibkyjt4covc4yhd22aw7kav45zozk3exdv344emt3lilln64soaxm
-  behaviours.py: bafybeib6ef2ntjcokb7476unn2iza6fqgc2jqfuvtxvcffpucq5q7djtfe
+  behaviours.py: bafybeig3gcpiiq2mvuyugt2o4mtestmfod2ghbdnfpa5lklznkdr3cwiyi
   dialogues.py: bafybeicmaufkl7vdomnfciv7lw4536ssld7x4uemdapuhsyvfpd4ncibza
   fsm_specification.yaml: bafybeiglegr5e55k3kra4movl5klfoqc6c2lm4cbh3fzicilwq6lhmnmxa
   handlers.py: bafybeietxjfli2i57kb7heoy772rcq2znusl36gg7jjj5g3pddw7egny3q
-  models.py: bafybeif5wcgzqfkq55hzo3cq2fzwr74s5jeozknxpzizqabcsfr3sd6xry
+  models.py: bafybeigc4vhwylsqoioq5qy24dlflg63g63eirbeshkabsic7eeobj53mi
   payloads.py: bafybeiadaz4jtimdq6ppgej55xezqkri5bjhjwvwbqipd2fwep2gkq2vvu
   prompts.py: bafybeigbvslbtm463rw77nt4jqwkzbhnwhmicaacxgcrq55m3tww5ytmfy
   rounds.py: bafybeia4onql3sl6zcf2blklnwjqcvob7qokdwsib26gfu33h6a4oalq3m
@@ -100,6 +100,7 @@ models:
       market_approval_server_api_key: api_key
       newsapi_endpoint: https://newsapi.org/v2
       newsapi_api_key: f1ea36ae6175474bbcbae11eca64d0b9
+      market_closing_newsapi_api_key: f1ea36ae6175474bbcbae11eca64d0b9
       topics:
       - business
       - cryptocurrency

packages/valory/skills/market_maker_abci/skill.yaml

@@ -24,7 +24,7 @@ skills:
 - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq
 - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am
 - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba
-- valory/market_creation_manager_abci:0.1.0:bafybeibcaibxcnza7yovemtr2b24dr5fjjyowcj32vymu4ltnz7xut5xt4
+- valory/market_creation_manager_abci:0.1.0:bafybeihkyzxbg5mrnlwmt3csivxvvy4zj7hxltjrvkkfel4yljmcz2simm
 - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa
 - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja
 behaviours:
@@ -199,6 +199,7 @@ models:
       use_slashing: false
       slash_cooldown_hours: 3
       questions_to_close_batch_size: 1
+      market_closing_newsapi_api_key: f1ea36ae6175474bbcbae11eca64d0b9
       xdai_threshold: 1000000000000000000
       close_question_bond: 1000000000000000
       slash_threshold_amount: 10000000000000000