diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
new file mode 100644
index 000000000..ddd850403
--- /dev/null
+++ b/.github/workflows/lint.yaml
@@ -0,0 +1,59 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  unit_tests:
+    strategy:
+      matrix:
+        go-version: [1.20.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          - go-version: 1.17.x
+            os: ubuntu-latest
+          - go-version: 1.18.x
+            os: ubuntu-latest
+          - go-version: 1.19.x
+            os: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          # Require: The version of golangci-lint to use.
+          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
+          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
+          version: v1.54
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          #
+          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
+          # The location of the configuration file can be changed by using `--config=`
+          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true, then all caching functionality will be completely disabled,
+          #           takes precedence over all other caching options.
+          # skip-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true
+
+          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
+          # install-mode: "goinstall"
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
new file mode 100644
index 000000000..6156ca4a4
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,204 @@
+<?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="master" />
+                    <option name="lastUsedInstant" value="1703063609" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="add-code-owners" />
+                    <option name="lastUsedInstant" value="1703063588" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="api-doc-refactor" />
+                    <option name="lastUsedInstant" value="1702986844" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="api-docs-upates" />
+                    <option name="lastUsedInstant" value="1702421418" />
+                  </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="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" />
+  </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": {
+    "Go Build.go build github.com/vechain/thor/cmd/thor.executor": "Debug",
+    "Makefile Target.test-coverage.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",
+    "git-widget-placeholder": "master",
+    "go.import.settings.migrated": "true",
+    "go.sdk.automatically.set": "true",
+    "last_opened_file_path": "/Users/darren/workspace/vechain/thor/.github",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.pluginManager"
+  }
+}]]></component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/.github" />
+      <recent name="$PROJECT_DIR$/api/doc/api-docs" />
+      <recent name="$PROJECT_DIR$/api/doc/swagger-ui" />
+    </key>
+  </component>
+  <component name="RunManager" selected="Go Build.go build github.com/vechain/thor/cmd/thor">
+    <configuration name="go build github.com/vechain/thor/cmd/thor" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
+      <module name="thor" />
+      <working_directory value="$PROJECT_DIR$" />
+      <parameters value="solo --data-dir ~/workspace/vechain/testing/thor-swagger --api-addr localhost:8669 --api-cors=&quot;*&quot; " />
+      <EXTENSION ID="net.ashald.envfile">
+        <option name="IS_ENABLED" value="false" />
+        <option name="IS_SUBST" value="false" />
+        <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+        <option name="IS_IGNORE_MISSING_FILES" value="false" />
+        <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+        <ENTRIES>
+          <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        </ENTRIES>
+      </EXTENSION>
+      <EXTENSION ID="software.aws.toolkits.jetbrains.core.execution.GoAwsConnectionRunConfigurationExtension">
+        <option name="credential" />
+        <option name="region" />
+        <option name="useCurrentConnection" value="false" />
+      </EXTENSION>
+      <kind value="PACKAGE" />
+      <package value="github.com/vechain/thor/cmd/thor" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$/cmd/thor/main.go" />
+      <method v="2" />
+    </configuration>
+    <configuration name="test-coverage" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
+      <makefile filename="$PROJECT_DIR$/Makefile" target="test-coverage" workingDirectory="" arguments="">
+        <envs />
+      </makefile>
+      <method v="2" />
+    </configuration>
+    <list>
+      <item itemvalue="Go Build.go build github.com/vechain/thor/cmd/thor" />
+      <item itemvalue="Makefile Target.test-coverage" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Go Build.go build github.com/vechain/thor/cmd/thor" />
+        <item itemvalue="Makefile Target.test-coverage" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-gosdk-467a64f6063b-ee0e143f3e2b-org.jetbrains.plugins.go.sharedIndexes.bundled-GO-233.11799.228" />
+      </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" />
+  </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>
+      </breakpoints>
+      <default-breakpoints>
+        <breakpoint type="DlvErrorBreakpoint" />
+      </default-breakpoints>
+    </breakpoint-manager>
+  </component>
+</project>
\ No newline at end of file
diff --git a/api/doc/thor.yaml b/api/doc/thor.yaml
index d9e51ad16..6dd3eb2a6 100644
--- a/api/doc/thor.yaml
+++ b/api/doc/thor.yaml
@@ -29,7 +29,7 @@ tags:
     description: Subscribe interested subjects
   - name: Debug
     description: Debug utilities
-    
+
 paths:
   /accounts/{address}:
     parameters:
@@ -236,7 +236,7 @@ paths:
               schema:
                 allOf:
                   - $ref: '#/components/schemas/Receipt'
-                properties:            
+                properties:
                   meta:
                     $ref: '#/components/schemas/ReceiptMeta'
 
@@ -285,7 +285,7 @@ paths:
                     - $ref: '#/components/schemas/IsFinalized'
                     properties:
                       transactions:
-                        description: transaction IDs                          
+                        description: transaction IDs
                         type: array
                         items:
                           type: string
@@ -400,7 +400,7 @@ paths:
       summary: (Websocket) Subscribe new blocks
       parameters:
         - $ref: '#/components/parameters/PositionInQuery'
-      
+
       responses:
         '200':
           description: OK
@@ -425,7 +425,7 @@ paths:
       summary: (Websocket) Subscribe new events
       description: |
         which satisfy criteria in query.
-        
+
       parameters:
         - $ref: '#/components/parameters/PositionInQuery'
         - name: addr
@@ -470,8 +470,8 @@ paths:
                 properties:
                   meta:
                     $ref: '#/components/schemas/LogMeta'
-                
-          
+
+
   /subscriptions/transfer:
     get:
       tags:
@@ -576,7 +576,7 @@ paths:
             schema:
               allOf:
                 - $ref: '#/components/schemas/ClauseTracerOption'
-                - $ref: '#/components/schemas/TracerOption'     
+                - $ref: '#/components/schemas/TracerOption'
       responses:
         '200':
           description: OK
@@ -586,7 +586,7 @@ paths:
                 type: object
 
   /debug/tracers/call:
-    post: 
+    post:
       tags:
         - Debug
       summary: Create a tracer
@@ -786,7 +786,7 @@ components:
         txsRoot:
           type: string
           format: bytes32
-          description: root hash of transactions in the block 
+          description: root hash of transactions in the block
           example: '0x89dfd9fcd10c9e53d68592cf8b540b280b72d381b868523223992f3e09a806bb'
         txsFeatures:
           type: integer
@@ -986,7 +986,7 @@ components:
         gas: 50000
         gasPrice: '1000000000000000'
         caller: '0x7567d83b7b8d80addcb281a71d54fc7b3364ffed'
-  
+
     ExtendedCallData:
       properties:
         provedWork:
@@ -1055,11 +1055,11 @@ components:
         clauses:
           - to: '0x5034aa590125b64023a0262112b98d72e3c8e40e'
             value: '0xde0b6b3a7640000'
-            data: '0x5665436861696e2054686f72' 
+            data: '0x5665436861696e2054686f72'
         gas: 50000
         gasPrice: '1000000000000000'
         caller: '0x7567d83b7b8d80addcb281a71d54fc7b3364ffed'
-        
+
     BatchCallResult:
       type: array
       items:
@@ -1103,12 +1103,12 @@ components:
           description: |
             defines the unit of `from` and `to`.
             `block` means block number, `time` means block timestamp, default to `block`.
-            
+
         from:
           type: integer
           format: uint64
           example: 0
-          
+
         to:
           type: integer
           format: uint64
@@ -1127,7 +1127,7 @@ components:
         ```
         refers to the range from block 10 to block 1000.
         `null` stands for the full range.
-            
+
     EventCriteria:
       properties:
         address:
@@ -1156,7 +1156,7 @@ components:
         address: "0x0000000000000000000000000000456E65726779"
         topic0: '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'
         topic1: '0x0000000000000000000000005034aa590125b64023a0262112b98d72e3c8e40e'
-            
+
     EventFilter:
       properties:
         range:
@@ -1174,7 +1174,7 @@ components:
           enum:
             - asc
             - desc
-            
+
     TransferCriteria:
       properties:
         txOrigin:
@@ -1204,7 +1204,7 @@ components:
           enum:
             - asc
             - desc
-    
+
     PeerStats:
       properties:
         name:
@@ -1235,15 +1235,15 @@ components:
           type: string
       example:
         id: '0x4de71f2d588aa8a1ea00fe8312d92966da424d9939a511fc0be81e65fad52af8'
-    
-    
+
+
     Obsolete:
       properties:
         obsolete:
           type: boolean
           description: |
             indicates whether the block containing this data become branch block
-    
+
     ClauseTracerOption:
       properties:
         target:
@@ -1346,7 +1346,7 @@ components:
           format: uint32
           description: |
             the number of hash functions for bloom filter
-          example: 3          
+          example: 3
 
     Beat2:
       allOf:
@@ -1363,7 +1363,7 @@ components:
         isTrunk:
           type: boolean
           description: whether the block is on the trunk
-    
+
     IsFinalized:
       properties:
         isFinalized:
@@ -1452,7 +1452,7 @@ components:
       schema:
         type: string
       example: '0x9bcc6526a76ae560244f698805cc001977246cb92c2b4f1e2b7a204e445409ea'
-      
+
     PositionInQuery:
       name: pos
       in: query