diff --git a/.github/scripts/run_smartnet.sh b/.github/scripts/run_smartnet.sh index ffe27c18ff..25f81fc103 100755 --- a/.github/scripts/run_smartnet.sh +++ b/.github/scripts/run_smartnet.sh @@ -16,6 +16,7 @@ docker run --rm -v $(pwd)/docker/data:/data --entrypoint "/bin/sh" -e RUST_LOG=d # Get bootnode peer id export BOOTNODE_PEER_ID=$(docker run --rm -v $(pwd)/docker/data:/data --entrypoint "/bin/sh" -e RUST_LOG=info "${NODE_IMAGE}" -c "aleph-node key inspect-node-key --file /data/$NODE_ID/p2p_secret") +docker network create node-network || true docker-compose -f docker/smartnet-compose.yml up --remove-orphans exit $? diff --git a/contracts/scripts/deploy.sh b/contracts/scripts/deploy.sh index 133f04d6a6..88b16a1641 100755 --- a/contracts/scripts/deploy.sh +++ b/contracts/scripts/deploy.sh @@ -218,7 +218,7 @@ echo "Early Bird Special" salt="0x4561726C79426972645370656369616C" deploy_ticket_token EARLY_BIRD_SPECIAL_TICKET early_bird_special_ticket EBST $salt -deploy_game_token EARLY_BIRD_SPECIAL_TOKEN early_bird_special EBS $salt +deploy_game_token EARLY_BIRD_SPECIAL_TOKEN Ubik UBI $salt deploy_marketplace EARLY_BIRD_SPECIAL_MARKETPLACE "$MARKETPLACE_CODE_HASH" early_bird_special "$salt" "$EARLY_BIRD_SPECIAL_TICKET" "$EARLY_BIRD_SPECIAL_TOKEN" deploy_button_game EARLY_BIRD_SPECIAL EarlyBirdSpecial "$EARLY_BIRD_SPECIAL_TICKET" "$EARLY_BIRD_SPECIAL_TOKEN" "$EARLY_BIRD_SPECIAL_MARKETPLACE" "$salt" @@ -229,7 +229,7 @@ echo "Back To The Future" salt="0x4261636B546F546865467574757265" deploy_ticket_token BACK_TO_THE_FUTURE_TICKET back_to_the_future_ticket BTFT $salt -deploy_game_token BACK_TO_THE_FUTURE_TOKEN back_to_the_future BTF $salt +deploy_game_token BACK_TO_THE_FUTURE_TOKEN Cyberiad CYB $salt deploy_marketplace BACK_TO_THE_FUTURE_MARKETPLACE "$MARKETPLACE_CODE_HASH" back_to_the_future "$salt" "$BACK_TO_THE_FUTURE_TICKET" "$BACK_TO_THE_FUTURE_TOKEN" deploy_button_game BACK_TO_THE_FUTURE BackToTheFuture "$BACK_TO_THE_FUTURE_TICKET" "$BACK_TO_THE_FUTURE_TOKEN" "$BACK_TO_THE_FUTURE_MARKETPLACE" "$salt" @@ -240,7 +240,7 @@ echo "The Pressiah Cometh" salt="0x7468655F70726573736961685F636F6D657468" deploy_ticket_token THE_PRESSIAH_COMETH_TICKET the_pressiah_cometh_ticket TPCT $salt -deploy_game_token THE_PRESSIAH_COMETH_TOKEN the_pressiah_cometh TPC $salt +deploy_game_token THE_PRESSIAH_COMETH_TOKEN Lono LON $salt deploy_marketplace THE_PRESSIAH_COMETH_MARKETPLACE "$MARKETPLACE_CODE_HASH" the_pressiah_cometh "$salt" "$THE_PRESSIAH_COMETH_TICKET" "$THE_PRESSIAH_COMETH_TOKEN" deploy_button_game THE_PRESSIAH_COMETH ThePressiahCometh "$THE_PRESSIAH_COMETH_TICKET" "$THE_PRESSIAH_COMETH_TOKEN" "$THE_PRESSIAH_COMETH_MARKETPLACE" "$salt" diff --git a/docker/smartnet-compose.yml b/docker/smartnet-compose.yml index c0be18c68b..2bd1f0394d 100644 --- a/docker/smartnet-compose.yml +++ b/docker/smartnet-compose.yml @@ -4,7 +4,6 @@ services: smartnode: image: public.ecr.aws/p6e8q1z1/aleph-node:latest container_name: smartnode - network_mode: host environment: - ALLOW_PRIVATE_IPV4=true - BASE_PATH=/data/$NODE_ID @@ -23,3 +22,16 @@ services: - PUBLIC_ADDR=/ip4/127.0.0.1/tcp/30333 volumes: - ./data/:/data/ + expose: + - 30333 + - 9933 + - 9943 + ports: + - 0.0.0.0:30333:30333 + - 0.0.0.0:9933:9933 + - 0.0.0.0:9943:9943 + +networks: + default: + external: + name: node-network