Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stargate #2613

Merged
merged 69 commits into from
Sep 7, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
048023a
Get balance
MissingNO57 Aug 10, 2021
e4031de
Removed unsafe functions
MissingNO57 Aug 10, 2021
8061e8c
lint fix
MissingNO57 Aug 10, 2021
d3ffd2f
Account query
MissingNO57 Aug 11, 2021
53247bf
Addresses fix
MissingNO57 Aug 11, 2021
51cff2a
Faucet fix
MissingNO57 Aug 11, 2021
fae8cd1
aea config
MissingNO57 Aug 11, 2021
f3977d6
account number and sequence fix
MissingNO57 Aug 11, 2021
6d6964a
tx generation
MissingNO57 Aug 11, 2021
a74f5b6
Txs
MissingNO57 Aug 11, 2021
34d9758
signing
MissingNO57 Aug 11, 2021
5028353
deploy init
MissingNO57 Aug 12, 2021
9d11753
Fix
MissingNO57 Aug 12, 2021
976b16c
fixes
MissingNO57 Aug 12, 2021
5f81a9d
execute
MissingNO57 Aug 12, 2021
2139320
removed unused functions
MissingNO57 Aug 12, 2021
46a2980
More fixed functions
MissingNO57 Aug 12, 2021
85e1ff2
fixes
MissingNO57 Aug 13, 2021
4aaa4b0
Some tests fixed
MissingNO57 Aug 13, 2021
d9c0fc0
FIxed tests
MissingNO57 Aug 13, 2021
529352c
Fixed tests
MissingNO57 Aug 13, 2021
e4fa462
fixed tests
MissingNO57 Aug 13, 2021
b1286b0
fixed tests
MissingNO57 Aug 13, 2021
df46224
Fixed tests
MissingNO57 Aug 13, 2021
96f00e2
Some fixes
MissingNO57 Aug 20, 2021
356b0f3
fixes
MissingNO57 Aug 20, 2021
fd5686f
tests aded
MissingNO57 Aug 20, 2021
8b54b48
arcturus
MissingNO57 Aug 20, 2021
bd4c383
Configs fixed
MissingNO57 Aug 23, 2021
77d3631
Fetchd image fix
MissingNO57 Aug 23, 2021
a4731c0
cosmpy
MissingNO57 Aug 23, 2021
cc4418e
resolved comments
MissingNO57 Aug 23, 2021
c11d0d9
Added dependencies
MissingNO57 Aug 23, 2021
9a51396
Fixes
MissingNO57 Aug 23, 2021
c8a61ae
Pipfile fix
MissingNO57 Aug 23, 2021
d311129
Checks fixes
MissingNO57 Aug 23, 2021
f560d30
Updated cosmpy to 0.1.3
MissingNO57 Aug 24, 2021
083d26d
Updated erc1155 contract to cw0.14
MissingNO57 Aug 24, 2021
6091391
Cosmpy version updated
MissingNO57 Aug 26, 2021
df2bd0a
Hashes update
MissingNO57 Aug 26, 2021
3390c8d
fixes
MissingNO57 Aug 27, 2021
6012504
more fixes
MissingNO57 Aug 27, 2021
17cc3ed
Funding fix
MissingNO57 Aug 27, 2021
0233b05
Test fixes
MissingNO57 Aug 27, 2021
36f2008
More tests fixed
MissingNO57 Aug 27, 2021
27df13e
Added get wealth timeout
MissingNO57 Aug 27, 2021
4c378e0
Improvements
MissingNO57 Aug 31, 2021
d2d49ee
get wealth moved
MissingNO57 Aug 31, 2021
3a67344
Removed rust
MissingNO57 Aug 31, 2021
d0087aa
Pipfile fix
MissingNO57 Aug 31, 2021
9d95d92
address ipfs cli command tests
5A11 Aug 31, 2021
0b508bb
Merge branch 'feature/queries' of https://github.com/fetchai/agents-a…
5A11 Aug 31, 2021
bbbf34f
fix: cleanup docs and fix docs related test
5A11 Aug 31, 2021
d062dab
cleanup: reuse get_wealth_if_needed
5A11 Aug 31, 2021
9988970
feat: update oracle contracts for cosmwasm 14
jrriehl Aug 31, 2021
89c6cbd
chore: update entrypoint lines
jrriehl Aug 31, 2021
e374c0a
chore: uncomment code
jrriehl Aug 31, 2021
6180fea
chore: generate ipfs hashes
jrriehl Aug 31, 2021
c7c46fb
pull latest develop
5A11 Sep 1, 2021
33815a4
hashes
5A11 Sep 1, 2021
c744a76
add ipfs installation to tox
5A11 Sep 1, 2021
fba58e2
Flaky test fix
MissingNO57 Sep 1, 2021
6befa3d
fix: change ports and private key
jrriehl Sep 2, 2021
411a8db
chore: update oracle contract binary
jrriehl Sep 2, 2021
fe921dd
fix: send 1 atestfet and update oracle client contract binary
jrriehl Sep 3, 2021
c8904db
chore: lint and hashes
jrriehl Sep 3, 2021
4fa28ea
Merge pull request #2609 from fetchai/fix/oracle-update
5A11 Sep 3, 2021
16d975d
fix: oracle handler test failure
5A11 Sep 3, 2021
3ded31f
Merge pull request #2593 from fetchai/feature/queries
5A11 Sep 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: cleanup docs and fix docs related test
  • Loading branch information
5A11 committed Aug 31, 2021
commit bbbf34fc6dd7070536f8ff4dd3b96676d3d03b25
8 changes: 4 additions & 4 deletions docs/car-park-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ The following steps assume you have launched the AEA Manager Desktop app.

2. Add another new AEA called `car_data_buyer` with public id `fetchai/car_data_buyer:0.31.0`.

3. Copy the address from the `car_data_buyer` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">AgentLand block explorer</a> and request some test tokens via `Get Funds`.
3. Copy the address from the `car_data_buyer` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">StargateWorld block explorer</a> and request some test tokens via `Get Funds`.

4. Run the `car_detector` AEA. Navigate to its logs and copy the multiaddress displayed.

Expand Down Expand Up @@ -172,7 +172,7 @@ aea build

#### Add keys for the car data seller AEA

First, create the private key for the car data seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the car data seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand All @@ -193,13 +193,13 @@ aea issue-certificates

The buyer needs to have some wealth to purchase the service from the seller.

First, create the private key for the car data buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the car data buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
```

Then, create some wealth for your car data buyer based on the network you want to transact with. On the Fetch.ai `AgentLand` network:
Then, create some wealth for your car data buyer based on the network you want to transact with. On the Fetch.ai `StargateWorld` network:
``` bash
aea generate-wealth fetchai
```
Expand Down
10 changes: 10 additions & 0 deletions docs/decision-maker-transaction.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ from packages.fetchai.protocols.signing.dialogues import (
)
from packages.fetchai.protocols.signing.message import SigningMessage

from tests.conftest import get_wealth_if_needed


logger = logging.getLogger("aea")
logging.basicConfig(level=logging.INFO)
Expand Down Expand Up @@ -91,6 +93,7 @@ Add a simple skill with a signing handler and the signing dialogues.
)

counterparty_wallet = Wallet({FetchAICrypto.identifier: FETCHAI_PRIVATE_KEY_FILE_2})
get_wealth_if_needed(counterparty_wallet.addresses["fetchai"])

counterparty_identity = Identity(
name="counterparty_aea",
Expand All @@ -113,6 +116,8 @@ Next, we are creating the signing message and we send it to the decision-maker.
nonce="some_nonce",
fee_by_currency_id={"FET": 0},
)
get_wealth_if_needed(terms.sender_address)

signing_dialogues = cast(SigningDialogues, skill_context.signing_dialogues)
stub_transaction = LedgerApis.get_transfer_transaction(
terms.ledger_id,
Expand Down Expand Up @@ -319,6 +324,8 @@ from packages.fetchai.protocols.signing.dialogues import (
)
from packages.fetchai.protocols.signing.message import SigningMessage

from tests.conftest import get_wealth_if_needed


logger = logging.getLogger("aea")
logging.basicConfig(level=logging.INFO)
Expand Down Expand Up @@ -372,6 +379,7 @@ def run():
)

counterparty_wallet = Wallet({FetchAICrypto.identifier: FETCHAI_PRIVATE_KEY_FILE_2})
get_wealth_if_needed(counterparty_wallet.addresses["fetchai"])

counterparty_identity = Identity(
name="counterparty_aea",
Expand All @@ -389,6 +397,8 @@ def run():
nonce="some_nonce",
fee_by_currency_id={"FET": 0},
)
get_wealth_if_needed(terms.sender_address)

signing_dialogues = cast(SigningDialogues, skill_context.signing_dialogues)
stub_transaction = LedgerApis.get_transfer_transaction(
terms.ledger_id,
Expand Down
2 changes: 1 addition & 1 deletion docs/generic-skills-step-by-step.md
Original file line number Diff line number Diff line change
Expand Up @@ -3232,7 +3232,7 @@ Then run the buyer AEA:
aea run
```

You will see that the AEAs negotiate and then transact using the Agentland testnet.
You will see that the AEAs negotiate and then transact using the StargateWorld testnet.

## Delete the AEAs

Expand Down
6 changes: 3 additions & 3 deletions docs/generic-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ aea build

### Add keys for the seller AEA

Create the private key for the seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
Create the private key for the seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand All @@ -154,13 +154,13 @@ aea issue-certificates

The buyer needs to have some wealth to purchase the data from the seller.

First, create the private key for the buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
```

Then, create some wealth for your buyer based on the network you want to transact with. On the Fetch.ai `AgentLand` network:
Then, create some wealth for your buyer based on the network you want to transact with. On the Fetch.ai `StargateWorld` network:
``` bash
aea generate-wealth fetchai
```
Expand Down
4 changes: 2 additions & 2 deletions docs/ledger-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ The framework wraps all `LedgerApi` classes and exposes them in the <a href="../

The separation between the `Crypto` and `LedgerApi` is fundamental to the framework design. In particular, the object which holds the private key is separated from the object which interacts with the ledger. This design pattern is repeated throughout the framework: the decision maker is the only entity with access to the AEA's `Wallet` whilst `LedgerApis` are accessible by all skills.

## Agent Land - Fetch.ai testnet for agents
## Stargate World - Fetch.ai testnet for agents

Agent Land is our stable, public testnet for the Fetch Ledger v2. As such, most developers will be interacting with this testnet. This is specifically designed and supported for AEA development.
Stargate World is our stable, public testnet for the Fetch Ledger v2. As such, most developers will be interacting with this testnet. This is specifically designed and supported for AEA development.


| Parameter | Value |
Expand Down
8 changes: 4 additions & 4 deletions docs/ml-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The following steps assume you have launched the AEA Manager Desktop app.

2. Add another new AEA called `ml_model_trainer` with public id `fetchai/ml_model_trainer:0.29.0`.

3. Copy the address from the `ml_model_trainer` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">AgentLand block explorer</a> and request some test tokens via `Get Funds`.
3. Copy the address from the `ml_model_trainer` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">StargateWorld block explorer</a> and request some test tokens via `Get Funds`.

4. Run the `ml_data_provider` AEA. Navigate to its logs and copy the multiaddress displayed.

Expand Down Expand Up @@ -179,7 +179,7 @@ aea build

#### Add keys for the data provider AEA

First, create the private key for the data provider AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the data provider AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand All @@ -200,13 +200,13 @@ aea issue-certificates

The model trainer needs to have some wealth to purchase the data from the data provider.

First, create the private key for the model trainer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the model trainer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
```

Then, create some wealth for your model trainer based on the network you want to transact with. On the Fetch.ai `AgentLand` network:
Then, create some wealth for your model trainer based on the network you want to transact with. On the Fetch.ai `StargateWorld` network:
``` bash
aea generate-wealth fetchai
```
Expand Down
4 changes: 2 additions & 2 deletions docs/orm-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ aea build

### Add keys for the seller AEA

First, create the private key for the seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand All @@ -162,7 +162,7 @@ aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
```

Then, create some wealth for the buyer based on the network you want to transact with. On the Fetch.ai `AgentLand` network:
Then, create some wealth for the buyer based on the network you want to transact with. On the Fetch.ai `StargateWorld` network:
``` bash
aea generate-wealth fetchai
```
Expand Down
4 changes: 2 additions & 2 deletions docs/skill-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ aea fetch fetchai/simple_service_registration:0.30.0 && cd simple_service_regist

This AEA will simply register a location service on the <a href="../simple-oef">SOEF search node</a> so we can search for it.

We first create the private key for the service provider AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
We first create the private key for the service provider AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand Down Expand Up @@ -1072,7 +1072,7 @@ is_abstract: false

## Step 9: Run the Search AEA

First, create the private key for the search AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the search AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand Down
2 changes: 1 addition & 1 deletion docs/tac-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ aea build

### Add keys for all AEAs

Create the private key for the AEA for Fetch.ai `AgentLand`:
Create the private key for the AEA for Fetch.ai `StargateWorld`:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand Down
4 changes: 2 additions & 2 deletions docs/thermometer-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ The following steps assume you have launched the AEA Manager Desktop app.

2. Add another new AEA called `my_thermometer_client` with public id `fetchai/thermometer_client:0.29.0`.

3. Copy the address from the `my_thermometer_client` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">AgentLand block explorer</a> and request some test tokens via `Get Funds`.
3. Copy the address from the `my_thermometer_client` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">StargateWorld block explorer</a> and request some test tokens via `Get Funds`.

4. Run the `my_thermometer_aea` AEA. Navigate to its logs and copy the multiaddress displayed.

Expand Down Expand Up @@ -163,7 +163,7 @@ aea config set --type dict agent.default_routing \

#### Add keys for the thermometer AEA

First, create the private key for the thermometer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the thermometer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand Down
8 changes: 4 additions & 4 deletions docs/weather-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ The following steps assume you have launched the AEA Manager Desktop app.

2. Add another new AEA called `my_weather_client` with public id `fetchai/weather_client:0.31.0`.

3. Copy the address from the `my_weather_client` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">AgentLand block explorer</a> and request some test tokens via `Get Funds`.
3. Copy the address from the `my_weather_client` into your clip board. Then go to the <a href="https://explore-stargateworld.fetch.ai" target="_blank">StargateWorld block explorer</a> and request some test tokens via `Get Funds`.

4. Run the `my_weather_station` AEA. Navigate to its logs and copy the multiaddress displayed.

Expand Down Expand Up @@ -178,7 +178,7 @@ aea build

#### Add keys for the weather station AEA

First, create the private key for the weather station AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the weather station AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
Expand All @@ -199,13 +199,13 @@ aea issue-certificates

The weather client needs to have some wealth to purchase the service from the weather station.

First, create the private key for the weather client AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `AgentLand` use:
First, create the private key for the weather client AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use:
``` bash
aea generate-key fetchai
aea add-key fetchai fetchai_private_key.txt
```

Then, create some wealth for your weather client based on the network you want to transact with. On the Fetch.ai `AgentLand` network:
Then, create some wealth for your weather client based on the network you want to transact with. On the Fetch.ai `StargateWorld` network:
``` bash
aea generate-wealth fetchai
```
Expand Down