Merge branch 'main' into 3367-transaction-with-contract-negative-valu…

…e-breaks-routes
hashgraph · Jan 28, 2025 · e430c25 · e430c25
2 parents e3d5067 + 373f1dc
commit e430c25
Show file tree

Hide file tree

Showing 71 changed files with 2,236 additions and 1,660 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -25,16 +25,16 @@
 # NOTE: Must be placed last to ensure enforcement over all other rules
 
 # Protection Rules for Github Configuration Files and Actions Workflows
-/.github/                                       @hashgraph/devops-ci @hashgraph/devops-ci-committers @hashgraph/release-engineering @hashgraph/release-engineering-managers
-/.github/workflows/                             @hashgraph/devops-ci @hashgraph/devops-ci-committers @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/hedera-smart-contracts @hashgraph/hedera-smart-contracts-product
+/.github/                                       @hashgraph/platform-ci @hashgraph/platform-ci-committers @hashgraph/release-engineering @hashgraph/release-engineering-managers
+/.github/workflows/                             @hashgraph/platform-ci @hashgraph/platform-ci-committers @hashgraph/release-engineering-managers @hashgraph/hedera-smart-contracts-managers
 
 # Self-protection for root CODEOWNERS files (this file should not exist and should definitely require approval)
 /CODEOWNERS                                     @hashgraph/release-engineering-managers
 
 # Protect the repository root files
-/README.md                                      @Nana-EC @hashgraph/release-engineering-managers @hashgraph/devops-ci @hashgraph/hedera-smart-contracts @hashgraph/hedera-smart-contracts-product 
+/README.md                                      @Nana-EC @hashgraph/release-engineering-managers @hashgraph/platform-ci @hashgraph/hedera-smart-contracts @hashgraph/hedera-smart-contracts-product 
 **/LICENSE                                      @hashgraph/release-engineering-managers @hashgraph/hedera-smart-contracts-managers
 
 # Git Ignore definitions
-**/.gitignore                                   @Nana-EC @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/devops-ci @hashgraph/hedera-smart-contracts @hashgraph/hedera-smart-contracts-product 
-**/.gitignore.*                                 @Nana-EC @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/devops-ci @hashgraph/hedera-smart-contracts @hashgraph/hedera-smart-contracts-product 
+**/.gitignore                                   @Nana-EC @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/platform-ci @hashgraph/hedera-smart-contracts @hashgraph/hedera-smart-contracts-product 
+**/.gitignore.*                                 @Nana-EC @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/platform-ci @hashgraph/hedera-smart-contracts @hashgraph/hedera-smart-contracts-product 
diff --git a/.github/workflows/acceptance-workflow.yml b/.github/workflows/acceptance-workflow.yml
@@ -38,20 +38,19 @@ on:
         description: 'Codecov upload token'
         required: true
 
-
-env:
-  OPERATOR_ID_MAIN: ${{ inputs.operator_id }}
-
 jobs:
   acceptance-workflow:
     runs-on: smart-contracts-linux-large
     timeout-minutes: 50
     permissions:
       contents: read
       checks: write
-    env:
-      OPERATOR_ID_MAIN: ${{ inputs.operator_id }}
     steps:
+      - name: Set env variables
+        run: |
+          if [ -n "${{ inputs.operator_id }}" ]; then
+            echo "OPERATOR_ID_MAIN=${{ inputs.operator_id }}" >> $GITHUB_ENV
+          fi
       - name: Harden Runner
         uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
@@ -97,26 +96,31 @@ jobs:
         with:
           max_attempts: ${{ inputs.maxAttempts }}
           timeout_minutes: 30
-          command: npm run acceptancetest:${{ inputs.testfilter }}
+          command: |
+            if [[ -n "$OPERATOR_KEY" ]] && [[ "$OPERATOR_KEY" != "" ]]; then
+              echo "Overriding OPERATOR_KEY_MAIN with the secret value"
+              export OPERATOR_KEY_MAIN="$OPERATOR_KEY"
+            fi
+            npm run acceptancetest:${{ inputs.testfilter }}
         env:
           TEST_WS_SERVER: ${{ inputs.test_ws_server }}
           SUBSCRIPTIONS_ENABLED: ${{ inputs.test_ws_server }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_PR_NUMBER: ${{ github.event.number }}
           GITHUB_REPOSITORY: ${{ github.repository }}
-          OPERATOR_KEY_MAIN: ${{ secrets.operator_key }}
+          OPERATOR_KEY: ${{ secrets.operator_key }}
 
       - name: Upload Heap Snapshots
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: Heap Snapshots
-          path: "**/*.heapsnapshot"
+          path: '**/*.heapsnapshot'
           if-no-files-found: ignore
 
       - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: Test Results (${{ inputs.testfilter }})
           path: test-*.xml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -50,10 +50,10 @@ jobs:
 
       - name: Upload Heap Snapshots
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: Heap Snapshots
-          path: "**/*.heapsnapshot"
+          path: '**/*.heapsnapshot'
           if-no-files-found: ignore
 
       - name: Upload coverage report

diff --git a/charts/hedera-json-rpc-relay-websocket/Chart.yaml b/charts/hedera-json-rpc-relay-websocket/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "0.64.0-SNAPSHOT"
+appVersion: "0.65.0-SNAPSHOT"
 description: Helm chart deployment of the hashgraph/hedera-json-rpc-relay web socket server
 home: https://github.com/hashgraph/hedera-json-rpc-relay
 icon: https://camo.githubusercontent.com/cca6b767847bb8ca5c7059481ba13a5fc81c5938/68747470733a2f2f7777772e6865646572612e636f6d2f6c6f676f2d6361706974616c2d686261722d776f72646d61726b2e6a7067
@@ -22,4 +22,4 @@ name: hedera-json-rpc-relay-websocket
 sources:
   - https://github.com/hashgraph/hedera-json-rpc-relay
 type: application
-version: 0.64.0-SNAPSHOT
+version: 0.65.0-SNAPSHOT
diff --git a/charts/hedera-json-rpc-relay/Chart.yaml b/charts/hedera-json-rpc-relay/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "0.64.0-SNAPSHOT"
+appVersion: "0.65.0-SNAPSHOT"
 description: Helm chart deployment of the hashgraph/hedera-json-rpc-relay
 home: https://github.com/hashgraph/hedera-json-rpc-relay
 icon: https://camo.githubusercontent.com/cca6b767847bb8ca5c7059481ba13a5fc81c5938/68747470733a2f2f7777772e6865646572612e636f6d2f6c6f676f2d6361706974616c2d686261722d776f72646d61726b2e6a7067
@@ -21,4 +21,4 @@ name: hedera-json-rpc-relay
 sources:
   - https://github.com/hashgraph/hedera-json-rpc-relay
 type: application
-version: 0.64.0-SNAPSHOT
+version: 0.65.0-SNAPSHOT
diff --git a/charts/hedera-json-rpc-relay/environments/minikube.yaml b/charts/hedera-json-rpc-relay/environments/minikube.yaml
@@ -16,4 +16,3 @@ config:
 rolling_restart:
   enabled: true
   schedule: "0 0 * * *"
-
diff --git a/charts/hedera-json-rpc-relay/templates/secret.yaml b/charts/hedera-json-rpc-relay/templates/secret.yaml
@@ -9,4 +9,4 @@ stringData:
   OPERATOR_ID_MAIN: {{ .Values.config.OPERATOR_ID_MAIN | quote }}
   OPERATOR_KEY_MAIN: {{ .Values.config.OPERATOR_KEY_MAIN | quote }}
   OPERATOR_ID_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_ID_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}
-  OPERATOR_KEY_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_KEY_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}  
+  OPERATOR_KEY_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_KEY_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}
diff --git a/charts/hedera-json-rpc/Chart.yaml b/charts/hedera-json-rpc/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "0.64.0-SNAPSHOT"
+appVersion: "0.65.0-SNAPSHOT"
 dependencies:
   - alias: relay
     condition: relay.enabled
@@ -31,4 +31,4 @@ name: hedera-json-rpc
 sources:
   - https://github.com/hashgraph/hedera-json-rpc-relay
 type: application
-version: 0.64.0-SNAPSHOT
+version: 0.65.0-SNAPSHOT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,3 @@ config:
		rolling_restart:
		enabled: true
		schedule: "0 0 * * *"