more docker files to ops and fix docker compose failed by allow list

alt-research · Mar 31, 2024 · 26be29b · 26be29b
1 parent 978ff22
commit 26be29b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/release-aggregator.yml b/.github/workflows/release-aggregator.yml
@@ -102,7 +102,7 @@ jobs:
           secret-files: |
             git_config=${{ env.HOME }}/.gitconfig
             git_credentials=${{ env.XDG_CONFIG_HOME }}/git/credentials
-          file: aggregator.Dockerfile
+          file: ./ops/aggregator.Dockerfile
           labels:  ${{ steps.aggregator-meta.outputs.labels }}
           tags: ${{ steps.aggregator-meta.outputs.tags }}
 

diff --git a/.github/workflows/release-operator.yml b/.github/workflows/release-operator.yml
@@ -101,7 +101,7 @@ jobs:
           secret-files: |
             git_config=${{ env.HOME }}/.gitconfig
             git_credentials=${{ env.XDG_CONFIG_HOME }}/git/credentials
-          file: operator.Dockerfile
+          file: ./ops/operator.Dockerfile
           labels:  ${{ steps.operator-meta.outputs.labels }}
           tags: ${{ steps.operator-meta.outputs.tags }}
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
   contracts-deploy:
     build:
       context: .
-      dockerfile: contract-deployer.Dockerfile
+      dockerfile: ./ops/contract-deployer.Dockerfile
     container_name: contracts-deploy
     working_dir: /app/
     volumes:

diff --git a/aggregator.Dockerfile → ops/aggregator.Dockerfile b/aggregator.Dockerfile → ops/aggregator.Dockerfile
diff --git a/contract-deployer.Dockerfile → ops/contract-deployer.Dockerfile b/contract-deployer.Dockerfile → ops/contract-deployer.Dockerfile
diff --git a/operator.Dockerfile → ops/operator.Dockerfile b/operator.Dockerfile → ops/operator.Dockerfile
diff --git a/ops/scripts/init-devnet.sh b/ops/scripts/init-devnet.sh
@@ -21,6 +21,7 @@ AVS_ADDRESS_PATH='./contracts/script/output/machavs_deploy_output.json'
 UNDERLAYING_TOKEN=$(cat $EIGENLAYER_ADDRESS_PATH | jq -r '.underlayingToken' )
 REGISTRY_COORDINATOR_ADDR=$(cat $AVS_ADDRESS_PATH | jq -r '.registryCoordinator' )
 OPERATOR_STATE_RETRIEVER_ADDR=$(cat $AVS_ADDRESS_PATH | jq -r '.operatorStateRetriever' )
+MACH_AVS_ADDR=$(cat $AVS_ADDRESS_PATH | jq -r '.machServiceManager' )
 STRATEGY_BASE_TVL_LIMITS_ADDR=$(cat $EIGENLAYER_ADDRESS_PATH | jq -r '.strategyBaseTVLLimits' )
 
 cast send  -f $OWNER_ADDR --private-key $OWNER_PRIVATE --rpc-url $RPC_URL --value 2ether $OPERATOR_ADDR
@@ -33,6 +34,9 @@ sed -i 's/ecdsa_private_key_store_path: .\+/ecdsa_private_key_store_path: .\/con
 sed -i 's/bls_private_key_store_path: .\+/bls_private_key_store_path: .\/config-files\/key\/'${OPERATOR_KEY_NAME}'.bls.key.json/g' ./ops/configs/operator-docker-compose.yaml
 sed -i 's/metadata_uri: .\+/metadata_uri: '${METADATA_URI}'/g' ./ops/configs/operator-docker-compose.yaml
 
+# disable the allow list, so we can test easy.
+cast send  -f $OWNER_ADDR --private-key $OWNER_PRIVATE $MACH_AVS_ADDR --rpc-url $RPC_URL 'disableAllowlist()'
+
 ./bin/mach-operator-cli --config ./ops/configs/operator-docker-compose.yaml rel
 ./bin/mach-operator-cli --config ./ops/configs/operator-docker-compose.yaml d --strategy-addr $STRATEGY_BASE_TVL_LIMITS_ADDR --amount 10000000
 ./bin/mach-operator-cli --config ./ops/configs/operator-docker-compose.yaml r