From a48d88ee696aa99d2ee690ba2e91c024ae5879e6 Mon Sep 17 00:00:00 2001 From: Giacomo Licari Date: Thu, 9 Mar 2023 11:31:02 +0100 Subject: [PATCH] Fix namings, use gnosischain docker project --- .github/workflows/main.yml | 2 +- .gitmodules | 2 +- CONTRIBUTING.md | 2 +- README.md | 6 +++--- .../tokenbridge-bw-exchange/package.json | 2 +- deployment/CONFIGURATION.md | 4 ++-- e2e-commons/docker-compose.yml | 16 ++++++++-------- monitor/README.md | 2 +- monitor/crontab.example | 2 +- monitor/docker-compose-build.yml | 2 +- monitor/docker-compose.yml | 2 +- monitor/scripts/getBridgeStats.sh | 2 +- oracle/README.md | 2 +- oracle/docker-compose-amb.yml | 2 +- oracle/docker-compose-build.yml | 2 +- oracle/docker-compose-helpers.yml | 6 +++--- oracle/docker-compose-transfer.yml | 2 +- oracle/docker-compose.yml | 12 ++++++------ package.json | 2 +- 19 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e151f8f1c..359a5fed3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,7 +211,7 @@ jobs: - name: Pull e2e oracle image run: | docker-compose -f ./e2e-commons/docker-compose.yml pull oracle-amb - docker tag ${DOCKER_PULL_IMAGE_BASE}/tokenbridge-e2e-oracle:${ORACLE_TAG} poanetwork/tokenbridge-oracle:latest + docker tag ${DOCKER_PULL_IMAGE_BASE}/tokenbridge-e2e-oracle:${ORACLE_TAG} gnosischain/tokenbridge-oracle:latest - name: Deploy oracle run: deployment-e2e/molecule.sh ultimate-${{ matrix.task }} - name: Reset docker socket permissions diff --git a/.gitmodules b/.gitmodules index 95ba12f54..0396ee55d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "contracts"] path = contracts - url = https://github.com/poanetwork/tokenbridge-contracts.git + url = https://github.com/gnosischain/tokenbridge-contracts.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5ae24eb75..be40c282d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Thank your for contributing to this project! We welcome collaborators and expect users to follow our [code of conduct](CODE_OF_CONDUCT.md) when submitting code or comments. -1. Fork the repo ( https://github.com/poanetwork/tokenbridge/fork ). +1. Fork the repo ( https://github.com/gnosischain/tokenbridge/fork ). 2. Create your feature branch (`git checkout -b my-new-feature`). 3. Write tests that cover your work. 4. Commit your changes (`git commit -am 'Add some feature'`). diff --git a/README.md b/README.md index e8f5fdadd..9d01a32e9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![tokenbridge](https://github.com/poanetwork/tokenbridge/workflows/tokenbridge/badge.svg?branch=master) +![tokenbridge](https://github.com/gnosischain/tokenbridge/workflows/tokenbridge/badge.svg?branch=master) [![Gitter](https://badges.gitter.im/poanetwork/poa-bridge.svg)](https://gitter.im/poanetwork/poa-bridge?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![License: LGPL v3.0](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) @@ -30,7 +30,7 @@ Sub-repositories maintained within this monorepo are listed below. | [ALM](alm/README.md) | DApp interface tool for AMB Live Monitoring | | [Burner-wallet-plugin](burner-wallet-plugin/README.md) | TokenBridge Burner Wallet 2 Plugin | -Additionally there are [Smart Contracts](https://github.com/poanetwork/tokenbridge-contracts) used to manage bridge validators, collect signatures, and confirm asset relay and disposal. +Additionally there are [Smart Contracts](https://github.com/gnosischain/tokenbridge-contracts) used to manage bridge validators, collect signatures, and confirm asset relay and disposal. ## Available deployments @@ -61,7 +61,7 @@ The POA TokenBridge provides four operational modes: Clone the repository: ```bash -git clone https://github.com/poanetwork/tokenbridge +git clone https://github.com/gnosischain/tokenbridge ``` If there is no need to build docker images for the TokenBridge components (oracle, monitor), initialize submodules, install dependencies, compile the Smart Contracts: diff --git a/burner-wallet-plugin/tokenbridge-bw-exchange/package.json b/burner-wallet-plugin/tokenbridge-bw-exchange/package.json index 63dfa012f..7d163b6dd 100644 --- a/burner-wallet-plugin/tokenbridge-bw-exchange/package.json +++ b/burner-wallet-plugin/tokenbridge-bw-exchange/package.json @@ -29,7 +29,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/poanetwork/tokenbridge.git", + "url": "https://github.com/gnosischain/tokenbridge.git", "directory": "burner-wallet-plugin/tokenbridge-bw-exchange" }, "homepage": "https://tokenbridge.net/", diff --git a/deployment/CONFIGURATION.md b/deployment/CONFIGURATION.md index 4c48836f0..f9d7ba4c7 100644 --- a/deployment/CONFIGURATION.md +++ b/deployment/CONFIGURATION.md @@ -4,7 +4,7 @@ Please see the [Configuration](../CONFIGURATION.md) for additional configuration ## Prerequisites -A functional Ubuntu 16.04 server launched using a trusted hosting provider. For more information, see our tutorials on [setting up a validator node on AWS](https://github.com/poanetwork/wiki/wiki/Validator-Node-on-AWS) or [setting up on non-AWS](https://github.com/poanetwork/wiki/wiki/Validator-Node-Non-AWS). +A functional Ubuntu 16.04 server launched using a trusted hosting provider. For more information, see our tutorials on [setting up a validator node on AWS](https://github.com/gnosischain/wiki/wiki/Validator-Node-on-AWS) or [setting up on non-AWS](https://github.com/gnosischain/wiki/wiki/Validator-Node-Non-AWS). * Record the IP address (required for file setup). * Setup ssh access to your node via public+private keys (using passwords is less secure). * When creating the node, set a meaningful `hostname` that can identify you (e.g. `validator-0x...`). @@ -13,7 +13,7 @@ A functional Ubuntu 16.04 server launched using a trusted hosting provider. For 1. Clone this repository and go to the `deployment` folder ``` -git clone --recursive https://github.com/poanetwork/tokenbridge +git clone --recursive https://github.com/gnosischain/tokenbridge cd tokenbridge/deployment ``` 2. Create the file `hosts.yml` from `hosts.yml.example` diff --git a/e2e-commons/docker-compose.yml b/e2e-commons/docker-compose.yml index 8ae2e29a8..c62e437df 100644 --- a/e2e-commons/docker-compose.yml +++ b/e2e-commons/docker-compose.yml @@ -28,7 +28,7 @@ services: networks: - ultimate oracle-erc20-native: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local} env_file: ../e2e-commons/components-envs/oracle-erc20-native.env environment: - NODE_ENV=production @@ -39,7 +39,7 @@ services: networks: - ultimate oracle-amb: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local} build: context: .. dockerfile: oracle/Dockerfile @@ -53,7 +53,7 @@ services: networks: - ultimate alm: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-alm:${ALM_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-alm:${ALM_TAG:-local} build: context: .. dockerfile: alm/Dockerfile @@ -63,7 +63,7 @@ services: networks: - ultimate monitor-erc20-native: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local} env_file: ../e2e-commons/components-envs/monitor-erc20-native.env entrypoint: yarn check-and-start ports: @@ -71,7 +71,7 @@ services: networks: - ultimate monitor-amb: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local} build: context: .. dockerfile: monitor/Dockerfile @@ -82,7 +82,7 @@ services: networks: - ultimate e2e: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-e2e:${E2E_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-e2e:${E2E_TAG:-local} build: context: .. dockerfile: Dockerfile.e2e @@ -90,12 +90,12 @@ services: networks: - ultimate blocks: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-e2e:${E2E_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-e2e:${E2E_TAG:-local} entrypoint: node e2e-commons/scripts/blocks.js networks: - ultimate molecule_runner: - image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-molecule_runner:${MOLECULE_RUNNER_TAG:-local} + image: ghcr.io/gnosischain/${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-molecule_runner:${MOLECULE_RUNNER_TAG:-local} build: context: .. dockerfile: deployment-e2e/Dockerfile diff --git a/monitor/README.md b/monitor/README.md index 3e23a1a50..6e522ded1 100644 --- a/monitor/README.md +++ b/monitor/README.md @@ -149,7 +149,7 @@ yarn check-all Using Docker: ``` docker run --rm --env-file .env -v $(pwd)/responses:/mono/monitor/responses \ - poanetwork/tokenbridge-monitor:latest /bin/bash -c 'yarn check-all' + gnosischain/tokenbridge-monitor:latest /bin/bash -c 'yarn check-all' ``` As soon as the process finishes, use the URL described above to get the statistic. diff --git a/monitor/crontab.example b/monitor/crontab.example index 18fa156fb..0c3b44342 100644 --- a/monitor/crontab.example +++ b/monitor/crontab.example @@ -2,4 +2,4 @@ */4 * * * * cd $HOME/tokenbridge/monitor; yarn check-all >>cronWorker.out 2>>cronWorker.err # Docker: -*/4 * * * * cd $HOME/tokenbridge/monitor; docker run --rm --env-file .env -v $(pwd)/responses:/mono/monitor/responses poanetwork/tokenbridge-monitor:latest /bin/bash -c 'yarn check-all' >>cronWorker.out 2>>cronWorker.err +*/4 * * * * cd $HOME/tokenbridge/monitor; docker run --rm --env-file .env -v $(pwd)/responses:/mono/monitor/responses gnosischain/tokenbridge-monitor:latest /bin/bash -c 'yarn check-all' >>cronWorker.out 2>>cronWorker.err diff --git a/monitor/docker-compose-build.yml b/monitor/docker-compose-build.yml index 124f89c52..b12226bdb 100644 --- a/monitor/docker-compose-build.yml +++ b/monitor/docker-compose-build.yml @@ -2,7 +2,7 @@ version: '2.4' services: monitor: - image: poanetwork/tokenbridge-monitor + image: ghcr.io/gnosischain/tokenbridge-monitor build: context: .. dockerfile: ./monitor/Dockerfile diff --git a/monitor/docker-compose.yml b/monitor/docker-compose.yml index 9164d9ef1..8e17a1e0d 100644 --- a/monitor/docker-compose.yml +++ b/monitor/docker-compose.yml @@ -2,7 +2,7 @@ version: '2.4' services: monitor: - image: poanetwork/tokenbridge-monitor:latest + image: ghcr.io/gnosischain/tokenbridge-monitor:latest ports: - "${MONITOR_PORT}:${MONITOR_PORT}" env_file: ./.env diff --git a/monitor/scripts/getBridgeStats.sh b/monitor/scripts/getBridgeStats.sh index d847ed280..571464c5b 100755 --- a/monitor/scripts/getBridgeStats.sh +++ b/monitor/scripts/getBridgeStats.sh @@ -42,7 +42,7 @@ if /usr/local/bin/docker-compose ps | grep -q -i 'monitor'; then docker run --rm --env-file $file -v $(pwd)/${RESPONSESDIR}:/mono/monitor/responses \ ${alist:+"-v"} ${alist:+"$al_param"} ${blist:+"-v"} ${blist:+"$bl_param"} \ -v $(pwd)/${CACHEDIR}/${bridgename}:/mono/monitor/cache/${bridgename} \ - --name ${containername} poanetwork/tokenbridge-monitor:${IMAGETAG} \ + --name ${containername} gnosischain/tokenbridge-monitor:${IMAGETAG} \ /bin/bash -c 'yarn check-all' shasum -a 256 -s -c ${checksumfile} if [ "$?" == "0" ]; then diff --git a/oracle/README.md b/oracle/README.md index 7c23e37e6..32394438b 100644 --- a/oracle/README.md +++ b/oracle/README.md @@ -49,7 +49,7 @@ For more information on the Redis/RabbitMQ requirements, see [#90](/../../issues **Note:** The following steps detail the bridge deployment process for development and testing. For deployment in a production environment we recommend using the [Bridge Deployment Playbooks](../deployment/README.md). -1. [Deploy the bridge contracts](https://github.com/poanetwork/tokenbridge-contracts/blob/master/deploy/README.md) +1. [Deploy the bridge contracts](https://github.com/gnosischain/tokenbridge-contracts/blob/master/deploy/README.md) 2. Open `bridgeDeploymentResults.json` or copy the JSON output generated by the bridge contract deployment process. diff --git a/oracle/docker-compose-amb.yml b/oracle/docker-compose-amb.yml index 46760f8b3..573964345 100644 --- a/oracle/docker-compose-amb.yml +++ b/oracle/docker-compose-amb.yml @@ -37,7 +37,7 @@ services: bridge_information: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production diff --git a/oracle/docker-compose-build.yml b/oracle/docker-compose-build.yml index 5905acd2b..fe054a27e 100644 --- a/oracle/docker-compose-build.yml +++ b/oracle/docker-compose-build.yml @@ -2,7 +2,7 @@ version: '2.4' services: oracle: - image: poanetwork/tokenbridge-oracle + image: ghcr.io/gnosischain/tokenbridge-oracle build: context: .. dockerfile: ./oracle/Dockerfile diff --git a/oracle/docker-compose-helpers.yml b/oracle/docker-compose-helpers.yml index 8ea5f1261..3c230e21b 100644 --- a/oracle/docker-compose-helpers.yml +++ b/oracle/docker-compose-helpers.yml @@ -12,7 +12,7 @@ services: interestFetcher: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: NODE_ENV: production @@ -24,7 +24,7 @@ services: mevWatcher: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: NODE_ENV: production @@ -42,7 +42,7 @@ services: mevSender: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: NODE_ENV: production diff --git a/oracle/docker-compose-transfer.yml b/oracle/docker-compose-transfer.yml index 5cbf72372..611bb0553 100644 --- a/oracle/docker-compose-transfer.yml +++ b/oracle/docker-compose-transfer.yml @@ -40,7 +40,7 @@ services: bridge_transfer: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production diff --git a/oracle/docker-compose.yml b/oracle/docker-compose.yml index 6417e53aa..cf2eccc75 100644 --- a/oracle/docker-compose.yml +++ b/oracle/docker-compose.yml @@ -33,7 +33,7 @@ services: bridge_request: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production @@ -46,7 +46,7 @@ services: bridge_collected: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production @@ -59,7 +59,7 @@ services: bridge_affirmation: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production @@ -72,7 +72,7 @@ services: bridge_senderhome: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production @@ -85,7 +85,7 @@ services: bridge_senderforeign: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production @@ -98,7 +98,7 @@ services: bridge_shutdown: cpus: 0.1 mem_limit: 500m - image: poanetwork/tokenbridge-oracle:latest + image: ghcr.io/gnosischain/tokenbridge-oracle:latest env_file: ./.env environment: - NODE_ENV=production diff --git a/package.json b/package.json index 8c27a23b7..efc576df2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tokenbridge", "version": "0.0.1", "description": "Monorepository for TokenBridge", - "repository": "https://github.com/poanetwork/tokenbridge.git", + "repository": "https://github.com/gnosischain/tokenbridge.git", "author": "rzadp ", "license": "MIT", "private": true,