From becb37f493b0ff59ffeaf03346ab8b020a4f6d05 Mon Sep 17 00:00:00 2001 From: cyberosa Date: Fri, 22 Nov 2024 11:48:25 +0100 Subject: [PATCH] removed old benchmarking params not used anymore --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 8 +++----- packages/valory/services/trader/service.yaml | 5 +---- packages/valory/services/trader_pearl/service.yaml | 2 +- packages/valory/skills/decision_maker_abci/models.py | 11 ----------- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 15 insertions(+), 31 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 0cdf1969..4da0f731 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeifhedrcyzfeewmcaujk7gr6larcakyv3aosa255i6te5rhxdqvouq", - "skill/valory/decision_maker_abci/0.1.0": "bafybeid67hnwigtzqnnxz6nrwwnzucmfa4evrkjapgumrzcrp33ykenp34", - "skill/valory/trader_abci/0.1.0": "bafybeigyyhuo63z5vu252zomjkacmwy25nw6lkm56eeskwdykhkwczdyha", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiaa46bshtuoow2fzc4ih7kkhh4tlite66fnzsuagnbtsdiwj6xudq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeihcbsuy6kht2q2ralyy6tvc7akhojr7j4ezs45jinb33npqrry2nm", + "skill/valory/trader_abci/0.1.0": "bafybeia4t2yq6xtrqohnuyqbhmp5ees3ffz5rltwntvkgxmqa3fqm25dqa", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiaz6w5nhykzonxmv5rdrroeipc57im4hspqf32qt55n5aeboxw5y4", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini", - "agent/valory/trader/0.1.0": "bafybeicrinslmkepmw3mbcos4b7l6jeiyafaonb42k4qmqgzwzyszgk44i", - "service/valory/trader/0.1.0": "bafybeid4cemjkcdcoh5edw6rzyu3efelkmzochfuvpevifx7j2nrkxzlw4", - "service/valory/trader_pearl/0.1.0": "bafybeiage73uj4dsrlsfa6bgzuinyjc2qs3qd4zfapbo5iavwlzkomcvhm" + "agent/valory/trader/0.1.0": "bafybeido3sqjr45mo7ruj7dnpchs5743chnvcpfrcjivy7xp7qcaiqepre", + "service/valory/trader/0.1.0": "bafybeigone6p2ny6ulhg3skmkyb2lkkgvw3chkkklze4f7rdwfu5zirjji", + "service/valory/trader_pearl/0.1.0": "bafybeify4vvf3dxb4lzjcqk2gufpnegwxiytcjiqkh4dqxsfntgatsu54a" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 80cd56ae..47d7cb96 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiaa46bshtuoow2fzc4ih7kkhh4tlite66fnzsuagnbtsdiwj6xudq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiaz6w5nhykzonxmv5rdrroeipc57im4hspqf32qt55n5aeboxw5y4 - valory/market_manager_abci:0.1.0:bafybeifhedrcyzfeewmcaujk7gr6larcakyv3aosa255i6te5rhxdqvouq -- valory/decision_maker_abci:0.1.0:bafybeid67hnwigtzqnnxz6nrwwnzucmfa4evrkjapgumrzcrp33ykenp34 -- valory/trader_abci:0.1.0:bafybeigyyhuo63z5vu252zomjkacmwy25nw6lkm56eeskwdykhkwczdyha +- valory/decision_maker_abci:0.1.0:bafybeihcbsuy6kht2q2ralyy6tvc7akhojr7j4ezs45jinb33npqrry2nm +- valory/trader_abci:0.1.0:bafybeia4t2yq6xtrqohnuyqbhmp5ees3ffz5rltwntvkgxmqa3fqm25dqa - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm @@ -252,8 +252,6 @@ models: collateral_balance: ${int:10000000000000000000} mech_cost: ${int:10000000000000000} pool_fee: ${int:20000000000000000} - outcome_token_amounts: ${list:[11000000000000000000,9000000000000000000]} - outcome_token_marginal_prices: ${list:[0.55,0.45]} sep: ${str:,} dataset_filename: ${str:benchmark_data.csv} question_field: ${str:question} diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 51b7ac54..b1c56c12 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeicrinslmkepmw3mbcos4b7l6jeiyafaonb42k4qmqgzwzyszgk44i +agent: valory/trader:0.1.0:bafybeido3sqjr45mo7ruj7dnpchs5743chnvcpfrcjivy7xp7qcaiqepre number_of_agents: 4 deployment: agent: @@ -155,9 +155,6 @@ type: skill collateral_balance: ${BENCHMARKING_MODE_COLLATERAL_BALANCE:int:10000000000000000000} mech_cost: ${BENCHMARKING_MODE_MECH_COST:int:10000000000000000} pool_fee: ${BENCHMARKING_MODE_POOL_FEE:int:20000000000000000} - outcome_token_amounts: ${OUTCOME_TOKEN_AMOUNTS:dict:{"1":[11000000000000000000,9000000000000000000],"2":[12051566363198041123,4065861525654596129],"3":[7873230340650588731,6223620785868051083]}} - outcome_token_marginal_prices: ${OUTCOME_TOKEN_MARGINAL_PRICES:dict:{"1":[0.39537,0.60462],"2":[0.252264,0.747735],"3":[0.44149,0.5585]}} - scaled_liquidity_measure: ${SCALED_LIQUIDITY_MEASURE:dict:{"1":9.79065,"2":6.08036330493113,"3":6.951844672001134}} sep: ${BENCHMARKING_MODE_SEP:str:,} dataset_filename: ${BENCHMARKING_MODE_DATASET_FILENAME:str:benchmark_data.csv} question_field: ${BENCHMARKING_MODE_QUESTION_FIELD:str:question} diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 41b9adc7..bad5fe86 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeicrinslmkepmw3mbcos4b7l6jeiyafaonb42k4qmqgzwzyszgk44i +agent: valory/trader:0.1.0:bafybeido3sqjr45mo7ruj7dnpchs5743chnvcpfrcjivy7xp7qcaiqepre number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index 2535c460..7a345a44 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -529,17 +529,6 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: self.collateral_balance: int = self._ensure("collateral_balance", kwargs, int) self.mech_cost: int = self._ensure("mech_cost", kwargs, int) self.pool_fee: int = self._ensure("pool_fee", kwargs, int) - # the market parameters can be now different per simulated market - # these are the default values for each market - # self.outcome_token_amounts: Dict[str, List[int]] = self._ensure( - # "outcome_token_amounts", kwargs, Dict[str, List[int]] - # ) - # self.outcome_token_marginal_prices: Dict[str, List[float]] = self._ensure( - # "outcome_token_marginal_prices", kwargs, Dict[str, List[float]] - # ) - # self.scaled_liquidity_measure: Dict[str, List[float]] = self._ensure( - # "scaled_liquidity_measure", kwargs, Dict[str, float] - # ) self.sep: str = self._ensure("sep", kwargs, str) self.dataset_filename: Path = Path( self._ensure("dataset_filename", kwargs, str) diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index f98621c7..71b3deee 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -32,7 +32,7 @@ fingerprint: handlers.py: bafybeigod6gbjrxy4mbmulbzsbokeaoycoqys64vqtxnumishfukzf73za io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeifnbcepew5ambs5y2ebj5np5rt722etiqfnk426w6edqsg2yfk4xe + models.py: bafybeiacxfqel75lmwpzjf7gv5cikia74vnpsmltlkocvzv32zeb4bgv2i payloads.py: bafybeibio3sokcwjp7gqf4usrmqkasarhg5bapfwfsfj5j5lassecf45de policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 1f9d9c15..2fde6416 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeifhedrcyzfeewmcaujk7gr6larcakyv3aosa255i6te5rhxdqvouq -- valory/decision_maker_abci:0.1.0:bafybeid67hnwigtzqnnxz6nrwwnzucmfa4evrkjapgumrzcrp33ykenp34 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiaa46bshtuoow2fzc4ih7kkhh4tlite66fnzsuagnbtsdiwj6xudq +- valory/decision_maker_abci:0.1.0:bafybeihcbsuy6kht2q2ralyy6tvc7akhojr7j4ezs45jinb33npqrry2nm +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiaz6w5nhykzonxmv5rdrroeipc57im4hspqf32qt55n5aeboxw5y4 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 26c8cbd4..d71429c3 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeid67hnwigtzqnnxz6nrwwnzucmfa4evrkjapgumrzcrp33ykenp34 +- valory/decision_maker_abci:0.1.0:bafybeihcbsuy6kht2q2ralyy6tvc7akhojr7j4ezs45jinb33npqrry2nm - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: