Merge pull request #269 from valory-xyz/develop

Merging develop into main
valory-xyz · Nov 22, 2024 · a402730 · a402730
2 parents bae5b45 + 575c8f3
commit a402730
Show file tree

Hide file tree

Showing 149 changed files with 1,095 additions and 23,998 deletions.
diff --git a/.example.env b/.example.env
@@ -1,10 +1,13 @@
-FILE_HASH_TO_TOOLS='[["bafybeibdcttrlgp5udygntka5fofi566pitkxhquke37ng7csvndhy4s2i",["openai-gpt-3.5-turbo-instruct","openai-gpt-3.5-turbo","openai-gpt-4"]],["bafybeiegbsq2ajxyipajac4mmxyvbt22ctwyuypuid6ziavqpndns6fsjy",["stabilityai-stable-diffusion-v1-5","stabilityai-stable-diffusion-xl-beta-v2-2-2","stabilityai-stable-diffusion-512-v2-1","stabilityai-stable-diffusion-768-v2-1"]],["bafybeihugaylajwh2fgypxatcw5qrw5qxadtrsi2h2s2246442wlvjirtm",["transfer-native"]],["bafybeiayity7o6c2yynrpe6libyak37hgf4fp7a4kjfcnqkkxwy3zkp3ie",["prediction-offline","prediction-online"]],["bafybeifpalgiya4dyu42hehsqxlwr36fjtxdo75xf3gcpfrauvoxgargy4",["gemini-pro", "gemini-1.0-pro-001", "gemini-1.0-pro-latest", "gemini-1.5-pro-latest"]]]'
-API_KEYS='[["openai","dummy_api_key"],["stabilityai","dummy_api_key"],["gemini","dummy_api_key"]]'
+TOOLS_TO_PACKAGE_HASH="{"openai-gpt-3.5-turbo-instruct":"bafybeigz5brshryms5awq5zscxsxibjymdofm55dw5o6ud7gtwmodm3vmq","openai-gpt-3.5-turbo":"bafybeigz5brshryms5awq5zscxsxibjymdofm55dw5o6ud7gtwmodm3vmq","openai-gpt-4":"bafybeigz5brshryms5awq5zscxsxibjymdofm55dw5o6ud7gtwmodm3vmq"}"
+API_KEYS="{"openai":"dummy_api_key", "google_api_key":"dummy_api_key"}"
 ETHEREUM_LEDGER_RPC_0=https://rpc.eu-central-2.gateway.fm/v4/gnosis/non-archival/mainnet
 GNOSIS_RPC_0=https://rpc.eu-central-2.gateway.fm/v4/gnosis/non-archival/mainnet
 ETHEREUM_WEBSOCKET_RPC_0=wss://rpc.eu-central-2.gateway.fm/ws/v4/gnosis/non-archival/mainnet
 ETHEREUM_LEDGER_CHAIN_ID=100
 ALL_PARTICIPANTS='["0x10E867Ac2Fb0Aa156ca81eF440a5cdf373bE1AaC"]'
-RESET_PAUSE_DURATION=100
 SAFE_CONTRACT_ADDRESS="0x5e1D1eb61E1164D5a50b28C575dA73A29595dFf7"
-AGENT_MECH_CONTRACT_ADDRESS="0xFf82123dFB52ab75C417195c5fDB87630145ae81"
+SERVICE_REGISTRY_ADDRESS="0x9338b5153AE39BB89f50468E608eD9d764B755fD"
+AGENT_REGISTRY_ADDRESS="0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA"
+MECH_MARKETPLACE_ADDRESS="0x4554fE75c1f5576c1d7F765B2A036c199Adae329"
+MECH_TO_SUBSCRIPTION="{"0x77af31De935740567Cf4fF1986D04B2c964A786a":{"tokenAddress":"0x0000000000000000000000000000000000000000","tokenId":"1"}}"
+MECH_TO_CONFIG="{"0xFf82123dFB52ab75C417195c5fDB87630145ae81":{"use_dynamic_pricing":false,"is_marketplace_mech":false}}"
diff --git a/.github/workflows/common_checks.yaml b/.github/workflows/common_checks.yaml
@@ -156,20 +156,4 @@ jobs:
           sudo apt-get autoremove
           sudo apt-get autoclean
           pip install tomte[tox,cli]==0.2.15
-          pip install --user --upgrade setuptools
-      - name: Tool unit tests
-        env:
-          OPENAI_SECRET_KEY: ${{ secrets.OPENAI_API_KEY }}
-          STABILITY_API_KEY: ${{ secrets.STABILITY_AI_KEY }}
-          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
-          GOOGLE_ENGINE_ID: ${{ vars.GOOGLE_ENGINE_ID }}
-          CLAUDE_API_KEY: ${{ secrets.CLAUDE_API_KEY }}
-          REPLICATE_API_KEY: ${{ secrets.REPLICATE_API_KEY }}
-          NEWS_API_KEY: ${{ secrets.NEWS_API_KEY }}
-          OPENROUTER_API_KEY: ${{ secrets.OPEN_ROUTER_API_KEY }}
-          GNOSIS_RPC_URL: ${{ secrets.GNOSIS_RPC_URL }}
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-          GRAPH_API_KEY: ${{ secrets.GRAPH_API_KEY }}
-        run: |
-          printenv
-          tox -e check-tools
+          pip install --user --upgrade setuptools
diff --git a/.gitleaksignore b/.gitleaksignore
@@ -137,4 +137,5 @@ eecbf34a242377fb07d28230cf11ea43fb07de8d:packages/valory/skills/task_execution/s
 d7f9fd6ad8bcf9ea2bf14bf3de221971ddb56268:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
 c0dee637e3d520b9706e91db197e859ca5fce23a:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
 c0aaf1331142b5e804d41ebe1a17be19b6014eb4:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
-bead325392d69c64be89a862c92134e5b8663832:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
+bead325392d69c64be89a862c92134e5b8663832:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
+0d067561292282eee8a0b8036daeafba0eaa7734:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
diff --git a/README.md b/README.md
diff --git a/mints/10.json b/mints/10.json
diff --git a/mints/10.png b/mints/10.png
diff --git a/mints/11.json b/mints/11.json
diff --git a/mints/11.png b/mints/11.png
diff --git a/mints/12.json b/mints/12.json
diff --git a/mints/12.png b/mints/12.png
diff --git a/mints/13.json b/mints/13.json
diff --git a/mints/13.png b/mints/13.png
diff --git a/mints/14.json b/mints/14.json
diff --git a/mints/14.png b/mints/14.png
diff --git a/mints/15.json b/mints/15.json
diff --git a/mints/15.png b/mints/15.png
diff --git a/mints/16.json b/mints/16.json
diff --git a/mints/16.png b/mints/16.png
diff --git a/mints/17.json b/mints/17.json
diff --git a/mints/17.png b/mints/17.png
diff --git a/mints/18.json b/mints/18.json
diff --git a/mints/18.png b/mints/18.png
diff --git a/mints/mapping.txt b/mints/mapping.txt
@@ -8,18 +8,7 @@ token_id-"component_id"
 84-"skill/valory/task_execution_abci/0.1.0"
 85-"skill/valory/mech_abci/0.1.0"
 168-"custom/valory/openai_request/0.1.0"
-169-"custom/psouranis/optimization_by_prompting/0.1.0"
-170-"custom/valory/prediction_request/0.1.0"
-171-"custom/valory/prediction_request_claude/0.1.0"
-172-"custom/valory/prediction_request_embedding/0.1.0"
-173-"custom/nickcom007/prediction_request_sme/0.1.0"
-174-"custom/jhehemann/prediction_sum_url_content/0.1.0"
-175-"custom/nickcom007/sme_generation_request/0.1.0"
-176-"custom/valory/stability_ai_request/0.1.0"
-181-"custom/polywrap/prediction_with_research_report/0.1.0"
-186-"custom/valory/resolve_market/0.1.0"
-TBD-"custom/napthaai/prediction_request_rag/0.1.0"
-TBD-"custom/napthaai/resolve_market_reasoning/0.1.0"
+
 ---
 token_id-"agent_id"
 9-"agent/valory/mech/0.1.0"

diff --git a/mints/whitelist.txt b/mints/whitelist.txt
@@ -1,5 +1 @@
-contract/valory/agent_registry/0.1.0
-custom/napthaai/prediction_request_rag/0.1.0
-custom/napthaai/prediction_request_reasoning/0.1.0
-custom/napthaai/resolve_market_reasoning/0.1.0
-custom/polywrap/prediction_with_research_report/0.1.0
+contract/valory/agent_registry/0.1.0
diff --git a/packages/dvilela/customs/__init__.py b/packages/dvilela/customs/__init__.py
diff --git a/packages/dvilela/customs/corcel_request/__init__.py b/packages/dvilela/customs/corcel_request/__init__.py
diff --git a/packages/dvilela/customs/corcel_request/component.yaml b/packages/dvilela/customs/corcel_request/component.yaml
diff --git a/packages/dvilela/customs/corcel_request/corcel_request.py b/packages/dvilela/customs/corcel_request/corcel_request.py
diff --git a/packages/dvilela/customs/gemini_prediction/__init__.py b/packages/dvilela/customs/gemini_prediction/__init__.py
diff --git a/packages/dvilela/customs/gemini_prediction/component.yaml b/packages/dvilela/customs/gemini_prediction/component.yaml