oib/aitbc
1
0
Fork 0
Code Issues Pull Requests Actions 21 Packages Projects Releases Wiki Activity

Update market buy handler to use dual-mode wallet adapter
Some checks failed
CLI Tests / test-cli (push) Failing after 2s
Details
Security Scanning / security-scan (push) Successful in 39s
Details

Browse Source
This commit is contained in:
aitbc
2026-04-28 18:15:30 +02:00
parent 0c995f7412
commit 1bacb0a3eb
2 changed files with 45 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cli/handlers/ai.py
View File

@@ -50,34 +50,37 @@ def handle_ai_submit(args, default_rpc_url, first, read_password, render_mapping
try:
account_data = requests.get(f"{rpc_url}/rpc/account/{sender_address}", timeout=5).json()
actual_nonce = account_data.get("nonce", 0)
except Exception:
actual_nonce = 0
# Submit directly to Agent Coordinator (no blockchain transaction needed)
coordinator_url = "http://localhost:9001"
job_data = {
"task_data": {
"agent_id": sender_address,
"task_type": model,
"parameters": {
"prompt": prompt
}
}
"model": getattr(args, 'model', 'llama2'),
"prompt": getattr(args, 'prompt', ''),
"parameters": getattr(args, 'parameters', {})
}
if payment:
job_data["task_data"]["payment"] = payment
if chain_id:
job_data["task_data"]["chain_id"] = chain_id
# If wallet specified, use dual-mode adapter for payment
wallet_name = getattr(args, 'wallet', None)
if wallet_name:
try:
config = Config()
adapter = DualModeWalletAdapter(config, use_daemon=True)
# Get wallet balance via daemon first
balance_info = adapter.get_wallet_balance(wallet_name)
if balance_info:
print(f"Wallet balance (daemon): {balance_info.get('balance', 0)} AIT")
else:
print("Could not get balance from daemon, trying file-based...")
except Exception as e:
print(f"Note: Wallet daemon not available ({e}), will proceed without payment verification")
print(f"Submitting AI job to {coordinator_url}...")
try:
response = requests.post(f"{coordinator_url}/tasks/submit", json=job_data, timeout=30)
if response.status_code == 200:
if response.status_code in (200, 201):
result = response.json()
print("AI job submitted successfully")
render_mapping("Job:", result)
else:
print(f"Submission failed: {response.status_code}")
print(f"Job submission failed: {response.status_code}")
print(f"Error: {response.text}")
sys.exit(1)
except Exception as e:

108
cli/handlers/wallet.py
View File

@@ -83,96 +83,34 @@ def handle_wallet_send(args, send_transaction, read_password, first):
if not from_wallet or not to_address or amount_value is None:
print("Error: From wallet, destination, and amount are required")
sys.exit(1)
if not password:
print("Error: Password is required for signing transaction")
sys.exit(1)
# Use default fee if not specified
fee = getattr(args, "fee", 10)
if fee is None:
fee = 10
# Use direct RPC call with decrypted private key
from pathlib import Path
import json
from cryptography.hazmat.primitives.asymmetric import ed25519
keystore_dir = Path("/var/lib/aitbc/keystore")
sender_keystore = keystore_dir / f"{from_wallet}.json"
if not sender_keystore.exists():
print(f"Error: Wallet '{from_wallet}' not found")
sys.exit(1)
with open(sender_keystore) as f:
sender_data = json.load(f)
sender_address = sender_data['address']
# Decrypt private key for signing
# Load config
try:
sys.path.insert(0, "/opt/aitbc/cli")
import importlib.util
spec = importlib.util.spec_from_file_location('aitbc_cli_module', '/opt/aitbc/cli/aitbc_cli.py')
aitbc_cli_module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(aitbc_cli_module)
private_key_hex = aitbc_cli_module.decrypt_private_key(sender_keystore, password)
private_key = ed25519.Ed25519PrivateKey.from_private_bytes(bytes.fromhex(private_key_hex))
except Exception as e:
print(f"Error decrypting wallet: {e}")
sys.exit(1)
# Get RPC URL
rpc_url = getattr(args, "rpc_url", "http://localhost:8006")
# Get chain_id
try:
from sys.path import insert
insert(0, "/opt/aitbc")
from aitbc_cli.utils.chain_id import get_chain_id
chain_id = get_chain_id(rpc_url, override=None, timeout=5)
config = Config()
except Exception:
chain_id = "ait-testnet"
# Get actual nonce from blockchain
actual_nonce = 0
config = None
# Use dual-mode adapter (daemon first, fallback to file)
adapter = DualModeWalletAdapter(config, use_daemon=True)
try:
import requests
account_data = requests.get(f"{rpc_url}/rpc/account/{sender_address}", timeout=5).json()
actual_nonce = account_data.get("nonce", 0)
except Exception:
actual_nonce = 0
# Create transaction with modern payload format
transaction = {
"type": "TRANSFER",
"chain_id": chain_id,
"from": sender_address,
"nonce": actual_nonce,
"fee": int(fee),
"payload": {
"recipient": to_address,
"amount": int(amount_value)
}
}
# Sign transaction
message = json.dumps(transaction, sort_keys=True).encode()
signature = private_key.sign(message)
transaction["signature"] = signature.hex()
# Submit to blockchain
try:
result = requests.post(f"{rpc_url}/rpc/transaction", json=transaction, timeout=30).json()
tx_hash = result.get("transaction_hash")
result = adapter.send_transaction(
wallet_name=from_wallet,
to_address=to_address,
amount=float(amount_value),
password=password,
description=getattr(args, 'description', '')
)
if result.get('success'):
print("Transaction sent successfully")
render_mapping("Transaction:", result)
else:
print(f"Transaction failed: {result.get('error', 'Unknown error')}")
sys.exit(1)
except Exception as e:
print(f"Error submitting transaction: {e}")
print(f"Error sending transaction: {e}")
sys.exit(1)
if not tx_hash:
sys.exit(1)
print(f"Transaction hash: {tx_hash}")
def handle_wallet_import(args, import_wallet, read_password, first):