Merge pull request #71 from valory-xyz/feat/approval_markets

Autonomous approval markets functionality
valory-xyz · Dec 11, 2023 · 85a3715 · 85a3715
2 parents 94c7601 + 4482bc1
commit 85a3715
Show file tree

Hide file tree

Showing 13 changed files with 908 additions and 234 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,7 +36,7 @@ agent/
 
 ethereum_private_key.txt
 keys.json
-market_maker/
+./market_maker/
 fetched_service/
 keys_json/
 market_approval_server/market_approval_server.log

diff --git a/packages/packages.json b/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": "bafybeiaqs3onithjb76vecq5qkl5dkchm6vj76yqesdbpcpfmcjnzszhki",
-        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeif2y6uu4oblmty7bjbnslou2mxd3dmbnd3t25mj7ywyttjtzrnxay",
-        "skill/valory/market_maker_abci/0.1.0": "bafybeihz2qyzcmumtkr6z5zsd5yxkkhuqylhyg4hjmu36zfye26aklloui",
-        "agent/valory/market_maker/0.1.0": "bafybeifihpw4beu5c7btzcucxojhi2h27iedcdo2ldda6zsqj4tlwb2hgi",
-        "service/valory/market_maker/0.1.0": "bafybeiau6lx562whsafrl7ralexx5koahdkick43ujnwsvs5uqc3e5c4zq",
+        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeiavrnas7ulajfpfk6oqrnc3ajjkhuqpfbagnyzpxritceujr2m4tq",
+        "skill/valory/market_maker_abci/0.1.0": "bafybeia5udk5xsqoqqjzosuxohsqpdpkhtwujai3a55qlzemrxll4a3fte",
+        "agent/valory/market_maker/0.1.0": "bafybeigrbwonw2kru3waihszlsy6gmf4adnihva4zwffj5x5qwpk6cpvhe",
+        "service/valory/market_maker/0.1.0": "bafybeiejasy5cn7zndcrn5qimfljyrom43msvh54fkmx2tavlesze3pufe",
         "contract/valory/wxdai/0.1.0": "bafybeidalocwbhmbto6ii6adldtpcughtdt6j3v4tv36utevjk2wrdyqie",
         "contract/valory/fpmm/0.1.0": "bafybeiai2ruj27nnglvn7yc5atojyojo3fkmofw6wrjgz2ybps2uwdizx4"
     },

diff --git a/packages/valory/agents/market_maker/aea-config.yaml b/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:bafybeihz2qyzcmumtkr6z5zsd5yxkkhuqylhyg4hjmu36zfye26aklloui
+- valory/market_maker_abci:0.1.0:bafybeia5udk5xsqoqqjzosuxohsqpdpkhtwujai3a55qlzemrxll4a3fte
 - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am
-- valory/market_creation_manager_abci:0.1.0:bafybeif2y6uu4oblmty7bjbnslou2mxd3dmbnd3t25mj7ywyttjtzrnxay
+- valory/market_creation_manager_abci:0.1.0:bafybeiavrnas7ulajfpfk6oqrnc3ajjkhuqpfbagnyzpxritceujr2m4tq
 - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba
 - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa
 - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja
@@ -151,6 +151,12 @@ models:
         topic of the news and it should be one of; {topics}.\n* Output only the JSON
         object. Do not include any other contents in your response.}
       max_proposed_markets: ${int:-1}
+      max_approved_markets: ${int:-1}
+      markets_to_approve_per_epoch: ${int:1}
+      markets_to_approve_per_day: ${int:10}
+      min_approve_markets_epoch_seconds: ${int:43200}
+      approve_market_event_days_offset: ${int:5}
+      approve_market_creator: ${str:0x0000000000000000000000000000000000000000}
       market_approval_server_url: ${str:http://127.0.0.1:5000}
       market_approval_server_api_key: ${str:api_key}
       newsapi_endpoint: ${str:https://newsapi.org/v2/top-headlines}

diff --git a/packages/valory/services/market_maker/service.yaml b/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:bafybeifihpw4beu5c7btzcucxojhi2h27iedcdo2ldda6zsqj4tlwb2hgi
+agent: valory/market_maker:0.1.0:bafybeigrbwonw2kru3waihszlsy6gmf4adnihva4zwffj5x5qwpk6cpvhe
 number_of_agents: 1
 deployment:
   agent:
@@ -42,6 +42,12 @@ models:
         topic of the news and it should be one of; {topics}.\n* Output only the JSON
         object. Do not include any other contents in your response.}
       max_proposed_markets: ${MAX_PROPOSED_MARKETS:int:-1}
+      max_approved_markets: ${MAX_APPROVED_MARKETS:int:-1}
+      markets_to_approve_per_epoch: ${MARKETS_TO_APPROVE_PER_EPOCH:int:1}
+      markets_to_approve_per_day: ${MARKETS_TO_APPROVE_PER_DAY:int:10}
+      min_approve_markets_epoch_seconds: ${MIN_APPROVE_MARKETS_EPOCH_SECONDS:int:43200}
+      approve_market_event_days_offset: ${APPROVE_MARKET_EVENT_DAYS_OFFSET:int:5}
+      approve_market_creator: ${APPROVE_MARKET_CREATOR:str:0x89c5cc945dd550BcFfb72Fe42BfF002429F46Fec}
       market_approval_server_url: ${MARKET_APPROVAL_SERVER_URL:str:http://127.0.0.1:5000}
       market_approval_server_api_key: ${MARKET_APPROVAL_SERVER_API_KEY:str:api_key}
       newsapi_endpoint: ${NEWSAPI_ENDPOINT:str:https://newsapi.org/v2/top-headlines}