Skip to content
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.

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

Replaced the network which must not be named with integration network #1941

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ alphanet/
testnet/
shimmer/

# private tangle
private_tangle/
# integration network
integration_network/

# log files
hornet.log
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_HORNET.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths-ignore:
- 'documentation/**'
- 'nfpm/**'
- 'private_tangle/**'
- 'integration_network/**'
- 'scripts/**'
- 'tools/**'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'documentation/**'
- 'docker/**'
- 'nfpm/**'
- 'private_tangle/**'
- 'integration_network/**'
- 'scripts/**'
- 'tools/**'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'documentation/**'
- 'docker/**'
- 'nfpm/**'
- 'private_tangle/**'
- 'integration_network/**'
- 'scripts/**'
- 'tools/**'

Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,6 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}

- name: Prepare private_tangle files
run: |
yq -i 'del(.services.create-snapshots.build)' private_tangle/docker-compose.yml
yq -i 'del(.services.bootstrap-network.build)' private_tangle/docker-compose.yml
yq -i 'del(.services.hornet-1.build)' private_tangle/docker-compose.yml
yq -i '.services.create-snapshots.image = "iotaledger/hornet:${{ steps.meta.outputs.version }}"' private_tangle/docker-compose.yml
yq -i '.services.bootstrap-network.image = "iotaledger/hornet:${{ steps.meta.outputs.version }}"' private_tangle/docker-compose.yml
yq -i '.services.hornet-1.image = "iotaledger/hornet:${{ steps.meta.outputs.version }}"' private_tangle/docker-compose.yml
yq -i '.services.hornet-2.image = "iotaledger/hornet:${{ steps.meta.outputs.version }}"' private_tangle/docker-compose.yml
yq -i '.services.hornet-3.image = "iotaledger/hornet:${{ steps.meta.outputs.version }}"' private_tangle/docker-compose.yml
yq -i '.services.hornet-4.image = "iotaledger/hornet:${{ steps.meta.outputs.version }}"' private_tangle/docker-compose.yml

- name: Create private_tangle.tar.gz file
uses: ihiroky/archive-action@v1
with:
root_dir: private_tangle
file_path: private_tangle.tar.gz

- name: Upload private_tangle.tar.gz file
uses: Shopify/[email protected]
with:
name: HORNET-${{ steps.meta.outputs.version }}-private_tangle.tar.gz
path: private_tangle.tar.gz
repo-token: ${{ secrets.GITHUB_TOKEN }}

release-docker-nest:
needs: release-docker
name: Release Docker Nest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_HORNET.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths-ignore:
- 'documentation/**'
- 'nfpm/**'
- 'private_tangle/**'
- 'integration_network/**'
- 'scripts/**'
- 'tools/**'

Expand Down
6 changes: 3 additions & 3 deletions private_tangle/README.md → integration_network/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Private Tangle
# Integration Network

This folder contains a Docker-based setup to run your own development private Tangle. The steps to run a private tangle
This folder contains a Docker-based setup to run your own development integration network. The steps to run a integration network
are:

## Requirements
Expand All @@ -9,7 +9,7 @@ are:

## Steps

1. `./bootstrap.sh` this will bootstrap your own private tangle by creating the genesis snapshot and required files.
1. `./bootstrap.sh` this will bootstrap your own integration network by creating the genesis snapshot and required files.
- _**Note:** If you are running this from inside the repository, you should run `./bootstrap.sh build` to re-build the docker images after any updates to the HORNET codebase (e.g. changing files or pulling git changes)_
2. Run:
- `./run.sh` to run 2 nodes + COO.
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"stopGracePeriod": "5m"
},
"node": {
"alias": "HORNET private-tangle node"
"alias": "HORNET integration-network node"
},
"protocol": {
"targetNetworkName": "private_tangle1",
"targetNetworkName": "integration_network1",
"milestonePublicKeyCount": 2,
"baseToken": {
"name": "TestCoin",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ services:
environment:
- "COO_PRV_KEYS=651941eddb3e68cb1f6ef4ef5b04625dcf5c70de1fdc4b1c9eadb2c219c074e0ed3c3f1a319ff4e909cf2771d79fece0ac9bd9fd2ee49ea6c0885c9cb3b1248c,0e324c6ff069f31890d496e9004636fd73d8e8b5bea08ec58a4178ca85462325f6752f5f46a53364e2ee9c4d662d762a81efd51010282a75cd6bd03f28ef349c"
volumes:
- ./config_private_tangle.json:/app/config_private_tangle.json:ro
- ./config_integration_network.json:/app/config_integration_network.json:ro
- ./snapshots/hornet-1:/app/snapshots
- ./privatedb/hornet-1:/app/privatedb
- ./privatedb/state:/app/state
command:
- "tool"
- "bootstrap-private-tangle"
- "--configFile=/app/config_private_tangle.json"
- "--configFile=/app/config_integration_network.json"
- "--snapshotPath=/app/snapshots/full_snapshot.bin"
- "--databasePath=/app/privatedb"
- "--cooStatePath=/app/state/coordinator.state"
Expand Down Expand Up @@ -74,12 +74,12 @@ services:
cap_drop:
- ALL
volumes:
- ./config_private_tangle.json:/app/config_private_tangle.json:ro
- ./config_integration_network.json:/app/config_integration_network.json:ro
- ./privatedb/hornet-1:/app/privatedb
- ./snapshots/hornet-1:/app/snapshots
command:
- "-c"
- "config_private_tangle.json"
- "config_integration_network.json"
- "--node.alias=hornet-1"
- "--inx.enabled=true"
- "--inx.bindAddress=172.18.211.11:9029"
Expand Down Expand Up @@ -119,12 +119,12 @@ services:
cap_drop:
- ALL
volumes:
- ./config_private_tangle.json:/app/config_private_tangle.json:ro
- ./config_integration_network.json:/app/config_integration_network.json:ro
- ./privatedb/hornet-2:/app/privatedb
- ./snapshots/hornet-2:/app/snapshots
command:
- "-c"
- "config_private_tangle.json"
- "config_integration_network.json"
- "--node.alias=hornet-2"
- "--inx.enabled=true"
- "--inx.bindAddress=172.18.211.12:9029"
Expand Down Expand Up @@ -164,12 +164,12 @@ services:
cap_drop:
- ALL
volumes:
- ./config_private_tangle.json:/app/config_private_tangle.json:ro
- ./config_integration_network.json:/app/config_integration_network.json:ro
- ./privatedb/hornet-3:/app/privatedb
- ./snapshots/hornet-3:/app/snapshots
command:
- "-c"
- "config_private_tangle.json"
- "config_integration_network.json"
- "--node.alias=hornet-3"
- "--inx.enabled=true"
- "--inx.bindAddress=172.18.211.13:9029"
Expand Down Expand Up @@ -208,12 +208,12 @@ services:
cap_drop:
- ALL
volumes:
- ./config_private_tangle.json:/app/config_private_tangle.json:ro
- ./config_integration_network.json:/app/config_integration_network.json:ro
- ./privatedb/hornet-4:/app/privatedb
- ./snapshots/hornet-4:/app/snapshots
command:
- "-c"
- "config_private_tangle.json"
- "config_integration_network.json"
- "--node.alias=hornet-4"
- "--inx.enabled=true"
- "--inx.bindAddress=172.18.211.14:9029"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Keys for the private tangle
# Keys for the integration network

## Coordinator
1. private key: 651941eddb3e68cb1f6ef4ef5b04625dcf5c70de1fdc4b1c9eadb2c219c074e0ed3c3f1a319ff4e909cf2771d79fece0ac9bd9fd2ee49ea6c0885c9cb3b1248c
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"networkName": "private_tangle1",
"networkName": "integration_network1",
"bech32HRP": "tst",
"minPoWScore": 0,
"belowMaxDepth": 15,
Expand Down
File renamed without changes.
Loading