diff --git a/.github/workflows/common_checks.yaml b/.github/workflows/common_checks.yaml index 569353076..b31fddd6a 100644 --- a/.github/workflows/common_checks.yaml +++ b/.github/workflows/common_checks.yaml @@ -124,4 +124,4 @@ jobs: wget https://github.com/zricethezav/gitleaks/releases/download/v8.10.1/gitleaks_8.10.1_linux_x64.tar.gz && \ tar -xzf gitleaks_8.10.1_linux_x64.tar.gz && \ sudo install gitleaks /usr/bin && \ - gitleaks detect --report-format json --report-path leak_report + gitleaks detect --report-format json --report-path leak_report -v diff --git a/packages/packages.json b/packages/packages.json index eae047d89..132a4b5f6 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,13 +12,13 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "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": "bafybeif64m3zztadm2jjonorlwc2lpppqmqktig4jvfvycz3w5qv6sfrpa", - "skill/valory/trader_abci/0.1.0": "bafybeia3pfyuea4wxwbtizq57vcx2tg4z6dk4i5twhhqqjwzoi5l37gkl4", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigwosmf2ltoh2wkwppgftqzucktzq2b7eiakhtclnfybpsusregde", + "skill/valory/decision_maker_abci/0.1.0": "bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je", + "skill/valory/trader_abci/0.1.0": "bafybeihzojyuubf3ka32ic55h2456wiptcbbh6fwwmcwo7jmh5znvjbaki", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibcuvrm5fvmh7nuee4tmbof6debprdqzhvhdpzp2dbddtwva4wz3y", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifho6gdnpx3j2czez4iotjhgropakiubzya6ceag556ijjqc5gfay", - "agent/valory/trader/0.1.0": "bafybeihlc6vtlokdt4wxxt7jqto6rokydpn2xhlqpmny3cs4s76flaeeoq", - "service/valory/trader/0.1.0": "bafybeig5nbohr7bgf2nn6ghdw3q2ij7sms7patvvwgoqzo2nhz5q74x4oa" + "agent/valory/trader/0.1.0": "bafybeiexvfnp2wvxcon3plkx5jzpgkz36ricwioffnhpu4iueqtfbvzrpy", + "service/valory/trader/0.1.0": "bafybeihik7bbmaqgqxezfgufeiov4mn4nketzsf3cng7qu7ovux3cm6olm" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -46,6 +46,6 @@ "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/mech_interact_abci/0.1.0": "bafybeihvjtdg47pchoutcuh5l7jwiclpowriymtj7nyud22cetjjxggeiy" + "skill/valory/mech_interact_abci/0.1.0": "bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index f60e88a89..7e61fff7f 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,13 +43,13 @@ 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:bafybeigwosmf2ltoh2wkwppgftqzucktzq2b7eiakhtclnfybpsusregde +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibcuvrm5fvmh7nuee4tmbof6debprdqzhvhdpzp2dbddtwva4wz3y - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeif64m3zztadm2jjonorlwc2lpppqmqktig4jvfvycz3w5qv6sfrpa -- valory/trader_abci:0.1.0:bafybeia3pfyuea4wxwbtizq57vcx2tg4z6dk4i5twhhqqjwzoi5l37gkl4 +- valory/decision_maker_abci:0.1.0:bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je +- valory/trader_abci:0.1.0:bafybeihzojyuubf3ka32ic55h2456wiptcbbh6fwwmcwo7jmh5znvjbaki - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeifho6gdnpx3j2czez4iotjhgropakiubzya6ceag556ijjqc5gfay -- valory/mech_interact_abci:0.1.0:bafybeihvjtdg47pchoutcuh5l7jwiclpowriymtj7nyud22cetjjxggeiy +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 @@ -174,9 +174,9 @@ models: average_block_time: ${int:5} abt_error_mult: ${int:5} mech_contract_address: ${str:0x77af31De935740567Cf4fF1986D04B2c964A786a} - request_price: ${int:null} + mech_request_price: ${int:null} mech_chain_id: ${str:gnosis} - wrapped_native_token_address: ${str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} + mech_wrapped_native_token_address: ${str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} sample_bets_closing_days: ${int:10} trading_strategy: ${str:kelly_criterion} use_fallback_strategy: ${bool:true} diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index c87bb7884..2a4473e28 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:bafybeihlc6vtlokdt4wxxt7jqto6rokydpn2xhlqpmny3cs4s76flaeeoq +agent: valory/trader:0.1.0:bafybeiexvfnp2wvxcon3plkx5jzpgkz36ricwioffnhpu4iueqtfbvzrpy number_of_agents: 4 deployment: {} --- @@ -80,9 +80,9 @@ type: skill average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31De935740567Cf4fF1986D04B2c964A786a} - request_price: ${REQUEST_PRICE:int:null} + mech_request_price: ${MECH_REQUEST_PRICE:int:null} mech_chain_id: ${MECH_CHAIN_ID:str:gnosis} - wrapped_native_token_address: ${WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} + mech_wrapped_native_token_address: ${MECH_WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -181,9 +181,9 @@ type: skill average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31De935740567Cf4fF1986D04B2c964A786a} - request_price: ${REQUEST_PRICE:int:null} + mech_request_price: ${MECH_REQUEST_PRICE:int:null} mech_chain_id: ${MECH_CHAIN_ID:str:gnosis} - wrapped_native_token_address: ${WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} + mech_wrapped_native_token_address: ${MECH_WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -280,9 +280,9 @@ type: skill average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31De935740567Cf4fF1986D04B2c964A786a} - request_price: ${REQUEST_PRICE:int:null} + mech_request_price: ${MECH_REQUEST_PRICE:int:null} mech_chain_id: ${MECH_CHAIN_ID:str:gnosis} - wrapped_native_token_address: ${WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} + mech_wrapped_native_token_address: ${MECH_WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -379,9 +379,9 @@ type: skill average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31De935740567Cf4fF1986D04B2c964A786a} - request_price: ${REQUEST_PRICE:int:null} + mech_request_price: ${MECH_REQUEST_PRICE:int:null} mech_chain_id: ${MECH_CHAIN_ID:str:gnosis} - wrapped_native_token_address: ${WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} + mech_wrapped_native_token_address: ${MECH_WRAPPED_NATIVE_TOKEN_ADDRESS:str:0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 25eead50c..4630ee44f 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeihvjtdg47pchoutcuh5l7jwiclpowriymtj7nyud22cetjjxggeiy +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: main: args: {} @@ -181,7 +181,9 @@ models: tx_timeout: 10.0 use_termination: false mech_contract_address: '0x77af31de935740567cf4ff1986d04b2c964a786a' - request_price: null + mech_request_price: null + mech_chain_id: gnosis + mech_wrapped_native_token_address: '0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d' sample_bets_closing_days: 10 trading_strategy: strategy_name use_fallback_strategy: true diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 1e09c84d2..1844ec440 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,11 +25,11 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeif64m3zztadm2jjonorlwc2lpppqmqktig4jvfvycz3w5qv6sfrpa -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigwosmf2ltoh2wkwppgftqzucktzq2b7eiakhtclnfybpsusregde +- valory/decision_maker_abci:0.1.0:bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibcuvrm5fvmh7nuee4tmbof6debprdqzhvhdpzp2dbddtwva4wz3y - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeifho6gdnpx3j2czez4iotjhgropakiubzya6ceag556ijjqc5gfay -- valory/mech_interact_abci:0.1.0:bafybeihvjtdg47pchoutcuh5l7jwiclpowriymtj7nyud22cetjjxggeiy +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: main: args: {} @@ -149,9 +149,9 @@ models: average_block_time: 5 abt_error_mult: 5 mech_contract_address: '0x77af31de935740567cf4ff1986d04b2c964a786a' - request_price: null + mech_request_price: null mech_chain_id: gnosis - wrapped_native_token_address: '0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d' + mech_wrapped_native_token_address: '0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d' sample_bets_closing_days: 10 trading_strategy: strategy_name use_fallback_strategy: true diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index b43f9f4de..960e65895 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeif64m3zztadm2jjonorlwc2lpppqmqktig4jvfvycz3w5qv6sfrpa +- valory/decision_maker_abci:0.1.0:bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/mech_interact_abci:0.1.0:bafybeihvjtdg47pchoutcuh5l7jwiclpowriymtj7nyud22cetjjxggeiy +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: main: args: {}