evm: Deploy DST20 for loan tokens

lib/ain-evm/src/evm.rs

@@ -41,6 +41,7 @@ pub struct FinalizedBlockInfo {
     pub failed_transactions: Vec<String>,
     pub total_burnt_fees: U256,
     pub total_priority_fees: U256,
+    pub block_number: U256,
 }
 
 pub struct DeployContractInfo {
@@ -343,6 +344,7 @@ impl EVMServices {
             failed_transactions,
             total_burnt_fees,
             total_priority_fees,
+            block_number: current_block_number,
         })
     }
 
@@ -524,7 +526,7 @@ impl EVMServices {
         })
     }
 
-    pub fn is_dst20_deployed_or_queued(
+    pub unsafe fn is_dst20_deployed_or_queued(
         &self,
         queue_id: u64,
         name: &str,
@@ -549,11 +551,7 @@ impl EVMServices {
             address,
         }));
 
-        let is_queued = self
-            .core
-            .tx_queues
-            .get_queue(queue_id)?
-            .is_queued(deploy_tx);
+        let is_queued = self.core.tx_queues.get(queue_id)?.is_queued(deploy_tx);
 
         Ok(is_queued)
     }

lib/ain-rs-exports/src/evm.rs

@@ -424,13 +424,15 @@ pub fn evm_unsafe_try_construct_block_in_q(
                 failed_transactions,
                 total_burnt_fees,
                 total_priority_fees,
+                block_number,
             }) => {
                 cross_boundary_success(result);
                 ffi::FinalizeBlockCompletion {
                     block_hash,
                     failed_transactions,
                     total_burnt_fees: WeiAmount(total_burnt_fees).to_satoshi().as_u64(),
                     total_priority_fees: WeiAmount(total_priority_fees).to_satoshi().as_u64(),
+                    block_number: block_number.as_u64(),
                 }
             }
             Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -508,12 +510,14 @@ pub fn evm_try_is_dst20_deployed_or_queued(
     symbol: &str,
     token_id: &str,
 ) -> bool {
-    match SERVICES
-        .evm
-        .is_dst20_deployed_or_queued(queue_id, name, symbol, token_id)
-    {
-        Ok(is_deployed) => cross_boundary_success_return(result, is_deployed),
-        Err(e) => cross_boundary_error_return(result, e.to_string()),
+    unsafe {
+        match SERVICES
+            .evm
+            .is_dst20_deployed_or_queued(queue_id, name, symbol, token_id)
+        {
+            Ok(is_deployed) => cross_boundary_success_return(result, is_deployed),
+            Err(e) => cross_boundary_error_return(result, e.to_string()),
+        }
     }
 }
 

lib/ain-rs-exports/src/lib.rs

@@ -46,6 +46,7 @@ pub mod ffi {
         pub failed_transactions: Vec<String>,
         pub total_burnt_fees: u64,
         pub total_priority_fees: u64,
+        pub block_number: u64,
     }
 
     #[derive(Default)]

src/masternodes/validation.cpp

@@ -2386,7 +2386,7 @@ static Res ValidateCoinbaseXVMOutput(const CScript &scriptPubKey, const Finalize
 
     auto res = XVM::TryFrom(scriptPubKey);
     if (!res.ok) return res;
-    
+
     auto obj = *res;
 
     if (obj.evm.blockHash != coinbaseBlockHash) {
@@ -2404,8 +2404,8 @@ static Res ValidateCoinbaseXVMOutput(const CScript &scriptPubKey, const Finalize
     return Res::Ok();
 }
 
-static Res ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCustomCSView &cache, const CChainParams& chainparams, const uint64_t evmQueueId, std::array<uint8_t, 20>& beneficiary, const bool evmEnabledOnBlockHead) {
-    if (!IsEVMEnabled(pindex->nHeight, cache, chainparams.GetConsensus())) return Res::Ok();
+static ResVal<uint64_t> ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCustomCSView &cache, const CChainParams& chainparams, const uint64_t evmQueueId, std::array<uint8_t, 20>& beneficiary, const bool evmEnabledOnBlockHead) {
+    if (!IsEVMEnabled(pindex->nHeight, cache, chainparams.GetConsensus())) return {std::numeric_limits<uint64_t>::max(), Res::Ok()};
 
     CKeyID minter;
     assert(block.ExtractMinterKey(minter));
@@ -2484,9 +2484,31 @@ static Res ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCust
     res = cache.AddBalance(minerAddress, {DCT_ID{}, static_cast<CAmount>(blockResult.total_priority_fees)});
     if (!res) return res;
 
-    return Res::Ok();
+    return {blockResult.block_number, Res::Ok()};
+}
+
+
+static Res ProcessDST20Migration(const CBlock &block, const CBlockIndex *pindex, CCustomCSView &cache, const CChainParams& chainparams, const uint64_t evmQueueId, std::array<uint8_t, 20>& beneficiary, const bool evmEnabledOnBlockHead) {
+    if (!IsEVMEnabled(pindex->nHeight, cache, chainparams.GetConsensus())) return Res::Ok();
+    auto time = GetTimeMillis();
+    LogPrintf("DST20 migration ...\n");
+
+    CrossBoundaryResult result;
+    cache.ForEachLoanToken([&](DCT_ID const & key, CLoanView::CLoanSetLoanTokenImpl loanToken) {
+        if (evm_try_is_dst20_deployed_or_queued(result, evmQueueId, loanToken.name, loanToken.symbol, key.ToString())) {
+            return result.ok;
+        }
+
+        evm_try_create_dst20(result, evmQueueId, loanToken.creationTx.GetByteArray(),
+                    loanToken.name, loanToken.symbol, key.ToString());
+        return result.ok;
+    });
+    LogPrint(BCLog::BENCH, "    - DST20 migration took: %dms\n", GetTimeMillis() - time);
+    return result.ok ? Res::Ok() : Res::Err("Error migrating DST20 token: %s", result.reason.c_str());
 }
 
+
+
 static void FlushCacheCreateUndo(const CBlockIndex *pindex, CCustomCSView &mnview, CCustomCSView &cache, const uint256 hash) {
     // construct undo
     auto& flushable = cache.GetStorage();
@@ -2506,6 +2528,12 @@ Res ProcessFallibleEvent(const CBlock &block, const CBlockIndex *pindex, CCustom
     auto res = ProcessEVMQueue(block, pindex, cache, chainparams, evmQueueId, beneficiary, evmEnabledOnBlockHead);
     if (!res) return res;
 
+    auto isEVMGenesisBlock = *res.val == 0;
+    if (isEVMGenesisBlock) {
+        auto res = ProcessDST20Migration(block, pindex, cache, chainparams, evmQueueId, beneficiary, evmEnabledOnBlockHead);
+        if (!res) return res;
+    }
+
     // Construct undo
     FlushCacheCreateUndo(pindex, mnview, cache, uint256S(std::string(64, '1')));
 

src/validation.cpp

@@ -2410,7 +2410,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
     if (pindex->nHeight == chainparams.GetConsensus().FortCanningHillHeight) {
         auto time = GetTimeMillis();
         LogPrintf("Interest rate migration ...\n");
-        mnview.MigrateInterestRateToV2(mnview,(uint32_t)pindex->nHeight);
+        mnview.MigrateInterestRateToV2(mnview, static_cast<uint32_t>(pindex->nHeight));
         LogPrint(BCLog::BENCH, "    - Interest rate migration took: %dms\n", GetTimeMillis() - time);
     }