🪦 poa ganache (#11367)

Author: alecsavvy

.circleci/config.yml

@@ -337,12 +337,10 @@ workflows:
             comms/.* run-discovery-workflow true
             packages/identity-service/.* run-identity-workflow true
             eth-contracts/.* run-eth-contracts-workflow true
-            contracts/.* run-contracts-workflow true
             .circleci/.* run-discovery-workflow true
             .circleci/.* run-identity-workflow true
             .circleci/.* run-eth-contracts-workflow true
             .circleci/.* run-protocol-dashboard-workflow true
-            .circleci/.* run-contracts-workflow true
             .circleci/.* run-sdk-workflow true
             .circleci/.* run-web-workflow true
             .circleci/.* run-mobile-workflow true
@@ -389,12 +387,10 @@ workflows:
             comms/.* run-discovery-workflow true
             packages/identity-service/.* run-identity-workflow true
             eth-contracts/.* run-eth-contracts-workflow true
-            contracts/.* run-contracts-workflow true
             .circleci/.* run-discovery-workflow true
             .circleci/.* run-identity-workflow true
             .circleci/.* run-eth-contracts-workflow true
             .circleci/.* run-protocol-dashboard-workflow true
-            .circleci/.* run-contracts-workflow true
             .circleci/.* run-sdk-workflow true
             .circleci/.* run-web-workflow true
             .circleci/.* run-mobile-workflow true
@@ -437,7 +433,6 @@ workflows:
           mapping: |
             .* run-integration-workflow true
             .* run-eth-contracts-workflow true
-            .* run-contracts-workflow true
             .* run-release-workflow true
             .* run-sdk-workflow true
           requires:

.circleci/src/workflows/contracts.yml

@@ -21,7 +21,6 @@ audius-protocol-creator-node-1 audius-protocol-creator-node-2 audius-protocol-cr
 audius-protocol-identity-service-1 \
 audius-protocol-solana-test-validator-1 \
 audius-protocol-eth-ganache-1 \
-audius-protocol-poa-ganache-1 \
 audius-protocol-pedalboard \
 audius-protocol-anti-abuse-oracle-1 \
 audius-protocol-discovery-provider-redis-1 \

dev-tools/audius-compose

@@ -1,18 +1,6 @@
 version: '3.9'
 
 services:
-  poa-ganache:
-    image: audius/poa-ganache:latest
-    command: bash /tmp/dev-tools/startup/poa-ganache.sh
-    volumes:
-      - poa-contracts-abis:/usr/src/app/build/contracts
-      - ${PROJECT_ROOT}/dev-tools:/tmp/dev-tools
-    ports:
-      - '8545:8545'
-    deploy:
-      mode: global
-    profiles:
-      - chain
 
   eth-ganache:
     image: audius/eth-ganache:latest

dev-tools/compose/docker-compose.blockchain.yml

@@ -157,8 +157,6 @@ services:
     depends_on:
       db:
         condition: service_healthy
-      poa-ganache:
-        condition: service_healthy
       eth-ganache:
         condition: service_healthy
       solana-test-validator:

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -83,8 +83,6 @@ services:
         condition: service_healthy
       identity-service-redis:
         condition: service_healthy
-      poa-ganache:
-        condition: service_healthy
       eth-ganache:
         condition: service_healthy
       solana-test-validator:

dev-tools/compose/docker-compose.identity.prod.yml

@@ -67,8 +67,6 @@ services:
         condition: service_healthy
       discovery-provider-redis:
         condition: service_healthy
-      poa-ganache:
-        condition: service_healthy
 
   solana-relay:
     build:

dev-tools/compose/docker-compose.pedalboard.prod.yml

@@ -48,20 +48,6 @@ services:
         limits:
           memory: 3G
 
-  poa-ganache:
-    image: audius/poa-ganache:latest
-    command: bash /tmp/dev-tools/startup/poa-ganache.sh
-    volumes:
-      - poa-contracts-abis:/usr/src/app/build/contracts
-      - ${PROJECT_ROOT}/dev-tools:/tmp/dev-tools
-    logging: *default-logging
-    deploy:
-      mode: global
-    profiles:
-      - tests
-      - chain
-      - poa
-
   eth-ganache:
     image: audius/eth-ganache:latest
     command: bash /tmp/dev-tools/startup/eth-ganache.sh
@@ -205,29 +191,6 @@ services:
     profiles:
       - tests
 
-  # contracts
-  test-contracts:
-    user: ${DOCKER_UID:-root}:${DOCKER_GID:-root}
-    build:
-      context: ${PROJECT_ROOT}/contracts
-      dockerfile: Dockerfile
-      args:
-        bootstrapSPIds: ${BOOTSTRAP_SP_IDS}
-        bootstrapSPDelegateWallets: ${BOOTSTRAP_SP_DELEGATE_WALLETS}
-        bootstrapSPOwnerWallets: ${BOOTSTRAP_SP_OWNER_WALLETS}
-    entrypoint: sh -c '[ "$$1" = "test" ] || sleep inf && (shift; npm run test)' -
-    logging: *default-logging
-    deploy:
-      mode: global
-    depends_on:
-      poa-ganache:
-        condition: service_healthy
-    profiles:
-      - poa
-    volumes:
-      - ${PROJECT_ROOT}/contracts:/usr/src/app
-      - /usr/src/app/node_modules
-
   # eth-contracts
   test-eth-contracts:
     user: ${DOCKER_UID:-root}:${DOCKER_GID:-root}

dev-tools/compose/docker-compose.test.yml

@@ -23,7 +23,6 @@ x-common: &common
     - 'audius-protocol-identity-service-1:host-gateway'
     - 'audius-protocol-solana-test-validator-1:host-gateway'
     - 'audius-protocol-eth-ganache-1:host-gateway'
-    - 'audius-protocol-poa-ganache-1:host-gateway'
     - 'audius-protocol-pedalboard:host-gateway'
   deploy:
     resources:
@@ -218,12 +217,6 @@ services:
 
   # Blockchain
 
-  poa-ganache:
-    extends:
-      file: docker-compose.blockchain.yml
-      service: poa-ganache
-    <<: *common
-
   eth-ganache:
     extends:
       file: docker-compose.blockchain.yml

dev-tools/compose/docker-compose.yml

@@ -28,13 +28,6 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
-    location ~ ^/chain(/.*)?$ {
-        resolver 127.0.0.11 valid=30s;
-        proxy_pass http://audius-protocol-poa-ganache-1:8545/$1;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
     location ~ ^/relay(/.*)?$ {
         resolver 127.0.0.11 valid=30s;
         proxy_pass http://audius-protocol-relay-1:6001/relay$1;
@@ -250,18 +243,6 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 }
-server {
-    listen      80;
-    server_name audius-protocol-poa-ganache-1;
-
-    location / {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream audius-protocol-poa-ganache-1:8545;
-        proxy_pass http://$upstream;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-}
 server {
     listen      80;
     server_name audius-protocol-solana-test-validator-1;

dev-tools/compose/nginx_ingress.conf

@@ -26,11 +26,16 @@ export let web3: providers.JsonRpcProvider
 export let wallets: WalletManager
 
 const main = async () => {
-  // async config
-  const connectedWeb3 = await connectWeb3(config)
-  web3 = connectedWeb3.web3
-  config.acdcChainId = connectedWeb3.chainId.toString()
-  wallets = new WalletManager(web3)
+  if (config.environment !== "dev") {
+    // async config
+    const connectedWeb3 = await connectWeb3(config)
+    web3 = connectedWeb3.web3
+    config.acdcChainId = connectedWeb3.chainId.toString()
+    wallets = new WalletManager(web3)
+  } else {
+    // needs to stay so decoding can happen correctly
+    config.acdcChainId = "1337"
+  }
 
   // start webserver after async config
   const { serverHost, serverPort } = config

packages/discovery-provider/plugins/pedalboard/apps/relay/src/index.ts

@@ -24,8 +24,6 @@ export const relayTransaction = async (
   const { validatedRelayRequest, logger, requestId } = res.locals.ctx
   const { encodedABI, gasLimit, contractAddress } = validatedRelayRequest
 
-  const senderWallet = wallets.selectNextWallet()
-  const address = await senderWallet.getAddress()
   let nonce = undefined
   let submit = undefined
   try {
@@ -43,6 +41,9 @@ export const relayTransaction = async (
       }
     }
 
+    const senderWallet = wallets.selectNextWallet()
+    const address = await senderWallet.getAddress()
+
     // gather some transaction params
     nonce = await retryPromise(() => web3.getTransactionCount(address))
 
@@ -63,7 +64,6 @@ export const relayTransaction = async (
     receipt.blockNumber += config.finalPoaBlock
     logger.info(
       {
-        senderWallet: address,
         nonce,
         txHash: submit?.hash,
         blocknumber: receipt.blockNumber
@@ -73,7 +73,7 @@ export const relayTransaction = async (
     res.send({ receipt })
   } catch (e) {
     logger.error(
-      { senderWallet: address, nonce, txHash: submit?.hash },
+      { nonce, txHash: submit?.hash },
       'transaction submission failed'
     )
     internalError(next, e)

packages/discovery-provider/plugins/pedalboard/apps/relay/src/txRelay.ts

@@ -18,12 +18,27 @@ class AudiusLibsWrapper {
   }
 
   async init() {
-    const dataWeb3 = await AudiusLibs.Utils.configureWeb3(
-      web3ProviderUrl,
-      null,
-      false
-    )
-    if (!dataWeb3) throw new Error('Web3 incorrectly configured')
+    let web3Config
+    if (config.get('environment') !== 'development') {
+      const dataWeb3 = await AudiusLibs.Utils.configureWeb3(
+        web3ProviderUrl,
+        null,
+        false
+      )
+      if (!dataWeb3) throw new Error('Web3 incorrectly configured')
+
+      web3Config = {
+        registryAddress,
+        useExternalWeb3: true,
+        externalWeb3Config: {
+          web3: dataWeb3,
+          // this is a stopgap since libs external web3 init requires an ownerWallet
+          // this is never actually used in the service's libs calls
+          ownerWallet: config.get('relayerPublicKey')
+        },
+        entityManagerAddress
+      }
+    }
 
     const discoveryProviderWhitelist = config.get('discoveryProviderWhitelist')
       ? new Set(config.get('discoveryProviderWhitelist').split(','))
@@ -71,17 +86,7 @@ class AudiusLibsWrapper {
         config.get('ethProviderUrl'),
         config.get('ethOwnerWallet')
       ),
-      web3Config: {
-        registryAddress,
-        useExternalWeb3: true,
-        externalWeb3Config: {
-          web3: dataWeb3,
-          // this is a stopgap since libs external web3 init requires an ownerWallet
-          // this is never actually used in the service's libs calls
-          ownerWallet: config.get('relayerPublicKey')
-        },
-        entityManagerAddress
-      },
+      web3Config,
       isServer: true,
       captchaConfig: { serviceKey: config.get('recaptchaServiceKey') },
       solanaWeb3Config,