Merge pull request #524 from multiversx/merge-main-in-feat-05-06

Merge main in feat/next

Author: popenta

CLI.md

@@ -60,7 +60,7 @@ usage: mxpy contract COMMAND [-h] ...
 Deploy, upgrade and interact with Smart Contracts
 
 COMMANDS:
-  {deploy,call,upgrade,query,verify,reproducible-build,build}
+  {deploy,call,upgrade,query,verify,unverify,reproducible-build,build}
 
 OPTIONS:
   -h, --help            show this help message and exit
@@ -73,6 +73,7 @@ call                           Interact with a Smart Contract (execute function)
 upgrade                        Upgrade a previously-deployed Smart Contract.
 query                          Query a Smart Contract (call a pure function)
 verify                         Verify the authenticity of the code of a deployed Smart Contract
+unverify                       Unverify a previously verified Smart Contract
 reproducible-build             Build a Smart Contract and get the same output as a previously built Smart Contract
 build                          Build a Smart Contract project. This command is DISABLED.
 

multiversx_sdk_cli/cli_contracts.py

@@ -1,12 +1,15 @@
+import hashlib
 import json
 import logging
 import os
 from pathlib import Path
 from typing import Any
 
+import requests
 from multiversx_sdk import (
     Address,
     AddressComputer,
+    Message,
     ProxyNetworkProvider,
     Transaction,
     TransactionsFactoryConfig,
@@ -147,8 +150,37 @@ def setup_parser(args: list[str], subparsers: Any) -> Any:
         help="in case of a multicontract, specify the contract variant you want to verify",
     )
     cli_shared.add_wallet_args(args, sub)
+    sub.add_argument(
+        "--skip-confirmation",
+        "-y",
+        dest="skip_confirmation",
+        action="store_true",
+        default=False,
+        help="can be used to skip the confirmation prompt",
+    )
     sub.set_defaults(func=verify)
 
+    sub = cli_shared.add_command_subparser(
+        subparsers,
+        "contract",
+        "unverify",
+        "Unverify a previously verified Smart Contract",
+    )
+
+    _add_contract_arg(sub)
+    sub.add_argument(
+        "--code-hash",
+        required=True,
+        help="the code hash of the contract",
+    )
+    sub.add_argument(
+        "--verifier-url",
+        required=True,
+        help="the url of the service that validates the contract",
+    )
+    cli_shared.add_wallet_args(args, sub)
+    sub.set_defaults(func=unverify)
+
     sub = cli_shared.add_command_subparser(
         subparsers,
         "contract",
@@ -473,6 +505,14 @@ def _send_or_simulate(tx: Transaction, contract_address: Address, args: Any):
 
 
 def verify(args: Any) -> None:
+    if not args.skip_confirmation:
+        response = input(
+            "Are you sure you want to verify the contract? This will publish the contract's source code, which will be displayed on the MultiversX Explorer (y/n): "
+        )
+        if response.lower() != "y":
+            logger.info("Contract verification cancelled.")
+            return
+
     contract = Address.new_from_bech32(args.contract)
     verifier_url = args.verifier_url
 
@@ -486,6 +526,34 @@ def verify(args: Any) -> None:
     logger.info("Contract verification request completed!")
 
 
+def unverify(args: Any) -> None:
+    account = cli_shared.prepare_account(args)
+    contract: str = args.contract
+    code_hash: str = args.code_hash
+    verifier_url: str = f"{args.verifier_url}/verifier"
+
+    payload = {
+        "contract": contract,
+        "codeHash": code_hash,
+    }
+
+    serialized_payload = json.dumps(payload, separators=(",", ":")).encode("utf-8")
+    hash = hashlib.sha256(serialized_payload).hexdigest()
+    message_to_sign = (contract + hash).encode("utf-8")
+
+    signature = account.sign_message(Message(message_to_sign))
+
+    request_payload = {
+        "signature": signature.hex(),
+        "payload": payload,
+    }
+
+    headers = {"Content-type": "application/json"}
+    response = requests.delete(verifier_url, json=request_payload, headers=headers)
+    logger.info(f"Your request to unverify contract {contract} was submitted.")
+    print(response.json().get("message"))
+
+
 def do_reproducible_build(args: Any):
     project_path = args.project
     docker_image = args.docker_image

multiversx_sdk_cli/cli_output.py

@@ -6,7 +6,6 @@
 from multiversx_sdk import Address, Transaction, TransactionOnNetwork
 
 from multiversx_sdk_cli import utils
-from multiversx_sdk_cli.transactions import transaction_on_network_to_dictionary
 from multiversx_sdk_cli.utils import ISerializable
 
 logger = logging.getLogger("cli.output")
@@ -36,7 +35,8 @@ def set_contract_address(self, contract_address: Address):
         return self
 
     def set_awaited_transaction(self, awaited_transaction: TransactionOnNetwork, omitted_fields: list[str] = []):
-        return self.set_transaction_on_network(awaited_transaction, omitted_fields)
+        self.set_transaction_on_network(awaited_transaction, omitted_fields)
+        self.set_emitted_transaction_hash(awaited_transaction.hash.hex())
 
     def set_transaction_on_network(
         self,
@@ -69,7 +69,7 @@ def build(self) -> dict[str, Any]:
             output["contractAddress"] = contract_address
 
         if self.transaction_on_network:
-            transaction_on_network_dict = transaction_on_network_to_dictionary(self.transaction_on_network)
+            transaction_on_network_dict = self.transaction_on_network.raw
             utils.omit_fields(transaction_on_network_dict, self.transaction_on_network_omitted_fields)
             output["transactionOnNetwork"] = transaction_on_network_dict
 

multiversx_sdk_cli/transactions.py

@@ -1,15 +1,12 @@
 import json
 import logging
-from typing import Any, Optional, Protocol, TextIO, Union
+from typing import Optional, Protocol, TextIO, Union
 
 from multiversx_sdk import (
     Address,
     AwaitingOptions,
-    SmartContractResult,
     TokenTransfer,
     Transaction,
-    TransactionEvent,
-    TransactionLogs,
     TransactionOnNetwork,
     TransactionsFactoryConfig,
     TransferTransactionsFactory,
@@ -116,56 +113,3 @@ def load_transaction_from_file(f: TextIO) -> Transaction:
     data_json: bytes = f.read().encode()
     transaction_dictionary = json.loads(data_json).get("tx") or json.loads(data_json).get("emittedTransaction")
     return Transaction.new_from_dictionary(transaction_dictionary)
-
-
-def transaction_event_to_dictionary(event: TransactionEvent) -> dict[str, Any]:
-    return {
-        "address": event.address.to_bech32(),
-        "identifier": event.identifier,
-        "topics": [topic.hex() for topic in event.topics],
-        "data": event.data.decode(),
-        "additional_data": [data.hex() for data in event.additional_data],
-    }
-
-
-def transaction_logs_to_dictionary(logs: TransactionLogs) -> dict[str, Any]:
-    return {
-        "address": logs.address.to_bech32(),
-        "events": [transaction_event_to_dictionary(event) for event in logs.events],
-    }
-
-
-def smart_contract_result_to_dictionary(result: SmartContractResult) -> dict[str, Any]:
-    return {
-        "sender": result.sender.to_bech32(),
-        "receiver": result.receiver.to_bech32(),
-        "data": result.data.decode(),
-        "logs": transaction_logs_to_dictionary(result.logs),
-    }
-
-
-def transaction_on_network_to_dictionary(tx: TransactionOnNetwork) -> dict[str, Any]:
-    return {
-        "sender": tx.sender.to_bech32(),
-        "receiver": tx.receiver.to_bech32(),
-        "hash": tx.hash.hex(),
-        "nonce": tx.nonce,
-        "round": tx.round,
-        "epoch": tx.epoch,
-        "timestamp": tx.timestamp,
-        "blockHash": tx.block_hash.hex(),
-        "miniBlockHash": tx.miniblock_hash.hex(),
-        "senderShard": tx.sender_shard,
-        "receiverShard": tx.receiver_shard,
-        "value": tx.value,
-        "gasLimit": tx.gas_limit,
-        "gasPrice": tx.gas_price,
-        "function": tx.function,
-        "data": tx.data.decode(),
-        "version": tx.version,
-        "options": tx.options,
-        "signature": tx.signature.hex(),
-        "status": tx.status.status,
-        "smartContractResults": [smart_contract_result_to_dictionary(res) for res in tx.smart_contract_results],
-        "logs": transaction_logs_to_dictionary(tx.logs),
-    }

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "multiversx-sdk-cli"
-version = "10.1.0"
+version = "10.2.0"
 authors = [
   { name="MultiversX" },
 ]