mirror
/
moonstream
kopia lustrzana https://github.com/bugout-dev/moonstream
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Contract register via resource creation

pull/1124/head
kompotkot 2024-08-14 12:34:08 +00:00
rodzic 68251d822d
commit fba1a1f488
3 zmienionych plików z 91 dodań i 55 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

85
engineapi/engineapi/contracts_actions.py
Wyświetl plik

@ -5,6 +5,7 @@ import uuid
from datetime import datetime, timedelta
from typing import Any, Dict, List, Optional, Set, Tuple
from bugout.data import BugoutResourceHolder
from sqlalchemy import func, or_, text, tuple_
from sqlalchemy.dialects.postgresql import insert
from sqlalchemy.engine import Row
@ -20,7 +21,11 @@ from .models import (
MetatxRequester,
RegisteredContract,
)
from .settings import bugout_client
from .settings import (
MOONSTREAM_ADMIN_ACCESS_TOKEN,
MOONSTREAM_APPLICATION_ID,
bugout_client,
)
logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
@ -164,11 +169,46 @@ def validate_method_and_params(
return call_request_type
def create_resource_for_registered_contract(user_id: uuid.UUID) -> uuid.UUID:
resource_data = {"type": "metatx_requester"}
creator_permissions = ["create", "read", "update", "delete"]
resource = bugout_client.create_resource(
token=MOONSTREAM_ADMIN_ACCESS_TOKEN,
application_id=MOONSTREAM_APPLICATION_ID,
resource_data=resource_data,
)
logger.info(f"Created resource with ID: {str(resource.id)}")
resource_holder = bugout_client.add_resource_holder_permissions(
token=MOONSTREAM_ADMIN_ACCESS_TOKEN,
resource_id=resource.id,
holder_permissions=BugoutResourceHolder(
holder_id=str(user_id),
holder_type="user",
permissions=["create", "read", "update", "delete"],
),
)
logger.info(
f"Granted {creator_permissions} permissions for resource {str(resource.id)} to metatx requester with ID: {user_id}"
)
return resource.id
def delete_resource_for_registered_contract(resource_id: uuid.UUID) -> None:
resource = bugout_client.delete_resource(
token=MOONSTREAM_ADMIN_ACCESS_TOKEN,
resource_id=resource_id,
)
logger.info(f"Delete resource with ID: {resource.id} for registered contract")
def register_contract(
db_session: Session,
blockchain_name: str,
address: str,
metatx_requester_id: uuid.UUID,
user_id: uuid.UUID,
title: Optional[str],
description: Optional[str],
image_uri: Optional[str],
@ -176,18 +216,25 @@ def register_contract(
"""
Register a contract against the Engine instance
"""
try:
blockchain = (
db_session.query(Blockchain)
.filter(Blockchain.name == blockchain_name)
.one_or_none()
)
if blockchain is None:
raise UnsupportedBlockchain("Unsupported blockchain specified")
blockchain = (
db_session.query(Blockchain)
.filter(Blockchain.name == blockchain_name)
.one_or_none()
)
metatx_requester_stmt = insert(MetatxRequester.__table__).values(
id=metatx_requester_id
if blockchain is None:
raise UnsupportedBlockchain("Unsupported blockchain specified")
try:
resource_id = create_resource_for_registered_contract(user_id=user_id)
except Exception as err:
logger.error(repr(err))
raise Exception(
f"Unhandled exception during resource creation for user with ID: {str(user_id)}"
)
try:
metatx_requester_stmt = insert(MetatxRequester.__table__).values(id=resource_id)
metatx_requester_stmt_do_nothing_stmt = (
metatx_requester_stmt.on_conflict_do_nothing()
)
@ -196,7 +243,7 @@ def register_contract(
contract = RegisteredContract(
blockchain_id=blockchain.id,
address=Web3.toChecksumAddress(address),
metatx_requester_id=metatx_requester_id,
metatx_requester_id=resource_id,
title=title,
description=description,
image_uri=image_uri,
@ -205,11 +252,15 @@ def register_contract(
db_session.commit()
except IntegrityError as err:
db_session.rollback()
delete_resource_for_registered_contract(resource_id)
raise ContractAlreadyRegistered()
except Exception as err:
db_session.rollback()
delete_resource_for_registered_contract(resource_id)
logger.error(repr(err))
raise
raise Exception(
f"Unhandled exception during creating new registered contract for user with ID: {str(user_id)}"
)
return (contract, blockchain)
@ -260,7 +311,7 @@ def update_registered_contract(
def get_registered_contract(
db_session: Session,
metatx_requester_id: uuid.UUID,
metatx_requester_ids: List[uuid.UUID],
contract_id: uuid.UUID,
) -> Tuple[RegisteredContract, Blockchain]:
"""
@ -269,7 +320,7 @@ def get_registered_contract(
contract_with_blockchain = (
db_session.query(RegisteredContract, Blockchain)
.join(Blockchain, Blockchain.id == RegisteredContract.blockchain_id)
.filter(RegisteredContract.metatx_requester_id == metatx_requester_id)
.filter(RegisteredContract.metatx_requester_id.in_(metatx_requester_ids))
.filter(RegisteredContract.id == contract_id)
.one()
)
@ -697,7 +748,7 @@ def handle_register(args: argparse.Namespace) -> None:
blockchain=args.blockchain,
address=args.address,
contract_type=args.contract_type,
moonstream_user_id=args.user_id,
user_id=args.user_id,
title=args.title,
description=args.description,
image_uri=args.image_uri,

25
engineapi/engineapi/routes/metatx.py
Wyświetl plik

@ -139,14 +139,21 @@ async def get_registered_contract_route(
"""
Get the contract by ID.
"""
user = user_authorization
_, token = user_authorization
try:
metatx_requester_ids = contracts_actions.fetch_metatx_requester_ids(token=token)
contract_with_blockchain = contracts_actions.get_registered_contract(
db_session=db_session,
metatx_requester_id=user.id,
metatx_requester_ids=metatx_requester_ids,
contract_id=contract_id,
)
except contracts_actions.MetatxRequestersNotFound:
raise EngineHTTPException(
status_code=404,
detail="Metatx requester IDs not found",
)
except NoResultFound:
raise EngineHTTPException(
status_code=404,
@ -172,12 +179,12 @@ async def register_contract_route(
"""
Allows users to register contracts.
"""
user = user_authorization
user, _ = user_authorization
try:
contract_with_blockchain = contracts_actions.register_contract(
db_session=db_session,
metatx_requester_id=user.id,
user_id=user.id,
blockchain_name=contract.blockchain,
address=contract.address,
title=contract.title,
@ -213,7 +220,7 @@ async def update_contract_route(
user_authorization: Tuple[BugoutUser, UUID] = Depends(request_user_auth),
db_session: Session = Depends(db.yield_db_session),
) -> data.RegisteredContractResponse:
user = user_authorization
user, _ = user_authorization
try:
contract_with_blockchain = contracts_actions.update_registered_contract(
@ -252,7 +259,7 @@ async def delete_contract_route(
"""
Allows users to delete contracts that they have registered.
"""
user = user_authorization
user, _ = user_authorization
try:
deleted_contract_with_blockchain = contracts_actions.delete_registered_contract(
@ -347,7 +354,7 @@ async def check_requests_route(
"""
Implemented for pre-check until list of requests to be pushed into database.
"""
user = user_authorization
user, _ = user_authorization
try:
incoming_requests: Set[Tuple[str, str]] = set()
@ -429,7 +436,7 @@ async def create_requests(
At least one of `contract_id` or `contract_address` must be provided in the request body.
"""
user = user_authorization
user, _ = user_authorization
try:
num_requests = contracts_actions.create_request_calls(
@ -482,7 +489,7 @@ async def delete_requests(
"""
Allows users to delete requests.
"""
user = user_authorization
user, _ = user_authorization
try:
deleted_requests = contracts_actions.delete_requests(

36
engineapi/engineapi/scripts/metatx_resources.py
Wyświetl plik

@ -7,6 +7,7 @@ from bugout.data import BugoutResourceHolder
from sqlalchemy.sql import delete, distinct, func, insert, update
from .. import db, models
from ..contracts_actions import create_resource_for_registered_contract
from ..settings import (
MOONSTREAM_ADMIN_ACCESS_TOKEN,
MOONSTREAM_APPLICATION_ID,
@ -22,8 +23,6 @@ def generate_handler(args: argparse.Namespace):
3. Grant permissions for resource to metatx requester
4. Replace metatx requester table with uuid of resource
"""
resource_data = {"type": "metatx_requester"}
with db.yield_db_session_ctx() as db_session:
query = (
db_session.query(
@ -59,30 +58,9 @@ def generate_handler(args: argparse.Namespace):
f"Processing metatx_requester_id: {mr_id} with registered_contracts_cnt: {registered_contracts_cnt} and call_requests_cnt: {call_requests_cnt}"
)
# Create Brood resource
# Create Brood resource and grant permissions to user
try:
resource = bugout_client.create_resource(
token=MOONSTREAM_ADMIN_ACCESS_TOKEN,
application_id=MOONSTREAM_APPLICATION_ID,
resource_data=resource_data,
)
print(f"Created resource with ID: {resource.id}")
except Exception as e:
print(str(e))
continue
# Grant access for resource to metatx requester
try:
resource_holder = bugout_client.add_resource_holder_permissions(
token=MOONSTREAM_ADMIN_ACCESS_TOKEN,
resource_id=resource.id,
holder_permissions=BugoutResourceHolder(
holder_id=str(mr_id),
holder_type="user",
permissions=["create", "read", "update", "delete"],
),
)
print("Granted permissions for resource to metatx requester")
resource_id = create_resource_for_registered_contract(user_id=mr_id)
except Exception as e:
print(str(e))
continue
@ -90,7 +68,7 @@ def generate_handler(args: argparse.Namespace):
try:
# Create new metatx_requester_id equal to resource ID
metatx_requester_stmt = insert(models.MetatxRequester).values(
id=str(resource.id)
id=str(resource_id)
)
db_session.execute(metatx_requester_stmt)
@ -98,7 +76,7 @@ def generate_handler(args: argparse.Namespace):
update_registered_contract = (
update(models.RegisteredContract)
.where(models.RegisteredContract.metatx_requester_id == str(mr_id))
.values(metatx_requester_id=str(resource.id))
.values(metatx_requester_id=str(resource_id))
)
db_session.execute(update_registered_contract)
@ -106,7 +84,7 @@ def generate_handler(args: argparse.Namespace):
update_call_request = (
update(models.CallRequest)
.where(models.CallRequest.metatx_requester_id == str(mr_id))
.values(metatx_requester_id=str(resource.id))
.values(metatx_requester_id=str(resource_id))
)
db_session.execute(update_call_request)
@ -118,7 +96,7 @@ def generate_handler(args: argparse.Namespace):
db_session.commit()
print(
f"Updated all metatx_requester_id from {str(mr_id)} to {str(resource.id)} successfully in each table"
f"Updated all metatx_requester_id from {str(mr_id)} to {str(resource_id)} successfully in each table"
)
except Exception as e: