Skip to content

Commit

Permalink
- Prepare alpha.25 (#1619)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexsporn authored Jul 13, 2022
1 parent 9b27585 commit 1653bf6
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 43 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:

- name: Pull additional Docker images
run: |
docker pull iotaledger/inx-coordinator:0.7
docker pull iotaledger/inx-indexer:0.9
docker pull iotaledger/inx-coordinator:0.8
docker pull iotaledger/inx-indexer:0.10
- name: Run integration tests
run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
Expand Down Expand Up @@ -59,8 +59,8 @@ jobs:

- name: Pull additional Docker images
run: |
docker pull iotaledger/inx-coordinator:0.7
docker pull iotaledger/inx-indexer:0.9
docker pull iotaledger/inx-coordinator:0.8
docker pull iotaledger/inx-indexer:0.10
- name: Run integration tests
run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
Expand Down Expand Up @@ -92,8 +92,8 @@ jobs:

- name: Pull additional Docker images
run: |
docker pull iotaledger/inx-coordinator:0.7
docker pull iotaledger/inx-indexer:0.9
docker pull iotaledger/inx-coordinator:0.8
docker pull iotaledger/inx-indexer:0.10
docker build github.com/iotaledger/chrysalis-tools#:wfmock -t wfmock:latest
- name: Run integration tests
Expand Down Expand Up @@ -126,8 +126,8 @@ jobs:

- name: Pull additional Docker images
run: |
docker pull iotaledger/inx-coordinator:0.7
docker pull iotaledger/inx-indexer:0.9
docker pull iotaledger/inx-coordinator:0.8
docker pull iotaledger/inx-indexer:0.10
- name: Run integration tests
run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
Expand Down Expand Up @@ -159,8 +159,8 @@ jobs:

- name: Pull additional Docker images
run: |
docker pull iotaledger/inx-coordinator:0.7
docker pull iotaledger/inx-indexer:0.9
docker pull iotaledger/inx-coordinator:0.8
docker pull iotaledger/inx-indexer:0.10
- name: Run integration tests
run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file.

## [2.0.0-alpha.25] - 13.07.2022

### Changed
- Removed `app.enablePlugins` and `app.disablePlugins` and replaced them with plugin-specific `enabled` settings (#1617)

## [2.0.0-alpha.24] - 12.07.2022

### Added
Expand Down
2 changes: 1 addition & 1 deletion core/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var (
Name = "HORNET"

// Version of the app.
Version = "2.0.0-alpha.24"
Version = "2.0.0-alpha.25"
)

func App() *app.App {
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
inx-indexer:
image: iotaledger/inx-indexer:0.9
image: iotaledger/inx-indexer:0.10
restart: on-failure
volumes:
- ./alphanet/indexer:/app/database
Expand All @@ -10,14 +10,14 @@ services:
- "--indexer.bindAddress=inx-indexer:9091"

inx-mqtt:
image: iotaledger/inx-mqtt:0.10
image: iotaledger/inx-mqtt:0.11
restart: on-failure
command:
- "--inx.address=hornet:9029"
- "--mqtt.websocket.bindAddress=inx-mqtt:1888"

inx-participation:
image: iotaledger/inx-participation:0.6
image: iotaledger/inx-participation:0.7
restart: on-failure
volumes:
- ./alphanet/participation:/app/database
Expand All @@ -26,7 +26,7 @@ services:
- "--participation.bindAddress=inx-participation:9892"

inx-dashboard:
image: iotaledger/inx-dashboard:0.2
image: iotaledger/inx-dashboard:0.3
restart: on-failure
ports:
- "8081:8081/tcp"
Expand Down
14 changes: 7 additions & 7 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'
services:

hornet:
image: iotaledger/hornet:2.0.0-alpha.24
image: iotaledger/hornet:2.0.0-alpha.25
ulimits:
nofile:
soft: 16384
Expand Down Expand Up @@ -104,7 +104,7 @@ services:
##################################################################

inx-indexer:
image: iotaledger/inx-indexer:0.9
image: iotaledger/inx-indexer:0.10
stop_grace_period: 5m
restart: unless-stopped
volumes:
Expand All @@ -117,7 +117,7 @@ services:
- "--prometheus.bindAddress=inx-indexer:9312"

inx-mqtt:
image: iotaledger/inx-mqtt:0.10
image: iotaledger/inx-mqtt:0.11
stop_grace_period: 5m
restart: unless-stopped
command:
Expand All @@ -127,7 +127,7 @@ services:
- "--prometheus.bindAddress=inx-mqtt:9312"

inx-participation:
image: iotaledger/inx-participation:0.6
image: iotaledger/inx-participation:0.7
stop_grace_period: 5m
restart: unless-stopped
ulimits:
Expand All @@ -142,7 +142,7 @@ services:
- "--participation.bindAddress=inx-participation:9892"

inx-spammer:
image: iotaledger/inx-spammer:0.3
image: iotaledger/inx-spammer:0.4
stop_grace_period: 5m
restart: unless-stopped
command:
Expand All @@ -152,15 +152,15 @@ services:
- "--prometheus.bindAddress=inx-spammer:9312"

inx-poi:
image: iotaledger/inx-poi:0.3
image: iotaledger/inx-poi:0.4
stop_grace_period: 5m
restart: unless-stopped
command:
- "--inx.address=hornet:9029"
- "--poi.bindAddress=inx-poi:9687"

inx-dashboard:
image: iotaledger/inx-dashboard:0.2
image: iotaledger/inx-dashboard:0.3
stop_grace_period: 5m
restart: unless-stopped
labels:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-20220713112541-3bfe06a592ed
github.com/iotaledger/inx/go v0.0.0-20220705124918-775bb201b49e
github.com/iotaledger/iota.go v1.0.0
github.com/iotaledger/iota.go/v3 v3.0.0-20220713111307-e56bfeff5451
github.com/iotaledger/iota.go/v3 v3.0.0-20220713125317-0f9382655ffc
github.com/labstack/echo/v4 v4.7.2
github.com/labstack/gommon v0.3.1
github.com/libp2p/go-libp2p v0.21.0-rc.0.20220709183451-3d351e4ed396
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ github.com/iotaledger/inx/go v0.0.0-20220705124918-775bb201b49e h1:C8UvhK3nGrQoS
github.com/iotaledger/inx/go v0.0.0-20220705124918-775bb201b49e/go.mod h1:oMnK53vBku3E0WbLgfrFdLZMAJJ4iT0CeRxd1xZJD4w=
github.com/iotaledger/iota.go v1.0.0 h1:tqm1FxJ/zOdzbrAaQ5BQpVF8dUy2eeGlSeWlNG8GoXY=
github.com/iotaledger/iota.go v1.0.0/go.mod h1:RiKYwDyY7aCD1L0YRzHSjOsJ5mUR9yvQpvhZncNcGQI=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713111307-e56bfeff5451 h1:QyM+YqoEZ+zCFmYikmMUbCusHcD7K70r0NXlzbbhLiI=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713111307-e56bfeff5451/go.mod h1:+9a/3it5ZSsmvDzIW6UawtNATQyzmrP+6puS8mUTHwo=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713125317-0f9382655ffc h1:qEda36piLkEZTEKly7xCpEOFwUlcuARjoekhj96u/iU=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713125317-0f9382655ffc/go.mod h1:+9a/3it5ZSsmvDzIW6UawtNATQyzmrP+6puS8mUTHwo=
github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
github.com/ipfs/go-cid v0.2.0 h1:01JTiihFq9en9Vz0lc0VDWvZe/uBonGpzo4THP0vcQ0=
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ then
fi
fi

docker pull iotaledger/inx-coordinator:0.7
docker pull iotaledger/inx-indexer:0.9
docker pull iotaledger/inx-coordinator:0.8
docker pull iotaledger/inx-indexer:0.10

echo "Run integration tests"
for name in $TEST_NAMES; do
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/tester/framework/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ const (
autopeeringMaxTries = 50

containerNodeImage = "hornet:dev"
coordinatorImage = "iotaledger/inx-coordinator:0.7"
indexerImage = "iotaledger/inx-indexer:0.9"
coordinatorImage = "iotaledger/inx-coordinator:0.8"
indexerImage = "iotaledger/inx-indexer:0.10"
containerWhiteFlagMockServer = "wfmock:latest"

containerNameTester = "/tester"
Expand Down
22 changes: 11 additions & 11 deletions private_tangle/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
- bootstrap

inx-coordinator:
image: iotaledger/inx-coordinator:0.7
image: iotaledger/inx-coordinator:0.8
networks:
peering_net:
ipv4_address: 172.18.211.20
Expand All @@ -65,7 +65,7 @@ services:
- 4-nodes

inx-indexer:
image: iotaledger/inx-indexer:0.9
image: iotaledger/inx-indexer:0.10
networks:
peering_net:
ipv4_address: 172.18.211.21
Expand All @@ -82,7 +82,7 @@ services:
- 4-nodes

inx-mqtt:
image: iotaledger/inx-mqtt:0.10
image: iotaledger/inx-mqtt:0.11
networks:
peering_net:
ipv4_address: 172.18.211.22
Expand All @@ -102,7 +102,7 @@ services:
- 4-nodes

inx-faucet:
image: iotaledger/inx-faucet:0.9
image: iotaledger/inx-faucet:0.10
networks:
peering_net:
ipv4_address: 172.18.211.23
Expand All @@ -124,7 +124,7 @@ services:
- 4-nodes

inx-participation:
image: iotaledger/inx-participation:0.6
image: iotaledger/inx-participation:0.7
networks:
peering_net:
ipv4_address: 172.18.211.24
Expand All @@ -145,7 +145,7 @@ services:
- 4-nodes

inx-spammer:
image: iotaledger/inx-spammer:0.3
image: iotaledger/inx-spammer:0.4
networks:
peering_net:
ipv4_address: 172.18.211.25
Expand All @@ -165,7 +165,7 @@ services:
- 4-nodes

inx-poi:
image: iotaledger/inx-poi:0.3
image: iotaledger/inx-poi:0.4
networks:
peering_net:
ipv4_address: 172.18.211.26
Expand All @@ -185,7 +185,7 @@ services:
- 4-nodes

inx-dashboard-1:
image: iotaledger/inx-dashboard:0.2
image: iotaledger/inx-dashboard:0.3
networks:
peering_net:
ipv4_address: 172.18.211.31
Expand All @@ -208,7 +208,7 @@ services:
- 4-nodes

inx-dashboard-2:
image: iotaledger/inx-dashboard:0.2
image: iotaledger/inx-dashboard:0.3
networks:
peering_net:
ipv4_address: 172.18.211.32
Expand All @@ -231,7 +231,7 @@ services:
- 4-nodes

inx-dashboard-3:
image: iotaledger/inx-dashboard:0.2
image: iotaledger/inx-dashboard:0.3
networks:
peering_net:
ipv4_address: 172.18.211.33
Expand All @@ -253,7 +253,7 @@ services:
- 4-nodes

inx-dashboard-4:
image: iotaledger/inx-dashboard:0.2
image: iotaledger/inx-dashboard:0.3
networks:
peering_net:
ipv4_address: 172.18.211.34
Expand Down
2 changes: 1 addition & 1 deletion tools/gendoc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ require (
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-20220713112541-3bfe06a592ed // indirect
github.com/iotaledger/inx/go v0.0.0-20220705124918-775bb201b49e // indirect
github.com/iotaledger/iota.go v1.0.0 // indirect
github.com/iotaledger/iota.go/v3 v3.0.0-20220713111307-e56bfeff5451 // indirect
github.com/iotaledger/iota.go/v3 v3.0.0-20220713125317-0f9382655ffc // indirect
github.com/ipfs/go-cid v0.2.0 // indirect
github.com/ipfs/go-datastore v0.5.1 // indirect
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions tools/gendoc/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ github.com/iotaledger/inx/go v0.0.0-20220705124918-775bb201b49e h1:C8UvhK3nGrQoS
github.com/iotaledger/inx/go v0.0.0-20220705124918-775bb201b49e/go.mod h1:oMnK53vBku3E0WbLgfrFdLZMAJJ4iT0CeRxd1xZJD4w=
github.com/iotaledger/iota.go v1.0.0 h1:tqm1FxJ/zOdzbrAaQ5BQpVF8dUy2eeGlSeWlNG8GoXY=
github.com/iotaledger/iota.go v1.0.0/go.mod h1:RiKYwDyY7aCD1L0YRzHSjOsJ5mUR9yvQpvhZncNcGQI=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713111307-e56bfeff5451 h1:QyM+YqoEZ+zCFmYikmMUbCusHcD7K70r0NXlzbbhLiI=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713111307-e56bfeff5451/go.mod h1:+9a/3it5ZSsmvDzIW6UawtNATQyzmrP+6puS8mUTHwo=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713125317-0f9382655ffc h1:qEda36piLkEZTEKly7xCpEOFwUlcuARjoekhj96u/iU=
github.com/iotaledger/iota.go/v3 v3.0.0-20220713125317-0f9382655ffc/go.mod h1:+9a/3it5ZSsmvDzIW6UawtNATQyzmrP+6puS8mUTHwo=
github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
github.com/ipfs/go-cid v0.2.0 h1:01JTiihFq9en9Vz0lc0VDWvZe/uBonGpzo4THP0vcQ0=
Expand Down

0 comments on commit 1653bf6

Please sign in to comment.