Merge pull request #544 from singnet/development

v3.0.0 release

Author: kiruxaspb

.gitignore

@@ -5,8 +5,8 @@ venv/
 .idea/
 __pycache__
 blockchain/node_modules
-snet.egg-info/
-snet.cli.egg-info/
+snet_egg-info/
+snet_cli.egg-info/
 snet/cli/resources/node_modules
 snet/cli/resources/proto/*.py
 build/

MANIFEST.in

@@ -1,4 +1,4 @@
-include snet/cli/resources/*
+recursive-include snet/cli/resources *
 
 recursive-exclude * .git
 recursive-exclude * node_modules

README.md

@@ -122,18 +122,25 @@ Backward compatibility for other Python versions is not guaranteed.
 
 ---
 
-* Clone the git repository  
+## Install the package in development mode
+
+### Clone the git repository  
+
 ```bash  
-$ git clone https://github.com/singnet/snet-cli.git
-$ cd snet-cli/packages/snet_cli
+git clone https://github.com/singnet/snet-cli.git
+cd snet-cli
 ```
 
-* 
-  
-* Install the package in development/editable mode  
+```bash  
+pip install -r requirements.txt
+```
+
+```bash  
+pip3 install .
+```
 
 ```bash  
-$ pip3 install -e .
+snet -h
 ```
 
 ### Building the Documentation in Markdown files

requirements.txt

@@ -18,6 +18,6 @@ jsonschema==4.0.0
 eth-account==0.9.0
 trezor==0.13.8
 ledgerblue==0.1.48
-snet-contracts==0.2.1
+snet-contracts==1.0.0
 lighthouseweb3==0.1.4
-cryptography==43.0.3
+cryptography==44.0.1

setup.py

@@ -67,7 +67,7 @@ def run(self):
     },
     entry_points={
         'console_scripts': [
-            'snet = snet.cli:main',
+            'snet = snet.cli:main'
         ],
     }
 )

snet/cli/arguments.py

@@ -14,7 +14,7 @@
 from snet.cli.commands.sdk_command import SDKCommand
 from snet.cli.config import Config, get_session_keys, get_session_network_keys_removable
 from snet.cli.identity import get_identity_types
-from snet.cli.utils.agix2cogs import stragix2cogs
+from snet.cli.utils.token2cogs import strtoken2cogs
 from snet.cli.utils.utils import type_converter
 
 
@@ -62,7 +62,7 @@ def add_root_options(parser, config):
         title="snet commands", metavar="COMMAND")
     subparsers.required = True
 
-    p = subparsers.add_parser("account", help="AGIX account")
+    p = subparsers.add_parser("account", help="ASI(FET) account")
     add_mpe_account_options(p)
 
     p = subparsers.add_parser("channel", help="Interact with SingularityNET payment channels")
@@ -236,7 +236,7 @@ def add_contract_options(parser):
 
     contracts = get_all_abi_contract_files()
     for path in contracts:
-        if "MultiPartyEscrow" in str(path) or "Registry" in str(path) or "SingularityNetToken" in str(path):
+        if "MultiPartyEscrow" in str(path) or "Registry" in str(path) or "FetchToken" in str(path):
             contract_name = re.search(
                 r"([^.]*)\.json", os.path.basename(path)).group(1)
             contract_p = subparsers.add_parser(
@@ -584,32 +584,32 @@ def add_p_snt_address_opt(p):
     p.set_defaults(fn="print_account")
     add_eth_call_arguments(p)
 
-    p = subparsers.add_parser("balance", help="Print balance of AGIX tokens and balance of MPE wallet")
-    p.set_defaults(fn="print_agix_and_mpe_balances")
+    p = subparsers.add_parser("balance", help="Print balance of ASI(FET) tokens and balance of MPE wallet")
+    p.set_defaults(fn="print_token_and_mpe_balances")
     p.add_argument("--account", default=None, help="Account to print balance for (default is the current identity)")
     add_p_snt_address_opt(p)
     add_p_mpe_address_opt(p)
     add_eth_call_arguments(p)
 
-    p = subparsers.add_parser("deposit", help="Deposit AGIX tokens to MPE wallet")
+    p = subparsers.add_parser("deposit", help="Deposit ASI(FET) tokens to MPE wallet")
     p.set_defaults(fn="deposit_to_mpe")
-    p.add_argument("amount", type=stragix2cogs, help="Amount of AGIX tokens to deposit in MPE wallet", metavar="AMOUNT")
+    p.add_argument("amount", type=strtoken2cogs, help="Amount of ASI(FET) tokens to deposit in MPE wallet", metavar="AMOUNT")
     add_p_snt_address_opt(p)
     add_p_mpe_address_opt(p)
     add_transaction_arguments(p)
 
-    p = subparsers.add_parser("withdraw", help="Withdraw AGIX tokens from MPE wallet")
+    p = subparsers.add_parser("withdraw", help="Withdraw ASI(FET) tokens from MPE wallet")
     p.set_defaults(fn="withdraw_from_mpe")
-    p.add_argument("amount", type=stragix2cogs, help="Amount of AGIX tokens to withdraw from MPE wallet", metavar="AMOUNT")
+    p.add_argument("amount", type=strtoken2cogs, help="Amount of ASI(FET) tokens to withdraw from MPE wallet", metavar="AMOUNT")
     add_p_mpe_address_opt(p)
     add_transaction_arguments(p)
 
-    p = subparsers.add_parser("transfer", help="Transfer AGIX tokens inside MPE wallet")
+    p = subparsers.add_parser("transfer", help="Transfer ASI(FET) tokens inside MPE wallet")
     p.set_defaults(fn="transfer_in_mpe")
     p.add_argument("receiver", help="Address of the receiver", metavar="RECEIVER")
     p.add_argument("amount",
-                   type=stragix2cogs,
-                   help="Amount of AGIX tokens to be transferred to another account inside MPE wallet",
+                   type=strtoken2cogs,
+                   help="Amount of ASI(FET) tokens to be transferred to another account inside MPE wallet",
                    metavar="AMOUNT")
     add_p_mpe_address_opt(p)
     add_transaction_arguments(p)
@@ -664,8 +664,8 @@ def add_p_open_channel_basic(p):
     add_group_name(p)
 
     p.add_argument("amount",
-                   type=stragix2cogs,
-                   help="Amount of AGIX tokens to put in the new channel",
+                   type=strtoken2cogs,
+                   help="Amount of ASI(FET) tokens to put in the new channel",
                    metavar="AMOUNT")
     # p.add_argument("group_name",
     #                default=None,
@@ -709,8 +709,8 @@ def add_p_set_for_extend_add(_p):
             title="Expiration and amount")
         add_p_expiration(expiration_amount_g, is_optional=True)
         expiration_amount_g.add_argument("--amount",
-                                         type=stragix2cogs,
-                                         help="Amount of AGIX tokens to add to the channel")
+                                         type=strtoken2cogs,
+                                         help="Amount of ASI(FET) tokens to add to the channel")
         add_p_mpe_address_opt(p)
         add_transaction_arguments(p)
 
@@ -920,8 +920,8 @@ def add_mpe_service_options(parser):
                    nargs='*',
                    help="Endpoints for the first group")
     p.add_argument("--fixed-price",
-                   type=stragix2cogs,
-                   help="Set fixed price in AGIX token for all methods")
+                   type=strtoken2cogs,
+                   help="Set fixed price in ASI(FET) token for all methods")
 
     p.add_argument("--encoding",
                    default="proto",
@@ -950,8 +950,8 @@ def add_mpe_service_options(parser):
     p.add_argument("group_name",
                    help="group name for fixed price method")
     p.add_argument("price",
-                   type=stragix2cogs,
-                   help="Set fixed price in AGIX token for all methods",
+                   type=strtoken2cogs,
+                   help="Set fixed price in ASI(FET) token for all methods",
                    metavar="PRICE")
     add_p_metadata_file_opt(p)
 
@@ -970,8 +970,8 @@ def add_mpe_service_options(parser):
                    )
 
     p.add_argument("price",
-                   type=stragix2cogs,
-                   help="Set fixed price in AGIX token for all methods",
+                   type=strtoken2cogs,
+                   help="Set fixed price in ASI(FET) token for all methods",
                    metavar="PRICE")
     add_p_metadata_file_opt(p)
 

snet/cli/commands/commands.py

@@ -166,8 +166,8 @@ def get_identity(self):
             return RpcIdentityProvider(self.w3, self.get_wallet_index())
         if identity_type == "mnemonic":
             return MnemonicIdentityProvider(self.w3, self.config.get_session_field("mnemonic"), self.get_wallet_index())
-        if identity_type == "trezor":
-            return TrezorIdentityProvider(self.w3, self.get_wallet_index())
+        # if identity_type == "trezor":
+        #     return TrezorIdentityProvider(self.w3, self.get_wallet_index())
         if identity_type == "ledger":
             return LedgerIdentityProvider(self.w3, self.get_wallet_index())
         if identity_type == "key":
@@ -358,8 +358,8 @@ def populate_contract_address(self, rez, key):
                 w3=self.w3, contract_name="Registry")
             rez[key]['default_multipartyescrow_at'] = read_default_contract_address(
                 w3=self.w3, contract_name="MultiPartyEscrow")
-            rez[key]['default_singularitynettoken_at'] = read_default_contract_address(
-                w3=self.w3, contract_name="SingularityNetToken")
+            rez[key]['default_fetchtoken_at'] = read_default_contract_address(
+                w3=self.w3, contract_name="FetchToken")
         except Exception as e:
             pass
         return

snet/cli/commands/mpe_account.py

@@ -1,5 +1,5 @@
 from snet.cli.commands.commands import BlockchainCommand
-from snet.cli.utils.agix2cogs import cogs2stragix
+from snet.cli.utils.token2cogs import cogs2strtoken
 
 
 class MPEAccountCommand(BlockchainCommand):
@@ -8,31 +8,31 @@ def print_account(self):
         self.check_ident()
         self._printout(self.ident.address)
 
-    def print_agix_and_mpe_balances(self):
-        """ Print balance of ETH, AGIX, and MPE wallet """
+    def print_token_and_mpe_balances(self):
+        """ Print balance of ETH, ASI(FET), and MPE wallet """
         self.check_ident()
         if self.args.account:
             account = self.args.account
         else:
             account = self.ident.address
         eth_wei = self.w3.eth.get_balance(account)
-        agix_cogs = self.call_contract_command("SingularityNetToken", "balanceOf", [account])
+        token_cogs = self.call_contract_command("FetchToken", "balanceOf", [account])
         mpe_cogs = self.call_contract_command("MultiPartyEscrow", "balances", [account])
 
         # we cannot use _pprint here because it doesn't conserve order yet
         self._printout("    account: %s"%account)
         self._printout("    ETH: %s"%self.w3.from_wei(eth_wei, 'ether'))
-        self._printout("    AGIX: %s"%cogs2stragix(agix_cogs))
-        self._printout("    MPE: %s"%cogs2stragix(mpe_cogs))
+        self._printout("    ASI(FET): %s"%cogs2strtoken(token_cogs))
+        self._printout("    MPE: %s"%cogs2strtoken(mpe_cogs))
 
     def deposit_to_mpe(self):
         self.check_ident()
         amount = self.args.amount
         mpe_address = self.get_mpe_address()
 
-        already_approved = self.call_contract_command("SingularityNetToken", "allowance", [self.ident.address, mpe_address])
+        already_approved = self.call_contract_command("FetchToken", "allowance", [self.ident.address, mpe_address])
         if already_approved < amount:
-            self.transact_contract_command("SingularityNetToken", "approve", [mpe_address, amount])
+            self.transact_contract_command("FetchToken", "approve", [mpe_address, amount])
         self.transact_contract_command("MultiPartyEscrow", "deposit", [amount])
 
     def withdraw_from_mpe(self):

snet/cli/commands/mpe_channel.py

@@ -14,10 +14,11 @@
 from snet.cli.commands.commands import OrganizationCommand
 from snet.cli.metadata.service import mpe_service_metadata_from_json, load_mpe_service_metadata
 from snet.cli.metadata.organization import OrganizationMetadata
-from snet.cli.utils.agix2cogs import cogs2stragix
+from snet.cli.utils.token2cogs import cogs2strtoken
 from snet.cli.utils.ipfs_utils import get_from_ipfs_and_checkhash
 from snet.cli.utils.utils import abi_decode_struct_to_dict, abi_get_element_by_name, \
-    compile_proto, type_converter, bytesuri_to_hash, get_file_from_filecoin, download_and_safe_extract_proto
+    compile_proto, type_converter, bytesuri_to_hash, get_file_from_filecoin, download_and_safe_extract_proto, \
+    check_training_in_proto
 
 
 # we inherit MPEServiceCommand because we need _get_service_metadata_from_registry
@@ -37,7 +38,7 @@ def _get_channels_cache_file(self):
 
     def _update_channels_cache(self):
         channels = []
-        last_read_block = get_contract_deployment_block(self.ident.w3, "MultiPartyEscrow")
+        last_read_block = get_contract_deployment_block(self.ident.w3, "MultiPartyEscrow") - 1
         channels_file = self._get_channels_cache_file()
 
         if not channels_file.exists():
@@ -58,7 +59,7 @@ def _update_channels_cache(self):
         current_block_number = self.ident.w3.eth.block_number
 
         if last_read_block < current_block_number:
-            new_channels = self._get_all_opened_channels_from_blockchain(last_read_block, current_block_number)
+            new_channels = self._get_all_opened_channels_from_blockchain(last_read_block + 1, current_block_number)
             channels = channels + new_channels
             last_read_block = current_block_number
 
@@ -286,7 +287,7 @@ def _open_channel_for_org(self, metadata):
             "MultiPartyEscrow",    "balances",  [self.ident.address])
         if mpe_cogs < self.args.amount:
             raise Exception(
-                "insufficient funds. You MPE balance is %s AGIX " % cogs2stragix(mpe_cogs))
+                "insufficient funds. You MPE balance is %s ASI(FET) " % cogs2strtoken(mpe_cogs))
 
         group_id = base64.b64decode(metadata.get_group_id_by_group_name(self.args.group_name))
         if not group_id:
@@ -496,7 +497,7 @@ def _print_channels(self, channels, filters: list[str] = None):
         for channel_id in channels_ids:
             channel = self._get_channel_state_from_blockchain(channel_id)
             channel["channel_id"] = channel_id
-            channel["value"] = cogs2stragix(channel["value"])
+            channel["value"] = cogs2strtoken(channel["value"])
             channel["group_id"] = base64.b64encode(channel["groupId"]).decode("ascii")
             self._printout(self._convert_channel_dict_to_str(channel, filters))
 
@@ -602,9 +603,10 @@ def _init_or_update_service_if_needed(self, metadata, service_registration):
             os.makedirs(spec_dir, mode=0o700)
             service_api_source = metadata.get("service_api_source") or metadata.get("model_ipfs_hash")
             download_and_safe_extract_proto(service_api_source, spec_dir, self._get_ipfs_client())
+            training_added = check_training_in_proto(spec_dir)
 
             # compile .proto files
-            if not compile_proto(Path(spec_dir), service_dir):
+            if not compile_proto(Path(spec_dir), service_dir, add_training = training_added):
                 raise Exception("Fail to compile %s/*.proto" % spec_dir)
 
             # save service_metadata.json in channel_dir

snet/cli/commands/mpe_client.py

@@ -6,7 +6,7 @@
 from eth_account.messages import encode_defunct
 
 from snet.cli.commands.mpe_channel import MPEChannelCommand
-from snet.cli.utils.agix2cogs import cogs2stragix
+from snet.cli.utils.token2cogs import cogs2strtoken
 from snet.cli.utils.proto_utils import import_protobuf_from_dir, switch_to_json_payload_encoding
 from snet.cli.utils.utils import open_grpc_channel, rgetattr, RESOURCES_PATH
 
@@ -303,7 +303,7 @@ def call_server_statelessly_with_params(self, params, group_name):
         server_state = self._get_channel_state_from_server(grpc_channel, channel_id)
 
         proceed = self.args.yes or input(
-            "Price for this call will be %s AGIX (use -y to remove this warning). Proceed? (y/n): " % (cogs2stragix(price))) == "y"
+            "Price for this call will be %s ASI(FET) (use -y to remove this warning). Proceed? (y/n): " % (cogs2strtoken(price))) == "y"
         if not proceed:
             self._error("Cancelled")