Skip to content

Commit e7ffe4f

Browse files
Merge pull request #980 from valory-xyz/chore/migrate-to-omen-protocol
chore: consume Omen contracts from omen-protocol upstream
2 parents 3194319 + 7181e79 commit e7ffe4f

28 files changed

Lines changed: 31 additions & 4705 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ packages/valory/contracts/gnosis_safe_proxy_factory/
2626
packages/valory/contracts/agent_mech/
2727
packages/valory/contracts/mech_marketplace_legacy/
2828
packages/valory/contracts/multisend/
29+
packages/valory/contracts/realitio/
30+
packages/valory/contracts/realitio_proxy/
31+
packages/valory/contracts/conditional_tokens/
2932
packages/valory/contracts/service_registry/
3033
packages/valory/contracts/gnosis_safe/
3134
packages/valory/contracts/agent_registry/

packages/packages.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,22 @@
22
"dev": {
33
"custom/valory/kelly_criterion/0.1.0": "bafybeia4jbzn5bmzii72l43y6wxdw57dy3wndsozdvmeiz5dzqmlvga664",
44
"custom/valory/fixed_bet/0.1.0": "bafybeidahih5c7htr5g5e4nq5wcqfiwse2z6ga27jxsxll7iracehmysim",
5-
"contract/valory/realitio/0.1.0": "bafybeidva2wdv2vuswrrkjoanccysuhcsmq3ojvn2kf5ufonxbvfgvhvsm",
6-
"contract/valory/realitio_proxy/0.1.0": "bafybeiagm5qkgcmkhpyxvhptxcysvtu2pwgg4gcjt3yplczcqev3kt3zzy",
7-
"contract/valory/conditional_tokens/0.1.0": "bafybeifkrnpjm3a7lupjn2w3widfei4to2xk6tt2dhalllgso52vmeaayy",
85
"contract/valory/service_staking_token/0.1.0": "bafybeici4bbllbyw4aeg3lw2fj26oolflj5r4wwrav23ulyl7v7r6fobzu",
96
"contract/valory/mech_activity/0.1.0": "bafybeiasmh6vxp2gh3kfoh6ulqia3nh2a3zh2fszowszc62dbdndk7inku",
107
"contract/valory/relayer/0.1.0": "bafybeia7zmnqsfk235yjpegb6tijmfyelezms3bewadpdqhx65aricaaoe",
11-
"contract/valory/market_maker/0.1.0": "bafybeia73kg5d7mjeckxnmajh3sdjbfldjtjhpqpg3l4aewubosd2dhdcy",
8+
"contract/valory/market_maker/0.1.0": "bafybeibgqxf7hp6gk2g2bf37qtsl4fv67dbmvxzzyfheha2tzoayrisrs4",
129
"connection/valory/polymarket_client/0.1.0": "bafybeih443m6zq7hgdlgehy4quq4xjklxd5h3mpoxwfzs4reqn4zntgap4",
1310
"skill/valory/market_manager_abci/0.1.0": "bafybeiful2wriymu6fhdcs6eqydoakwms74oogm5fmxh3ym53izp6loxzy",
14-
"skill/valory/decision_maker_abci/0.1.0": "bafybeieitqu4o66gvoh7xmv62xdkc7kncfxgbdjx5akonzrd5f6ihfrgoy",
15-
"skill/valory/trader_abci/0.1.0": "bafybeihw46tobxkf6jblb4ttbyge2wpdh5v6gqg3pqtptvwwwt5uqhphoe",
16-
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibvnszw27khp62mcexyyamedklhlzxhtbgnbtlw5lp5sfuuq2sf3a",
11+
"skill/valory/decision_maker_abci/0.1.0": "bafybeiat3shgqi2aycjpbhqswcmsauvs7d5yzuxta3bzxw2xvmts26cesu",
12+
"skill/valory/trader_abci/0.1.0": "bafybeibmrn2lebmfxwhmkoakd3b7fpv5f7ta2jcfzvbf353pwcymkmpcea",
13+
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeies4vwkrkbcklbpdxkux3ahc6aa2cfqe4damqjwtv4sswozdcjvwy",
1714
"skill/valory/staking_abci/0.1.0": "bafybeiggw7bwh3vmtzolcg23idt5kiwkdlggupq3ktk7ssjnixvybtfw5m",
1815
"skill/valory/agent_performance_summary_abci/0.1.0": "bafybeicg6kecyjvnegwvxdqt6lhk5pykosdwq4fizafurvucuyvvaz4whi",
1916
"skill/valory/check_stop_trading_abci/0.1.0": "bafybeicfxhgi4ydi7s2qde7hhnmosorgqbvj6cewt2ii6igxesicbqcdsq",
2017
"skill/valory/chatui_abci/0.1.0": "bafybeih22osp3bht4s7zbxvskoapzhc2mihsutjlwdie3etxtsov6qinne",
21-
"agent/valory/trader/0.1.0": "bafybeidh2vedwfhyik7n5aqwefa3k2ablnoq57dc22uxm3r6fkeyvteoea",
22-
"service/valory/trader_pearl/0.1.0": "bafybeibpa2eyrf22mg2r4avfhwio3jq77ra7erldt6n42zqeavil3c2ujq",
23-
"service/valory/polymarket_trader/0.1.0": "bafybeiakan7nc6y47uq4nvexn3sojc7duzyibpet5f2ykczv4rbb2zfo44"
18+
"agent/valory/trader/0.1.0": "bafybeiexlsgoxailr6bmsxzxkoa5cexc6tp66pdcf2qlkjknga7ixhy2de",
19+
"service/valory/trader_pearl/0.1.0": "bafybeibgy42eo6y6gsbwb6hwlapxd6pqsomsykxbcfqmhzl344xe7bbhra",
20+
"service/valory/polymarket_trader/0.1.0": "bafybeihthl4c6f7u2fdtoy2gkde55kxvujru6df6jomlyjshzcx26qqwpy"
2421
},
2522
"third_party": {
2623
"protocol/valory/acn_data_share/0.1.0": "bafybeieqisfr6lhaaesq37lk7vyaxza2h6nucshksgyo2djqfyf2saqo4i",
@@ -34,6 +31,9 @@
3431
"protocol/valory/ipfs/0.1.0": "bafybeibz5xqhxdbuvba7nuw2w6ardjermtcoqercopnypdplnaekf3joam",
3532
"protocol/valory/srr/0.1.0": "bafybeibfs6osw7guctdpollf4iwt4vhd6yk7ai34tqk5djuxtgowjwdjb4",
3633
"contract/valory/multisend/0.1.0": "bafybeih73g7nltnmfqfa75qurljjk7xu7cvd3d2uzt4bqogcw5rgrrmu2m",
34+
"contract/valory/realitio/0.1.0": "bafybeibfy6dqkwsz4xersouotswcug27awkvtsmjlo3r7b476qgeujn3eu",
35+
"contract/valory/realitio_proxy/0.1.0": "bafybeibutej7uzucill5ohb3xxu245vo32kg5vchpqondwdfomixx2psba",
36+
"contract/valory/conditional_tokens/0.1.0": "bafybeifqpw3hnllwy3s2ktcsfup3usgaykh5gbhieyf2wb2s4iwemykn2i",
3737
"contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib63lr7rsd77nyo5iz4et2ali6z2y5lekfjg3za7lk4fnf4b2j2ue",
3838
"contract/valory/agent_registry/0.1.0": "bafybeihndb57u3da2ollttbkm56te6ihekh5pesmxruk4sxn6psnz2ycri",
3939
"contract/valory/service_registry/0.1.0": "bafybeiccha6qwov4pqsnnhnprldppaqlb7djcujcqqlmtgbukq4a5fmvvq",

packages/valory/agents/trader/aea-config.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ contracts:
2222
- valory/gnosis_safe:0.1.0:bafybeieaxcd3wrjxgw7yzmlbxr6tcwj3u7kiixb6fzu2shwy5hthzzyxuq
2323
- valory/gnosis_safe_proxy_factory:0.1.0:bafybeib63lr7rsd77nyo5iz4et2ali6z2y5lekfjg3za7lk4fnf4b2j2ue
2424
- valory/service_registry:0.1.0:bafybeiccha6qwov4pqsnnhnprldppaqlb7djcujcqqlmtgbukq4a5fmvvq
25-
- valory/market_maker:0.1.0:bafybeia73kg5d7mjeckxnmajh3sdjbfldjtjhpqpg3l4aewubosd2dhdcy
25+
- valory/market_maker:0.1.0:bafybeibgqxf7hp6gk2g2bf37qtsl4fv67dbmvxzzyfheha2tzoayrisrs4
2626
- valory/multisend:0.1.0:bafybeih73g7nltnmfqfa75qurljjk7xu7cvd3d2uzt4bqogcw5rgrrmu2m
2727
- valory/mech:0.1.0:bafybeigwsa3rzuxoyki5wrapkl5mbp5n5tnbkumb67r3uegnk3u5psafbi
28-
- valory/conditional_tokens:0.1.0:bafybeifkrnpjm3a7lupjn2w3widfei4to2xk6tt2dhalllgso52vmeaayy
29-
- valory/realitio:0.1.0:bafybeidva2wdv2vuswrrkjoanccysuhcsmq3ojvn2kf5ufonxbvfgvhvsm
30-
- valory/realitio_proxy:0.1.0:bafybeiagm5qkgcmkhpyxvhptxcysvtu2pwgg4gcjt3yplczcqev3kt3zzy
28+
- valory/conditional_tokens:0.1.0:bafybeifqpw3hnllwy3s2ktcsfup3usgaykh5gbhieyf2wb2s4iwemykn2i
29+
- valory/realitio:0.1.0:bafybeibfy6dqkwsz4xersouotswcug27awkvtsmjlo3r7b476qgeujn3eu
30+
- valory/realitio_proxy:0.1.0:bafybeibutej7uzucill5ohb3xxu245vo32kg5vchpqondwdfomixx2psba
3131
- valory/agent_registry:0.1.0:bafybeihndb57u3da2ollttbkm56te6ihekh5pesmxruk4sxn6psnz2ycri
3232
- valory/service_staking_token:0.1.0:bafybeici4bbllbyw4aeg3lw2fj26oolflj5r4wwrav23ulyl7v7r6fobzu
3333
- valory/erc20:0.1.0:bafybeidhafsjqsj7umr5mgb3v4t52sbcnwhlfk7hqgulbdvui4yhfrgrjy
@@ -65,10 +65,10 @@ skills:
6565
- valory/reset_pause_abci:0.1.0:bafybeiakhczviqep47o5txatkdbzui6bk5o554cnspdkauapvmdykk2tkm
6666
- valory/termination_abci:0.1.0:bafybeibduc7hdi3xu7ahpumgew6es33jcadbrbipboyc7sbuyzds45fmve
6767
- valory/transaction_settlement_abci:0.1.0:bafybeiceijjjlvbq2tnadeqdrm7nka7gqgwzvmlgjuzbacgnkljry5h72a
68-
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibvnszw27khp62mcexyyamedklhlzxhtbgnbtlw5lp5sfuuq2sf3a
68+
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeies4vwkrkbcklbpdxkux3ahc6aa2cfqe4damqjwtv4sswozdcjvwy
6969
- valory/market_manager_abci:0.1.0:bafybeiful2wriymu6fhdcs6eqydoakwms74oogm5fmxh3ym53izp6loxzy
70-
- valory/decision_maker_abci:0.1.0:bafybeieitqu4o66gvoh7xmv62xdkc7kncfxgbdjx5akonzrd5f6ihfrgoy
71-
- valory/trader_abci:0.1.0:bafybeihw46tobxkf6jblb4ttbyge2wpdh5v6gqg3pqtptvwwwt5uqhphoe
70+
- valory/decision_maker_abci:0.1.0:bafybeiat3shgqi2aycjpbhqswcmsauvs7d5yzuxta3bzxw2xvmts26cesu
71+
- valory/trader_abci:0.1.0:bafybeibmrn2lebmfxwhmkoakd3b7fpv5f7ta2jcfzvbf353pwcymkmpcea
7272
- valory/staking_abci:0.1.0:bafybeiggw7bwh3vmtzolcg23idt5kiwkdlggupq3ktk7ssjnixvybtfw5m
7373
- valory/check_stop_trading_abci:0.1.0:bafybeicfxhgi4ydi7s2qde7hhnmosorgqbvj6cewt2ii6igxesicbqcdsq
7474
- valory/mech_interact_abci:0.1.0:bafybeiexvtbft2iupqojaeodfr6cdn3kmhzbrqa4exeb7vhjs2m7j43hfm

packages/valory/contracts/conditional_tokens/__init__.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)