Skip to content

Commit

Permalink
Fix namings, use gnosischain docker project
Browse files Browse the repository at this point in the history
  • Loading branch information
Giacomo Licari committed Mar 9, 2023
1 parent 9dc1966 commit a48d88e
Show file tree
Hide file tree
Showing 19 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "contracts"]
path = contracts
url = https://github.com/poanetwork/tokenbridge-contracts.git
url = https://github.com/gnosischain/tokenbridge-contracts.git
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'`).
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion burner-wallet-plugin/tokenbridge-bw-exchange/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down
4 changes: 2 additions & 2 deletions deployment/CONFIGURATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -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...`).
Expand All @@ -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`
Expand Down
16 changes: 8 additions & 8 deletions e2e-commons/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -63,15 +63,15 @@ 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:
- "3012:3012"
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
Expand All @@ -82,20 +82,20 @@ 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
command: "true"
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
Expand Down
2 changes: 1 addition & 1 deletion monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion monitor/crontab.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion monitor/docker-compose-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '2.4'
services:
monitor:
image: poanetwork/tokenbridge-monitor
image: ghcr.io/gnosischain/tokenbridge-monitor
build:
context: ..
dockerfile: ./monitor/Dockerfile
2 changes: 1 addition & 1 deletion monitor/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion monitor/scripts/getBridgeStats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion oracle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion oracle/docker-compose-amb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion oracle/docker-compose-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '2.4'
services:
oracle:
image: poanetwork/tokenbridge-oracle
image: ghcr.io/gnosischain/tokenbridge-oracle
build:
context: ..
dockerfile: ./oracle/Dockerfile
6 changes: 3 additions & 3 deletions oracle/docker-compose-helpers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion oracle/docker-compose-transfer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions oracle/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>",
"license": "MIT",
"private": true,
Expand Down

0 comments on commit a48d88e

Please sign in to comment.