Skip to content

Commit

Permalink
Merge pull request #40 from valory-xyz/fix/none-outcome
Browse files Browse the repository at this point in the history
Reopened to include missing changes
  • Loading branch information
Adamantios authored Aug 3, 2023
2 parents 931eac3 + 38b822d commit 631b854
Show file tree
Hide file tree
Showing 14 changed files with 111 additions and 110 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ agent/
trader/
!/packages/valory/agents/trader/
!/packages/valory/services/trader/
/trader_service/
36 changes: 18 additions & 18 deletions packages/packages.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dev": {
"skill/valory/market_manager_abci/0.1.0": "bafybeid2sx5aorbyozxivzk7wfcfsydkil3nxsadb26zt2cri6v2l324ue",
"skill/valory/decision_maker_abci/0.1.0": "bafybeihs4k26uk57evqvefqqql627q7vuyrireupam5baqafzxcwtsnvf4",
"skill/valory/trader_abci/0.1.0": "bafybeieft6qr7rtl7yvv72uyfl6slyiazcxv6nvczdyulfnza5cxfir5fu",
"contract/valory/market_maker/0.1.0": "bafybeig3b2wfngntdypnixi2gphuqz3o6w7zba2rq6n6kepwdmth2mx3ni",
"agent/valory/trader/0.1.0": "bafybeig3ar7o6xplpfljxtl356sebmuk2hyjhqh5lgdyhhb7e4iif4kndq",
"service/valory/trader/0.1.0": "bafybeidpwt4phbjwu353hv6uqhmx57yajiwrw3oepadyvoak3c5nygozqu",
"contract/valory/erc20/0.1.0": "bafybeid4dnlzxpvb7sbgo2bnnffzwk5scelytshworzbfyxce6ibdyk67i",
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiavkmrdwdif5i5fs4vz43i43ecashbzzz6r7c5xojtyuhpm35vz2u",
"skill/valory/market_manager_abci/0.1.0": "bafybeiezuq5lpq6h4mj5tuvare3pihsdxqfnvrpkv5ektl4zinl5rlqtam",
"skill/valory/decision_maker_abci/0.1.0": "bafybeieg2oi23fvbhq3c6yuorlsmb4lsxofnqlxxza3jdt7vr4nh2sblha",
"skill/valory/trader_abci/0.1.0": "bafybeiflcgooxsfsm2om2525qysnbxmzry4beyz4olcwysytleny7wv7cm",
"contract/valory/market_maker/0.1.0": "bafybeibn7pcfywutlw6cvzpo7uwuu7eikcwjanzhiz4mt3ec2p3u4d2ks4",
"agent/valory/trader/0.1.0": "bafybeicbr4xm6xqvrs54ztofn3scerofvu44gnfndejg23q5xs7ue7yldm",
"service/valory/trader/0.1.0": "bafybeihdl7u6a2khmvpz2iebjgmmxcyd3bpn7rv5dcdduj2wtac2eqrede",
"contract/valory/erc20/0.1.0": "bafybeic3ise3v233qz3mm5dst53rhcbwnyxxhzefmf7a3cz5avtapuxpbq",
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigsrdprbk664hyym7xmyypc7zhccanq5lpf7t7l3m6auhoebm3evq",
"contract/valory/mech/0.1.0": "bafybeib3syh35usqjtqapqjjvobnkcxllkpjbxcb67g3vp3f566qsbhqgq"
},
"third_party": {
Expand All @@ -19,20 +19,20 @@
"protocol/valory/acn/1.1.0": "bafybeiapa5ilsobggnspoqhspftwolrx52udrwmaxdxgrk26heuvl4oooa",
"protocol/valory/tendermint/0.1.0": "bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa",
"protocol/valory/ipfs/0.1.0": "bafybeibjzhsengtxfofqpxy6syamplevp35obemwfp4c5lhag3v2bvgysa",
"skill/valory/abstract_abci/0.1.0": "bafybeiamr3cwetayz6lr72buhq6iviabtboj4hhpq47tlumimxolvvqjcy",
"skill/valory/reset_pause_abci/0.1.0": "bafybeialcwck7fahrr23jckv5qjwg3cdq4ai2ihyjsofnbj44jzyl4cjmm",
"skill/valory/registration_abci/0.1.0": "bafybeibafy7qmcvvzaykimy3mbqdwtcuajmbghqilaa7zwkh6wla33cfce",
"skill/valory/abstract_round_abci/0.1.0": "bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i",
"connection/valory/abci/0.1.0": "bafybeig6difzdar2n5gya7cq2xa7c2rxxp65xlxviatqzg33kivvc3zaam",
"skill/valory/abstract_abci/0.1.0": "bafybeih3bwx5apteinnoxts7sqmjlskntdbo7vvnmdbs5noo2pv76by7fu",
"skill/valory/reset_pause_abci/0.1.0": "bafybeigzvwbzktclahjbsyiwqnj6poree4iveon5pric6s5ixb6wrhkdhq",
"skill/valory/registration_abci/0.1.0": "bafybeia25gpusnkakb2dp4heqkwtuftbc2apppq3i4bds6sphltsovgzvi",
"skill/valory/abstract_round_abci/0.1.0": "bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm",
"connection/valory/abci/0.1.0": "bafybeic6beo7cpd2qtotntlbmsrs3qfn7fw5eh2vkav6milat6awao46pu",
"connection/valory/http_client/0.23.0": "bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y",
"connection/valory/ledger/0.19.0": "bafybeiejc7g7ebv3cleiqb4f4h4pspcu6vtr54332szwlqiabfs3sfdh44",
"connection/valory/p2p_libp2p_client/0.1.0": "bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq",
"connection/valory/ipfs/0.1.0": "bafybeicwe4fksbhaqs4qycfdqbzgqtikfn3u4g5y5fucxfmriezwwf7hse",
"contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeigbtbgzqlt4tufgymtjsyxiqvivxmtc4csx43hmo5nexmdfcxm6bi",
"contract/valory/gnosis_safe/0.1.0": "bafybeic3ajabs7sl6qgkzy452szlsdeitj746kdzfd7k4m4ixtxw4g33qi",
"contract/valory/service_registry/0.1.0": "bafybeiae7nr5fqn6ckt3ehol27qfd4o5ljzx6kk5k32lgtrvj3mtb62ufm",
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeiacwr7p4nhhufoey7uz2jqkegrlykdrmc7mm3rzkvh2mslu66gyle",
"contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeiesdz7xfijeomjpps3e5k3zspvisx2xje6yqub6hzj4uczr7q33wq",
"contract/valory/gnosis_safe/0.1.0": "bafybeibhezhwgi5ustv675gfohsq5l5xjijp36gqueuicyl2ofrtkrortm",
"contract/valory/service_registry/0.1.0": "bafybeidjm7w7pugc6kzrxlhbtnnc4rpgr3pkrg3owdxacrccar5qqwyu2e",
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm",
"contract/valory/multisend/0.1.0": "bafybeict2k3vf3c4fvzosaq5kku2ivtzsskbomrujmmoicut7eg52onnje",
"skill/valory/termination_abci/0.1.0": "bafybeifqsogqiar4yook5bu3j6z66dbdcizey7dr3e5oxeocdjijvfbaja"
"skill/valory/termination_abci/0.1.0": "bafybeibcdgnarxyyqexncpfewcemraryywtwueuv7qthsjuean5l77lp2e"
}
}
34 changes: 17 additions & 17 deletions packages/valory/agents/trader/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ fingerprint:
__init__.py: bafybeighcq4pmuzte6vhvvprrvo563vzghkoit2h6qdqxf2ma5bghevkee
fingerprint_ignore_patterns: []
connections:
- valory/abci:0.1.0:bafybeig6difzdar2n5gya7cq2xa7c2rxxp65xlxviatqzg33kivvc3zaam
- valory/abci:0.1.0:bafybeic6beo7cpd2qtotntlbmsrs3qfn7fw5eh2vkav6milat6awao46pu
- valory/http_client:0.23.0:bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y
- valory/ipfs:0.1.0:bafybeicwe4fksbhaqs4qycfdqbzgqtikfn3u4g5y5fucxfmriezwwf7hse
- valory/ledger:0.19.0:bafybeiejc7g7ebv3cleiqb4f4h4pspcu6vtr54332szwlqiabfs3sfdh44
- valory/p2p_libp2p_client:0.1.0:bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq
contracts:
- valory/gnosis_safe:0.1.0:bafybeic3ajabs7sl6qgkzy452szlsdeitj746kdzfd7k4m4ixtxw4g33qi
- valory/gnosis_safe_proxy_factory:0.1.0:bafybeigbtbgzqlt4tufgymtjsyxiqvivxmtc4csx43hmo5nexmdfcxm6bi
- valory/service_registry:0.1.0:bafybeiae7nr5fqn6ckt3ehol27qfd4o5ljzx6kk5k32lgtrvj3mtb62ufm
- valory/market_maker:0.1.0:bafybeig3b2wfngntdypnixi2gphuqz3o6w7zba2rq6n6kepwdmth2mx3ni
- valory/erc20:0.1.0:bafybeid4dnlzxpvb7sbgo2bnnffzwk5scelytshworzbfyxce6ibdyk67i
- valory/gnosis_safe:0.1.0:bafybeibhezhwgi5ustv675gfohsq5l5xjijp36gqueuicyl2ofrtkrortm
- valory/gnosis_safe_proxy_factory:0.1.0:bafybeiesdz7xfijeomjpps3e5k3zspvisx2xje6yqub6hzj4uczr7q33wq
- valory/service_registry:0.1.0:bafybeidjm7w7pugc6kzrxlhbtnnc4rpgr3pkrg3owdxacrccar5qqwyu2e
- valory/market_maker:0.1.0:bafybeibn7pcfywutlw6cvzpo7uwuu7eikcwjanzhiz4mt3ec2p3u4d2ks4
- valory/erc20:0.1.0:bafybeic3ise3v233qz3mm5dst53rhcbwnyxxhzefmf7a3cz5avtapuxpbq
- valory/multisend:0.1.0:bafybeict2k3vf3c4fvzosaq5kku2ivtzsskbomrujmmoicut7eg52onnje
- valory/mech:0.1.0:bafybeib3syh35usqjtqapqjjvobnkcxllkpjbxcb67g3vp3f566qsbhqgq
protocols:
Expand All @@ -32,16 +32,16 @@ protocols:
- valory/ledger_api:1.0.0:bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby
- valory/tendermint:0.1.0:bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa
skills:
- valory/abstract_abci:0.1.0:bafybeiamr3cwetayz6lr72buhq6iviabtboj4hhpq47tlumimxolvvqjcy
- valory/abstract_round_abci:0.1.0:bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i
- valory/registration_abci:0.1.0:bafybeibafy7qmcvvzaykimy3mbqdwtcuajmbghqilaa7zwkh6wla33cfce
- valory/reset_pause_abci:0.1.0:bafybeialcwck7fahrr23jckv5qjwg3cdq4ai2ihyjsofnbj44jzyl4cjmm
- valory/termination_abci:0.1.0:bafybeifqsogqiar4yook5bu3j6z66dbdcizey7dr3e5oxeocdjijvfbaja
- valory/transaction_settlement_abci:0.1.0:bafybeiacwr7p4nhhufoey7uz2jqkegrlykdrmc7mm3rzkvh2mslu66gyle
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiavkmrdwdif5i5fs4vz43i43ecashbzzz6r7c5xojtyuhpm35vz2u
- valory/market_manager_abci:0.1.0:bafybeid2sx5aorbyozxivzk7wfcfsydkil3nxsadb26zt2cri6v2l324ue
- valory/decision_maker_abci:0.1.0:bafybeihs4k26uk57evqvefqqql627q7vuyrireupam5baqafzxcwtsnvf4
- valory/trader_abci:0.1.0:bafybeieft6qr7rtl7yvv72uyfl6slyiazcxv6nvczdyulfnza5cxfir5fu
- valory/abstract_abci:0.1.0:bafybeih3bwx5apteinnoxts7sqmjlskntdbo7vvnmdbs5noo2pv76by7fu
- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm
- valory/registration_abci:0.1.0:bafybeia25gpusnkakb2dp4heqkwtuftbc2apppq3i4bds6sphltsovgzvi
- valory/reset_pause_abci:0.1.0:bafybeigzvwbzktclahjbsyiwqnj6poree4iveon5pric6s5ixb6wrhkdhq
- valory/termination_abci:0.1.0:bafybeibcdgnarxyyqexncpfewcemraryywtwueuv7qthsjuean5l77lp2e
- valory/transaction_settlement_abci:0.1.0:bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigsrdprbk664hyym7xmyypc7zhccanq5lpf7t7l3m6auhoebm3evq
- valory/market_manager_abci:0.1.0:bafybeiezuq5lpq6h4mj5tuvare3pihsdxqfnvrpkv5ektl4zinl5rlqtam
- valory/decision_maker_abci:0.1.0:bafybeieg2oi23fvbhq3c6yuorlsmb4lsxofnqlxxza3jdt7vr4nh2sblha
- valory/trader_abci:0.1.0:bafybeiflcgooxsfsm2om2525qysnbxmzry4beyz4olcwysytleny7wv7cm
default_ledger: ethereum
required_ledgers:
- ethereum
Expand Down Expand Up @@ -77,7 +77,7 @@ dependencies:
open-aea-ledger-ethereum:
version: ==1.37.0
open-aea-test-autonomy:
version: ==0.10.9
version: ==0.10.10.post1
skill_exception_policy: stop_and_exit
connection_exception_policy: just_log
default_connection: null
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/contracts/erc20/contract.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
open-aea-ledger-ethereum:
version: ==1.37.0
open-aea-test-autonomy:
version: ==0.10.9
version: ==0.10.10.post1
packaging: {}
py-eth-sig-utils: {}
requests: {}
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/contracts/market_maker/contract.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
open-aea-ledger-ethereum:
version: ==1.37.0
open-aea-test-autonomy:
version: ==0.10.9
version: ==0.10.10.post1
packaging: {}
py-eth-sig-utils: {}
requests: {}
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/services/trader/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license: Apache-2.0
fingerprint:
README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq
fingerprint_ignore_patterns: []
agent: valory/trader:0.1.0:bafybeig3ar7o6xplpfljxtl356sebmuk2hyjhqh5lgdyhhb7e4iif4kndq
agent: valory/trader:0.1.0:bafybeicbr4xm6xqvrs54ztofn3scerofvu44gnfndejg23q5xs7ue7yldm
number_of_agents: 4
deployment: {}
---
Expand Down
12 changes: 6 additions & 6 deletions packages/valory/skills/decision_maker_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ fingerprint:
fingerprint_ignore_patterns: []
connections: []
contracts:
- valory/gnosis_safe:0.1.0:bafybeic3ajabs7sl6qgkzy452szlsdeitj746kdzfd7k4m4ixtxw4g33qi
- valory/market_maker:0.1.0:bafybeig3b2wfngntdypnixi2gphuqz3o6w7zba2rq6n6kepwdmth2mx3ni
- valory/erc20:0.1.0:bafybeid4dnlzxpvb7sbgo2bnnffzwk5scelytshworzbfyxce6ibdyk67i
- valory/gnosis_safe:0.1.0:bafybeibhezhwgi5ustv675gfohsq5l5xjijp36gqueuicyl2ofrtkrortm
- valory/market_maker:0.1.0:bafybeibn7pcfywutlw6cvzpo7uwuu7eikcwjanzhiz4mt3ec2p3u4d2ks4
- valory/erc20:0.1.0:bafybeic3ise3v233qz3mm5dst53rhcbwnyxxhzefmf7a3cz5avtapuxpbq
- valory/multisend:0.1.0:bafybeict2k3vf3c4fvzosaq5kku2ivtzsskbomrujmmoicut7eg52onnje
- valory/mech:0.1.0:bafybeib3syh35usqjtqapqjjvobnkcxllkpjbxcb67g3vp3f566qsbhqgq
protocols:
- valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa
skills:
- valory/abstract_round_abci:0.1.0:bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i
- valory/market_manager_abci:0.1.0:bafybeid2sx5aorbyozxivzk7wfcfsydkil3nxsadb26zt2cri6v2l324ue
- valory/transaction_settlement_abci:0.1.0:bafybeiacwr7p4nhhufoey7uz2jqkegrlykdrmc7mm3rzkvh2mslu66gyle
- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm
- valory/market_manager_abci:0.1.0:bafybeiezuq5lpq6h4mj5tuvare3pihsdxqfnvrpkv5ektl4zinl5rlqtam
- valory/transaction_settlement_abci:0.1.0:bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm
behaviours:
main:
args: {}
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/skills/market_manager_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ connections: []
contracts: []
protocols: []
skills:
- valory/abstract_round_abci:0.1.0:bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i
- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm
behaviours:
main:
args: {}
Expand Down
16 changes: 8 additions & 8 deletions packages/valory/skills/trader_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ connections: []
contracts: []
protocols: []
skills:
- valory/abstract_round_abci:0.1.0:bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i
- valory/registration_abci:0.1.0:bafybeibafy7qmcvvzaykimy3mbqdwtcuajmbghqilaa7zwkh6wla33cfce
- valory/reset_pause_abci:0.1.0:bafybeialcwck7fahrr23jckv5qjwg3cdq4ai2ihyjsofnbj44jzyl4cjmm
- valory/transaction_settlement_abci:0.1.0:bafybeiacwr7p4nhhufoey7uz2jqkegrlykdrmc7mm3rzkvh2mslu66gyle
- valory/termination_abci:0.1.0:bafybeifqsogqiar4yook5bu3j6z66dbdcizey7dr3e5oxeocdjijvfbaja
- valory/market_manager_abci:0.1.0:bafybeid2sx5aorbyozxivzk7wfcfsydkil3nxsadb26zt2cri6v2l324ue
- valory/decision_maker_abci:0.1.0:bafybeihs4k26uk57evqvefqqql627q7vuyrireupam5baqafzxcwtsnvf4
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiavkmrdwdif5i5fs4vz43i43ecashbzzz6r7c5xojtyuhpm35vz2u
- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm
- valory/registration_abci:0.1.0:bafybeia25gpusnkakb2dp4heqkwtuftbc2apppq3i4bds6sphltsovgzvi
- valory/reset_pause_abci:0.1.0:bafybeigzvwbzktclahjbsyiwqnj6poree4iveon5pric6s5ixb6wrhkdhq
- valory/transaction_settlement_abci:0.1.0:bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm
- valory/termination_abci:0.1.0:bafybeibcdgnarxyyqexncpfewcemraryywtwueuv7qthsjuean5l77lp2e
- valory/market_manager_abci:0.1.0:bafybeiezuq5lpq6h4mj5tuvare3pihsdxqfnvrpkv5ektl4zinl5rlqtam
- valory/decision_maker_abci:0.1.0:bafybeieg2oi23fvbhq3c6yuorlsmb4lsxofnqlxxza3jdt7vr4nh2sblha
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigsrdprbk664hyym7xmyypc7zhccanq5lpf7t7l3m6auhoebm3evq
behaviours:
main:
args: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ connections: []
contracts: []
protocols: []
skills:
- valory/abstract_round_abci:0.1.0:bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i
- valory/decision_maker_abci:0.1.0:bafybeihs4k26uk57evqvefqqql627q7vuyrireupam5baqafzxcwtsnvf4
- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm
- valory/decision_maker_abci:0.1.0:bafybeieg2oi23fvbhq3c6yuorlsmb4lsxofnqlxxza3jdt7vr4nh2sblha
behaviours:
main:
args: {}
Expand Down
Loading

0 comments on commit 631b854

Please sign in to comment.