Merge pull request #7050 from multiversx/merge-barnard-into-feat-timestamp-ms

Merge barnard into feat timestamp ms

Author: ssd04

.github/workflows/build_and_run_chain_simulator_and_execute_system_test.yml

@@ -22,18 +22,23 @@ jobs:
       (github.event_name == 'issue_comment' && contains(github.event.comment.body, 'Run Tests:')) ||
       github.event_name == 'workflow_dispatch'
 
-    strategy:
-      matrix:
-        #TODO Include Macos support later on
-        runs-on: [ubuntu-latest]
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: [self-hosted, Linux, X64]
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
       TARGET_BRANCH: ""
       MX_CHAIN_GO_TARGET_BRANCH: ""
       MX_CHAIN_SIMULATOR_TARGET_BRANCH: ""
       MX_CHAIN_TESTING_SUITE_TARGET_BRANCH: ""
 
+      CF_R2_ACCESS_KEY: ${{ secrets.CF_R2_ACCESS_KEY }}
+      CF_R2_SECRET_KEY: ${{ secrets.CF_R2_SECRET_KEY }}
+      CF_R2_ENDPOINT:    ${{ secrets.CF_R2_ENDPOINT }}
+
+      REPORT_BUCKET:  mx-chain-go-testing-reports
+      REPORT_BASE_URL: https://mx-chain-go-testing-reports.multiversx.com
+
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
     steps:
       - name: Determine Target Branches
         id: target_branch
@@ -132,6 +137,22 @@ jobs:
           echo "LATEST_COMMIT_HASH=${latest_commit_hash}" >> $GITHUB_ENV
           echo "Latest commit hash: ${latest_commit_hash}"
 
+      - name: Install rclone
+        run: |
+          TS=$(date +'%Y_%^B_%d__%H_%M_%S'); 
+          echo "TS=$TS" >> "$GITHUB_ENV"
+          echo "TIMESTAMP=$TS" >> "$GITHUB_ENV"
+          sudo apt-get update -y && sudo apt-get install -y rclone
+          mkdir -p ~/.config/rclone
+          cat > ~/.config/rclone/rclone.conf <<EOF
+          [r2]
+          type = s3
+          provider = Cloudflare
+          access_key_id = ${CF_R2_ACCESS_KEY}
+          secret_access_key = ${CF_R2_SECRET_KEY}
+          endpoint = ${CF_R2_ENDPOINT}
+          EOF
+
       - name: Checkout mx-chain-simulator-go
         uses: actions/checkout@v4
         with:
@@ -147,6 +168,8 @@ jobs:
       - name: Install Python Dependencies and Update go.mod
         run: |
           cd mx-chain-simulator-go
+          echo "SIMULATOR_REF=$(git symbolic-ref --short HEAD || git describe --tags)" >> $GITHUB_ENV
+          echo "SIMULATOR_COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
           pip install -r scripts/update-go-mod/requirements.txt
           python scripts/update-go-mod/update-go-mod.py $LATEST_COMMIT_HASH
 
@@ -241,10 +264,12 @@ jobs:
           ref: ${{ env.MX_CHAIN_TESTING_SUITE_TARGET_BRANCH || github.event.pull_request.base.ref }}
           token: ${{ secrets.MVX_TESTER_GH_TOKEN }}
 
-      - name: Install Dependencies
+      - name: Install MX-Chain-Testing-Suite Dependencies
         run: |
           pip install -r mx-chain-testing-suite/requirements.txt
           echo "PYTHONPATH=mx-chain-testing-suite" >> $GITHUB_ENV
+          cd mx-chain-testing-suite
+          echo "CURRENT_COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
 
       - name: Run tests and generate HTML report
@@ -262,6 +287,19 @@ jobs:
           else
             echo "Report not found."
           fi
+          
+      - name: Stage report for R2
+        run: |
+          mkdir -p r2_upload
+          cp reports/report.html r2_upload/index.html  # correct source
+
+      - name: Upload report to Cloudflare R2
+        if: always()
+        run: |
+          branch="${{ env.BRANCH_NAME }}"
+          target="reports/chain-simulator/${branch}/${TS}"
+          rclone copy r2_upload/ "r2:${REPORT_BUCKET}/${target}"
+          echo "R2_REPORT_URL=${REPORT_BASE_URL}/${target}/index.html" >> $GITHUB_ENV          
 
       - name: Upload test report
         if: always()
@@ -346,42 +384,54 @@ jobs:
           MX_CHAIN_TESTING_SUITE_TARGET_BRANCH: ${{ env.MX_CHAIN_TESTING_SUITE_TARGET_BRANCH }}
           LATEST_COMMIT_HASH: ${{ env.LATEST_COMMIT_HASH }}
           PYTEST_EXIT_CODE: ${{ env.PYTEST_EXIT_CODE }}
-
+          CURRENT_COMMIT_HASH:   ${{ env.CURRENT_COMMIT_HASH }}
+          SIMULATOR_COMMIT_HASH: ${{ env.SIMULATOR_COMMIT_HASH }}
+          SIMULATOR_REF:         ${{ env.SIMULATOR_REF }}
+          R2_REPORT_URL:         ${{ env.R2_REPORT_URL }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const timestamp = process.env.TIMESTAMP;
-            const branchName = process.env.BRANCH_NAME;
-            const currentBranch = process.env.CURRENT_BRANCH;
-            const goTargetBranch = process.env.MX_CHAIN_GO_TARGET_BRANCH;
-            const simulatorTargetBranch = process.env.MX_CHAIN_SIMULATOR_TARGET_BRANCH;
-            const testingSuiteTargetBranch = process.env.MX_CHAIN_TESTING_SUITE_TARGET_BRANCH;
-            const commitHash = process.env.LATEST_COMMIT_HASH;
-            const exitCode = process.env.PYTEST_EXIT_CODE;
+            const timestamp                 = process.env.TIMESTAMP;
+            const branchName                = process.env.BRANCH_NAME;
+            const currentBranch             = process.env.CURRENT_BRANCH;
+            const goTargetBranch            = process.env.MX_CHAIN_GO_TARGET_BRANCH;
+            const simulatorTargetBranch     = process.env.MX_CHAIN_SIMULATOR_TARGET_BRANCH;
+            const testingSuiteTargetBranch  = process.env.MX_CHAIN_TESTING_SUITE_TARGET_BRANCH;
+            const commitHash                = process.env.LATEST_COMMIT_HASH;
+            const exitCode                  = process.env.PYTEST_EXIT_CODE;
+
+            const simulatorCommitHash = process.env.SIMULATOR_COMMIT_HASH || 'N/A';
+            const r2Url            = process.env.R2_REPORT_URL || 'N/A';
+
             const issue_number = context.issue.number;
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
+            const owner  = context.repo.owner;
+            const repo   = context.repo.repo;
+            const ts = process.env.TS || process.env.TIMESTAMP;
+            const verdict = exitCode === "0"
+              ? "✅ **Integration Tests passed successfully!**"
+              : "❌ **Integration Tests completed with failures or errors.**";
             let message;
-
-            if (timestamp && branchName && timestamp !== "" && branchName !== "") {
-              const reportUrl = `https://multiversx.github.io/mx-chain-testing-suite/reports/${branchName}/${timestamp}/index.html`;
+            if (timestamp && branchName) {
+              const backupUrl = `https://multiversx.github.io/mx-chain-testing-suite/reports/${branchName}/${timestamp}/index.html`;
               message = `
-              📊 **MultiversX Automated Test Report:** [View Report](${reportUrl})
+              ${verdict}
             
+              📊 **MultiversX Automated Test Report:** [View Report](${r2Url})
+
               🔄 **Build Details:**
               - **mx-chain-go Commit Hash:** \`${commitHash}\`
               - **Current Branch:** \`${currentBranch}\`
               - **mx-chain-go Target Branch:** \`${goTargetBranch}\`
               - **mx-chain-simulator-go Target Branch:** \`${simulatorTargetBranch}\`
               - **mx-chain-testing-suite Target Branch:** \`${testingSuiteTargetBranch}\`
-            
+              - **mx-chain-simulator-go Commit Hash:** \`${simulatorCommitHash}\`
+
               🚀 **Environment Variables:**
-            - **TIMESTAMP:** \`${timestamp}\`
-            - **PYTEST_EXIT_CODE:** \`${exitCode}\`
-              🎉 **MultiversX CI/CD Workflow Complete!**
+              - **TIMESTAMP:** \`${ts}\`
+              - **PYTEST_EXIT_CODE:** \`${exitCode}\`
               `;
             } else {
-              message = "⚠️ No report was generated due to an error or cancellation of the process.\nPlease checkout gh action logs for details";
+              message = "⚠️ No report was generated due to an error or cancellation of the process.\nPlease checkout GH-Action logs for details.";
             }
 
             github.rest.issues.createComment({
@@ -391,6 +441,36 @@ jobs:
               body: message
             });
 
+      - name: Notify Slack
+        if: always()
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          R2_REPORT_URL: ${{ env.R2_REPORT_URL }}
+          BRANCH_NAME: ${{ env.BRANCH_NAME }}
+          CURRENT_COMMIT_HASH: ${{ env.CURRENT_COMMIT_HASH }}
+          SIMULATOR_REF: ${{ env.SIMULATOR_REF }}
+          SIMULATOR_COMMIT_HASH: ${{ env.SIMULATOR_COMMIT_HASH }}
+          TS: ${{ env.TS }}
+          PYTEST_EXIT_CODE: ${{ env.PYTEST_EXIT_CODE }}
+        run: |
+          status="❌ FAILED"
+          [ "${PYTEST_EXIT_CODE}" = "0" ] && status="✅ PASSED"
+          repo="${GITHUB_REPOSITORY##*/}"
+          base="${{ github.base_ref }}"
+          
+          msg="*MX-CHAIN-GO ChainSimulator CI – ${status}*\
+          \n• *Report:* <${R2_REPORT_URL:-N/A}|HTML>\
+          \n• *Repository:* \`${repo}\`\
+          \n• *Branch:* \`${BRANCH_NAME}\` → \`${base:-main}\`\
+          \n• *Testing-suite Commit:* \`${CURRENT_COMMIT_HASH}\`\
+          \n• *Chain Simulator Branch:* \`${SIMULATOR_REF}\`\
+          \n• *Chain Simulator Commit:* \`${SIMULATOR_COMMIT_HASH}\`\
+          \n• *Run at:* ${TS}"
+          
+          curl -s -X POST -H 'Content-Type: application/json' \
+               -d "{\"text\":\"${msg}\"}" \
+               "$SLACK_WEBHOOK_URL"
+
       - name: Fail job if tests failed
         if: always()
         run: |

.github/workflows/check-cli-md.yml

@@ -7,6 +7,9 @@ on:
   push:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   build:
     strategy:

.github/workflows/code-coverage.yml

@@ -6,15 +6,14 @@ on:
       - master
   pull_request:
     branches: [ master, feat/*, rc/* ]
-
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   build:
-    strategy:
-      matrix:
-        runs-on: [ubuntu-latest]
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: [self-hosted, Linux, X64]
     name: Build
     steps:
       - name: Set up Go 1.23.6

.github/workflows/docker-keygenerator.yaml

@@ -3,6 +3,9 @@ name: Build & push keygenerator docker image
 on:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   build-docker-image:
     strategy:

api/groups/addressGroup.go

@@ -42,6 +42,9 @@ const (
 	urlParamWithKeys               = "withKeys"
 )
 
+// maxUint64 is represented on 20 characters as a string
+const maxNumCharsForNonceAsString = 20
+
 // addressFacadeHandler defines the methods to be implemented by a facade for handling address requests
 type addressFacadeHandler interface {
 	GetBalance(address string, options api.AccountQueryOptions) (*big.Int, api.BlockInfo, error)
@@ -634,6 +637,9 @@ func extractGetESDTNFTDataParams(c *gin.Context) (string, string, *big.Int, api.
 	if nonceAsStr == "" {
 		return "", "", nil, api.AccountQueryOptions{}, errors.ErrNonceInvalid
 	}
+	if len(nonceAsStr) > maxNumCharsForNonceAsString {
+		return "", "", nil, api.AccountQueryOptions{}, fmt.Errorf("%w: nonce too long, num chars %v, max num chars %v", errors.ErrNonceInvalid, len(nonceAsStr), maxNumCharsForNonceAsString)
+	}
 
 	nonceAsBigInt, okConvert := big.NewInt(0).SetString(nonceAsStr, 10)
 	if !okConvert {

api/groups/addressGroup_test.go

@@ -992,6 +992,9 @@ func TestAddressGroup_getESDTNFTData(t *testing.T) {
 	t.Run("invalid nonce should error",
 		testErrorScenario("/address/erd1alice/nft/newToken/nonce/not-int", "GET", nil,
 			formatExpectedErr(apiErrors.ErrGetESDTNFTData, apiErrors.ErrNonceInvalid)))
+	t.Run("nonce too long should error",
+		testErrorScenario("/address/erd1alice/nft/newToken/nonce/1234567489123456789123", "GET", nil,
+			formatExpectedErr(apiErrors.ErrGetESDTNFTData, apiErrors.ErrNonceInvalid)))
 	t.Run("with node fail should err", func(t *testing.T) {
 		t.Parallel()
 

go.sum

@@ -401,8 +401,6 @@ github.com/multiversx/concurrent-map v0.1.4 h1:hdnbM8VE4b0KYJaGY5yJS2aNIW9TFFsUY
 github.com/multiversx/concurrent-map v0.1.4/go.mod h1:8cWFRJDOrWHOTNSqgYCUvwT7c7eFQ4U2vKMOp4A/9+o=
 github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476 h1:Dn73bH1AdG+7+3/FFRfOiivOEvwPyzZUBWWxpk8QVxc=
 github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476/go.mod h1:99+FW6f7X0Ri5tph+2l2GaDVrdej1do89exkfh7gilE=
-github.com/multiversx/mx-chain-core-go v1.3.2-0.20250606113953-9e4dc87c16cb h1:orPuViEu3dnElbfp6w2q1iokLQlTueb9akRpxfqe6IU=
-github.com/multiversx/mx-chain-core-go v1.3.2-0.20250606113953-9e4dc87c16cb/go.mod h1:IO+vspNan+gT0WOHnJ95uvWygiziHZvfXpff6KnxV7g=
 github.com/multiversx/mx-chain-core-go v1.3.2-0.20250611135730-8202519ce227 h1:0Xu8i4k/aMO5Vb36SIS4ejJHI3gbEtpHjIZUsaVCSSE=
 github.com/multiversx/mx-chain-core-go v1.3.2-0.20250611135730-8202519ce227/go.mod h1:IO+vspNan+gT0WOHnJ95uvWygiziHZvfXpff6KnxV7g=
 github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d h1:NI5uKpkwP5XZu9gtDiWxmbbb07T9hXegPist17WAzY4=
@@ -419,6 +417,8 @@ github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250604100541-1efc3d1b131
 github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250604100541-1efc3d1b1314/go.mod h1:HlpJgCTYVvHE1nrEJLIsR/AJx0gqzg3m+qdJwf7jOjU=
 github.com/multiversx/mx-chain-vm-go v1.5.41-0.20250612091736-50ea397e96f7 h1:oNbDBD1VZauOg9iltCd9q8QXkNpS+cglgnjklG8cEtI=
 github.com/multiversx/mx-chain-vm-go v1.5.41-0.20250612091736-50ea397e96f7/go.mod h1:K9NYP80fWFD7pSRG+5RQ42P9AGTsbdSF6Y9vLC1M4Z0=
+github.com/multiversx/mx-chain-vm-go v1.5.41-0.20250613100924-fa527150f62e h1:487uQFdkWIJ/cI6c7sPPOXHxspMxRg7zumsNnyfapx4=
+github.com/multiversx/mx-chain-vm-go v1.5.41-0.20250613100924-fa527150f62e/go.mod h1:vfFEw1qAmR1mUU8/p2EKu2woKS+o9W8wSqi3muEqRds=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250520080927-410c413d962f h1:Sg1SZWm90IeliVPce3w0CtLjr+a+mcWAFVHW2VGR0nA=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250520080927-410c413d962f/go.mod h1:aeGXPTVkUDsPcHwuSer2VXEnMow7iofEvuDGPd47Cj8=
 github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20250520081414-edf8b75e054d h1:DFYWypkQs7BYepsLPz/IIN8cGsEf4+fWM9L0a6mnfKU=

node/node.go

@@ -679,6 +679,10 @@ func (n *Node) GetAllESDTTokens(address string, options api.AccountQueryOptions,
 			continue
 		}
 
+		if esdtToken.Value.Sign() <= 0 {
+			continue
+		}
+
 		if esdtToken.TokenMetaData != nil {
 			esdtTokenCreatorAddr, errEncode := n.coreComponents.AddressPubKeyConverter().Encode(esdtToken.TokenMetaData.Creator)
 			if errEncode != nil {

node/node_test.go

@@ -1080,13 +1080,30 @@ func TestNode_GetAllESDTTokensShouldReturnEsdtAndFormattedNft(t *testing.T) {
 	nftData := &esdt.ESDigitalToken{Type: uint32(core.NonFungible), Value: big.NewInt(10), TokenMetaData: nftMetaData}
 	marshalledNftData, _ := getMarshalizer().Marshal(nftData)
 
+	dynamicNft := "TCKR-abcdef"
+	dynamicNftNonce := big.NewInt(100)
+	dynamicNftKey := []byte(core.ProtectedKeyPrefix + core.ESDTKeyIdentifier + dynamicNft)
+	dynamicNftKeyWithBytes := append(dynamicNftKey, dynamicNftNonce.Bytes()...)
+	dynamicNftSuffix := append(dynamicNftKeyWithBytes, acc.AddressBytes()...)
+	dynamicNftData := &esdt.ESDigitalToken{
+		Type:  uint32(core.DynamicNFT),
+		Value: big.NewInt(0),
+		TokenMetaData: &esdt.MetaData{
+			Nonce: dynamicNftNonce.Uint64(),
+			URIs:  [][]byte{[]byte("https://example.com/dynamic-nft")},
+		},
+	}
+	marshalledDynamicNftData, _ := getMarshalizer().Marshal(dynamicNftData)
+
 	esdtStorageStub := &testscommon.EsdtStorageHandlerStub{
 		GetESDTNFTTokenOnDestinationWithCustomSystemAccountCalled: func(acnt vmcommon.UserAccountHandler, esdtTokenKey []byte, nonce uint64, _ vmcommon.UserAccountHandler) (*esdt.ESDigitalToken, bool, error) {
 			switch string(esdtTokenKey) {
 			case string(esdtKey):
 				return esdtData, false, nil
 			case string(nftKey):
 				return nftData, false, nil
+			case string(dynamicNftKey):
+				return dynamicNftData, false, nil
 			default:
 				return nil, false, nil
 			}
@@ -1103,6 +1120,10 @@ func TestNode_GetAllESDTTokensShouldReturnEsdtAndFormattedNft(t *testing.T) {
 
 					trieLeaf = keyValStorage.NewKeyValStorage(nftKey, append(marshalledNftData, nftSuffix...))
 					leavesChannels.LeavesChan <- trieLeaf
+
+					trieLeaf = keyValStorage.NewKeyValStorage(dynamicNftKey, append(marshalledDynamicNftData, dynamicNftSuffix...))
+					leavesChannels.LeavesChan <- trieLeaf
+
 					wg.Done()
 					close(leavesChannels.LeavesChan)
 					leavesChannels.ErrChan.Close()

sonar-project.properties

@@ -0,0 +1 @@
+sonar.exclusions=**/*_test.go, integrationTests/**, testcommon/**, **/mock/**, **/disabled/**, **/disabled*.go,  examples/**, scripts/**, **/*.pb.go