Merge pull request #91 from valory-xyz/feat/close_with_mech_requests

Resolve markets with mech requests
valory-xyz · Mar 4, 2024 · c6d8e2c · c6d8e2c
2 parents 95010d2 + e9a075f
commit c6d8e2c
Show file tree

Hide file tree

Showing 21 changed files with 915 additions and 557 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,11 +20,13 @@ packages/valory/contracts/multisend
 packages/valory/contracts/service_registry
 packages/valory/contracts/delegate
 packages/valory/contracts/conditional_tokens
+packages/valory/contracts/mech
 packages/valory/contracts/realitio
 packages/valory/contracts/realitio_proxy
 
 packages/valory/skills/abstract_abci
 packages/valory/skills/abstract_round_abci
+packages/valory/skills/mech_interact_abci
 packages/valory/skills/registration_abci
 packages/valory/skills/reset_pause_abci
 packages/valory/skills/termination_abci

diff --git a/packages/packages.json b/packages/packages.json
@@ -3,10 +3,10 @@
         "contract/valory/fpmm_deterministic_factory/0.1.0": "bafybeibrtxj6yfafeypjcq4myhjxpxystjnqvepqibklnwigawsftxvdce",
         "contract/valory/wxdai/0.1.0": "bafybeidalocwbhmbto6ii6adldtpcughtdt6j3v4tv36utevjk2wrdyqie",
         "contract/valory/fpmm/0.1.0": "bafybeiai2ruj27nnglvn7yc5atojyojo3fkmofw6wrjgz2ybps2uwdizx4",
-        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeia746daapyl76tqeptlz2xgk6zschdkxnuqdivim6iawig4lht7ca",
-        "skill/valory/market_maker_abci/0.1.0": "bafybeibfrzvvzpxsyqdxaxzaznbep4ezlfeoimo7h2f54weocyjvvjhsnm",
-        "agent/valory/market_maker/0.1.0": "bafybeib3ukoxw43dxx6vggbit7ralr3jhlq7ru6ikobuafxgzytzyo6zm4",
-        "service/valory/market_maker/0.1.0": "bafybeihiij5epctadoocxh2gv3uwe2qscyo7e2ky2zl5cwmut2gcsiz63y"
+        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeiaf36yqrsyspveckmyciayklnsy4c2r7wyjvtnxlkmk722kloonwu",
+        "skill/valory/market_maker_abci/0.1.0": "bafybeihjwa6fxcfzfsplqcufuzbjd7wnnj4jgwnnocrgnpiafuhj4vp6kq",
+        "agent/valory/market_maker/0.1.0": "bafybeibj5d4quoj3fgyrwp7nbgahmxq2pllsp54dzru6miz2jpbmnx3hdq",
+        "service/valory/market_maker/0.1.0": "bafybeihg7uc5tojdkdsoofx2iza4mz6eyvc2k2musxh5ymmz2uyqkgwxvm"
     },
     "third_party": {
         "protocol/valory/contract_api/1.0.0": "bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i",
@@ -17,26 +17,28 @@
         "protocol/valory/abci/0.1.0": "bafybeiaqmp7kocbfdboksayeqhkbrynvlfzsx4uy4x6nohywnmaig4an7u",
         "protocol/valory/acn/1.1.0": "bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe",
         "protocol/valory/tendermint/0.1.0": "bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra",
-        "protocol/valory/llm/1.0.0": "bafybeicpd5hxe5rlgp75kaqotzpy3jkdyl5pbdcutwqdzlqfknnmkgadsy",
+        "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4",
         "contract/valory/service_registry/0.1.0": "bafybeiby5x4wfdywlenmoudbykdxohpq2nifqxfep5niqgxrjyrekyahzy",
         "contract/valory/gnosis_safe/0.1.0": "bafybeictjc7saviboxbsdcey3trvokrgo7uoh76mcrxecxhlvcrp47aqg4",
         "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeie6ynnoavvk2fpbn426nlp32sxrj7pz5esgebtlezy4tmx5gjretm",
         "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y",
         "contract/valory/realitio/0.1.0": "bafybeignaxfk7fjlfa4lioflwsfru2z5xln5cyvyew3if5oas2sgm5wuii",
         "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4",
         "contract/valory/conditional_tokens/0.1.0": "bafybeibnzmqmeph4cj5vfh3s622mo2o5627vjjwc6bptrhj4dk65mzgvhe",
+        "contract/valory/mech/0.1.0": "bafybeih3e33fm7km26iioxsregy2ncuh4p5h6rey25clbj2542ppafhtqu",
         "contract/valory/delegate/0.1.0": "bafybeiaslboosyvpzccaqgie56wta3aqrdkgfx5vs5ogxu7ebiez67wp6i",
         "connection/valory/ipfs/0.1.0": "bafybeiflaxrnepfn4hcnq5pieuc7ki7d422y3iqb54lv4tpgs7oywnuhhq",
         "connection/valory/abci/0.1.0": "bafybeifbnhe4f2bll3a5o3hqji3dqx4soov7hr266rdz5vunxgzo5hggbq",
+        "connection/valory/openai/0.1.0": "bafybeigyehjbahya5mp7vyp5tjvn36rey4btvzskp3ql3mgxp3zu6gwq5a",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e",
         "connection/valory/ledger/0.19.0": "bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya",
         "connection/valory/http_client/0.23.0": "bafybeih5vzo22p2umhqo52nzluaanxx7kejvvpcpdsrdymckkyvmsim6gm",
-        "connection/valory/openai/0.1.0": "bafybeidnryrgq6jp3mqvjcpei4nesbey54fhyrcvginby7fer32z32kpai",
         "skill/valory/abstract_abci/0.1.0": "bafybeihljirk3d4rgvmx2nmz3p2mp27iwh2o5euce5gccwjwrpawyjzuaq",
         "skill/valory/abstract_round_abci/0.1.0": "bafybeigjrepaqpb3m7zunmt4hryos4vto4yyj3u6iyofdb2fotwho3bqvm",
         "skill/valory/transaction_settlement_abci/0.1.0": "bafybeid57tozt5f3kgzmu22nbr3c3oy4p7bi2bu66rqsgnlylq6xgh2ixe",
         "skill/valory/registration_abci/0.1.0": "bafybeif3ln6eg53ebrfe6uicjew4uqp2ynyrcxkw5wi4jm3ixqv3ykte4a",
         "skill/valory/reset_pause_abci/0.1.0": "bafybeicm7onl72rfnn33pbvzwjpkl5gafeieyobfcnyresxz7kunjwmqea",
-        "skill/valory/termination_abci/0.1.0": "bafybeie6h7j4hyhgj2wte64n3xyudxq4pgqcqjmslxi5tff4mb6vce2tay"
+        "skill/valory/termination_abci/0.1.0": "bafybeie6h7j4hyhgj2wte64n3xyudxq4pgqcqjmslxi5tff4mb6vce2tay",
+        "skill/valory/mech_interact_abci/0.1.0": "bafybeicjunamybs27vwz2jz5hdrtkrtr2xwy2a5dyhbqksjrgh266qpnha"
     }
 }
diff --git a/packages/valory/agents/market_maker/aea-config.yaml b/packages/valory/agents/market_maker/aea-config.yaml
@@ -12,7 +12,7 @@ connections:
 - valory/abci:0.1.0:bafybeifbnhe4f2bll3a5o3hqji3dqx4soov7hr266rdz5vunxgzo5hggbq
 - valory/http_client:0.23.0:bafybeih5vzo22p2umhqo52nzluaanxx7kejvvpcpdsrdymckkyvmsim6gm
 - valory/ledger:0.19.0:bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya
-- valory/openai:0.1.0:bafybeidnryrgq6jp3mqvjcpei4nesbey54fhyrcvginby7fer32z32kpai
+- valory/openai:0.1.0:bafybeigyehjbahya5mp7vyp5tjvn36rey4btvzskp3ql3mgxp3zu6gwq5a
 - valory/p2p_libp2p_client:0.1.0:bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e
 contracts:
 - valory/gnosis_safe:0.1.0:bafybeictjc7saviboxbsdcey3trvokrgo7uoh76mcrxecxhlvcrp47aqg4
@@ -32,17 +32,18 @@ protocols:
 - valory/http:1.0.0:bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae
 - valory/ipfs:0.1.0:bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm
 - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni
-- valory/llm:1.0.0:bafybeicpd5hxe5rlgp75kaqotzpy3jkdyl5pbdcutwqdzlqfknnmkgadsy
+- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4
 - valory/tendermint:0.1.0:bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra
 skills:
 - valory/abstract_abci:0.1.0:bafybeihljirk3d4rgvmx2nmz3p2mp27iwh2o5euce5gccwjwrpawyjzuaq
 - valory/abstract_round_abci:0.1.0:bafybeigjrepaqpb3m7zunmt4hryos4vto4yyj3u6iyofdb2fotwho3bqvm
-- valory/market_maker_abci:0.1.0:bafybeibfrzvvzpxsyqdxaxzaznbep4ezlfeoimo7h2f54weocyjvvjhsnm
+- valory/market_maker_abci:0.1.0:bafybeihjwa6fxcfzfsplqcufuzbjd7wnnj4jgwnnocrgnpiafuhj4vp6kq
 - valory/registration_abci:0.1.0:bafybeif3ln6eg53ebrfe6uicjew4uqp2ynyrcxkw5wi4jm3ixqv3ykte4a
-- valory/market_creation_manager_abci:0.1.0:bafybeia746daapyl76tqeptlz2xgk6zschdkxnuqdivim6iawig4lht7ca
+- valory/market_creation_manager_abci:0.1.0:bafybeiaf36yqrsyspveckmyciayklnsy4c2r7wyjvtnxlkmk722kloonwu
 - valory/reset_pause_abci:0.1.0:bafybeicm7onl72rfnn33pbvzwjpkl5gafeieyobfcnyresxz7kunjwmqea
 - valory/termination_abci:0.1.0:bafybeie6h7j4hyhgj2wte64n3xyudxq4pgqcqjmslxi5tff4mb6vce2tay
 - valory/transaction_settlement_abci:0.1.0:bafybeid57tozt5f3kgzmu22nbr3c3oy4p7bi2bu66rqsgnlylq6xgh2ixe
+- valory/mech_interact_abci:0.1.0:bafybeicjunamybs27vwz2jz5hdrtkrtr2xwy2a5dyhbqksjrgh266qpnha
 default_ledger: ethereum
 required_ledgers:
 - ethereum
@@ -61,7 +62,7 @@ logging_config:
       class: logging.FileHandler
       formatter: standard
       filename: ${LOG_FILE:str:log.txt}
-      level: INFO
+      level: ${LOG_LEVEL:str:INFO}
     console:
       class: logging.StreamHandler
       formatter: standard
@@ -71,7 +72,7 @@ logging_config:
       handlers:
       - logfile
       - console
-      propagate: false
+      propagate: true
 skill_exception_policy: stop_and_exit
 dependencies:
   open-aea-ledger-cosmos:
@@ -99,6 +100,11 @@ config:
       chain_id: ${int:100}
       poa_chain: ${bool:false}
       default_gas_price_strategy: ${str:eip1559}
+    gnosis:
+      address: ${str:https://rpc.gnosischain.com}
+      chain_id: ${int:100}
+      poa_chain: ${bool:false}
+      default_gas_price_strategy: ${str:eip1559}
 ---
 public_id: valory/openai:0.1.0
 type: connection
@@ -177,6 +183,8 @@ models:
       collateral_tokens_contract: ${str:0xe91d153e0b41518a2ce8dd3d7944fa863463a97d}
       arbitrator_contract: ${str:0xe40dd83a262da3f56976038f1554fe541fa75ecd}
       multisend_address: ${str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761}
+      multisend_batch_size: ${int:5}
+      ipfs_address: ${str:https://gateway.autonolas.tech/ipfs/}
       on_chain_service_id: ${int:null}
       reset_tendermint_after: ${int:1}
       reset_pause_duration: ${int:1800}
@@ -193,6 +201,7 @@ models:
       tendermint_url: ${str:http://localhost:26657}
       tendermint_p2p_url: ${str:localhost:26656}
       termination_sleep: ${int:900}
+      termination_from_block: ${int:0}
       tx_timeout: ${float:10.0}
       round_timeout_seconds: ${float:60}
       use_termination: ${bool:false}
@@ -205,4 +214,8 @@ models:
       serious_slash_unit_amount: ${int:8000000000000000}
       xdai_threshold: ${int:1000000000000000000}
       market_closing_newsapi_api_key: ${str:f1ea36ae6175474bbcbae11eca64d0b9}
+      google_api_key: ${str:google_api_key}
+      google_engine_id: ${str:google_engine_id}
+      openai_api_key: ${str:openai_api_key}
+      mech_contract_address: ${str:0x77af31de935740567cf4ff1986d04b2c964a786a}
 is_abstract: false
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:bafybeib3ukoxw43dxx6vggbit7ralr3jhlq7ru6ikobuafxgzytzyo6zm4
+agent: valory/market_maker:0.1.0:bafybeibj5d4quoj3fgyrwp7nbgahmxq2pllsp54dzru6miz2jpbmnx3hdq
 number_of_agents: 1
 deployment:
   agent:
@@ -68,6 +68,9 @@ models:
       collateral_tokens_contract: ${COLLATERAL_TOKENS_CONTRACT:str:0xe91d153e0b41518a2ce8dd3d7944fa863463a97d}
       arbitrator_contract: ${ARBITRATOR_CONTRACT:str:0xe40dd83a262da3f56976038f1554fe541fa75ecd}
       multisend_address: ${MULTISEND_ADDRESS:str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761}
+      multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:1}
+      ipfs_address: ${IPFS_ADDRESS:str:https://gateway.autonolas.tech/ipfs/}
+      mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a}
       on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null}
       reset_tendermint_after: ${RESET_TENDERMINT_AFTER:int:1}
       reset_pause_duration: ${RESET_PAUSE_DURATION:int:1800}
@@ -86,6 +89,7 @@ models:
       tendermint_url: ${TENDERMINT_URL:str:http://localhost:26657}
       tendermint_p2p_url: ${TENDERMINT_P2P_URL:str:localhost:26656}
       termination_sleep: ${TERMINATION_SLEEP:int:900}
+      termination_from_block: ${TERMINATION_FROM_BLOCK:int:0}
       xdai_threshold: ${XDAI_THRESHOLD:int:1000000000000000000}
       tx_timeout: ${TX_TIMEOUT:float:10.0}
       use_termination: ${USE_TERMINATION:bool:false}
@@ -96,6 +100,9 @@ models:
       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}
+      google_api_key: ${GOOGLE_API_KEY:str:google_api_key}
+      google_engine_id: ${GOOGLE_ENGINE_ID:str:google_engine_id}
+      openai_api_key: ${OPENAI_API_KEY:str:openai_api_key}
 ---
 public_id: valory/ledger:0.19.0
 type: connection