Skip to content

Commit

Permalink
Merge pull request #144 from valory-xyz/feat/nevermined
Browse files Browse the repository at this point in the history
Feat/nevermined
  • Loading branch information
0xArdi authored Dec 22, 2023
2 parents 4592975 + 0f86002 commit 2e7f759
Show file tree
Hide file tree
Showing 24 changed files with 1,136 additions and 47 deletions.
17 changes: 9 additions & 8 deletions packages/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
"dev": {
"connection/valory/websocket_client/0.1.0": "bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm",
"skill/valory/contract_subscription/0.1.0": "bafybeicyugrkx5glat4p4ezwf6i7oduh26eycfie6ftd4uxrknztzl3ik4",
"agent/valory/mech/0.1.0": "bafybeia5wlctflbgvtigc45gfzimftosrvsi6c6z57o2iiuij3kidpcp3e",
"skill/valory/mech_abci/0.1.0": "bafybeifktlrkncnb5hjtwc7xqjag2pzmtciogp6nsm4t5umrqhmkmzyl5i",
"contract/valory/agent_mech/0.1.0": "bafybeicgt3bwogpwv7t57xuxzcq7vxmoq4glcjoprabb6d4ajtgjwzsrzi",
"service/valory/mech/0.1.0": "bafybeiejotownjomk36oyj6f5kkeg4k5hrkvellaswcv7x2qhceevqinfe",
"agent/valory/mech/0.1.0": "bafybeifg3hcc5inhmp7yhl7sjwdiuioemmcg2gc7id2ob3ttty3t3iaery",
"skill/valory/mech_abci/0.1.0": "bafybeiej4fot4ee27d5tujxxb2u5w4rtbanpm7txwfti73rrhgmf43xmwq",
"contract/valory/agent_mech/0.1.0": "bafybeiggowhbqwg7ex2yfz57l3qzorlnu4fkipdrlzs23nrldrbbfa7dri",
"service/valory/mech/0.1.0": "bafybeiebh5mqqiist7kw3mi6lam7stlpqc3ss5vqmbids5xi5jvdb5pae4",
"protocol/valory/acn_data_share/0.1.0": "bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq",
"skill/valory/task_submission_abci/0.1.0": "bafybeia6b7rzrbrhijkctxpwzeywqvsdqm2j5u5ee6fbmrp6t3x2afdase",
"skill/valory/task_execution/0.1.0": "bafybeiffc4nqpk3ri7kq5tuljbgnxqmhfj3brpznr6ujxqaif24tj64kcq",
"skill/valory/task_submission_abci/0.1.0": "bafybeiewwpv5veykxbd7wfbq7vvnlcnfsraxhz6ymqxcaf5nfz6nz7g2pa",
"skill/valory/task_execution/0.1.0": "bafybeidmvbucjd472m5lo3ebyhlojpl2o25mndlnllqtakqe73r7vghztq",
"contract/valory/agent_registry/0.1.0": "bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu",
"protocol/valory/websocket_client/0.1.0": "bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4",
"skill/valory/websocket_client/0.1.0": "bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta",
"contract/valory/hash_checkpoint/0.1.0": "bafybeieys27hidb5m267jwqsxdgorf5v37o6lvrfy2oga557stjn4xgoaa"
"contract/valory/hash_checkpoint/0.1.0": "bafybeieys27hidb5m267jwqsxdgorf5v37o6lvrfy2oga557stjn4xgoaa",
"skill/valory/subscription_abci/0.1.0": "bafybeibtm62zrvzg2jp7yb5oi77pi6glrgewg2tael5oildf4wd6nzugbm"
},
"third_party": {
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja",
Expand All @@ -39,6 +40,6 @@
"contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeidvcgnbbmjtha6tl7st2ysna2l3iiqfhnzjfasyvml5unecozeeka",
"contract/valory/gnosis_safe/0.1.0": "bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei",
"contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y",
"connection/valory/http_server/0.22.0": "bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44"
"connection/valory/http_server/0.22.0": "bafybeib6axuzanyktdidtygeibsm426fw4a2dcpc5ppdwsjblaboeepmry"
}
}
37 changes: 20 additions & 17 deletions packages/valory/agents/mech/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@ fingerprint_ignore_patterns: []
connections:
- valory/abci:0.1.0:bafybeiejo5uyurbmafretedivyci2ktastxclbmgrkwcwc2yt36jftyqgm
- valory/http_client:0.23.0:bafybeiddrfvomrmgvh5yuv2coq7ci72wcdf663stayi3m5aawnj4srggce
- valory/http_server:0.22.0:bafybeib6axuzanyktdidtygeibsm426fw4a2dcpc5ppdwsjblaboeepmry
- valory/ipfs:0.1.0:bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq
- valory/ledger:0.19.0:bafybeia47rr37ianvwsh77tjjpv3nwif5sywhhy2fbdshnz4a2icwln76a
- valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq
- valory/http_server:0.22.0:bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44
- valory/websocket_client:0.1.0:bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm
contracts:
- valory/agent_mech:0.1.0:bafybeicgt3bwogpwv7t57xuxzcq7vxmoq4glcjoprabb6d4ajtgjwzsrzi
- valory/agent_mech:0.1.0:bafybeiggowhbqwg7ex2yfz57l3qzorlnu4fkipdrlzs23nrldrbbfa7dri
- valory/agent_registry:0.1.0:bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu
- valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei
- valory/gnosis_safe_proxy_factory:0.1.0:bafybeidvcgnbbmjtha6tl7st2ysna2l3iiqfhnzjfasyvml5unecozeeka
- valory/hash_checkpoint:0.1.0:bafybeieys27hidb5m267jwqsxdgorf5v37o6lvrfy2oga557stjn4xgoaa
- valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y
- valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm
- valory/agent_registry:0.1.0:bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu
protocols:
- open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii
- valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu
Expand All @@ -31,17 +32,18 @@ protocols:
- valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe
- valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u
- valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru
- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4
- valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu
- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4
skills:
- valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi
- valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq
- valory/contract_subscription:0.1.0:bafybeicyugrkx5glat4p4ezwf6i7oduh26eycfie6ftd4uxrknztzl3ik4
- valory/mech_abci:0.1.0:bafybeifktlrkncnb5hjtwc7xqjag2pzmtciogp6nsm4t5umrqhmkmzyl5i
- valory/task_execution:0.1.0:bafybeiffc4nqpk3ri7kq5tuljbgnxqmhfj3brpznr6ujxqaif24tj64kcq
- valory/mech_abci:0.1.0:bafybeiej4fot4ee27d5tujxxb2u5w4rtbanpm7txwfti73rrhgmf43xmwq
- valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am
- valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba
- valory/task_submission_abci:0.1.0:bafybeia6b7rzrbrhijkctxpwzeywqvsdqm2j5u5ee6fbmrp6t3x2afdase
- valory/subscription_abci:0.1.0:bafybeibtm62zrvzg2jp7yb5oi77pi6glrgewg2tael5oildf4wd6nzugbm
- valory/task_execution:0.1.0:bafybeidmvbucjd472m5lo3ebyhlojpl2o25mndlnllqtakqe73r7vghztq
- valory/task_submission_abci:0.1.0:bafybeiewwpv5veykxbd7wfbq7vvnlcnfsraxhz6ymqxcaf5nfz6nz7g2pa
- valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa
- valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja
- valory/websocket_client:0.1.0:bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta
Expand Down Expand Up @@ -75,6 +77,8 @@ logging_config:
- console
propagate: true
dependencies:
aiohttp:
version: <4.0.0,>=3.8.5
anthropic:
version: ==0.3.11
beautifulsoup4:
Expand All @@ -83,24 +87,22 @@ dependencies:
version: ==2.95.0
googlesearch-python:
version: ==1.2.3
open-aea-ledger-ethereum:
version: ==1.42.0
aiohttp:
version: <4.0.0,>=3.8.5
hypothesis:
version: ==6.21.6
langchain:
version: ==0.0.303
scikit-learn:
version: ==1.3.1
open-aea-ledger-ethereum:
version: ==1.42.0
pandas:
version: ==2.1.1
hypothesis:
version: ==6.21.6
python-dateutil:
version: ==2.8.2
scikit-learn:
version: ==1.3.1
spacy:
version: ==3.7.2
tiktoken:
version: ==0.5.1
python-dateutil:
version: ==2.8.2
default_connection: null
---
public_id: valory/websocket_client:0.1.0:bafybeiexove4oqyhoae5xmk2hilskthosov5imdp65olpgj3cfrepbouyy
Expand Down Expand Up @@ -178,6 +180,7 @@ models:
manual_gas_limit: ${int:1000000}
service_owner_share: ${float:0.1}
profit_split_freq: ${int:1}
mech_to_subscription: ${list:[["0x77af31De935740567Cf4fF1986D04B2c964A786a",["0x0000000000000000000000000000000000000000","1"]]]}
hash_checkpoint_address: ${str:0x694e62BDF7Ff510A4EE66662cf4866A961a31653}
setup:
all_participants: ${list:["0x10E867Ac2Fb0Aa156ca81eF440a5cdf373bE1AaC"]}
Expand Down
44 changes: 44 additions & 0 deletions packages/valory/contracts/agent_mech/build/AgentMech.json
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,50 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "subscriptionNFT",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "subscriptionTokenId",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_subscriptionNFT",
"type": "address"
},
{
"internalType": "uint256",
"name": "_subscriptionTokenId",
"type": "uint256"
}
],
"name": "setSubscription",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"stateMutability": "payable",
"type": "receive"
Expand Down
34 changes: 34 additions & 0 deletions packages/valory/contracts/agent_mech/contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from aea.contracts.base import Contract
from aea.crypto.base import LedgerApi
from aea_ledger_ethereum import EthereumApi
from web3 import Web3
from web3.types import BlockIdentifier, TxReceipt


Expand Down Expand Up @@ -302,3 +303,36 @@ def get_exec_tx_data(
fn_name="exec", args=[to, value, data, operation, tx_gas]
)
return {"data": bytes.fromhex(data[2:])} # type: ignore

@classmethod
def get_subscription(
cls,
ledger_api: LedgerApi,
contract_address: str,
) -> JSONLike:
"""Get tx data"""
contract_instance = cls.get_instance(ledger_api, contract_address)
nft = contract_instance.functions.subscriptionNFT().call()
token_id = contract_instance.functions.subscriptionTokenId().call()
return {"nft": nft, "token_id": token_id}

@classmethod
def get_set_subscription_tx_data(
cls,
ledger_api: LedgerApi,
contract_address: str,
subscription_address: str,
token_id: int,
) -> JSONLike:
"""Get tx data"""
ledger_api = cast(EthereumApi, ledger_api)

if not isinstance(ledger_api, EthereumApi):
raise ValueError(f"Only EthereumApi is supported, got {type(ledger_api)}")

contract_instance = cls.get_instance(ledger_api, contract_address)
data = contract_instance.encodeABI(
fn_name="setSubscription",
args=[Web3.to_checksum_address(subscription_address), token_id],
)
return {"data": bytes.fromhex(data[2:])} # type: ignore
4 changes: 2 additions & 2 deletions packages/valory/contracts/agent_mech/contract.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ license: Apache-2.0
aea_version: '>=1.0.0, <2.0.0'
fingerprint:
__init__.py: bafybeigpq5lxfj2aza6ok3fjuywtdafelkbvoqwaits7regfbgu4oynmku
build/AgentMech.json: bafybeidrlu7vpusp2tzovyf5rbnqy2jicuq3e6czizfkzswjq4rjusu72i
contract.py: bafybeig65qzfwsetro4ncnb4zlmtws3dliun6q57mw3xzy7qh5s2kczj64
build/AgentMech.json: bafybeienu4zryyvn6jvjfuhlzxonij7oim7hm3nf2atpjl7swx2amagv4q
contract.py: bafybeibyqhwdez2d2sewagzaqxqvaxwqd2lpfj3tjt5cmkylv4apaspwyu
fingerprint_ignore_patterns: []
class_name: AgentMechContract
contract_interface_paths:
Expand Down
6 changes: 5 additions & 1 deletion packages/valory/services/mech/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: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba
fingerprint_ignore_patterns: []
agent: valory/mech:0.1.0:bafybeia5wlctflbgvtigc45gfzimftosrvsi6c6z57o2iiuij3kidpcp3e
agent: valory/mech:0.1.0:bafybeifg3hcc5inhmp7yhl7sjwdiuioemmcg2gc7id2ob3ttty3t3iaery
number_of_agents: 4
deployment:
agent:
Expand Down Expand Up @@ -57,6 +57,7 @@ type: skill
metadata_hash: ${METADATA_HASH:str:f01701220caa53607238e340da63b296acab232c18a48e954f0af6ff2b835b2d93f1962f0}
profit_split_freq: ${PROFIT_SPLIT_FREQ:int:100}
hash_checkpoint_address: ${CHECKPOINT_ADDRESS:str:0x0000000000000000000000000000000000000000}
mech_to_subscription: ${MECH_TO_SUBSCRIPTION:list:[["0x77af31De935740567Cf4fF1986D04B2c964A786a",["0x0000000000000000000000000000000000000000","1"]]]}
1:
models:
params:
Expand Down Expand Up @@ -88,6 +89,7 @@ type: skill
profit_split_freq: ${PROFIT_SPLIT_FREQ:int:100}
hash_checkpoint_address: ${CHECKPOINT_ADDRESS:str:0x0000000000000000000000000000000000000000}
service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://dummy_service.autonolas.tech/}
mech_to_subscription: ${MECH_TO_SUBSCRIPTION:list:[["0x77af31De935740567Cf4fF1986D04B2c964A786a",["0x0000000000000000000000000000000000000000","1"]]]}
2:
models:
params:
Expand Down Expand Up @@ -119,6 +121,7 @@ type: skill
metadata_hash: ${METADATA_HASH:str:f01701220caa53607238e340da63b296acab232c18a48e954f0af6ff2b835b2d93f1962f0}
profit_split_freq: ${PROFIT_SPLIT_FREQ:int:100}
hash_checkpoint_address: ${CHECKPOINT_ADDRESS:str:0x0000000000000000000000000000000000000000}
mech_to_subscription: ${MECH_TO_SUBSCRIPTION:list:[["0x77af31De935740567Cf4fF1986D04B2c964A786a",["0x0000000000000000000000000000000000000000","1"]]]}
3:
models:
params:
Expand Down Expand Up @@ -150,6 +153,7 @@ type: skill
profit_split_freq: ${PROFIT_SPLIT_FREQ:int:100}
hash_checkpoint_address: ${CHECKPOINT_ADDRESS:str:0x0000000000000000000000000000000000000000}
service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://dummy_service.autonolas.tech/}
mech_to_subscription: ${MECH_TO_SUBSCRIPTION:list:[["0x77af31De935740567Cf4fF1986D04B2c964A786a",["0x0000000000000000000000000000000000000000","1"]]]}
---
public_id: valory/task_execution:0.1.0
type: skill
Expand Down
4 changes: 4 additions & 0 deletions packages/valory/skills/mech_abci/behaviours.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
from packages.valory.skills.reset_pause_abci.behaviours import (
ResetPauseABCIConsensusBehaviour,
)
from packages.valory.skills.subscription_abci.behaviours import (
UpdateSubscriptionRoundBehaviour,
)
from packages.valory.skills.task_submission_abci.behaviours import (
TaskSubmissionRoundBehaviour,
)
Expand All @@ -56,5 +59,6 @@ class MechConsensusBehaviour(AbstractRoundBehaviour):
*ResetPauseABCIConsensusBehaviour.behaviours,
*TransactionSettlementRoundBehaviour.behaviours,
*TerminationAbciBehaviours.behaviours,
*UpdateSubscriptionRoundBehaviour.behaviours,
}
background_behaviours_cls = {BackgroundBehaviour} # type: ignore
6 changes: 5 additions & 1 deletion packages/valory/skills/mech_abci/composition.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import packages.valory.skills.registration_abci.rounds as RegistrationAbci
import packages.valory.skills.reset_pause_abci.rounds as ResetAndPauseAbci
import packages.valory.skills.subscription_abci.rounds as SubscriptionUpdateAbciApp
import packages.valory.skills.task_submission_abci.rounds as TaskSubmissionAbciApp
import packages.valory.skills.transaction_settlement_abci.rounds as TransactionSubmissionAbciApp
from packages.valory.skills.abstract_round_abci.abci_app_chain import (
Expand All @@ -38,7 +39,9 @@
# Here we define how the transition between the FSMs should happen
# more information here: https://docs.autonolas.network/fsm_app_introduction/#composition-of-fsm-apps
abci_app_transition_mapping: AbciAppTransitionMapping = {
RegistrationAbci.FinishedRegistrationRound: TaskSubmissionAbciApp.TaskPoolingRound,
RegistrationAbci.FinishedRegistrationRound: SubscriptionUpdateAbciApp.UpdateSubscriptionRound,
SubscriptionUpdateAbciApp.FinishedWithoutTxRound: TaskSubmissionAbciApp.TaskPoolingRound,
SubscriptionUpdateAbciApp.FinishedWithTxRound: TransactionSubmissionAbciApp.RandomnessTransactionSubmissionRound, # pylint: disable=C0301
TaskSubmissionAbciApp.FinishedTaskPoolingRound: TransactionSubmissionAbciApp.RandomnessTransactionSubmissionRound, # pylint: disable=C0301
TaskSubmissionAbciApp.FinishedTaskExecutionWithErrorRound: ResetAndPauseAbci.ResetAndPauseRound,
TaskSubmissionAbciApp.FinishedWithoutTasksRound: ResetAndPauseAbci.ResetAndPauseRound,
Expand All @@ -60,6 +63,7 @@
TaskSubmissionAbciApp.TaskSubmissionAbciApp,
ResetAndPauseAbci.ResetPauseAbciApp,
TransactionSubmissionAbciApp.TransactionSubmissionAbciApp,
SubscriptionUpdateAbciApp.SubscriptionUpdateAbciApp,
),
abci_app_transition_mapping,
).add_background_app(termination_config)
10 changes: 8 additions & 2 deletions packages/valory/skills/mech_abci/fsm_specification.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ alphabet_in:
- NONE
- NO_MAJORITY
- NO_TASKS
- NO_TX
- RESET_AND_PAUSE_TIMEOUT
- RESET_TIMEOUT
- ROUND_TIMEOUT
Expand Down Expand Up @@ -39,6 +40,7 @@ states:
- SynchronizeLateMessagesRound
- TaskPoolingRound
- TransactionPreparationRound
- UpdateSubscriptionRound
- ValidateTransactionRound
transition_func:
(CheckLateTxHashesRound, CHECK_LATE_ARRIVING_MESSAGE): SynchronizeLateMessagesRound
Expand All @@ -65,9 +67,9 @@ transition_func:
(RandomnessTransactionSubmissionRound, DONE): SelectKeeperTransactionSubmissionARound
(RandomnessTransactionSubmissionRound, NO_MAJORITY): RandomnessTransactionSubmissionRound
(RandomnessTransactionSubmissionRound, ROUND_TIMEOUT): RandomnessTransactionSubmissionRound
(RegistrationRound, DONE): TaskPoolingRound
(RegistrationRound, DONE): UpdateSubscriptionRound
(RegistrationRound, NO_MAJORITY): RegistrationRound
(RegistrationStartupRound, DONE): TaskPoolingRound
(RegistrationStartupRound, DONE): UpdateSubscriptionRound
(ResetAndPauseRound, DONE): TaskPoolingRound
(ResetAndPauseRound, NO_MAJORITY): RegistrationRound
(ResetAndPauseRound, RESET_AND_PAUSE_TIMEOUT): RegistrationRound
Expand Down Expand Up @@ -97,6 +99,10 @@ transition_func:
(TransactionPreparationRound, DONE): RandomnessTransactionSubmissionRound
(TransactionPreparationRound, ERROR): ResetAndPauseRound
(TransactionPreparationRound, NO_MAJORITY): ResetAndPauseRound
(UpdateSubscriptionRound, DONE): RandomnessTransactionSubmissionRound
(UpdateSubscriptionRound, ERROR): UpdateSubscriptionRound
(UpdateSubscriptionRound, NO_MAJORITY): UpdateSubscriptionRound
(UpdateSubscriptionRound, NO_TX): TaskPoolingRound
(ValidateTransactionRound, DONE): ResetAndPauseRound
(ValidateTransactionRound, NEGATIVE): CheckTransactionHistoryRound
(ValidateTransactionRound, NONE): SelectKeeperTransactionSubmissionBRound
Expand Down
3 changes: 2 additions & 1 deletion packages/valory/skills/mech_abci/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from packages.valory.skills.abstract_round_abci.models import Requests as BaseRequests
from packages.valory.skills.mech_abci.composition import MechAbciApp
from packages.valory.skills.reset_pause_abci.rounds import Event as ResetPauseEvent
from packages.valory.skills.subscription_abci.models import Params as SubscriptionParams
from packages.valory.skills.task_submission_abci.models import (
Params as TaskExecutionAbciParams,
)
Expand Down Expand Up @@ -99,5 +100,5 @@ def setup(self) -> None:
)


class Params(TaskExecutionParams, TerminationParams): # type: ignore
class Params(TaskExecutionParams, SubscriptionParams, TerminationParams): # type: ignore
"""A model to represent params for multiple abci apps."""
Loading

0 comments on commit 2e7f759

Please sign in to comment.