From c426d7ccdb0766063501169f8d9e1d5f4a58d3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Wed, 28 Jun 2023 18:21:50 +0200 Subject: [PATCH] chore: rename org (#9) --- .github/workflows/docker_build_push.yml | 2 +- .npmrc | 1 - Dockerfile | 4 +--- package-lock.json | 22 +++++++++++----------- package.json | 6 +++--- src/execute/execute.processor.ts | 8 ++++---- 6 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 .npmrc diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml index 5c96cdd..e7f82c6 100644 --- a/.github/workflows/docker_build_push.yml +++ b/.github/workflows/docker_build_push.yml @@ -28,7 +28,7 @@ jobs: - uses: convictional/trigger-workflow-and-wait@v1.6.1 with: - owner: topos-network + owner: topos-protocol repo: e2e-tests github_token: ${{ secrets.ROBOT_PAT_TRIGGER_E2E_WORKFLOWS }} workflow_file_name: frontend:erc20-messaging.yml diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 492bc8a..0000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -@toposware:registry=https://npm.pkg.github.com diff --git a/Dockerfile b/Dockerfile index 0b1b627..f730e50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,8 @@ FROM node:lts-slim -ARG NPM_TOKEN WORKDIR /usr/src/app -COPY package*.json .npmrc ./ -RUN npm set //npm.pkg.github.com/:_authToken $NPM_TOKEN +COPY package*.json ./ RUN npm ci diff --git a/package-lock.json b/package-lock.json index e4d55f8..9a1c793 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "nest-typescript-starter", + "name": "@topos-protocol/executor-service", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "nest-typescript-starter", + "name": "@topos-protocol/executor-service", "version": "1.0.0", "license": "MIT", "dependencies": { @@ -18,7 +18,7 @@ "@nestjs/passport": "^9.0.0", "@nestjs/platform-express": "^9.4.0", "@nestjs/swagger": "^6.1.2", - "@topos-network/topos-smart-contracts": "^1.1.1", + "@topos-protocol/topos-smart-contracts": "^1.1.2", "bcrypt": "^5.1.0", "bull": "^4.10.1", "class-transformer": "^0.5.1", @@ -2698,10 +2698,10 @@ "@sinonjs/commons": "^1.7.0" } }, - "node_modules/@topos-network/topos-smart-contracts": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@topos-network/topos-smart-contracts/-/topos-smart-contracts-1.1.1.tgz", - "integrity": "sha512-uSMODtWe8NH2kzNpUH89bziioRAQ3Fb62SbRYDpWNZxWp9uQ0WuxgxXO3o3BaFU+gQMnhFyp/5VnGaA3HN0H4Q==", + "node_modules/@topos-protocol/topos-smart-contracts": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@topos-protocol/topos-smart-contracts/-/topos-smart-contracts-1.1.2.tgz", + "integrity": "sha512-yhArAs1PdMbFYEV0Vi0YnpZ4oKxYK6P1oJwAAmbEPXk8zWCwMZyAxz2Wn7KEn64qJZikPshF2w24BMzX1lZh1g==", "dependencies": { "@openzeppelin/contracts": "^4.8.3", "ethers": "^5.7.2", @@ -11828,10 +11828,10 @@ "@sinonjs/commons": "^1.7.0" } }, - "@topos-network/topos-smart-contracts": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@topos-network/topos-smart-contracts/-/topos-smart-contracts-1.1.1.tgz", - "integrity": "sha512-uSMODtWe8NH2kzNpUH89bziioRAQ3Fb62SbRYDpWNZxWp9uQ0WuxgxXO3o3BaFU+gQMnhFyp/5VnGaA3HN0H4Q==", + "@topos-protocol/topos-smart-contracts": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@topos-protocol/topos-smart-contracts/-/topos-smart-contracts-1.1.2.tgz", + "integrity": "sha512-yhArAs1PdMbFYEV0Vi0YnpZ4oKxYK6P1oJwAAmbEPXk8zWCwMZyAxz2Wn7KEn64qJZikPshF2w24BMzX1lZh1g==", "requires": { "@openzeppelin/contracts": "^4.8.3", "ethers": "^5.7.2", diff --git a/package.json b/package.json index 533d973..a0e1010 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@topos-network/executor-service", + "name": "@topos-protocol/executor-service", "private": true, "version": "1.0.0", "description": "Delegate cross-subnet messages call on receiving subnets with the Executor service", @@ -7,7 +7,7 @@ "author": "Sébastien Dan ", "repository": { "type": "git", - "url": "git+https://github.com/topos-network/executor-service.git" + "url": "git+https://github.com/topos-protocol/executor-service.git" }, "scripts": { "build": "nest build", @@ -33,7 +33,7 @@ "@nestjs/passport": "^9.0.0", "@nestjs/platform-express": "^9.4.0", "@nestjs/swagger": "^6.1.2", - "@topos-network/topos-smart-contracts": "^1.1.1", + "@topos-protocol/topos-smart-contracts": "^1.1.2", "bcrypt": "^5.1.0", "bull": "^4.10.1", "class-transformer": "^0.5.1", diff --git a/src/execute/execute.processor.ts b/src/execute/execute.processor.ts index e407fa1..5dab0bc 100644 --- a/src/execute/execute.processor.ts +++ b/src/execute/execute.processor.ts @@ -11,14 +11,14 @@ import { } from '@nestjs/bull' import { Logger } from '@nestjs/common' import { ConfigService } from '@nestjs/config' -import * as ToposCoreJSON from '@topos-network/topos-smart-contracts/artifacts/contracts/topos-core/ToposCore.sol/ToposCore.json' -import * as ToposMessagingJSON from '@topos-network/topos-smart-contracts/artifacts/contracts/topos-core/ToposMessaging.sol/ToposMessaging.json' -import * as SubnetRegistratorJSON from '@topos-network/topos-smart-contracts/artifacts/contracts/topos-core/SubnetRegistrator.sol/SubnetRegistrator.json' +import * as ToposCoreJSON from '@topos-protocol/topos-smart-contracts/artifacts/contracts/topos-core/ToposCore.sol/ToposCore.json' +import * as ToposMessagingJSON from '@topos-protocol/topos-smart-contracts/artifacts/contracts/topos-core/ToposMessaging.sol/ToposMessaging.json' +import * as SubnetRegistratorJSON from '@topos-protocol/topos-smart-contracts/artifacts/contracts/topos-core/SubnetRegistrator.sol/SubnetRegistrator.json' import { SubnetRegistrator, ToposCore, ToposMessaging, -} from '@topos-network/topos-smart-contracts/typechain-types/contracts/topos-core' +} from '@topos-protocol/topos-smart-contracts/typechain-types/contracts/topos-core' import { Job } from 'bull' import { ethers, providers } from 'ethers'