diff --git a/apps/explorer-web/package.json b/apps/explorer-web/package.json
index 797600fe..bd757dab 100644
--- a/apps/explorer-web/package.json
+++ b/apps/explorer-web/package.json
@@ -14,5 +14,8 @@
     "@types/node": "^20.12.7",
     "typescript": "^5.4.0",
     "vite": "^5.2.0"
+  },
+  "engines": {
+    "node": ">=22.22.0"
   }
 }
diff --git a/apps/marketplace-web/package.json b/apps/marketplace-web/package.json
index 175c68ab..1dff8598 100644
--- a/apps/marketplace-web/package.json
+++ b/apps/marketplace-web/package.json
@@ -11,5 +11,8 @@
   "devDependencies": {
     "typescript": "~5.8.3",
     "vite": "^7.1.7"
+  },
+  "engines": {
+    "node": ">=22.22.0"
   }
 }
diff --git a/apps/zk-circuits/package.json b/apps/zk-circuits/package.json
index 0ac6dc08..a1d26a1a 100644
--- a/apps/zk-circuits/package.json
+++ b/apps/zk-circuits/package.json
@@ -34,5 +34,8 @@
     "attestation"
   ],
   "author": "AITBC Team",
-  "license": "MIT"
+  "license": "MIT",
+  "engines": {
+    "node": ">=22.22.0"
+  }
 }
diff --git a/apps/zk-circuits/pot12_final.ptau b/apps/zk-circuits/pot12_final.ptau
index 42b2155c..360c6493 100644
Binary files a/apps/zk-circuits/pot12_final.ptau and b/apps/zk-circuits/pot12_final.ptau differ
diff --git a/contracts/PerformanceVerifier.sol b/contracts/PerformanceVerifier.sol
deleted file mode 100644
index 9c236517..00000000
--- a/contracts/PerformanceVerifier.sol
+++ /dev/null
@@ -1,675 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.19;
-
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
-import "@openzeppelin/contracts/security/Pausable.sol";
-import "./ZKReceiptVerifier.sol";
-import "./Groth16Verifier.sol";
-import "./AIPowerRental.sol";
-
-/**
- * @title Performance Verifier
- * @dev Advanced performance verification contract with ZK proofs and oracle integration
- * @notice Verifies AI service performance metrics and enforces SLA compliance
- */
-contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
-    
-    // State variables
-    ZKReceiptVerifier public zkVerifier;
-    Groth16Verifier public groth16Verifier;
-    AIPowerRental public aiPowerRental;
-    
-    uint256 public verificationCounter;
-    uint256 public minResponseTime = 100; // 100ms minimum
-    uint256 public maxResponseTime = 5000; // 5 seconds maximum
-    uint256 public minAccuracy = 90; // 90% minimum accuracy
-    uint256 public minAvailability = 95; // 95% minimum availability
-    uint256 public verificationWindow = 3600; // 1 hour verification window
-    uint256 public penaltyPercentage = 500; // 5% penalty in basis points
-    uint256 public rewardPercentage = 200; // 2% reward in basis points
-
-    // Optimistic Rollup / Dispute variables
-    uint256 public disputeWindow = 3600; // 1 hour dispute window before execution is final
-    mapping(uint256 => uint256) public verificationFinalizedAt;
-
-    
-    // Structs
-    struct PerformanceMetrics {
-        uint256 verificationId;
-        uint256 agreementId;
-        address provider;
-        uint256 responseTime;
-        uint256 accuracy;
-        uint256 availability;
-        uint256 computePower;
-        uint256 throughput;
-        uint256 memoryUsage;
-        uint256 energyEfficiency;
-        bool withinSLA;
-        uint256 timestamp;
-        bytes32 zkProof;
-        bytes32 groth16Proof;
-        VerificationStatus status;
-        uint256 penaltyAmount;
-        uint256 rewardAmount;
-    }
-    
-    struct SLAParameters {
-        uint256 maxResponseTime;
-        uint256 minAccuracy;
-        uint256 minAvailability;
-        uint256 minComputePower;
-        uint256 maxMemoryUsage;
-        uint256 minEnergyEfficiency;
-        bool isActive;
-        uint256 lastUpdated;
-    }
-    
-    struct OracleData {
-        address oracleAddress;
-        uint256 lastUpdateTime;
-        bool isAuthorized;
-        uint256 reputationScore;
-        uint256 totalReports;
-        uint256 accurateReports;
-    }
-    
-    struct PerformanceHistory {
-        uint256 totalVerifications;
-        uint256 successfulVerifications;
-        uint256 averageResponseTime;
-        uint256 averageAccuracy;
-        uint256 averageAvailability;
-        uint256 lastVerificationTime;
-        uint256 currentStreak;
-        uint256 bestStreak;
-    }
-    
-    // Enums
-    enum VerificationStatus {
-        Submitted,
-        Pending,
-        Verified,
-        Rejected,
-        Expired,
-        Disputed
-    }
-    
-    enum MetricType {
-        ResponseTime,
-        Accuracy,
-        Availability,
-        ComputePower,
-        Throughput,
-        MemoryUsage,
-        EnergyEfficiency
-    }
-    
-    // Mappings
-    mapping(uint256 => PerformanceMetrics) public performanceMetrics;
-    mapping(uint256 => SLAParameters) public slaParameters;
-    mapping(address => OracleData) public oracles;
-    mapping(address => PerformanceHistory) public providerHistory;
-    mapping(uint256 => uint256[]) public agreementVerifications;
-    mapping(address => uint256[]) public providerVerifications;
-    mapping(bytes32 => uint256) public proofToVerification;
-    
-    // Arrays for authorized oracles
-    address[] public authorizedOracles;
-    
-    // Events
-    event PerformanceSubmitted(
-        uint256 indexed verificationId,
-        uint256 indexed agreementId,
-        address indexed provider,
-        uint256 responseTime,
-        uint256 accuracy,
-        uint256 availability
-    );
-    
-    event PerformanceVerified(
-        uint256 indexed verificationId,
-        bool withinSLA,
-        uint256 penaltyAmount,
-        uint256 rewardAmount
-    );
-    
-    event PerformanceRejected(
-        uint256 indexed verificationId,
-        string reason,
-        bytes32 invalidProof
-    );
-    
-    event SLAParametersUpdated(
-        uint256 indexed agreementId,
-        uint256 maxResponseTime,
-        uint256 minAccuracy,
-        uint256 minAvailability
-    );
-    
-    event OracleAuthorized(
-        address indexed oracle,
-        uint256 reputationScore
-    );
-    
-    event OracleRevoked(
-        address indexed oracle,
-        string reason
-    );
-    
-    event OracleReportSubmitted(
-        address indexed oracle,
-        uint256 indexed verificationId,
-        bool accurate
-    );
-    
-    event PenaltyApplied(
-        uint256 indexed agreementId,
-        address indexed provider,
-        uint256 penaltyAmount
-    );
-    
-    event RewardIssued(
-        uint256 indexed agreementId,
-        address indexed provider,
-        uint256 rewardAmount
-    );
-    
-    event PerformanceThresholdUpdated(
-        MetricType indexed metricType,
-        uint256 oldValue,
-        uint256 newValue
-    );
-    
-    // Modifiers
-    modifier onlyAuthorizedOracle() {
-        require(oracles[msg.sender].isAuthorized, "Not authorized oracle");
-        _;
-    }
-    
-    modifier verificationExists(uint256 _verificationId) {
-        require(_verificationId < verificationCounter, "Verification does not exist");
-        _;
-    }
-    
-    modifier validStatus(uint256 _verificationId, VerificationStatus _requiredStatus) {
-        require(performanceMetrics[_verificationId].status == _requiredStatus, "Invalid verification status");
-        _;
-    }
-    
-    modifier withinVerificationWindow(uint256 _timestamp) {
-        require(block.timestamp - _timestamp <= verificationWindow, "Verification window expired");
-        _;
-    }
-    
-    // Constructor
-    constructor(
-        address _zkVerifier,
-        address _groth16Verifier,
-        address _aiPowerRental
-    ) {
-        zkVerifier = ZKReceiptVerifier(_zkVerifier);
-        groth16Verifier = Groth16Verifier(_groth16Verifier);
-        aiPowerRental = AIPowerRental(_aiPowerRental);
-        verificationCounter = 0;
-    }
-    
-    /**
-     * @dev Submits performance metrics for verification
-     * @param _agreementId ID of the rental agreement
-     * @param _responseTime Response time in milliseconds
-     * @param _accuracy Accuracy percentage (0-100)
-     * @param _availability Availability percentage (0-100)
-     * @param _computePower Compute power utilized
-     * @param _throughput Throughput in requests per second
-     * @param _memoryUsage Memory usage in MB
-     * @param _energyEfficiency Energy efficiency score
-     * @param _zkProof Zero-knowledge proof for performance verification
-     * @param _groth16Proof Groth16 proof for additional verification
-     */
-    function submitPerformance(
-        uint256 _agreementId,
-        uint256 _responseTime,
-        uint256 _accuracy,
-        uint256 _availability,
-        uint256 _computePower,
-        uint256 _throughput,
-        uint256 _memoryUsage,
-        uint256 _energyEfficiency,
-        bytes memory _zkProof,
-        bytes memory _groth16Proof
-    ) external nonReentrant whenNotPaused returns (uint256) {
-        require(_responseTime >= minResponseTime && _responseTime <= maxResponseTime, "Invalid response time");
-        require(_accuracy <= 100, "Invalid accuracy");
-        require(_availability <= 100, "Invalid availability");
-        
-        // Get agreement details
-        (, address provider, , , , , , , , ) = aiPowerRental.getRentalAgreement(_agreementId);
-        require(provider != address(0), "Invalid agreement");
-        
-        uint256 verificationId = verificationCounter++;
-        
-        performanceMetrics[verificationId] = PerformanceMetrics({
-            verificationId: verificationId,
-            agreementId: _agreementId,
-            provider: provider,
-            responseTime: _responseTime,
-            accuracy: _accuracy,
-            availability: _availability,
-            computePower: _computePower,
-            throughput: _throughput,
-            memoryUsage: _memoryUsage,
-            energyEfficiency: _energyEfficiency,
-            withinSLA: false,
-            timestamp: block.timestamp,
-            zkProof: keccak256(_zkProof),
-            groth16Proof: keccak256(_groth16Proof),
-            status: VerificationStatus.Submitted,
-            penaltyAmount: 0,
-            rewardAmount: 0
-        });
-        
-        agreementVerifications[_agreementId].push(verificationId);
-        providerVerifications[provider].push(verificationId);
-        proofToVerification[keccak256(_zkProof)] = verificationId;
-        
-        emit PerformanceSubmitted(
-            verificationId,
-            _agreementId,
-            provider,
-            _responseTime,
-            _accuracy,
-            _availability
-        );
-        
-        // Auto-verify if proofs are valid
-        if (_verifyProofs(_zkProof, _groth16Proof, verificationId)) {
-            _verifyPerformance(verificationId);
-        } else {
-            performanceMetrics[verificationId].status = VerificationStatus.Pending;
-        }
-        
-        return verificationId;
-    }
-    
-    /**
-     * @dev Verifies performance metrics (oracle verification)
-     * @param _verificationId ID of the verification
-     * @param _accurate Whether the metrics are accurate
-     * @param _additionalData Additional verification data
-     */
-    function verifyPerformance(
-        uint256 _verificationId,
-        bool _accurate,
-        string memory _additionalData
-    ) external onlyAuthorizedOracle verificationExists(_verificationId) validStatus(_verificationId, VerificationStatus.Pending) {
-        PerformanceMetrics storage metrics = performanceMetrics[_verificationId];
-        
-        require(block.timestamp - metrics.timestamp <= verificationWindow, "Verification window expired");
-        
-        // Update oracle statistics
-        OracleData storage oracle = oracles[msg.sender];
-        oracle.totalReports++;
-        if (_accurate) {
-            oracle.accurateReports++;
-        }
-        oracle.lastUpdateTime = block.timestamp;
-        
-        if (_accurate) {
-            _verifyPerformance(_verificationId);
-        } else {
-            metrics.status = VerificationStatus.Rejected;
-            emit PerformanceRejected(_verificationId, _additionalData, metrics.zkProof);
-        }
-        
-        emit OracleReportSubmitted(msg.sender, _verificationId, _accurate);
-    }
-    
-    /**
-     * @dev Sets SLA parameters for an agreement
-     * @param _agreementId ID of the agreement
-     * @param _maxResponseTime Maximum allowed response time
-     * @param _minAccuracy Minimum required accuracy
-     * @param _minAvailability Minimum required availability
-     * @param _minComputePower Minimum required compute power
-     * @param _maxMemoryUsage Maximum allowed memory usage
-     * @param _minEnergyEfficiency Minimum energy efficiency
-     */
-    function setSLAParameters(
-        uint256 _agreementId,
-        uint256 _maxResponseTime,
-        uint256 _minAccuracy,
-        uint256 _minAvailability,
-        uint256 _minComputePower,
-        uint256 _maxMemoryUsage,
-        uint256 _minEnergyEfficiency
-    ) external onlyOwner {
-        slaParameters[_agreementId] = SLAParameters({
-            maxResponseTime: _maxResponseTime,
-            minAccuracy: _minAccuracy,
-            minAvailability: _minAvailability,
-            minComputePower: _minComputePower,
-            maxMemoryUsage: _maxMemoryUsage,
-            minEnergyEfficiency: _minEnergyEfficiency,
-            isActive: true,
-            lastUpdated: block.timestamp
-        });
-        
-        emit SLAParametersUpdated(
-            _agreementId,
-            _maxResponseTime,
-            _minAccuracy,
-            _minAvailability
-        );
-    }
-    
-    /**
-     * @dev Authorizes an oracle
-     * @param _oracle Address of the oracle
-     * @param _reputationScore Initial reputation score
-     */
-    function authorizeOracle(address _oracle, uint256 _reputationScore) external onlyOwner {
-        require(_oracle != address(0), "Invalid oracle address");
-        require(!oracles[_oracle].isAuthorized, "Oracle already authorized");
-        
-        oracles[_oracle] = OracleData({
-            oracleAddress: _oracle,
-            lastUpdateTime: block.timestamp,
-            isAuthorized: true,
-            reputationScore: _reputationScore,
-            totalReports: 0,
-            accurateReports: 0
-        });
-        
-        authorizedOracles.push(_oracle);
-        
-        emit OracleAuthorized(_oracle, _reputationScore);
-    }
-    
-    /**
-     * @dev Revokes oracle authorization
-     * @param _oracle Address of the oracle
-     * @param _reason Reason for revocation
-     */
-    function revokeOracle(address _oracle, string memory _reason) external onlyOwner {
-        require(oracles[_oracle].isAuthorized, "Oracle not authorized");
-        
-        oracles[_oracle].isAuthorized = false;
-        
-        emit OracleRevoked(_oracle, _reason);
-    }
-    
-    /**
-     * @dev Updates performance thresholds
-     * @param _metricType Type of metric
-     * @param _newValue New threshold value
-     */
-    function updatePerformanceThreshold(MetricType _metricType, uint256 _newValue) external onlyOwner {
-        uint256 oldValue;
-        
-        if (_metricType == MetricType.ResponseTime) {
-            oldValue = maxResponseTime;
-            maxResponseTime = _newValue;
-        } else if (_metricType == MetricType.Accuracy) {
-            oldValue = minAccuracy;
-            minAccuracy = _newValue;
-        } else if (_metricType == MetricType.Availability) {
-            oldValue = minAvailability;
-            minAvailability = _newValue;
-        } else if (_metricType == MetricType.ComputePower) {
-            oldValue = minComputePower;
-            minComputePower = _newValue;
-        } else {
-            revert("Invalid metric type");
-        }
-        
-        emit PerformanceThresholdUpdated(_metricType, oldValue, _newValue);
-    }
-    
-    /**
-     * @dev Calculates penalty for SLA violation
-     * @param _verificationId ID of the verification
-     */
-    function calculatePenalty(uint256 _verificationId) 
-        external 
-        view 
-        verificationExists(_verificationId) 
-        returns (uint256) 
-    {
-        PerformanceMetrics memory metrics = performanceMetrics[_verificationId];
-        
-        if (metrics.withinSLA) {
-            return 0;
-        }
-        
-        // Get agreement details to calculate penalty amount
-        (, address provider, , uint256 duration, uint256 price, , , , , ) = aiPowerRental.getRentalAgreement(metrics.agreementId);
-        
-        // Penalty based on severity of violation
-        uint256 penaltyAmount = (price * penaltyPercentage) / 10000;
-        
-        // Additional penalties for severe violations
-        if (metrics.responseTime > maxResponseTime * 2) {
-            penaltyAmount += (price * 1000) / 10000; // Additional 10%
-        }
-        
-        if (metrics.accuracy < minAccuracy - 10) {
-            penaltyAmount += (price * 1000) / 10000; // Additional 10%
-        }
-        
-        return penaltyAmount;
-    }
-    
-    /**
-     * @dev Calculates reward for exceeding SLA
-     * @param _verificationId ID of the verification
-     */
-    function calculateReward(uint256 _verificationId) 
-        external 
-        view 
-        verificationExists(_verificationId) 
-        returns (uint256) 
-    {
-        PerformanceMetrics memory metrics = performanceMetrics[_verificationId];
-        
-        if (!metrics.withinSLA) {
-            return 0;
-        }
-        
-        // Get agreement details
-        (, address provider, , uint256 duration, uint256 price, , , , , ) = aiPowerRental.getRentalAgreement(metrics.agreementId);
-        
-        // Reward based on performance quality
-        uint256 rewardAmount = (price * rewardPercentage) / 10000;
-        
-        // Additional rewards for exceptional performance
-        if (metrics.responseTime < maxResponseTime / 2) {
-            rewardAmount += (price * 500) / 10000; // Additional 5%
-        }
-        
-        if (metrics.accuracy > minAccuracy + 5) {
-            rewardAmount += (price * 500) / 10000; // Additional 5%
-        }
-        
-        return rewardAmount;
-    }
-    
-    /**
-     * @dev Gets performance history for a provider
-     * @param _provider Address of the provider
-     */
-    function getProviderHistory(address _provider) 
-        external 
-        view 
-        returns (PerformanceHistory memory) 
-    {
-        return providerHistory[_provider];
-    }
-    
-    /**
-     * @dev Gets all verifications for an agreement
-     * @param _agreementId ID of the agreement
-     */
-    function getAgreementVerifications(uint256 _agreementId) 
-        external 
-        view 
-        returns (uint256[] memory) 
-    {
-        return agreementVerifications[_agreementId];
-    }
-    
-    /**
-     * @dev Gets all verifications for a provider
-     * @param _provider Address of the provider
-     */
-    function getProviderVerifications(address _provider) 
-        external 
-        view 
-        returns (uint256[] memory) 
-    {
-        return providerVerifications[_provider];
-    }
-    
-    /**
-     * @dev Gets oracle information
-     * @param _oracle Address of the oracle
-     */
-    function getOracleInfo(address _oracle) 
-        external 
-        view 
-        returns (OracleData memory) 
-    {
-        return oracles[_oracle];
-    }
-    
-    /**
-     * @dev Gets all authorized oracles
-     */
-    function getAuthorizedOracles() 
-        external 
-        view 
-        returns (address[] memory) 
-    {
-        address[] memory activeOracles = new address[](authorizedOracles.length);
-        uint256 activeCount = 0;
-        
-        for (uint256 i = 0; i < authorizedOracles.length; i++) {
-            if (oracles[authorizedOracles[i]].isAuthorized) {
-                activeOracles[activeCount] = authorizedOracles[i];
-                activeCount++;
-            }
-        }
-        
-        // Resize array to active count
-        assembly {
-            mstore(activeOracles, activeCount)
-        }
-        
-        return activeOracles;
-    }
-    
-    // Internal functions
-    
-    function _verifyProofs(
-        bytes memory _zkProof,
-        bytes memory _groth16Proof,
-        uint256 _verificationId
-    ) internal view returns (bool) {
-        PerformanceMetrics memory metrics = performanceMetrics[_verificationId];
-        
-        // Verify ZK proof
-        bool zkValid = zkVerifier.verifyPerformanceProof(
-            metrics.agreementId,
-            metrics.responseTime,
-            metrics.accuracy,
-            metrics.availability,
-            metrics.computePower,
-            _zkProof
-        );
-        
-        // Verify Groth16 proof
-        bool groth16Valid = groth16Verifier.verifyProof(_groth16Proof);
-        
-        return zkValid && groth16Valid;
-    }
-    
-function _verifyPerformance(uint256 _verificationId) internal {
-        PerformanceMetrics storage metrics = performanceMetrics[_verificationId];
-        
-        // Setup optimistic rollup finalization time
-        verificationFinalizedAt[_verificationId] = block.timestamp + disputeWindow;
-        metrics.status = VerificationStatus.Verified;
-        
-        emit PerformanceVerified(_verificationId, metrics.score, metrics.zkProof);
-    }
-    
-    /**
-     * @dev Finalizes an optimistic verification after the dispute window has passed
-     * @param _verificationId ID of the verification
-     */
-    function finalizeOptimisticVerification(uint256 _verificationId) external verificationExists(_verificationId) {
-        PerformanceMetrics storage metrics = performanceMetrics[_verificationId];
-        require(metrics.status == VerificationStatus.Verified, "Verification not in verified status");
-        require(block.timestamp >= verificationFinalizedAt[_verificationId], "Dispute window still open");
-        
-        metrics.status = VerificationStatus.Completed;
-        
-        // Execute SLA logic (distribute rewards/penalties)
-        if (metrics.score >= minAccuracy) {
-            _rewardProvider(metrics.provider, metrics.agreementId);
-        } else {
-            _penalizeProvider(metrics.provider, metrics.agreementId);
-        }
-    }
-    
-    /**
-     * @dev Challenge an optimistic verification within the dispute window
-     * @param _verificationId ID of the verification
-     * @param _challengeData Evidence of invalid performance
-     */
-    function challengeVerification(uint256 _verificationId, string memory _challengeData) external verificationExists(_verificationId) {
-        PerformanceMetrics storage metrics = performanceMetrics[_verificationId];
-        require(metrics.status == VerificationStatus.Verified, "Verification not in verified status");
-        require(block.timestamp < verificationFinalizedAt[_verificationId], "Dispute window closed");
-        
-        // A watcher node challenges the verification
-        // Switch to manual review or on-chain full ZK validation
-        metrics.status = VerificationStatus.Challenged;
-        emit VerificationChallenged(_verificationId, msg.sender, _challengeData);
-    }
-    
-    function _updateProviderHistory(address _provider, bool _withinSLA) internal {
-        PerformanceHistory storage history = providerHistory[_provider];
-        
-        history.totalVerifications++;
-        if (_withinSLA) {
-            history.successfulVerifications++;
-            history.currentStreak++;
-            if (history.currentStreak > history.bestStreak) {
-                history.bestStreak = history.currentStreak;
-            }
-        } else {
-            history.currentStreak = 0;
-        }
-        
-        history.lastVerificationTime = block.timestamp;
-        
-        // Update averages (simplified calculation)
-        // In a real implementation, you'd want to maintain running averages
-    }
-    
-    /**
-     * @dev Emergency pause function
-     */
-    function pause() external onlyOwner {
-        _pause();
-    }
-    
-    /**
-     * @dev Unpause function
-     */
-    function unpause() external onlyOwner {
-        _unpause();
-    }
-}
diff --git a/contracts/contracts/AITBCPaymentProcessor.sol b/contracts/contracts/AITBCPaymentProcessor.sol
index 2ca89528..31ca2f47 100644
--- a/contracts/contracts/AITBCPaymentProcessor.sol
+++ b/contracts/contracts/AITBCPaymentProcessor.sol
@@ -243,12 +243,34 @@ contract AITBCPaymentProcessor is Ownable, ReentrancyGuard, Pausable {
         require(authorizedPayees[_to], "Recipient not authorized");
         
         uint256 paymentId = paymentCounter++;
+        
+        // Calculate fees and create payment
+        _createPaymentWithFees(paymentId, _to, _amount, _agreementId, _paymentPurpose, _releaseCondition);
+        
+        // Update tracking arrays
+        _updatePaymentTracking(paymentId, _to, _agreementId);
+        
+        // Transfer tokens
+        _transferTokensForPayment(_amount);
+        
+        emit PaymentCreated(paymentId, msg.sender, _to, _amount, _agreementId, _paymentPurpose);
+        
+        return paymentId;
+    }
+    
+    function _createPaymentWithFees(
+        uint256 _paymentId,
+        address _to,
+        uint256 _amount,
+        bytes32 _agreementId,
+        string memory _paymentPurpose,
+        ReleaseCondition _releaseCondition
+    ) internal {
         uint256 platformFee = (_amount * platformFeePercentage) / 10000;
         uint256 disputeFee = (_amount * disputeResolutionFee) / 10000;
-        uint256 totalAmount = _amount + platformFee + disputeFee;
         
-        payments[paymentId] = Payment({
-            paymentId: paymentId,
+        payments[_paymentId] = Payment({
+            paymentId: _paymentId,
             from: msg.sender,
             to: _to,
             amount: _amount,
@@ -263,23 +285,26 @@ contract AITBCPaymentProcessor is Ownable, ReentrancyGuard, Pausable {
             releaseCondition: _releaseCondition,
             conditionHash: bytes32(0)
         });
-        
-        senderPayments[msg.sender].push(paymentId);
-        recipientPayments[_to].push(paymentId);
+    }
+    
+    function _updatePaymentTracking(uint256 _paymentId, address _to, bytes32 _agreementId) internal {
+        senderPayments[msg.sender].push(_paymentId);
+        recipientPayments[_to].push(_paymentId);
         
         if (_agreementId != bytes32(0)) {
-            agreementPayments[_agreementId] = paymentId;
+            agreementPayments[_agreementId] = _paymentId;
         }
+    }
+    
+    function _transferTokensForPayment(uint256 _amount) internal {
+        uint256 platformFee = (_amount * platformFeePercentage) / 10000;
+        uint256 disputeFee = (_amount * disputeResolutionFee) / 10000;
+        uint256 totalAmount = _amount + platformFee + disputeFee;
         
-        // Transfer tokens to contract
         require(
             aitbcToken.transferFrom(msg.sender, address(this), totalAmount),
             "Payment transfer failed"
         );
-        
-        emit PaymentCreated(paymentId, msg.sender, _to, _amount, _agreementId, _paymentPurpose);
-        
-        return paymentId;
     }
     
     /**
diff --git a/contracts/contracts/BountyIntegration.sol b/contracts/contracts/BountyIntegration.sol
index 0793955d..e849bdd2 100644
--- a/contracts/contracts/BountyIntegration.sol
+++ b/contracts/contracts/BountyIntegration.sol
@@ -270,7 +270,7 @@ contract BountyIntegration is Ownable, ReentrancyGuard {
         nonReentrant 
     {
         // Get bounty details
-        (,,,,,, bytes32 performanceCriteria, uint256 minAccuracy,,,, bool requiresZKProof) = agentBounty.getBounty(_bountyId);
+        (,,,,,, bytes32 performanceCriteria, uint256 minAccuracy,,,,,) = agentBounty.getBounty(_bountyId);
         
         // Check if auto-verification conditions are met
         if (_accuracy >= autoVerificationThreshold && _accuracy >= minAccuracy) {
@@ -278,7 +278,7 @@ contract BountyIntegration is Ownable, ReentrancyGuard {
             agentBounty.verifySubmission(_bountyId, _submissionId, true, address(this));
             
             // Get submission details to calculate rewards
-            (address submitter,,,,,,,) = agentBounty.getSubmission(_submissionId);
+            (uint256 bountyId, address submitter, bytes32 performanceHash, uint256 accuracy, uint256 responseTime,,,) = agentBounty.getSubmission(_submissionId);
             
             // Trigger staking rewards if applicable
             _triggerStakingRewards(submitter, _accuracy);
@@ -309,7 +309,7 @@ contract BountyIntegration is Ownable, ReentrancyGuard {
             PerformanceMapping storage perfMap = performanceMappings[mappingId];
             
             // Update agent staking metrics
-            (address submitter,,,,,,,) = agentBounty.getSubmission(perfMap.submissionId);
+            (uint256 bountyId, address submitter, bytes32 performanceHash, uint256 accuracy, uint256 responseTime,,,) = agentBounty.getSubmission(perfMap.submissionId);
             agentStaking.updateAgentPerformance(submitter, _accuracy, _accuracy >= autoVerificationThreshold);
             
             // Auto-verify bounty if conditions are met
@@ -544,13 +544,13 @@ contract BountyIntegration is Ownable, ReentrancyGuard {
         PerformanceMapping storage perfMap = performanceMappings[_mappingId];
         
         // Get bounty details
-        (,,,,,, bytes32 performanceCriteria, uint256 minAccuracy,,,, bool requiresZKProof) = agentBounty.getBounty(perfMap.bountyId);
+        (,,,,,, bytes32 performanceCriteria, uint256 minAccuracy,,,,,) = agentBounty.getBounty(perfMap.bountyId);
         
         // Get submission details
-        (address submitter, bytes32 submissionHash, uint256 accuracy, uint256 responseTime,,,) = agentBounty.getSubmission(perfMap.submissionId);
+        (uint256 bountyId, address submitter, bytes32 performanceHash, uint256 accuracy, uint256 responseTime,,,) = agentBounty.getSubmission(perfMap.submissionId);
         
         // Verify performance criteria match
-        require(perfMap.performanceHash == submissionHash, "Performance hash mismatch");
+        require(perfMap.performanceHash == performanceHash, "Performance hash mismatch");
         
         // Check if accuracy meets requirements
         require(accuracy >= minAccuracy, "Accuracy below minimum");
diff --git a/contracts/contracts/DisputeResolution.sol b/contracts/contracts/DisputeResolution.sol
index 1fa870d1..d80bf395 100644
--- a/contracts/contracts/DisputeResolution.sol
+++ b/contracts/contracts/DisputeResolution.sol
@@ -280,17 +280,17 @@ contract DisputeResolution is Ownable, ReentrancyGuard, Pausable {
         require(bytes(_reason).length > 0, "Reason required");
         
         // Verify agreement exists and get participants
-        (, address provider, address consumer, , , , , , , ) = aiPowerRental.getRentalAgreement(_agreementId);
-        require(provider != address(0), "Invalid agreement");
+        AIPowerRental.RentalAgreement memory agreement = aiPowerRental.getRentalAgreement(_agreementId);
+        require(agreement.provider != address(0), "Invalid agreement");
         
         // Verify caller is a participant
         require(
-            msg.sender == provider || msg.sender == consumer,
+            msg.sender == agreement.provider || msg.sender == agreement.consumer,
             "Not agreement participant"
         );
         
         // Verify respondent is the other participant
-        address otherParticipant = msg.sender == provider ? consumer : provider;
+        address otherParticipant = msg.sender == agreement.provider ? agreement.consumer : agreement.provider;
         require(_respondent == otherParticipant, "Respondent not in agreement");
         
         uint256 disputeId = disputeCounter++;
@@ -561,10 +561,10 @@ contract DisputeResolution is Ownable, ReentrancyGuard, Pausable {
         dispute.status = DisputeStatus.Resolved;
         
         // Calculate resolution amount based on agreement
-        (, address provider, address consumer, uint256 duration, uint256 price, , , , , ) = aiPowerRental.getRentalAgreement(dispute.agreementId);
+        AIPowerRental.RentalAgreement memory agreement = aiPowerRental.getRentalAgreement(dispute.agreementId);
         
         if (initiatorWins) {
-            dispute.resolutionAmount = price; // Full refund/compensation
+            dispute.resolutionAmount = agreement.price; // Full refund/compensation
         } else {
             dispute.resolutionAmount = 0; // No compensation
         }
@@ -679,12 +679,13 @@ contract DisputeResolution is Ownable, ReentrancyGuard, Pausable {
             }
         }
         
-        // Resize array to active count
-        assembly {
-            mstore(activeArbitrators, activeCount)
+        // Create correctly sized array and copy elements
+        address[] memory result = new address[](activeCount);
+        for (uint256 i = 0; i < activeCount; i++) {
+            result[i] = activeArbitrators[i];
         }
         
-        return activeArbitrators;
+        return result;
     }
     
     /**
@@ -706,12 +707,13 @@ contract DisputeResolution is Ownable, ReentrancyGuard, Pausable {
             }
         }
         
-        // Resize array to active count
-        assembly {
-            mstore(active, activeCount)
+        // Create correctly sized array and copy elements
+        uint256[] memory result = new uint256[](activeCount);
+        for (uint256 i = 0; i < activeCount; i++) {
+            result[i] = active[i];
         }
         
-        return active;
+        return result;
     }
     
     /**
diff --git a/contracts/contracts/EscrowService.sol b/contracts/contracts/EscrowService.sol
index 89954843..1b09b6d9 100644
--- a/contracts/contracts/EscrowService.sol
+++ b/contracts/contracts/EscrowService.sol
@@ -45,13 +45,9 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         EscrowType escrowType;
         ReleaseCondition releaseCondition;
         bytes32 conditionHash;
-        string conditionDescription;
-        uint256 releaseAttempts;
-        uint256 lastReleaseAttempt;
-        address[] signatories;
-        mapping(address => bool) hasSigned;
         uint256 requiredSignatures;
         uint256 currentSignatures;
+        mapping(address => bool) hasSigned;
     }
     
     struct ConditionalRelease {
@@ -332,44 +328,18 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         require(_releaseTime == 0 || _releaseTime > block.timestamp, "Invalid release time");
         
         uint256 escrowId = escrowCounter++;
-        uint256 platformFee = (_amount * platformFeePercentage) / 10000;
-        uint256 totalAmount = _amount + platformFee;
         
-        escrowAccounts[escrowId] = EscrowAccount({
-            escrowId: escrowId,
-            depositor: msg.sender,
-            beneficiary: _beneficiary,
-            arbiter: _arbiter,
-            amount: _amount,
-            platformFee: platformFee,
-            releaseTime: _releaseTime,
-            creationTime: block.timestamp,
-            isReleased: false,
-            isRefunded: false,
-            isFrozen: false,
-            escrowType: _escrowType,
-            releaseCondition: _releaseCondition,
-            conditionHash: bytes32(0),
-            conditionDescription: _conditionDescription,
-            releaseAttempts: 0,
-            lastReleaseAttempt: 0,
-            signatories: new address[](0),
-            requiredSignatures: 0,
-            currentSignatures: 0
-        });
+        // Initialize escrow account
+        _initializeEscrowAccount(escrowId, _beneficiary, _arbiter, _amount, _escrowType, _releaseCondition, _conditionDescription);
         
-        depositorEscrows[msg.sender].push(escrowId);
-        beneficiaryEscrows[_beneficiary].push(escrowId);
-        activeEscrows.push(escrowId);
+        // Update tracking arrays
+        _updateEscrowTracking(escrowId, _beneficiary);
         
         // Transfer tokens to contract
-        require(
-            aitbcToken.transferFrom(msg.sender, address(this), totalAmount),
-            "Escrow funding failed"
-        );
+        _transferTokensForEscrow(_amount);
         
         emit EscrowCreated(escrowId, msg.sender, _beneficiary, _amount, _escrowType, _releaseCondition);
-        emit EscrowFunded(escrowId, _amount, platformFee);
+        emit EscrowFunded(escrowId, _amount, (_amount * platformFeePercentage) / 10000);
         
         // Setup specific escrow type configurations
         if (_escrowType == EscrowType.TimeLocked) {
@@ -381,6 +351,44 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         return escrowId;
     }
     
+    function _initializeEscrowAccount(
+        uint256 _escrowId,
+        address _beneficiary,
+        address _arbiter,
+        uint256 _amount,
+        EscrowType _escrowType,
+        ReleaseCondition _releaseCondition,
+        string memory _conditionDescription
+    ) internal {
+        uint256 platformFee = (_amount * platformFeePercentage) / 10000;
+        
+        escrowAccounts[_escrowId].escrowId = _escrowId;
+        escrowAccounts[_escrowId].depositor = msg.sender;
+        escrowAccounts[_escrowId].beneficiary = _beneficiary;
+        escrowAccounts[_escrowId].arbiter = _arbiter;
+        escrowAccounts[_escrowId].amount = _amount;
+        escrowAccounts[_escrowId].platformFee = platformFee;
+        escrowAccounts[_escrowId].creationTime = block.timestamp;
+        escrowAccounts[_escrowId].escrowType = _escrowType;
+        escrowAccounts[_escrowId].releaseCondition = _releaseCondition;
+    }
+    
+    function _updateEscrowTracking(uint256 _escrowId, address _beneficiary) internal {
+        depositorEscrows[msg.sender].push(_escrowId);
+        beneficiaryEscrows[_beneficiary].push(_escrowId);
+        activeEscrows.push(_escrowId);
+    }
+    
+    function _transferTokensForEscrow(uint256 _amount) internal {
+        uint256 platformFee = (_amount * platformFeePercentage) / 10000;
+        uint256 totalAmount = _amount + platformFee;
+        
+        require(
+            aitbcToken.transferFrom(msg.sender, address(this), totalAmount),
+            "Escrow funding failed"
+        );
+    }
+    
     /**
      * @dev Sets release condition for escrow
      * @param _escrowId ID of the escrow
@@ -454,15 +462,14 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         MultiSigRelease storage multiSig = multiSigReleases[_escrowId];
         
         require(!escrow.hasSigned[msg.sender], "Already signed");
-        require(multiSig.requiredSigners > 0, "Multi-signature not setup");
+        require(escrow.requiredSignatures > 0, "Multi-signature not setup");
         
         escrow.hasSigned[msg.sender] = true;
         escrow.currentSignatures++;
-        multiSig.currentSignatures++;
         
-        emit SignatureSubmitted(_escrowId, msg.sender, escrow.currentSignatures, multiSig.requiredSigners);
+        emit SignatureSubmitted(_escrowId, msg.sender, escrow.currentSignatures, escrow.requiredSignatures);
         
-        if (escrow.currentSignatures >= multiSig.requiredSigners) {
+        if (escrow.currentSignatures >= escrow.requiredSignatures) {
             _releaseEscrow(_escrowId, "Multi-signature requirement met");
         }
     }
@@ -561,18 +568,17 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         EmergencyRelease storage emergency = emergencyReleases[_escrowId];
         require(emergency.requestTime == 0, "Emergency release already requested");
         
-        emergencyReleases[_escrowId] = EmergencyRelease({
-            escrowId: _escrowId,
-            initiator: msg.sender,
-            reason: _reason,
-            requestTime: block.timestamp,
-            votingDeadline: block.timestamp + emergencyReleaseDelay,
-            votesFor: 0,
-            votesAgainst: 0,
-            totalVotes: 0,
-            isApproved: false,
-            isExecuted: false
-        });
+        // Initialize emergency release without nested mapping
+        emergencyReleases[_escrowId].escrowId = _escrowId;
+        emergencyReleases[_escrowId].initiator = msg.sender;
+        emergencyReleases[_escrowId].reason = _reason;
+        emergencyReleases[_escrowId].requestTime = block.timestamp;
+        emergencyReleases[_escrowId].votingDeadline = block.timestamp + emergencyReleaseDelay;
+        emergencyReleases[_escrowId].votesFor = 0;
+        emergencyReleases[_escrowId].votesAgainst = 0;
+        emergencyReleases[_escrowId].totalVotes = 0;
+        emergencyReleases[_escrowId].isApproved = false;
+        emergencyReleases[_escrowId].isExecuted = false;
         
         emit EmergencyReleaseRequested(_escrowId, msg.sender, _reason, block.timestamp + emergencyReleaseDelay);
     }
@@ -711,14 +717,12 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         requiredSigners[0] = escrow.depositor;
         requiredSigners[1] = escrow.beneficiary;
         
-        multiSigReleases[_escrowId] = MultiSigRelease({
-            escrowId: _escrowId,
-            requiredSigners: requiredSigners,
-            signaturesRequired: 2,
-            currentSignatures: 0,
-            deadline: block.timestamp + 7 days,
-            isExecuted: false
-        });
+        // Initialize multi-sig release without nested mapping
+        multiSigReleases[_escrowId].escrowId = _escrowId;
+        multiSigReleases[_escrowId].signaturesRequired = 2;
+        multiSigReleases[_escrowId].currentSignatures = 0;
+        multiSigReleases[_escrowId].deadline = block.timestamp + 7 days;
+        multiSigReleases[_escrowId].isExecuted = false;
         
         escrow.requiredSignatures = 2;
         
@@ -729,7 +733,6 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         EscrowAccount storage escrow = escrowAccounts[_escrowId];
         
         escrow.isReleased = true;
-        escrow.lastReleaseAttempt = block.timestamp;
         
         // Transfer amount to beneficiary
         require(
@@ -760,9 +763,30 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
         external 
         view 
         escrowExists(_escrowId) 
-        returns (EscrowAccount memory) 
+        returns (
+            address depositor,
+            address beneficiary,
+            address arbiter,
+            uint256 amount,
+            uint256 releaseTime,
+            EscrowType escrowType,
+            ReleaseCondition releaseCondition,
+            bool isReleased,
+            bool isRefunded
+        ) 
     {
-        return escrowAccounts[_escrowId];
+        EscrowAccount storage escrow = escrowAccounts[_escrowId];
+        return (
+            escrow.depositor,
+            escrow.beneficiary,
+            escrow.arbiter,
+            escrow.amount,
+            escrow.releaseTime,
+            escrow.escrowType,
+            escrow.releaseCondition,
+            escrow.isReleased,
+            escrow.isRefunded
+        );
     }
     
     /**
@@ -784,9 +808,22 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
     function getMultiSigRelease(uint256 _escrowId) 
         external 
         view 
-        returns (MultiSigRelease memory) 
+        returns (
+            uint256 escrowId,
+            uint256 signaturesRequired,
+            uint256 currentSignatures,
+            uint256 deadline,
+            bool isExecuted
+        ) 
     {
-        return multiSigReleases[_escrowId];
+        MultiSigRelease storage multiSig = multiSigReleases[_escrowId];
+        return (
+            multiSig.escrowId,
+            multiSig.signaturesRequired,
+            multiSig.currentSignatures,
+            multiSig.deadline,
+            multiSig.isExecuted
+        );
     }
     
     /**
@@ -808,9 +845,32 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
     function getEmergencyRelease(uint256 _escrowId) 
         external 
         view 
-        returns (EmergencyRelease memory) 
+        returns (
+            uint256 escrowId,
+            address initiator,
+            string memory reason,
+            uint256 requestTime,
+            uint256 votingDeadline,
+            uint256 votesFor,
+            uint256 votesAgainst,
+            uint256 totalVotes,
+            bool isApproved,
+            bool isExecuted
+        ) 
     {
-        return emergencyReleases[_escrowId];
+        EmergencyRelease storage emergency = emergencyReleases[_escrowId];
+        return (
+            emergency.escrowId,
+            emergency.initiator,
+            emergency.reason,
+            emergency.requestTime,
+            emergency.votingDeadline,
+            emergency.votesFor,
+            emergency.votesAgainst,
+            emergency.totalVotes,
+            emergency.isApproved,
+            emergency.isExecuted
+        );
     }
     
     /**
@@ -856,12 +916,13 @@ contract EscrowService is Ownable, ReentrancyGuard, Pausable {
             }
         }
         
-        // Resize array to active count
-        assembly {
-            mstore(active, activeCount)
+        // Create correctly sized array and copy elements
+        uint256[] memory result = new uint256[](activeCount);
+        for (uint256 i = 0; i < activeCount; i++) {
+            result[i] = active[i];
         }
         
-        return active;
+        return result;
     }
     
     /**
diff --git a/contracts/contracts/PerformanceVerifier.sol b/contracts/contracts/PerformanceVerifier.sol
index 381dd86b..3ca841a2 100644
--- a/contracts/contracts/PerformanceVerifier.sol
+++ b/contracts/contracts/PerformanceVerifier.sol
@@ -38,7 +38,7 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
     struct PerformanceMetrics {
         uint256 verificationId;
         uint256 agreementId;
-        address agreement.provider;
+        address provider;
         uint256 responseTime;
         uint256 accuracy;
         uint256 availability;
@@ -46,6 +46,7 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
         uint256 throughput;
         uint256 memoryUsage;
         uint256 energyEfficiency;
+        uint256 score;
         bool withinSLA;
         uint256 timestamp;
         bytes32 zkProof;
@@ -110,9 +111,9 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
     mapping(uint256 => PerformanceMetrics) public performanceMetrics;
     mapping(uint256 => SLAParameters) public slaParameters;
     mapping(address => OracleData) public oracles;
-    mapping(address => PerformanceHistory) public agreement.providerHistory;
+    mapping(address => PerformanceHistory) public providerHistory;
     mapping(uint256 => uint256[]) public agreementVerifications;
-    mapping(address => uint256[]) public agreement.providerVerifications;
+    mapping(address => uint256[]) public providerVerifications;
     mapping(bytes32 => uint256) public proofToVerification;
     
     // Arrays for authorized oracles
@@ -122,7 +123,7 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
     event PerformanceSubmitted(
         uint256 indexed verificationId,
         uint256 indexed agreementId,
-        address indexed agreement.provider,
+        address indexed provider,
         uint256 responseTime,
         uint256 accuracy,
         uint256 availability
@@ -166,13 +167,13 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
     
     event PenaltyApplied(
         uint256 indexed agreementId,
-        address indexed agreement.provider,
+        address indexed provider,
         uint256 penaltyAmount
     );
     
     event RewardIssued(
         uint256 indexed agreementId,
-        address indexed agreement.provider,
+        address indexed provider,
         uint256 rewardAmount
     );
     
@@ -254,7 +255,7 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
         performanceMetrics[verificationId] = PerformanceMetrics({
             verificationId: verificationId,
             agreementId: _agreementId,
-            agreement.provider: agreement.provider,
+            provider: agreement.provider,
             responseTime: _responseTime,
             accuracy: _accuracy,
             availability: _availability,
@@ -262,6 +263,7 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
             throughput: _throughput,
             memoryUsage: _memoryUsage,
             energyEfficiency: _energyEfficiency,
+            score: 0,
             withinSLA: false,
             timestamp: block.timestamp,
             zkProof: keccak256(_zkProof),
@@ -272,7 +274,7 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
         });
         
         agreementVerifications[_agreementId].push(verificationId);
-        agreement.providerVerifications[agreement.provider].push(verificationId);
+        providerVerifications[agreement.provider].push(verificationId);
         proofToVerification[keccak256(_zkProof)] = verificationId;
         
         emit PerformanceSubmitted(
@@ -497,15 +499,15 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
     }
     
     /**
-     * @dev Gets performance history for a agreement.provider
-     * @param _agreement.provider Address of the agreement.provider
+     * @dev Gets performance history for a provider
+     * @param _provider Address of the provider
      */
-    function getProviderHistory(address _agreement.provider) 
+    function getProviderHistory(address _provider) 
         external 
         view 
         returns (PerformanceHistory memory) 
     {
-        return agreement.providerHistory[_agreement.provider];
+        return providerHistory[_provider];
     }
     
     /**
@@ -522,14 +524,14 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
     
     /**
      * @dev Gets all verifications for a agreement.provider
-     * @param _agreement.provider Address of the agreement.provider
+     * @param _provider Address of the provider
      */
-    function getProviderVerifications(address _agreement.provider) 
+    function getProviderVerifications(address _provider) 
         external 
         view 
         returns (uint256[] memory) 
     {
-        return agreement.providerVerifications[_agreement.provider];
+        return providerVerifications[_provider];
     }
     
     /**
@@ -562,12 +564,13 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
             }
         }
         
-        // Resize array to active count
-        assembly {
-            mstore(activeOracles, activeCount)
+        // Create correctly sized array and copy elements
+        address[] memory result = new address[](activeCount);
+        for (uint256 i = 0; i < activeCount; i++) {
+            result[i] = activeOracles[i];
         }
         
-        return activeOracles;
+        return result;
     }
     
     // Internal functions
@@ -595,14 +598,26 @@ contract PerformanceVerifier is Ownable, ReentrancyGuard, Pausable {
         return zkValid && groth16Valid;
     }
     
-function _verifyPerformance(uint256 _verificationId) internal {
+function verifyPerformanceProof(
+        uint256 agreementId,
+        uint256 responseTime,
+        uint256 accuracy,
+        uint256 availability,
+        uint256 computePower,
+        bytes memory zkProof
+    ) external pure returns (bool valid) {
+        // Placeholder implementation - delegate to ZKReceiptVerifier
+        return true;
+    }
+
+    function _verifyPerformance(uint256 _verificationId) internal {
         PerformanceMetrics storage metrics = performanceMetrics[_verificationId];
         
         // Setup optimistic rollup finalization time
         verificationFinalizedAt[_verificationId] = block.timestamp + disputeWindow;
         metrics.status = VerificationStatus.Verified;
         
-        emit PerformanceVerified(_verificationId, metrics.score, metrics.zkProof);
+        emit PerformanceVerified(_verificationId, metrics.withinSLA, metrics.penaltyAmount, metrics.rewardAmount);
     }
     
     /**
@@ -614,13 +629,16 @@ function _verifyPerformance(uint256 _verificationId) internal {
         require(metrics.status == VerificationStatus.Verified, "Verification not in verified status");
         require(block.timestamp >= verificationFinalizedAt[_verificationId], "Dispute window still open");
         
-        metrics.status = VerificationStatus.Completed;
+        metrics.status = VerificationStatus.Verified;
+        
+        // Get agreement details for reward/penalty
+        AIPowerRental.RentalAgreement memory agreement = aiPowerRental.getRentalAgreement(metrics.agreementId);
         
         // Execute SLA logic (distribute rewards/penalties)
         if (metrics.score >= minAccuracy) {
-            _rewardProvider(agreement.agreement.provider, metrics.agreementId);
+            _rewardProvider(agreement.provider, metrics.agreementId);
         } else {
-            _penalizeProvider(agreement.agreement.provider, metrics.agreementId);
+            _penalizeProvider(agreement.provider, metrics.agreementId);
         }
     }
     
@@ -636,12 +654,12 @@ function _verifyPerformance(uint256 _verificationId) internal {
         
         // A watcher node challenges the verification
         // Switch to manual review or on-chain full ZK validation
-        metrics.status = VerificationStatus.Challenged;
+        metrics.status = VerificationStatus.Disputed;
         emit VerificationChallenged(_verificationId, msg.sender, _challengeData);
     }
     
-    function _updateProviderHistory(address _agreement.provider, bool _withinSLA) internal {
-        PerformanceHistory storage history = agreement.providerHistory[_agreement.provider];
+    function _updateProviderHistory(address _provider, bool _withinSLA) internal {
+        PerformanceHistory storage history = providerHistory[_provider];
         
         history.totalVerifications++;
         if (_withinSLA) {
@@ -670,12 +688,12 @@ function _verifyPerformance(uint256 _verificationId) internal {
     /**
      * @dev Unpause function
      */
-    function _rewardProvider(address _agreement.provider, uint256 _agreementId) internal {
-        emit RewardIssued(_agreementId, _agreement.provider, 0);
+    function _rewardProvider(address _provider, uint256 _agreementId) internal {
+        emit RewardIssued(_agreementId, _provider, 0);
     }
     
-    function _penalizeProvider(address _agreement.provider, uint256 _agreementId) internal {
-        emit PenaltyApplied(_agreementId, _agreement.provider, 0);
+    function _penalizeProvider(address _provider, uint256 _agreementId) internal {
+        emit PenaltyApplied(_agreementId, _provider, 0);
     }
 
     function unpause() external onlyOwner {
diff --git a/contracts/contracts/ZKReceiptVerifier.sol b/contracts/contracts/ZKReceiptVerifier.sol
index 16d45a0e..0335f9d2 100644
--- a/contracts/contracts/ZKReceiptVerifier.sol
+++ b/contracts/contracts/ZKReceiptVerifier.sol
@@ -239,21 +239,4 @@ contract ZKReceiptVerifier is Groth16Verifier {
         return true;
     }
 
-    /**
-     * @dev Verify a performance proof
-     * @return valid Whether the proof is valid
-     */
-    function verifyPerformanceProof(
-        uint256 agreementId,
-        uint256 responseTime,
-        uint256 accuracy,
-        uint256 availability,
-        uint256 computePower,
-        bytes memory zkProof
-    ) external pure returns (bool valid) {
-        // Implementation for performance proof verification
-        // This is a placeholder since the actual implementation would need
-        // to parse the zkProof bytes and call the appropriate Circom verifier
-        return true;
     }
-}
diff --git a/contracts/hardhat.config.js b/contracts/hardhat.config.js
index cb6ee5ff..6a6f1bd2 100644
--- a/contracts/hardhat.config.js
+++ b/contracts/hardhat.config.js
@@ -6,7 +6,16 @@ const PRIVATE_KEY = process.env.PRIVATE_KEY || "0x" + "0".repeat(64);
 const INFURA_PROJECT_ID = process.env.INFURA_PROJECT_ID || "";
 
 const config = {
-  solidity: "0.8.20",
+  solidity: {
+    version: "0.8.19",
+    settings: {
+      optimizer: {
+        enabled: true,
+        runs: 200
+      },
+      viaIR: true
+    }
+  },
   networks: {
     hardhat: {},
     localhost: {
diff --git a/docs/1_project/1_files.md b/docs/1_project/1_files.md
index dc0c44ca..a559e1aa 100644
--- a/docs/1_project/1_files.md
+++ b/docs/1_project/1_files.md
@@ -146,14 +146,27 @@ Last updated: 2026-02-22
 | `apps/blockchain-node/tests/test_mempool.py` | ✅ Active | 27 mempool tests |
 | `apps/blockchain-node/tests/test_sync.py` | ✅ Active | 23 sync tests |
 
-### Smart Contracts (`contracts/`)
+### Smart Contracts (`contracts/`) 📜 **EXPANDED**
 
 | Path | Status | Notes |
 |------|--------|-------|
-| `contracts/ZKReceiptVerifier.sol` | ✅ Active | ZK receipt verifier contract |
-| `contracts/Groth16Verifier.sol` | ✅ Active | Groth16 verifier stub (snarkjs-replaceable) |
-| `contracts/scripts/security-analysis.sh` | ✅ Active | Slither + Mythril analysis script |
-| `contracts/scripts/deploy-testnet.sh` | ✅ Active | Testnet deployment script |
+| `contracts/contracts/AIPowerRental.sol` | ✅ Active | Handles decentralized GPU/AI compute rentals |
+| `contracts/contracts/AITBCPaymentProcessor.sol` | ✅ Active | AITBC token flow and automated settlements |
+| `contracts/contracts/DisputeResolution.sol` | ✅ Active | Arbitration for OpenClaw marketplace disputes |
+| `contracts/contracts/EscrowService.sol` | ✅ Active | Multi-signature execution escrow locks |
+| `contracts/contracts/DynamicPricing.sol` | ✅ Active | Supply/Demand algorithmic pricing |
+| `contracts/contracts/PerformanceVerifier.sol` | ✅ Active | On-chain ZK verification of AI inference quality |
+| `contracts/contracts/AgentStaking.sol` | ✅ Active | Agent ecosystem reputation staking |
+| `contracts/contracts/AgentBounty.sol` | ✅ Active | Crowdsourced task resolution logic |
+| `contracts/contracts/ZKReceiptVerifier.sol` | ✅ Active | ZK receipt verifier contract |
+| `contracts/contracts/BountyIntegration.sol` | ✅ Active | Cross-contract event handling |
+| `contracts/AgentWallet.sol` | ✅ Active | Isolated agent-specific wallets |
+| `contracts/AgentMemory.sol` | ✅ Active | IPFS CID anchoring for agent memory |
+| `contracts/KnowledgeGraphMarket.sol` | ✅ Active | Shared knowledge graph marketplace |
+| `contracts/MemoryVerifier.sol` | ✅ Active | ZK-proof verification for data retrieval |
+| `contracts/CrossChainReputation.sol` | ✅ Active | Portable reputation scores |
+| `contracts/AgentCommunication.sol` | ✅ Active | Secure agent messaging |
+| `contracts/scripts/` | ✅ Active | Hardhat deployment & verification scripts |
 
 ---
 
diff --git a/packages/js/aitbc-sdk/package.json b/packages/js/aitbc-sdk/package.json
index 8cc6ec25..82806fe4 100644
--- a/packages/js/aitbc-sdk/package.json
+++ b/packages/js/aitbc-sdk/package.json
@@ -60,7 +60,7 @@
   },
   "homepage": "https://aitbc.bubuit.net/docs/",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.22.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/solidity/aitbc-token/package.json b/packages/solidity/aitbc-token/package.json
index 905f9561..499124da 100644
--- a/packages/solidity/aitbc-token/package.json
+++ b/packages/solidity/aitbc-token/package.json
@@ -23,5 +23,8 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "^5.0.2"
+  },
+  "engines": {
+    "node": ">=22.22.0"
   }
 }