Run comms locally via audius-compose (#7028)

AudiusProject · Dec 27, 2023 · dea3dfb · dea3dfb
1 parent 14385bf
commit dea3dfb
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 27 deletions.
diff --git a/comms/Dockerfile b/comms/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=builder /app/comms /bin/comms
 
 EXPOSE 4222
 VOLUME ["/tmp"]
-ENTRYPOINT ["comms"]
+CMD ["comms"]
diff --git a/comms/discovery/pubkeystore/recover.go b/comms/discovery/pubkeystore/recover.go
@@ -46,6 +46,13 @@ func Dial(discoveryConfig *config.DiscoveryConfig) error {
 		finalPoaBlock = 30000000
 	}
 
+	if discoveryConfig.IsDev {
+		acdcEndpoint = "http://audius-protocol-poa-ganache-1"
+		poaEndpoint = "http://audius-protocol-poa-ganache-1" // won't ever be used
+		verifyingContract = "0x254dffcd3277C0b1660F6d42EFbB754edaBAbC2B"
+		finalPoaBlock = -1
+	}
+
 	poaClient, err = ethclient.Dial(poaEndpoint)
 	if err != nil {
 		return err

diff --git a/contracts/contracts/EntityManager.sol b/contracts/contracts/EntityManager.sol
@@ -30,7 +30,7 @@ contract EntityManager is SigningLogicInitializable {
 
     function initialize(
         address _verifierAddress,
-        uint _networkId
+        uint _chainId
     ) public initializer
     {
         require(
@@ -41,7 +41,7 @@ contract EntityManager is SigningLogicInitializable {
         SigningLogicInitializable.initialize(
             "Entity Manager",
             "1",
-            _networkId
+            _chainId
         );
     }
 

diff --git a/contracts/migrations/2_entity_manager_migration.js b/contracts/migrations/2_entity_manager_migration.js
@@ -17,16 +17,16 @@ module.exports = (deployer, network, accounts) => {
     const config = contractConfig[network]
     const proxyAdminAddress =
       config.blacklisterAddress || accounts[accounts.length - 1]
-    const networkId = await web3.eth.net.getId()
-    console.log(`Deploying EntityManager to ${networkId}`)
+    const chainId = await web3.eth.getChainId()
+    console.log(`Deploying EntityManager to ${chainId}`)
     const deployLogicTx = await deployer.deploy(EntityManager)
     const logicContractAddress = deployLogicTx.address
     console.log(logicContractAddress)
     const verifierAddress = config.verifierAddress || accounts[0]
     const initializeData = encodeCall(
       'initialize',
       ['address', 'uint'],
-      [verifierAddress, networkId]
+      [verifierAddress, chainId]
     )
     // Deploy proxy contract with encoded initialize function
     let deployedProxyTx = await deployer.deploy(

diff --git a/dev-tools/compose/docker-compose.discovery.prod.yml b/dev-tools/compose/docker-compose.discovery.prod.yml
@@ -43,15 +43,19 @@ services:
     build:
       context: ${PROJECT_ROOT}/comms
       dockerfile: Dockerfile
-    command: discovery
+    command: sh -c ". /tmp/dev-tools/startup/startup.sh && comms discovery"
     restart: unless-stopped
+    env_file: .env # used by the startup script
     environment:
       comms_dev_mode: true
-      audius_delegate_private_key: 'c82ad757622db5a148089e0a8fc1741cefa8677ab56a2ac9e38dac905c5ad7c7'
-      audius_db_url: 'postgresql://postgres:postgres@db:5432/discovery_provider_1'
     depends_on:
       db:
         condition: service_healthy
+    deploy:
+      mode: replicated
+      replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
+    volumes:
+      - ${PROJECT_ROOT}/dev-tools:/tmp/dev-tools
 
   trpc:
     build:

diff --git a/dev-tools/compose/docker-compose.test.yml b/dev-tools/compose/docker-compose.test.yml
@@ -292,7 +292,7 @@ services:
     build:
       context: ${PROJECT_ROOT}/comms
       dockerfile: Dockerfile
-    command: discovery-migrations
+    command: comms discovery-migrations
     environment:
       audius_db_url: 'postgres://postgres:postgres@discovery-provider-db:5432/discovery_provider?sslmode=disable'
     depends_on:

diff --git a/dev-tools/compose/docker-compose.yml b/dev-tools/compose/docker-compose.yml
@@ -11,9 +11,9 @@ x-common: &common
     driver: json-file
   extra_hosts:
     # Allows the containers can talk to each other via their hostnames routed through nginx
-    - 'audius-protocol-comms-discovery-1:host-gateway'
-    - 'audius-protocol-comms-discovery-2:host-gateway'
-    - 'audius-protocol-comms-discovery-3:host-gateway'
+    - 'audius-protocol-comms-1:host-gateway'
+    - 'audius-protocol-comms-2:host-gateway'
+    - 'audius-protocol-comms-3:host-gateway'
     - 'audius-protocol-creator-node-1:host-gateway'
     - 'audius-protocol-creator-node-2:host-gateway'
     - 'audius-protocol-creator-node-3:host-gateway'

diff --git a/dev-tools/compose/nginx_ingress.conf b/dev-tools/compose/nginx_ingress.conf
@@ -6,7 +6,12 @@
 # COMMS. Routes to containers for: audius-protocol-storage-1 audius-protocol-storage-2 audius-protocol-storage-3 audius-protocol-storage-4 audius-protocol-discovery-1 audius-protocol-discovery-2 audius-protocol-discovery-3
 # Comes from comms/nginx/ingress.conf
 #
-include comms_ingress.conf;
+# include comms_ingress.conf;
+
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
 
 #
 # DISCOVERY PROVIDER. Uses port 5000 to forward to the same nginx that stage and prod use (i.e., discovery-provider/nginx_conf/nginx.conf)
@@ -37,6 +42,17 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
+    location ~ ^/comms(/.*)?$ {
+        resolver 127.0.0.11 valid=30s;
+        proxy_pass http://audius-protocol-comms-1:8925/comms$1$is_args$args;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        # for websockets:
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
     location ^~ /healthz {
         resolver 127.0.0.11 valid=30s;
         proxy_pass http://healthz;
@@ -51,7 +67,6 @@ server {
         proxy_set_header Host $http_host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
-
 }
 
 
@@ -81,6 +96,17 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
+    location ~ ^/comms(/.*)?$ {
+        resolver 127.0.0.11 valid=30s;
+        proxy_pass http://audius-protocol-comms-2:8925/comms$1$is_args$args;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        # for websockets:
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
     location ^~ /healthz {
         resolver 127.0.0.11 valid=30s;
         proxy_pass http://healthz;
@@ -123,6 +149,17 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
+    location ~ ^/comms(/.*)?$ {
+        resolver 127.0.0.11 valid=30s;
+        proxy_pass http://audius-protocol-comms-1:8925/comms$1$is_args$args;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        # for websockets:
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
     location ^~ /healthz {
         resolver 127.0.0.11 valid=30s;
         proxy_pass http://healthz;
@@ -137,7 +174,6 @@ server {
         proxy_set_header Host $http_host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
-
 }
 
 #

diff --git a/dev-tools/startup/comms.sh b/dev-tools/startup/comms.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+if [[ "$audius_db_url" == "" ]]; then
+    export audius_db_url="postgresql://postgres:postgres@audius-protocol-db-1:5432/discovery_provider_${replica}"
+    export audius_db_url_read_replica="postgresql://postgres:postgres@audius-protocol-db-1:5432/discovery_provider_${replica}"
+fi
+
+if [[ "$audius_redis_url" == "" ]]; then
+    export audius_redis_url="redis://audius-protocol-discovery-provider-redis-${replica}:6379/00"
+fi
+
+export audius_enable_rsyslog=false
+
+export audius_discprov_url="http://audius-protocol-discovery-provider-${replica}"
+
+export audius_delegate_owner_wallet=$(printenv "DP${replica}_DELEGATE_OWNER_ADDRESS")
+export audius_delegate_private_key=$(printenv "DP${replica}_DELEGATE_OWNER_PRIVATE_KEY")
diff --git a/dev-tools/startup/startup.sh b/dev-tools/startup/startup.sh
@@ -2,7 +2,7 @@
 
 # NOTE: This script is meant to be used from within docker containers
 
-name=$(nslookup $(hostname -i) | grep -o "\(discovery-provider\|identity-service\)-[0-9]\+")
+name=$(nslookup $(hostname -i) | grep -o "\(discovery-provider\|identity-service\|comms\)-[0-9]\+")
 replica=$(echo $name | grep -o "[0-9]\+")
 
 if [[ -f "/tmp/dev-tools/startup/$name.env" ]]; then

diff --git a/packages/libs/src/sdk/services/EntityManager/EntityManager.test.ts b/packages/libs/src/sdk/services/EntityManager/EntityManager.test.ts
@@ -20,9 +20,7 @@ jest.mock('../../utils/web3', () => {
   return jest.fn().mockImplementation(() => {
     return {
       eth: {
-        net: {
-          getId: () => ''
-        },
+        getChainId: () => '',
         Contract: jest.fn().mockImplementation(() => ({
           methods: {
             manageEntity: () => ({

diff --git a/packages/libs/src/sdk/services/EntityManager/EntityManager.ts b/packages/libs/src/sdk/services/EntityManager/EntityManager.ts
@@ -68,7 +68,7 @@ export class EntityManager implements EntityManagerService {
     Pick<TransactionReceipt, 'blockHash' | 'blockNumber'>
   > {
     const nonce = await signatureSchemas.getNonce()
-    const chainId = Number(await this.web3.eth.net.getId())
+    const chainId = Number(await this.web3.eth.getChainId())
     const signatureData = signatureSchemas.generators.getManageEntityData(
       chainId,
       this.config.contractAddress,

diff --git a/packages/libs/src/services/contracts/ContractClient.ts b/packages/libs/src/services/contracts/ContractClient.ts
@@ -227,11 +227,10 @@ export class ContractClient {
     return method
   }
 
-  async getEthNetId() {
+  async getEthChainId() {
     await this.init()
-    const netId = await this.web3Manager.getWeb3().eth.net.getId()
-
-    return netId
+    const chainId = await this.web3Manager.getWeb3().eth.getChainId()
+    return chainId
   }
 
   async getContract() {

diff --git a/packages/libs/src/services/dataContracts/EntityManagerClient.ts b/packages/libs/src/services/dataContracts/EntityManagerClient.ts
@@ -53,7 +53,7 @@ export class EntityManagerClient extends ContractClient {
     privateKey?: string
   ): Promise<[string, string]> {
     const nonce = await signatureSchemas.getNonce()
-    const chainId = await this.getEthNetId()
+    const chainId = await this.getEthChainId()
     const contractAddress = await this.getAddress()
     const signatureData = signatureSchemas.generators.getManageEntityData(
       chainId,
@@ -107,7 +107,7 @@ export class EntityManagerClient extends ContractClient {
     privateKey?: string
   ): Promise<{ txReceipt: TransactionReceipt }> {
     const nonce = await signatureSchemas.getNonce()
-    const chainId = await this.getEthNetId()
+    const chainId = await this.getEthChainId()
     const contractAddress = await this.getAddress()
     const nethermindContractAddress = await this.getNethermindAddress()
     const signatureData = signatureSchemas.generators.getManageEntityData(