Skip to content

Commit

Permalink
Merge branch 'main' into chore/bump
Browse files Browse the repository at this point in the history
  • Loading branch information
angrybayblade committed Nov 17, 2023
2 parents 71dc8e1 + 0569bc8 commit 5315ea4
Show file tree
Hide file tree
Showing 42 changed files with 2,743 additions and 341 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/common_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ jobs:
run: tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part protocols --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part websocket_client --exclude-part contract_subscription
- name: License compatibility check
run: tox -e liccheck
- name: Check dependencies
run: tox -e check-dependencies
# TODO: reactivate once false positives are fixed
# - name: Check dependencies
# run: tox -e check-dependencies
- name: Check doc links
run: tomte check-doc-links
- name: Check doc IPFS hashes
Expand Down Expand Up @@ -98,8 +99,8 @@ jobs:
pip install --user --upgrade setuptools
# install Protobuf compiler
wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip
unzip protoc-3.19.4-linux-x86_64.zip -d protoc
wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip
unzip protoc-24.3-linux-x86_64.zip -d protoc
sudo mv protoc/bin/protoc /usr/local/bin/protoc
# install IPFS
Expand Down
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ packages/valory/connections/abci/
packages/valory/connections/ipfs/
packages/valory/connections/ledger/
packages/valory/connections/p2p_libp2p_client/

packages/valory/skills/abstract_abci/

packages/valory/contracts/gnosis_safe_proxy_factory/
Expand All @@ -31,6 +30,15 @@ packages/valory/protocols/tendermint
.mypy_cache
/.tox/

packages/valory/protocols/abci
packages/valory/protocols/acn
packages/valory/protocols/contract_api
packages/valory/protocols/http
packages/valory/protocols/ipfs
packages/valory/protocols/ledger_api
packages/valory/protocols/tendermint


.env
.1env
keys.json
Expand Down
24 changes: 13 additions & 11 deletions packages/packages.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{
"dev": {
"connection/valory/websocket_client/0.1.0": "bafybeia3lo6hyhom2ht56gzgkv4gdsul5s4qoelljyks2wrcfvx5dtvsiq",
"skill/valory/contract_subscription/0.1.0": "bafybeigl52zsiduaabccpeqtii2f7uorzdnb6xgpoimo3mudvbudifmwtu",
"agent/valory/mech/0.1.0": "bafybeidsxvvyks3z5lq7ejkb4rj2ncqpxtqksj7xi2favs7u72syple4ji",
"skill/valory/mech_abci/0.1.0": "bafybeidh4ro4u6edng5oxggn27rzylo53yxxjujope2srrbdz3vkjvg2um",
"contract/valory/agent_mech/0.1.0": "bafybeiektlfcs66jmprajmfg45rvyxbq7wqwj2yzpohyvlux4447talgsa",
"service/valory/mech/0.1.0": "bafybeicn2biozztigz5lxgjqou6mgtpfm6cduqmqsd7nvnki2qxlcgwzse",
"connection/valory/websocket_client/0.1.0": "bafybeiako6kyllvgdmqio5y7zxqysaqlwfzjbdij4dkpsibuz3cznh3oza",
"skill/valory/contract_subscription/0.1.0": "bafybeibccykzca4ybe3ozbdfuxkbialdgsrr4zknxbowarbqt5onsffblq",
"agent/valory/mech/0.1.0": "bafybeiag6kzwog6zgdsk5v3sk6m636c67fipbcxuajfkcoozdt2knlt5da",
"skill/valory/mech_abci/0.1.0": "bafybeihmnjvk33yqhfptpmrayzx6fnfiwkyqwlr6xnlahqdrq34g7drccy",
"contract/valory/agent_mech/0.1.0": "bafybeicshvlc2slopzidzblf2zhdcw2uuav3ntxcgqduxskjujvebikg5u",
"service/valory/mech/0.1.0": "bafybeiei5uox7azc6otm5stj4hfggxzhyqh7mhv6erwftb7ok3i4wlplym",
"protocol/valory/acn_data_share/0.1.0": "bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq",
"protocol/valory/default/1.0.0": "bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq",
"skill/valory/task_submission_abci/0.1.0": "bafybeidis6ncqusjvhe4o3kwb2qjfc6kxsa3l5j635iaeuke6wm7ezylpi",
"skill/valory/task_execution/0.1.0": "bafybeihah7eanflznxfowubqbvfz7epqz5vnimylcpyelxukxzbt3jiaqi",
"skill/valory/task_submission_abci/0.1.0": "bafybeifzxp4rmqmobgzl5mcfsg3kuvwwzq7c456u2tzlpfq7s7j3tmzk6u",
"skill/valory/task_execution/0.1.0": "bafybeianf56ypn6pjrqvj24uhmty2b5vtsewzjcrqxnrqyjsuudhyjpiue",
"skill/valory/reset_pause_abci/0.1.0": "bafybeidgizxuqcmsznigog3ly5ffqk6wohthw3ohti4xcsalp7erxgxowe",
"skill/valory/registration_abci/0.1.0": "bafybeib2flpet4krdafrh55jljxlpplkzf4vfuideu6srjma23h7nf55yi",
"skill/valory/abstract_round_abci/0.1.0": "bafybeifutndycs3n4xxru76bzxmmr26v6sakbaaa3qgbpsxlkknsnzs6ve",
"connection/valory/http_client/0.23.0": "bafybeicc4msyohrmjzqiu7pgpqvxmyqd7mmp3vfuairdeea2o2pblpzcui",
"skill/valory/termination_abci/0.1.0": "bafybeign7rs4qg5pucqf6sqgwkirjomamnlp4zgai3a4q3xsq37z4mmonm",
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeieomj6ecrrolnhxrgygpdra3rjhgllursknsvup2m2illirjxaqu4",
"contract/valory/agent_registry/0.1.0": "bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu"
"skill/valory/termination_abci/0.1.0": "bafybeieupcqf7v4e77w7kpsgmh66vilsl4rlhytaoacg5txbw6qqcihcoy",
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeibei2b6l3s2msmirbgru6atbbr6ezneei2txwe3ya3aijgzcgfac4",
"contract/valory/agent_registry/0.1.0": "bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu",
"protocol/valory/websocket_client/0.1.0": "bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4",
"skill/valory/websocket_client/0.1.0": "bafybeiaazkuyvkg5xaz62tkmstqc65oyerwpdfe3vl2morsvxdolq4p2le"
},
"third_party": {
"protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii",
Expand Down
48 changes: 35 additions & 13 deletions packages/valory/agents/mech/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ connections:
- valory/ipfs:0.1.0:bafybeigfmqvlzbp67fttccpl4hsu3zaztbxv6vd7ikzra2hfppfkalgpji
- valory/ledger:0.19.0:bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm
- valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq
- valory/websocket_client:0.1.0:bafybeia3lo6hyhom2ht56gzgkv4gdsul5s4qoelljyks2wrcfvx5dtvsiq
- valory/websocket_client:0.1.0:bafybeiako6kyllvgdmqio5y7zxqysaqlwfzjbdij4dkpsibuz3cznh3oza
contracts:
- valory/agent_mech:0.1.0:bafybeiektlfcs66jmprajmfg45rvyxbq7wqwj2yzpohyvlux4447talgsa
- valory/agent_mech:0.1.0:bafybeicshvlc2slopzidzblf2zhdcw2uuav3ntxcgqduxskjujvebikg5u
- valory/gnosis_safe:0.1.0:bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4
- valory/gnosis_safe_proxy_factory:0.1.0:bafybeigejiv4fkksyjwmr6doo23kfpicfbktuwspbamasyvjusfdyjtrxy
- valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y
- valory/service_registry:0.1.0:bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi
- valory/agent_registry:0.1.0:bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu
protocols:
- open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii
- valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu
Expand All @@ -33,14 +34,15 @@ protocols:
skills:
- valory/abstract_abci:0.1.0:bafybeifmfv4bgt5vzvgawlocksacqeadzg72zs4usvgjaf245hbbptpiki
- valory/abstract_round_abci:0.1.0:bafybeifutndycs3n4xxru76bzxmmr26v6sakbaaa3qgbpsxlkknsnzs6ve
- valory/contract_subscription:0.1.0:bafybeigl52zsiduaabccpeqtii2f7uorzdnb6xgpoimo3mudvbudifmwtu
- valory/mech_abci:0.1.0:bafybeidh4ro4u6edng5oxggn27rzylo53yxxjujope2srrbdz3vkjvg2um
- valory/contract_subscription:0.1.0:bafybeibccykzca4ybe3ozbdfuxkbialdgsrr4zknxbowarbqt5onsffblq
- valory/mech_abci:0.1.0:bafybeihmnjvk33yqhfptpmrayzx6fnfiwkyqwlr6xnlahqdrq34g7drccy
- valory/task_execution:0.1.0:bafybeianf56ypn6pjrqvj24uhmty2b5vtsewzjcrqxnrqyjsuudhyjpiue
- valory/registration_abci:0.1.0:bafybeib2flpet4krdafrh55jljxlpplkzf4vfuideu6srjma23h7nf55yi
- valory/reset_pause_abci:0.1.0:bafybeidgizxuqcmsznigog3ly5ffqk6wohthw3ohti4xcsalp7erxgxowe
- valory/task_execution:0.1.0:bafybeihah7eanflznxfowubqbvfz7epqz5vnimylcpyelxukxzbt3jiaqi
- valory/task_submission_abci:0.1.0:bafybeidis6ncqusjvhe4o3kwb2qjfc6kxsa3l5j635iaeuke6wm7ezylpi
- valory/termination_abci:0.1.0:bafybeign7rs4qg5pucqf6sqgwkirjomamnlp4zgai3a4q3xsq37z4mmonm
- valory/transaction_settlement_abci:0.1.0:bafybeieomj6ecrrolnhxrgygpdra3rjhgllursknsvup2m2illirjxaqu4
- valory/task_submission_abci:0.1.0:bafybeifzxp4rmqmobgzl5mcfsg3kuvwwzq7c456u2tzlpfq7s7j3tmzk6u
- valory/termination_abci:0.1.0:bafybeieupcqf7v4e77w7kpsgmh66vilsl4rlhytaoacg5txbw6qqcihcoy
- valory/transaction_settlement_abci:0.1.0:bafybeibei2b6l3s2msmirbgru6atbbr6ezneei2txwe3ya3aijgzcgfac4
- valory/websocket_client:0.1.0:bafybeiaazkuyvkg5xaz62tkmstqc65oyerwpdfe3vl2morsvxdolq4p2le
default_ledger: ethereum
required_ledgers:
- ethereum
Expand Down Expand Up @@ -87,6 +89,16 @@ dependencies:
version: ==0.0.303
scikit-learn:
version: ==1.3.1
pandas:
version: ==2.1.1
hypothesis:
version: ==6.21.6
spacy:
version: ==3.7.2
tiktoken:
version: ==0.5.1
python-dateutil:
version: ==2.8.2
default_connection: null
---
public_id: valory/websocket_client:0.1.0:bafybeiexove4oqyhoae5xmk2hilskthosov5imdp65olpgj3cfrepbouyy
Expand All @@ -99,9 +111,8 @@ is_abstract: true
public_id: valory/contract_subscription:0.1.0:bafybeiby5ajjc7a3m2uq73d2pprx6enqt4ghfcq2gkmrtsr75e4d4napi4
type: skill
behaviours:
subscriptions:
args:
contracts: ${list:["0xFf82123dFB52ab75C417195c5fDB87630145ae81"]}
contract_subscriptions:
args: {}
handlers:
new_event:
args:
Expand Down Expand Up @@ -150,13 +161,17 @@ models:
tendermint_max_retries: ${int:5}
tendermint_url: ${str:http://localhost:26657}
use_termination: ${bool:false}
agent_mech_contract_address: ${str:0xFf82123dFB52ab75C417195c5fDB87630145ae81}
agent_mech_contract_addresses: ${list:["0xFf82123dFB52ab75C417195c5fDB87630145ae81"]}
round_timeout_seconds: ${float:30.0}
reset_period_count: ${int:1000}
on_chain_service_id: ${int:1}
agent_registry_address: ${str:0x0000000000000000000000000000000000000000}
agent_id: ${int:3}
metadata_hash: ${str:null}
share_tm_config_on_startup: ${bool:false}
multisend_address: ${str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761}
service_registry_address: ${str:0x9338b5153AE39BB89f50468E608eD9d764B755fD}
init_fallback_gas: ${int:500000}
setup:
all_participants: ${list:["0x10E867Ac2Fb0Aa156ca81eF440a5cdf373bE1AaC"]}
safe_contract_address: ${str:0x5e1D1eb61E1164D5a50b28C575dA73A29595dFf7}
Expand All @@ -167,14 +182,16 @@ type: skill
models:
params:
args:
agent_mech_contract_address: ${str:0xFf82123dFB52ab75C417195c5fDB87630145ae81}
agent_mech_contract_addresses: ${list:["0xFf82123dFB52ab75C417195c5fDB87630145ae81"]}
task_deadline: ${float:240.0}
file_hash_to_tools_json: ${list:[["bafybeibi34bhbvesmvd6o24jxvuldrwen4wj62na3lhva7k4afkg2shinu",["openai-text-davinci-002","openai-text-davinci-003","openai-gpt-3.5-turbo","openai-gpt-4"]],["bafybeiafdm3jctiz6wwo3rmo3vdubk7j7l5tumoxi5n5rc3x452mtkgyua",["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"]],["bafybeidpbnqbruzqlq424qt3i5dcvyqmcimshjilftabnrroujmjhdmteu",["transfer-native"]],["bafybeiglhy5epaytvt5qqdx77ld23ekouli53qrf2hjyebd5xghlunidfi",["prediction-online","prediction-offline"]]]}
api_keys_json: ${list:[["openai", "dummy_api_key"],["stabilityai", "dummy_api_key"],["google_api_key",
"dummy_api_key"],["google_engine_id", "dummy_api_key"]]}
polling_interval: ${float:30.0}
agent_index: ${int:0}
num_agents: ${int:4}
from_block_range: ${int:50000}
timeout_limit: ${int:3}
---
public_id: valory/ledger:0.19.0
type: connection
Expand All @@ -185,3 +202,8 @@ 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}
Loading

0 comments on commit 5315ea4

Please sign in to comment.