From 413859dfc42b75e3527b7bf50db138ef80146850 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Tue, 22 Mar 2022 12:13:14 +0100 Subject: [PATCH 01/29] fix:changing links --- docs/acn-internals.md | 57 ++++++++++++++++++++----------------------- docs/acn.md | 10 ++++---- 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/docs/acn-internals.md b/docs/acn-internals.md index 5d16d212d2..1d3a53cc9a 100644 --- a/docs/acn-internals.md +++ b/docs/acn-internals.md @@ -4,9 +4,9 @@ the main implementation of the Agent Communication Network (ACN). In particular: -- the `libp2p_node` Golang library; -- the `p2p_libp2p` AEA connection, written in Python, that implements the _direct connection_ with an ACN peer; -- the `p2p_libp2p_client` AEA connection, written in Python, which implements the _delegate connection_ with an ACN peer. +- The `open-acn` Golang library; At the moment a copy resides locally in open-aea here as [`libp2p_node`](https://github.com/valory-xyz/open-aea/tree/main/packages/open_aea/connections/p2p_libp2p/libp2p_node). +- The `p2p_libp2p` AEA connection, written in Python, that implements the _direct connection_ with an ACN peer; +- The `p2p_libp2p_client` AEA connection, written in Python, which implements the _delegate connection_ with an ACN peer. It is assumed the reader already knows what is the ACN and its purposes; if not, we suggest reading this page. @@ -24,7 +24,7 @@ and the message exchange involved; destination agent to the target agent; - The following section describes the functionalities of the AEA connections that allow to communicate through - the ACN: `fetchai/p2p_libp2p` and `fetchia/p2p_libp2p_delegate`; + the ACN: `p2p_libp2p` and `p2p_libp2p_client`; - The documentation ends with a section of known issues and limitations of the current implementation. @@ -32,12 +32,11 @@ and the message exchange involved; At the foundation of the ACN there is the _ACN protocol_. The protocol messages and the reply structure are generated from this -protocol specification, +protocol specification, using the protocol generator. Therefore, it uses Protocol Buffers -as a serialization format, -and the definition of the data structures involved is defined in this -`.proto` file. +as a serialization format, and the definition of the data structures involved is defined in this +`.proto` file. To know more about the protocol generator, refer to the relevant section of the documentation: @@ -90,7 +89,7 @@ the sender about the handling of certain requests. The payload contains: - the `status_code`, a positive integer among the ones in the - Protobuf file. + Protobuf file. - a list of error messages (string). A status code `0`, identified as `SUCCESS`, @@ -339,9 +338,9 @@ The following diagram explains the exchange of messages on entering an envelope In the case of _direct connection_, `Agent` is a Python process, whereas `Peer` is in a separate (Golang) process. The logic of the Python Agent client is implemented in -the AEA connection `fetchai/p2p_libp2p` +the AEA connection `p2p_libp2p` The communication between `Agent` and `Peer` is done through -an OS pipe for Inter-Process Communication (IPC) between the AEA's process and the libp2p node process; +an OS pipe for Inter-Process Communication (IPC) between the AEAs process and the libp2p node process; then, the message gets enqueued to an output queue by an input coroutine. Finally, the envelope ends up in an output queue, which is processed by an output coroutine and routed to the next peer. @@ -351,8 +350,9 @@ the message exchange is very similar; however, instead of using pipes, the communication is done through the network, i.e. TCP, with a peer which has the delegate service enabled. The logic of the `Agent` client connected with a delegate connection -is implemented in -the AEA connection `fetchai/p2p_libp2p_client` +is implemented in the open-aea +`p2p_libp2p_client` connection. +
sequenceDiagram @@ -423,7 +423,7 @@ we may have different scenario: participant Peer2 Agent->>Peer1: AeaEnvelope alt target == peer1.my_agent - note over Peer1: envelope destinated
to local agent,
not routing + note over Peer1: envelope designated
to local agent,
not routing loop agent not ready note over Peer1: sleep for 100ms end @@ -578,27 +578,25 @@ similarly for what has been described for the envelope entrance To connect the AEA to the ACN network, there are two AEA connections available: -- the `fetchai/p2p_libp2p`, that implements +- the `p2p_libp2p`, that implements a direct connection, and -- the `fetchai/p2p_libp2p_delegate` connection, +- the `p2p_libp2p_client` connection, that implements the delegate connection. For more information on the AEA connection package type, refer to this guide. -### The `fetchai/p2p_libp2p` connection +### The `p2p_libp2p` connection -The source code of the `fetchai/p2p_libp2p` connection -can be downloaded from -the AEA Registry, -or from the main AEA framework repository. +The source code of the `p2p_libp2p` connection can be downloaded +here. The package provides the connection class `P2PLibp2pConnection`, which implements the `Connection` interface and therefore can be used by the Multiplexer as any other connection. - The `connect` method of this connection spawns a new instance - of the `libp2p_node` program + of the `libp2p_node` program (i.e. an ACN peer node) and connects to it through OS pipes. Then, it sets up the _message receiving loop_, which enqueues messages in the input queue to be read by `read` method calls, @@ -693,12 +691,10 @@ which receives messages from the Libp2p node. - the `disconnect` method stops both the receiving loop and the sending loop, and stops the Libp2p node. -### The `fetchai/p2p_libp2p_delegate` connection +### The `p2p_libp2p_client` connection -The source code of the `fetchai/p2p_libp2p_delegate` connection -can be downloaded from -the main AEA framework repository. -or from the main AEA framework repository. +The source code of the `p2p_libp2p` connection can be downloaded +here. The package provides the connection class `P2PLibp2pClientConnection`, which implements the `Connection` interface and @@ -747,8 +743,7 @@ therefore can be used by the Multiplexer as any other connection.
- The `send` method and the `receive` methods behave similarly to - the `send` and `receive` methods of the - `p2p_libp2p connection`, + the `send` and `receive` methods of the `p2p_libp2p` connection, in terms of message exchange; however, the communication is done via TCP rather than pipes. @@ -776,8 +771,8 @@ Possible solutions: Code references: -- record removed: https://github.com/fetchai/agents-aea/blob/1db1720081969bcec1be5a2000ca176475d2b487/libs/go/libp2p_node/dht/dhtpeer/dhtpeer.go#L864 -- send code: https://github.com/fetchai/agents-aea/blob/1db1720081969bcec1be5a2000ca176475d2b487/libs/go/libp2p_node/dht/dhtpeer/dhtpeer.go#L955 +- agent record removal +- message routing ### Golang Node <> Python Client `libp2p` connection diff --git a/docs/acn.md b/docs/acn.md index f083aeff33..6a864b6ada 100644 --- a/docs/acn.md +++ b/docs/acn.md @@ -4,14 +4,14 @@ The agent communication network (ACN) provides a system for agents to find each ## Message delivery problem Agents need to contact each others. Given the wallet address of a target agent, how can the originator agent deliver a message to it whilst guaranteeing certain properties? -The properties we would like to have are: +The properties we would like are: - Reliability: with guarantees on message reception - Authentication: to prevent impersonation - Confidentiality: to prevent exposing sensitive information within the message - Availability: some guarantees about the liveness of the service (tampering detection) -The problem statement and the agents framework context impose a number of design constraints: +The problem statement and the agent framework context impose a number of design constraints: - Distributed environment: no assumption are placed about the location of the agent, they can be anywhere in the publicly reachable internet - Decentralized environment: no trusted central authority @@ -28,7 +28,7 @@ The ACN is maintained by peers. Peers are not to be equated with agents. They ar At its core, the ACN implements a distributed hash table (DHT). A DHT is similar to a regular hash table in that it stores key-value pairs. However, storage is distributed across the participating machines (peers) with an efficient lookup operation. This is enabled by: - Consistent hashing: decide responsibility for assignment of the DHT key-value storage -- Structured overlays: organize the participating peers in a well defined topology for efficient routing +- Structured overlays: organize the participating peers in a well-defined topology for efficient routing DHT @@ -51,8 +51,8 @@ To satisfy different resource constraints and flexible deployment the ACN is imp An agent can choose which connection to use depending on the resource and trust requirements: -- `p2p_libp2p` connection: the agent maintains a peer of the ACN. The agent has full control over the peer and does not need to trust any other entity. -- `p2p_libp2p_client` connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer. +- [`p2p_libp2p`](../packages/open_aea/connections/p2p_libp2p) connection: the agent maintains a peer of the ACN. The agent has full control over the peer and does not need to trust any other entity. +- [`p2p_libp2p_client`](../packages/open_aea/connections/p2p_libp2p_client) connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer. All communication protocols use public cryptography to ensure security (authentication, confidentiality, and availability) using TLS handshakes with pre-shared public keys. From 16361524d29bbc178640b591539f89313c549818 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Tue, 22 Mar 2022 12:23:51 +0100 Subject: [PATCH 02/29] chore:copies p2p-connection.md --- docs/p2p-connection.md | 188 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 docs/p2p-connection.md diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md new file mode 100644 index 0000000000..e1f3609d4b --- /dev/null +++ b/docs/p2p-connection.md @@ -0,0 +1,188 @@ +The `fetchai/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. + +## Local demo + +First, make sure you have installed the crypto plugin +of the target test-net. E.g. for Fetch.AI: +``` bash +pip install aea-ledger-fetchai +``` + +### Create and run the genesis AEA + +Create one AEA as follows: + +``` bash +aea create my_genesis_aea +cd my_genesis_aea +aea add connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea install +aea build +``` + +Establish the proof of representation: + +``` bash +aea generate-key fetchai +aea add-key fetchai fetchai_private_key.txt +aea generate-key fetchai fetchai_connection_private_key.txt +aea add-key fetchai fetchai_connection_private_key.txt --connection +aea issue-certificates +``` + +Run the AEA: + +``` bash +aea run --connections fetchai/p2p_libp2p:0.26.0 +``` + +Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.26.0 -u public_uri` to retrieve the address.) +This is the entry peer address for the local agent communication network created by the genesis AEA. + +### Create and run another AEA + +Create a second AEA: + +``` bash +aea create my_other_aea +cd my_other_aea +aea add connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea install +aea build +``` + +Establish the proof of representation: + +``` bash +aea generate-key fetchai +aea add-key fetchai fetchai_private_key.txt +aea generate-key fetchai fetchai_connection_private_key.txt +aea add-key fetchai fetchai_connection_private_key.txt --connection +aea issue-certificates +``` + +Provide the AEA with the information it needs to find the genesis: + +``` bash +aea config set --type dict vendor.fetchai.connections.p2p_libp2p.config \ +'{ + "delegate_uri": "127.0.0.1:11001", + "entry_peers": ["SOME_ADDRESS"], + "local_uri": "127.0.0.1:9001", + "log_file": "libp2p_node.log", + "public_uri": "127.0.0.1:9001" +}' +``` +Here `SOME_ADDRESS` needs to be replaced with the list of multi addresses displayed in the log output of the genesis AEA. + +Run the AEA: + +``` bash +aea run --connections fetchai/p2p_libp2p:0.26.0 +``` + +You can inspect the `libp2p_node.log` log files of the AEA to see how they discover each other. + +
+

Note

+

Currently p2p_libp2p connection limits the total message size to 3 MB. +

+
+ + +## Local demo with skills + +Explore the demo section for further examples. + +## Deployed agent communication network + +You can connect to the deployed public test network by adding one or multiple of the following addresses as the `p2p_libp2p` connection's `entry_peers`: + +``` yaml +/dns4/acn.fetch.ai/tcp/9000/p2p/16Uiu2HAkw1ypeQYQbRFV5hKUxGRHocwU5ohmVmCnyJNg36tnPFdx +``` +``` yaml +/dns4/acn.fetch.ai/tcp/9001/p2p/16Uiu2HAmVWnopQAqq4pniYLw44VRvYxBUoRHqjz1Hh2SoCyjbyRW +``` + +Specifically, in an AEA's configuration `aea-config.yaml` add the above addresses for `entry_peers` as follows: +``` yaml +--- +public_id: fetchai/p2p_libp2p:0.26.0 +type: connection +config: + delegate_uri: null + entry_peers: [/dns4/acn.fetch.ai/tcp/9000/p2p/16Uiu2HAkw1ypeQYQbRFV5hKUxGRHocwU5ohmVmCnyJNg36tnPFdx,/dns4/acn.fetch.ai/tcp/9001/p2p/16Uiu2HAmVWnopQAqq4pniYLw44VRvYxBUoRHqjz1Hh2SoCyjbyRW] + public_uri: null + local_uri: 127.0.0.1:9001 +``` + +Note, this configuration change must be made for all agents attempting to communicate with each other via the Agent Communication Network. For example, in demos involving two agents, both agents will need the above modifications to their respective `aea-config.yaml` file. However, remember to use different ports in `local_uri.` This will allow both agents to default to this communication network without the added overhead of opening ports and specifying hosts on the individual host machines running each agent. + + +## Configuring the `connection.yaml` entries: + +To learn more about how to configure your `fetchai/p2p_libp2p:0.26.0` connection consult the `README.md` file supplied with the connection package. + +## Running Go peer standalone + +You can run a peer node in _standalone mode_; that is, as a Go process with no dependency on the AEA framework. To facilitate such a deployment, we provide a script + `run_acn_node_standalone.py` + and a corresponding + Dockerfile. + +First, you need to build the node's binary (`libp2p_node`) either: + +- locally + ``` bash + svn export https://github.com/fetchai/agents-aea.git/trunk/packages/fetchai/connections/p2p_libp2p + cd p2p_libp2p + go build + chmod +x libp2p_node + ``` + Make sure you satisfy the system requirements. +- or within a docker image using the provided Dockerfile: + ``` bash + docker build -t acn_node_standalone -f scripts/acn/Dockerfile . + ``` + +Next, to run the node binary in standalone mode, it requires values for the following entries: + +- `AEA_P2P_ID`: the node's private key, will be used as its identity +- `AEA_P2P_URI`: the local host and port to use by node +- `AEA_P2P_URI_PUBLIC`: the URI under which the peer is publicly reachable +- `AEA_P2P_DELEGATE_URI`: the URI under which the peer receives delegate connections +- `AEA_P2P_ENTRY_URIS`: an optionally supplied list of comma-separated (`,`) entry Multiaddresses for the peer to bootstrap + +The script allows different methods to pass these values to the node: + +- As environment variables exported in the format `=` for each entry. Then: + ``` bash + python3 run_acn_node_standalone.py libp2p_node --config-from-env + ``` +- Using an environment file containing the entries and their values in the format `=`, one entry per line. Then: + ``` bash + python3 run_acn_node_standalone.py libp2p_node --config-from-file + ``` + or + ``` bash + docker run -v :/acn/acn_config -it acn_node_standalone --config-from-file /acn/acn_config + ``` +- Using command line arguments: + ``` bash + python3 run_acn_node_standalone.py libp2p_node --key-file \ + --uri --uri-external \ + --uri-delegate \ + --entry-peers-maddrs ... + ``` + or + ``` bash + docker run -v :/acn/key.txt -it acn_node_standalone --key-file /acn/key.txt \ + --uri --uri-external \ + --uri-delegate \ + --entry-peers-maddrs ... + ``` + +Note that the script will always save the configuration of the running node as a file under the name `.acn_config` in the current working directory. This can be handy when you want the exact same configuration for future runs of the node. From f0ed3a9b04d33811180ff63eeaeb328a02d8cf71 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Tue, 29 Mar 2022 00:25:26 +0200 Subject: [PATCH 03/29] docs:updating to open-aea --- docs/p2p-connection.md | 58 +++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md index e1f3609d4b..669d9997c4 100644 --- a/docs/p2p-connection.md +++ b/docs/p2p-connection.md @@ -1,11 +1,21 @@ -The `fetchai/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. +The `open_aea/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. ## Local demo +
+

Note

+

Currently p2p_libp2p does not support the + ethereum keys generated by open-aea-ledger-ethereum yet. + This does not affect the agents ability to interact with the + ethereum ledger and solely necessitates a separate set of + cosmos keys for establishing the libp2p connection. +

+
+ First, make sure you have installed the crypto plugin -of the target test-net. E.g. for Fetch.AI: +of the target test-net. ``` bash -pip install aea-ledger-fetchai +pip install open-aea-ledger-cosmos ``` ### Create and run the genesis AEA @@ -15,8 +25,8 @@ Create one AEA as follows: ``` bash aea create my_genesis_aea cd my_genesis_aea -aea add connection fetchai/p2p_libp2p:0.26.0 -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea add connection open_aea/p2p_libp2p:0.26.0 +aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 aea install aea build ``` @@ -24,17 +34,17 @@ aea build Establish the proof of representation: ``` bash -aea generate-key fetchai -aea add-key fetchai fetchai_private_key.txt -aea generate-key fetchai fetchai_connection_private_key.txt -aea add-key fetchai fetchai_connection_private_key.txt --connection +aea generate-key cosmos +aea add-key cosmos cosmos_private_key.txt +aea generate-key cosmos cosmos_connection_private_key.txt +aea add-key cosmos cosmos_connection_private_key.txt --connection aea issue-certificates ``` Run the AEA: ``` bash -aea run --connections fetchai/p2p_libp2p:0.26.0 +aea run --connections open_aea/p2p_libp2p:0.26.0 ``` Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.26.0 -u public_uri` to retrieve the address.) @@ -47,8 +57,8 @@ Create a second AEA: ``` bash aea create my_other_aea cd my_other_aea -aea add connection fetchai/p2p_libp2p:0.26.0 -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea add connection open_aea/p2p_libp2p:0.26.0 +aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 aea install aea build ``` @@ -56,17 +66,17 @@ aea build Establish the proof of representation: ``` bash -aea generate-key fetchai -aea add-key fetchai fetchai_private_key.txt -aea generate-key fetchai fetchai_connection_private_key.txt -aea add-key fetchai fetchai_connection_private_key.txt --connection +aea generate-key cosmos +aea add-key cosmos cosmos_private_key.txt +aea generate-key cosmos cosmos_connection_private_key.txt +aea add-key cosmos cosmos_connection_private_key.txt --connection aea issue-certificates ``` Provide the AEA with the information it needs to find the genesis: ``` bash -aea config set --type dict vendor.fetchai.connections.p2p_libp2p.config \ +aea config set --type dict vendor.open_aea.connections.p2p_libp2p.config \ '{ "delegate_uri": "127.0.0.1:11001", "entry_peers": ["SOME_ADDRESS"], @@ -80,7 +90,7 @@ Here `SOME_ADDRESS` needs to be replaced with the list of multi addresses displa Run the AEA: ``` bash -aea run --connections fetchai/p2p_libp2p:0.26.0 +aea run --connections open_aea/p2p_libp2p:0.26.0 ``` You can inspect the `libp2p_node.log` log files of the AEA to see how they discover each other. @@ -101,20 +111,20 @@ Explore the demo section for further examples. You can connect to the deployed public test network by adding one or multiple of the following addresses as the `p2p_libp2p` connection's `entry_peers`: ``` yaml -/dns4/acn.fetch.ai/tcp/9000/p2p/16Uiu2HAkw1ypeQYQbRFV5hKUxGRHocwU5ohmVmCnyJNg36tnPFdx + ``` ``` yaml -/dns4/acn.fetch.ai/tcp/9001/p2p/16Uiu2HAmVWnopQAqq4pniYLw44VRvYxBUoRHqjz1Hh2SoCyjbyRW + ``` -Specifically, in an AEA's configuration `aea-config.yaml` add the above addresses for `entry_peers` as follows: +Specifically, in an AEAs configuration `aea-config.yaml` add the above addresses for `entry_peers` as follows: ``` yaml --- -public_id: fetchai/p2p_libp2p:0.26.0 +public_id: open_aea/p2p_libp2p:0.26.0 type: connection config: delegate_uri: null - entry_peers: [/dns4/acn.fetch.ai/tcp/9000/p2p/16Uiu2HAkw1ypeQYQbRFV5hKUxGRHocwU5ohmVmCnyJNg36tnPFdx,/dns4/acn.fetch.ai/tcp/9001/p2p/16Uiu2HAmVWnopQAqq4pniYLw44VRvYxBUoRHqjz1Hh2SoCyjbyRW] + entry_peers: [] public_uri: null local_uri: 127.0.0.1:9001 ``` @@ -124,7 +134,7 @@ Note, this configuration change must be made for all agents attempting to commun ## Configuring the `connection.yaml` entries: -To learn more about how to configure your `fetchai/p2p_libp2p:0.26.0` connection consult the `README.md` file supplied with the connection package. +To learn more about how to configure your `open_aea/p2p_libp2p:0.26.0` connection consult the `README.md` file supplied with the connection package. ## Running Go peer standalone From d7d0cc4fc98d0312d789b04c9f4123ea5598b134 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Wed, 30 Mar 2022 22:46:36 +0200 Subject: [PATCH 04/29] docs:updating to open-aea and open-acn --- docs/p2p-connection.md | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md index 669d9997c4..12f523ba64 100644 --- a/docs/p2p-connection.md +++ b/docs/p2p-connection.md @@ -1,4 +1,4 @@ -The `open_aea/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. +The `open_aea/p2p_libp2p:0.1.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. ## Local demo @@ -6,7 +6,7 @@ The `open_aea/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer

Note

Currently p2p_libp2p does not support the ethereum keys generated by open-aea-ledger-ethereum yet. - This does not affect the agents ability to interact with the + This does not affect the agents' ability to interact with the ethereum ledger and solely necessitates a separate set of cosmos keys for establishing the libp2p connection.

@@ -16,6 +16,7 @@ First, make sure you have installed the crypto plugin of the target test-net. ``` bash pip install open-aea-ledger-cosmos +pip install open-aea-ledger-ethereum ``` ### Create and run the genesis AEA @@ -25,8 +26,8 @@ Create one AEA as follows: ``` bash aea create my_genesis_aea cd my_genesis_aea -aea add connection open_aea/p2p_libp2p:0.26.0 -aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 +aea add connection open_aea/p2p_libp2p:0.1.0 +aea config set agent.default_connection open_aea/p2p_libp2p:0.1.0 aea install aea build ``` @@ -34,8 +35,8 @@ aea build Establish the proof of representation: ``` bash -aea generate-key cosmos -aea add-key cosmos cosmos_private_key.txt +aea generate-key ethereum +aea add-key ethereum ethereum_private_key.txt aea generate-key cosmos cosmos_connection_private_key.txt aea add-key cosmos cosmos_connection_private_key.txt --connection aea issue-certificates @@ -44,10 +45,10 @@ aea issue-certificates Run the AEA: ``` bash -aea run --connections open_aea/p2p_libp2p:0.26.0 +aea run --connections open_aea/p2p_libp2p:0.1.0 ``` -Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.26.0 -u public_uri` to retrieve the address.) +Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.1.0 -u public_uri` to retrieve the address.) This is the entry peer address for the local agent communication network created by the genesis AEA. ### Create and run another AEA @@ -57,8 +58,8 @@ Create a second AEA: ``` bash aea create my_other_aea cd my_other_aea -aea add connection open_aea/p2p_libp2p:0.26.0 -aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 +aea add connection open_aea/p2p_libp2p:0.1.0 +aea config set agent.default_connection open_aea/p2p_libp2p:0.1.0 aea install aea build ``` @@ -66,8 +67,8 @@ aea build Establish the proof of representation: ``` bash -aea generate-key cosmos -aea add-key cosmos cosmos_private_key.txt +aea generate-key ethereum +aea add-key ethereum ethereum_private_key.txt aea generate-key cosmos cosmos_connection_private_key.txt aea add-key cosmos cosmos_connection_private_key.txt --connection aea issue-certificates @@ -79,18 +80,18 @@ Provide the AEA with the information it needs to find the genesis: aea config set --type dict vendor.open_aea.connections.p2p_libp2p.config \ '{ "delegate_uri": "127.0.0.1:11001", - "entry_peers": ["SOME_ADDRESS"], + "entry_peers": [, ], "local_uri": "127.0.0.1:9001", "log_file": "libp2p_node.log", "public_uri": "127.0.0.1:9001" }' ``` -Here `SOME_ADDRESS` needs to be replaced with the list of multi addresses displayed in the log output of the genesis AEA. +Here `[, ]` represents a list of multi addresses displayed in the log output of the genesis AEA. Run the AEA: ``` bash -aea run --connections open_aea/p2p_libp2p:0.26.0 +aea run --connections open_aea/p2p_libp2p:0.1.0 ``` You can inspect the `libp2p_node.log` log files of the AEA to see how they discover each other. @@ -111,20 +112,20 @@ Explore the demo section for further examples. You can connect to the deployed public test network by adding one or multiple of the following addresses as the `p2p_libp2p` connection's `entry_peers`: ``` yaml - + ``` ``` yaml - + ``` Specifically, in an AEAs configuration `aea-config.yaml` add the above addresses for `entry_peers` as follows: ``` yaml --- -public_id: open_aea/p2p_libp2p:0.26.0 +public_id: open_aea/p2p_libp2p:0.1.0 type: connection config: delegate_uri: null - entry_peers: [] + entry_peers: [, ] public_uri: null local_uri: 127.0.0.1:9001 ``` @@ -134,21 +135,21 @@ Note, this configuration change must be made for all agents attempting to commun ## Configuring the `connection.yaml` entries: -To learn more about how to configure your `open_aea/p2p_libp2p:0.26.0` connection consult the `README.md` file supplied with the connection package. +To learn more about how to configure your `open_aea/p2p_libp2p:0.1.0` connection consult the `README.md` file supplied with the connection package. ## Running Go peer standalone You can run a peer node in _standalone mode_; that is, as a Go process with no dependency on the AEA framework. To facilitate such a deployment, we provide a script - `run_acn_node_standalone.py` + `run_acn_node_standalone.py` and a corresponding - Dockerfile. + Dockerfile. First, you need to build the node's binary (`libp2p_node`) either: - locally ``` bash - svn export https://github.com/fetchai/agents-aea.git/trunk/packages/fetchai/connections/p2p_libp2p - cd p2p_libp2p + git clone https://github.com/valory-xyz/open-acn/ + cd open-acn go build chmod +x libp2p_node ``` From e53262871d7b1187ee4febd12177da1836154627 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Thu, 31 Mar 2022 09:16:21 +0200 Subject: [PATCH 05/29] docs:fix links and packages --- docs/acn-internals.md | 4 ++-- docs/acn.md | 6 ++++-- docs/p2p-connection.md | 25 ++++++++++--------------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/docs/acn-internals.md b/docs/acn-internals.md index 1d3a53cc9a..a0f25cf74e 100644 --- a/docs/acn-internals.md +++ b/docs/acn-internals.md @@ -4,7 +4,7 @@ the main implementation of the Agent Communication Network (ACN). In particular: -- The `open-acn` Golang library; At the moment a copy resides locally in open-aea here as [`libp2p_node`](https://github.com/valory-xyz/open-aea/tree/main/packages/open_aea/connections/p2p_libp2p/libp2p_node). +- The `open-acn` Golang library; At the moment a copy resides locally in open-aea here as `libp2p_node`. - The `p2p_libp2p` AEA connection, written in Python, that implements the _direct connection_ with an ACN peer; - The `p2p_libp2p_client` AEA connection, written in Python, which implements the _delegate connection_ with an ACN peer. @@ -307,7 +307,7 @@ during a registration request: ### Delegate connections If the ACN node is configured to run the delegate service, -it start listening from a TCP socket at a configurable URI. +it starts listening from a TCP socket at a configurable URI. To see a diagram of the message exchanged during a registration request read diff --git a/docs/acn.md b/docs/acn.md index 6a864b6ada..7b16b65101 100644 --- a/docs/acn.md +++ b/docs/acn.md @@ -51,8 +51,10 @@ To satisfy different resource constraints and flexible deployment the ACN is imp An agent can choose which connection to use depending on the resource and trust requirements: -- [`p2p_libp2p`](../packages/open_aea/connections/p2p_libp2p) connection: the agent maintains a peer of the ACN. The agent has full control over the peer and does not need to trust any other entity. -- [`p2p_libp2p_client`](../packages/open_aea/connections/p2p_libp2p_client) connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer. +- `p2p_libp2p` +connection: the agent maintains a peer of the ACN. The agent has full control over the peer and does not need to trust any other entity. +- `p2p_libp2p_client` +connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer. All communication protocols use public cryptography to ensure security (authentication, confidentiality, and availability) using TLS handshakes with pre-shared public keys. diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md index 12f523ba64..f9230c8e3c 100644 --- a/docs/p2p-connection.md +++ b/docs/p2p-connection.md @@ -1,4 +1,4 @@ -The `open_aea/p2p_libp2p:0.1.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. +The `open_aea/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. ## Local demo @@ -26,8 +26,8 @@ Create one AEA as follows: ``` bash aea create my_genesis_aea cd my_genesis_aea -aea add connection open_aea/p2p_libp2p:0.1.0 -aea config set agent.default_connection open_aea/p2p_libp2p:0.1.0 +aea add connection open_aea/p2p_libp2p:0.26.0 +aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 aea install aea build ``` @@ -45,10 +45,10 @@ aea issue-certificates Run the AEA: ``` bash -aea run --connections open_aea/p2p_libp2p:0.1.0 +aea run --connections open_aea/p2p_libp2p:0.26.0 ``` -Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.1.0 -u public_uri` to retrieve the address.) +Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress open-aea -c -i open-aea/p2p_libp2p:0.26.0 -u public_uri` to retrieve the address.) This is the entry peer address for the local agent communication network created by the genesis AEA. ### Create and run another AEA @@ -58,8 +58,8 @@ Create a second AEA: ``` bash aea create my_other_aea cd my_other_aea -aea add connection open_aea/p2p_libp2p:0.1.0 -aea config set agent.default_connection open_aea/p2p_libp2p:0.1.0 +aea add connection open_aea/p2p_libp2p:0.26.0 +aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 aea install aea build ``` @@ -91,7 +91,7 @@ Here `[, ]` represents a list of multi Run the AEA: ``` bash -aea run --connections open_aea/p2p_libp2p:0.1.0 +aea run --connections open_aea/p2p_libp2p:0.26.0 ``` You can inspect the `libp2p_node.log` log files of the AEA to see how they discover each other. @@ -102,11 +102,6 @@ You can inspect the `libp2p_node.log` log files of the AEA to see how they disco

- -## Local demo with skills - -Explore the demo section for further examples. - ## Deployed agent communication network You can connect to the deployed public test network by adding one or multiple of the following addresses as the `p2p_libp2p` connection's `entry_peers`: @@ -121,7 +116,7 @@ You can connect to the deployed public test network by adding one or multiple of Specifically, in an AEAs configuration `aea-config.yaml` add the above addresses for `entry_peers` as follows: ``` yaml --- -public_id: open_aea/p2p_libp2p:0.1.0 +public_id: open_aea/p2p_libp2p:0.26.0 type: connection config: delegate_uri: null @@ -135,7 +130,7 @@ Note, this configuration change must be made for all agents attempting to commun ## Configuring the `connection.yaml` entries: -To learn more about how to configure your `open_aea/p2p_libp2p:0.1.0` connection consult the `README.md` file supplied with the connection package. +To learn more about how to configure your `open_aea/p2p_libp2p:0.26.0` connection consult the `README.md` file supplied with the connection package. ## Running Go peer standalone From d8d12318749db2935789c29af769b61b2e87a922 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Thu, 31 Mar 2022 21:38:28 +0200 Subject: [PATCH 06/29] trigger From 70380cb51bb24aeedfdbba351a2a9f2f97b00be5 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Fri, 1 Apr 2022 22:51:46 +0200 Subject: [PATCH 07/29] chore:move acn to packages.valory --- packages/{open_aea => valory}/connections/__init__.py | 0 packages/{open_aea => valory}/connections/p2p_libp2p/README.md | 0 .../{open_aea => valory}/connections/p2p_libp2p/__init__.py | 0 .../connections/p2p_libp2p/check_dependencies.py | 0 .../{open_aea => valory}/connections/p2p_libp2p/connection.py | 2 +- .../{open_aea => valory}/connections/p2p_libp2p/connection.yaml | 0 packages/{open_aea => valory}/connections/p2p_libp2p/consts.py | 0 .../connections/p2p_libp2p/libp2p_node/Makefile | 0 .../connections/p2p_libp2p/libp2p_node/README.md | 0 .../connections/p2p_libp2p/libp2p_node/acn/utils.go | 0 .../connections/p2p_libp2p/libp2p_node/aea/api.go | 0 .../connections/p2p_libp2p/libp2p_node/aea/envelope.pb.go | 0 .../connections/p2p_libp2p/libp2p_node/aea/envelope.proto | 0 .../connections/p2p_libp2p/libp2p_node/aea/pipe.go | 0 .../connections/p2p_libp2p/libp2p_node/aea/utils.go | 0 .../connections/p2p_libp2p/libp2p_node/common/common.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/common/handlers.go | 0 .../p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient.go | 0 .../p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient_test.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtclient/options.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtnode/dhtnode.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtnode/streams.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtnode/utils.go | 0 .../p2p_libp2p/libp2p_node/dht/dhtpeer/benchmarks_test.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer.go | 0 .../p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer_test.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtpeer/mailbox.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtpeer/options.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhtpeer/utils.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/dhttests/dhttests.go | 0 .../connections/p2p_libp2p/libp2p_node/dht/monitoring/file.go | 0 .../p2p_libp2p/libp2p_node/dht/monitoring/prometheus.go | 0 .../p2p_libp2p/libp2p_node/dht/monitoring/service.go | 0 .../connections/p2p_libp2p/libp2p_node/go.mod | 0 .../connections/p2p_libp2p/libp2p_node/go.sum | 0 .../connections/p2p_libp2p/libp2p_node/libp2p_node.go | 0 .../connections/p2p_libp2p/libp2p_node/link | 0 .../connections/p2p_libp2p/libp2p_node/mocks/mock_host.go | 0 .../connections/p2p_libp2p/libp2p_node/mocks/mock_net.go | 0 .../connections/p2p_libp2p/libp2p_node/mocks/mock_network.go | 0 .../connections/p2p_libp2p/libp2p_node/mocks/mock_peerstore.go | 0 .../p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.pb.go | 0 .../p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.proto | 0 .../p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml | 0 .../connections/p2p_libp2p/libp2p_node/utils/utils.go | 0 .../connections/p2p_libp2p/libp2p_node/utils/utils_test.go | 0 .../connections/p2p_libp2p_client/README.md | 0 .../connections/p2p_libp2p_client/__init__.py | 0 .../connections/p2p_libp2p_client/connection.py | 0 .../connections/p2p_libp2p_client/connection.yaml | 0 .../connections/p2p_libp2p_mailbox/README.md | 0 .../connections/p2p_libp2p_mailbox/__init__.py | 0 .../connections/p2p_libp2p_mailbox/connection.py | 0 .../connections/p2p_libp2p_mailbox/connection.yaml | 0 packages/{fetchai => valory}/protocols/acn/README.md | 0 packages/{fetchai => valory}/protocols/acn/__init__.py | 0 packages/{fetchai => valory}/protocols/acn/acn.proto | 0 packages/{fetchai => valory}/protocols/acn/acn_pb2.py | 0 packages/{fetchai => valory}/protocols/acn/custom_types.py | 0 packages/{fetchai => valory}/protocols/acn/dialogues.py | 0 packages/{fetchai => valory}/protocols/acn/message.py | 0 packages/{fetchai => valory}/protocols/acn/protocol.yaml | 0 packages/{fetchai => valory}/protocols/acn/serialization.py | 0 63 files changed, 1 insertion(+), 1 deletion(-) rename packages/{open_aea => valory}/connections/__init__.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/README.md (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/__init__.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/check_dependencies.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/connection.py (99%) rename packages/{open_aea => valory}/connections/p2p_libp2p/connection.yaml (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/consts.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/Makefile (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/README.md (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/acn/utils.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/aea/api.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/aea/envelope.pb.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/aea/envelope.proto (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/aea/pipe.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/aea/utils.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/common/common.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/common/handlers.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient_test.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtclient/options.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtnode/dhtnode.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtnode/streams.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtnode/utils.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/benchmarks_test.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer_test.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/mailbox.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/options.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/utils.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/dhttests/dhttests.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/monitoring/file.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/monitoring/prometheus.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/dht/monitoring/service.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/go.mod (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/go.sum (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/libp2p_node.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/link (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/mocks/mock_host.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/mocks/mock_net.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/mocks/mock_network.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/mocks/mock_peerstore.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.pb.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.proto (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/utils/utils.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p/libp2p_node/utils/utils_test.go (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_client/README.md (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_client/__init__.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_client/connection.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_client/connection.yaml (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_mailbox/README.md (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_mailbox/__init__.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_mailbox/connection.py (100%) rename packages/{open_aea => valory}/connections/p2p_libp2p_mailbox/connection.yaml (100%) rename packages/{fetchai => valory}/protocols/acn/README.md (100%) rename packages/{fetchai => valory}/protocols/acn/__init__.py (100%) rename packages/{fetchai => valory}/protocols/acn/acn.proto (100%) rename packages/{fetchai => valory}/protocols/acn/acn_pb2.py (100%) rename packages/{fetchai => valory}/protocols/acn/custom_types.py (100%) rename packages/{fetchai => valory}/protocols/acn/dialogues.py (100%) rename packages/{fetchai => valory}/protocols/acn/message.py (100%) rename packages/{fetchai => valory}/protocols/acn/protocol.yaml (100%) rename packages/{fetchai => valory}/protocols/acn/serialization.py (100%) diff --git a/packages/open_aea/connections/__init__.py b/packages/valory/connections/__init__.py similarity index 100% rename from packages/open_aea/connections/__init__.py rename to packages/valory/connections/__init__.py diff --git a/packages/open_aea/connections/p2p_libp2p/README.md b/packages/valory/connections/p2p_libp2p/README.md similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/README.md rename to packages/valory/connections/p2p_libp2p/README.md diff --git a/packages/open_aea/connections/p2p_libp2p/__init__.py b/packages/valory/connections/p2p_libp2p/__init__.py similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/__init__.py rename to packages/valory/connections/p2p_libp2p/__init__.py diff --git a/packages/open_aea/connections/p2p_libp2p/check_dependencies.py b/packages/valory/connections/p2p_libp2p/check_dependencies.py similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/check_dependencies.py rename to packages/valory/connections/p2p_libp2p/check_dependencies.py diff --git a/packages/open_aea/connections/p2p_libp2p/connection.py b/packages/valory/connections/p2p_libp2p/connection.py similarity index 99% rename from packages/open_aea/connections/p2p_libp2p/connection.py rename to packages/valory/connections/p2p_libp2p/connection.py index 55e1969271..efe64739cb 100644 --- a/packages/open_aea/connections/p2p_libp2p/connection.py +++ b/packages/valory/connections/p2p_libp2p/connection.py @@ -43,7 +43,7 @@ from packages.fetchai.protocols.acn import acn_pb2 from packages.fetchai.protocols.acn.message import AcnMessage -from packages.open_aea.connections.p2p_libp2p.consts import LIBP2P_NODE_MODULE_NAME +from packages.valory.connections.p2p_libp2p.consts import LIBP2P_NODE_MODULE_NAME _default_logger = logging.getLogger("aea.packages.open_aea.connections.p2p_libp2p") diff --git a/packages/open_aea/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/connection.yaml rename to packages/valory/connections/p2p_libp2p/connection.yaml diff --git a/packages/open_aea/connections/p2p_libp2p/consts.py b/packages/valory/connections/p2p_libp2p/consts.py similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/consts.py rename to packages/valory/connections/p2p_libp2p/consts.py diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/Makefile b/packages/valory/connections/p2p_libp2p/libp2p_node/Makefile similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/Makefile rename to packages/valory/connections/p2p_libp2p/libp2p_node/Makefile diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/README.md b/packages/valory/connections/p2p_libp2p/libp2p_node/README.md similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/README.md rename to packages/valory/connections/p2p_libp2p/libp2p_node/README.md diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/acn/utils.go b/packages/valory/connections/p2p_libp2p/libp2p_node/acn/utils.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/acn/utils.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/acn/utils.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/api.go b/packages/valory/connections/p2p_libp2p/libp2p_node/aea/api.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/api.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/aea/api.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/envelope.pb.go b/packages/valory/connections/p2p_libp2p/libp2p_node/aea/envelope.pb.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/envelope.pb.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/aea/envelope.pb.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/envelope.proto b/packages/valory/connections/p2p_libp2p/libp2p_node/aea/envelope.proto similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/envelope.proto rename to packages/valory/connections/p2p_libp2p/libp2p_node/aea/envelope.proto diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/pipe.go b/packages/valory/connections/p2p_libp2p/libp2p_node/aea/pipe.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/pipe.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/aea/pipe.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/utils.go b/packages/valory/connections/p2p_libp2p/libp2p_node/aea/utils.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/aea/utils.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/aea/utils.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/common/common.go b/packages/valory/connections/p2p_libp2p/libp2p_node/common/common.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/common/common.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/common/common.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/common/handlers.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/common/handlers.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/common/handlers.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/common/handlers.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient_test.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient_test.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient_test.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtclient/dhtclient_test.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtclient/options.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtclient/options.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtclient/options.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtclient/options.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtnode/dhtnode.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtnode/dhtnode.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtnode/dhtnode.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtnode/dhtnode.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtnode/streams.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtnode/streams.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtnode/streams.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtnode/streams.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtnode/utils.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtnode/utils.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtnode/utils.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtnode/utils.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/benchmarks_test.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/benchmarks_test.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/benchmarks_test.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/benchmarks_test.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer_test.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer_test.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer_test.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/dhtpeer_test.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/mailbox.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/mailbox.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/mailbox.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/mailbox.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/options.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/options.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/options.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/options.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/utils.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/utils.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/utils.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhtpeer/utils.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhttests/dhttests.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhttests/dhttests.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/dhttests/dhttests.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhttests/dhttests.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/monitoring/file.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/monitoring/file.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/monitoring/file.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/monitoring/file.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/monitoring/prometheus.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/monitoring/prometheus.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/monitoring/prometheus.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/monitoring/prometheus.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/monitoring/service.go b/packages/valory/connections/p2p_libp2p/libp2p_node/dht/monitoring/service.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/dht/monitoring/service.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/dht/monitoring/service.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/go.mod b/packages/valory/connections/p2p_libp2p/libp2p_node/go.mod similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/go.mod rename to packages/valory/connections/p2p_libp2p/libp2p_node/go.mod diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/go.sum b/packages/valory/connections/p2p_libp2p/libp2p_node/go.sum similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/go.sum rename to packages/valory/connections/p2p_libp2p/libp2p_node/go.sum diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/libp2p_node.go b/packages/valory/connections/p2p_libp2p/libp2p_node/libp2p_node.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/libp2p_node.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/libp2p_node.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/link b/packages/valory/connections/p2p_libp2p/libp2p_node/link similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/link rename to packages/valory/connections/p2p_libp2p/libp2p_node/link diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_host.go b/packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_host.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_host.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_host.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_net.go b/packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_net.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_net.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_net.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_network.go b/packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_network.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_network.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_network.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_peerstore.go b/packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_peerstore.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/mocks/mock_peerstore.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/mocks/mock_peerstore.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.pb.go b/packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.pb.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.pb.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.pb.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.proto b/packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.proto similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.proto rename to packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.proto diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml b/packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml rename to packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/utils/utils.go b/packages/valory/connections/p2p_libp2p/libp2p_node/utils/utils.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/utils/utils.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/utils/utils.go diff --git a/packages/open_aea/connections/p2p_libp2p/libp2p_node/utils/utils_test.go b/packages/valory/connections/p2p_libp2p/libp2p_node/utils/utils_test.go similarity index 100% rename from packages/open_aea/connections/p2p_libp2p/libp2p_node/utils/utils_test.go rename to packages/valory/connections/p2p_libp2p/libp2p_node/utils/utils_test.go diff --git a/packages/open_aea/connections/p2p_libp2p_client/README.md b/packages/valory/connections/p2p_libp2p_client/README.md similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_client/README.md rename to packages/valory/connections/p2p_libp2p_client/README.md diff --git a/packages/open_aea/connections/p2p_libp2p_client/__init__.py b/packages/valory/connections/p2p_libp2p_client/__init__.py similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_client/__init__.py rename to packages/valory/connections/p2p_libp2p_client/__init__.py diff --git a/packages/open_aea/connections/p2p_libp2p_client/connection.py b/packages/valory/connections/p2p_libp2p_client/connection.py similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_client/connection.py rename to packages/valory/connections/p2p_libp2p_client/connection.py diff --git a/packages/open_aea/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_client/connection.yaml rename to packages/valory/connections/p2p_libp2p_client/connection.yaml diff --git a/packages/open_aea/connections/p2p_libp2p_mailbox/README.md b/packages/valory/connections/p2p_libp2p_mailbox/README.md similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_mailbox/README.md rename to packages/valory/connections/p2p_libp2p_mailbox/README.md diff --git a/packages/open_aea/connections/p2p_libp2p_mailbox/__init__.py b/packages/valory/connections/p2p_libp2p_mailbox/__init__.py similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_mailbox/__init__.py rename to packages/valory/connections/p2p_libp2p_mailbox/__init__.py diff --git a/packages/open_aea/connections/p2p_libp2p_mailbox/connection.py b/packages/valory/connections/p2p_libp2p_mailbox/connection.py similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_mailbox/connection.py rename to packages/valory/connections/p2p_libp2p_mailbox/connection.py diff --git a/packages/open_aea/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml similarity index 100% rename from packages/open_aea/connections/p2p_libp2p_mailbox/connection.yaml rename to packages/valory/connections/p2p_libp2p_mailbox/connection.yaml diff --git a/packages/fetchai/protocols/acn/README.md b/packages/valory/protocols/acn/README.md similarity index 100% rename from packages/fetchai/protocols/acn/README.md rename to packages/valory/protocols/acn/README.md diff --git a/packages/fetchai/protocols/acn/__init__.py b/packages/valory/protocols/acn/__init__.py similarity index 100% rename from packages/fetchai/protocols/acn/__init__.py rename to packages/valory/protocols/acn/__init__.py diff --git a/packages/fetchai/protocols/acn/acn.proto b/packages/valory/protocols/acn/acn.proto similarity index 100% rename from packages/fetchai/protocols/acn/acn.proto rename to packages/valory/protocols/acn/acn.proto diff --git a/packages/fetchai/protocols/acn/acn_pb2.py b/packages/valory/protocols/acn/acn_pb2.py similarity index 100% rename from packages/fetchai/protocols/acn/acn_pb2.py rename to packages/valory/protocols/acn/acn_pb2.py diff --git a/packages/fetchai/protocols/acn/custom_types.py b/packages/valory/protocols/acn/custom_types.py similarity index 100% rename from packages/fetchai/protocols/acn/custom_types.py rename to packages/valory/protocols/acn/custom_types.py diff --git a/packages/fetchai/protocols/acn/dialogues.py b/packages/valory/protocols/acn/dialogues.py similarity index 100% rename from packages/fetchai/protocols/acn/dialogues.py rename to packages/valory/protocols/acn/dialogues.py diff --git a/packages/fetchai/protocols/acn/message.py b/packages/valory/protocols/acn/message.py similarity index 100% rename from packages/fetchai/protocols/acn/message.py rename to packages/valory/protocols/acn/message.py diff --git a/packages/fetchai/protocols/acn/protocol.yaml b/packages/valory/protocols/acn/protocol.yaml similarity index 100% rename from packages/fetchai/protocols/acn/protocol.yaml rename to packages/valory/protocols/acn/protocol.yaml diff --git a/packages/fetchai/protocols/acn/serialization.py b/packages/valory/protocols/acn/serialization.py similarity index 100% rename from packages/fetchai/protocols/acn/serialization.py rename to packages/valory/protocols/acn/serialization.py From 35357919f4e2e9a26b13e1d9e8e6c86c93dea0b6 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Fri, 1 Apr 2022 22:56:52 +0200 Subject: [PATCH 08/29] chore:move acn protocol and libp2p connection --- packages/valory/__init__.py | 0 packages/valory/connections/p2p_libp2p/connection.py | 4 ++-- .../valory/connections/p2p_libp2p/libp2p_node/__init__.py | 0 .../valory/connections/p2p_libp2p_client/connection.py | 4 ++-- .../valory/connections/p2p_libp2p_mailbox/connection.py | 4 ++-- packages/valory/protocols/__init__.py | 0 packages/valory/protocols/acn/__init__.py | 4 ++-- packages/valory/protocols/acn/dialogues.py | 2 +- packages/valory/protocols/acn/message.py | 4 ++-- packages/valory/protocols/acn/serialization.py | 6 +++--- tests/conftest.py | 8 ++++---- .../test_connections/test_p2p_libp2p/test_aea_cli.py | 2 +- .../test_connections/test_p2p_libp2p/test_build.py | 8 ++++---- .../test_p2p_libp2p/test_communication.py | 2 +- .../test_connections/test_p2p_libp2p/test_errors.py | 4 ++-- .../test_p2p_libp2p/test_fault_tolerance.py | 2 +- .../test_connections/test_p2p_libp2p/test_public_dht.py | 4 ++-- .../test_p2p_libp2p_client/test_aea_cli.py | 2 +- .../test_p2p_libp2p_client/test_communication.py | 2 +- .../test_p2p_libp2p_client/test_errors.py | 2 +- .../test_p2p_libp2p_mailbox/test_aea_cli.py | 2 +- .../test_p2p_libp2p_mailbox/test_errors.py | 4 ++-- .../test_p2p_libp2p_mailbox/test_mailbox_service.py | 6 +++--- tests/test_packages/test_protocols/test_acn.py | 6 +++--- 24 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 packages/valory/__init__.py create mode 100644 packages/valory/connections/p2p_libp2p/libp2p_node/__init__.py create mode 100644 packages/valory/protocols/__init__.py diff --git a/packages/valory/__init__.py b/packages/valory/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/valory/connections/p2p_libp2p/connection.py b/packages/valory/connections/p2p_libp2p/connection.py index efe64739cb..330d043324 100644 --- a/packages/valory/connections/p2p_libp2p/connection.py +++ b/packages/valory/connections/p2p_libp2p/connection.py @@ -41,8 +41,8 @@ from aea.helpers.pipe import IPCChannel, TCPSocketChannel from aea.mail.base import Envelope -from packages.fetchai.protocols.acn import acn_pb2 -from packages.fetchai.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn import acn_pb2 +from packages.valory.protocols.acn.message import AcnMessage from packages.valory.connections.p2p_libp2p.consts import LIBP2P_NODE_MODULE_NAME diff --git a/packages/valory/connections/p2p_libp2p/libp2p_node/__init__.py b/packages/valory/connections/p2p_libp2p/libp2p_node/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/valory/connections/p2p_libp2p_client/connection.py b/packages/valory/connections/p2p_libp2p_client/connection.py index ab9384eada..e55132c570 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.py +++ b/packages/valory/connections/p2p_libp2p_client/connection.py @@ -45,8 +45,8 @@ from aea.helpers.pipe import IPCChannelClient, TCPSocketChannelClient, TCPSocketProtocol from aea.mail.base import Envelope -from packages.fetchai.protocols.acn import acn_pb2 -from packages.fetchai.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn import acn_pb2 +from packages.valory.protocols.acn.message import AcnMessage try: diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.py b/packages/valory/connections/p2p_libp2p_mailbox/connection.py index dfa5ed64b2..5b14ee5a9d 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.py +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.py @@ -46,8 +46,8 @@ from aea.helpers.acn.uri import Uri from aea.mail.base import Envelope -from packages.fetchai.protocols.acn import acn_pb2 -from packages.fetchai.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn import acn_pb2 +from packages.valory.protocols.acn.message import AcnMessage try: diff --git a/packages/valory/protocols/__init__.py b/packages/valory/protocols/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/valory/protocols/acn/__init__.py b/packages/valory/protocols/acn/__init__.py index 95a029291e..9025d3769e 100644 --- a/packages/valory/protocols/acn/__init__.py +++ b/packages/valory/protocols/acn/__init__.py @@ -23,8 +23,8 @@ It was created with protocol buffer compiler version `libprotoc 3.19.4` and aea version `1.6.0`. """ -from packages.fetchai.protocols.acn.message import AcnMessage -from packages.fetchai.protocols.acn.serialization import AcnSerializer +from packages.valory.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn.serialization import AcnSerializer AcnMessage.serializer = AcnSerializer diff --git a/packages/valory/protocols/acn/dialogues.py b/packages/valory/protocols/acn/dialogues.py index a6ae32afc3..e86436c5fe 100644 --- a/packages/valory/protocols/acn/dialogues.py +++ b/packages/valory/protocols/acn/dialogues.py @@ -31,7 +31,7 @@ from aea.protocols.base import Message from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues -from packages.fetchai.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn.message import AcnMessage class AcnDialogue(Dialogue): diff --git a/packages/valory/protocols/acn/message.py b/packages/valory/protocols/acn/message.py index 6b399553c1..03fc137383 100644 --- a/packages/valory/protocols/acn/message.py +++ b/packages/valory/protocols/acn/message.py @@ -27,8 +27,8 @@ from aea.exceptions import AEAEnforceError, enforce from aea.protocols.base import Message -from packages.fetchai.protocols.acn.custom_types import AgentRecord as CustomAgentRecord -from packages.fetchai.protocols.acn.custom_types import StatusBody as CustomStatusBody +from packages.valory.protocols.acn.custom_types import AgentRecord as CustomAgentRecord +from packages.valory.protocols.acn.custom_types import StatusBody as CustomStatusBody _default_logger = logging.getLogger("aea.packages.fetchai.protocols.acn.message") diff --git a/packages/valory/protocols/acn/serialization.py b/packages/valory/protocols/acn/serialization.py index 0c2a627f8e..254f1ec84b 100644 --- a/packages/valory/protocols/acn/serialization.py +++ b/packages/valory/protocols/acn/serialization.py @@ -26,9 +26,9 @@ from aea.mail.base_pb2 import Message as ProtobufMessage from aea.protocols.base import Message, Serializer -from packages.fetchai.protocols.acn import acn_pb2 -from packages.fetchai.protocols.acn.custom_types import AgentRecord, StatusBody -from packages.fetchai.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn import acn_pb2 +from packages.valory.protocols.acn.custom_types import AgentRecord, StatusBody +from packages.valory.protocols.acn.message import AcnMessage class AcnSerializer(Serializer): diff --git a/tests/conftest.py b/tests/conftest.py index f5c45fe09d..afdaf49fc2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -102,17 +102,17 @@ from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection from packages.fetchai.connections.stub.connection import StubConnection -from packages.open_aea.connections.p2p_libp2p.check_dependencies import build_node -from packages.open_aea.connections.p2p_libp2p.connection import ( +from packages.valory.connections.p2p_libp2p import build_node +from packages.valory.connections.p2p_libp2p import ( LIBP2P_NODE_MODULE_NAME, MultiAddr, P2PLibp2pConnection, POR_DEFAULT_SERVICE_ID, ) -from packages.open_aea.connections.p2p_libp2p_client.connection import ( +from packages.valory.connections import ( P2PLibp2pClientConnection, ) -from packages.open_aea.connections.p2p_libp2p_mailbox.connection import ( +from packages.valory.connections.p2p_libp2p_mailbox import ( P2PLibp2pMailboxConnection, ) diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py index 071b5d12d7..967d4e83e9 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py @@ -28,7 +28,7 @@ from aea.test_tools.test_cases import AEATestCaseEmpty -from packages.open_aea.connections.p2p_libp2p.connection import ( +from packages.valory.connections.p2p_libp2p import ( PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID, ) diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py index afc777a960..796477ecac 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py @@ -27,15 +27,15 @@ from aea.exceptions import AEAException -from packages.open_aea.connections.p2p_libp2p import check_dependencies -from packages.open_aea.connections.p2p_libp2p.check_dependencies import ( +from packages.valory.connections.p2p_libp2p import check_dependencies +from packages.valory.connections.p2p_libp2p import ( MINIMUM_GCC_VERSION, MINIMUM_GO_VERSION, build_node, check_versions, version_to_string, ) -from packages.open_aea.connections.p2p_libp2p.connection import LIBP2P_NODE_MODULE_NAME +from packages.valory.connections.p2p_libp2p import LIBP2P_NODE_MODULE_NAME def test_check_versions(): @@ -60,7 +60,7 @@ def test_check_versions_negative_binary_not_found(): def test_check_versions_negative_version_too_low(): """Test check_versions - negative case, version too low.""" with mock.patch.object( - check_dependencies, "get_version", return_value=(0, 0, 0), + check_dependencies, "get_version", return_value=(0, 0, 0), ): with pytest.raises( AEAException, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py index 0fa234e4a6..f415a471ce 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py @@ -35,7 +35,7 @@ from packages.fetchai.protocols.default import DefaultSerializer from packages.fetchai.protocols.default.message import DefaultMessage -from packages.open_aea.connections.p2p_libp2p.connection import NodeClient, Uri +from packages.valory.connections.p2p_libp2p import NodeClient, Uri from tests.conftest import ( _make_libp2p_connection, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py index cb3b59be52..f665deab78 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py @@ -36,8 +36,8 @@ from aea.identity.base import Identity from aea.multiplexer import Multiplexer -from packages.fetchai.protocols.acn.message import AcnMessage -from packages.open_aea.connections.p2p_libp2p.connection import ( +from packages.valory.protocols.acn.message import AcnMessage +from packages.valory.connections.p2p_libp2p import ( LIBP2P_NODE_MODULE_NAME, Libp2pNode, P2PLibp2pConnection, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py index 923e5155af..28606e23db 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py @@ -31,7 +31,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.protocols.default.serialization import DefaultSerializer -from packages.open_aea.connections.p2p_libp2p.check_dependencies import build_node +from packages.valory.connections.p2p_libp2p import build_node from tests.common.utils import wait_for_condition from tests.conftest import ( diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py index 0e02106bf3..d53e51676d 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py @@ -33,10 +33,10 @@ from aea.test_tools.test_cases import AEATestCaseMany from packages.fetchai.protocols.default.message import DefaultMessage -from packages.open_aea.connections.p2p_libp2p.connection import ( +from packages.valory.connections.p2p_libp2p import ( PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID, ) -from packages.open_aea.connections.p2p_libp2p_client.connection import ( +from packages.valory.connections import ( PUBLIC_ID as P2P_CLIENT_CONNECTION_PUBLIC_ID, ) diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py index 84ff43913c..689239c7a9 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py @@ -26,7 +26,7 @@ from aea.multiplexer import Multiplexer from aea.test_tools.test_cases import AEATestCaseEmpty -from packages.open_aea.connections.p2p_libp2p_client.connection import PUBLIC_ID +from packages.valory.connections import PUBLIC_ID from tests.conftest import ( DEFAULT_LEDGER, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py index 8e1fd35abb..f019d56ecc 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py @@ -33,7 +33,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.protocols.default.serialization import DefaultSerializer -from packages.open_aea.connections.p2p_libp2p_client.connection import NodeClient, Uri +from packages.valory.connections import NodeClient, Uri from tests.common.mocks import RegexComparator from tests.common.utils import wait_for_condition diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py index 79e0ae0b27..939e2314d6 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py @@ -34,7 +34,7 @@ from aea.identity.base import Identity from aea.multiplexer import Multiplexer -from packages.open_aea.connections.p2p_libp2p_client.connection import ( +from packages.valory.connections import ( NodeClient, P2PLibp2pClientConnection, POR_DEFAULT_SERVICE_ID, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py index d97fab2058..6977e5dcd2 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py @@ -26,7 +26,7 @@ from aea.multiplexer import Multiplexer from aea.test_tools.test_cases import AEATestCaseEmpty -from packages.open_aea.connections.p2p_libp2p_mailbox.connection import PUBLIC_ID +from packages.valory.connections.p2p_libp2p_mailbox import PUBLIC_ID from tests.conftest import ( DEFAULT_LEDGER, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py index c29188bfda..6c6615a39d 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py @@ -34,10 +34,10 @@ from aea.identity.base import Identity from aea.multiplexer import Multiplexer -from packages.open_aea.connections.p2p_libp2p_client.connection import ( +from packages.valory.connections import ( POR_DEFAULT_SERVICE_ID, ) -from packages.open_aea.connections.p2p_libp2p_mailbox.connection import ( +from packages.valory.connections.p2p_libp2p_mailbox import ( P2PLibp2pMailboxConnection, ) diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py index cb2aa03eeb..70306babc4 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py @@ -30,11 +30,11 @@ from aea.mail.base import Envelope from aea.multiplexer import Multiplexer -from packages.fetchai.protocols.acn import acn_pb2 -from packages.fetchai.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn import acn_pb2 +from packages.valory.protocols.acn.message import AcnMessage from packages.fetchai.protocols.default import DefaultSerializer from packages.fetchai.protocols.default.message import DefaultMessage -from packages.open_aea.connections.p2p_libp2p_mailbox.connection import NodeClient +from packages.valory.connections.p2p_libp2p_mailbox import NodeClient from tests.common.utils import wait_for_condition from tests.conftest import _make_libp2p_client_connection, _make_libp2p_connection diff --git a/tests/test_packages/test_protocols/test_acn.py b/tests/test_packages/test_protocols/test_acn.py index 42616af778..6dfef10c50 100644 --- a/tests/test_packages/test_protocols/test_acn.py +++ b/tests/test_packages/test_protocols/test_acn.py @@ -31,9 +31,9 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -from packages.fetchai.protocols.acn.dialogues import AcnDialogue as BaseAcnDialogue -from packages.fetchai.protocols.acn.dialogues import AcnDialogues as BaseAcnDialogues -from packages.fetchai.protocols.acn.message import AcnMessage +from packages.valory.protocols.acn import AcnDialogue as BaseAcnDialogue +from packages.valory.protocols.acn import AcnDialogues as BaseAcnDialogues +from packages.valory.protocols.acn.message import AcnMessage def test_acn_aea_envelope_serialization(): From 599ae437826595401f64545f9d2670a5eafabd51 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Fri, 1 Apr 2022 23:17:28 +0200 Subject: [PATCH 09/29] chore:author to valory --- docs/acn-internals.md | 2 +- packages/hashes.csv | 16 +++++++-------- packages/valory/__init__.py | 20 +++++++++++++++++++ packages/valory/connections/__init__.py | 2 +- .../valory/connections/p2p_libp2p/README.md | 4 ++-- .../connections/p2p_libp2p/connection.yaml | 6 +++--- .../p2p_libp2p/libp2p_node/README.md | 2 +- .../p2p_libp2p/libp2p_node/__init__.py | 0 .../libp2p_node/protocols/acn/v1_0_0/acn.yaml | 2 +- .../connections/p2p_libp2p_client/README.md | 2 +- .../p2p_libp2p_client/connection.yaml | 6 +++--- .../connections/p2p_libp2p_mailbox/README.md | 2 +- .../p2p_libp2p_mailbox/connection.yaml | 6 +++--- packages/valory/protocols/__init__.py | 20 +++++++++++++++++++ packages/valory/protocols/acn/README.md | 2 +- packages/valory/protocols/acn/message.py | 4 ++-- packages/valory/protocols/acn/protocol.yaml | 12 +++++------ scripts/generate_ipfs_hashes.py | 2 +- tests/conftest.py | 8 ++++---- 19 files changed, 79 insertions(+), 39 deletions(-) delete mode 100644 packages/valory/connections/p2p_libp2p/libp2p_node/__init__.py diff --git a/docs/acn-internals.md b/docs/acn-internals.md index a0f25cf74e..c18cf1589b 100644 --- a/docs/acn-internals.md +++ b/docs/acn-internals.md @@ -588,7 +588,7 @@ refer to this guide. ### The `p2p_libp2p` connection -The source code of the `p2p_libp2p` connection can be downloaded +The source code of the `valory/p2p_libp2p` connection can be downloaded here. The package provides the connection class `P2PLibp2pConnection`, diff --git a/packages/hashes.csv b/packages/hashes.csv index 8523c61825..91433a0c29 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -18,8 +18,6 @@ fetchai/connections/stub,QmXFpXZEYWQJ4r1ZadwsBiz2fRYWp1YtbeurFPH9sLHrXF fetchai/connections/stub/connection.yaml,QmReHyTH7WfVzjz4zZ3bzzYqGopxG5saFdr8ZHqsjZVjXW fetchai/contracts/erc1155,QmUGE8FyiyMSzue7rY8ymQYJWMxkhAhXdk6rsDrFoSX9hk fetchai/contracts/erc1155/contract.yaml,QmeUXxLooHRNmxLRE6RwdzyEx3UXdT5udhgwJyeN6weg78 -fetchai/protocols/acn,Qmc6LtmvHQvQFTCRpxormE5Pbia3461X7XuFtDqG781vr3 -fetchai/protocols/acn/protocol.yaml,QmUAAsBCA1xKBmrK9KdUyHBoUpqgpZXXbdPqAhwM12JfqC fetchai/protocols/contract_api,QmXJqymbfxCKDSfTJaRgfRiAHkCzvVwtKdPhLMawR1UX4Y fetchai/protocols/contract_api/protocol.yaml,QmW17bWVaSQRsS3XFjoto4KVquExEiuCDoHoqGr3v3TCKp fetchai/protocols/default,QmSbCMLQkHQ5Fiwc1zv9i1WbVdiUYZU97xJCHLu7WugTmM @@ -66,12 +64,12 @@ open_aea/agents/http_echo,QmcJewf19fn25iLdVZsXJMqpM9BQ17LBTS3TYpuy6XGUNL open_aea/agents/http_echo/aea-config.yaml,QmavyP2JqcrAK6EHvJTnPJZ3GAjPjSDigV868Pd12F4pNy open_aea/agents/my_first_aea,QmPZJPLDuiiXeKM1BsB3QRGiEoeqjS5hTXem5JAV2uiuSp open_aea/agents/my_first_aea/aea-config.yaml,QmRsNjTXsFVgdZg4LJyfwEAPDjCgJoLF2TnPJs6uXH2DNJ -open_aea/connections/p2p_libp2p,QmRsF3Hrh3ZtNoHyd55voe22BadmLwbhAQTmY32UrxoESR -open_aea/connections/p2p_libp2p/connection.yaml,QmRWAuVFG4twTKxcyNbU5RsmpEzsG649TsEgPsSYSMgSrY -open_aea/connections/p2p_libp2p_client,QmRJn4Z2igqbzgw1Tg9CiqkN9M7W4HeaTnLwxspmTQXpC7 -open_aea/connections/p2p_libp2p_client/connection.yaml,QmNRCQZhrPUUoE3cEoabyLc8ockCu7sL12vNmoQC4jH9WL -open_aea/connections/p2p_libp2p_mailbox,QmTSPBj8SMcrmH8LGtKe4TwPStYQQ2pZQ6sMMPsa8x19no -open_aea/connections/p2p_libp2p_mailbox/connection.yaml,QmP7prc1UUsvpZoA7nXi1Sv2sA7Z4G6U2AbbC3aDhNFSob +open_aea/connections/p2p_libp2p,QmXidBAMcNeH9FXnoos8Va5uL1qrt5xfhQ27zNKqwjkgFj +open_aea/connections/p2p_libp2p/connection.yaml,QmRAYKzTsohsBBU53tiJ4bT3dTtfLN56G7NjZezj2EQLUW +open_aea/connections/p2p_libp2p_client,QmdCVQLQorF157ZLX2n9SD4SAmmgzJji3vZ1p4QidZNynk +open_aea/connections/p2p_libp2p_client/connection.yaml,QmTKp5kEsXE2QBAoc6kQQyJ4x78DTCcmmBmDY1KAvpo2Nh +open_aea/connections/p2p_libp2p_mailbox,QmP7mEwZyuCGxDr7FXcmNGpDWFt3DxWByqzWz1zAUcEt6t +open_aea/connections/p2p_libp2p_mailbox/connection.yaml,QmYs3WG4sb8yGj8HqUgyM3aSHTo2afj5y6KXqr72STggtU open_aea/connections/scaffold,QmQeGqjcTvXn6sDGZCMUFTULjfHNW2RoCVN4PFeJUbbPWJ open_aea/connections/scaffold/connection.yaml,QmSNZgeHm1DRhhdzmsU3EKTTK4HyF4AU3dNEBaLFWF1XR7 open_aea/contracts/scaffold,QmeqqfKY6pNLDbsCjBMxaNVdaHHd23NrpdHwYHhJ6DwqTB @@ -82,3 +80,5 @@ open_aea/protocols/signing,QmNa9d62dQbZbh2rpu8Eey1fav9ZcWw8a9i4D45uDE7Avq open_aea/protocols/signing/protocol.yaml,QmdiuSpQW1LV5uusAAe3DDYBcksxZPYuMZ1YBWvwvXuWsM open_aea/skills/scaffold,QmYUhZb94UXmnb4B4S1Y4NbRKQBwYXextBiWTVRmMucrFv open_aea/skills/scaffold/skill.yaml,QmaH1Qo5MTCrkBZxtEr59XMW3gbN6PRdFoQXU1QcZSZ5QH +valory/protocols/acn,QmYygvNm3cbZneMHgh77DfPTVVbbqE6jpGhutNykf89DAN +valory/protocols/acn/protocol.yaml,QmSQPYLHQaBum9hKvm5LGXkMrtMBdv9eNtG4K3wf6YQ1GB diff --git a/packages/valory/__init__.py b/packages/valory/__init__.py index e69de29bb2..189a1da804 100644 --- a/packages/valory/__init__.py +++ b/packages/valory/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Packages authored by Valory AG""" diff --git a/packages/valory/connections/__init__.py b/packages/valory/connections/__init__.py index 00c1a1c695..5617409620 100644 --- a/packages/valory/connections/__init__.py +++ b/packages/valory/connections/__init__.py @@ -17,4 +17,4 @@ # # ------------------------------------------------------------------------------ -"""This module contains the connection packages authored by open-aea""" +"""This module contains the connection packages authored by Valory AG""" diff --git a/packages/valory/connections/p2p_libp2p/README.md b/packages/valory/connections/p2p_libp2p/README.md index 0567156200..a2ba4b0b55 100644 --- a/packages/valory/connections/p2p_libp2p/README.md +++ b/packages/valory/connections/p2p_libp2p/README.md @@ -6,7 +6,7 @@ The DHT provides proper messages delivery by mapping agents addresses to their l ## Usage -First, add the connection to your AEA project: `aea add connection fetchai/p2p_libp2p:0.26.0`. +First, add the connection to your AEA project: `aea add connection valory/p2p_libp2p:0.26.0`. Next, ensure that the connection is properly configured by setting: @@ -15,4 +15,4 @@ Next, ensure that the connection is properly configured by setting: - `entry_peers` to a list of multiaddresses of already deployed nodes to join their network, should be empty for genesis node - `delegate_uri` to the IP address and port number for the delegate service, leave empty to disable the service -If the delegate service is enabled, then other AEAs can connect to the peer node using the `fetchai/p2p_libp2p_client:0.20.0` connection. +If the delegate service is enabled, then other AEAs can connect to the peer node using the `valory/p2p_libp2p_client:0.20.0` connection. diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index c92105c149..008b20367d 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -1,5 +1,5 @@ name: p2p_libp2p -author: open_aea +author: valory version: 0.26.0 type: connection description: The p2p libp2p connection implements an interface to standalone golang @@ -11,7 +11,7 @@ fingerprint: README.md: Qmd6xGBWWvYaxZUryir7m2SWFZX7fpzoBC3ttJiKXEJVXK __init__.py: QmRo1DRePomRccoY2tB3GnKV2rUoNFaaE26WDRKp4ATs33 check_dependencies.py: QmS7PnP2G3vMrjqPHeuuTH74Nfowd33FUZkqYTUb3269Pi - connection.py: QmQijVDdoPpo9Vqei86Z9odJhXiCEPEw87ygLQW5oXiSGB + connection.py: QmePX6yBbpMtryq8vgR8N3WQVwu7obvzRa7avYns9tegyq consts.py: QmWAHrbN2fhqEe8o6cVLtwhWaEFp6h5cUJtJddYWbibPJj libp2p_node/Makefile: QmYMR8evkEV166HXTxjaAYEBiQ9HFh2whKQ7uotXvr88TU libp2p_node/README.md: QmRBC7o5y1TBQGwviJ9XxywdeuSSz6dNgvGE9wQhFPES4D @@ -56,7 +56,7 @@ fingerprint_ignore_patterns: [] build_entrypoint: check_dependencies.py connections: [] protocols: -- fetchai/acn:1.1.0 +- valory/acn:1.1.0 class_name: P2PLibp2pConnection config: delegate_uri: 127.0.0.1:11000 diff --git a/packages/valory/connections/p2p_libp2p/libp2p_node/README.md b/packages/valory/connections/p2p_libp2p/libp2p_node/README.md index 6bac84ad3c..05b9284068 100644 --- a/packages/valory/connections/p2p_libp2p/libp2p_node/README.md +++ b/packages/valory/connections/p2p_libp2p/libp2p_node/README.md @@ -5,7 +5,7 @@ The `libp2p_node` is an integral part of the ACN. The agent communication network (ACN) provides a system for agents to find each other and communicate, solely based on their wallet addresses. It addresses the message delivery problem. -For more details check out the [docs](https://github.com/fetchai/agents-aea/blob/main/docs/acn.md). +For more details check out the [docs](https://github.com/valory-xyz/open-aea/blob/main/docs/acn.md). ## Development diff --git a/packages/valory/connections/p2p_libp2p/libp2p_node/__init__.py b/packages/valory/connections/p2p_libp2p/libp2p_node/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml b/packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml index 480d719e87..deabc0312a 100644 --- a/packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml +++ b/packages/valory/connections/p2p_libp2p/libp2p_node/protocols/acn/v1_0_0/acn.yaml @@ -1,6 +1,6 @@ --- name: acn -author: fetchai +author: valory version: 1.0.0 description: The protocol used for envelope delivery on the ACN. license: Apache-2.0 diff --git a/packages/valory/connections/p2p_libp2p_client/README.md b/packages/valory/connections/p2p_libp2p_client/README.md index 72eaea2350..4decbda0af 100644 --- a/packages/valory/connections/p2p_libp2p_client/README.md +++ b/packages/valory/connections/p2p_libp2p_client/README.md @@ -7,7 +7,7 @@ It allows for using the DHT without having to deploy a node by delegating its co ## Usage -First, add the connection to your AEA project: `aea add connection fetchai/p2p_libp2p_client:0.20.0`. +First, add the connection to your AEA project: `aea add connection valory/p2p_libp2p_client:0.20.0`. Next, ensure that the connection is properly configured by setting: diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index dc5964125c..26de13a1f8 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -1,5 +1,5 @@ name: p2p_libp2p_client -author: open_aea +author: valory version: 0.20.0 type: connection description: The libp2p client connection implements a tcp connection to a running @@ -10,11 +10,11 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: QmQZQyYpobMCzc3g8x1FhuRfu2Lm7NNocDDZPsYG9nzKRQ __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmPGaYG1SWdzDyryTSdLDRbTeJFVdRQWewTe8zkppzSjiS + connection.py: QmYZhZS6g7unajJoqLGHJKLJXcYfxxM8DUWeg7tyMTnAkP fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/acn:1.1.0 +- valory/acn:1.1.0 class_name: P2PLibp2pClientConnection config: connect_retries: 3 diff --git a/packages/valory/connections/p2p_libp2p_mailbox/README.md b/packages/valory/connections/p2p_libp2p_mailbox/README.md index 72eaea2350..4decbda0af 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/README.md +++ b/packages/valory/connections/p2p_libp2p_mailbox/README.md @@ -7,7 +7,7 @@ It allows for using the DHT without having to deploy a node by delegating its co ## Usage -First, add the connection to your AEA project: `aea add connection fetchai/p2p_libp2p_client:0.20.0`. +First, add the connection to your AEA project: `aea add connection valory/p2p_libp2p_client:0.20.0`. Next, ensure that the connection is properly configured by setting: diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 09eb74519e..1ffac82d73 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -1,5 +1,5 @@ name: p2p_libp2p_mailbox -author: open_aea +author: valory version: 0.2.0 type: connection description: The libp2p client connection implements a tcp connection to a running @@ -10,11 +10,11 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: QmQZQyYpobMCzc3g8x1FhuRfu2Lm7NNocDDZPsYG9nzKRQ __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmQpFw1xKFCw9vVQ7jFEoUASn5o1qfAV1PypA8NFP6ZWwp + connection.py: QmX2rCgErRLZd6ZmR5BE6d82A6obMxNX1baok58kEZhLdx fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/acn:1.1.0 +- valory/acn:1.1.0 class_name: P2PLibp2pMailboxConnection config: connect_retries: 3 diff --git a/packages/valory/protocols/__init__.py b/packages/valory/protocols/__init__.py index e69de29bb2..4895992ba9 100644 --- a/packages/valory/protocols/__init__.py +++ b/packages/valory/protocols/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the protocol packages authored by Valory AG""" diff --git a/packages/valory/protocols/acn/README.md b/packages/valory/protocols/acn/README.md index 4f0c072fb3..7c44e6b2d9 100644 --- a/packages/valory/protocols/acn/README.md +++ b/packages/valory/protocols/acn/README.md @@ -9,7 +9,7 @@ This is a protocol for ACN (agent communication network) envelope delivery. ```yaml --- name: acn -author: fetchai +author: valory version: 1.1.0 description: The protocol used for envelope delivery on the ACN. license: Apache-2.0 diff --git a/packages/valory/protocols/acn/message.py b/packages/valory/protocols/acn/message.py index 03fc137383..9f61237d1c 100644 --- a/packages/valory/protocols/acn/message.py +++ b/packages/valory/protocols/acn/message.py @@ -31,7 +31,7 @@ from packages.valory.protocols.acn.custom_types import StatusBody as CustomStatusBody -_default_logger = logging.getLogger("aea.packages.fetchai.protocols.acn.message") +_default_logger = logging.getLogger("aea.packages.valory.protocols.acn.message") DEFAULT_BODY_SIZE = 4 @@ -39,7 +39,7 @@ class AcnMessage(Message): """The protocol used for envelope delivery on the ACN.""" - protocol_id = PublicId.from_str("fetchai/acn:1.1.0") + protocol_id = PublicId.from_str("valory/acn:1.1.0") protocol_specification_id = PublicId.from_str("aea/acn:1.0.0") AgentRecord = CustomAgentRecord diff --git a/packages/valory/protocols/acn/protocol.yaml b/packages/valory/protocols/acn/protocol.yaml index f98b6d0818..01d1435450 100644 --- a/packages/valory/protocols/acn/protocol.yaml +++ b/packages/valory/protocols/acn/protocol.yaml @@ -1,5 +1,5 @@ name: acn -author: fetchai +author: valory version: 1.1.0 protocol_specification_id: aea/acn:1.0.0 type: protocol @@ -7,14 +7,14 @@ description: The protocol used for envelope delivery on the ACN. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: QmTC2bW7X9szcSXsGo4x3CtK9WST4fc5r5Kv4mVsVcY4RM - __init__.py: QmaHUMVtRYZusHPunBSfkSxuM7ZuRF5HmNJ6iajHEHhjua + README.md: QmZ59igTs2SKsMDHzuew8gfGdqjW1vNZ3DxBDqWLnDd6XD + __init__.py: QmX46WMVxai4o9K9sGSogZLJEZhebmVerBRHvr6My1bPZn acn.proto: QmVWvXETUNe7QZTvBgzwpofNP3suFthwyxbTVUqSx8mdnE acn_pb2.py: Qmf3HYmJtGwugpCuWSmJEDVHwZcnCF6BWmeEouUSpBRs45 custom_types.py: QmS9xN5EPy8pZRbwpUdewH7TocNGCx7xv3GwupxSQRRVgM - dialogues.py: QmWwhx6NRUhzaza64s4bNmPk1F3Rb4jLVU4sx874AkW66F - message.py: QmTW892MFBaU7o1VkReepxPeiELiXiFzp8LUYGBBGB7ime - serialization.py: QmRwtCbyw6Uw1aGaLHXb2iGJPJYC2vBEjxKysKH9bh5EBp + dialogues.py: QmNWpqFrnVhUsveh6WKDaWCYsUVj6gQd1tHSxZJB8UwjH6 + message.py: QmeLwVbFaVv8z5bT8vqceVpgQYpg2UVmSkQxK2fmLn1Se3 + serialization.py: QmT1PPT4jSzvJaeQNCTxx54gSWUU3EAYuU1RakGqDdPmXT fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/scripts/generate_ipfs_hashes.py b/scripts/generate_ipfs_hashes.py index d9482497e3..c88f8934d9 100755 --- a/scripts/generate_ipfs_hashes.py +++ b/scripts/generate_ipfs_hashes.py @@ -59,7 +59,7 @@ from aea.helpers.yaml_utils import yaml_dump, yaml_dump_all -AUTHOR = "fetchai" +AUTHOR = "valory" CORE_PATH = Path("aea") TEST_PATH = Path("tests") / "data" PACKAGE_HASHES_PATH = "packages/hashes.csv" diff --git a/tests/conftest.py b/tests/conftest.py index afdaf49fc2..7528478ffd 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -102,17 +102,17 @@ from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection from packages.fetchai.connections.stub.connection import StubConnection -from packages.valory.connections.p2p_libp2p import build_node -from packages.valory.connections.p2p_libp2p import ( +from packages.valory.connections.p2p_libp2p.check_dependencies import build_node +from packages.valory.connections.p2p_libp2p.connection import ( LIBP2P_NODE_MODULE_NAME, MultiAddr, P2PLibp2pConnection, POR_DEFAULT_SERVICE_ID, ) -from packages.valory.connections import ( +from packages.valory.connections.p2p_libp2p_client.connection import ( P2PLibp2pClientConnection, ) -from packages.valory.connections.p2p_libp2p_mailbox import ( +from packages.valory.connections.p2p_libp2p_mailbox.connection import ( P2PLibp2pMailboxConnection, ) From 09899f072eba262f74804776311e2973dc503f89 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 00:24:52 +0200 Subject: [PATCH 10/29] grunt:hardcoded paths --- packages/hashes.csv | 12 +++++----- .../connections/p2p_libp2p/connection.py | 6 ++--- .../connections/p2p_libp2p/connection.yaml | 6 ++--- .../p2p_libp2p/libp2p_node/README.md | 2 +- .../p2p_libp2p_client/connection.py | 4 ++-- .../p2p_libp2p_client/connection.yaml | 4 ++-- .../p2p_libp2p_mailbox/connection.py | 4 ++-- .../p2p_libp2p_mailbox/connection.yaml | 4 ++-- .../test_p2p_libp2p/test_aea_cli.py | 14 +++++------ .../test_p2p_libp2p/test_build.py | 6 ++--- .../test_p2p_libp2p/test_communication.py | 2 +- .../test_p2p_libp2p/test_errors.py | 24 ++++++++----------- .../test_p2p_libp2p/test_fault_tolerance.py | 2 +- .../test_go_code_matching_acn.py | 2 +- .../test_p2p_libp2p/test_public_dht.py | 21 ++++++++-------- .../test_p2p_libp2p_client/test_aea_cli.py | 7 +++--- .../test_communication.py | 2 +- .../test_p2p_libp2p_client/test_errors.py | 2 +- .../test_p2p_libp2p_mailbox/test_aea_cli.py | 7 +++--- .../test_p2p_libp2p_mailbox/test_errors.py | 8 ++----- .../test_mailbox_service.py | 6 ++--- 21 files changed, 69 insertions(+), 76 deletions(-) diff --git a/packages/hashes.csv b/packages/hashes.csv index 91433a0c29..bafd6ca31a 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -64,12 +64,6 @@ open_aea/agents/http_echo,QmcJewf19fn25iLdVZsXJMqpM9BQ17LBTS3TYpuy6XGUNL open_aea/agents/http_echo/aea-config.yaml,QmavyP2JqcrAK6EHvJTnPJZ3GAjPjSDigV868Pd12F4pNy open_aea/agents/my_first_aea,QmPZJPLDuiiXeKM1BsB3QRGiEoeqjS5hTXem5JAV2uiuSp open_aea/agents/my_first_aea/aea-config.yaml,QmRsNjTXsFVgdZg4LJyfwEAPDjCgJoLF2TnPJs6uXH2DNJ -open_aea/connections/p2p_libp2p,QmXidBAMcNeH9FXnoos8Va5uL1qrt5xfhQ27zNKqwjkgFj -open_aea/connections/p2p_libp2p/connection.yaml,QmRAYKzTsohsBBU53tiJ4bT3dTtfLN56G7NjZezj2EQLUW -open_aea/connections/p2p_libp2p_client,QmdCVQLQorF157ZLX2n9SD4SAmmgzJji3vZ1p4QidZNynk -open_aea/connections/p2p_libp2p_client/connection.yaml,QmTKp5kEsXE2QBAoc6kQQyJ4x78DTCcmmBmDY1KAvpo2Nh -open_aea/connections/p2p_libp2p_mailbox,QmP7mEwZyuCGxDr7FXcmNGpDWFt3DxWByqzWz1zAUcEt6t -open_aea/connections/p2p_libp2p_mailbox/connection.yaml,QmYs3WG4sb8yGj8HqUgyM3aSHTo2afj5y6KXqr72STggtU open_aea/connections/scaffold,QmQeGqjcTvXn6sDGZCMUFTULjfHNW2RoCVN4PFeJUbbPWJ open_aea/connections/scaffold/connection.yaml,QmSNZgeHm1DRhhdzmsU3EKTTK4HyF4AU3dNEBaLFWF1XR7 open_aea/contracts/scaffold,QmeqqfKY6pNLDbsCjBMxaNVdaHHd23NrpdHwYHhJ6DwqTB @@ -80,5 +74,11 @@ open_aea/protocols/signing,QmNa9d62dQbZbh2rpu8Eey1fav9ZcWw8a9i4D45uDE7Avq open_aea/protocols/signing/protocol.yaml,QmdiuSpQW1LV5uusAAe3DDYBcksxZPYuMZ1YBWvwvXuWsM open_aea/skills/scaffold,QmYUhZb94UXmnb4B4S1Y4NbRKQBwYXextBiWTVRmMucrFv open_aea/skills/scaffold/skill.yaml,QmaH1Qo5MTCrkBZxtEr59XMW3gbN6PRdFoQXU1QcZSZ5QH +valory/connections/p2p_libp2p,QmSBvTawMkft3zf9tgYFNWJ6Hu4bkXtwddEfEjc3TVmSPL +valory/connections/p2p_libp2p/connection.yaml,QmWcv11roKVZD557s76raVtEhzzrA544rRFJyw6HnhWbW7 +valory/connections/p2p_libp2p_client,Qmdmj8FGiTthD1TNMAfPgycsYYmFj3CykXjLZpi8Rx1dvN +valory/connections/p2p_libp2p_client/connection.yaml,QmZbRxziRBtwfj8MdhCwifCeib2gviv2NxEyCTz2pf5YqB +valory/connections/p2p_libp2p_mailbox,QmWHapy8qYS7vZqrPkjYPmdG2sF3yvfsSJjXcP2KoDAxNw +valory/connections/p2p_libp2p_mailbox/connection.yaml,QmUjJCQcX3pVT9kV94MvCUxPiQAhveJkKTkp4i2ueofED7 valory/protocols/acn,QmYygvNm3cbZneMHgh77DfPTVVbbqE6jpGhutNykf89DAN valory/protocols/acn/protocol.yaml,QmSQPYLHQaBum9hKvm5LGXkMrtMBdv9eNtG4K3wf6YQ1GB diff --git a/packages/valory/connections/p2p_libp2p/connection.py b/packages/valory/connections/p2p_libp2p/connection.py index 330d043324..4f64553404 100644 --- a/packages/valory/connections/p2p_libp2p/connection.py +++ b/packages/valory/connections/p2p_libp2p/connection.py @@ -41,12 +41,12 @@ from aea.helpers.pipe import IPCChannel, TCPSocketChannel from aea.mail.base import Envelope +from packages.valory.connections.p2p_libp2p.consts import LIBP2P_NODE_MODULE_NAME from packages.valory.protocols.acn import acn_pb2 from packages.valory.protocols.acn.message import AcnMessage -from packages.valory.connections.p2p_libp2p.consts import LIBP2P_NODE_MODULE_NAME -_default_logger = logging.getLogger("aea.packages.open_aea.connections.p2p_libp2p") +_default_logger = logging.getLogger("aea.packages.valory.connections.p2p_libp2p") ACN_CURRENT_VERSION = "0.1.0" @@ -59,7 +59,7 @@ PIPE_CONN_TIMEOUT = 10.0 -PUBLIC_ID = PublicId.from_str("open_aea/p2p_libp2p:0.26.0") +PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p:0.26.0") SUPPORTED_LEDGER_IDS = ["fetchai", "cosmos", "ethereum"] diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index 008b20367d..69107b37d3 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -8,10 +8,10 @@ description: The p2p libp2p connection implements an interface to standalone gol license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: Qmd6xGBWWvYaxZUryir7m2SWFZX7fpzoBC3ttJiKXEJVXK + README.md: QmZP7GPu67Ag2Fw8zgZnzpQPqaYJvr7w8Zy5VhQ8Jpekkg __init__.py: QmRo1DRePomRccoY2tB3GnKV2rUoNFaaE26WDRKp4ATs33 check_dependencies.py: QmS7PnP2G3vMrjqPHeuuTH74Nfowd33FUZkqYTUb3269Pi - connection.py: QmePX6yBbpMtryq8vgR8N3WQVwu7obvzRa7avYns9tegyq + connection.py: QmQGfUKtUnCB8GjhpWLMxvbd4dbXWFr1obknYeb1oeK56C consts.py: QmWAHrbN2fhqEe8o6cVLtwhWaEFp6h5cUJtJddYWbibPJj libp2p_node/Makefile: QmYMR8evkEV166HXTxjaAYEBiQ9HFh2whKQ7uotXvr88TU libp2p_node/README.md: QmRBC7o5y1TBQGwviJ9XxywdeuSSz6dNgvGE9wQhFPES4D @@ -49,7 +49,7 @@ fingerprint: libp2p_node/mocks/mock_peerstore.go: QmeH1TucFNbbv9yrLFWHSMDMnsmUmZQbzJYfo25JLyFoYf libp2p_node/protocols/acn/v1_0_0/acn.pb.go: QmWDoniHr3wa5freLHDESv7SgC9ggYenrLyibw4jFkTc4r libp2p_node/protocols/acn/v1_0_0/acn.proto: QmcguMcKttJfsuPYrUVWFJ1Trr1VxrSSfan94Z3yNAxNEW - libp2p_node/protocols/acn/v1_0_0/acn.yaml: QmeqaYRWL5bVRE8FKgbiAspgFkoi5HKtkSncT7fCf1JAex + libp2p_node/protocols/acn/v1_0_0/acn.yaml: QmUxjEyzwQP7TWad5RfCefS2qfpbhJgVFjaEN4LUoA3ys5 libp2p_node/utils/utils.go: QmdVRRhcoWZE5tt9aD1zYapAcbs5hfJh7z8p4AwgnkT4i2 libp2p_node/utils/utils_test.go: Qmd2tbXhEDQELjkyKHyCqmcBitECK9mrVENyPWaev5HF63 fingerprint_ignore_patterns: [] diff --git a/packages/valory/connections/p2p_libp2p/libp2p_node/README.md b/packages/valory/connections/p2p_libp2p/libp2p_node/README.md index 05b9284068..6bac84ad3c 100644 --- a/packages/valory/connections/p2p_libp2p/libp2p_node/README.md +++ b/packages/valory/connections/p2p_libp2p/libp2p_node/README.md @@ -5,7 +5,7 @@ The `libp2p_node` is an integral part of the ACN. The agent communication network (ACN) provides a system for agents to find each other and communicate, solely based on their wallet addresses. It addresses the message delivery problem. -For more details check out the [docs](https://github.com/valory-xyz/open-aea/blob/main/docs/acn.md). +For more details check out the [docs](https://github.com/fetchai/agents-aea/blob/main/docs/acn.md). ## Development diff --git a/packages/valory/connections/p2p_libp2p_client/connection.py b/packages/valory/connections/p2p_libp2p_client/connection.py index e55132c570..eaf0d83fe7 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.py +++ b/packages/valory/connections/p2p_libp2p_client/connection.py @@ -56,10 +56,10 @@ _default_logger = logging.getLogger( - "aea.packages.open_aea.connections.p2p_libp2p_client" + "aea.packages.valory.connections.p2p_libp2p_client" ) -PUBLIC_ID = PublicId.from_str("open_aea/p2p_libp2p_client:0.20.0") +PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_client:0.20.0") SUPPORTED_LEDGER_IDS = ["fetchai", "cosmos", "ethereum"] diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index 26de13a1f8..84caf1a272 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -8,9 +8,9 @@ description: The libp2p client connection implements a tcp connection to a runni license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: QmQZQyYpobMCzc3g8x1FhuRfu2Lm7NNocDDZPsYG9nzKRQ + README.md: QmRmDYNeEsKRgKjroGCJmLVJqjfnUm9FNXBXv3YYBBwsXq __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmYZhZS6g7unajJoqLGHJKLJXcYfxxM8DUWeg7tyMTnAkP + connection.py: QmYVhxT4DGNoTTewjE4MitvU99d9Baa6FXJSWPeURxYk9u fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.py b/packages/valory/connections/p2p_libp2p_mailbox/connection.py index 5b14ee5a9d..32c4231aea 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.py +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.py @@ -57,10 +57,10 @@ _default_logger = logging.getLogger( - "aea.packages.open_aea.connections.p2p_libp2p_client" + "aea.packages.valory.connections.p2p_libp2p_client" ) -PUBLIC_ID = PublicId.from_str("open_aea/p2p_libp2p_mailbox:0.2.0") +PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_mailbox:0.2.0") SUPPORTED_LEDGER_IDS = ["fetchai", "cosmos", "ethereum"] diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 1ffac82d73..83936aa441 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -8,9 +8,9 @@ description: The libp2p client connection implements a tcp connection to a runni license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: QmQZQyYpobMCzc3g8x1FhuRfu2Lm7NNocDDZPsYG9nzKRQ + README.md: QmRmDYNeEsKRgKjroGCJmLVJqjfnUm9FNXBXv3YYBBwsXq __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmX2rCgErRLZd6ZmR5BE6d82A6obMxNX1baok58kEZhLdx + connection.py: QmVwH93nSM99cApNfv6QUvfUY58cuR9WtzMgrr4RvVpLgc fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py index 967d4e83e9..6a4725acdb 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py @@ -28,9 +28,8 @@ from aea.test_tools.test_cases import AEATestCaseEmpty -from packages.valory.connections.p2p_libp2p import ( - PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID, -) +from packages.valory.connections import p2p_libp2p +from packages.valory.connections.p2p_libp2p.connection import PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID from tests.conftest import ( DEFAULT_LEDGER, @@ -39,6 +38,7 @@ ) +p2p_libp2p_path = f"vendor.{p2p_libp2p.__name__.split('.', 1)[-1]}" DEFAULT_PORT = 10234 DEFAULT_DELEGATE_PORT = 11234 DEFAULT_NET_SIZE = 4 @@ -80,7 +80,7 @@ def test_agent(self): self.add_item("connection", str(P2P_CONNECTION_PUBLIC_ID)) self.run_cli_command("build", cwd=self._get_cwd()) # for logging - config_path = "vendor.open_aea.connections.p2p_libp2p.config" + config_path = f"{p2p_libp2p_path}.config" log_file = "libp2p_node_{}.log".format(self.agent_name) log_file = os.path.join(os.path.abspath(os.getcwd()), log_file) self.set_config("{}.log_file".format(config_path), log_file) @@ -148,12 +148,12 @@ def test_agent(self): self.set_config("agent.default_connection", str(P2P_CONNECTION_PUBLIC_ID)) # for logging - config_path = "vendor.open_aea.connections.p2p_libp2p.config" + config_path = f"{p2p_libp2p_path}.config" log_file = "libp2p_node_{}.log".format(self.agent_name) log_file = os.path.join(os.path.abspath(os.getcwd()), log_file) self.set_config("{}.log_file".format(config_path), log_file) self.log_files.append(log_file) - setting_path = "vendor.open_aea.connections.p2p_libp2p.cert_requests" + setting_path = f"{p2p_libp2p_path}.cert_requests" settings = json.dumps( [ { @@ -228,7 +228,7 @@ def test_agent(self): self.add_item("connection", str(P2P_CONNECTION_PUBLIC_ID)) self.run_cli_command("build", cwd=self._get_cwd()) # setup a full node: with public uri, relay service, and delegate service - config_path = "vendor.open_aea.connections.p2p_libp2p.config" + config_path = f"{p2p_libp2p_path}.config" self.set_config( "{}.local_uri".format(config_path), "127.0.0.1:{}".format(DEFAULT_PORT) ) diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py index 796477ecac..1e9ea372dc 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_build.py @@ -28,14 +28,14 @@ from aea.exceptions import AEAException from packages.valory.connections.p2p_libp2p import check_dependencies -from packages.valory.connections.p2p_libp2p import ( +from packages.valory.connections.p2p_libp2p.check_dependencies import ( + LIBP2P_NODE_MODULE_NAME, MINIMUM_GCC_VERSION, MINIMUM_GO_VERSION, build_node, check_versions, version_to_string, ) -from packages.valory.connections.p2p_libp2p import LIBP2P_NODE_MODULE_NAME def test_check_versions(): @@ -60,7 +60,7 @@ def test_check_versions_negative_binary_not_found(): def test_check_versions_negative_version_too_low(): """Test check_versions - negative case, version too low.""" with mock.patch.object( - check_dependencies, "get_version", return_value=(0, 0, 0), + check_dependencies, "get_version", return_value=(0, 0, 0), ): with pytest.raises( AEAException, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py index f415a471ce..62b671266e 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py @@ -35,7 +35,7 @@ from packages.fetchai.protocols.default import DefaultSerializer from packages.fetchai.protocols.default.message import DefaultMessage -from packages.valory.connections.p2p_libp2p import NodeClient, Uri +from packages.valory.connections.p2p_libp2p.connection import NodeClient, Uri from tests.conftest import ( _make_libp2p_connection, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py index f665deab78..f8097c614f 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py @@ -36,18 +36,20 @@ from aea.identity.base import Identity from aea.multiplexer import Multiplexer -from packages.valory.protocols.acn.message import AcnMessage -from packages.valory.connections.p2p_libp2p import ( +from packages.valory.connections.p2p_libp2p.connection import ( LIBP2P_NODE_MODULE_NAME, Libp2pNode, P2PLibp2pConnection, _golang_module_run, _ip_all_private_or_all_public, ) +from packages.valory.protocols.acn.message import AcnMessage from tests.conftest import DEFAULT_LEDGER, _make_libp2p_connection +check_node_built = f"{P2PLibp2pConnection.__module__}.{P2PLibp2pConnection.__name__}._check_node_built" + DEFAULT_PORT = 10234 DEFAULT_NET_SIZE = 4 @@ -242,10 +244,8 @@ async def test_reconnect_on_write_failed(): """Test node restart on write fail.""" host = "localhost" port = "10000" - with patch( - "packages.open_aea.connections.p2p_libp2p.connection.P2PLibp2pConnection._check_node_built", - return_value="./", - ), patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: + with patch(check_node_built, return_value="./"), \ + patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: con = _make_libp2p_connection( port=port, host=host, data_dir=data_dir, build_directory=data_dir ) @@ -276,10 +276,8 @@ async def test_reconnect_on_write_failed_reconnect_pipe(): """Test node restart on write fail.""" host = "localhost" port = "10000" - with patch( - "packages.open_aea.connections.p2p_libp2p.connection.P2PLibp2pConnection._check_node_built", - return_value="./", - ), patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: + with patch(check_node_built, return_value="./"), \ + patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: con = _make_libp2p_connection( port=port, host=host, data_dir=data_dir, build_directory=data_dir ) @@ -316,10 +314,8 @@ async def test_reconnect_on_read_failed(): """Test node restart on read fail.""" host = "localhost" port = "10000" - with patch( - "packages.open_aea.connections.p2p_libp2p.connection.P2PLibp2pConnection._check_node_built", - return_value="./", - ), patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: + with patch(check_node_built, return_value="./"), \ + patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: con = _make_libp2p_connection( port=port, host=host, data_dir=data_dir, build_directory=data_dir ) diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py index 28606e23db..8f9079bb98 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py @@ -31,7 +31,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.protocols.default.serialization import DefaultSerializer -from packages.valory.connections.p2p_libp2p import build_node +from packages.valory.connections.p2p_libp2p.check_dependencies import build_node from tests.common.utils import wait_for_condition from tests.conftest import ( diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_go_code_matching_acn.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_go_code_matching_acn.py index 0bd0a2006c..4c0787a7eb 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_go_code_matching_acn.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_go_code_matching_acn.py @@ -35,7 +35,7 @@ from tests.conftest import libp2p_log_on_failure_all -PACKAGE = "packages.open_aea.connections.p2p_libp2p.libp2p_node" +PACKAGE = "packages.valory.connections.p2p_libp2p.libp2p_node" AEA_ROOT_DIR = os.path.join(*PACKAGE.split(".")) # if testing locally: tmp_dir = "../open-acn/" # WARNING: will be `/` prefix missing still ACN_GITHUB_URL = "https://github.com/valory-xyz/open-acn/" diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py index d53e51676d..bde28987d3 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py @@ -33,12 +33,9 @@ from aea.test_tools.test_cases import AEATestCaseMany from packages.fetchai.protocols.default.message import DefaultMessage -from packages.valory.connections.p2p_libp2p import ( - PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID, -) -from packages.valory.connections import ( - PUBLIC_ID as P2P_CLIENT_CONNECTION_PUBLIC_ID, -) +from packages.valory.connections import p2p_libp2p, p2p_libp2p_client +from packages.valory.connections.p2p_libp2p.connection import PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID +from packages.valory.connections.p2p_libp2p_client.connection import PUBLIC_ID as P2P_CLIENT_CONNECTION_PUBLIC_ID from tests.conftest import ( DEFAULT_LEDGER, @@ -81,6 +78,9 @@ AEA_DEFAULT_LAUNCH_TIMEOUT = 30 AEA_LIBP2P_LAUNCH_TIMEOUT = 30 +p2p_libp2p_path = f"vendor.{p2p_libp2p.__name__.split('.', 1)[-1]}" +p2p_libp2p_client_path = f"vendor.{p2p_libp2p_client.__name__.split('.', 1)[-1]}" + @pytest.fixture def maddrs(request): @@ -522,7 +522,7 @@ def test_connectivity(self, maddrs): log_file = "libp2p_node_{}.log".format(self.agent_name) log_file = os.path.join(os.path.abspath(os.getcwd()), log_file) - config_path = "vendor.open_aea.connections.p2p_libp2p.config" + config_path = f"{p2p_libp2p_path}.config" self.nested_set_config( config_path, { @@ -590,14 +590,13 @@ def test_connectivity(self, delegate_uris_public_keys): self.add_private_key(agent_ledger_id, f"{agent_ledger_id}_private_key.txt") self.add_item("connection", str(P2P_CLIENT_CONNECTION_PUBLIC_ID)) - config_path = "vendor.open_aea.connections.p2p_libp2p_client.config" + config_path = f"{p2p_libp2p_client_path}.config" self.nested_set_config( config_path, {"nodes": [{"uri": "{}".format(uri)} for uri in delegate_uris]}, ) - conn_path = "vendor.open_aea.connections.p2p_libp2p_client" self.nested_set_config( - conn_path + ".config", + p2p_libp2p_client_path + ".config", { "nodes": [ {"uri": uri, "public_key": public_keys[i]} @@ -608,7 +607,7 @@ def test_connectivity(self, delegate_uris_public_keys): # generate certificates for connection self.nested_set_config( - conn_path + ".cert_requests", + p2p_libp2p_client_path + ".cert_requests", [ CertRequest( identifier="acn", diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py index 689239c7a9..270401e167 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py @@ -26,7 +26,8 @@ from aea.multiplexer import Multiplexer from aea.test_tools.test_cases import AEATestCaseEmpty -from packages.valory.connections import PUBLIC_ID +from packages.valory.connections import p2p_libp2p_client +from packages.valory.connections.p2p_libp2p_client.connection import PUBLIC_ID from tests.conftest import ( DEFAULT_LEDGER, @@ -35,7 +36,7 @@ libp2p_log_on_failure_all, ) - +p2p_libp2p_client_path = f"vendor.{p2p_libp2p_client.__name__.split('.', 1)[-1]}" DEFAULT_PORT = 10234 DEFAULT_DELEGATE_PORT = 11234 DEFAULT_HOST = "127.0.0.1" @@ -79,7 +80,7 @@ def test_connection(self): self.set_config("agent.default_ledger", ledger_id) self.set_config("agent.required_ledgers", json.dumps([ledger_id]), "list") self.add_item("connection", str(PUBLIC_ID)) - conn_path = "vendor.open_aea.connections.p2p_libp2p_client" + conn_path = p2p_libp2p_client_path self.nested_set_config( conn_path + ".config", { diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py index f019d56ecc..f2d5fbdcd9 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py @@ -33,7 +33,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.protocols.default.serialization import DefaultSerializer -from packages.valory.connections import NodeClient, Uri +from packages.valory.connections.p2p_libp2p.connection import NodeClient, Uri from tests.common.mocks import RegexComparator from tests.common.utils import wait_for_condition diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py index 939e2314d6..fc102fb32d 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py @@ -34,7 +34,7 @@ from aea.identity.base import Identity from aea.multiplexer import Multiplexer -from packages.valory.connections import ( +from packages.valory.connections.p2p_libp2p_client.connection import ( NodeClient, P2PLibp2pClientConnection, POR_DEFAULT_SERVICE_ID, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py index 6977e5dcd2..42eb50aa1d 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py @@ -26,7 +26,8 @@ from aea.multiplexer import Multiplexer from aea.test_tools.test_cases import AEATestCaseEmpty -from packages.valory.connections.p2p_libp2p_mailbox import PUBLIC_ID +from packages.valory.connections import p2p_libp2p_mailbox +from packages.valory.connections.p2p_libp2p_mailbox.connection import PUBLIC_ID from tests.conftest import ( DEFAULT_LEDGER, @@ -35,7 +36,7 @@ libp2p_log_on_failure_all, ) - +p2p_libp2p_mailbox_path = f"vendor.{p2p_libp2p_mailbox.__name__.split('.', 1)[-1]}" DEFAULT_PORT = 10234 DEFAULT_DELEGATE_PORT = 11234 DEFAULT_HOST = "127.0.0.1" @@ -82,7 +83,7 @@ def test_connection(self): self.set_config("agent.default_ledger", ledger_id) self.set_config("agent.required_ledgers", json.dumps([ledger_id]), "list") self.add_item("connection", str(PUBLIC_ID)) - conn_path = "vendor.open_aea.connections.p2p_libp2p_mailbox" + conn_path = p2p_libp2p_mailbox_path self.nested_set_config( conn_path + ".config", { diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py index 6c6615a39d..8ec2059490 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py @@ -34,12 +34,8 @@ from aea.identity.base import Identity from aea.multiplexer import Multiplexer -from packages.valory.connections import ( - POR_DEFAULT_SERVICE_ID, -) -from packages.valory.connections.p2p_libp2p_mailbox import ( - P2PLibp2pMailboxConnection, -) +from packages.valory.connections.p2p_libp2p_mailbox.connection import POR_DEFAULT_SERVICE_ID +from packages.valory.connections.p2p_libp2p_mailbox.connection import P2PLibp2pMailboxConnection from tests.conftest import ( _make_libp2p_client_connection, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py index 70306babc4..ad7b3fa403 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_mailbox_service.py @@ -30,11 +30,11 @@ from aea.mail.base import Envelope from aea.multiplexer import Multiplexer -from packages.valory.protocols.acn import acn_pb2 -from packages.valory.protocols.acn.message import AcnMessage from packages.fetchai.protocols.default import DefaultSerializer from packages.fetchai.protocols.default.message import DefaultMessage -from packages.valory.connections.p2p_libp2p_mailbox import NodeClient +from packages.valory.connections.p2p_libp2p_mailbox.connection import NodeClient +from packages.valory.protocols.acn import acn_pb2 +from packages.valory.protocols.acn.message import AcnMessage from tests.common.utils import wait_for_condition from tests.conftest import _make_libp2p_client_connection, _make_libp2p_connection From 71cd0a218d2c7e238a4e3d96e8020da1efc3f03d Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 00:37:29 +0200 Subject: [PATCH 11/29] grunt:linters --- aea/helpers/serializers.py | 2 +- packages/hashes.csv | 8 ++++---- .../p2p_libp2p_client/connection.py | 4 +--- .../p2p_libp2p_client/connection.yaml | 2 +- .../p2p_libp2p_mailbox/connection.py | 4 +--- .../p2p_libp2p_mailbox/connection.yaml | 2 +- .../aea_ledger_cosmos/cosmos.py | 2 +- setup.cfg | 2 +- .../test_p2p_libp2p/test_aea_cli.py | 4 +++- .../test_p2p_libp2p/test_errors.py | 19 ++++++++++++------- .../test_p2p_libp2p/test_public_dht.py | 8 ++++++-- .../test_p2p_libp2p_client/test_aea_cli.py | 1 + .../test_p2p_libp2p_mailbox/test_aea_cli.py | 1 + .../test_p2p_libp2p_mailbox/test_errors.py | 6 ++++-- .../test_packages/test_protocols/test_acn.py | 4 ++-- 15 files changed, 40 insertions(+), 29 deletions(-) diff --git a/aea/helpers/serializers.py b/aea/helpers/serializers.py index 3e2fd27630..660f870504 100644 --- a/aea/helpers/serializers.py +++ b/aea/helpers/serializers.py @@ -22,7 +22,7 @@ import copy from typing import Any, Dict, Tuple -from google.protobuf.struct_pb2 import ListValue, Struct +from google.protobuf.struct_pb2 import ListValue, Struct # pylint: disable=no-name-in-module class DictProtobufStructSerializer: diff --git a/packages/hashes.csv b/packages/hashes.csv index bafd6ca31a..83a36ae9a8 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -76,9 +76,9 @@ open_aea/skills/scaffold,QmYUhZb94UXmnb4B4S1Y4NbRKQBwYXextBiWTVRmMucrFv open_aea/skills/scaffold/skill.yaml,QmaH1Qo5MTCrkBZxtEr59XMW3gbN6PRdFoQXU1QcZSZ5QH valory/connections/p2p_libp2p,QmSBvTawMkft3zf9tgYFNWJ6Hu4bkXtwddEfEjc3TVmSPL valory/connections/p2p_libp2p/connection.yaml,QmWcv11roKVZD557s76raVtEhzzrA544rRFJyw6HnhWbW7 -valory/connections/p2p_libp2p_client,Qmdmj8FGiTthD1TNMAfPgycsYYmFj3CykXjLZpi8Rx1dvN -valory/connections/p2p_libp2p_client/connection.yaml,QmZbRxziRBtwfj8MdhCwifCeib2gviv2NxEyCTz2pf5YqB -valory/connections/p2p_libp2p_mailbox,QmWHapy8qYS7vZqrPkjYPmdG2sF3yvfsSJjXcP2KoDAxNw -valory/connections/p2p_libp2p_mailbox/connection.yaml,QmUjJCQcX3pVT9kV94MvCUxPiQAhveJkKTkp4i2ueofED7 +valory/connections/p2p_libp2p_client,QmXPJMHa98DTQASkSbEtXY5SrtjJMcRVepNi2nkWv8Y2cr +valory/connections/p2p_libp2p_client/connection.yaml,QmPdHsTLCYVYiKPcmLJeJW3QfCEs9SaKvbetWAeHMQMHGk +valory/connections/p2p_libp2p_mailbox,QmZRz9Rgt3YP4L4f2iuWBgoCBVrM2FRDURbBM3oDXfQEwP +valory/connections/p2p_libp2p_mailbox/connection.yaml,QmTk3CR23UxLRWyrQqyrB4WUhnMARzvyXrxVmv6BfUSFtq valory/protocols/acn,QmYygvNm3cbZneMHgh77DfPTVVbbqE6jpGhutNykf89DAN valory/protocols/acn/protocol.yaml,QmSQPYLHQaBum9hKvm5LGXkMrtMBdv9eNtG4K3wf6YQ1GB diff --git a/packages/valory/connections/p2p_libp2p_client/connection.py b/packages/valory/connections/p2p_libp2p_client/connection.py index eaf0d83fe7..52316bae60 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.py +++ b/packages/valory/connections/p2p_libp2p_client/connection.py @@ -55,9 +55,7 @@ from asyncio import IncompleteReadError # pylint: disable=ungrouped-imports -_default_logger = logging.getLogger( - "aea.packages.valory.connections.p2p_libp2p_client" -) +_default_logger = logging.getLogger("aea.packages.valory.connections.p2p_libp2p_client") PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_client:0.20.0") diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index 84caf1a272..aaaea2dbe5 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -10,7 +10,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: QmRmDYNeEsKRgKjroGCJmLVJqjfnUm9FNXBXv3YYBBwsXq __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmYVhxT4DGNoTTewjE4MitvU99d9Baa6FXJSWPeURxYk9u + connection.py: QmeNZqL5QXEGufCymF9aqNuFMH5CsGAMJXq9VZjaE9pS1S fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.py b/packages/valory/connections/p2p_libp2p_mailbox/connection.py index 32c4231aea..99f3b7c519 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.py +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.py @@ -56,9 +56,7 @@ from asyncio import IncompleteReadError # pylint: disable=ungrouped-imports -_default_logger = logging.getLogger( - "aea.packages.valory.connections.p2p_libp2p_client" -) +_default_logger = logging.getLogger("aea.packages.valory.connections.p2p_libp2p_client") PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_mailbox:0.2.0") diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 83936aa441..8bd8f57643 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -10,7 +10,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: QmRmDYNeEsKRgKjroGCJmLVJqjfnUm9FNXBXv3YYBBwsXq __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmVwH93nSM99cApNfv6QUvfUY58cuR9WtzMgrr4RvVpLgc + connection.py: QmeGYLzuz3km72QCfAbuWszAxTLbR4AgTMPtZBXVqx6hza fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py b/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py index 3880e3560c..28cf2a29b4 100644 --- a/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py +++ b/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py @@ -77,7 +77,7 @@ from ecdsa.util import ( # type: ignore # pylint: disable=wrong-import-order sigencode_string_canonize, ) -from google.protobuf.any_pb2 import Any as ProtoAny +from google.protobuf.any_pb2 import Any as ProtoAny # pylint: disable=no-name-in-module from google.protobuf.json_format import MessageToDict, ParseDict from aea.common import Address, JSONLike diff --git a/setup.cfg b/setup.cfg index 49057de87c..99e328db7c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -199,7 +199,7 @@ ignore_errors = True [mypy-packages/fetchai/protocols/tac/tac_pb2] ignore_errors = True -[mypy-packages/fetchai/protocols/acn/acn_pb2] +[mypy-packages/valory/protocols/acn/acn_pb2] ignore_errors = True [mypy-tensorflow.*] diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py index 6a4725acdb..94ba0a9321 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py @@ -29,7 +29,9 @@ from aea.test_tools.test_cases import AEATestCaseEmpty from packages.valory.connections import p2p_libp2p -from packages.valory.connections.p2p_libp2p.connection import PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID +from packages.valory.connections.p2p_libp2p.connection import ( + PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID, +) from tests.conftest import ( DEFAULT_LEDGER, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py index f8097c614f..632e6fb747 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py @@ -48,7 +48,9 @@ from tests.conftest import DEFAULT_LEDGER, _make_libp2p_connection -check_node_built = f"{P2PLibp2pConnection.__module__}.{P2PLibp2pConnection.__name__}._check_node_built" +check_node_built = ( + f"{P2PLibp2pConnection.__module__}.{P2PLibp2pConnection.__name__}._check_node_built" +) DEFAULT_PORT = 10234 DEFAULT_NET_SIZE = 4 @@ -244,8 +246,9 @@ async def test_reconnect_on_write_failed(): """Test node restart on write fail.""" host = "localhost" port = "10000" - with patch(check_node_built, return_value="./"), \ - patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: + with patch(check_node_built, return_value="./"), patch( + "tests.conftest.build_node" + ), tempfile.TemporaryDirectory() as data_dir: con = _make_libp2p_connection( port=port, host=host, data_dir=data_dir, build_directory=data_dir ) @@ -276,8 +279,9 @@ async def test_reconnect_on_write_failed_reconnect_pipe(): """Test node restart on write fail.""" host = "localhost" port = "10000" - with patch(check_node_built, return_value="./"), \ - patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: + with patch(check_node_built, return_value="./"), patch( + "tests.conftest.build_node" + ), tempfile.TemporaryDirectory() as data_dir: con = _make_libp2p_connection( port=port, host=host, data_dir=data_dir, build_directory=data_dir ) @@ -314,8 +318,9 @@ async def test_reconnect_on_read_failed(): """Test node restart on read fail.""" host = "localhost" port = "10000" - with patch(check_node_built, return_value="./"), \ - patch("tests.conftest.build_node"), tempfile.TemporaryDirectory() as data_dir: + with patch(check_node_built, return_value="./"), patch( + "tests.conftest.build_node" + ), tempfile.TemporaryDirectory() as data_dir: con = _make_libp2p_connection( port=port, host=host, data_dir=data_dir, build_directory=data_dir ) diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py index bde28987d3..5a6ef5e241 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py @@ -34,8 +34,12 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.valory.connections import p2p_libp2p, p2p_libp2p_client -from packages.valory.connections.p2p_libp2p.connection import PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID -from packages.valory.connections.p2p_libp2p_client.connection import PUBLIC_ID as P2P_CLIENT_CONNECTION_PUBLIC_ID +from packages.valory.connections.p2p_libp2p.connection import ( + PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID, +) +from packages.valory.connections.p2p_libp2p_client.connection import ( + PUBLIC_ID as P2P_CLIENT_CONNECTION_PUBLIC_ID, +) from tests.conftest import ( DEFAULT_LEDGER, diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py index 270401e167..eda0667597 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py @@ -36,6 +36,7 @@ libp2p_log_on_failure_all, ) + p2p_libp2p_client_path = f"vendor.{p2p_libp2p_client.__name__.split('.', 1)[-1]}" DEFAULT_PORT = 10234 DEFAULT_DELEGATE_PORT = 11234 diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py index 42eb50aa1d..7c41c72694 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py @@ -36,6 +36,7 @@ libp2p_log_on_failure_all, ) + p2p_libp2p_mailbox_path = f"vendor.{p2p_libp2p_mailbox.__name__.split('.', 1)[-1]}" DEFAULT_PORT = 10234 DEFAULT_DELEGATE_PORT = 11234 diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py index 8ec2059490..6999685038 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_errors.py @@ -34,8 +34,10 @@ from aea.identity.base import Identity from aea.multiplexer import Multiplexer -from packages.valory.connections.p2p_libp2p_mailbox.connection import POR_DEFAULT_SERVICE_ID -from packages.valory.connections.p2p_libp2p_mailbox.connection import P2PLibp2pMailboxConnection +from packages.valory.connections.p2p_libp2p_mailbox.connection import ( + P2PLibp2pMailboxConnection, + POR_DEFAULT_SERVICE_ID, +) from tests.conftest import ( _make_libp2p_client_connection, diff --git a/tests/test_packages/test_protocols/test_acn.py b/tests/test_packages/test_protocols/test_acn.py index 6dfef10c50..7f06601e38 100644 --- a/tests/test_packages/test_protocols/test_acn.py +++ b/tests/test_packages/test_protocols/test_acn.py @@ -31,8 +31,8 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -from packages.valory.protocols.acn import AcnDialogue as BaseAcnDialogue -from packages.valory.protocols.acn import AcnDialogues as BaseAcnDialogues +from packages.valory.protocols.acn.dialogues import AcnDialogue as BaseAcnDialogue +from packages.valory.protocols.acn.dialogues import AcnDialogues as BaseAcnDialogues from packages.valory.protocols.acn.message import AcnMessage From 1c0bdc5f8d06cce1ba25f850a40a7ad3108afc07 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 00:41:02 +0200 Subject: [PATCH 12/29] fix: workflow python@master -> python@v3 --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index fd2ff81e76..af281659df 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -14,7 +14,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.7 - name: Install dependencies (ubuntu-latest) From cfca288bad30746a445994cc33ddfbedd47e3b38 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 00:55:58 +0200 Subject: [PATCH 13/29] fix: adding packages/valory to makefile --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f133a4fbc8..e4a64780dd 100644 --- a/Makefile +++ b/Makefile @@ -76,17 +76,17 @@ test: pytest -rfE plugins/aea-ledger-ethereum/tests --cov=aea_ledger_ethereum --cov-report=term --cov-report=term-missing --cov-config=.coveragerc pytest -rfE plugins/aea-ledger-cosmos/tests --cov=aea_ledger_cosmos --cov-report=term --cov-report=term-missing --cov-config=.coveragerc pytest -rfE plugins/aea-cli-ipfs/tests --cov=aea_cli_ipfs --cov-report=term --cov-report=term-missing --cov-config=.coveragerc - pytest -rfE --doctest-modules aea packages/fetchai/protocols packages/fetchai/connections packages/fetchai/skills tests/ --cov=aea --cov=packages/fetchai/connections --cov=packages/fetchai/contracts --cov=packages/fetchai/protocols --cov=packages/fetchai/skills --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov=aea --cov=packages/fetchai/protocols --cov=packages/fetchai/connections --cov=packages/fetchai/skills --cov-config=.coveragerc + pytest -rfE --doctest-modules aea packages/valory/protocols packages/valory/connections packages/fetchai/protocols packages/fetchai/connections packages/fetchai/skills tests/ --cov=aea --cov=packages/valory/connections --cov=packages/fetchai/connections --cov=packages/fetchai/contracts --cov=packages/fetchai/protocols --cov=packages/fetchai/skills --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov=aea --cov=packages/valory/protocols --cov=packages/fetchai/protocols --cov=packages/fetchai/connections --cov=packages/fetchai/skills --cov-config=.coveragerc find . -name ".coverage*" -not -name ".coveragerc" -exec rm -fr "{}" \; .PHONY: test-sub test-sub: - pytest -rfE --doctest-modules aea packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills tests/test_$(tdir) --cov=aea.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov-config=.coveragerc + pytest -rfE --doctest-modules aea packages/valory/connections packages/valory/protocols packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills tests/test_$(tdir) --cov=aea.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov-config=.coveragerc find . -name ".coverage*" -not -name ".coveragerc" -exec rm -fr "{}" \; .PHONY: test-sub-p test-sub-p: - pytest -rfE --doctest-modules aea packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills tests/test_packages/test_$(tdir) --cov=packages.fetchai.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov-config=.coveragerc + pytest -rfE --doctest-modules aea packages/valory/connections packages/valory/protocols packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills tests/test_packages/test_$(tdir) --cov=packages.fetchai.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov-config=.coveragerc find . -name ".coverage*" -not -name ".coveragerc" -exec rm -fr "{}" \; .PHONY: hashes @@ -156,11 +156,11 @@ new_env: clean protolint_install: GO111MODULE=on GOPATH=~/go go get -u -v github.com/yoheimuta/protolint/cmd/protolint@v0.27.0 protolint: - PATH=${PATH}:${GOPATH}/bin/:~/go/bin protolint lint -config_path=./protolint.yaml -fix ./aea/mail ./packages/fetchai/protocols + PATH=${PATH}:${GOPATH}/bin/:~/go/bin protolint lint -config_path=./protolint.yaml -fix ./aea/mail ./packages/fetchai/protocols ./packages/valory/protocols protolint_install_win: powershell -command '$$env:GO111MODULE="on"; go get -u -v github.com/yoheimuta/protolint/cmd/protolint@v0.27.0' protolint_win: - protolint lint -config_path=./protolint.yaml -fix ./aea/mail ./packages/fetchai/protocols + protolint lint -config_path=./protolint.yaml -fix ./aea/mail ./packages/fetchai/protocols ./packages/valory/protocols # isort: fix import orders # black: format files according to the pep standards From 51fef35036173d5cddf6d64e7d102e342976fb3b Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 01:07:52 +0200 Subject: [PATCH 14/29] fix: revert --- plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py b/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py index 28cf2a29b4..3880e3560c 100644 --- a/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py +++ b/plugins/aea-ledger-cosmos/aea_ledger_cosmos/cosmos.py @@ -77,7 +77,7 @@ from ecdsa.util import ( # type: ignore # pylint: disable=wrong-import-order sigencode_string_canonize, ) -from google.protobuf.any_pb2 import Any as ProtoAny # pylint: disable=no-name-in-module +from google.protobuf.any_pb2 import Any as ProtoAny from google.protobuf.json_format import MessageToDict, ParseDict from aea.common import Address, JSONLike From f67bcb8923e20c1d9326f371a32ab845a8ec6502 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 11:55:35 +0200 Subject: [PATCH 15/29] chore:versions to 0.1.0 --- packages/valory/connections/p2p_libp2p/connection.py | 2 +- packages/valory/connections/p2p_libp2p/connection.yaml | 2 +- packages/valory/connections/p2p_libp2p_client/connection.py | 2 +- packages/valory/connections/p2p_libp2p_client/connection.yaml | 2 +- packages/valory/connections/p2p_libp2p_mailbox/connection.py | 2 +- packages/valory/connections/p2p_libp2p_mailbox/connection.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/valory/connections/p2p_libp2p/connection.py b/packages/valory/connections/p2p_libp2p/connection.py index 4f64553404..2c53d60411 100644 --- a/packages/valory/connections/p2p_libp2p/connection.py +++ b/packages/valory/connections/p2p_libp2p/connection.py @@ -59,7 +59,7 @@ PIPE_CONN_TIMEOUT = 10.0 -PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p:0.26.0") +PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p:0.1.0") SUPPORTED_LEDGER_IDS = ["fetchai", "cosmos", "ethereum"] diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index 69107b37d3..9848ada7f7 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -1,6 +1,6 @@ name: p2p_libp2p author: valory -version: 0.26.0 +version: 0.1.0 type: connection description: The p2p libp2p connection implements an interface to standalone golang go-libp2p node that can exchange aea envelopes with other agents connected to the diff --git a/packages/valory/connections/p2p_libp2p_client/connection.py b/packages/valory/connections/p2p_libp2p_client/connection.py index 52316bae60..fb718c9c7d 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.py +++ b/packages/valory/connections/p2p_libp2p_client/connection.py @@ -57,7 +57,7 @@ _default_logger = logging.getLogger("aea.packages.valory.connections.p2p_libp2p_client") -PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_client:0.20.0") +PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_client:0.1.0") SUPPORTED_LEDGER_IDS = ["fetchai", "cosmos", "ethereum"] diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index aaaea2dbe5..bcb01d64fb 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -1,6 +1,6 @@ name: p2p_libp2p_client author: valory -version: 0.20.0 +version: 0.1.0 type: connection description: The libp2p client connection implements a tcp connection to a running libp2p node as a traffic delegate to send/receive envelopes to/from agents in the diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.py b/packages/valory/connections/p2p_libp2p_mailbox/connection.py index 99f3b7c519..0fc01ca557 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.py +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.py @@ -58,7 +58,7 @@ _default_logger = logging.getLogger("aea.packages.valory.connections.p2p_libp2p_client") -PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_mailbox:0.2.0") +PUBLIC_ID = PublicId.from_str("valory/p2p_libp2p_mailbox:0.1.0") SUPPORTED_LEDGER_IDS = ["fetchai", "cosmos", "ethereum"] diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 8bd8f57643..5e1d9bfef7 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -1,6 +1,6 @@ name: p2p_libp2p_mailbox author: valory -version: 0.2.0 +version: 0.1.0 type: connection description: The libp2p client connection implements a tcp connection to a running libp2p node as a traffic delegate to send/receive envelopes to/from agents in the From 5bdde4a76abd6810b664f73622397c326db621d1 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 11:56:40 +0200 Subject: [PATCH 16/29] docs:author and version --- docs/acn-internals.md | 14 +++++++------- docs/acn.md | 4 ++-- docs/p2p-connection.md | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/acn-internals.md b/docs/acn-internals.md index c18cf1589b..b8553f36f9 100644 --- a/docs/acn-internals.md +++ b/docs/acn-internals.md @@ -338,7 +338,7 @@ The following diagram explains the exchange of messages on entering an envelope In the case of _direct connection_, `Agent` is a Python process, whereas `Peer` is in a separate (Golang) process. The logic of the Python Agent client is implemented in -the AEA connection `p2p_libp2p` +the AEA connection `p2p_libp2p` The communication between `Agent` and `Peer` is done through an OS pipe for Inter-Process Communication (IPC) between the AEAs process and the libp2p node process; then, the message gets enqueued to an output queue by an input coroutine. @@ -351,7 +351,7 @@ pipes, the communication is done through the network, i.e. TCP, with a peer which has the delegate service enabled. The logic of the `Agent` client connected with a delegate connection is implemented in the open-aea -`p2p_libp2p_client` connection. +`p2p_libp2p_client` connection.
@@ -589,14 +589,14 @@ refer to this guide. ### The `p2p_libp2p` connection The source code of the `valory/p2p_libp2p` connection can be downloaded -here. +here. The package provides the connection class `P2PLibp2pConnection`, which implements the `Connection` interface and therefore can be used by the Multiplexer as any other connection. - The `connect` method of this connection spawns a new instance - of the `libp2p_node` program + of the `libp2p_node` program (i.e. an ACN peer node) and connects to it through OS pipes. Then, it sets up the _message receiving loop_, which enqueues messages in the input queue to be read by `read` method calls, @@ -694,7 +694,7 @@ which receives messages from the Libp2p node. ### The `p2p_libp2p_client` connection The source code of the `p2p_libp2p` connection can be downloaded -here. +here. The package provides the connection class `P2PLibp2pClientConnection`, which implements the `Connection` interface and @@ -771,8 +771,8 @@ Possible solutions: Code references: -- agent record removal -- message routing +- agent record removal +- message routing ### Golang Node <> Python Client `libp2p` connection diff --git a/docs/acn.md b/docs/acn.md index 7b16b65101..b031bcfd30 100644 --- a/docs/acn.md +++ b/docs/acn.md @@ -51,9 +51,9 @@ To satisfy different resource constraints and flexible deployment the ACN is imp An agent can choose which connection to use depending on the resource and trust requirements: -- `p2p_libp2p` +- `p2p_libp2p` connection: the agent maintains a peer of the ACN. The agent has full control over the peer and does not need to trust any other entity. -- `p2p_libp2p_client` +- `p2p_libp2p_client` connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer. All communication protocols use public cryptography to ensure security (authentication, confidentiality, and availability) using TLS handshakes with pre-shared public keys. diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md index f9230c8e3c..67239f73ed 100644 --- a/docs/p2p-connection.md +++ b/docs/p2p-connection.md @@ -26,8 +26,8 @@ Create one AEA as follows: ``` bash aea create my_genesis_aea cd my_genesis_aea -aea add connection open_aea/p2p_libp2p:0.26.0 -aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 +aea add connection valory/p2p_libp2p:0.1.0 +aea config set agent.default_connection valory/p2p_libp2p:0.1.0 aea install aea build ``` @@ -45,10 +45,10 @@ aea issue-certificates Run the AEA: ``` bash -aea run --connections open_aea/p2p_libp2p:0.26.0 +aea run --connections valory/p2p_libp2p:0.1.0 ``` -Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress open-aea -c -i open-aea/p2p_libp2p:0.26.0 -u public_uri` to retrieve the address.) +Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress open-aea -c -i valory/p2p_libp2p:0.1.0 -u public_uri` to retrieve the address.) This is the entry peer address for the local agent communication network created by the genesis AEA. ### Create and run another AEA @@ -58,8 +58,8 @@ Create a second AEA: ``` bash aea create my_other_aea cd my_other_aea -aea add connection open_aea/p2p_libp2p:0.26.0 -aea config set agent.default_connection open_aea/p2p_libp2p:0.26.0 +aea add connection valory/p2p_libp2p:0.1.0 +aea config set agent.default_connection valory/p2p_libp2p:0.1.0 aea install aea build ``` @@ -91,7 +91,7 @@ Here `[, ]` represents a list of multi Run the AEA: ``` bash -aea run --connections open_aea/p2p_libp2p:0.26.0 +aea run --connections valory/p2p_libp2p:0.1.0 ``` You can inspect the `libp2p_node.log` log files of the AEA to see how they discover each other. @@ -107,20 +107,20 @@ You can inspect the `libp2p_node.log` log files of the AEA to see how they disco You can connect to the deployed public test network by adding one or multiple of the following addresses as the `p2p_libp2p` connection's `entry_peers`: ``` yaml - +/dns4/staging.acn.autonolas.tech/tcp/9003/p2p/16Uiu2HAkzqwxz5HdbnXS6mB4nTwJ3WysQa6udvbZ3te2sCHZ6ih2 ``` ``` yaml - +/dns4/staging.acn.autonolas.tech/tcp/9004/p2p/16Uiu2HAmCQqXLFWaqqUv8hFdFPDwwNQf9qEQox8Kcf78heb33e7x ``` Specifically, in an AEAs configuration `aea-config.yaml` add the above addresses for `entry_peers` as follows: ``` yaml --- -public_id: open_aea/p2p_libp2p:0.26.0 +public_id: valory/p2p_libp2p:0.1.0 type: connection config: delegate_uri: null - entry_peers: [, ] + entry_peers: [/dns4/staging.acn.autonolas.tech/tcp/9003/p2p/16Uiu2HAkzqwxz5HdbnXS6mB4nTwJ3WysQa6udvbZ3te2sCHZ6ih2,/dns4/staging.acn.autonolas.tech/tcp/9004/p2p/16Uiu2HAmCQqXLFWaqqUv8hFdFPDwwNQf9qEQox8Kcf78heb33e7x] public_uri: null local_uri: 127.0.0.1:9001 ``` @@ -130,7 +130,7 @@ Note, this configuration change must be made for all agents attempting to commun ## Configuring the `connection.yaml` entries: -To learn more about how to configure your `open_aea/p2p_libp2p:0.26.0` connection consult the `README.md` file supplied with the connection package. +To learn more about how to configure your `valory/p2p_libp2p:0.1.0` connection consult the `README.md` file supplied with the connection package. ## Running Go peer standalone From 61abae1dfd4a6a52e2b89ef319f2e45fa3221dbe Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 12:03:11 +0200 Subject: [PATCH 17/29] fix:updating hashes --- aea/helpers/serializers.py | 5 ++++- packages/hashes.csv | 12 ++++++------ .../valory/connections/p2p_libp2p/connection.yaml | 2 +- .../connections/p2p_libp2p_client/connection.yaml | 2 +- .../connections/p2p_libp2p_mailbox/connection.yaml | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/aea/helpers/serializers.py b/aea/helpers/serializers.py index 660f870504..08dc68bb23 100644 --- a/aea/helpers/serializers.py +++ b/aea/helpers/serializers.py @@ -22,7 +22,10 @@ import copy from typing import Any, Dict, Tuple -from google.protobuf.struct_pb2 import ListValue, Struct # pylint: disable=no-name-in-module +from google.protobuf.struct_pb2 import ( # pylint: disable=no-name-in-module + ListValue, + Struct, +) class DictProtobufStructSerializer: diff --git a/packages/hashes.csv b/packages/hashes.csv index 83a36ae9a8..3263276256 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -74,11 +74,11 @@ open_aea/protocols/signing,QmNa9d62dQbZbh2rpu8Eey1fav9ZcWw8a9i4D45uDE7Avq open_aea/protocols/signing/protocol.yaml,QmdiuSpQW1LV5uusAAe3DDYBcksxZPYuMZ1YBWvwvXuWsM open_aea/skills/scaffold,QmYUhZb94UXmnb4B4S1Y4NbRKQBwYXextBiWTVRmMucrFv open_aea/skills/scaffold/skill.yaml,QmaH1Qo5MTCrkBZxtEr59XMW3gbN6PRdFoQXU1QcZSZ5QH -valory/connections/p2p_libp2p,QmSBvTawMkft3zf9tgYFNWJ6Hu4bkXtwddEfEjc3TVmSPL -valory/connections/p2p_libp2p/connection.yaml,QmWcv11roKVZD557s76raVtEhzzrA544rRFJyw6HnhWbW7 -valory/connections/p2p_libp2p_client,QmXPJMHa98DTQASkSbEtXY5SrtjJMcRVepNi2nkWv8Y2cr -valory/connections/p2p_libp2p_client/connection.yaml,QmPdHsTLCYVYiKPcmLJeJW3QfCEs9SaKvbetWAeHMQMHGk -valory/connections/p2p_libp2p_mailbox,QmZRz9Rgt3YP4L4f2iuWBgoCBVrM2FRDURbBM3oDXfQEwP -valory/connections/p2p_libp2p_mailbox/connection.yaml,QmTk3CR23UxLRWyrQqyrB4WUhnMARzvyXrxVmv6BfUSFtq +valory/connections/p2p_libp2p,QmRtaTNhzeKLyoV7WGcLp1SeKcezPxgZ9YVyV2RAaspLhH +valory/connections/p2p_libp2p/connection.yaml,QmahcbMLW2hLsTQrVePYz2drFPcKxgvtPJtZuzVkLu71zT +valory/connections/p2p_libp2p_client,QmRrYqiDQknhivEqh6e2cdwUvjtxJyNkzR49Dg7MWcWsCG +valory/connections/p2p_libp2p_client/connection.yaml,QmUK9xDgMMBg32KSqhWrkn1eHzaiu2QgjCDCrhJP1NH4ej +valory/connections/p2p_libp2p_mailbox,QmaubzT3ynirrUd6GdWfV7omizqR5juvKar8vCcCb8fqnG +valory/connections/p2p_libp2p_mailbox/connection.yaml,QmekCSzpQDzqk5vCzHpgFnEu1krqRxSWcwpWnNpNcCCD3a valory/protocols/acn,QmYygvNm3cbZneMHgh77DfPTVVbbqE6jpGhutNykf89DAN valory/protocols/acn/protocol.yaml,QmSQPYLHQaBum9hKvm5LGXkMrtMBdv9eNtG4K3wf6YQ1GB diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index 9848ada7f7..6e1950ebaa 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -11,7 +11,7 @@ fingerprint: README.md: QmZP7GPu67Ag2Fw8zgZnzpQPqaYJvr7w8Zy5VhQ8Jpekkg __init__.py: QmRo1DRePomRccoY2tB3GnKV2rUoNFaaE26WDRKp4ATs33 check_dependencies.py: QmS7PnP2G3vMrjqPHeuuTH74Nfowd33FUZkqYTUb3269Pi - connection.py: QmQGfUKtUnCB8GjhpWLMxvbd4dbXWFr1obknYeb1oeK56C + connection.py: Qmagjyj3QrcmU3q7LGvSiHLzQFfLkzvux2mxaWFVCbij2D consts.py: QmWAHrbN2fhqEe8o6cVLtwhWaEFp6h5cUJtJddYWbibPJj libp2p_node/Makefile: QmYMR8evkEV166HXTxjaAYEBiQ9HFh2whKQ7uotXvr88TU libp2p_node/README.md: QmRBC7o5y1TBQGwviJ9XxywdeuSSz6dNgvGE9wQhFPES4D diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index bcb01d64fb..a3b80988b7 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -10,7 +10,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: QmRmDYNeEsKRgKjroGCJmLVJqjfnUm9FNXBXv3YYBBwsXq __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmeNZqL5QXEGufCymF9aqNuFMH5CsGAMJXq9VZjaE9pS1S + connection.py: QmUFkxwiJp9d55Bjwke3eHhpHxpuHCKN8fRPPHoTKPhT3m fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 5e1d9bfef7..162bef500c 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -10,7 +10,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: QmRmDYNeEsKRgKjroGCJmLVJqjfnUm9FNXBXv3YYBBwsXq __init__.py: QmWYz6a1UrsXsG55CQj6X2snQZWU7isUGBiWJWwDqEpYyS - connection.py: QmeGYLzuz3km72QCfAbuWszAxTLbR4AgTMPtZBXVqx6hza + connection.py: Qmf5Vwi8o9wPbP8VjUfnqL7jwCo373LrGt59CbsjPVzpdi fingerprint_ignore_patterns: [] connections: [] protocols: From c64fa60307ff269b4b4492fc5d6c33292d24dcd5 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 12:27:01 +0200 Subject: [PATCH 18/29] fix:prefixing author --- docs/acn-internals.md | 22 +++++++++++----------- docs/acn.md | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/acn-internals.md b/docs/acn-internals.md index b8553f36f9..695a04e502 100644 --- a/docs/acn-internals.md +++ b/docs/acn-internals.md @@ -5,8 +5,8 @@ the main implementation of the Agent Communication Network (ACN). In particular: - The `open-acn` Golang library; At the moment a copy resides locally in open-aea here as `libp2p_node`. -- The `p2p_libp2p` AEA connection, written in Python, that implements the _direct connection_ with an ACN peer; -- The `p2p_libp2p_client` AEA connection, written in Python, which implements the _delegate connection_ with an ACN peer. +- The `valory/p2p_libp2p` AEA connection, written in Python, that implements the _direct connection_ with an ACN peer; +- The `valory/p2p_libp2p_client` AEA connection, written in Python, which implements the _delegate connection_ with an ACN peer. It is assumed the reader already knows what is the ACN and its purposes; if not, we suggest reading this page. @@ -24,7 +24,7 @@ and the message exchange involved; destination agent to the target agent; - The following section describes the functionalities of the AEA connections that allow to communicate through - the ACN: `p2p_libp2p` and `p2p_libp2p_client`; + the ACN: `valory/p2p_libp2p` and `valory/p2p_libp2p_client`; - The documentation ends with a section of known issues and limitations of the current implementation. @@ -338,7 +338,7 @@ The following diagram explains the exchange of messages on entering an envelope In the case of _direct connection_, `Agent` is a Python process, whereas `Peer` is in a separate (Golang) process. The logic of the Python Agent client is implemented in -the AEA connection `p2p_libp2p` +the `valory/p2p_libp2p` connection. The communication between `Agent` and `Peer` is done through an OS pipe for Inter-Process Communication (IPC) between the AEAs process and the libp2p node process; then, the message gets enqueued to an output queue by an input coroutine. @@ -351,7 +351,7 @@ pipes, the communication is done through the network, i.e. TCP, with a peer which has the delegate service enabled. The logic of the `Agent` client connected with a delegate connection is implemented in the open-aea -`p2p_libp2p_client` connection. +`valory/p2p_libp2p_client` connection.
@@ -578,15 +578,15 @@ similarly for what has been described for the envelope entrance To connect the AEA to the ACN network, there are two AEA connections available: -- the `p2p_libp2p`, that implements +- the `valory/p2p_libp2p`, that implements a direct connection, and -- the `p2p_libp2p_client` connection, +- the `valory/p2p_libp2p_client` connection, that implements the delegate connection. For more information on the AEA connection package type, refer to this guide. -### The `p2p_libp2p` connection +### The `valory/p2p_libp2p` connection The source code of the `valory/p2p_libp2p` connection can be downloaded here. @@ -691,9 +691,9 @@ which receives messages from the Libp2p node. - the `disconnect` method stops both the receiving loop and the sending loop, and stops the Libp2p node. -### The `p2p_libp2p_client` connection +### The `valory/p2p_libp2p_client` connection -The source code of the `p2p_libp2p` connection can be downloaded +The source code of the `valory/p2p_libp2p_client` connection can be downloaded here. The package provides the connection class `P2PLibp2pClientConnection`, @@ -743,7 +743,7 @@ therefore can be used by the Multiplexer as any other connection.
- The `send` method and the `receive` methods behave similarly to - the `send` and `receive` methods of the `p2p_libp2p` connection, + the `send` and `receive` methods of the `valory/p2p_libp2p` connection, in terms of message exchange; however, the communication is done via TCP rather than pipes. diff --git a/docs/acn.md b/docs/acn.md index b031bcfd30..7f6379e524 100644 --- a/docs/acn.md +++ b/docs/acn.md @@ -51,9 +51,9 @@ To satisfy different resource constraints and flexible deployment the ACN is imp An agent can choose which connection to use depending on the resource and trust requirements: -- `p2p_libp2p` +- `valory/p2p_libp2p` connection: the agent maintains a peer of the ACN. The agent has full control over the peer and does not need to trust any other entity. -- `p2p_libp2p_client` +- `valory/p2p_libp2p_client` connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer. All communication protocols use public cryptography to ensure security (authentication, confidentiality, and availability) using TLS handshakes with pre-shared public keys. From 9d36d50bc6ea76a2a74ea62420e7d0bfef836004 Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 12:37:14 +0200 Subject: [PATCH 19/29] fix:author prefix --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 35c6711187..3523ebbd20 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -97,7 +97,7 @@ We have various commands which are helpful during development. ### Go Development -- The `fetchai/p2p_libp2p` package is partially developed in Go. +- The `valory/p2p_libp2p` package is partially developed in Go. - To install Go visit the [Golang site](https://golang.org/doc/install). From a149089bea6426a8c26783324fd9da3b466bbfef Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Sat, 2 Apr 2022 12:46:54 +0200 Subject: [PATCH 20/29] fix:add generate_all_protocols to Makefile --- Makefile | 1 + packages/hashes.csv | 4 ++-- packages/valory/protocols/acn/__init__.py | 2 +- packages/valory/protocols/acn/dialogues.py | 2 +- packages/valory/protocols/acn/message.py | 2 +- packages/valory/protocols/acn/protocol.yaml | 8 ++++---- packages/valory/protocols/acn/serialization.py | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index e4a64780dd..55ff840f18 100644 --- a/Makefile +++ b/Makefile @@ -191,6 +191,7 @@ security: # update copyright headers .PHONY: generators generators: + python scripts/generate_all_protocols.py python scripts/generate_ipfs_hashes.py python scripts/generate_api_docs.py python scripts/check_copyright_notice.py diff --git a/packages/hashes.csv b/packages/hashes.csv index 3263276256..492ae47655 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -80,5 +80,5 @@ valory/connections/p2p_libp2p_client,QmRrYqiDQknhivEqh6e2cdwUvjtxJyNkzR49Dg7MWcW valory/connections/p2p_libp2p_client/connection.yaml,QmUK9xDgMMBg32KSqhWrkn1eHzaiu2QgjCDCrhJP1NH4ej valory/connections/p2p_libp2p_mailbox,QmaubzT3ynirrUd6GdWfV7omizqR5juvKar8vCcCb8fqnG valory/connections/p2p_libp2p_mailbox/connection.yaml,QmekCSzpQDzqk5vCzHpgFnEu1krqRxSWcwpWnNpNcCCD3a -valory/protocols/acn,QmYygvNm3cbZneMHgh77DfPTVVbbqE6jpGhutNykf89DAN -valory/protocols/acn/protocol.yaml,QmSQPYLHQaBum9hKvm5LGXkMrtMBdv9eNtG4K3wf6YQ1GB +valory/protocols/acn,QmeAc6ShrprQJUg3mu9psN7XcKp9qFduRVZYDnzMRekpxJ +valory/protocols/acn/protocol.yaml,QmT5obGfVVYxWX3FZL8DT3jJ9NXRSdhZwNokwms996FiX1 diff --git a/packages/valory/protocols/acn/__init__.py b/packages/valory/protocols/acn/__init__.py index 9025d3769e..dba9281335 100644 --- a/packages/valory/protocols/acn/__init__.py +++ b/packages/valory/protocols/acn/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2022 fetchai +# Copyright 2022 valory # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/valory/protocols/acn/dialogues.py b/packages/valory/protocols/acn/dialogues.py index e86436c5fe..a2b611ff4b 100644 --- a/packages/valory/protocols/acn/dialogues.py +++ b/packages/valory/protocols/acn/dialogues.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2022 fetchai +# Copyright 2022 valory # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/valory/protocols/acn/message.py b/packages/valory/protocols/acn/message.py index 9f61237d1c..6843c64875 100644 --- a/packages/valory/protocols/acn/message.py +++ b/packages/valory/protocols/acn/message.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2022 fetchai +# Copyright 2022 valory # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/valory/protocols/acn/protocol.yaml b/packages/valory/protocols/acn/protocol.yaml index 01d1435450..ee24f64160 100644 --- a/packages/valory/protocols/acn/protocol.yaml +++ b/packages/valory/protocols/acn/protocol.yaml @@ -8,13 +8,13 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: QmZ59igTs2SKsMDHzuew8gfGdqjW1vNZ3DxBDqWLnDd6XD - __init__.py: QmX46WMVxai4o9K9sGSogZLJEZhebmVerBRHvr6My1bPZn + __init__.py: QmSkPSpzcED8eTLWGLkD34Fve95rBpBAQPpSfoXRH9MagU acn.proto: QmVWvXETUNe7QZTvBgzwpofNP3suFthwyxbTVUqSx8mdnE acn_pb2.py: Qmf3HYmJtGwugpCuWSmJEDVHwZcnCF6BWmeEouUSpBRs45 custom_types.py: QmS9xN5EPy8pZRbwpUdewH7TocNGCx7xv3GwupxSQRRVgM - dialogues.py: QmNWpqFrnVhUsveh6WKDaWCYsUVj6gQd1tHSxZJB8UwjH6 - message.py: QmeLwVbFaVv8z5bT8vqceVpgQYpg2UVmSkQxK2fmLn1Se3 - serialization.py: QmT1PPT4jSzvJaeQNCTxx54gSWUU3EAYuU1RakGqDdPmXT + dialogues.py: QmT4CxF6EQVAm4oEyZAjUinTXNH4LCBz4LsGGHmCNY4s8z + message.py: Qmbgg2gtaqNN5MkpbbZgfybTqEvNMDVgEwSfmhUtDcWcoQ + serialization.py: QmQ5dK9C1cd33FfN8pkAzvmW7Hs6rK5ZBuppMXp48zHXr2 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/acn/serialization.py b/packages/valory/protocols/acn/serialization.py index 254f1ec84b..4f6ef2433b 100644 --- a/packages/valory/protocols/acn/serialization.py +++ b/packages/valory/protocols/acn/serialization.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2022 fetchai +# Copyright 2022 valory # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 5fa041d618c9c299519f83ca156cb287030132df Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Mon, 4 Apr 2022 19:53:31 -0700 Subject: [PATCH 21/29] fix: address protobuf error by fixing version --- .pylintrc | 2 +- Pipfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index 1290085b42..a82dcfeeac 100644 --- a/.pylintrc +++ b/.pylintrc @@ -22,7 +22,7 @@ disable=C0103,C0201,C0301,C0302,W0105,W0707,W1202,W1203,R0801 # W0212: protected-access [IMPORTS] -ignored-modules=bech32,ecdsa,lru,eth_typing,eth_keys,eth_account,ipfshttpclient,werkzeug,openapi_spec_validator,aiohttp,multidict,yoti_python_sdk,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,web3,aioprometheus,pyaes,Crypto,asn1crypto,cosmpy,google +ignored-modules=bech32,ecdsa,lru,eth_typing,eth_keys,eth_account,ipfshttpclient,werkzeug,openapi_spec_validator,aiohttp,multidict,yoti_python_sdk,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,web3,protobuf,aioprometheus,pyaes,Crypto,asn1crypto,cosmpy,google [DESIGN] min-public-methods=1 diff --git a/Pipfile b/Pipfile index 060f8d89ef..4c7ff09cb0 100644 --- a/Pipfile +++ b/Pipfile @@ -45,6 +45,7 @@ openapi-core = "==0.13.2" openapi-spec-validator = "==0.2.8" packaging = "==20.9" pexpect = "==4.8.0" +protobuf = "==3.19.4" psutil = "==5.7.0" pycryptodome = ">=3.10.1" pydoc-markdown = "==4.6.3" From 6a5b8b96d62c9e905d5cc30a449520db59ecb6d3 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Mon, 4 Apr 2022 20:15:51 -0700 Subject: [PATCH 22/29] fix: pin version of protobuf in tox too --- .pylintrc | 2 +- tox.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index a82dcfeeac..1290085b42 100644 --- a/.pylintrc +++ b/.pylintrc @@ -22,7 +22,7 @@ disable=C0103,C0201,C0301,C0302,W0105,W0707,W1202,W1203,R0801 # W0212: protected-access [IMPORTS] -ignored-modules=bech32,ecdsa,lru,eth_typing,eth_keys,eth_account,ipfshttpclient,werkzeug,openapi_spec_validator,aiohttp,multidict,yoti_python_sdk,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,web3,protobuf,aioprometheus,pyaes,Crypto,asn1crypto,cosmpy,google +ignored-modules=bech32,ecdsa,lru,eth_typing,eth_keys,eth_account,ipfshttpclient,werkzeug,openapi_spec_validator,aiohttp,multidict,yoti_python_sdk,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,web3,aioprometheus,pyaes,Crypto,asn1crypto,cosmpy,google [DESIGN] min-public-methods=1 diff --git a/tox.ini b/tox.ini index cfbab6544d..f5cc5aed6f 100644 --- a/tox.ini +++ b/tox.ini @@ -254,6 +254,7 @@ deps = pylint==2.6.0 pytest==5.4.3 gitpython>=3.1.14 + protobuf==3.19.4 commands = python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-ethereum From bf425906c3ed1c8077eb0dedbf009b07c83e3c58 Mon Sep 17 00:00:00 2001 From: 8baller <8ball030@gmail.com> Date: Tue, 5 Apr 2022 19:26:33 +0100 Subject: [PATCH 23/29] test: increased time for failing test. --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index af281659df..43aa3166a3 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -257,7 +257,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.7 - uses: actions/setup-go@master From 67c067b847ad403e4289752a7daca9b6ea8c7aca Mon Sep 17 00:00:00 2001 From: 8baller <8ball030@gmail.com> Date: Tue, 5 Apr 2022 19:28:57 +0100 Subject: [PATCH 24/29] pinning go version for protolint install --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 43aa3166a3..b15791ede8 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -262,7 +262,7 @@ jobs: python-version: 3.7 - uses: actions/setup-go@master with: - go-version: "^1.14.0" + go-version: "1.17.7" - name: Install protolint (ubuntu-latest) run: | sudo apt-get update --fix-missing From da780ae385a28e8c4aa8772c5940e875d6cd3300 Mon Sep 17 00:00:00 2001 From: 8baller <8ball030@gmail.com> Date: Tue, 5 Apr 2022 19:35:06 +0100 Subject: [PATCH 25/29] final go version --- .github/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b15791ede8..fe53542459 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -53,7 +53,7 @@ jobs: python-version: 3.7 - uses: actions/setup-go@master with: - go-version: "^1.14.0" + go-version: "1.17.1" - name: Install dependencies (ubuntu-latest) run: | sudo apt-get update --fix-missing @@ -262,7 +262,7 @@ jobs: python-version: 3.7 - uses: actions/setup-go@master with: - go-version: "1.17.7" + go-version: "1.17.1" - name: Install protolint (ubuntu-latest) run: | sudo apt-get update --fix-missing From 93f1051fc6f7e3c0cda89cc9dfc03210c87d192c Mon Sep 17 00:00:00 2001 From: 8baller <8ball030@gmail.com> Date: Tue, 5 Apr 2022 19:45:39 +0100 Subject: [PATCH 26/29] final go version --- .github/workflows/workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index fe53542459..db1b82717a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -48,12 +48,12 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.7 - uses: actions/setup-go@master with: - go-version: "1.17.1" + go-version: "1.17.7" - name: Install dependencies (ubuntu-latest) run: | sudo apt-get update --fix-missing @@ -80,7 +80,7 @@ jobs: env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true with: - version: v1.28 + version: v1.28.3 working-directory: libs/go/aealite common_checks_3: From e580c0a02f9226cd53a2b1a176a3ec7958bcdc5c Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Wed, 6 Apr 2022 08:53:37 +0200 Subject: [PATCH 27/29] fix:golangci-lint --- .github/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index db1b82717a..1d5563c08a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -76,11 +76,11 @@ jobs: - name: Static type check run: tox -e mypy - name: Golang code style check (aealite) - uses: golangci/golangci-lint-action@v1 + uses: golangci/golangci-lint-action@v2 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true with: - version: v1.28.3 + version: v1.29 working-directory: libs/go/aealite common_checks_3: From 4cf16d5fe64d64fa73cf54c82264be79d573a56f Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Wed, 6 Apr 2022 09:02:45 +0200 Subject: [PATCH 28/29] fix:PR feedback --- .github/workflows/workflow.yml | 19 ++++++++++--------- docs/p2p-connection.md | 6 +++--- .../test_communication.py | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 1d5563c08a..d1c9116fdd 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-python@v3 with: python-version: 3.7 - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: go-version: "1.17.7" - name: Install dependencies (ubuntu-latest) @@ -76,11 +76,12 @@ jobs: - name: Static type check run: tox -e mypy - name: Golang code style check (aealite) - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v3 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true with: - version: v1.29 + version: v1.28 + args: --version working-directory: libs/go/aealite common_checks_3: @@ -291,7 +292,7 @@ jobs: python-version: 3.8 - uses: actions/setup-go@master with: - go-version: "^1.14.0" + go-version: "1.17.0" - name: Install dependencies (ubuntu-latest) run: | sudo apt-get update --fix-missing @@ -352,7 +353,7 @@ jobs: python-version: ${{ matrix.python_version }} - uses: actions/setup-go@master with: - go-version: "^1.14.0" + go-version: "1.17.7" - if: matrix.os == 'ubuntu-latest' name: Install dependencies (ubuntu-latest) run: | @@ -398,7 +399,7 @@ jobs: cd .. rm -rf go-ipfs ipfs init - + - if: matrix.os == 'windows-latest' name: Install dependencies (windows-latest) env: @@ -449,7 +450,7 @@ jobs: python-version: ${{ matrix.python-version }} - uses: actions/setup-go@master with: - go-version: "^1.14.0" + go-version: "1.17.7" # - if: matrix.python-version == '3.7' # name: Golang unit tests (aealite) # working-directory: ./libs/go/aealite @@ -470,7 +471,7 @@ jobs: python-version: 3.7 - uses: actions/setup-go@master with: - go-version: "^1.14.0" + go-version: "1.17.7" - name: Install dependencies (ubuntu-latest) run: | sudo apt-get update --fix-missing @@ -499,4 +500,4 @@ jobs: file: ./coverage.xml flags: unittests name: codecov-umbrella - fail_ci_if_error: false + fail_ci_if_error: false \ No newline at end of file diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md index 67239f73ed..729933bd2d 100644 --- a/docs/p2p-connection.md +++ b/docs/p2p-connection.md @@ -1,4 +1,4 @@ -The `open_aea/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. +The `valory/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses. ## Local demo @@ -77,7 +77,7 @@ aea issue-certificates Provide the AEA with the information it needs to find the genesis: ``` bash -aea config set --type dict vendor.open_aea.connections.p2p_libp2p.config \ +aea config set --type dict vendor.valory.connections.p2p_libp2p.config \ '{ "delegate_uri": "127.0.0.1:11001", "entry_peers": [, ], @@ -160,7 +160,7 @@ Next, to run the node binary in standalone mode, it requires values for the foll - `AEA_P2P_URI`: the local host and port to use by node - `AEA_P2P_URI_PUBLIC`: the URI under which the peer is publicly reachable - `AEA_P2P_DELEGATE_URI`: the URI under which the peer receives delegate connections -- `AEA_P2P_ENTRY_URIS`: an optionally supplied list of comma-separated (`,`) entry Multiaddresses for the peer to bootstrap +- `AEA_P2P_ENTRY_URIS`: an optionally supplied list of comma-separated (`,`) entry Multiaddrs for the peer to bootstrap The script allows different methods to pass these values to the node: diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py index f2d5fbdcd9..d46b8a2796 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py @@ -33,7 +33,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.protocols.default.serialization import DefaultSerializer -from packages.valory.connections.p2p_libp2p.connection import NodeClient, Uri +from packages.valory.connections.p2p_libp2p_client.connection import NodeClient, Uri from tests.common.mocks import RegexComparator from tests.common.utils import wait_for_condition From 019f22b3597202169250713f9e9f324edd905a5d Mon Sep 17 00:00:00 2001 From: "m.a.p.karrenbelt" Date: Wed, 6 Apr 2022 16:41:07 +0200 Subject: [PATCH 29/29] test:update connection and protocol path --- tests/conftest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 7528478ffd..ea5a0213d7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -301,6 +301,7 @@ PACKAGES_DIR = os.path.join(ROOT_DIR, "packages") FETCHAI_PREF = os.path.join(ROOT_DIR, "packages", "fetchai") OPEN_AEA_REF = os.path.join(ROOT_DIR, "packages", "open_aea") +VALORY_REF = os.path.join(ROOT_DIR, "packages", "valory") PROTOCOL_SPECS_PREF_1 = os.path.join(ROOT_DIR, "examples", "protocol_specification_ex") PROTOCOL_SPECS_PREF_2 = os.path.join(ROOT_DIR, "tests", "data") @@ -318,9 +319,10 @@ os.path.join(FETCHAI_PREF, "protocols", "http", PROTOCOL_YAML), os.path.join(FETCHAI_PREF, "protocols", "ledger_api", PROTOCOL_YAML), os.path.join(FETCHAI_PREF, "protocols", "oef_search", PROTOCOL_YAML), - os.path.join(OPEN_AEA_REF, "protocols", "signing", PROTOCOL_YAML), os.path.join(FETCHAI_PREF, "protocols", "state_update", PROTOCOL_YAML), os.path.join(FETCHAI_PREF, "protocols", "tac", PROTOCOL_YAML), + os.path.join(OPEN_AEA_REF, "protocols", "signing", PROTOCOL_YAML), + os.path.join(VALORY_REF, "protocols", "acn", PROTOCOL_YAML), os.path.join(CUR_PATH, "data", "dummy_protocol", PROTOCOL_YAML), ] @@ -332,8 +334,9 @@ os.path.join(FETCHAI_PREF, "connections", "ledger", CONNECTION_YAML), os.path.join(FETCHAI_PREF, "connections", "local", CONNECTION_YAML), os.path.join(FETCHAI_PREF, "connections", "stub", CONNECTION_YAML), - os.path.join(OPEN_AEA_REF, "connections", "p2p_libp2p", CONNECTION_YAML), - os.path.join(OPEN_AEA_REF, "connections", "p2p_libp2p_client", CONNECTION_YAML), + os.path.join(VALORY_REF, "connections", "p2p_libp2p", CONNECTION_YAML), + os.path.join(VALORY_REF, "connections", "p2p_libp2p_client", CONNECTION_YAML), + os.path.join(VALORY_REF, "connections", "p2p_libp2p_mailbox", CONNECTION_YAML), os.path.join(CUR_PATH, "data", "dummy_connection", CONNECTION_YAML), os.path.join(CUR_PATH, "data", "gym-connection.yaml"), ]