From 5a05dd2b6981dcc2c2d22f71d85e6d7e45e94148 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Thu, 23 Nov 2023 17:58:51 +0800
Subject: [PATCH 1/6] CI: Fix creating / staging release (#2708)

* Remove master branch checkout on creating release

* Correct fixes to build release tag workflow

* Clean up genbuild

* Remove all master ref tag

* Better rename

* Use git_version if env variable is set in genbuild

* Fix git version to build version

* Fix typo
---
 .github/workflows/build-release.yaml | 12 ------------
 .github/workflows/build-staging.yaml | 12 ------------
 contrib/genbuild.sh                  | 15 ++++++++-------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
index 5525552106..43f8d4f769 100644
--- a/.github/workflows/build-release.yaml
+++ b/.github/workflows/build-release.yaml
@@ -20,8 +20,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -57,8 +55,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -80,8 +76,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -103,8 +97,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -126,8 +118,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -153,8 +143,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
index 4567d2249c..fe56c3d076 100644
--- a/.github/workflows/build-staging.yaml
+++ b/.github/workflows/build-staging.yaml
@@ -15,8 +15,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -37,8 +35,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -59,8 +55,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -81,8 +75,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -103,8 +95,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -133,8 +123,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: master
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
diff --git a/contrib/genbuild.sh b/contrib/genbuild.sh
index 64bccc5867..47b12a2600 100755
--- a/contrib/genbuild.sh
+++ b/contrib/genbuild.sh
@@ -25,7 +25,7 @@ git_check_in_repo() {
 DESC=""
 SUFFIX=""
 CURRENT_BRANCH=""
-if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
+if [ -z "$BUILD_VERSION" ] && [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null
 
@@ -49,14 +49,15 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$
         SUFFIX="$(echo $CURRENT_BRANCH | sed 's/\//-/g')-$SUFFIX"
     fi
 
-    if [ "$CURRENT_BRANCH" != "hotfix" ] && [ "$CURRENT_BRANCH" != "master" ]; then
-        # if it's hotfix branch, don't mark dirty.
-        # otherwise generate suffix from git, i.e. string like "59887e8-dirty". 
-        git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
-    fi
+    # Check for changes in tracked files against the
+    # index/working tree, mark as dirty if changes
+    # are present.
+    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
 fi
 
-if [ -n "$DESC" ]; then
+if [ -n "$BUILD_VERSION" ]; then
+    NEWINFO="#define BUILD_DESC \"$BUILD_VERSION\""
+elif [ -n "$DESC" ]; then
     NEWINFO="#define BUILD_DESC \"$DESC\""
 elif [ -n "$SUFFIX" ]; then
     NEWINFO="#define BUILD_SUFFIX $SUFFIX"

From 45f7e3a31a0117709466e8b8e8af3777cd2fad27 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Thu, 23 Nov 2023 18:00:32 +0800
Subject: [PATCH 2/6] Add td single key check config into defid (#2714)

---
 src/dfi/rpc_accounts.cpp | 2 +-
 src/init.cpp             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dfi/rpc_accounts.cpp b/src/dfi/rpc_accounts.cpp
index 7d7f8d12bc..a1212383de 100644
--- a/src/dfi/rpc_accounts.cpp
+++ b/src/dfi/rpc_accounts.cpp
@@ -2309,7 +2309,7 @@ UniValue transferdomain(const JSONRPCRequest &request) {
         //     dst.data.assign(dstObj["data"].getValStr().begin(), dstObj["data"].getValStr().end());
 
         // Single key check
-        bool singlekeycheck = true;
+        auto singlekeycheck = gArgs.GetBoolArg("-tdsinglekeycheck", true);
         if (!singlekeycheckObj.isNull()) {
             singlekeycheck = singlekeycheckObj.getBool();
         }
diff --git a/src/init.cpp b/src/init.cpp
index 9186b3121e..8300a74f3c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -609,6 +609,7 @@ void SetupServerArgs()
     gArgs.AddArg("-printpriority", strprintf("Log transaction fee per kB when mining blocks (default: %u)", DEFAULT_PRINTPRIORITY), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     gArgs.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -daemon. To disable logging to file, set -nodebuglogfile)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     gArgs.AddArg("-shrinkdebugfile", "Shrink debug.log file on client startup (default: 1 when no -debug)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
+    gArgs.AddArg("-tdsinglekeycheck", "Set the single key check flag for transferdomain RPC. If enabled, transfers between domain are only allowed if the addresses specified corresponds to the same key (default: true)", ArgsManager::ALLOW_ANY, OptionsCategory::RPC);
     gArgs.AddArg("-uacomment=<cmt>", "Append comment to the user agent string", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
 
     SetupChainParamsBaseOptions();

From 042bd3ce0d83f3a5f3accaa3fa614c71ea86f427 Mon Sep 17 00:00:00 2001
From: Jouzo <15011228+Jouzo@users.noreply.github.com>
Date: Thu, 23 Nov 2023 11:09:59 +0100
Subject: [PATCH 3/6] EVM: Add Code to storage cache (#2692)

* Switch LRU behind RwLock to Mutex

* Add code cache

* Rename code index name
---
 lib/ain-evm/src/storage/cache.rs | 69 ++++++++++++++++----------------
 lib/ain-evm/src/storage/mod.rs   | 12 +++++-
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/lib/ain-evm/src/storage/cache.rs b/lib/ain-evm/src/storage/cache.rs
index b645cdc5bd..2c81ce4662 100644
--- a/lib/ain-evm/src/storage/cache.rs
+++ b/lib/ain-evm/src/storage/cache.rs
@@ -3,16 +3,18 @@ use std::{borrow::ToOwned, num::NonZeroUsize, sync::RwLock};
 use ethereum::{BlockAny, TransactionV2};
 use ethereum_types::{H256, U256};
 use lru::LruCache;
+use parking_lot::Mutex;
 
 use super::traits::{BlockStorage, Rollback, TransactionStorage};
 use crate::Result;
 
 #[derive(Debug)]
 pub struct Cache {
-    transactions: RwLock<LruCache<H256, TransactionV2>>,
-    blocks: RwLock<LruCache<U256, BlockAny>>,
-    block_hashes: RwLock<LruCache<H256, U256>>,
+    transactions: Mutex<LruCache<H256, TransactionV2>>,
+    blocks: Mutex<LruCache<U256, BlockAny>>,
+    block_hashes: Mutex<LruCache<H256, U256>>,
     latest_block: RwLock<Option<BlockAny>>,
+    contract_code: Mutex<LruCache<H256, Vec<u8>>>,
 }
 
 impl Cache {
@@ -20,13 +22,16 @@ impl Cache {
 
     pub fn new(cache_size: Option<usize>) -> Self {
         Cache {
-            transactions: RwLock::new(LruCache::new(
+            transactions: Mutex::new(LruCache::new(
                 NonZeroUsize::new(cache_size.unwrap_or(Self::DEFAULT_CACHE_SIZE)).unwrap(),
             )),
-            blocks: RwLock::new(LruCache::new(
+            blocks: Mutex::new(LruCache::new(
                 NonZeroUsize::new(cache_size.unwrap_or(Self::DEFAULT_CACHE_SIZE)).unwrap(),
             )),
-            block_hashes: RwLock::new(LruCache::new(
+            block_hashes: Mutex::new(LruCache::new(
+                NonZeroUsize::new(cache_size.unwrap_or(Self::DEFAULT_CACHE_SIZE)).unwrap(),
+            )),
+            contract_code: Mutex::new(LruCache::new(
                 NonZeroUsize::new(cache_size.unwrap_or(Self::DEFAULT_CACHE_SIZE)).unwrap(),
             )),
             latest_block: RwLock::new(None),
@@ -36,19 +41,13 @@ impl Cache {
 
 impl BlockStorage for Cache {
     fn get_block_by_number(&self, number: &U256) -> Result<Option<BlockAny>> {
-        let block = self
-            .blocks
-            .write()
-            .unwrap()
-            .get(number)
-            .map(ToOwned::to_owned);
+        let block = self.blocks.lock().get(number).map(ToOwned::to_owned);
         Ok(block)
     }
 
     fn get_block_by_hash(&self, block_hash: &H256) -> Result<Option<BlockAny>> {
         self.block_hashes
-            .write()
-            .unwrap()
+            .lock()
             .get(block_hash)
             .map_or(Ok(None), |block_number| {
                 self.get_block_by_number(block_number)
@@ -60,11 +59,8 @@ impl BlockStorage for Cache {
 
         let block_number = block.header.number;
         let hash = block.header.hash();
-        self.blocks
-            .write()
-            .unwrap()
-            .put(block_number, block.clone());
-        self.block_hashes.write().unwrap().put(hash, block_number);
+        self.blocks.lock().put(block_number, block.clone());
+        self.block_hashes.lock().put(hash, block_number);
         Ok(())
     }
 
@@ -87,7 +83,7 @@ impl BlockStorage for Cache {
 
 impl TransactionStorage for Cache {
     fn extend_transactions_from_block(&self, block: &BlockAny) -> Result<()> {
-        let mut cache = self.transactions.write().unwrap();
+        let mut cache = self.transactions.lock();
 
         for transaction in &block.transactions {
             let hash = transaction.hash();
@@ -97,12 +93,7 @@ impl TransactionStorage for Cache {
     }
 
     fn get_transaction_by_hash(&self, hash: &H256) -> Result<Option<TransactionV2>> {
-        let transaction = self
-            .transactions
-            .write()
-            .unwrap()
-            .get(hash)
-            .map(ToOwned::to_owned);
+        let transaction = self.transactions.lock().get(hash).map(ToOwned::to_owned);
         Ok(transaction)
     }
 
@@ -112,8 +103,7 @@ impl TransactionStorage for Cache {
         index: usize,
     ) -> Result<Option<TransactionV2>> {
         self.block_hashes
-            .write()
-            .unwrap()
+            .lock()
             .get(block_hash)
             .map_or(Ok(None), |block_number| {
                 self.get_transaction_by_block_number_and_index(block_number, index)
@@ -127,8 +117,7 @@ impl TransactionStorage for Cache {
     ) -> Result<Option<TransactionV2>> {
         let transaction = self
             .blocks
-            .write()
-            .unwrap()
+            .lock()
             .get(block_number)
             .and_then(|block| block.transactions.get(index).map(ToOwned::to_owned));
         Ok(transaction)
@@ -136,8 +125,7 @@ impl TransactionStorage for Cache {
 
     fn put_transaction(&self, transaction: &TransactionV2) -> Result<()> {
         self.transactions
-            .write()
-            .unwrap()
+            .lock()
             .put(transaction.hash(), transaction.clone());
         Ok(())
     }
@@ -146,13 +134,13 @@ impl TransactionStorage for Cache {
 impl Rollback for Cache {
     fn disconnect_latest_block(&self) -> Result<()> {
         if let Some(block) = self.get_latest_block()? {
-            let mut transaction_cache = self.transactions.write().unwrap();
+            let mut transaction_cache = self.transactions.lock();
             for tx in &block.transactions {
                 transaction_cache.pop(&tx.hash());
             }
 
-            self.block_hashes.write().unwrap().pop(&block.header.hash());
-            self.blocks.write().unwrap().pop(&block.header.number);
+            self.block_hashes.lock().pop(&block.header.hash());
+            self.blocks.lock().pop(&block.header.number);
 
             let previous_block = self.get_block_by_hash(&block.header.parent_hash)?;
             self.put_latest_block(previous_block.as_ref())?;
@@ -160,3 +148,14 @@ impl Rollback for Cache {
         Ok(())
     }
 }
+
+impl Cache {
+    pub fn get_code_by_hash(&self, hash: &H256) -> Result<Option<Vec<u8>>> {
+        Ok(self.contract_code.lock().get(hash).map(ToOwned::to_owned))
+    }
+
+    pub fn put_code(&self, hash: H256, code: &[u8]) -> Result<()> {
+        self.contract_code.lock().put(hash, code.to_vec());
+        Ok(())
+    }
+}
diff --git a/lib/ain-evm/src/storage/mod.rs b/lib/ain-evm/src/storage/mod.rs
index d3ee93c5b9..00f5eda18d 100644
--- a/lib/ain-evm/src/storage/mod.rs
+++ b/lib/ain-evm/src/storage/mod.rs
@@ -193,7 +193,17 @@ impl FlushableStorage for Storage {
 
 impl Storage {
     pub fn get_code_by_hash(&self, address: H160, hash: H256) -> Result<Option<Vec<u8>>> {
-        self.blockstore.get_code_by_hash(address, &hash)
+        match self.cache.get_code_by_hash(&hash) {
+            Ok(Some(code)) => Ok(Some(code)),
+            Ok(None) => {
+                let code = self.blockstore.get_code_by_hash(address, &hash);
+                if let Ok(Some(ref code)) = code {
+                    self.cache.put_code(hash, code)?;
+                }
+                code
+            }
+            Err(e) => Err(e),
+        }
     }
 
     pub fn put_code(

From cd29ac3ebbf75513bd85c02fd036798267beb66a Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Fri, 24 Nov 2023 16:55:26 +0800
Subject: [PATCH 4/6] CI: Shift workflows to local build, cleanup pipelines
 (#2717)

* Revert genbuild

* Initial dev on build-dev ci workflow

* Fix dubious repo

* Shift docker defi build out of container

* Fix pkg name

* Add zip dep

* Fix populate env

* Remove incorrect copy command in defi dockerfile

* Revert dockerfile

* Fix sh check

* Clean up package dir

* Upgrade all checkout action to v4

* Add rust caching to build dev, release and staging

* Resolve copying package into docker image

* Remove dockerignore, fix release and staging builds

* Add git config to build dev

* Better rename

* Remove sudo privilege

* remove relative path

* Better rename

* Debug log

* Fix package path

* Better refactor

* Fix docker build

* Fix relative path
---
 .github/workflows/build-dev.yaml      |  87 ++++----
 .github/workflows/build-release.yaml  | 274 +++++---------------------
 .github/workflows/build-staging.yaml  | 148 +++-----------
 .github/workflows/lint.yaml           |   4 +-
 .github/workflows/tests-ethlibs.yaml  |  14 +-
 .github/workflows/tests-frontier.yml  |  17 +-
 .github/workflows/tests-jellyfish.yml |   5 +-
 .github/workflows/tests-sync.yml      |  17 +-
 .github/workflows/tests.yaml          |  11 +-
 contrib/dockerfiles/defi.dockerfile   |  24 +++
 contrib/dockerfiles/noarch.dockerfile |   2 +-
 contrib/genbuild.sh                   |   6 +-
 make.sh                               |  47 ++++-
 13 files changed, 232 insertions(+), 424 deletions(-)
 create mode 100644 contrib/dockerfiles/defi.dockerfile

diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml
index b1ee4d61da..18ab636c4d 100644
--- a/.github/workflows/build-dev.yaml
+++ b/.github/workflows/build-dev.yaml
@@ -25,74 +25,71 @@ env:
   GIT_VERSION: 1
 
 jobs:
-  linux-x64:
+  build:
     runs-on: ubuntu-latest
+    container: defi/ain-builder:latest
+    strategy:
+      matrix:
+        target: [x86_64-pc-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin]
     env:
-      TARGET: x86_64-pc-linux-gnu
+      TARGET: ${{matrix.target}}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
 
-    - name: Build and package
-      run: ./make.sh docker-release
+    - name: Setup dependencies
+      run: ./make.sh ci-setup-deps
+      
+    - name: Setup user dependencies
+      run: ./make.sh ci-setup-user-deps
 
-    - name: Publish artifact - x86_64-pc-linux-gnu
-      uses: actions/upload-artifact@v3
+    - uses: Swatinem/rust-cache@v2
       with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ env.DOCKER_HUB_USER }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-    - name: Push to Docker Hub
-      run: |
-        set -e; ver=${{ env.BUILD_VERSION }}
-        docker tag defichain-x86_64-pc-linux-gnu:${ver} defi/defichain:${ver}
-        docker push defi/defichain:${ver}
-
-  win-x64:
-    runs-on: ubuntu-latest
-    env:
-      TARGET: x86_64-w64-mingw32
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
+        workspaces: lib -> ../build/lib/target
+        save-if: ${{ github.ref == 'refs/heads/master' }}
 
     - name: Build and package
-      run: ./make.sh docker-release
+      run: ./make.sh release
 
-    - name: Publish artifact - x86_64-w64-mingw32
+    - name: Publish artifact
       uses: actions/upload-artifact@v3
       with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.tar.gz
+        name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}
+        path: ./build/defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}
 
-  osx-x64:
+  docker-build:
     runs-on: ubuntu-latest
+    needs: [build]
     env:
-      TARGET: x86_64-apple-darwin
+      TARGET: x86_64-pc-linux-gnu
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
 
-    - name: Build and package
-      run: ./make.sh docker-release
+    - name: Download Binaries
+      uses: actions/download-artifact@v3
+      with:
+        name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}
 
-    - name: Publish artifact - x86_64-apple-darwin
-      uses: actions/upload-artifact@v3
+    - name: Build defi image
+      run: rm .dockerignore && ./make.sh docker-defi-build
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
       with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin.tar.gz
+        username: ${{ env.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+    - name: Push to Docker Hub
+      run: |
+        set -e; ver=${{ env.BUILD_VERSION }}
+        docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver}
+        docker push defi/defichain:${ver}
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
index 43f8d4f769..6c4cba3507 100644
--- a/.github/workflows/build-release.yaml
+++ b/.github/workflows/build-release.yaml
@@ -12,153 +12,44 @@ env:
   GIT_VERSION: 1
 
 jobs:
-  linux-x64:
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    env:
-      TARGET: x86_64-pc-linux-gnu
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
-
-    - name: Build and package
-      run: ./make.sh docker-release
-
-    - name: Publish artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ env.DOCKER_HUB_USER }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-    - name: Push to Docker Hub
-      run: |
-        set -e; ver=${{ env.BUILD_VERSION }}
-        for tag in $(echo $ver latest); do 
-          docker tag defichain-x86_64-pc-linux-gnu:${ver} defi/defichain:${tag}
-        done
-        docker push defi/defichain:${ver}
-
-  linux-aarch64:
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    env:
-      TARGET: aarch64-linux-gnu
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
-    
-    - name: Build and package
-      run: ./make.sh docker-release
-
-    - name: Publish artifact - aarch64-linux-gnu
-      uses: actions/upload-artifact@v3
-      with:
-        name: defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu.tar.gz
-
-  win-x64:
+  create-release:
     runs-on: ubuntu-latest
+    container: defi/ain-builder:latest
     if: startsWith(github.ref, 'refs/tags/')
+    strategy:
+      matrix:
+        target: [x86_64-pc-linux-gnu, aarch64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, aarch64-apple-darwin]
     env:
-      TARGET: x86_64-w64-mingw32
+      TARGET: ${{matrix.target}}
 
     steps:
     - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
 
-    - name: Build and package
-      run: ./make.sh docker-release
+    - name: Setup dependencies
+      run: ./make.sh ci-setup-deps
+      
+    - name: Setup user dependencies
+      run: ./make.sh ci-setup-user-deps
 
-    - name: Publish artifact - x86_64-w64-mingw32
-      uses: actions/upload-artifact@v3
+    - uses: Swatinem/rust-cache@v2
       with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.tar.gz
-
-  osx-x64:
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    env:
-      TARGET: x86_64-apple-darwin
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
+        workspaces: lib -> ../build/lib/target
+        save-if: ${{ github.ref == 'refs/heads/master' }}
 
     - name: Build and package
-      run: ./make.sh docker-release
+      run: ./make.sh release
 
-    - name: Publish artifact - x86_64-apple-darwin
+    - name: Publish artifact
       uses: actions/upload-artifact@v3
       with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin.tar.gz
-
-  osx-aarch64:
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    env:
-      TARGET: aarch64-apple-darwin
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
-
-    - name: Build and package
-      run: ./make.sh docker-release
-
-    - name: Publish artifact - aarch64-apple-darwin
-      uses: actions/upload-artifact@v3
-      with:
-        name: defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin.tar.gz
-
-  create-release:
-    needs:
-      - linux-x64
-      - linux-aarch64
-      - win-x64
-      - osx-x64
-      - osx-aarch64
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
-
-    - name: Cleanup work dir
-      run: rm -rf *
-
-    - name: Get artifacts
-      uses: actions/download-artifact@v3
-
-    - name: zip package for win-x64
-      run: |
-        set -e; ver=${{ env.BUILD_VERSION }}
-        cd defichain-${ver}-x86_64-w64-mingw32
-        tar xzf defichain-${ver}-x86_64-w64-mingw32.tar.gz
-        zip -r "defichain-${ver}-x86_64-w64-mingw32.zip" defichain-${ver}/
+        name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}
+        path: |
+          ./build/defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}
+          ./build/defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}.SHA256
 
     - name: Get release
       id: get_release
@@ -166,116 +57,55 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Generate SHA256 checksum
-      run: |
-        set -e; ver=${{ env.BUILD_VERSION }}
-        (cd ./defichain-${ver}-x86_64-pc-linux-gnu
-        sha256sum ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz > ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz.SHA256)
-        (cd ./defichain-${ver}-aarch64-linux-gnu
-        sha256sum ./defichain-${ver}-aarch64-linux-gnu.tar.gz > ./defichain-${ver}-aarch64-linux-gnu.tar.gz.SHA256)
-        (cd ./defichain-${ver}-x86_64-w64-mingw32
-        sha256sum ./defichain-${ver}-x86_64-w64-mingw32.zip > ./defichain-${ver}-x86_64-w64-mingw32.zip.SHA256)
-        (cd ./defichain-${ver}-x86_64-apple-darwin
-        sha256sum ./defichain-${ver}-x86_64-apple-darwin.tar.gz > ././defichain-${ver}-x86_64-apple-darwin.tar.gz.SHA256)
-        (cd ./defichain-${ver}-aarch64-apple-darwin
-        sha256sum ./defichain-${ver}-aarch64-apple-darwin.tar.gz > ././defichain-${ver}-aarch64-apple-darwin.tar.gz.SHA256)
-
-    - name: Upload release asset - linux-x64
+    - name: Upload release asset
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu/defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz
-        asset_name: defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz
+        asset_path: ./build/defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}
+        asset_name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}
         asset_content_type: application/gzip
 
-    - name: Upload checksum - linux-x64
+    - name: Upload checksum
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu/defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz.SHA256
-        asset_name: defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz.SHA256
+        asset_path: ./build/defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}.SHA256
+        asset_name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}.SHA256
         asset_content_type: text/plain
 
-    - name: Upload release asset - linux-aarch64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu/defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu.tar.gz
-        asset_name: defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu.tar.gz
-        asset_content_type: application/gzip
-    
-    - name: Upload checksum - linux-aarch64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu/defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu.tar.gz.SHA256
-        asset_name: defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu.tar.gz.SHA256
-        asset_content_type: text/plain
+  create-docker-release:
+    runs-on: ubuntu-latest
+    needs: [create-release]
+    env:
+      TARGET: x86_64-pc-linux-gnu
 
-    - name: Upload release asset - win-x64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.zip
-        asset_name: defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.zip
-        asset_content_type: application/zip
+    steps:
+    - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
-    - name: Upload checksum asset - win-x64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.zip.SHA256
-        asset_name: defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.zip.SHA256
-        asset_content_type: text/plain
+    - name: Populate environment
+      run: ./make.sh ci-export-vars
 
-    - name: Upload release asset - osx-x64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Download Binaries
+      uses: actions/download-artifact@v3
       with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin/defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin.tar.gz
-        asset_name: defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin.tar.gz
-        asset_content_type: application/gzip
+        name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}
 
-    - name: Upload checksum asset - osx-x64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin/defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin.tar.gz.SHA256
-        asset_name: defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin.tar.gz.SHA256
-        asset_content_type: text/plain
-    
-    - name: Upload release asset - osx-aarch64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin/defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin.tar.gz
-        asset_name: defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin.tar.gz
-        asset_content_type: application/gzip
+    - name: Build defi image
+      run: rm .dockerignore && ./make.sh docker-defi-build
 
-    - name: Upload checksum asset - osx-aarch64
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
       with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: ./defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin/defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin.tar.gz.SHA256
-        asset_name: defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin.tar.gz.SHA256
-        asset_content_type: text/plain
+        username: ${{ env.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+    - name: Push to Docker Hub
+      run: |
+        set -e; ver=${{ env.BUILD_VERSION }}
+        docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver}
+        docker push defi/defichain:${ver}
diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
index fe56c3d076..c75c626ca3 100644
--- a/.github/workflows/build-staging.yaml
+++ b/.github/workflows/build-staging.yaml
@@ -8,148 +8,64 @@ env:
   GIT_VERSION: 1
 
 jobs:
-  linux-x64:
+  # We keep the flow as similar as close to release flow as possible
+  # to validate change before it gets into release, even though
+  # these don't create end artifacts to use
+  stage-release:
     runs-on: ubuntu-latest
+    container: defi/ain-builder:latest
+    strategy:
+      matrix:
+        target: [x86_64-pc-linux-gnu, aarch64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, aarch64-apple-darwin]
     env:
-      TARGET: x86_64-pc-linux-gnu
+      TARGET: ${{matrix.target}}
 
     steps:
     - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
 
-    - name: Build and package
-      run: ./make.sh docker-release
-
-    - name: Publish artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz
+    - name: Setup dependencies
+      run: ./make.sh ci-setup-deps
 
-  linux-aarch64:
-    runs-on: ubuntu-latest
-    env:
-      TARGET: aarch64-linux-gnu
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
-    
-    - name: Build and package
-      run: ./make.sh docker-release
+    - name: Setup user dependencies
+      run: ./make.sh ci-setup-user-deps
 
-    - name: Publish artifact - aarch64-linux-gnu
-      uses: actions/upload-artifact@v3
+    - uses: Swatinem/rust-cache@v2
       with:
-        name: defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-aarch64-linux-gnu.tar.gz
-
-  win-x64:
-    runs-on: ubuntu-latest
-    env:
-      TARGET: x86_64-w64-mingw32
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
+        workspaces: lib -> ../build/lib/target
+        save-if: ${{ github.ref == 'refs/heads/master' }}
 
     - name: Build and package
-      run: ./make.sh docker-release
+      run: ./make.sh release
 
-    - name: Publish artifact - x86_64-w64-mingw32
+    - name: Publish artifact
       uses: actions/upload-artifact@v3
       with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.tar.gz
+        name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}
+        path: |
+          ./build/defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}
+          ./build/defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}.${{ env.PKG_TYPE }}.SHA256
 
-  osx-x64:
+  stage-docker-release:
     runs-on: ubuntu-latest
+    needs: [stage-release]
     env:
-      TARGET: x86_64-apple-darwin
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
-
-    - name: Build and package
-      run: ./make.sh docker-release
-
-    - name: Publish artifact - x86_64-apple-darwin
-      uses: actions/upload-artifact@v3
-      with:
-        name: defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-apple-darwin.tar.gz
-
-  osx-aarch64:
-    runs-on: ubuntu-latest
-    env:
-      TARGET: aarch64-apple-darwin
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Populate environment
-      run: ./make.sh ci-export-vars
-
-    - name: Build and package
-      run: ./make.sh docker-release
-
-    - name: Publish artifact - aarch64-apple-darwin
-      uses: actions/upload-artifact@v3
-      with:
-        name: defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin
-        path: ./build/defichain-${{ env.BUILD_VERSION }}-aarch64-apple-darwin.tar.gz
-
- # We keep the flow as similar as close to release flow as possible
- # to validate change before it gets into release, even though
- # these don't create end artifacts to use
- 
-  stage-release:
-    needs:
-      - linux-x64
-      - linux-aarch64
-      - win-x64
-      - osx-x64
-      - osx-aarch64
-    runs-on: ubuntu-latest
+      TARGET: x86_64-pc-linux-gnu
 
     steps:
     - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
 
-    - name: Cleanup work dir
-      run: rm -rf *
-
-    - name: Get artifacts
+    - name: Download Binaries
       uses: actions/download-artifact@v3
+      with:
+        name: defichain-${{ env.BUILD_VERSION }}-${{ env.TARGET }}
 
-    - name: zip package for win-x64
-      run: |
-        set -e; ver=${{ env.BUILD_VERSION }}
-        cd defichain-${ver}-x86_64-w64-mingw32
-        tar xzf defichain-${ver}-x86_64-w64-mingw32.tar.gz
-        zip -r "defichain-${ver}-x86_64-w64-mingw32.zip" defichain-${ver}/
-
-    - name: Generate SHA256 checksum
-      run: |
-        set -e; ver=${{ env.BUILD_VERSION }}
-        (cd ./defichain-${ver}-x86_64-pc-linux-gnu
-        sha256sum ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz > ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz.SHA256)
-        (cd ./defichain-${ver}-aarch64-linux-gnu
-        sha256sum ./defichain-${ver}-aarch64-linux-gnu.tar.gz > ./defichain-${ver}-aarch64-linux-gnu.tar.gz.SHA256)
-        (cd ./defichain-${ver}-x86_64-w64-mingw32
-        sha256sum ./defichain-${ver}-x86_64-w64-mingw32.zip > ./defichain-${ver}-x86_64-w64-mingw32.zip.SHA256)
-        (cd ./defichain-${ver}-x86_64-apple-darwin
-        sha256sum ./defichain-${ver}-x86_64-apple-darwin.tar.gz > ././defichain-${ver}-x86_64-apple-darwin.tar.gz.SHA256)
-        (cd ./defichain-${ver}-aarch64-apple-darwin
-        sha256sum ./defichain-${ver}-aarch64-apple-darwin.tar.gz > ././defichain-${ver}-aarch64-apple-darwin.tar.gz.SHA256)
+    - name: Build defi image
+      run: rm .dockerignore && ./make.sh docker-defi-build
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index a1bba7be3c..da86d4ef83 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -29,7 +29,7 @@ jobs:
       PYTHON: 3.8
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Lint
       run: ./ci/lint/main.sh
@@ -45,7 +45,7 @@ jobs:
       CARGO_INCREMENTAL: 0
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
diff --git a/.github/workflows/tests-ethlibs.yaml b/.github/workflows/tests-ethlibs.yaml
index dd7f9abcab..1bdf74a8f4 100644
--- a/.github/workflows/tests-ethlibs.yaml
+++ b/.github/workflows/tests-ethlibs.yaml
@@ -15,15 +15,19 @@ concurrency:
 
 env:
   NODE_URL: "http://127.0.0.1:19551/"
+  TARGET: x86_64-pc-linux-gnu
+  MAKE_DEBUG: 0
 
 jobs:
   build:
-    env:
-      CARGO_INCREMENTAL: 0
     runs-on: ubuntu-latest
     container: defi/ain-builder:latest
+    env:
+      CARGO_INCREMENTAL: 0
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -31,7 +35,7 @@ jobs:
     - name: Setup dependencies
       run: ./make.sh ci-setup-deps
 
-    - name: Setup dependencies for user
+    - name: Setup user dependencies
       run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
@@ -83,7 +87,7 @@ jobs:
         go-version: '^1.17.0'
 
     - name: Setup go-ethlibs test suites
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: 'DeFiCh/go-ethlibs'
 
diff --git a/.github/workflows/tests-frontier.yml b/.github/workflows/tests-frontier.yml
index 6e75bf666b..fd389b0152 100644
--- a/.github/workflows/tests-frontier.yml
+++ b/.github/workflows/tests-frontier.yml
@@ -12,19 +12,22 @@ concurrency:
 
 jobs:
   build:
+    runs-on: ubuntu-latest
+    container: defi/ain-builder:latest
     env:
       CARGO_INCREMENTAL: 0
-    runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
 
     - name: Setup dependencies
-      run: sudo ./make.sh ci-setup-deps
+      run: ./make.sh ci-setup-deps
 
-    - name: Setup dependencies for user
+    - name: Setup user dependencies
       run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
@@ -39,17 +42,15 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: defi-bins
-        path: |
-          build/src/defid
+        path: build/src/defid
 
   test:
     name: Frontier tests
     runs-on: ubuntu-latest
-
     needs: build
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: defich/metachain-ts-tests
           ref: 'main'
diff --git a/.github/workflows/tests-jellyfish.yml b/.github/workflows/tests-jellyfish.yml
index 21c0c1c9fe..a4735abd5a 100644
--- a/.github/workflows/tests-jellyfish.yml
+++ b/.github/workflows/tests-jellyfish.yml
@@ -17,13 +17,14 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: JellyfishSDK/jellyfish
           ref: 'main'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: defichain
 
diff --git a/.github/workflows/tests-sync.yml b/.github/workflows/tests-sync.yml
index 6158c902d8..22fde03602 100644
--- a/.github/workflows/tests-sync.yml
+++ b/.github/workflows/tests-sync.yml
@@ -28,7 +28,8 @@ jobs:
     env:
       CARGO_INCREMENTAL: 0
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
@@ -36,7 +37,7 @@ jobs:
     - name: Setup dependencies
       run: sudo ./make.sh ci-setup-deps
 
-    - name: Setup dependencies for user
+    - name: Setup user dependencies
       run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
@@ -44,8 +45,6 @@ jobs:
         workspaces: lib -> ../build/lib/target
         save-if: ${{ github.ref == 'refs/heads/master' }}
 
-      # TODO: Switch this to a docker build later and this builds on the native
-      # VM toolchain and loses disparity with the CI release builds
     - name: Build binaries
       run: ./make.sh build
 
@@ -54,8 +53,8 @@ jobs:
       with:
         name: defi-bins
         path: |
-         build/src/defid
-         build/src/defi-cli
+          build/src/defid
+          build/src/defi-cli
 
     - name: Upload shell commands
       uses: actions/upload-artifact@v3
@@ -76,7 +75,8 @@ jobs:
         matrix: ${{ steps.set-matrix.outputs.matrix }}
 
       steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
+        - run: git config --global --add safe.directory '*'
 
         - id: 'auth'
           name: 'Authenticate to Google Cloud'
@@ -119,7 +119,8 @@ jobs:
     timeout-minutes: 4320
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - run: git config --global --add safe.directory '*'
 
     - name: Download Snapshot
       run: aria2c -x16 -s16 https://storage.googleapis.com/team-drop/master-datadir/datadir-${{matrix.blocks.start}}.tar.gz
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 69ea0c3070..faaf4ff257 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -24,14 +24,15 @@ jobs:
       TESTS_FAILFAST: 0
       TESTS_COMBINED_LOGS: 500
       CARGO_INCREMENTAL: 0
+
     steps:
     - name: Checkout base branch and/or merge
       if: github.event_name != 'pull_request'
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Checkout pull request head commit
       if: github.event_name == 'pull_request'
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
     
@@ -41,7 +42,7 @@ jobs:
     - name: Install dependencies
       run: ./make.sh ci-setup-deps
     
-    - name: Setup dependencies for user
+    - name: Setup user dependencies
       run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
@@ -49,7 +50,7 @@ jobs:
         workspaces: lib -> ../build/lib/target
         save-if: ${{ github.ref == 'refs/heads/master' }}
 
-    - name: Build deps and configure
+    - name: Build binaries
       run: ./make.sh build
 
     # Temp. workaround to save space to prevent GH runners from running out
@@ -64,7 +65,7 @@ jobs:
     container: defi/ain-builder:latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Populate environment
       run: ./make.sh ci-export-vars
diff --git a/contrib/dockerfiles/defi.dockerfile b/contrib/dockerfiles/defi.dockerfile
new file mode 100644
index 0000000000..40db80d80a
--- /dev/null
+++ b/contrib/dockerfiles/defi.dockerfile
@@ -0,0 +1,24 @@
+ARG TARGET=x86_64-pc-linux-gnu
+
+FROM --platform=linux/amd64 ubuntu:latest as defi
+ARG TARGET
+ARG PACKAGE
+ENV PATH=/app/bin:$PATH
+LABEL org.defichain.name="defichain"
+LABEL org.defichain.arch=${TARGET}
+
+WORKDIR /app
+COPY ${PACKAGE} ./
+RUN tar -xvzf ${PACKAGE} --strip-components 1
+
+RUN useradd --create-home defi && \
+    mkdir -p /data && \
+    chown defi:defi /data && \
+    ln -s /data /home/defi/.defi
+
+VOLUME ["/data"]
+
+USER defi:defi
+CMD [ "/app/bin/defid" ]
+
+EXPOSE 8554 8550 8551 18554 18550 18551 19554 19550 19551 20554 20550 20551
diff --git a/contrib/dockerfiles/noarch.dockerfile b/contrib/dockerfiles/noarch.dockerfile
index 9393ce7bdc..1ee1aa8db0 100644
--- a/contrib/dockerfiles/noarch.dockerfile
+++ b/contrib/dockerfiles/noarch.dockerfile
@@ -4,7 +4,7 @@
 ARG TARGET=unknown
 
 # -----------
-FROM ubuntu:latest as builder
+FROM --platform=linux/amd64 ubuntu:latest as builder
 ARG TARGET
 ARG MAKE_DEBUG
 LABEL org.defichain.name="defichain-builder"
diff --git a/contrib/genbuild.sh b/contrib/genbuild.sh
index 47b12a2600..ba751e796b 100755
--- a/contrib/genbuild.sh
+++ b/contrib/genbuild.sh
@@ -25,7 +25,7 @@ git_check_in_repo() {
 DESC=""
 SUFFIX=""
 CURRENT_BRANCH=""
-if [ -z "$BUILD_VERSION" ] && [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
+if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null
 
@@ -55,9 +55,7 @@ if [ -z "$BUILD_VERSION" ] && [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$
     git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
 fi
 
-if [ -n "$BUILD_VERSION" ]; then
-    NEWINFO="#define BUILD_DESC \"$BUILD_VERSION\""
-elif [ -n "$DESC" ]; then
+if [ -n "$DESC" ]; then
     NEWINFO="#define BUILD_DESC \"$DESC\""
 elif [ -n "$SUFFIX" ]; then
     NEWINFO="#define BUILD_SUFFIX $SUFFIX"
diff --git a/make.sh b/make.sh
index 7e8155ea1b..832873a696 100755
--- a/make.sh
+++ b/make.sh
@@ -19,6 +19,7 @@ setup_vars() {
 
     DOCKER_ROOT_CONTEXT=${DOCKER_ROOT_CONTEXT:-"."}
     DOCKERFILES_DIR=${DOCKERFILES_DIR:-"./contrib/dockerfiles"}
+    DEFI_DOCKERFILE=${DEFI_DOCKERFILE:-"${DOCKERFILES_DIR}/defi.dockerfile"}
 
     ROOT_DIR="$(_canonicalize "${_SCRIPT_DIR}")"
 
@@ -219,10 +220,13 @@ package() {
     local build_dir="${BUILD_DIR}"
 
     local pkg_name="${img_prefix}-${img_version}-${target}"
-    local pkg_tar_file_name="${pkg_name}.tar.gz"
 
     local pkg_path
-    pkg_path="$(_canonicalize "${build_dir}/${pkg_tar_file_name}")"
+    if [[ "$target" == "x86_64-w64-mingw32" ]]; then
+        pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.zip")"
+    else        
+        pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.tar.gz")"
+    fi
 
     local versioned_name="${img_prefix}-${img_version}"
     local versioned_build_dir="${build_dir}/${versioned_name}"
@@ -235,8 +239,14 @@ package() {
 
     echo "> packaging: ${pkg_name} from ${versioned_build_dir}"
 
-    _ensure_enter_dir "${versioned_build_dir}"
-    _tar --transform "s,^./,${versioned_name}/," -czf "${pkg_path}" ./*
+    if [[ "$target" == "x86_64-w64-mingw32" ]]; then
+        _ensure_enter_dir "${build_dir}"
+        zip -r "${pkg_path}" "${versioned_build_dir}/"
+    else
+        _ensure_enter_dir "${versioned_build_dir}"
+        _tar --transform "s,^./,${versioned_name}/," -czf "${pkg_path}" ./*
+    fi
+    sha256sum "${pkg_path}" > "${pkg_path}.SHA256"
     _exit_dir
 
     echo "> package: ${pkg_path}"
@@ -282,7 +292,6 @@ docker_deploy() {
     local img="${img_prefix}-${target}:${img_version}"
     echo "> deploy from: ${img}"
 
-    local pkg_name="${img_prefix}-${img_version}-${target}"
     local versioned_name="${img_prefix}-${img_version}"
     local versioned_build_dir="${build_dir}/${versioned_name}"
 
@@ -311,6 +320,27 @@ docker_release() {
     _sign "$target"
 }
 
+docker_defi_build() {
+    local target=${1:-${TARGET}}
+    local img_prefix="${IMAGE_PREFIX}"
+    local img_version="${IMAGE_VERSION}"
+
+    local pkg_name="${img_prefix}-${img_version}-${target}.tar.gz"
+
+    local docker_context="${DOCKER_ROOT_CONTEXT}"
+    local docker_file="${DEFI_DOCKERFILE}"
+
+    echo "> docker-defi-build";
+
+    local img="${img_prefix}-${target}:${img_version}"
+    echo "> building: ${img}"
+    echo "> docker defi build: ${img}"
+
+    docker build -f "${docker_file}" \
+        --build-arg PACKAGE="${pkg_name}" \
+        -t "${img}" "${docker_context}"
+}
+
 docker_clean_builds() {
     echo "> clean: defichain build images"
     _docker_clean "org.defichain.name=defichain"
@@ -661,7 +691,7 @@ pkg_install_deps() {
         libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev \
         libminiupnpc-dev libzmq3-dev libqrencode-dev wget \
         libdb-dev libdb++-dev libdb5.3 libdb5.3-dev libdb5.3++ libdb5.3++-dev \
-        curl cmake unzip libc6-dev gcc-multilib locales locales-all
+        curl cmake zip unzip libc6-dev gcc-multilib locales locales-all
 
     _fold_end
 }
@@ -1115,6 +1145,11 @@ ci_export_vars() {
         echo "BUILD_VERSION=${IMAGE_VERSION}" >> "$GITHUB_ENV"
         echo "PATH=$HOME/.cargo/bin:$PATH" >> "$GITHUB_ENV"
         echo "CARGO_INCREMENTAL=0" >> "$GITHUB_ENV"
+        if [[ "${TARGET}" == "x86_64-w64-mingw32" ]]; then
+            echo "PKG_TYPE=zip" >> "$GITHUB_ENV"
+        else
+            echo "PKG_TYPE=tar.gz" >> "$GITHUB_ENV"
+        fi
     fi
 }
 

From d4c4725a0f4e5da041c60c98b2470832a176f1d8 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Fri, 24 Nov 2023 17:52:06 +0800
Subject: [PATCH 5/6] EVM: Fix create token (#2686)

* Add UTF-8 encoding validity check, limit dst20 token name length

* fmt cpp

* Add longer string test

* Fix rust lint

* Disable clippy on ffi

* Specify exact clippy warn

* Init vec with reserved namespace size

* Fix throw error on max byte size check

* Add genesis block token name tests

* Remove unnecessary substr op

* Fix createtoken rpc token name max length

* Initial dev to port utf8 check on rust side

* Fixes to use vec

* Fix rust ffi for creating dst20 tokens

* Rust lint

* Fmt cpp

* Revert token validation pipeline

* Add unit test for rust UTF-8 encoding validity test

* Fix rust lint

* Switch to 31 limit

* Fix dst20 test

* Remove clippy ignore

* Fix merge error

* Expose rust str utf8 check with ffi

* Fix rust lint

* Remove import

* Remove import

* Add next upgrade fork height on tests

* Disable lint checks on dst20 migration tokens

* Fix rust lint

---------

Co-authored-by: Jouzo <15011228+Jouzo@users.noreply.github.com>
---
 lib/ain-cpp-imports/src/bridge.rs             |  3 +-
 lib/ain-cpp-imports/src/lib.rs                | 10 +-
 lib/ain-evm/src/contract.rs                   |  7 +-
 lib/ain-evm/tests/utf8_string_test.rs         | 55 +++++++++++
 lib/ain-rs-exports/src/evm.rs                 | 12 +--
 lib/ain-rs-exports/src/lib.rs                 | 59 +++++++-----
 lib/ain-rs-exports/src/util.rs                | 13 +++
 src/Makefile.test.include                     |  1 +
 src/dfi/consensus/tokens.cpp                  |  2 +-
 src/dfi/rpc_tokens.cpp                        |  3 +-
 src/dfi/tokens.cpp                            | 32 +++++--
 src/dfi/tokens.h                              |  3 +-
 src/ffi/ffiexports.cpp                        | 26 +++++-
 src/ffi/ffiexports.h                          |  2 +-
 src/ffi/ffihelpers.h                          |  5 +
 src/test/utf8_string_tests.cpp                | 91 +++++++++++++++++++
 src/util/strencodings.cpp                     | 59 ++++++++++++
 src/util/strencodings.h                       |  1 +
 test/functional/feature_address_map.py        |  2 +
 test/functional/feature_dusd_loans.py         |  1 +
 test/functional/feature_evm.py                |  1 +
 .../feature_evm_contract_env_vars.py          |  1 +
 test/functional/feature_evm_contracts.py      |  1 +
 test/functional/feature_evm_dfi_intrinsics.py |  1 +
 test/functional/feature_evm_dst20.py          | 72 ++++++++++++++-
 test/functional/feature_evm_eip1559_fees.py   |  1 +
 test/functional/feature_evm_fee.py            |  1 +
 test/functional/feature_evm_gas.py            |  1 +
 test/functional/feature_evm_genesis.py        |  2 +
 test/functional/feature_evm_logs.py           |  1 +
 test/functional/feature_evm_mempool.py        |  1 +
 test/functional/feature_evm_miner.py          |  1 +
 test/functional/feature_evm_proxy.py          |  1 +
 test/functional/feature_evm_rollback.py       |  1 +
 test/functional/feature_evm_rpc.py            |  1 +
 .../functional/feature_evm_rpc_fee_history.py |  1 +
 test/functional/feature_evm_rpc_filters.py    |  1 +
 .../functional/feature_evm_rpc_transaction.py |  1 +
 test/functional/feature_evm_smart_contract.py |  1 +
 .../feature_evm_transaction_replacement.py    |  1 +
 test/functional/feature_evm_transferdomain.py |  1 +
 test/functional/feature_evm_vmmap_rpc.py      |  1 +
 test/functional/feature_icx_orderbook.py      |  2 +
 ...re_on_chain_government_voting_scenarios.py |  1 +
 test/functional/rpc_blockchain.py             |  1 +
 test/functional/rpc_updatemasternode.py       |  1 +
 46 files changed, 432 insertions(+), 54 deletions(-)
 create mode 100644 lib/ain-evm/tests/utf8_string_test.rs
 create mode 100644 lib/ain-rs-exports/src/util.rs
 create mode 100644 src/test/utf8_string_tests.cpp

diff --git a/lib/ain-cpp-imports/src/bridge.rs b/lib/ain-cpp-imports/src/bridge.rs
index fb1f938789..53d3662157 100644
--- a/lib/ain-cpp-imports/src/bridge.rs
+++ b/lib/ain-cpp-imports/src/bridge.rs
@@ -46,7 +46,8 @@ pub mod ffi {
         fn getEthSyncStatus() -> [i64; 2];
         fn getAttributeValues(mnview_ptr: usize) -> Attributes;
         fn CppLogPrintf(message: String);
-        fn getDST20Tokens(mnview_ptr: usize) -> Vec<DST20Token>;
+        #[allow(clippy::ptr_arg)]
+        fn getDST20Tokens(mnview_ptr: usize, tokens: &mut Vec<DST20Token>) -> bool;
         fn getClientVersion() -> String;
         fn getNumCores() -> i32;
         fn getCORSAllowedOrigin() -> String;
diff --git a/lib/ain-cpp-imports/src/lib.rs b/lib/ain-cpp-imports/src/lib.rs
index 5468ac7827..fd008bd4bc 100644
--- a/lib/ain-cpp-imports/src/lib.rs
+++ b/lib/ain-cpp-imports/src/lib.rs
@@ -86,7 +86,8 @@ mod ffi {
         // Just the logs are skipped.
     }
 
-    pub fn getDST20Tokens(_mnview_ptr: usize) -> Vec<DST20Token> {
+    #[allow(clippy::ptr_arg)]
+    pub fn getDST20Tokens(_mnview_ptr: usize, _tokens: &mut Vec<DST20Token>) -> bool {
         unimplemented!("{}", UNIMPL_MSG)
     }
     pub fn getClientVersion() -> String {
@@ -238,9 +239,10 @@ pub fn log_print(message: &str) {
     ffi::CppLogPrintf(message.to_owned());
 }
 
-/// Fetches all DST20 tokens in view.
-pub fn get_dst20_tokens(mnview_ptr: usize) -> Vec<ffi::DST20Token> {
-    ffi::getDST20Tokens(mnview_ptr)
+/// Fetches all DST20 tokens in view, returns the result of the migration
+#[allow(clippy::ptr_arg)]
+pub fn get_dst20_tokens(mnview_ptr: usize, tokens: &mut Vec<ffi::DST20Token>) -> bool {
+    ffi::getDST20Tokens(mnview_ptr, tokens)
 }
 
 /// Returns the number of CPU cores available to the node.
diff --git a/lib/ain-evm/src/contract.rs b/lib/ain-evm/src/contract.rs
index ec53a178a4..f5c2f853a0 100644
--- a/lib/ain-evm/src/contract.rs
+++ b/lib/ain-evm/src/contract.rs
@@ -411,8 +411,13 @@ fn get_default_successful_receipt() -> ReceiptV3 {
 }
 
 pub fn get_dst20_migration_txs(mnview_ptr: usize) -> Result<Vec<ExecuteTx>> {
+    let mut tokens = vec![];
     let mut txs = Vec::new();
-    for token in ain_cpp_imports::get_dst20_tokens(mnview_ptr) {
+    if !ain_cpp_imports::get_dst20_tokens(mnview_ptr, &mut tokens) {
+        return Err(format_err!("DST20 token migration failed, invalid token name.").into());
+    }
+
+    for token in tokens {
         let address = ain_contracts::dst20_address_from_token_id(token.id)?;
         trace!(
             "[get_dst20_migration_txs] Deploying to address {:#?}",
diff --git a/lib/ain-evm/tests/utf8_string_test.rs b/lib/ain-evm/tests/utf8_string_test.rs
new file mode 100644
index 0000000000..403eac395a
--- /dev/null
+++ b/lib/ain-evm/tests/utf8_string_test.rs
@@ -0,0 +1,55 @@
+#[cfg(test)]
+use std::str;
+
+#[test]
+fn check_for_valid_utf8_strings() {
+    let test1 = "abcdefghijklmnopqrstuvwxyz1234567890~_= ^+%]{}";
+    let test2 = "abcdeàèéìòù";
+    let test3 = "😁 Beaming Face With Smiling Eyes";
+    let test4 = "Slightly Smiling Face 🙂";
+    let test5 = "🤣🤣🤣 Rolling on the Floor Laughing";
+    let test6 = "🤩🤩🤩 Star-🤩Struck 🤩🤩";
+    let test7 = "Left till here away at to whom past. Feelings laughing at no wondered repeated provided finished. \
+        It acceptance thoroughly my advantages everything as. Are projecting inquietude affronting preference saw who. \
+        Marry of am do avoid ample as. Old disposal followed she ignorant desirous two has. Called played entire roused \
+        though for one too. He into walk roof made tall cold he. Feelings way likewise addition wandered contempt bed \
+        indulged.";
+
+    let test1_bytes = test1.as_bytes();
+    let test2_bytes = test2.as_bytes();
+    let test3_bytes = test3.as_bytes();
+    let test4_bytes = test4.as_bytes();
+    let test5_bytes = test5.as_bytes();
+    let test6_bytes = test6.as_bytes();
+    let test7_bytes = test7.as_bytes();
+
+    assert_eq!(str::from_utf8(test1_bytes), Ok(test1));
+    assert_eq!(str::from_utf8(test2_bytes), Ok(test2));
+    assert_eq!(str::from_utf8(test3_bytes), Ok(test3));
+    assert_eq!(str::from_utf8(test4_bytes), Ok(test4));
+    assert_eq!(str::from_utf8(test5_bytes), Ok(test5));
+    assert_eq!(str::from_utf8(test6_bytes), Ok(test6));
+    assert_eq!(str::from_utf8(test7_bytes), Ok(test7));
+}
+
+#[test]
+fn check_for_invalid_utf8_strings() {
+    let smiling_face = "😁".as_bytes();
+    let laughing_face = "🤣".as_bytes();
+    let star_struck_face = "🤩".as_bytes();
+
+    let mut test1 = smiling_face[0..1].to_vec();
+    test1.extend_from_slice(" Beaming Face With Smiling Eyes".as_bytes());
+
+    let mut test2 = laughing_face[0..3].to_vec();
+    test2.extend_from_slice(&laughing_face[0..2]);
+    test2.extend_from_slice(&laughing_face[0..1]);
+    test2.extend_from_slice(" Rolling on the Floor Laughing".as_bytes());
+
+    let mut test3 = star_struck_face[0..1].to_vec();
+    test3.extend_from_slice("🤩🤩 Star-🤩Struck 🤩🤩".as_bytes());
+
+    assert!(str::from_utf8(test1.as_slice()).is_err());
+    assert!(str::from_utf8(test2.as_slice()).is_err());
+    assert!(str::from_utf8(test3.as_slice()).is_err());
+}
diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 76377af09a..cf44382ffa 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -726,19 +726,17 @@ fn evm_try_get_tx_by_hash(tx_hash: &str) -> Result<ffi::EVMTransaction> {
 fn evm_try_unsafe_create_dst20(
     template: &mut BlockTemplateWrapper,
     native_hash: &str,
-    name: &str,
-    symbol: &str,
-    token_id: u64,
+    token: ffi::DST20TokenInfo,
 ) -> Result<()> {
     let native_hash = XHash::from(native_hash);
-    let address = ain_contracts::dst20_address_from_token_id(token_id)?;
+    let address = ain_contracts::dst20_address_from_token_id(token.id)?;
     debug!("Deploying to address {:#?}", address);
 
     let system_tx = ExecuteTx::SystemTx(SystemTx::DeployContract(DeployContractData {
-        name: String::from(name),
-        symbol: String::from(symbol),
+        name: token.name,
+        symbol: token.symbol,
         address,
-        token_id,
+        token_id: token.id,
     }));
 
     unsafe {
diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
index f6b306d7e0..173dc9459f 100644
--- a/lib/ain-rs-exports/src/lib.rs
+++ b/lib/ain-rs-exports/src/lib.rs
@@ -1,10 +1,11 @@
 mod core;
 mod evm;
 mod prelude;
+mod util;
 
 use ain_evm::blocktemplate::BlockTemplate;
 
-use crate::{core::*, evm::*};
+use crate::{core::*, evm::*, util::*};
 
 pub struct BlockTemplateWrapper(Option<BlockTemplate>);
 
@@ -22,6 +23,32 @@ impl BlockTemplateWrapper {
 
 #[cxx::bridge]
 pub mod ffi {
+    // =========  FFI ==========
+    pub struct CrossBoundaryResult {
+        pub ok: bool,
+        pub reason: String,
+    }
+
+    // =========  Util ==========
+    extern "Rust" {
+        fn rs_try_from_utf8(result: &mut CrossBoundaryResult, string: &'static [u8]) -> String;
+    }
+
+    // =========  Core ==========
+    extern "Rust" {
+        fn ain_rs_preinit(result: &mut CrossBoundaryResult);
+        fn ain_rs_init_logging(result: &mut CrossBoundaryResult);
+        fn ain_rs_init_core_services(result: &mut CrossBoundaryResult);
+        fn ain_rs_wipe_evm_folder(result: &mut CrossBoundaryResult);
+        fn ain_rs_stop_core_services(result: &mut CrossBoundaryResult);
+
+        // Networking
+        fn ain_rs_init_network_json_rpc_service(result: &mut CrossBoundaryResult, addr: &str);
+        fn ain_rs_init_network_grpc_service(result: &mut CrossBoundaryResult, addr: &str);
+        fn ain_rs_init_network_subscriptions_service(result: &mut CrossBoundaryResult, addr: &str);
+        fn ain_rs_stop_network_services(result: &mut CrossBoundaryResult);
+    }
+
     // ========== Block ==========
     #[derive(Default)]
     pub struct EVMBlockHeader {
@@ -74,26 +101,6 @@ pub mod ffi {
         pub key_id: u32,
     }
 
-    // =========  Core ==========
-    pub struct CrossBoundaryResult {
-        pub ok: bool,
-        pub reason: String,
-    }
-
-    extern "Rust" {
-        fn ain_rs_preinit(result: &mut CrossBoundaryResult);
-        fn ain_rs_init_logging(result: &mut CrossBoundaryResult);
-        fn ain_rs_init_core_services(result: &mut CrossBoundaryResult);
-        fn ain_rs_wipe_evm_folder(result: &mut CrossBoundaryResult);
-        fn ain_rs_stop_core_services(result: &mut CrossBoundaryResult);
-
-        // Networking
-        fn ain_rs_init_network_json_rpc_service(result: &mut CrossBoundaryResult, addr: &str);
-        fn ain_rs_init_network_grpc_service(result: &mut CrossBoundaryResult, addr: &str);
-        fn ain_rs_init_network_subscriptions_service(result: &mut CrossBoundaryResult, addr: &str);
-        fn ain_rs_stop_network_services(result: &mut CrossBoundaryResult);
-    }
-
     // ========== EVM ==========
 
     pub struct CreateTransactionContext<'a> {
@@ -129,6 +136,12 @@ pub mod ffi {
         pub token_id: u32,
     }
 
+    pub struct DST20TokenInfo {
+        pub id: u64,
+        pub name: String,
+        pub symbol: String,
+    }
+
     #[derive(Default)]
     pub struct CreateTxResult {
         pub tx: Vec<u8>,
@@ -291,9 +304,7 @@ pub mod ffi {
             result: &mut CrossBoundaryResult,
             block_template: &mut BlockTemplateWrapper,
             native_hash: &str,
-            name: &str,
-            symbol: &str,
-            token_id: u64,
+            token: DST20TokenInfo,
         );
 
         fn evm_try_unsafe_bridge_dst20(
diff --git a/lib/ain-rs-exports/src/util.rs b/lib/ain-rs-exports/src/util.rs
new file mode 100644
index 0000000000..e1df8ae050
--- /dev/null
+++ b/lib/ain-rs-exports/src/util.rs
@@ -0,0 +1,13 @@
+use std::str;
+
+use ain_evm::Result;
+use ain_macros::ffi_fallible;
+
+use crate::{ffi, prelude::*};
+
+/// Validates a slice of bytes is valid UTF-8 and converts the bytes to a rust string slice.
+#[ffi_fallible]
+pub fn rs_try_from_utf8(string: &'static [u8]) -> Result<String> {
+    let string = str::from_utf8(string).map_err(|_| "Error interpreting bytes, invalid UTF-8")?;
+    Ok(string.to_string())
+}
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 3cb222b48e..f0ef44b7bb 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -154,6 +154,7 @@ DEFI_TESTS =\
   test/txvalidation_tests.cpp \
   test/txvalidationcache_tests.cpp \
   test/uint256_tests.cpp \
+  test/utf8_string_tests.cpp \
   test/util_tests.cpp \
   test/validation_block_tests.cpp \
   test/versionbits_tests.cpp \
diff --git a/src/dfi/consensus/tokens.cpp b/src/dfi/consensus/tokens.cpp
index 9a9daf7de5..f84f9bc69f 100644
--- a/src/dfi/consensus/tokens.cpp
+++ b/src/dfi/consensus/tokens.cpp
@@ -116,7 +116,7 @@ Res CTokensConsensus::operator()(const CCreateTokenMessage &obj) const {
         }
     }
 
-    auto tokenId = mnview.CreateToken(token, static_cast<int>(height) < consensus.DF2BayfrontHeight, &blockCtx);
+    auto tokenId = mnview.CreateToken(token, static_cast<int>(height), &blockCtx);
     return tokenId;
 }
 
diff --git a/src/dfi/rpc_tokens.cpp b/src/dfi/rpc_tokens.cpp
index c512c83bf6..0ee1c3d001 100644
--- a/src/dfi/rpc_tokens.cpp
+++ b/src/dfi/rpc_tokens.cpp
@@ -26,7 +26,8 @@ UniValue createtoken(const JSONRPCRequest &request) {
                     {"name",
                      RPCArg::Type::STR,
                      RPCArg::Optional::OMITTED,
-                     "Token's name (optional), no longer than " + std::to_string(CToken::MAX_TOKEN_NAME_LENGTH)},
+                     "Token's name (optional), no longer than " +
+                         std::to_string(CToken::POST_METACHAIN_TOKEN_NAME_BYTE_SIZE)},
                     {"isDAT",
                      RPCArg::Type::BOOL,
                      RPCArg::Optional::OMITTED,
diff --git a/src/dfi/tokens.cpp b/src/dfi/tokens.cpp
index 8a5f96459c..80aa5fdee1 100644
--- a/src/dfi/tokens.cpp
+++ b/src/dfi/tokens.cpp
@@ -68,9 +68,7 @@ Res CTokensView::CreateDFIToken() {
     return Res::Ok();
 }
 
-ResVal<DCT_ID> CTokensView::CreateToken(const CTokensView::CTokenImpl &token,
-                                        bool isPreBayfront,
-                                        BlockContext *blockCtx) {
+ResVal<DCT_ID> CTokensView::CreateToken(const CTokensView::CTokenImpl &token, int height, BlockContext *blockCtx) {
     if (GetTokenByCreationTx(token.creationTx)) {
         return Res::Err("token with creation tx %s already exists!", token.creationTx.ToString());
     }
@@ -93,7 +91,7 @@ ResVal<DCT_ID> CTokensView::CreateToken(const CTokensView::CTokenImpl &token,
             },
             id);
         if (id == DCT_ID_START) {
-            if (isPreBayfront) {
+            if (height < Params().GetConsensus().DF2BayfrontHeight) {
                 return Res::Err("Critical fault: trying to create DCT_ID same as DCT_ID_START for Foundation owner\n");
             }
 
@@ -107,12 +105,32 @@ ResVal<DCT_ID> CTokensView::CreateToken(const CTokensView::CTokenImpl &token,
             const auto &evmTemplate = blockCtx->GetEVMTemplate();
             if (shouldCreateDst20 && evmTemplate) {
                 CrossBoundaryResult result;
+                rust::string token_name{};
+                rust::string token_symbol{};
+                if (height >= Params().GetConsensus().DF23UpgradeHeight) {
+                    if (token.name.size() > CToken::POST_METACHAIN_TOKEN_NAME_BYTE_SIZE) {
+                        return Res::Err("Error creating DST20 token, token name is larger than max bytes\n");
+                    }
+                    token_name = rs_try_from_utf8(result, ffi_from_string_to_slice(token.name));
+                    if (!result.ok) {
+                        return Res::Err("Error creating DST20 token, token name not valid UTF-8\n");
+                    }
+                    token_symbol = rs_try_from_utf8(result, ffi_from_string_to_slice(token.symbol));
+                    if (!result.ok) {
+                        return Res::Err("Error creating DST20 token, token symbol not valid UTF-8\n");
+                    }
+                } else {
+                    token_name = rust::string(token.name);
+                    token_symbol = rust::string(token.symbol);
+                }
                 evm_try_unsafe_create_dst20(result,
                                             evmTemplate->GetTemplate(),
                                             token.creationTx.GetHex(),
-                                            rust::string(token.name.c_str()),
-                                            rust::string(token.symbol.c_str()),
-                                            id.v);
+                                            DST20TokenInfo{
+                                                id.v,
+                                                token_name,
+                                                token_symbol,
+                                            });
                 if (!result.ok) {
                     return Res::Err("Error creating DST20 token: %s", result.reason);
                 }
diff --git a/src/dfi/tokens.h b/src/dfi/tokens.h
index 8208ca4636..417f2d4c45 100644
--- a/src/dfi/tokens.h
+++ b/src/dfi/tokens.h
@@ -24,6 +24,7 @@ class CToken {
     static const uint8_t MAX_TOKEN_NAME_LENGTH = 128;
     static const uint8_t MAX_TOKEN_SYMBOL_LENGTH = 8;
     static const uint8_t MAX_TOKEN_POOLPAIR_LENGTH = 16;
+    static const uint8_t POST_METACHAIN_TOKEN_NAME_BYTE_SIZE = 30;
     enum class TokenFlags : uint8_t {
         None = 0,
         Mintable = 0x01,
@@ -197,7 +198,7 @@ class CTokensView : public virtual CStorageView {
                       DCT_ID const &start = DCT_ID{0});
 
     Res CreateDFIToken();
-    ResVal<DCT_ID> CreateToken(const CTokenImpl &token, bool isPreBayfront = false, BlockContext *blockCtx = nullptr);
+    ResVal<DCT_ID> CreateToken(const CTokenImpl &token, int height, BlockContext *blockCtx = nullptr);
     Res UpdateToken(const CTokenImpl &newToken, bool isPreBayfront = false, const bool tokenSplitUpdate = false);
 
     Res BayfrontFlagsCleanup();
diff --git a/src/ffi/ffiexports.cpp b/src/ffi/ffiexports.cpp
index 9e266e5bb0..c9a60052ef 100644
--- a/src/ffi/ffiexports.cpp
+++ b/src/ffi/ffiexports.cpp
@@ -2,6 +2,7 @@
 #include <dfi/govvariables/attributes.h>
 #include <dfi/mn_rpc.h>
 #include <ffi/ffiexports.h>
+#include <ffi/ffihelpers.h>
 #include <httprpc.h>
 #include <key_io.h>
 #include <logging.h>
@@ -313,22 +314,39 @@ uint32_t getEthMaxResponseByteSize() {
     return max_response_size_mb * 1024 * 1024;
 }
 
-rust::vec<DST20Token> getDST20Tokens(std::size_t mnview_ptr) {
+bool getDST20Tokens(std::size_t mnview_ptr, rust::vec<DST20Token> &tokens) {
     LOCK(cs_main);
 
-    rust::vec<DST20Token> tokens;
+    bool res = true;
     CCustomCSView *cache = reinterpret_cast<CCustomCSView *>(static_cast<uintptr_t>(mnview_ptr));
     cache->ForEachToken(
         [&](DCT_ID const &id, CTokensView::CTokenImpl token) {
             if (!token.IsDAT() || token.IsPoolShare()) {
                 return true;
             }
+            if (token.name.size() > CToken::POST_METACHAIN_TOKEN_NAME_BYTE_SIZE) {
+                res = false;
+                return false;
+            }
 
-            tokens.push_back({id.v, token.name, token.symbol});
+            CrossBoundaryResult result;
+            auto token_name = rs_try_from_utf8(result, ffi_from_string_to_slice(token.name));
+            if (!result.ok) {
+                LogPrintf("Error migrating DST20 token, token name not valid UTF-8\n");
+                res = false;
+                return false;
+            }
+            auto token_symbol = rs_try_from_utf8(result, ffi_from_string_to_slice(token.symbol));
+            if (!result.ok) {
+                LogPrintf("Error migrating DST20 token, token symbol not valid UTF-8\n");
+                res = false;
+                return false;
+            }
+            tokens.push_back({id.v, token_name, token_symbol});
             return true;
         },
         DCT_ID{1});  // start from non-DFI
-    return tokens;
+    return res;
 }
 
 int32_t getNumCores() {
diff --git a/src/ffi/ffiexports.h b/src/ffi/ffiexports.h
index 0e8ce0511e..9e247eece7 100644
--- a/src/ffi/ffiexports.h
+++ b/src/ffi/ffiexports.h
@@ -78,7 +78,7 @@ rust::string getStateInputJSON();
 std::array<int64_t, 2> getEthSyncStatus();
 Attributes getAttributeValues(std::size_t mnview_ptr);
 void CppLogPrintf(rust::string message);
-rust::vec<DST20Token> getDST20Tokens(std::size_t mnview_ptr);
+bool getDST20Tokens(std::size_t mnview_ptr, rust::vec<DST20Token> &tokens);
 rust::string getClientVersion();
 int32_t getNumCores();
 rust::string getCORSAllowedOrigin();
diff --git a/src/ffi/ffihelpers.h b/src/ffi/ffihelpers.h
index 56bcb04d52..3954421cc9 100644
--- a/src/ffi/ffihelpers.h
+++ b/src/ffi/ffihelpers.h
@@ -3,6 +3,7 @@
 
 #include <ain_rs_exports.h>
 #include <dfi/res.h>
+#include <ffi/cxx.h>
 
 #define XResultThrowOnErr(x)                                 \
     [&]() {                                                  \
@@ -55,4 +56,8 @@
         return ResVal(std::move(res), Res::Ok());                                       \
     }();
 
+inline rust::slice<const uint8_t> ffi_from_string_to_slice(const std::string &str) {
+    return rust::slice<const uint8_t>(reinterpret_cast<const uint8_t *>(str.c_str()), str.size());
+}
+
 #endif  // DEFI_FFI_FFIHELPERS_H
diff --git a/src/test/utf8_string_tests.cpp b/src/test/utf8_string_tests.cpp
new file mode 100644
index 0000000000..a1016df9a1
--- /dev/null
+++ b/src/test/utf8_string_tests.cpp
@@ -0,0 +1,91 @@
+// Copyright (c) 2011-2019 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+#include <chainparams.h>
+#include <ffi/ffiexports.h>
+#include <ffi/ffihelpers.h>
+#include <util/strencodings.h>
+#include <test/setup_common.h>
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_FIXTURE_TEST_SUITE(utf8_string_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(check_for_valid_utf8_strings)
+{
+    std::string test1 = "abcdefghijklmnopqrstuvwxyz1234567890~_= ^+%]{}";
+    std::string test2 = "abcdeàèéìòù";
+    std::string test3 = "😁 Beaming Face With Smiling Eyes";
+    std::string test4 = "Slightly Smiling Face 🙂";
+    std::string test5 = "🤣🤣🤣 Rolling on the Floor Laughing";
+    std::string test6 = "🤩🤩🤩 Star-🤩Struck 🤩🤩";
+    std::string test7 = "Left till here away at to whom past. Feelings laughing at no wondered repeated provided finished."
+        " It acceptance thoroughly my advantages everything as. Are projecting inquietude affronting preference saw who."
+        " Marry of am do avoid ample as. Old disposal followed she ignorant desirous two has. Called played entire roused"
+        " though for one too. He into walk roof made tall cold he. Feelings way likewise addition wandered contempt bed indulged.";
+
+    // Check UTF-8 validity with CPP
+    BOOST_CHECK(check_is_valid_utf8(test1));
+    BOOST_CHECK(check_is_valid_utf8(test2));
+    BOOST_CHECK(check_is_valid_utf8(test3));
+    BOOST_CHECK(check_is_valid_utf8(test4));
+    BOOST_CHECK(check_is_valid_utf8(test5));
+    BOOST_CHECK(check_is_valid_utf8(test6));
+    BOOST_CHECK(check_is_valid_utf8(test7));
+
+    // Check UTF-8 validity with Rust FFI
+    CrossBoundaryResult result;
+    auto test1_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test1));
+    BOOST_CHECK(result.ok);
+    BOOST_CHECK(test1_res == test1);
+    auto test2_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test2));
+    BOOST_CHECK(result.ok);
+    BOOST_CHECK(test2_res == test2);
+    auto test3_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test3));
+    BOOST_CHECK(result.ok);
+    BOOST_CHECK(test3_res == test3);
+    auto test4_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test4));
+    BOOST_CHECK(result.ok);
+    BOOST_CHECK(test4_res == test4);
+    auto test5_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test5));
+    BOOST_CHECK(result.ok);
+    BOOST_CHECK(test5_res == test5);
+    auto test6_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test6));
+    BOOST_CHECK(result.ok);
+    BOOST_CHECK(test6_res == test6);
+    auto test7_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test7));
+    BOOST_CHECK(result.ok);
+    BOOST_CHECK(test7_res == test7);
+
+    // Check UTF
+}
+
+BOOST_AUTO_TEST_CASE(check_for_invalid_utf8_strings)
+{
+    std::string smiling_face = "😁";
+    std::string laughing_face = "🤣";
+    std::string star_struck_face = "🤩";
+    std::string test1 = smiling_face.substr(0, 1) +  " Beaming Face With Smiling Eyes";
+    std::string test2 = laughing_face.substr(0, 3) + laughing_face.substr(0, 2) + laughing_face.substr(0, 1) + " Rolling on the Floor Laughing";
+    std::string test3 = star_struck_face.substr(0, 1) + "🤩🤩 Star-🤩Struck 🤩🤩";
+
+    // Check UTF-8 validity with CPP
+    BOOST_CHECK(!check_is_valid_utf8(test1));
+    BOOST_CHECK(!check_is_valid_utf8(test2));
+    BOOST_CHECK(!check_is_valid_utf8(test3));
+
+    // Check UTF-8 validity with Rust FFI
+    CrossBoundaryResult result;
+    auto test1_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test1));
+    BOOST_CHECK(!result.ok);
+    BOOST_CHECK(test1_res == "");
+    auto test2_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test2));
+    BOOST_CHECK(!result.ok);
+    BOOST_CHECK(test2_res == "");
+    auto test3_res = rs_try_from_utf8(result, ffi_from_string_to_slice(test3));
+    BOOST_CHECK(!result.ok);
+    BOOST_CHECK(test3_res == "");
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp
index 03ad0fd56b..c6e2c3a7f1 100644
--- a/src/util/strencodings.cpp
+++ b/src/util/strencodings.cpp
@@ -578,3 +578,62 @@ std::string trim_ws(std::string const & str)
     size_t last = str.find_last_not_of(ws);
     return str.substr(first, (last - first + 1));
 }
+
+bool check_is_valid_utf8(const std::string& str)
+{
+    if (!str.data())
+        return true;
+
+    const unsigned char *bytes = (const unsigned char *)str.data();
+    unsigned int cp;
+    int num;
+
+    while (*bytes != 0x00)
+    {
+        if ((*bytes & 0x80) == 0x00)
+        {
+            // U+0000 to U+007F 
+            cp = (*bytes & 0x7F);
+            num = 1;
+        }
+        else if ((*bytes & 0xE0) == 0xC0)
+        {
+            // U+0080 to U+07FF 
+            cp = (*bytes & 0x1F);
+            num = 2;
+        }
+        else if ((*bytes & 0xF0) == 0xE0)
+        {
+            // U+0800 to U+FFFF 
+            cp = (*bytes & 0x0F);
+            num = 3;
+        }
+        else if ((*bytes & 0xF8) == 0xF0)
+        {
+            // U+10000 to U+10FFFF 
+            cp = (*bytes & 0x07);
+            num = 4;
+        }
+        else
+            return false;
+
+        bytes += 1;
+        for (int i = 1; i < num; ++i)
+        {
+            if ((*bytes & 0xC0) != 0x80)
+                return false;
+            cp = (cp << 6) | (*bytes & 0x3F);
+            bytes += 1;
+        }
+
+        if ((cp > 0x10FFFF) ||
+            ((cp >= 0xD800) && (cp <= 0xDFFF)) ||
+            ((cp <= 0x007F) && (num != 1)) ||
+            ((cp >= 0x0080) && (cp <= 0x07FF) && (num != 2)) ||
+            ((cp >= 0x0800) && (cp <= 0xFFFF) && (num != 3)) ||
+            ((cp >= 0x10000) && (cp <= 0x1FFFFF) && (num != 4)))
+            return false;
+    }
+
+    return true;
+}
diff --git a/src/util/strencodings.h b/src/util/strencodings.h
index 39e179638f..18b962db37 100644
--- a/src/util/strencodings.h
+++ b/src/util/strencodings.h
@@ -40,6 +40,7 @@ std::vector<unsigned char> ParseHex(const char* psz);
 std::vector<unsigned char> ParseHex(const std::string& str);
 signed char HexDigit(char c);
 std::string trim_ws(std::string const & str);
+bool check_is_valid_utf8(const std::string& str);
 /* Returns true if each character in str is a hex character, and has an even
  * number of hex digits.*/
 bool IsHex(const std::string& str);
diff --git a/test/functional/feature_address_map.py b/test/functional/feature_address_map.py
index 49abe79d51..085e85192b 100755
--- a/test/functional/feature_address_map.py
+++ b/test/functional/feature_address_map.py
@@ -36,6 +36,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
             [
@@ -53,6 +54,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_dusd_loans.py b/test/functional/feature_dusd_loans.py
index edbfbfbeb3..60b4898825 100755
--- a/test/functional/feature_dusd_loans.py
+++ b/test/functional/feature_dusd_loans.py
@@ -54,6 +54,7 @@ def set_test_params(self):
                 f"-grandcentralheight={self.grandcentralheight}",
                 f"-grandcentralepilogueheight={self.grandcentralepilogueheight}",
                 f"-metachainheight={self.metachainheight}",
+                f"-df23upgradeheight={self.metachainheight}",
                 "-jellyfish_regtest=1",
                 "-simulatemainnet=1",
             ]
diff --git a/test/functional/feature_evm.py b/test/functional/feature_evm.py
index dbf6fe8f3e..d7ffe45883 100755
--- a/test/functional/feature_evm.py
+++ b/test/functional/feature_evm.py
@@ -39,6 +39,7 @@ def set_test_params(self):
             "-fortcanningepilogueheight=96",
             "-grandcentralheight=101",
             "-metachainheight=105",
+            "-df23upgradeheight=105",
             "-subsidytest=1",
             "-ethdebug=1",
         ]
diff --git a/test/functional/feature_evm_contract_env_vars.py b/test/functional/feature_evm_contract_env_vars.py
index de23c87fc8..58f07863b3 100755
--- a/test/functional/feature_evm_contract_env_vars.py
+++ b/test/functional/feature_evm_contract_env_vars.py
@@ -32,6 +32,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_contracts.py b/test/functional/feature_evm_contracts.py
index 99e0248f5c..585eed2668 100755
--- a/test/functional/feature_evm_contracts.py
+++ b/test/functional/feature_evm_contracts.py
@@ -34,6 +34,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_dfi_intrinsics.py b/test/functional/feature_evm_dfi_intrinsics.py
index bd8e4370f7..cfb04eb75e 100755
--- a/test/functional/feature_evm_dfi_intrinsics.py
+++ b/test/functional/feature_evm_dfi_intrinsics.py
@@ -35,6 +35,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_dst20.py b/test/functional/feature_evm_dst20.py
index 83d586eb0b..15d2f956f1 100755
--- a/test/functional/feature_evm_dst20.py
+++ b/test/functional/feature_evm_dst20.py
@@ -41,11 +41,66 @@ def set_test_params(self):
                 "-fortcanninggreatworldheight=94",
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
-                "-metachainheight=105",
+                "-metachainheight=153",
+                "-df23upgradeheight=153",
                 "-subsidytest=1",
             ]
         ]
 
+    def test_invalid_too_long_token_name_dst20_migration_tx(self):
+        block_height = self.nodes[0].getblockcount()
+
+        self.node.createtoken(
+            {
+                "symbol": "TooLongTokenName",
+                "name": "TheTokenWithNameMore30ByteLimit",  # 31 bytes
+                "isDAT": True,
+                "collateralAddress": self.address,
+            }
+        )
+        self.nodes[0].generate(2)
+
+        # enable EVM, transferdomain, DVM to EVM transfers and EVM to DVM transfers
+        self.nodes[0].setgov(
+            {
+                "ATTRIBUTES": {
+                    "v0/params/feature/evm": "true",
+                }
+            }
+        )
+        self.nodes[0].generate(1)
+
+        # Trigger EVM genesis DST20 migration
+        assert_equal(self.nodes[0].generatetoaddress(1, self.address, 1), 0)
+        self.rollback_to(block_height)
+
+    def test_invalid_utf8_encoding_token_name_dst20_migration_tx(self):
+        block_height = self.nodes[0].getblockcount()
+
+        self.node.createtoken(
+            {
+                "symbol": "InvalidUTF8TokenName",
+                "name": "InvalidUTF8TokenNameIsThisOne🤩",
+                "isDAT": True,
+                "collateralAddress": self.address,
+            }
+        )
+        self.nodes[0].generate(2)
+
+        # enable EVM, transferdomain, DVM to EVM transfers and EVM to DVM transfers
+        self.nodes[0].setgov(
+            {
+                "ATTRIBUTES": {
+                    "v0/params/feature/evm": "true",
+                }
+            }
+        )
+        self.nodes[0].generate(1)
+
+        # Trigger EVM genesis DST20 migration
+        assert_equal(self.nodes[0].generatetoaddress(1, self.address, 1), 0)
+        self.rollback_to(block_height)
+
     def test_dst20_migration_txs(self):
         block_height = self.nodes[0].getblockcount()
 
@@ -73,7 +128,16 @@ def test_dst20_migration_txs(self):
                 "collateralAddress": self.address,
             }
         )
-        self.nodes[0].generate(1)
+        # create DST20 token with maximum byte size limit
+        self.node.createtoken(
+            {
+                "symbol": "Test",
+                "name": "TheTokenWithNameMax30ByteLimit",  # 30 bytes
+                "isDAT": True,
+                "collateralAddress": self.address,
+            }
+        )
+        self.nodes[0].generate(2)
 
         # enable EVM, transferdomain, DVM to EVM transfers and EVM to DVM transfers
         self.nodes[0].setgov(
@@ -981,9 +1045,13 @@ def run_test(self):
         # Generate chain
         self.node.generate(150)
         self.nodes[0].utxostoaccount({self.address: "1000@DFI"})
+
+        # pre-metachain fork height
         self.nodes[0].generate(1)
 
         # Create token and check DST20 migration pre EVM activation
+        self.test_invalid_too_long_token_name_dst20_migration_tx()
+        self.test_invalid_utf8_encoding_token_name_dst20_migration_tx()
         self.test_dst20_migration_txs()
 
         # Create token before EVM
diff --git a/test/functional/feature_evm_eip1559_fees.py b/test/functional/feature_evm_eip1559_fees.py
index b78b94dfa1..a722c0a04a 100644
--- a/test/functional/feature_evm_eip1559_fees.py
+++ b/test/functional/feature_evm_eip1559_fees.py
@@ -37,6 +37,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ]
         ]
diff --git a/test/functional/feature_evm_fee.py b/test/functional/feature_evm_fee.py
index 6d938ffbb1..43459d98fe 100755
--- a/test/functional/feature_evm_fee.py
+++ b/test/functional/feature_evm_fee.py
@@ -33,6 +33,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_gas.py b/test/functional/feature_evm_gas.py
index 2c3bf370c4..41abef0239 100644
--- a/test/functional/feature_evm_gas.py
+++ b/test/functional/feature_evm_gas.py
@@ -35,6 +35,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_genesis.py b/test/functional/feature_evm_genesis.py
index 947c2c2e07..9460159018 100755
--- a/test/functional/feature_evm_genesis.py
+++ b/test/functional/feature_evm_genesis.py
@@ -37,6 +37,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
@@ -140,6 +141,7 @@ def test_start_state_from_json(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_logs.py b/test/functional/feature_evm_logs.py
index 373a28197a..9ea4362364 100755
--- a/test/functional/feature_evm_logs.py
+++ b/test/functional/feature_evm_logs.py
@@ -36,6 +36,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_mempool.py b/test/functional/feature_evm_mempool.py
index 67e5750a93..a19772b167 100755
--- a/test/functional/feature_evm_mempool.py
+++ b/test/functional/feature_evm_mempool.py
@@ -34,6 +34,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
                 "-ethdebug=1",
             ],
diff --git a/test/functional/feature_evm_miner.py b/test/functional/feature_evm_miner.py
index af3e92a7d5..e8974df35f 100755
--- a/test/functional/feature_evm_miner.py
+++ b/test/functional/feature_evm_miner.py
@@ -37,6 +37,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_proxy.py b/test/functional/feature_evm_proxy.py
index fb3d006082..0ab19414eb 100755
--- a/test/functional/feature_evm_proxy.py
+++ b/test/functional/feature_evm_proxy.py
@@ -33,6 +33,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_rollback.py b/test/functional/feature_evm_rollback.py
index 3577f62ecf..6e7a6b3938 100755
--- a/test/functional/feature_evm_rollback.py
+++ b/test/functional/feature_evm_rollback.py
@@ -30,6 +30,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
                 "-ethdebug=1",
             ],
diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 2d588cfe47..0e408366c7 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -39,6 +39,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
                 "-ethdebug=1",
             ],
diff --git a/test/functional/feature_evm_rpc_fee_history.py b/test/functional/feature_evm_rpc_fee_history.py
index 3bd9f42096..e119a273be 100755
--- a/test/functional/feature_evm_rpc_fee_history.py
+++ b/test/functional/feature_evm_rpc_fee_history.py
@@ -41,6 +41,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_rpc_filters.py b/test/functional/feature_evm_rpc_filters.py
index e02438c621..d9889ec14c 100755
--- a/test/functional/feature_evm_rpc_filters.py
+++ b/test/functional/feature_evm_rpc_filters.py
@@ -36,6 +36,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_rpc_transaction.py b/test/functional/feature_evm_rpc_transaction.py
index f73b2e288f..66acabd064 100755
--- a/test/functional/feature_evm_rpc_transaction.py
+++ b/test/functional/feature_evm_rpc_transaction.py
@@ -44,6 +44,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
                 "-ethdebug=1",
             ],
diff --git a/test/functional/feature_evm_smart_contract.py b/test/functional/feature_evm_smart_contract.py
index 2e7ac9fa94..269a209fd2 100755
--- a/test/functional/feature_evm_smart_contract.py
+++ b/test/functional/feature_evm_smart_contract.py
@@ -32,6 +32,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_transaction_replacement.py b/test/functional/feature_evm_transaction_replacement.py
index 3d2b731711..5ad7bf7f0f 100755
--- a/test/functional/feature_evm_transaction_replacement.py
+++ b/test/functional/feature_evm_transaction_replacement.py
@@ -40,6 +40,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/feature_evm_transferdomain.py b/test/functional/feature_evm_transferdomain.py
index 4bd2a99283..3aa33383dd 100755
--- a/test/functional/feature_evm_transferdomain.py
+++ b/test/functional/feature_evm_transferdomain.py
@@ -56,6 +56,7 @@ def set_test_params(self):
             "-fortcanningepilogueheight=96",
             "-grandcentralheight=101",
             "-metachainheight=150",
+            "-df23upgradeheight=105",
             "-subsidytest=1",
         ]
         self.extra_args = [node_args, node_args]
diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index 637fd89b2d..c322b065a5 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -39,6 +39,7 @@ def set_test_params(self):
             "-fortcanningepilogueheight=96",
             "-grandcentralheight=101",
             "-metachainheight=105",
+            "-df23upgradeheight=105",
             "-subsidytest=1",
         ]
         self.extra_args = [extra_args, extra_args]
diff --git a/test/functional/feature_icx_orderbook.py b/test/functional/feature_icx_orderbook.py
index c555905f4e..48e231f57f 100755
--- a/test/functional/feature_icx_orderbook.py
+++ b/test/functional/feature_icx_orderbook.py
@@ -33,6 +33,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=3505",
+                "-df23upgradeheight=3505",
                 "-txindex=1",
             ],
             [
@@ -51,6 +52,7 @@ def set_test_params(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=3505",
+                "-df23upgradeheight=3505",
                 "-txindex=1",
             ],
         ]
diff --git a/test/functional/feature_on_chain_government_voting_scenarios.py b/test/functional/feature_on_chain_government_voting_scenarios.py
index 473f6f8c02..0c6780b46d 100755
--- a/test/functional/feature_on_chain_government_voting_scenarios.py
+++ b/test/functional/feature_on_chain_government_voting_scenarios.py
@@ -34,6 +34,7 @@ def set_test_params(self):
                 "-fortcanninggreatworldheight=94",
                 "-grandcentralheight=101",
                 f"-metachainheight={NEXT_NETWORK_UPGRADE_HEIGHT}",
+                f"-df23upgradeheight={NEXT_NETWORK_UPGRADE_HEIGHT}",
                 "-rpc-governance-accept-neutral=1",
                 "-simulatemainnet=1",
             ],
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index 4e7aea47d5..30d4956efb 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -71,6 +71,7 @@ def run_test(self):
                 "-fortcanningepilogueheight=96",
                 "-grandcentralheight=101",
                 "-metachainheight=105",
+                "-df23upgradeheight=105",
                 "-subsidytest=1",
             ],
         ]
diff --git a/test/functional/rpc_updatemasternode.py b/test/functional/rpc_updatemasternode.py
index ea224faf36..17a176cfa3 100755
--- a/test/functional/rpc_updatemasternode.py
+++ b/test/functional/rpc_updatemasternode.py
@@ -359,6 +359,7 @@ def run_test(self):
                 "-bayfrontheight=50",
                 "-grandcentralheight=1",
                 "-metachainheight=510",
+                "-df23upgradeheight=510",
             ],
         )
 

From ab5034ec70884f8206e986253927e12e9bf20683 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Fri, 24 Nov 2023 21:22:39 +0800
Subject: [PATCH 6/6] v4.0.4 (#2712)

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7f98de8ba7..8794b6a6f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 3)
+define(_CLIENT_VERSION_REVISION, 4)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)