Stargate

packages/fetchai/skills/simple_oracle/handlers.py

@@ -175,7 +175,7 @@ def _request_init_transaction(self, ledger_id: str, tx_receipt: JSONLike) -> Non
                         "label": "OracleContract",
                         "init_msg": {"fee": str(strategy.initial_fee_deploy)},
                         "gas": strategy.default_gas_deploy,
-                        "amount": 0,
+                        "amount": 1,
                         "code_id": code_id,
                         "deployer_address": self.context.agent_address,
                     }

packages/fetchai/skills/simple_oracle/skill.yaml

@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmcaiWWqt2VYwRtXPLmFCHshyHnow3sNeRCa5UmvutUKXp
   behaviours.py: QmRQT3Qjx78DXh2QAFkr3ehRk82mvD1a7hdXdx9PmLAEBq
   dialogues.py: QmRdwAgCaR6ju5Tk8SW2AzT62JHDMzyA27DEr7a5F7i64Q
-  handlers.py: QmdXwwBjnndpb35KR3KmXajsoHffaJ7az7QLvgAjNqxLn9
+  handlers.py: QmaGUDZCqGePMwBoqPT2jz3va3gYoJr3AdL1mnGs25mZ64
   strategy.py: QmXGBw4BatnPMxBRhFnG5K3NRQuhq5ZzpZxtAciCfC8dXa
 fingerprint_ignore_patterns: []
 contracts:

packages/hashes.csv

@@ -55,8 +55,8 @@ fetchai/connections/webhook,QmUrHTvYbpQ6dLSVBD3giS7h9DQNHYXJt4DoToA5VRpWYb
 fetchai/connections/yoti,QmNoE34qJe2qP5skBBqZpLcJ8nsJrrfSD9T29uguQnbUrF
 fetchai/contracts/erc1155,Qma32tAZxQEzNKosYq3LLQ6qUTHxhzv7BY7NLfRiJQ1LBJ
 fetchai/contracts/fet_erc20,QmZbeGvYWGr2J38CK8JS4hcriz3teYVhT1KRBRJ2S9qRfZ
-fetchai/contracts/oracle,QmTYM5KBLvAXeELUX68DM43TgbRToRszx7nTDVPeLJh4mC
-fetchai/contracts/oracle_client,QmW6zUrR2Ec1ZM57ZBTdekwJddPcd4S66hEz24i7GNT2TD
+fetchai/contracts/oracle,QmS1nFvLETGHDsoGT7NaT1ST9BzjwsK46uLkKoFuh3z17p
+fetchai/contracts/oracle_client,QmSqVhEsrn3Pu4btWuZJvHbAG71dsY62gu4gknCb4ACKQ3
 fetchai/contracts/scaffold,QmVpHToPRYPjBbjQd3fArdb1SWHqiQAvDnLickULehsNRL
 fetchai/contracts/staking_erc20,QmVJZpvNmgVYWmD11Br8uytKVvYNSm6zHyrHdBNvK5Ag7s
 fetchai/protocols/acn,QmNw5HKLVizqouTiTRAzT9htFGKjJHKH6Q4QRaJXHfyMA1
@@ -102,7 +102,7 @@ fetchai/skills/scaffold,QmUiNp6kSteawmGixMPDCxcEZmkpnAdw3osKSvu9xFR4VG
 fetchai/skills/simple_aggregation,QmWewBQBbCX2zwKPztnz3Epqj6NJ53TjdtKogfqoRT1AxY
 fetchai/skills/simple_buyer,QmPAVhTzgUwvMBYZvxKbHpKs7chKv6BUEaWSMCTLVAD8ia
 fetchai/skills/simple_data_request,QmR98BHVMmCT8edCtQrhYaKFiGezY4zWUS6pEFtARJdSCQ
-fetchai/skills/simple_oracle,QmaRQPkSuxKxPbt3HtkPjVWW4MZXZ9KgQ5mYhcYvbbHvHD
+fetchai/skills/simple_oracle,QmVsTiieuvm7KvWVVFrUykytCtVUCnRUebrsV3cGqWbGQJ
 fetchai/skills/simple_oracle_client,QmRGdTzujN65r3n8DpHEFNLpLQEB9DRQR4jjXWmNnyCQqG
 fetchai/skills/simple_seller,QmUtp19VvwMdsPwun7Ryzh1jvTKNXBBrhLQNa4cGHAZzAu
 fetchai/skills/simple_service_registration,QmSrpzpJyRGc9gwtSu1ije6V4KmjheujfWt1Y19Am1mNRo

tests/common/docker_image.py

@@ -424,6 +424,8 @@ def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool:
 class FetchLedgerDockerImage(DockerImage):
     """Wrapper to Fetch ledger Docker image."""
 
+    PORTS = {1317: 1317, 26657: 26657}
+
     def __init__(
         self,
         client: DockerClient,
@@ -453,20 +455,29 @@ def tag(self) -> str:
 
     def _make_entrypoint_file(self, tmpdirname) -> None:
         """Make a temporary entrypoint file to setup and run the test ledger node"""
-        run_node_lines = [
+        run_node_lines = (
             "#!/usr/bin/env bash",
-            "set -e",
-            f'fetchd init {self._config["moniker"]} --chain-id {self._config["chain_id"]}',
+            # variables
+            f'export VALIDATOR_KEY_NAME={self._config["genesis_account"]}',
+            f'export VALIDATOR_MNEMONIC="{self._config["mnemonic"]}"',
+            'export PASSWORD="12345678"',
+            f'export CHAIN_ID={self._config["chain_id"]}',
+            f'export MONIKER={self._config["moniker"]}',
+            f'export DENOM={self._config["denom"]}',
+            # Add key
+            '( echo "$VALIDATOR_MNEMONIC"; echo "$PASSWORD"; echo "$PASSWORD"; ) |fetchd keys add $VALIDATOR_KEY_NAME --recover',
+            # Configure node
+            "fetchd init --chain-id=$CHAIN_ID $MONIKER",
+            'echo "$PASSWORD" |fetchd add-genesis-account $(fetchd keys show $VALIDATOR_KEY_NAME -a) 100000000000000000000000$DENOM',
+            'echo "$PASSWORD" |fetchd gentx $VALIDATOR_KEY_NAME 10000000000000000000000$DENOM --chain-id $CHAIN_ID',
+            "fetchd collect-gentxs",
+            # Enable rest-api
             'sed -i "s/stake/atestfet/" ~/.fetchd/config/genesis.json',
             'sed -i "s/enable = false/enable = true/" ~/.fetchd/config/app.toml',
-            f'MNEMONIC="{self._config["mnemonic"]}"',
-            "fetchd config keyring-backend test",
-            f'echo $MNEMONIC | fetchd keys add {self._config["genesis_account"]} --recover',
-            f'fetchd add-genesis-account $(fetchd keys show {self._config["genesis_account"]} -a) 1152997575000000000000000000{self._config["denom"]}',
-            f'fetchd gentx --amount 100000000000000000000{self._config["denom"]} --name {self._config["genesis_account"]} --keyring-backend test --chain-id {self._config["chain_id"]}',
-            "fetchd collect-gentxs",
-            f"fetchd start --rpc.laddr tcp://0.0.0.0:{self._port}",
-        ]
+            'sed -i "s/swagger = false/swagger = true/" ~/.fetchd/config/app.toml',
+            "fetchd start",
+        )
+
         entrypoint_file = os.path.join(tmpdirname, "run-node.sh")
         with open(entrypoint_file, "w") as file:
             file.writelines(line + "\n" for line in run_node_lines)
@@ -485,15 +496,16 @@ def create(self) -> Container:
                 network="host",
                 volumes=volumes,
                 entrypoint=str(entrypoint),
+                ports=self.PORTS,
             )
         return container
 
     def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool:
         """Wait until the image is up."""
-        request = dict(jsonrpc=2.0, method="web3_clientVersion", params=[], id=1)
         for i in range(max_attempts):
             try:
-                response = requests.post(f"{self._addr}:{self._port}", json=request)
+                url = f"{self._addr}:{self._port}/net_info?"
+                response = requests.get(url)
                 enforce(response.status_code == 200, "")
                 return True
             except Exception:

tests/conftest.py

@@ -162,7 +162,7 @@
 # URL to local Fetch ledger instance
 DEFAULT_FETCH_DOCKER_IMAGE_TAG = "fetchai/fetchd:0.8.4"
 DEFAULT_FETCH_LEDGER_ADDR = "http://127.0.0.1"
-DEFAULT_FETCH_LEDGER_RPC_PORT = 9090
+DEFAULT_FETCH_LEDGER_RPC_PORT = 26657
 DEFAULT_FETCH_LEDGER_REST_PORT = 1317
 DEFAULT_FETCH_ADDR_REMOTE = "https://rest-stargateworld.fetch.ai:443"
 DEFAULT_FETCH_MNEMONIC = "gap bomb bulk border original scare assault pelican resemble found laptop skin gesture height inflict clinic reject giggle hurdle bubble soldier hurt moon hint"
@@ -214,7 +214,7 @@
     "b6ef49c3078f300efe2d4480e179362bd39f20cbb2087e970c8f345473661aa5"
 )
 FUNDED_FETCHAI_PRIVATE_KEY_1 = (
-    "f848e125edb124d7752338fdd15825cd031b8c7f38627ec50ccccb7d75ecffdb"
+    "bbaef7511f275dc15f47436d14d6d3c92d4d01befea073d23d0c2750a46f6cb3"
 )
 FUNDED_FETCHAI_PRIVATE_KEY_2 = (
     "9d6459d1f93dd153335291af940f6b5224a34a9a1e1062e2158a45fa4901ed3f"
@@ -227,7 +227,7 @@
 ETHEREUM_ADDRESS_TWO = "0x7A1236d5195e31f1F573AD618b2b6FEFC85C5Ce6"
 FETCHAI_ADDRESS_ONE = "fetch1paqxtqnfh7da7z9c05l3y3lahe8rhd0nm0jk98"
 FETCHAI_ADDRESS_TWO = "fetch19j4dc3e6fgle98pj06l5ehhj6zdejcddx7teac"
-FUNDED_FETCHAI_ADDRESS_ONE = "fetch1dm72s3yravky6t7rp3daajwwsz2vrqd86g2v47"
+FUNDED_FETCHAI_ADDRESS_ONE = "fetch1k9dns2fd74644g0q9mfpsmfeqg0h2ym2cm6wdh"
 FUNDED_FETCHAI_ADDRESS_TWO = "fetch1x2vfp8ec2yk8nnlzn52agflpmpwtucm6yj2hw4"
 
 # P2P addresses
@@ -1424,11 +1424,11 @@ def fund_accounts_from_local_validator(
     )
     pk = PrivateKey(bytes.fromhex(FUNDED_FETCHAI_PRIVATE_KEY_1))
 
+    time.sleep(FETCHD_INITIAL_TX_SLEEP)
     client = SigningCosmWasmClient(pk, rest_client, DEFAULT_FETCH_CHAIN_ID)
     coins = [Coin(amount=str(amount), denom=denom)]
 
     for address in addresses:
-        time.sleep(FETCHD_INITIAL_TX_SLEEP)
         client.send_tokens(CosmpyAddress(address), coins)
 
 

tests/test_packages/test_skills_integration/test_simple_oracle.py

@@ -156,6 +156,10 @@ def test_oracle(
             f"{DEFAULT_FETCH_LEDGER_ADDR}:{DEFAULT_FETCH_LEDGER_REST_PORT}",
         )
 
+        # use alternate port for prometheus connection
+        setting_path = "vendor.fetchai.connections.prometheus.config.port"
+        self.set_config(setting_path, 9091, type_="int")
+
         setting_path = "vendor.fetchai.skills.simple_oracle.models.strategy.args.contract_address_file"
         self.set_config(setting_path, ORACLE_CONTRACT_ADDRESS_FILE)