Skip to content

Commit fa191b8

Browse files
authored
Merge branch 'main' into typo-fix
2 parents e6d32f3 + 8a0d5c4 commit fa191b8

File tree

95 files changed

+1678
-1755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1678
-1755
lines changed

.github/workflows/codeql.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: "CodeQL"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
push:
8+
branches:
9+
- main
10+
workflow_dispatch:
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
analyze:
21+
name: Analyze
22+
runs-on: ubuntu-latest
23+
permissions:
24+
security-events: write
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
language:
29+
- go
30+
steps:
31+
- name: Checkout repository
32+
uses: actions/checkout@v4
33+
- name: Initialize CodeQL
34+
uses: github/codeql-action/init@v3
35+
with:
36+
languages: ${{ matrix.language }}
37+
- name: Autobuild
38+
uses: github/codeql-action/autobuild@v3
39+
- name: Perform CodeQL Analysis
40+
uses: github/codeql-action/analyze@v3

.github/workflows/docker_main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ on:
88
- '.github/**' # exclude .github directory
99
- '**.md' # exclude all markdown files
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
docker:
1316
runs-on: ubuntu-latest
1417
permissions:
15-
contents: read
1618
packages: write
1719
steps:
1820
- uses: actions/checkout@v3

.github/workflows/docker_release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ on:
44
release:
55
types: [released, prereleased]
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811

912
docker:
1013
runs-on: ubuntu-latest
1114
permissions:
12-
contents: read
1315
packages: write
1416
steps:
1517
- uses: actions/checkout@v4

.github/workflows/docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
pull_request:
88
release:
99
types: [released]
10+
11+
permissions:
12+
contents: read
13+
1014
jobs:
1115
build:
1216
runs-on: ubuntu-latest

.github/workflows/go.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Go
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [main]
66
paths:
77
- '**' # include all files
88
- '!.github/**' # exclude .github directory
@@ -18,6 +18,9 @@ on:
1818

1919
workflow_dispatch:
2020

21+
permissions:
22+
contents: read
23+
2124
jobs:
2225
build:
2326
env:

.github/workflows/integration.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
- cron: "0 0 * * *"
88
workflow_dispatch:
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
e2e-test:
1215
runs-on: firefly-ubuntu-latest

.github/workflows/solidity.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
pull_request:
55
branches: [main]
66

7+
permissions:
8+
contents: read
9+
packages: read
10+
711
jobs:
812
solidity-test:
913
runs-on: ubuntu-latest

Dockerfile

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ FROM $FIREFLY_BUILDER_TAG AS firefly-builder
1515
ARG BUILD_VERSION
1616
ARG GIT_REF
1717
RUN apk add make=4.4.1-r2 \
18-
gcc=13.2.1_git20231014-r0 \
19-
build-base=0.5-r3 \
20-
curl=8.11.1-r0 \
21-
git=2.43.6-r0
18+
gcc=13.2.1_git20231014-r0 \
19+
build-base=0.5-r3 \
20+
curl=8.12.1-r0 \
21+
git=2.43.6-r0
2222
WORKDIR /firefly
2323
RUN chgrp -R 0 /firefly \
24-
&& chmod -R g+rwX /firefly \
25-
&& mkdir /.cache \
26-
&& chgrp -R 0 /.cache \
27-
&& chmod -R g+rwX /.cache
24+
&& chmod -R g+rwX /firefly \
25+
&& mkdir /.cache \
26+
&& chgrp -R 0 /.cache \
27+
&& chmod -R g+rwX /.cache
2828
USER 1001
2929
ADD --chown=1001:0 go.mod go.sum ./
3030
RUN go mod download
@@ -35,10 +35,10 @@ RUN make build
3535
FROM --platform=$FABRIC_BUILDER_PLATFORM $FABRIC_BUILDER_TAG AS fabric-builder
3636
WORKDIR /firefly/smart_contracts/fabric/firefly-go
3737
RUN chgrp -R 0 /firefly \
38-
&& chmod -R g+rwX /firefly \
39-
&& mkdir /.cache \
40-
&& chgrp -R 0 /.cache \
41-
&& chmod -R g+rwX /.cache
38+
&& chmod -R g+rwX /firefly \
39+
&& mkdir /.cache \
40+
&& chgrp -R 0 /.cache \
41+
&& chmod -R g+rwX /.cache
4242
USER 1001
4343
ADD --chown=1001:0 smart_contracts/fabric/firefly-go .
4444
RUN GO111MODULE=on go mod vendor
@@ -55,10 +55,10 @@ RUN chgrp -R 0 /firefly && chmod -R g+rwX /firefly
5555
ADD --chown=1001:0 smart_contracts/ethereum/solidity_firefly/ .
5656
USER 1001
5757
RUN mkdir -p build/contracts \
58-
&& cd contracts \
59-
&& solc --combined-json abi,bin,devdoc -o ../build/contracts Firefly.sol \
60-
&& cd ../build/contracts \
61-
&& mv combined.json Firefly.json
58+
&& cd contracts \
59+
&& solc --combined-json abi,bin,devdoc -o ../build/contracts Firefly.sol \
60+
&& cd ../build/contracts \
61+
&& mv combined.json Firefly.json
6262

6363
# SBOM
6464
FROM alpine:3.19 AS sbom
@@ -74,26 +74,26 @@ FROM $BASE_TAG
7474
ARG UI_TAG
7575
ARG UI_RELEASE
7676
RUN apk add --update --no-cache \
77-
sqlite=3.44.2-r0 \
78-
postgresql16-client=16.6-r0 \
79-
curl=8.11.1-r0 \
80-
jq=1.7.1-r0
77+
sqlite=3.44.2-r0 \
78+
postgresql16-client=16.8-r0 \
79+
curl=8.12.1-r0 \
80+
jq=1.7.1-r0
8181
WORKDIR /firefly
8282
RUN chgrp -R 0 /firefly \
83-
&& chmod -R g+rwX /firefly \
84-
&& mkdir /etc/firefly \
85-
&& chgrp -R 0 /etc/firefly \
86-
&& chmod -R g+rwX /etc/firefly
83+
&& chmod -R g+rwX /firefly \
84+
&& mkdir /etc/firefly \
85+
&& chgrp -R 0 /etc/firefly \
86+
&& chmod -R g+rwX /etc/firefly
8787
RUN curl -sL "https://github.com/golang-migrate/migrate/releases/download/$(curl -sL https://api.github.com/repos/golang-migrate/migrate/releases/latest | jq -r '.name')/migrate.linux-amd64.tar.gz" | tar xz \
88-
&& chmod +x ./migrate \
89-
&& mv ./migrate /usr/bin/migrate
88+
&& chmod +x ./migrate \
89+
&& mv ./migrate /usr/bin/migrate
9090
COPY --from=firefly-builder --chown=1001:0 /firefly/firefly ./firefly
9191
COPY --from=firefly-builder --chown=1001:0 /firefly/db ./db
9292
COPY --from=solidity-builder --chown=1001:0 /firefly/solidity_firefly/build/contracts ./contracts
9393
COPY --from=fabric-builder --chown=1001:0 /firefly/smart_contracts/fabric/firefly-go/firefly_fabric.tar.gz ./contracts/firefly_fabric.tar.gz
9494
ENV UI_RELEASE=https://github.com/hyperledger/firefly-ui/releases/download/$UI_TAG/$UI_RELEASE.tgz
9595
RUN mkdir /firefly/frontend \
96-
&& curl -sLo - $UI_RELEASE | tar -C /firefly/frontend -zxvf -
96+
&& curl -sLo - $UI_RELEASE | tar -C /firefly/frontend -zxvf -
9797
COPY --from=sbom /sbom.spdx.json /sbom.spdx.json
9898
RUN ln -s /firefly/firefly /usr/bin/firefly
9999
USER 1001

README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
[![FireFy Documentation](https://img.shields.io/static/v1?label=FireFly&message=documentation&color=informational)](https://hyperledger.github.io/firefly//)
66
![build](https://github.com/hyperledger/firefly/actions/workflows/docker_main.yml/badge.svg?branch=main)
77
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7826/badge)](https://www.bestpractices.dev/projects/7826)
8+
[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/hyperledger/firefly/badge)](https://scorecard.dev/viewer/?uri=github.com/hyperledger/firefly)
89

910
![Hyperledger FireFly](./images/hyperledger_firefly_logo.png)
1011

1112
Hyperledger FireFly is the first open source Supernode: a complete stack for enterprises to build and scale secure Web3 applications.
1213

1314
The FireFly API for digital assets, data flows, and blockchain transactions makes it radically faster to build production-ready apps on popular chains and protocols.
1415

15-
1616
[ENGLISH](./README.md) | [简体中文](./README_zh_CN.md)
1717

1818
## Start using Hyperledger FireFly
@@ -61,35 +61,35 @@ Other repositories you might be interested in containing those microservice comp
6161
6262
### Blockchain connectivity
6363

64-
- Transaction Manager - https://github.com/hyperledger/firefly-transaction-manager
65-
- RLP & ABI encoding, KeystoreV3 utilities and secp256k1 signer runtime - https://github.com/hyperledger/firefly-signer
66-
- FFCAPI reference connector for EVM Chains - https://github.com/hyperledger/firefly-evmconnect
64+
- Transaction Manager - <https://github.com/hyperledger/firefly-transaction-manager>
65+
- RLP & ABI encoding, KeystoreV3 utilities and secp256k1 signer runtime - <https://github.com/hyperledger/firefly-signer>
66+
- FFCAPI reference connector for EVM Chains - <https://github.com/hyperledger/firefly-evmconnect>
6767
- Public EVM compatible chains: Learn more in the [documentation](https://hyperledger.github.io/firefly)
68-
- Permissioned Ethereum connector - https://github.com/hyperledger/firefly-ethconnect
68+
- Permissioned Ethereum connector - <https://github.com/hyperledger/firefly-ethconnect>
6969
- Private/permissioned: Hyperledger Besu / Quorum
70-
- Hyperledger Fabric connector - https://github.com/hyperledger/firefly-fabconnect
71-
- Tezos connector - https://github.com/hyperledger/firefly-tezosconnect
72-
- Corda connector starter: https://github.com/hyperledger/firefly-cordaconnect
70+
- Hyperledger Fabric connector - <https://github.com/hyperledger/firefly-fabconnect>
71+
- Tezos connector - <https://github.com/hyperledger/firefly-tezosconnect>
72+
- Corda connector starter: <https://github.com/hyperledger/firefly-cordaconnect>
7373
- CorDapp specific customization is required
7474

7575
### Token standards
7676

77-
- Tokens ERC20/ERC721 - https://github.com/hyperledger/firefly-tokens-erc20-erc721
78-
- Tokens ERC1155 - https://github.com/hyperledger/firefly-tokens-erc1155
77+
- Tokens ERC20/ERC721 - <https://github.com/hyperledger/firefly-tokens-erc20-erc721>
78+
- Tokens ERC1155 - <https://github.com/hyperledger/firefly-tokens-erc1155>
7979

8080
### Private data bus connectivity
8181

82-
- HTTPS Data Exchange - https://github.com/hyperledger/firefly-dataexchange-https
82+
- HTTPS Data Exchange - <https://github.com/hyperledger/firefly-dataexchange-https>
8383

8484
### Developer ecosystem
8585

86-
- Command Line Interface (CLI) - https://github.com/hyperledger/firefly-cli
87-
- Explorer UI - https://github.com/hyperledger/firefly-ui
88-
- Node.js SDK - https://github.com/hyperledger/firefly-sdk-nodejs
89-
- Sandbox / Exerciser - https://github.com/hyperledger/firefly-sandbox
90-
- Samples - https://github.com/hyperledger/firefly-samples
91-
- FireFly Performance CLI: https://github.com/hyperledger/firefly-perf-cli
92-
- Helm Charts for Deploying to Kubernetes: https://github.com/hyperledger/firefly-helm-charts
86+
- Command Line Interface (CLI) - <https://github.com/hyperledger/firefly-cli>
87+
- Explorer UI - <https://github.com/hyperledger/firefly-ui>
88+
- Node.js SDK - <https://github.com/hyperledger/firefly-sdk-nodejs>
89+
- Sandbox / Exerciser - <https://github.com/hyperledger/firefly-sandbox>
90+
- Samples - <https://github.com/hyperledger/firefly-samples>
91+
- FireFly Performance CLI: <https://github.com/hyperledger/firefly-perf-cli>
92+
- Helm Charts for Deploying to Kubernetes: <https://github.com/hyperledger/firefly-helm-charts>
9393

9494
## FireFly Core code hierarchy
9595

README_zh_CN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
[![FireFy Documentation](https://img.shields.io/static/v1?label=FireFly&message=documentation&color=informational)](https://hyperledger.github.io/firefly//)
66
![build](https://github.com/hyperledger/firefly/actions/workflows/docker_main.yml/badge.svg?branch=main)
77
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7826/badge)](https://www.bestpractices.dev/projects/7826)
8+
[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/hyperledger/firefly/badge)](https://scorecard.dev/viewer/?uri=github.com/hyperledger/firefly)
89

910
![Hyperledger FireFly](./images/hyperledger_firefly_logo.png)
1011

0 commit comments

Comments
 (0)