From 330e31f704a1f7a9580513031f026b6a674d5774 Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Tue, 26 Dec 2023 11:05:42 +0000
Subject: [PATCH 1/8] test docker image and download

---
 .github/workflows/e2e-tests.yaml |  44 +++++
 .idea/workspace.xml              | 318 +++++++++++++++++++++++++++++++
 2 files changed, 362 insertions(+)
 create mode 100644 .github/workflows/e2e-tests.yaml
 create mode 100644 .idea/workspace.xml

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
new file mode 100644
index 000000000..fccac2475
--- /dev/null
+++ b/.github/workflows/e2e-tests.yaml
@@ -0,0 +1,44 @@
+name: ci
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and export
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          tags: vechain/thor:{{github.sha}}
+          outputs: type=docker,dest=/tmp/vechain-thor.tar
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: vechain-thor-image
+          path: /tmp/vechain-thor.tar
+          retention-days: 7
+
+  use:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: vechain-thor-image
+          path: /tmp
+      - name: Load image
+        run: |
+          docker load --input /tmp/vechain-thor.tar
+          docker image ls -a   
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..cb42d9973
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="ALL" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="GOROOT" url="file:///usr/local/go" />
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;darrenvechain&quot;
+  }
+}</component>
+  <component name="GitToolBoxStore">
+    <option name="projectConfigVersion" value="5" />
+    <option name="recentBranches">
+      <RecentBranches>
+        <option name="branchesForRepo">
+          <list>
+            <RecentBranchesForRepo>
+              <option name="branches">
+                <list>
+                  <RecentBranch>
+                    <option name="branchName" value="integration-tests-2" />
+                    <option name="lastUsedInstant" value="1703588404" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="master" />
+                    <option name="lastUsedInstant" value="1703588398" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="integration-tests" />
+                    <option name="lastUsedInstant" value="1703181116" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="contributing-md-file" />
+                    <option name="lastUsedInstant" value="1703166619" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="docker-security-fix" />
+                    <option name="lastUsedInstant" value="1703163726" />
+                  </RecentBranch>
+                </list>
+              </option>
+              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
+            </RecentBranchesForRepo>
+          </list>
+        </option>
+      </RecentBranches>
+    </option>
+  </component>
+  <component name="GithubPullRequestsUISettings">
+    <option name="selectedUrlAndAccountId">
+      <UrlAndAccount>
+        <option name="accountId" value="8094f00e-5c99-4dd7-bdfc-2622f1944a8a" />
+        <option name="url" value="git@github.com:darrenvechain/thor.git" />
+      </UrlAndAccount>
+    </option>
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="jar://$APPLICATION_HOME_DIR$/plugins/qodana/lib/qodana.jar!/schemas/qodana-yaml-schema.json" root0="SKIP_INSPECTION" />
+    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@types/mocha/index.d.ts" root0="SKIP_INSPECTION" />
+    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@vechain/connex-driver/dist/driver-no-vendor.d.ts" root0="SKIP_INSPECTION" />
+    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@vechain/connex-types/vm.d.ts" root0="SKIP_INSPECTION" />
+    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/hardhat/src/types/config.ts" root0="SKIP_INSPECTION" />
+    <setting file="file:///usr/local/go/src/math/rand/rand.go" root0="SKIP_INSPECTION" />
+    <setting file="file:///usr/local/go/src/net/http/server.go" root0="SKIP_INSPECTION" />
+    <setting file="file:///usr/local/go/src/runtime/panic.go" root0="SKIP_INSPECTION" />
+    <setting file="https://json.schemastore.org/mocharc.json" root0="SKIP_INSPECTION" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 7
+}</component>
+  <component name="ProjectId" id="2ZOmMW6q4kcwVekgm2Vb5QieGkH" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Docker.integration_tests/docker-compose.yaml: Compose Deployment.executor": "Run",
+    "Go Build.go build github.com/vechain/thor/cmd/thor.executor": "Debug",
+    "Go Test.TestSeeder_Generate in github.com/vechain/thor/poa.executor": "Run",
+    "Jest.Blocks.executor": "Debug",
+    "Jest.Blocks.should be able to get the latest block.executor": "Debug",
+    "Makefile Target.test-coverage.executor": "Run",
+    "Mocha.Accounts.should be able to get a fungible token balance.executor": "Debug",
+    "Mocha.Blocks.executor": "Debug",
+    "Mocha.Contracts.executor": "Run",
+    "Mocha.Contracts.should be able to deploy contract.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.go.formatter.settings.were.checked": "true",
+    "RunOnceActivity.go.migrated.go.modules.settings": "true",
+    "RunOnceActivity.go.modules.automatic.dependencies.download": "true",
+    "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
+    "Vitest.Contracts.should be able to deploy contract.executor": "Debug",
+    "git-widget-placeholder": "integration-tests-2",
+    "go.import.settings.migrated": "true",
+    "go.sdk.automatically.set": "true",
+    "last_opened_file_path": "/Users/darren",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "nodejs.jest.jest_package": "/Users/darren/workspace/vechain/thor/integration_tests/node_modules/jest",
+    "nodejs.mocha.mocha_node_package_dir": "/Users/darren/workspace/vechain/thor/integration_tests/node_modules/mocha",
+    "nodejs_package_manager_path": "npm",
+    "npm.test.executor": "Debug",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "ts.external.directory.path": "/Users/darren/workspace/vechain/thor/integration_tests/node_modules/typescript/lib"
+  }
+}]]></component>
+  <component name="QodanaHighlightedReportService">
+    <option name="openInIdeCloudReportPersistedInfo">
+      <OpenInIdeCloudReportPersistedInfo>
+        <option name="projectId" value="3yod2" />
+        <option name="projectName" value="thor" />
+        <option name="reportId" value="VgrM7" />
+      </OpenInIdeCloudReportPersistedInfo>
+    </option>
+  </component>
+  <component name="QodanaIsSelectedPersistenceService">
+    <option name="selectedOrLoading" value="true" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/integration_tests/keys" />
+      <recent name="$PROJECT_DIR$/.github" />
+      <recent name="$PROJECT_DIR$/api/doc/api-docs" />
+      <recent name="$PROJECT_DIR$/api/doc/swagger-ui" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/integration_tests/network" />
+      <recent name="$PROJECT_DIR$/integration_tests/config" />
+      <recent name="$PROJECT_DIR$/integration_tests" />
+    </key>
+  </component>
+  <component name="RunManager" selected="Mocha.Accounts.should be able to get a fungible token balance">
+    <configuration default="true" type="docker-deploy" factoryName="docker-compose.yml" temporary="true">
+      <deployment type="docker-compose.yml">
+        <settings />
+      </deployment>
+      <method v="2" />
+    </configuration>
+    <configuration name="Accounts.should be able to get a fungible token balance" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>TEST</test-kind>
+      <test-file>$PROJECT_DIR$/integration_tests/test/accounts.test.ts</test-file>
+      <test-names>
+        <name value="Accounts" />
+        <name value="should be able to get a fungible token balance" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="Blocks" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>SUITE</test-kind>
+      <test-file>$PROJECT_DIR$/integration_tests/test/blocks.test.ts</test-file>
+      <test-names>
+        <name value="Blocks" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="Blocks.should be able to fetch finalized block (1)" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package />
+      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options>--require ts-node/register</extra-mocha-options>
+      <test-kind>TEST</test-kind>
+      <test-file>$PROJECT_DIR$/integration_tests/test/blocks.test.ts</test-file>
+      <test-names>
+        <name value="Blocks" />
+        <name value="should be able to fetch finalized block" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="Contracts" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>SUITE</test-kind>
+      <test-file>$PROJECT_DIR$/integration_tests/test/contracts.test.ts</test-file>
+      <test-names>
+        <name value="Contracts" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="Contracts.should be able to deploy contract" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>TEST</test-kind>
+      <test-file>$PROJECT_DIR$/integration_tests/test/contracts.test.ts</test-file>
+      <test-names>
+        <name value="Contracts" />
+        <name value="should be able to deploy contract" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <list>
+      <item itemvalue="Mocha.Accounts.should be able to get a fungible token balance" />
+      <item itemvalue="Mocha.Blocks" />
+      <item itemvalue="Mocha.Blocks.should be able to fetch finalized block (1)" />
+      <item itemvalue="Mocha.Contracts" />
+      <item itemvalue="Mocha.Contracts.should be able to deploy contract" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Mocha.Accounts.should be able to get a fungible token balance" />
+        <item itemvalue="Mocha.Contracts" />
+        <item itemvalue="Mocha.Contracts.should be able to deploy contract" />
+        <item itemvalue="Mocha.Blocks" />
+        <item itemvalue="Mocha.Blocks.should be able to fetch finalized block (1)" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-gosdk-266795519c66-911b893a1778-org.jetbrains.plugins.go.sharedIndexes.bundled-GO-233.13135.104" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+    <option name="exactExcludedFiles">
+      <list>
+        <option value="$PROJECT_DIR$/integration_tests/test/Lock.js" />
+      </list>
+    </option>
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VgoProject">
+    <settings-migrated>true</settings-migrated>
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/api/blocks/blocks.go</url>
+          <line>121</line>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/cmd/thor/flags.go</url>
+          <line>62</line>
+          <option name="timeStamp" value="14" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/api/api.go</url>
+          <line>62</line>
+          <option name="timeStamp" value="21" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/api/api.go</url>
+          <line>61</line>
+          <option name="timeStamp" value="22" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/integration_tests/test/setup/connex.ts</url>
+          <line>49</line>
+          <option name="timeStamp" value="28" />
+        </line-breakpoint>
+      </breakpoints>
+      <default-breakpoints>
+        <breakpoint type="DlvErrorBreakpoint" />
+      </default-breakpoints>
+    </breakpoint-manager>
+  </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="../../../../workspace/vechain/thor/coverage.out" NAME="coverage.out" MODIFIED="1703150194183" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="GoCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+  </component>
+</project>
\ No newline at end of file

From c23cd6bbca47a0c0bb519e58f1cf806894ac4e3f Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Tue, 26 Dec 2023 11:06:30 +0000
Subject: [PATCH 2/8] fix github.sha

---
 .github/workflows/e2e-tests.yaml | 4 ++--
 .idea/workspace.xml              | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index fccac2475..0e20acf18 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -1,4 +1,4 @@
-name: ci
+name: E2E Tests
 
 on: [push]
 
@@ -19,7 +19,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          tags: vechain/thor:{{github.sha}}
+          tags: vechain/thor:${{ github.sha }}
           outputs: type=docker,dest=/tmp/vechain-thor.tar
 
       - name: Upload artifact
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cb42d9973..17e9985ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="" />
+    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

From fa36df0ba6c8dc38fe840fb305f6b78a452076c4 Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Tue, 26 Dec 2023 11:12:21 +0000
Subject: [PATCH 3/8] fix dockerfile

---
 .github/workflows/e2e-tests.yaml | 18 ++++++++++++++++--
 .idea/workspace.xml              |  2 +-
 Dockerfile                       |  6 +++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 0e20acf18..151b998b4 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -3,7 +3,8 @@ name: E2E Tests
 on: [push]
 
 jobs:
-  build:
+  build-docker-image:
+    name: Build Docker image
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -29,15 +30,28 @@ jobs:
           path: /tmp/vechain-thor.tar
           retention-days: 7
 
-  use:
+  run-tests:
     runs-on: ubuntu-latest
     needs: build
+    name: Run E2E tests
     steps:
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: darrenvechain/thor-e2e-tests
+
       - name: Download artifact
         uses: actions/download-artifact@v3
         with:
           name: vechain-thor-image
           path: /tmp
+
+      - name: Setup Node JS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+
       - name: Load image
         run: |
           docker load --input /tmp/vechain-thor.tar
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17e9985ae..5de742500 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/Dockerfile b/Dockerfile
index 7f6311f87..66a8113ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build thor in a stock Go builder container
-FROM golang:alpine as builder
+FROM golang:alpine3.17 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 WORKDIR  /go/thor
@@ -7,7 +7,7 @@ COPY . /go/thor
 RUN make all
 
 # Pull thor into a second stage deploy alpine container
-FROM alpine:latest
+FROM alpine:3.17
 
 RUN apk add --no-cache ca-certificates
 COPY --from=builder /go/thor/bin/thor /usr/local/bin/
@@ -16,4 +16,4 @@ RUN adduser -D -s /bin/ash thor
 USER thor
 
 EXPOSE 8669 11235 11235/udp 55555/udp
-ENTRYPOINT ["thor"]
\ No newline at end of file
+ENTRYPOINT ["thor"]

From 6c64920ff3d6ea34c00dc533def4043317ca2fb6 Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Tue, 26 Dec 2023 11:13:24 +0000
Subject: [PATCH 4/8] fix actions

---
 .github/workflows/e2e-tests.yaml | 2 +-
 .idea/workspace.xml              | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 151b998b4..35418c14b 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -32,7 +32,7 @@ jobs:
 
   run-tests:
     runs-on: ubuntu-latest
-    needs: build
+    needs: build-docker-image
     name: Run E2E tests
     steps:
 
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5de742500..cb42d9973 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,7 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
-    </list>
+    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

From 24e2f9ac5b0efca2173a4dd2a550a545b30f2d93 Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Tue, 26 Dec 2023 11:28:03 +0000
Subject: [PATCH 5/8] run e2e tests

---
 .github/workflows/e2e-tests.yaml | 27 +++++++++++++++++++++++++++
 .idea/workspace.xml              |  5 ++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 35418c14b..6438166e2 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -33,6 +33,8 @@ jobs:
   run-tests:
     runs-on: ubuntu-latest
     needs: build-docker-image
+    env:
+      THOR_IMAGE: vechain/thor:${{ github.sha }}
     name: Run E2E tests
     steps:
 
@@ -56,3 +58,28 @@ jobs:
         run: |
           docker load --input /tmp/vechain-thor.tar
           docker image ls -a   
+
+      - name: Run Tests
+        run: |
+          yarn install
+          yarn test
+
+      - name: Publish Results
+        uses: dorny/test-reporter@v1
+        id: test-reporter
+        if: success() || failure()
+        with:
+          name: Integration Tests
+          only-summary: 'false'
+          list-suites: 'all'
+          list-tests: 'all'
+          fail-on-error: 'true'
+          reporter: 'mocha-json'
+          path: |
+            results.json
+
+        # TODO: Add PR Comment
+      - name: Add PR Comment
+        run: |
+          echo ${{steps.test-reporter.outputs.url_html}}
+          
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cb42d9973..17e9985ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="" />
+    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

From 2ced485e248b098e717ab56870d06bd5649ff21f Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Wed, 10 Jan 2024 12:45:52 +0000
Subject: [PATCH 6/8] update actions

---
 .github/workflows/e2e-tests.yaml |  2 +-
 .idea/aws.xml                    | 17 +++++++
 .idea/workspace.xml              | 76 ++++++++++++++------------------
 3 files changed, 50 insertions(+), 45 deletions(-)
 create mode 100644 .idea/aws.xml

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 6438166e2..310677023 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -62,7 +62,7 @@ jobs:
       - name: Run Tests
         run: |
           yarn install
-          yarn test
+          yarn test:report
 
       - name: Publish Results
         uses: dorny/test-reporter@v1
diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 000000000..ec328d0bb
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeProfile" value="profile:default" />
+    <option name="activeRegion" value="eu-west-1" />
+    <option name="recentlyUsedProfiles">
+      <list>
+        <option value="profile:default" />
+      </list>
+    </option>
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="eu-west-1" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17e9985ae..40b659e30 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -91,51 +91,39 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Docker.integration_tests/docker-compose.yaml: Compose Deployment.executor": "Run",
-    "Go Build.go build github.com/vechain/thor/cmd/thor.executor": "Debug",
-    "Go Test.TestSeeder_Generate in github.com/vechain/thor/poa.executor": "Run",
-    "Jest.Blocks.executor": "Debug",
-    "Jest.Blocks.should be able to get the latest block.executor": "Debug",
-    "Makefile Target.test-coverage.executor": "Run",
-    "Mocha.Accounts.should be able to get a fungible token balance.executor": "Debug",
-    "Mocha.Blocks.executor": "Debug",
-    "Mocha.Contracts.executor": "Run",
-    "Mocha.Contracts.should be able to deploy contract.executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.go.formatter.settings.were.checked": "true",
-    "RunOnceActivity.go.migrated.go.modules.settings": "true",
-    "RunOnceActivity.go.modules.automatic.dependencies.download": "true",
-    "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
-    "Vitest.Contracts.should be able to deploy contract.executor": "Debug",
-    "git-widget-placeholder": "integration-tests-2",
-    "go.import.settings.migrated": "true",
-    "go.sdk.automatically.set": "true",
-    "last_opened_file_path": "/Users/darren",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "nodejs.jest.jest_package": "/Users/darren/workspace/vechain/thor/integration_tests/node_modules/jest",
-    "nodejs.mocha.mocha_node_package_dir": "/Users/darren/workspace/vechain/thor/integration_tests/node_modules/mocha",
-    "nodejs_package_manager_path": "npm",
-    "npm.test.executor": "Debug",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "ts.external.directory.path": "/Users/darren/workspace/vechain/thor/integration_tests/node_modules/typescript/lib"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Docker.integration_tests/docker-compose.yaml: Compose Deployment.executor&quot;: &quot;Run&quot;,
+    &quot;Go Build.go build github.com/vechain/thor/cmd/thor.executor&quot;: &quot;Debug&quot;,
+    &quot;Go Test.TestSeeder_Generate in github.com/vechain/thor/poa.executor&quot;: &quot;Run&quot;,
+    &quot;Jest.Blocks.executor&quot;: &quot;Debug&quot;,
+    &quot;Jest.Blocks.should be able to get the latest block.executor&quot;: &quot;Debug&quot;,
+    &quot;Makefile Target.test-coverage.executor&quot;: &quot;Run&quot;,
+    &quot;Mocha.Accounts.should be able to get a fungible token balance.executor&quot;: &quot;Debug&quot;,
+    &quot;Mocha.Blocks.executor&quot;: &quot;Debug&quot;,
+    &quot;Mocha.Contracts.executor&quot;: &quot;Run&quot;,
+    &quot;Mocha.Contracts.should be able to deploy contract.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.modules.automatic.dependencies.download&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;,
+    &quot;Vitest.Contracts.should be able to deploy contract.executor&quot;: &quot;Debug&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;integration-tests-2&quot;,
+    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
+    &quot;go.sdk.automatically.set&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/darren&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs.jest.jest_package&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/jest&quot;,
+    &quot;nodejs.mocha.mocha_node_package_dir&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/mocha&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;npm.test.executor&quot;: &quot;Debug&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/typescript/lib&quot;
   }
-}]]></component>
-  <component name="QodanaHighlightedReportService">
-    <option name="openInIdeCloudReportPersistedInfo">
-      <OpenInIdeCloudReportPersistedInfo>
-        <option name="projectId" value="3yod2" />
-        <option name="projectName" value="thor" />
-        <option name="reportId" value="VgrM7" />
-      </OpenInIdeCloudReportPersistedInfo>
-    </option>
-  </component>
-  <component name="QodanaIsSelectedPersistenceService">
-    <option name="selectedOrLoading" value="true" />
-  </component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/integration_tests/keys" />

From 5e925e995f5d2f0bd775654eeca8875829eb7ae5 Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Wed, 10 Jan 2024 12:49:21 +0000
Subject: [PATCH 7/8] update actions to use THOR_IMAGE

---
 .github/workflows/e2e-tests.yaml |   1 +
 .idea/aws.xml                    |  17 --
 .idea/workspace.xml              | 309 -------------------------------
 3 files changed, 1 insertion(+), 326 deletions(-)
 delete mode 100644 .idea/aws.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 310677023..ed0d083c3 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -61,6 +61,7 @@ jobs:
 
       - name: Run Tests
         run: |
+          export THOR_IMAGE: vechain/thor:${{ github.sha }}
           yarn install
           yarn test:report
 
diff --git a/.idea/aws.xml b/.idea/aws.xml
deleted file mode 100644
index ec328d0bb..000000000
--- a/.idea/aws.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="eu-west-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="eu-west-1" />
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 40b659e30..000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="ALL" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="GOROOT" url="file:///usr/local/go" />
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitHubPullRequestSearchHistory">{
-  &quot;lastFilter&quot;: {
-    &quot;state&quot;: &quot;OPEN&quot;,
-    &quot;assignee&quot;: &quot;darrenvechain&quot;
-  }
-}</component>
-  <component name="GitToolBoxStore">
-    <option name="projectConfigVersion" value="5" />
-    <option name="recentBranches">
-      <RecentBranches>
-        <option name="branchesForRepo">
-          <list>
-            <RecentBranchesForRepo>
-              <option name="branches">
-                <list>
-                  <RecentBranch>
-                    <option name="branchName" value="integration-tests-2" />
-                    <option name="lastUsedInstant" value="1703588404" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="master" />
-                    <option name="lastUsedInstant" value="1703588398" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="integration-tests" />
-                    <option name="lastUsedInstant" value="1703181116" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="contributing-md-file" />
-                    <option name="lastUsedInstant" value="1703166619" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="docker-security-fix" />
-                    <option name="lastUsedInstant" value="1703163726" />
-                  </RecentBranch>
-                </list>
-              </option>
-              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
-            </RecentBranchesForRepo>
-          </list>
-        </option>
-      </RecentBranches>
-    </option>
-  </component>
-  <component name="GithubPullRequestsUISettings">
-    <option name="selectedUrlAndAccountId">
-      <UrlAndAccount>
-        <option name="accountId" value="8094f00e-5c99-4dd7-bdfc-2622f1944a8a" />
-        <option name="url" value="git@github.com:darrenvechain/thor.git" />
-      </UrlAndAccount>
-    </option>
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="jar://$APPLICATION_HOME_DIR$/plugins/qodana/lib/qodana.jar!/schemas/qodana-yaml-schema.json" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@types/mocha/index.d.ts" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@vechain/connex-driver/dist/driver-no-vendor.d.ts" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@vechain/connex-types/vm.d.ts" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/hardhat/src/types/config.ts" root0="SKIP_INSPECTION" />
-    <setting file="file:///usr/local/go/src/math/rand/rand.go" root0="SKIP_INSPECTION" />
-    <setting file="file:///usr/local/go/src/net/http/server.go" root0="SKIP_INSPECTION" />
-    <setting file="file:///usr/local/go/src/runtime/panic.go" root0="SKIP_INSPECTION" />
-    <setting file="https://json.schemastore.org/mocharc.json" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 7
-}</component>
-  <component name="ProjectId" id="2ZOmMW6q4kcwVekgm2Vb5QieGkH" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Docker.integration_tests/docker-compose.yaml: Compose Deployment.executor&quot;: &quot;Run&quot;,
-    &quot;Go Build.go build github.com/vechain/thor/cmd/thor.executor&quot;: &quot;Debug&quot;,
-    &quot;Go Test.TestSeeder_Generate in github.com/vechain/thor/poa.executor&quot;: &quot;Run&quot;,
-    &quot;Jest.Blocks.executor&quot;: &quot;Debug&quot;,
-    &quot;Jest.Blocks.should be able to get the latest block.executor&quot;: &quot;Debug&quot;,
-    &quot;Makefile Target.test-coverage.executor&quot;: &quot;Run&quot;,
-    &quot;Mocha.Accounts.should be able to get a fungible token balance.executor&quot;: &quot;Debug&quot;,
-    &quot;Mocha.Blocks.executor&quot;: &quot;Debug&quot;,
-    &quot;Mocha.Contracts.executor&quot;: &quot;Run&quot;,
-    &quot;Mocha.Contracts.should be able to deploy contract.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.modules.automatic.dependencies.download&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;,
-    &quot;Vitest.Contracts.should be able to deploy contract.executor&quot;: &quot;Debug&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;integration-tests-2&quot;,
-    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
-    &quot;go.sdk.automatically.set&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/darren&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs.jest.jest_package&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/jest&quot;,
-    &quot;nodejs.mocha.mocha_node_package_dir&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/mocha&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;npm.test.executor&quot;: &quot;Debug&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/typescript/lib&quot;
-  }
-}</component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/integration_tests/keys" />
-      <recent name="$PROJECT_DIR$/.github" />
-      <recent name="$PROJECT_DIR$/api/doc/api-docs" />
-      <recent name="$PROJECT_DIR$/api/doc/swagger-ui" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/integration_tests/network" />
-      <recent name="$PROJECT_DIR$/integration_tests/config" />
-      <recent name="$PROJECT_DIR$/integration_tests" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Mocha.Accounts.should be able to get a fungible token balance">
-    <configuration default="true" type="docker-deploy" factoryName="docker-compose.yml" temporary="true">
-      <deployment type="docker-compose.yml">
-        <settings />
-      </deployment>
-      <method v="2" />
-    </configuration>
-    <configuration name="Accounts.should be able to get a fungible token balance" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/accounts.test.ts</test-file>
-      <test-names>
-        <name value="Accounts" />
-        <name value="should be able to get a fungible token balance" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Blocks" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/blocks.test.ts</test-file>
-      <test-names>
-        <name value="Blocks" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Blocks.should be able to fetch finalized block (1)" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package />
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options>--require ts-node/register</extra-mocha-options>
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/blocks.test.ts</test-file>
-      <test-names>
-        <name value="Blocks" />
-        <name value="should be able to fetch finalized block" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Contracts" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/contracts.test.ts</test-file>
-      <test-names>
-        <name value="Contracts" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Contracts.should be able to deploy contract" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/contracts.test.ts</test-file>
-      <test-names>
-        <name value="Contracts" />
-        <name value="should be able to deploy contract" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <list>
-      <item itemvalue="Mocha.Accounts.should be able to get a fungible token balance" />
-      <item itemvalue="Mocha.Blocks" />
-      <item itemvalue="Mocha.Blocks.should be able to fetch finalized block (1)" />
-      <item itemvalue="Mocha.Contracts" />
-      <item itemvalue="Mocha.Contracts.should be able to deploy contract" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Mocha.Accounts.should be able to get a fungible token balance" />
-        <item itemvalue="Mocha.Contracts" />
-        <item itemvalue="Mocha.Contracts.should be able to deploy contract" />
-        <item itemvalue="Mocha.Blocks" />
-        <item itemvalue="Mocha.Blocks.should be able to fetch finalized block (1)" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-gosdk-266795519c66-911b893a1778-org.jetbrains.plugins.go.sharedIndexes.bundled-GO-233.13135.104" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-    <option name="exactExcludedFiles">
-      <list>
-        <option value="$PROJECT_DIR$/integration_tests/test/Lock.js" />
-      </list>
-    </option>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VgoProject">
-    <settings-migrated>true</settings-migrated>
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/blocks/blocks.go</url>
-          <line>121</line>
-          <option name="timeStamp" value="12" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/cmd/thor/flags.go</url>
-          <line>62</line>
-          <option name="timeStamp" value="14" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/api.go</url>
-          <line>62</line>
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/api.go</url>
-          <line>61</line>
-          <option name="timeStamp" value="22" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/integration_tests/test/setup/connex.ts</url>
-          <line>49</line>
-          <option name="timeStamp" value="28" />
-        </line-breakpoint>
-      </breakpoints>
-      <default-breakpoints>
-        <breakpoint type="DlvErrorBreakpoint" />
-      </default-breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="../../../../workspace/vechain/thor/coverage.out" NAME="coverage.out" MODIFIED="1703150194183" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="GoCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-  </component>
-</project>
\ No newline at end of file

From d654c063a2beb46e2c8bea35dead9de0d959e80e Mon Sep 17 00:00:00 2001
From: Darren Kelly <darren.kelly@vechain.org>
Date: Wed, 10 Jan 2024 12:51:59 +0000
Subject: [PATCH 8/8] update actions to use THOR_IMAGE

---
 .github/workflows/e2e-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index ed0d083c3..781179b95 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -61,7 +61,7 @@ jobs:
 
       - name: Run Tests
         run: |
-          export THOR_IMAGE: vechain/thor:${{ github.sha }}
+          export THOR_IMAGE=vechain/thor:${{ github.sha }}
           yarn install
           yarn test:report