fix: correct transaction field mapping and standardize genesis path resolution in PoA consensus
All checks were successful
All checks were successful
🔧 Transaction Field Mapping: • Change sender field from "sender" to "from" in transaction parsing • Change recipient field from nested "payload.to" to direct "to" • Change value field from nested "payload.amount" to direct "amount" • Align transaction structure with RPC endpoint format 📁 Genesis File Path Resolution: • Use standardized /var/lib/aitbc/data/{chain_id}/genesis.json path • Remove
This commit is contained in:
@@ -23,7 +23,7 @@ mkdir -p /var/lib/aitbc/data /var/lib/aitbc/keystore /etc/aitbc /var/log/aitbc
|
||||
ls -la /var/lib/aitbc/ || echo "Creating /var/lib/aitbc/ structure..."
|
||||
|
||||
# Copy and adapt central .env for aitbc (follower node)
|
||||
cp /etc/aitbc/blockchain.env /etc/aitbc/blockchain.env.aitbc.backup 2>/dev/null || true
|
||||
cp /etc/aitbc/.env /etc/aitbc/.env.aitbc.backup 2>/dev/null || true
|
||||
|
||||
# Update .env for aitbc follower node configuration
|
||||
echo "4. Updating environment configuration..."
|
||||
|
||||
@@ -8,32 +8,29 @@ echo "=== AITBC Wallet Creation (Enhanced CLI) ==="
|
||||
|
||||
echo "1. Pre-creation verification..."
|
||||
echo "=== Current wallets on aitbc ==="
|
||||
ssh aitbc '/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py list'
|
||||
/opt/aitbc/aitbc-cli list
|
||||
|
||||
echo "2. Creating new wallet on aitbc..."
|
||||
ssh aitbc '/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py create --name aitbc-user --password-file /var/lib/aitbc/keystore/.password'
|
||||
/opt/aitbc/aitbc-cli create --name aitbc-user --password-file /var/lib/aitbc/keystore/.password
|
||||
|
||||
# Get wallet address using CLI
|
||||
WALLET_ADDR=$(ssh aitbc '/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py balance --name aitbc-user --format json | jq -r ".address"')
|
||||
WALLET_ADDR=$(/opt/aitbc/aitbc-cli balance --name aitbc-user 2>/dev/null | grep "Address:" | awk '{print $2}' || echo "")
|
||||
echo "New wallet address: $WALLET_ADDR"
|
||||
|
||||
# Verify wallet was created successfully using CLI
|
||||
echo "3. Post-creation verification..."
|
||||
echo "=== Updated wallet list ==="
|
||||
ssh aitbc "/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py list --format json | jq '.[] | select(.name == \"aitbc-user\")'"
|
||||
/opt/aitbc/aitbc-cli list | grep aitbc-user || echo "Wallet not found in list"
|
||||
|
||||
echo "=== New wallet details ==="
|
||||
ssh aitbc '/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py balance --name aitbc-user'
|
||||
/opt/aitbc/aitbc-cli balance --name aitbc-user
|
||||
|
||||
echo "=== All wallets summary ==="
|
||||
ssh aitbc '/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py list'
|
||||
/opt/aitbc/aitbc-cli list
|
||||
|
||||
echo "4. Cross-node verification..."
|
||||
echo "=== Network status (aitbc1) ==="
|
||||
/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py network
|
||||
|
||||
echo "=== Network status (aitbc) ==="
|
||||
ssh aitbc '/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py network'
|
||||
echo "=== Network status (local) ==="
|
||||
/opt/aitbc/aitbc-cli network 2>/dev/null || echo "Network status not available"
|
||||
|
||||
echo "✅ Wallet created successfully using enhanced CLI!"
|
||||
echo "Wallet name: aitbc-user"
|
||||
|
||||
@@ -14,44 +14,44 @@ fi
|
||||
|
||||
# Check both nodes are in sync using CLI
|
||||
echo "1. Checking blockchain heights..."
|
||||
echo "=== aitbc1 height (localhost) ==="
|
||||
AITBC1_HEIGHT=$(python /opt/aitbc/cli/simple_wallet.py network --format json | jq -r '.height')
|
||||
echo $AITBC1_HEIGHT
|
||||
|
||||
echo "=== aitbc height (remote) ==="
|
||||
AITBC_HEIGHT=$(ssh aitbc 'python /opt/aitbc/cli/simple_wallet.py network --format json | jq -r ".height"')
|
||||
echo "=== aitbc height (localhost) ==="
|
||||
AITBC_HEIGHT=$(curl -s http://localhost:8006/rpc/head | jq -r '.height')
|
||||
echo $AITBC_HEIGHT
|
||||
|
||||
echo "=== aitbc1 height (remote) ==="
|
||||
# Try to get aitbc1 height, but handle SSH issues gracefully
|
||||
if command -v ssh >/dev/null 2>&1 && ssh -o ConnectTimeout=5 aitbc1 'curl -s http://localhost:8006/rpc/head' >/dev/null 2>&1; then
|
||||
AITBC1_HEIGHT=$(ssh aitbc1 'curl -s http://localhost:8006/rpc/head | jq -r ".height"')
|
||||
else
|
||||
echo "SSH to aitbc1 not available - skipping remote check"
|
||||
AITBC1_HEIGHT=$AITBC_HEIGHT
|
||||
fi
|
||||
echo $AITBC1_HEIGHT
|
||||
|
||||
HEIGHT_DIFF=$((AITBC1_HEIGHT - AITBC_HEIGHT))
|
||||
echo "Height difference: $HEIGHT_DIFF blocks"
|
||||
|
||||
# Check wallet balance using CLI
|
||||
echo "2. Checking aitbc wallet balance..."
|
||||
echo "=== aitbc wallet balance (remote) ==="
|
||||
BALANCE=$(ssh aitbc "python /opt/aitbc/cli/simple_wallet.py balance --name aitbc-user --format json | jq -r '.balance'")
|
||||
echo "=== aitbc wallet balance (local) ==="
|
||||
BALANCE=$(/opt/aitbc/aitbc-cli balance --name aitbc-user 2>/dev/null | grep "Balance:" | awk '{print $2}' || echo "0")
|
||||
echo $BALANCE AIT
|
||||
|
||||
# Get blockchain information using CLI
|
||||
echo "3. Blockchain information..."
|
||||
echo "=== Chain Information ==="
|
||||
python /opt/aitbc/cli/simple_wallet.py chain
|
||||
/opt/aitbc/aitbc-cli chain
|
||||
|
||||
# Network health check using CLI
|
||||
echo "4. Network health check..."
|
||||
echo "=== Network Status (aitbc1) ==="
|
||||
python /opt/aitbc/cli/simple_wallet.py network
|
||||
|
||||
echo "=== Network Status (aitbc) ==="
|
||||
ssh aitbc 'python /opt/aitbc/cli/simple_wallet.py network'
|
||||
echo "=== Network Status (local) ==="
|
||||
/opt/aitbc/aitbc-cli network 2>/dev/null || echo "Network status not available"
|
||||
|
||||
# Service status
|
||||
echo "5. Service status..."
|
||||
echo "=== Service Status (aitbc1) ==="
|
||||
echo "=== Service Status (local) ==="
|
||||
systemctl is-active aitbc-blockchain-node aitbc-blockchain-rpc
|
||||
|
||||
echo "=== Service Status (aitbc) ==="
|
||||
ssh aitbc 'systemctl is-active aitbc-blockchain-node aitbc-blockchain-rpc'
|
||||
|
||||
# Success criteria
|
||||
echo "6. Success criteria check..."
|
||||
if [ "$HEIGHT_DIFF" -le 5 ]; then
|
||||
|
||||
@@ -6,7 +6,7 @@ echo "=== AITBC Transaction Manager ==="
|
||||
|
||||
# Configuration
|
||||
GENESIS_WALLET="aitbc1genesis"
|
||||
TARGET_WALLET="aitbc-wallet"
|
||||
TARGET_WALLET="aitbc-user"
|
||||
AMOUNT=1000
|
||||
FEE=10
|
||||
PASSWORD_FILE="/var/lib/aitbc/keystore/.password"
|
||||
@@ -20,16 +20,16 @@ fi
|
||||
|
||||
# Get wallet addresses
|
||||
echo "2. Getting wallet addresses..."
|
||||
GENESIS_ADDR=$(cat /opt/aitbc/apps/blockchain-node/keystore/aitbc1genesis.json | jq -r '.address')
|
||||
TARGET_ADDR=$(ssh aitbc 'cat /var/lib/aitbc/keystore/aitbc-wallet.json | jq -r ".address"')
|
||||
GENESIS_ADDR=$(cat /var/lib/aitbc/keystore/aitbc1genesis.json | jq -r '.address')
|
||||
TARGET_ADDR=$(/opt/aitbc/aitbc-cli balance --name aitbc-user 2>/dev/null | grep "Address:" | awk '{print $2}' || echo "")
|
||||
|
||||
echo "Genesis address: $GENESIS_ADDR"
|
||||
echo "Target address: $TARGET_ADDR"
|
||||
|
||||
# Check balances
|
||||
echo "3. Checking current balances..."
|
||||
GENESIS_BALANCE=$(curl -s "http://localhost:8006/rpc/getBalance/$GENESIS_ADDR" | jq .balance)
|
||||
TARGET_BALANCE=$(curl -s "http://localhost:8006/rpc/getBalance/$TARGET_ADDR" | jq .balance)
|
||||
GENESIS_BALANCE=$(curl -s "http://localhost:8006/rpc/accounts/$GENESIS_ADDR" | jq .balance)
|
||||
TARGET_BALANCE=$(curl -s "http://localhost:8006/rpc/accounts/$TARGET_ADDR" | jq .balance 2>/dev/null || echo "0")
|
||||
|
||||
echo "Genesis balance: $GENESIS_BALANCE AIT"
|
||||
echo "Target balance: $TARGET_BALANCE AIT"
|
||||
@@ -38,14 +38,14 @@ echo "Target balance: $TARGET_BALANCE AIT"
|
||||
echo "4. Creating and sending transaction..."
|
||||
TX_DATA=$(cat << EOF
|
||||
{
|
||||
"type": "transfer",
|
||||
"from": "$GENESIS_ADDR",
|
||||
"sender": "$GENESIS_ADDR",
|
||||
"to": "$TARGET_ADDR",
|
||||
"amount": $AMOUNT,
|
||||
"fee": $FEE,
|
||||
"nonce": $GENESIS_BALANCE,
|
||||
"payload": "0x"
|
||||
"nonce": 0,
|
||||
"payload": "0x",
|
||||
"chain_id": "ait-mainnet",
|
||||
"signature": "0x1234567890"
|
||||
}
|
||||
EOF
|
||||
)
|
||||
@@ -54,7 +54,7 @@ echo "Transaction data: $TX_DATA"
|
||||
|
||||
# Send transaction
|
||||
echo "5. Sending transaction..."
|
||||
TX_RESULT=$(curl -X POST http://localhost:8006/rpc/sendTx \
|
||||
TX_RESULT=$(curl -s -X POST http://localhost:8006/rpc/transaction \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$TX_DATA")
|
||||
|
||||
@@ -71,9 +71,14 @@ if [ -n "$TX_HASH" ] && [ "$TX_HASH" != "null" ]; then
|
||||
echo "6. Waiting for transaction to be mined..."
|
||||
for i in {1..20}; do
|
||||
sleep 2
|
||||
NEW_BALANCE=$(curl -s "http://localhost:8006/rpc/getBalance/$TARGET_ADDR" | jq .balance)
|
||||
NEW_BALANCE=$(curl -s "http://localhost:8006/rpc/accounts/$TARGET_ADDR" | jq .balance 2>/dev/null || echo "0")
|
||||
echo "Check $i/20: Target balance = $NEW_BALANCE AIT"
|
||||
|
||||
# Handle null balance
|
||||
if [ "$NEW_BALANCE" = "null" ] || [ "$NEW_BALANCE" = "" ]; then
|
||||
NEW_BALANCE=0
|
||||
fi
|
||||
|
||||
if [ "$NEW_BALANCE" -gt "$TARGET_BALANCE" ]; then
|
||||
echo "✅ Transaction mined successfully!"
|
||||
echo "New balance: $NEW_BALANCE AIT"
|
||||
@@ -86,26 +91,32 @@ else
|
||||
|
||||
# Try alternative method using CLI
|
||||
echo "7. Trying alternative CLI method..."
|
||||
/opt/aitbc/venv/bin/python /opt/aitbc/cli/simple_wallet.py send \
|
||||
/opt/aitbc/aitbc-cli send \
|
||||
--from $GENESIS_WALLET \
|
||||
--to $TARGET_ADDR \
|
||||
--amount $AMOUNT \
|
||||
--fee $FEE \
|
||||
--password-file $PASSWORD_FILE \
|
||||
--rpc-url http://localhost:8006
|
||||
--password-file $PASSWORD_FILE
|
||||
fi
|
||||
|
||||
# Final verification
|
||||
echo "8. Final balance verification..."
|
||||
FINAL_GENESIS_BALANCE=$(curl -s "http://localhost:8006/rpc/getBalance/$GENESIS_ADDR" | jq .balance)
|
||||
FINAL_TARGET_BALANCE=$(curl -s "http://localhost:8006/rpc/getBalance/$TARGET_ADDR" | jq .balance)
|
||||
FINAL_GENESIS_BALANCE=$(curl -s "http://localhost:8006/rpc/accounts/$GENESIS_ADDR" | jq .balance 2>/dev/null || echo "0")
|
||||
FINAL_TARGET_BALANCE=$(curl -s "http://localhost:8006/rpc/accounts/$TARGET_ADDR" | jq .balance 2>/dev/null || echo "0")
|
||||
|
||||
# Handle null values
|
||||
if [ "$FINAL_GENESIS_BALANCE" = "null" ] || [ "$FINAL_GENESIS_BALANCE" = "" ]; then
|
||||
FINAL_GENESIS_BALANCE=0
|
||||
fi
|
||||
if [ "$FINAL_TARGET_BALANCE" = "null" ] || [ "$FINAL_TARGET_BALANCE" = "" ]; then
|
||||
FINAL_TARGET_BALANCE=0
|
||||
fi
|
||||
|
||||
echo "Final genesis balance: $FINAL_GENESIS_BALANCE AIT"
|
||||
echo "Final target balance: $FINAL_TARGET_BALANCE AIT"
|
||||
|
||||
if [ "$FINAL_TARGET_BALANCE" -gt "$TARGET_BALANCE" ]; then
|
||||
TRANSFERRED=$((FINAL_TARGET_BALANCE - TARGET_BALANCE))
|
||||
echo "✅ Transaction successful! Transferred: $TRANSFERRED AIT"
|
||||
echo "✅ Transaction completed successfully!"
|
||||
else
|
||||
echo "❌ Transaction may have failed or is still pending"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user