From 3da19a23e388a5b8a97f90d09ae05c41ffac06a4 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Wed, 1 Feb 2023 16:17:32 -0500 Subject: [PATCH 1/4] Shot in the dark Signed-off-by: Nicko Guyer --- .github/workflows/docker_main.yml | 5 +++-- .github/workflows/docker_release.yml | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index 04d3cfe7ad..72850214cc 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -35,7 +35,7 @@ jobs: BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") echo ::set-output name=BUILD_TAG::$BUILD_TAG echo ::set-output name=BUILD_DATE::$BUILD_DATE - + - name: Read manifest.json id: manifest run: | @@ -50,6 +50,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v2 with: + provenance: false context: ./ file: ./Dockerfile builder: ${{ steps.buildx.outputs.name }} @@ -69,4 +70,4 @@ jobs: SOLIDITY_BUILDER_TAG=${{ steps.manifest.outputs.SOLIDITY_BUILDER_TAG }} BASE_TAG=${{ steps.manifest.outputs.BASE_TAG }} UI_TAG=${{ steps.manifest.outputs.UI_TAG }} - UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }} \ No newline at end of file + UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }} diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml index 1254895686..81cee754ec 100644 --- a/.github/workflows/docker_release.yml +++ b/.github/workflows/docker_release.yml @@ -25,7 +25,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - + - name: Set latest tag if: github.event.action == 'released' run: | @@ -34,17 +34,17 @@ jobs: - name: Set alpha tag if: github.event.action == 'prereleased' && contains(github.ref, 'alpha') run: | - echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:alpha" >> $GITHUB_ENV + echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:alpha" >> $GITHUB_ENV - name: Set beta tag if: github.event.action == 'prereleased' && contains(github.ref, 'beta') run: | - echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:beta" >> $GITHUB_ENV + echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:beta" >> $GITHUB_ENV - name: Set rc tag if: github.event.action == 'prereleased' && contains(github.ref, 'rc') run: | - echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:rc" >> $GITHUB_ENV + echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:rc" >> $GITHUB_ENV - name: Set build tag id: build_tag_generator @@ -69,6 +69,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v2 with: + provenance: false context: ./ file: ./Dockerfile builder: ${{ steps.buildx.outputs.name }} @@ -88,4 +89,4 @@ jobs: SOLIDITY_BUILDER_TAG=${{ steps.manifest.outputs.SOLIDITY_BUILDER_TAG }} BASE_TAG=${{ steps.manifest.outputs.BASE_TAG }} UI_TAG=${{ steps.manifest.outputs.UI_TAG }} - UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }} \ No newline at end of file + UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }} From c898b0cfbb515d305e577dd24194de12ecb37b24 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Wed, 1 Feb 2023 16:32:55 -0500 Subject: [PATCH 2/4] Update to docker/build-push-action@v4 Signed-off-by: Nicko Guyer --- .github/workflows/docker_main.yml | 2 +- .github/workflows/docker_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index 72850214cc..97b9b3864c 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -48,7 +48,7 @@ jobs: echo ::set-output name=UI_RELEASE::$(cat manifest.json | jq -r '.ui.release') - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: provenance: false context: ./ diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml index 81cee754ec..f11b57effb 100644 --- a/.github/workflows/docker_release.yml +++ b/.github/workflows/docker_release.yml @@ -67,7 +67,7 @@ jobs: echo ::set-output name=UI_RELEASE::$(cat manifest.json | jq -r '.ui.release') - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: provenance: false context: ./ From 86161f3991aa2fc10a9d433232f7798fe1fb63f1 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Fri, 3 Feb 2023 13:05:46 -0500 Subject: [PATCH 3/4] Add contractLocation to depoyment transaction output Signed-off-by: Nicko Guyer --- internal/blockchain/common/common.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/blockchain/common/common.go b/internal/blockchain/common/common.go index 0da135b7dc..75db07a3e6 100644 --- a/internal/blockchain/common/common.go +++ b/internal/blockchain/common/common.go @@ -1,4 +1,4 @@ -// Copyright © 2022 Kaleido, Inc. +// Copyright © 2023 Kaleido, Inc. // // SPDX-License-Identifier: Apache-2.0 // @@ -78,10 +78,11 @@ type BlockchainReceiptHeaders struct { } type BlockchainReceiptNotification struct { - Headers BlockchainReceiptHeaders - TxHash string `json:"transactionHash,omitempty"` - Message string `json:"errorMessage,omitempty"` - ProtocolID string `json:"protocolId,omitempty"` + Headers BlockchainReceiptHeaders `json:"headers,omitempty"` + TxHash string `json:"transactionHash,omitempty"` + Message string `json:"errorMessage,omitempty"` + ProtocolID string `json:"protocolId,omitempty"` + ContractLocation *fftypes.JSONAny `json:"contractLocation,omitempty"` } func NewBlockchainCallbacks() BlockchainCallbacks { @@ -297,6 +298,7 @@ func HandleReceipt(ctx context.Context, plugin core.Named, reply *BlockchainRece if reply.Headers.ReceiptID == "" || reply.Headers.ReplyType == "" { return fmt.Errorf("reply cannot be processed - missing fields: %+v", reply) } + var updateType core.OpStatus switch reply.Headers.ReplyType { case "TransactionSuccess": From b2b24e44c724d8cca9a40766f667170cff4728e1 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Fri, 3 Feb 2023 15:26:37 -0500 Subject: [PATCH 4/4] Update evmconnect to v1.2.2 Signed-off-by: Nicko Guyer --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 0185689e4d..4accb159fe 100644 --- a/manifest.json +++ b/manifest.json @@ -6,8 +6,8 @@ }, "evmconnect": { "image": "ghcr.io/hyperledger/firefly-evmconnect", - "tag": "v1.2.1", - "sha": "5f5ada5da90e7e49ba60f82737f7613d6759134248faa363210b74d89996d9b8" + "tag": "v1.2.2", + "sha": "9032e45ea9cee7d881ce88eaea720f450d2ed176e96137feb495c5e7850fab45" }, "fabconnect": { "image": "ghcr.io/hyperledger/firefly-fabconnect",