refactor(domain): standardize metadata field naming to meta_data across all models

- Rename metadata fields to meta_data for consistency across domain models
- Update agent_identity, agent_performance, agent_portfolio, amm, analytics, bounty, certification, community, cross_chain_bridge, cross_chain_reputation, decentralized_memory, miner, pricing_models, trading, and wallet models
- Rename chain_metadata to chain_meta_data in CrossChainMapping
- Rename verification_metadata to verification_meta_data
This commit is contained in:
oib
2026-03-03 15:01:48 +01:00
parent f353e00172
commit cabbd2d9b7
34 changed files with 433 additions and 106 deletions

View File

@@ -19,7 +19,7 @@ from sqlalchemy.exc import SQLAlchemyError
from ..domain.cross_chain_bridge import (
BridgeRequestStatus, ChainType, TransactionType, ValidatorStatus,
CrossChainBridgeRequest, BridgeValidator, BridgeLiquidityPool
BridgeRequest, Validator
)
from ..domain.agent_identity import AgentWallet, CrossChainMapping
from ..agent_identity.wallet_adapter_enhanced import (
@@ -139,7 +139,7 @@ class CrossChainBridgeService:
protocol = protocol or BridgeProtocol(source_config["protocol"])
# Create bridge request
bridge_request = CrossChainBridgeRequest(
bridge_request = BridgeRequest(
id=f"bridge_{uuid4().hex[:8]}",
user_address=user_address,
source_chain_id=source_chain_id,
@@ -191,8 +191,8 @@ class CrossChainBridgeService:
"""Get status of a bridge request"""
try:
stmt = select(CrossChainBridgeRequest).where(
CrossChainBridgeRequest.id == bridge_request_id
stmt = select(BridgeRequest).where(
BridgeRequest.id == bridge_request_id
)
bridge_request = self.session.exec(stmt).first()
@@ -263,8 +263,8 @@ class CrossChainBridgeService:
"""Cancel a bridge request"""
try:
stmt = select(CrossChainBridgeRequest).where(
CrossChainBridgeRequest.id == bridge_request_id
stmt = select(BridgeRequest).where(
BridgeRequest.id == bridge_request_id
)
bridge_request = self.session.exec(stmt).first()
@@ -307,32 +307,32 @@ class CrossChainBridgeService:
# Get total requests
total_requests = self.session.exec(
select(func.count(CrossChainBridgeRequest.id)).where(
CrossChainBridgeRequest.created_at >= cutoff_time
select(func.count(BridgeRequest.id)).where(
BridgeRequest.created_at >= cutoff_time
)
).scalar() or 0
# Get completed requests
completed_requests = self.session.exec(
select(func.count(CrossChainBridgeRequest.id)).where(
CrossChainBridgeRequest.created_at >= cutoff_time,
CrossChainBridgeRequest.status == BridgeRequestStatus.COMPLETED
select(func.count(BridgeRequest.id)).where(
BridgeRequest.created_at >= cutoff_time,
BridgeRequest.status == BridgeRequestStatus.COMPLETED
)
).scalar() or 0
# Get total volume
total_volume = self.session.exec(
select(func.sum(CrossChainBridgeRequest.amount)).where(
CrossChainBridgeRequest.created_at >= cutoff_time,
CrossChainBridgeRequest.status == BridgeRequestStatus.COMPLETED
select(func.sum(BridgeRequest.amount)).where(
BridgeRequest.created_at >= cutoff_time,
BridgeRequest.status == BridgeRequestStatus.COMPLETED
)
).scalar() or 0
# Get total fees
total_fees = self.session.exec(
select(func.sum(CrossChainBridgeRequest.total_fee)).where(
CrossChainBridgeRequest.created_at >= cutoff_time,
CrossChainBridgeRequest.status == BridgeRequestStatus.COMPLETED
select(func.sum(BridgeRequest.total_fee)).where(
BridgeRequest.created_at >= cutoff_time,
BridgeRequest.status == BridgeRequestStatus.COMPLETED
)
).scalar() or 0
@@ -342,11 +342,11 @@ class CrossChainBridgeService:
# Get average processing time
avg_processing_time = self.session.exec(
select(func.avg(
func.extract('epoch', CrossChainBridgeRequest.completed_at) -
func.extract('epoch', CrossChainBridgeRequest.created_at)
func.extract('epoch', BridgeRequest.completed_at) -
func.extract('epoch', BridgeRequest.created_at)
)).where(
CrossChainBridgeRequest.created_at >= cutoff_time,
CrossChainBridgeRequest.status == BridgeRequestStatus.COMPLETED
BridgeRequest.created_at >= cutoff_time,
BridgeRequest.status == BridgeRequestStatus.COMPLETED
)
).scalar() or 0
@@ -354,9 +354,9 @@ class CrossChainBridgeService:
chain_distribution = {}
for chain_id in self.wallet_adapters.keys():
chain_requests = self.session.exec(
select(func.count(CrossChainBridgeRequest.id)).where(
CrossChainBridgeRequest.created_at >= cutoff_time,
CrossChainBridgeRequest.source_chain_id == chain_id
select(func.count(BridgeRequest.id)).where(
BridgeRequest.created_at >= cutoff_time,
BridgeRequest.source_chain_id == chain_id
)
).scalar() or 0
@@ -410,8 +410,8 @@ class CrossChainBridgeService:
"""Process a bridge request"""
try:
stmt = select(CrossChainBridgeRequest).where(
CrossChainBridgeRequest.id == bridge_request_id
stmt = select(BridgeRequest).where(
BridgeRequest.id == bridge_request_id
)
bridge_request = self.session.exec(stmt).first()
@@ -438,8 +438,8 @@ class CrossChainBridgeService:
logger.error(f"Error processing bridge request {bridge_request_id}: {e}")
# Update status to failed
try:
stmt = update(CrossChainBridgeRequest).where(
CrossChainBridgeRequest.id == bridge_request_id
stmt = update(BridgeRequest).where(
BridgeRequest.id == bridge_request_id
).values(
status=BridgeRequestStatus.FAILED,
error_message=str(e),
@@ -450,7 +450,7 @@ class CrossChainBridgeService:
except:
pass
async def _execute_atomic_swap(self, bridge_request: CrossChainBridgeRequest) -> None:
async def _execute_atomic_swap(self, bridge_request: BridgeRequest) -> None:
"""Execute atomic swap protocol"""
try:
@@ -510,7 +510,7 @@ class CrossChainBridgeService:
logger.error(f"Error executing atomic swap: {e}")
raise
async def _execute_liquidity_pool_swap(self, bridge_request: CrossChainBridgeRequest) -> None:
async def _execute_liquidity_pool_swap(self, bridge_request: BridgeRequest) -> None:
"""Execute liquidity pool swap"""
try:
@@ -549,7 +549,7 @@ class CrossChainBridgeService:
logger.error(f"Error executing liquidity pool swap: {e}")
raise
async def _execute_htlc_swap(self, bridge_request: CrossChainBridgeRequest) -> None:
async def _execute_htlc_swap(self, bridge_request: BridgeRequest) -> None:
"""Execute HTLC (Hashed Timelock Contract) swap"""
try:
@@ -604,7 +604,7 @@ class CrossChainBridgeService:
logger.error(f"Error executing HTLC swap: {e}")
raise
async def _create_atomic_swap_contract(self, bridge_request: CrossChainBridgeRequest, direction: str) -> Dict[str, Any]:
async def _create_atomic_swap_contract(self, bridge_request: BridgeRequest, direction: str) -> Dict[str, Any]:
"""Create atomic swap contract data"""
# Mock implementation
contract_address = f"0x{hashlib.sha256(f'atomic_swap_{bridge_request.id}_{direction}'.encode()).hexdigest()[:40]}"
@@ -615,7 +615,7 @@ class CrossChainBridgeService:
"contract_data": contract_data
}
async def _create_liquidity_pool_swap_data(self, bridge_request: CrossChainBridgeRequest, pool: Dict[str, Any]) -> Dict[str, Any]:
async def _create_liquidity_pool_swap_data(self, bridge_request: BridgeRequest, pool: Dict[str, Any]) -> Dict[str, Any]:
"""Create liquidity pool swap data"""
# Mock implementation
pool_address = pool.get("address", f"0x{hashlib.sha256(f'pool_{bridge_request.source_chain_id}_{bridge_request.target_chain_id}'.encode()).hexdigest()[:40]}")
@@ -626,7 +626,7 @@ class CrossChainBridgeService:
"swap_data": swap_data
}
async def _create_htlc_contract(self, bridge_request: CrossChainBridgeRequest, secret_hash: str, direction: str) -> Dict[str, Any]:
async def _create_htlc_contract(self, bridge_request: BridgeRequest, secret_hash: str, direction: str) -> Dict[str, Any]:
"""Create HTLC contract data"""
contract_address = f"0x{hashlib.sha256(f'htlc_{bridge_request.id}_{direction}_{secret_hash}'.encode()).hexdigest()[:40]}"
contract_data = f"0x{hashlib.sha256(f'htlc_data_{bridge_request.id}_{secret_hash}'.encode()).hexdigest()}"
@@ -637,7 +637,7 @@ class CrossChainBridgeService:
"secret_hash": secret_hash
}
async def _complete_htlc(self, bridge_request: CrossChainBridgeRequest, secret: str) -> None:
async def _complete_htlc(self, bridge_request: BridgeRequest, secret: str) -> None:
"""Complete HTLC by revealing secret"""
# Mock implementation
bridge_request.target_transaction_hash = f"0x{hashlib.sha256(f'htlc_complete_{bridge_request.id}_{secret}'.encode()).hexdigest()}"
@@ -717,7 +717,7 @@ class CrossChainBridgeService:
logger.error(f"Error waiting for confirmations: {e}")
raise
async def _calculate_bridge_progress(self, bridge_request: CrossChainBridgeRequest) -> float:
async def _calculate_bridge_progress(self, bridge_request: BridgeRequest) -> float:
"""Calculate bridge progress percentage"""
try:
@@ -749,7 +749,7 @@ class CrossChainBridgeService:
logger.error(f"Error calculating bridge progress: {e}")
return 0.0
async def _process_refund(self, bridge_request: CrossChainBridgeRequest) -> None:
async def _process_refund(self, bridge_request: BridgeRequest) -> None:
"""Process refund for cancelled bridge request"""
try:
# Mock refund implementation

View File

@@ -1,3 +1,6 @@
from ..domain.global_marketplace import GlobalMarketplaceAnalyticsRequest
from ..domain.global_marketplace import GlobalMarketplaceTransactionRequest
from ..domain.global_marketplace import GlobalMarketplaceOfferRequest
"""
Global Marketplace Services
Core services for global marketplace operations, multi-region support, and cross-chain integration
@@ -34,7 +37,7 @@ class GlobalMarketplaceService:
async def create_global_offer(
self,
request: GlobalMarketplaceOfferRequest,
request: "GlobalMarketplaceOfferRequest",
agent_identity: AgentIdentity
) -> GlobalMarketplaceOffer:
"""Create a new global marketplace offer"""
@@ -142,7 +145,7 @@ class GlobalMarketplaceService:
async def create_global_transaction(
self,
request: GlobalMarketplaceTransactionRequest,
request: "GlobalMarketplaceTransactionRequest",
buyer_identity: AgentIdentity
) -> GlobalMarketplaceTransaction:
"""Create a global marketplace transaction"""
@@ -258,7 +261,7 @@ class GlobalMarketplaceService:
async def get_marketplace_analytics(
self,
request: GlobalMarketplaceAnalyticsRequest
request: "GlobalMarketplaceAnalyticsRequest"
) -> GlobalMarketplaceAnalytics:
"""Get global marketplace analytics"""
@@ -291,7 +294,7 @@ class GlobalMarketplaceService:
async def _generate_analytics(
self,
request: GlobalMarketplaceAnalyticsRequest
request: "GlobalMarketplaceAnalyticsRequest"
) -> GlobalMarketplaceAnalytics:
"""Generate analytics for the specified period"""

View File

@@ -18,7 +18,7 @@ from aitbc.logging import get_logger
from sqlmodel import Session, select, update, delete, func, Field
from sqlalchemy.exc import SQLAlchemyError
from ..domain.cross_chain_bridge import CrossChainBridgeRequest, BridgeRequestStatus
from ..domain.cross_chain_bridge import BridgeRequest, BridgeRequestStatus
from ..domain.agent_identity import AgentWallet
from ..agent_identity.wallet_adapter_enhanced import (
EnhancedWalletAdapter, WalletAdapterFactory, SecurityLevel,