Skip to content

Fix demo and Update README.md #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YukiTsuchida merged 4 commits into from
Oct 16, 2025
Merged

Fix demo and Update README.md #3

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bb1465
Update README and Makefile for demo setup; add platform support in Do…
Oct 14, 2025
0bc302b
Update workflow configurations to use Ubuntu 22.04
Oct 14, 2025
0b88a0a
Update cache actions to version 4 in demo workflow
Oct 14, 2025
91d8325
Replace 'docker-compose' with 'docker compose' in Makefile and var.mk…
Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]
jobs:
demo:
name: demo
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
Copy link
Contributor Author

@YukiTsuchida YukiTsuchida Oct 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ubuntu-20.04 is deprecated and not working

steps:
- name: Set up Go 1.16
uses: actions/setup-go@v1
Expand All @@ -16,7 +16,7 @@ jobs:
node-version: '12'
- uses: actions/checkout@v2
- name: Cache go modules
uses: actions/cache@v2
uses: actions/cache@v4
Copy link
Contributor Author

@YukiTsuchida YukiTsuchida Oct 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actions/cache@v2 is deprecated and not working

with:
path: |
~/.cache/go-build
Expand All @@ -25,7 +25,7 @@ jobs:
restore-keys: |
${{ runner.os }}-go-
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -48,15 +48,15 @@ jobs:
make demo
unit-test:
name: unit-test
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.16
- uses: actions/checkout@v2
- name: Cache go modules
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
zip:
name: zip
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
ARTIFACT_NAME: fabric-besu-cross-demo
steps:
Expand Down
32 changes: 27 additions & 5 deletions demo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,35 @@
# Demo

## Start Besu
## Requirements

- [Go](https://go.dev/) 1.16–1.18
- [Docker](https://www.docker.com/products/docker-desktop)
- [jq](https://stedolan.github.io/jq/)
- Node.js v12-v16

## Testing the demo

This demo is primarily developed and validated on **Go 1.18**, and is supported on **Go 1.16–1.18**.
**Go 1.19 and later may exhibit unstable behavior** due to dependency and runtime differences.
To ensure a reproducible setup, we **strongly recommend Go 1.18**.

### 1. Generate networkFiles
```
$ make init
# 1) Build artifacts and tools
make build

# 2) Start local networks (Besu / Fabric / Proxy)
make network

# 3) Run demo scenarios
make demo
```

### 2. Start network
## Tear Down / Clean

```
$ make network
# Stop networks and clean up
make network-down

# Clean generated files only
make clean
```
6 changes: 3 additions & 3 deletions demo/chains/fabric/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ network:

.PHONY: network-common
network-common:
IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
FABRIC_PLATFORM=${FABRIC_PLATFORM} IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
fabric-orderer.fabric-besu-cross-demo.com \
fabric-peer0.platformer.fabric-besu-cross-demo.com \
fabric-peer0.orga.fabric-besu-cross-demo.com \
fabric-peer0.orgb.fabric-besu-cross-demo.com

.PHONY: network-chaincode
network-chaincode:
IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
FABRIC_PLATFORM=${FABRIC_PLATFORM} IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
fabric-chaincode.platformer.fabric-besu-cross-demo.com \
fabric-chaincode.orga.fabric-besu-cross-demo.com \
fabric-chaincode.orgb.fabric-besu-cross-demo.com

.PHONY: network-down
network-down:
IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} down -v --remove-orphans
FABRIC_PLATFORM=${FABRIC_PLATFORM} IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} down -v --remove-orphans

.PHONY: clean
clean:
Expand Down
4 changes: 4 additions & 0 deletions demo/chains/fabric/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
fabric-orderer.fabric-besu-cross-demo.com:
container_name: fabric-orderer.fabric-besu-cross-demo.com
image: hyperledger/fabric-orderer:${IMAGE_TAG}
platform: ${FABRIC_PLATFORM}
environment:
- FABRIC_LOGGING_SPEC=INFO
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
Expand All @@ -31,6 +32,7 @@ services:
fabric-peer0.platformer.fabric-besu-cross-demo.com:
container_name: fabric-peer0.platformer.fabric-besu-cross-demo.com
image: hyperledger/fabric-peer:${IMAGE_TAG}
platform: ${FABRIC_PLATFORM}
environment:
- FABRIC_LOGGING_SPEC=INFO
- CORE_PEER_ID=fabric-peer0.platformer.fabric-besu-cross-demo.com
Expand Down Expand Up @@ -60,6 +62,7 @@ services:
fabric-peer0.orga.fabric-besu-cross-demo.com:
container_name: fabric-peer0.orga.fabric-besu-cross-demo.com
image: hyperledger/fabric-peer:${IMAGE_TAG}
platform: ${FABRIC_PLATFORM}
environment:
- FABRIC_LOGGING_SPEC=INFO
- CORE_PEER_ID=fabric-peer0.orga.fabric-besu-cross-demo.com
Expand Down Expand Up @@ -89,6 +92,7 @@ services:
fabric-peer0.orgb.fabric-besu-cross-demo.com:
container_name: fabric-peer0.orgb.fabric-besu-cross-demo.com
image: hyperledger/fabric-peer:${IMAGE_TAG}
platform: ${FABRIC_PLATFORM}
environment:
- FABRIC_LOGGING_SPEC=INFO
- CORE_PEER_ID=fabric-peer0.orgb.fabric-besu-cross-demo.com
Expand Down
1 change: 1 addition & 0 deletions demo/var.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ DOCKER_COMPOSE ?= docker-compose

FABRIC_VERSION ?=2.2.0
FABRIC_CA_VERSION ?=1.4.7
FABRIC_PLATFORM ?=linux/amd64
Loading