Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use mech_interact_abci #238

Merged
merged 26 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d4088d1
chore: bump
angrybayblade Mar 20, 2024
beb882a
[no ci] chore: update packages.json
jmoreira-valory Mar 20, 2024
1c878e7
[no ci] chore: add required parameters
jmoreira-valory Mar 20, 2024
883ba48
Merge commit 'd4088d1dec963d8a849c06df676d6603094ac3a2' into feat/use…
jmoreira-valory Mar 21, 2024
08322a7
[no ci] feat: rewired
jmoreira-valory Mar 21, 2024
aff2e3a
[no ci] chore: update
jmoreira-valory Mar 21, 2024
5921fe0
[no ci] chore: update decision receive, request
jmoreira-valory Mar 22, 2024
a4e0496
[no ci] chore: fixes
jmoreira-valory Mar 22, 2024
7c0005f
[no ci] chore: fix parameter
jmoreira-valory Mar 22, 2024
54bde75
[no ci] chore: fix params
jmoreira-valory Mar 22, 2024
e4433e0
[no ci] fix: params
jmoreira-valory Mar 22, 2024
7df413c
[no ci] fix: round
jmoreira-valory Mar 22, 2024
a9eb60d
[no ci] chore: hashes
jmoreira-valory Mar 24, 2024
b26980f
chore: linters
jmoreira-valory Mar 25, 2024
2a636f2
fix: linters
jmoreira-valory Mar 25, 2024
852eb89
fix: linters
jmoreira-valory Mar 25, 2024
0dfc6ad
Merge remote-tracking branch 'origin/main' into feat/use_mech_interac…
jmoreira-valory Mar 27, 2024
38d85bb
fix: mech_price
jmoreira-valory Apr 2, 2024
4ad8174
fix: linters
jmoreira-valory Apr 2, 2024
d6a92bc
fix: linters
jmoreira-valory Apr 2, 2024
4890c9a
chore: update mech_interact_abci hash
jmoreira-valory Apr 3, 2024
ea6579a
[no ci] fix: change multisend_batch_size to 1 by default
jmoreira-valory Apr 3, 2024
dc3d64a
[no ci] fix: exception handling
jmoreira-valory Apr 3, 2024
b4f5550
fix: review changes
jmoreira-valory Apr 3, 2024
a301c99
chore: update hashes
jmoreira-valory Apr 3, 2024
072a0b3
chore: update hashes
jmoreira-valory Apr 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ packages/valory/connections/p2p_libp2p_client/

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/transaction_settlement_abci/
packages/valory/skills/termination_abci/

packages/valory/contracts/mech/
packages/valory/contracts/gnosis_safe_proxy_factory/
packages/valory/contracts/multisend/
packages/valory/contracts/service_registry/
Expand Down
15 changes: 8 additions & 7 deletions packages/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@
"custom/w1kke/always_blue/0.1.0": "bafybeieshu32h3es2fslduuhr7nimuvh2vuibyeqdunzrcggaeohekg3jm",
"contract/valory/market_maker/0.1.0": "bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq",
"contract/valory/erc20/0.1.0": "bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54",
"contract/valory/mech/0.1.0": "bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa",
"contract/valory/realitio/0.1.0": "bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq",
"contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4",
"contract/valory/conditional_tokens/0.1.0": "bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu",
"contract/valory/agent_registry/0.1.0": "bafybeibedc7ehebk3ikr4cowjbvgpxqpu65nforgqmraxqxiq5jv6rboqe",
"contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu",
"contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4",
"skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache",
"skill/valory/decision_maker_abci/0.1.0": "bafybeie7bvctvvmphamfrujtnsg2wxeafuoquvgikhm33xrowtpybj2iyy",
"skill/valory/trader_abci/0.1.0": "bafybeif44yj3ylxwu3pch5tfejwxdoq42vu34cfapsbiolggkxygbcz4ve",
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeico5v6u7dmy7tj4nwakmoef5ihirivtb7s5lxm3v6szsco3ulkctu",
"skill/valory/decision_maker_abci/0.1.0": "bafybeiftz2xjbld2njsywsii5pgp6354oqm6ultqyfyfsnemuzqulw6o2y",
"skill/valory/trader_abci/0.1.0": "bafybeidrrl5mni5i4gsde7pfms6shsljmnwdcgo4pqeaujvti446rkkgxu",
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifshd7ut2eyzyolvwpjcjxreq2c655gz4nh2vudglvfb7oog7gase",
"skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e",
"agent/valory/trader/0.1.0": "bafybeid7u2back4fs6tjg2xreuuoxffhyts7zqnopkaf33727nnudb4zhu",
"service/valory/trader/0.1.0": "bafybeiasnt464j7qfatuju2g6e6k2rgtebwqrdpyi5hij7xr5uwpwp4a2e"
"agent/valory/trader/0.1.0": "bafybeib2gnqwi5mmlz3efkzlahgwunpwt75nhpsvitllllnet5zu7jtb5u",
"service/valory/trader/0.1.0": "bafybeie4sj2z3iaxxpuxe2sefkjaorwe5f5ndud2qmq6paf6vyiywjr7gm"
},
"third_party": {
"protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",
Expand All @@ -32,6 +31,7 @@
"protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm",
"contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74",
"contract/valory/gnosis_safe/0.1.0": "bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa",
"contract/valory/mech/0.1.0": "bafybeiejdn3rqqa7smbeiypajy63um7okteimvj6bsud3gezneycmdc6te",
"contract/valory/service_registry/0.1.0": "bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm",
"contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y",
"connection/valory/abci/0.1.0": "bafybeiclexb6cnsog5yjz2qtvqyfnf7x5m7tpp56hblhk3pbocbvgjzhze",
Expand All @@ -44,6 +44,7 @@
"skill/valory/registration_abci/0.1.0": "bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm",
"skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i",
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq",
"skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44"
"skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44",
"skill/valory/mech_interact_abci/0.1.0": "bafybeidxignwgujlkhw5hbek7xw2uz5nrd3h2xx7sj5zor263dgh4fm3p4"
}
}
18 changes: 13 additions & 5 deletions packages/valory/agents/trader/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contracts:
- valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq
- valory/erc20:0.1.0:bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54
- valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y
- valory/mech:0.1.0:bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa
- valory/mech:0.1.0:bafybeiejdn3rqqa7smbeiypajy63um7okteimvj6bsud3gezneycmdc6te
- valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu
- valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq
- valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4
Expand All @@ -44,11 +44,12 @@ skills:
- valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam
- valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44
- valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeico5v6u7dmy7tj4nwakmoef5ihirivtb7s5lxm3v6szsco3ulkctu
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifshd7ut2eyzyolvwpjcjxreq2c655gz4nh2vudglvfb7oog7gase
- valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache
- valory/decision_maker_abci:0.1.0:bafybeie7bvctvvmphamfrujtnsg2wxeafuoquvgikhm33xrowtpybj2iyy
- valory/trader_abci:0.1.0:bafybeif44yj3ylxwu3pch5tfejwxdoq42vu34cfapsbiolggkxygbcz4ve
- valory/decision_maker_abci:0.1.0:bafybeiftz2xjbld2njsywsii5pgp6354oqm6ultqyfyfsnemuzqulw6o2y
- valory/trader_abci:0.1.0:bafybeidrrl5mni5i4gsde7pfms6shsljmnwdcgo4pqeaujvti446rkkgxu
- valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e
- valory/mech_interact_abci:0.1.0:bafybeidxignwgujlkhw5hbek7xw2uz5nrd3h2xx7sj5zor263dgh4fm3p4
customs:
- valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m
- valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24
Expand Down Expand Up @@ -154,6 +155,7 @@ models:
reset_pause_duration: ${int:30}
max_healthcheck: ${int:43200}
multisend_address: ${str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761}
multisend_batch_size: ${int:1}
drand_public_key: ${str:868f005eb8e6e4ca0a47c8a77ceaa5309a47978a7c71bc5cce96366b5d7a569937c529eeda66c7293784a9402801af31}
service_registry_address: ${str:null}
agent_registry_address: ${str:null}
Expand All @@ -171,7 +173,8 @@ models:
languages: ${list:["en_US"]}
average_block_time: ${int:5}
abt_error_mult: ${int:5}
mech_agent_address: ${str:0x77af31De935740567Cf4fF1986D04B2c964A786a}
mech_contract_address: ${str:0x77af31De935740567Cf4fF1986D04B2c964A786a}
request_price: ${int:null}
sample_bets_closing_days: ${int:10}
trading_strategy: ${str:kelly_criterion}
use_fallback_strategy: ${bool:true}
Expand Down Expand Up @@ -241,3 +244,8 @@ config:
chain_id: ${int:1337}
default_gas_price_strategy: ${str:eip1559}
poa_chain: ${bool:false}
gnosis:
address: ${str:https://rpc.gnosischain.com}
chain_id: ${int:100}
poa_chain: ${bool:false}
default_gas_price_strategy: ${str:eip1559}
1 change: 0 additions & 1 deletion packages/valory/contracts/mech/README.md

This file was deleted.

20 changes: 0 additions & 20 deletions packages/valory/contracts/mech/__init__.py

This file was deleted.

Loading
Loading