Merge pull request #10 from valory-xyz/fix/include-all-campaigns

Fix/include all campaigns
valory-xyz · Sep 18, 2024 · 83d7eb6 · 83d7eb6
2 parents f34402d + c379f8c
commit 83d7eb6
Show file tree

Hide file tree

Showing 9 changed files with 433 additions and 200 deletions.
diff --git a/packages/packages.json b/packages/packages.json
@@ -8,10 +8,10 @@
         "contract/valory/merkl_distributor/0.1.0": "bafybeifctofnyhdic2sxmkqujvf3j2wwydhtvzhi6kdeutykenymplf4e4",
         "contract/valory/staking_token/0.1.0": "bafybeihgp74ojttyzuriukd44biv2ehh4rcc3czm7mv2olw7amepxszbzu",
         "contract/valory/staking_activity_checker/0.1.0": "bafybeibfqnnqgrchsykidx3x3fgwjmjnml7jyl6e66prhxars3gzgosvxq",
-        "skill/valory/liquidity_trader_abci/0.1.0": "bafybeihii4e64akqkelii37havxmet3qeg5vlv4vg2toekoaww6tk7zudi",
-        "skill/valory/optimus_abci/0.1.0": "bafybeiazrizmyz5rbqkodjo3jrregmeoyg2qrov4p5qyh5znggeg2kmtdi",
-        "agent/valory/optimus/0.1.0": "bafybeicjbstfud6oljhtbobgahpzujyigo2u3eit62srji2ik52irhdv7i",
-        "service/valory/optimus/0.1.0": "bafybeibjwknk7bchs24irn7ayogp72i2cbaioqcd5dzssqtdq4gihrocu4"
+        "skill/valory/liquidity_trader_abci/0.1.0": "bafybeiftxq6ipny6wyir3vobayjav7fok5ys5cgwoaewlf6gwoleior364",
+        "skill/valory/optimus_abci/0.1.0": "bafybeiadjvqfs5is4cf7yb74l2cgmblkvjwfkrv2xn7byhvslmovvwpfzy",
+        "agent/valory/optimus/0.1.0": "bafybeicjus22cvpmab2jx33x4cnnuhnd2up4ezia7lnr4njbgbqwt6ue7e",
+        "service/valory/optimus/0.1.0": "bafybeiakhjobjcnqgx2gcdsxhpybwlgcyoll3jovwoygs6hk2hx67cjiiy"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",

diff --git a/packages/valory/agents/optimus/aea-config.yaml b/packages/valory/agents/optimus/aea-config.yaml
@@ -35,8 +35,8 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeihu2bcgjk2tqjiq2zhk3uogtfszqn4osvdt7ho3fubdpdj4jgdfjm
 - valory/abstract_round_abci:0.1.0:bafybeibovsktd3uxur45nrcomq5shcn46cgxd5idmhxbmjhg32c5abyqim
-- valory/liquidity_trader_abci:0.1.0:bafybeihii4e64akqkelii37havxmet3qeg5vlv4vg2toekoaww6tk7zudi
-- valory/optimus_abci:0.1.0:bafybeiazrizmyz5rbqkodjo3jrregmeoyg2qrov4p5qyh5znggeg2kmtdi
+- valory/liquidity_trader_abci:0.1.0:bafybeiftxq6ipny6wyir3vobayjav7fok5ys5cgwoaewlf6gwoleior364
+- valory/optimus_abci:0.1.0:bafybeiadjvqfs5is4cf7yb74l2cgmblkvjwfkrv2xn7byhvslmovvwpfzy
 - valory/registration_abci:0.1.0:bafybeicnth5q4httefsusywx3zrrq4al47owvge72dqf2fziruicq6hqta
 - valory/reset_pause_abci:0.1.0:bafybeievjciqdvxhqxfjd4whqs27h6qbxqzrae7wwj7fpvxlvmtw3x35im
 - valory/termination_abci:0.1.0:bafybeid54buqxipiuduw7b6nnliiwsxajnltseuroad53wukfonpxca2om
@@ -197,7 +197,7 @@ models:
       allowed_dexs: ${list:["balancerPool", "UniswapV3"]}
       initial_assets: ${str:{"ethereum":{"0x0000000000000000000000000000000000000000":"ETH","0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48":"USDC"}}}
       safe_contract_addresses: ${str:{"ethereum":"0x0000000000000000000000000000000000000000","base":"0x07e27E181Df065141ee90a4DD43cE4113bc9853C","optimism":"0x07e27E181Df065141ee90a4DD43cE4113bc9853C"}}
-      merkl_fetch_campaigns_args: ${str:{"url":"https://api.merkl.xyz/v3/campaigns","creator":"superfest","live":"true"}}
+      merkl_fetch_campaigns_args: ${str:{"url":"https://api.merkl.xyz/v3/campaigns","creator":"","live":"true"}}
       allowed_chains: ${list:["optimism","base"]}
       gas_reserve: ${str:{"ethereum":1000,"optimism":1000,"base":1000}}
       round_threshold: ${int:0}
@@ -216,7 +216,7 @@ models:
       balancer_vault_contract_addresses: ${str:{"optimism":"0xBA12222222228d8Ba445958a75a0704d566BF2C8","base":"0xBA12222222228d8Ba445958a75a0704d566BF2C8"}}
       uniswap_position_manager_contract_addresses: ${str:{"optimism":"0xC36442b4a4522E871399CD717aBDD847Ab11FE88","base":"0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1"}}
       chain_to_chain_key_mapping: ${str:{"ethereum":"eth","optimism":"opt","base":"bas"}}
-      waiting_period_for_retry: ${int:5}
+      waiting_period_for_status_check: ${int:5}
       max_num_of_retries: ${int:5}
       reward_claiming_time_period: ${int:28800}
       merkl_distributor_contract_addresses: ${str:{"optimism":"0x3Ef3D8bA38EBe18DB133cEc108f4D14CE00Dd9Ae","base":"0x3Ef3D8bA38EBe18DB133cEc108f4D14CE00Dd9Ae"}}
@@ -233,3 +233,4 @@ models:
       store_path: ${str:/data/}
       assets_info_filename: ${str:assets.json}
       pool_info_filename: ${str:current_pool.json}
+      balancer_graphql_endpoints: ${str:{"optimism":"https://api.studio.thegraph.com/query/75376/balancer-optimism-v2/version/latest","base":"https://api.studio.thegraph.com/query/24660/balancer-base-v2/version/latest"}}
diff --git a/packages/valory/services/optimus/service.yaml b/packages/valory/services/optimus/service.yaml
@@ -6,7 +6,7 @@ aea_version: '>=1.0.0, <2.0.0'
 license: Apache-2.0
 fingerprint: {}
 fingerprint_ignore_patterns: []
-agent: valory/optimus:0.1.0:bafybeicjbstfud6oljhtbobgahpzujyigo2u3eit62srji2ik52irhdv7i
+agent: valory/optimus:0.1.0:bafybeicjus22cvpmab2jx33x4cnnuhnd2up4ezia7lnr4njbgbqwt6ue7e
 number_of_agents: 1
 deployment: {}
 ---
@@ -74,7 +74,8 @@ models:
       store_path: ${STORE_PATH:str:/data/}
       assets_info_filename: ${ASSETS_INFO_FILENAME:str:assets.json}
       pool_info_filename: ${POOL_INFO_FILENAME:str:current_pool.json}
-      merkl_fetch_campaigns_args: ${MERKL_FETCH_CAMPAIGNS_ARGS:str:{"url":"https://api.merkl.xyz/v3/campaigns","creator":"superfest","live":"true"}}
+      merkl_fetch_campaigns_args: ${MERKL_FETCH_CAMPAIGNS_ARGS:str:{"url":"https://api.merkl.xyz/v3/campaigns","creator":"","live":"true"}}
+      balancer_graphql_endpoints: ${BALANCER_GRAPHQL_ENDPOINTS:str:{"optimism":"https://api.studio.thegraph.com/query/75376/balancer-optimism-v2/version/latest","base":"https://api.studio.thegraph.com/query/24660/balancer-base-v2/version/latest"}}
 ---
 public_id: valory/ledger:0.19.0
 type: connection