updating verify proof range to handle empty proof keys

.github/workflows/build-and-deploy.yml

@@ -1,166 +1,138 @@
 name: Docker Build, Publish and Deploy
 
+env:
+  DOCKER_REGISTRY: nethermind.jfrog.io
+
+  REPO_DEV: angkor-docker-local-dev
+  REPO_STAGING: angkor-docker-local-staging
+  REPO_PROD: angkor-docker-local-prod
+
+
 on:
   push:
     branches: [main]
-    tags: ['v*']
+    tags: ["v*"]
   workflow_dispatch:
 
 permissions:
   id-token: write
   contents: write
 
 jobs:
-  docker_build_and_publish:
+  build_docker_image:
     runs-on: ubuntu-latest
-    outputs:
-      IMAGE_TAG: ${{ steps.image_tag.outputs.IMAGE_TAG }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Define_docker_image_tag
-        id: image_tag
+
+      - name: Define image tag
         run: |
           echo "DOCKER_IMAGE_TAG=$(git describe --tags)" >> $GITHUB_ENV
-          echo "IMAGE_TAG=$(git describe --tags)" >> "$GITHUB_OUTPUT"
-
+
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with: 
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
+
+      - name: Login to registry
+        run: |
+          docker login ${{ env.DOCKER_REGISTRY }} -u ${{ vars.ARTIFACTORY_ANGKOR_USER }} -p ${{ secrets.ARTIFACTORY_ANGKOR_CONTRIBUTOR }}
+
       - name: Build and Push
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: 'linux/amd64'
+          platforms: "linux/amd64"
           push: true
-          tags: nethermindeth/juno:${{ env.DOCKER_IMAGE_TAG }}
-
-  deploy_to_dev:
+          tags: ${{ env.DOCKER_REGISTRY }}/${{ env.REPO_DEV }}/juno:${{ env.DOCKER_IMAGE_TAG }}
+
+
+  validate_dev:
     permissions:
       id-token: write
       contents: write
-    needs: [docker_build_and_publish]
+    needs: [build_docker_image]
     runs-on: ubuntu-latest
-    environment: 
+    environment:
       name: Development
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Repository Dispatch Dev
-        env:
-          EVENT_NAME: juno-dev
-          IMAGE_TAG: ${{ needs.docker_build_and_publish.outputs.IMAGE_TAG }}
-          SEPOLIA: apps/juno-dev/overlays/dev-sepolia/config.yaml
-        run: |
-          curl -L \
-          -X POST \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: token ${{ secrets.ACCESS_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/repos/NethermindEth/argo/dispatches \
-          -d '{"event_type": "${{ env.EVENT_NAME }}", "client_payload":{"name": "${{ env.EVENT_NAME }}", "sepolia_config": "${{ env.SEPOLIA }}", "tag": "${{ env.IMAGE_TAG }}"}}'
-
       - name: Verify Deployment Version (Dev)
-        run: bash .github/workflow-scripts/verify_deployment.sh ${{ secrets.DEV_SEPOLIA_URL }} ${{ needs.docker_build_and_publish.outputs.IMAGE_TAG }}        
-        
+        run: bash .github/workflow-scripts/verify_deployment.sh ${{ secrets.DEV_SEPOLIA_URL }} ${{ env.DOCKER_IMAGE_TAG }}
+
   dev-starknet-rs-tests:
-    needs: [deploy_to_dev]
+    needs: [validate_dev]
     uses: ./.github/workflows/starknet-rs-tests.yml
     secrets:
       STARKNET_RPC: ${{ secrets.DEV_SEPOLIA_URL }}/v0_6
-      
+
   dev-starknet-js-tests:
-    needs: [deploy_to_dev]
+    needs: [validate_dev]
     uses: ./.github/workflows/starknet-js-tests.yml
     secrets:
       TEST_RPC_URL: ${{ secrets.DEV_SEPOLIA_URL }}/v0_7
       TEST_ACCOUNT_ADDRESS: ${{ secrets.TEST_ACCOUNT_ADDRESS }}
       TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}
-            
-  deploy_to_staging:
-    needs: [docker_build_and_publish, deploy_to_dev]
+
+  promote_to_staging:
+    needs: [build_docker_image, validate_dev]
     runs-on: ubuntu-latest
-    environment: 
+    environment:
       name: Staging
-    steps:         
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Repository Dispatch Staging
-      env:
-          EVENT_NAME: juno-staging
-          IMAGE_TAG: ${{ needs.docker_build_and_publish.outputs.IMAGE_TAG }}
-          MAINNET: apps/juno-staging/overlays/staging-mainnet/config.yaml
-          SEPOLIA: apps/juno-staging/overlays/staging-sepolia/config.yaml
-          SEPOLIA_INTEGRATION: apps/juno-staging/overlays/staging-sepolia-integration/config.yaml
-      run: |
-          curl -L \
-          -X POST \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: token ${{ secrets.ACCESS_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/repos/NethermindEth/argo/dispatches \
-          -d '{"event_type": "${{ env.EVENT_NAME }}", "client_payload":{"name": "${{ env.EVENT_NAME }}", "mainnet_config": "${{ env.MAINNET }}", "sepolia_config": "${{ env.SEPOLIA }}", "sepolia_integration_config": "${{ env.SEPOLIA_INTEGRATION}}", "tag": "${{ env.IMAGE_TAG }}"}}'
-
-    - name: Verify Deployment Version (Staging)
-      run: bash .github/workflow-scripts/verify_deployment.sh ${{ secrets.STAGING_SEPOLIA_URL }} ${{ needs.docker_build_and_publish.outputs.IMAGE_TAG }}
+    steps:
+      - name: Setup JFrog CLI
+        uses: jfrog/setup-jfrog-cli@v4
+        env:
+          JF_URL: ${{ vars.JFROG_URL}}
+          JF_ACCESS_TOKEN: ${{ secrets.ARTIFACTORY_ANGKOR_CONTRIBUTOR }}
+
+      - name: Promote to Staging
+        run: |
+          jf rt dpr juno/${{ env.DOCKER_IMAGE_TAG }} ${{ env.REPO_DEV }} ${{ env.REPO_STAGING }}
 
   staging-starknet-rs-tests:
-    needs: [deploy_to_staging]
+    needs: [promote_to_staging]
     uses: ./.github/workflows/starknet-rs-tests.yml
     secrets:
       STARKNET_RPC: ${{ secrets.STAGING_SEPOLIA_URL }}/v0_6
-      
+
   staging-starknet-js-tests:
-    needs: [deploy_to_staging]
+    needs: [promote_to_staging]
     uses: ./.github/workflows/starknet-js-tests.yml
     secrets:
       TEST_RPC_URL: ${{ secrets.STAGING_SEPOLIA_URL }}/v0_7
       TEST_ACCOUNT_ADDRESS: ${{ secrets.TEST_ACCOUNT_ADDRESS }}
       TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}
 
-  deploy_to_production:
-    needs: [docker_build_and_publish, deploy_to_staging]
+  promote_to_production:
+    needs: [build_docker_image, promote_to_staging]
     runs-on: ubuntu-latest
     environment:
       name: Production
     steps:
-      - name: Repository Dispatch Prod
-        env: 
-          EVENT_NAME: juno-prod
-          IMAGE_TAG: ${{ needs.docker_build_and_publish.outputs.IMAGE_TAG }}
-          MAINNET: apps/juno-prod/overlays/prod-mainnet/config.yaml
-          SEPOLIA: apps/juno-prod/overlays/prod-sepolia/config.yaml
-          SEPOLIA_INTEGRATION: apps/juno-prod/overlays/prod-sepolia-integration/config.yaml
+      - name: Setup JFrog CLI
+        uses: jfrog/setup-jfrog-cli@v4
+        env:
+          JF_URL: ${{ vars.JFROG_URL}}
+          JF_ACCESS_TOKEN: ${{ secrets.ARTIFACTORY_ANGKOR_CONTRIBUTOR }}
+
+      - name: Promote to Production
         run: |
-          curl -L \
-          -X POST \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: token ${{ secrets.ACCESS_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/repos/NethermindEth/argo/dispatches \
-          -d '{"event_type": "${{ env.EVENT_NAME }}", "client_payload":{"name": "${{ env.EVENT_NAME }}", "mainnet_config": "${{ env.MAINNET }}", "sepolia_config": "${{ env.SEPOLIA }}", "sepolia_integration_config": "${{ env.SEPOLIA_INTEGRATION }}", "tag": "${{ env.IMAGE_TAG }}"}}'
-
+          jf rt dpr juno/${{ env.DOCKER_IMAGE_TAG }} ${{ env.REPO_STAGING }} ${{ env.REPO_PROD }}
+
   prod-starknet-rs-tests:
-    needs: [deploy_to_production]
+    needs: [promote_to_production]
     uses: ./.github/workflows/starknet-rs-tests.yml
     secrets:
       STARKNET_RPC: ${{ secrets.PROD_SEPOLIA_URL }}/v0_6
-      
+
   prod-starknet-js-tests:
-    needs: [deploy_to_production]
+    needs: [promote_to_production]
     uses: ./.github/workflows/starknet-js-tests.yml
     secrets:
       TEST_RPC_URL: ${{ secrets.PROD_SEPOLIA_URL }}/v0_7
       TEST_ACCOUNT_ADDRESS: ${{ secrets.TEST_ACCOUNT_ADDRESS }}
-      TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}
+      TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}

core/trie/node.go

@@ -9,9 +9,11 @@ import (
 
 // A Node represents a node in the [Trie]
 type Node struct {
-	Value *felt.Felt
-	Left  *Key
-	Right *Key
+	Value     *felt.Felt
+	Left      *Key
+	Right     *Key
+	LeftHash  *felt.Felt
+	RightHash *felt.Felt
 }
 
 // Hash calculates the hash of a [Node]
@@ -30,6 +32,12 @@ func (n *Node) Hash(path *Key, hashFunc hashFunc) *felt.Felt {
 	return hash.Add(hash, &pathFelt)
 }
 
+// Hash calculates the hash of a [Node]
+func (n *Node) HashFromParent(parnetKey, nodeKey *Key, hashFunc hashFunc) *felt.Felt {
+	path := path(nodeKey, parnetKey)
+	return n.Hash(&path, hashFunc)
+}
+
 func (n *Node) WriteTo(buf *bytes.Buffer) (int64, error) {
 	if n.Value == nil {
 		return 0, errors.New("cannot marshal node with nil value")
@@ -45,18 +53,38 @@ func (n *Node) WriteTo(buf *bytes.Buffer) (int64, error) {
 	}
 
 	if n.Left != nil {
-		wrote, err := n.Left.WriteTo(buf)
+		wrote, errInner := n.Left.WriteTo(buf)
 		totalBytes += wrote
 		if err != nil {
-			return totalBytes, err
+			return totalBytes, errInner
 		}
-		wrote, err = n.Right.WriteTo(buf) // n.Right is non-nil by design
+		wrote, errInner = n.Right.WriteTo(buf) // n.Right is non-nil by design
 		totalBytes += wrote
 		if err != nil {
-			return totalBytes, err
+			return totalBytes, errInner
 		}
 	}
 
+	if n.LeftHash == nil && n.RightHash == nil {
+		return totalBytes, nil
+	} else if (n.LeftHash != nil && n.RightHash == nil) || (n.LeftHash == nil && n.RightHash != nil) {
+		return totalBytes, errors.New("cannot store only one lefthash or righthash")
+	}
+
+	leftHashB := n.LeftHash.Bytes()
+	wrote, err = buf.Write(leftHashB[:])
+	totalBytes += int64(wrote)
+	if err != nil {
+		return totalBytes, err
+	}
+
+	rightHashB := n.RightHash.Bytes()
+	wrote, err = buf.Write(rightHashB[:])
+	totalBytes += int64(wrote)
+	if err != nil {
+		return totalBytes, err
+	}
+
 	return totalBytes, nil
 }
 
@@ -74,6 +102,8 @@ func (n *Node) UnmarshalBinary(data []byte) error {
 	if len(data) == 0 {
 		n.Left = nil
 		n.Right = nil
+		n.LeftHash = nil
+		n.RightHash = nil
 		return nil
 	}
 
@@ -85,5 +115,26 @@ func (n *Node) UnmarshalBinary(data []byte) error {
 	if err := n.Left.UnmarshalBinary(data); err != nil {
 		return err
 	}
-	return n.Right.UnmarshalBinary(data[n.Left.EncodedLen():])
+	data = data[n.Left.EncodedLen():]
+	if err := n.Right.UnmarshalBinary(data); err != nil {
+		return err
+	}
+	data = data[n.Right.EncodedLen():]
+
+	if n.LeftHash == nil {
+		n.LeftHash = new(felt.Felt)
+	}
+	if n.RightHash == nil {
+		n.RightHash = new(felt.Felt)
+	}
+	if len(data) == 0 {
+		return nil
+	}
+	if len(data) != 2*felt.Bytes {
+		return errors.New("the node does not contain both left and right hash")
+	}
+	n.LeftHash.SetBytes(data[:felt.Bytes])
+	data = data[felt.Bytes:]
+	n.RightHash.SetBytes(data[:felt.Bytes])
+	return nil
 }