From 533413281de5b3b0a3a18b191a810b936f96367e Mon Sep 17 00:00:00 2001 From: Akshay Dahiya Date: Fri, 17 Nov 2023 18:32:32 +0530 Subject: [PATCH 1/3] chore: enable submodules in build image --- .github/workflows/docker-publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index eca949b4..fb7031e7 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -37,6 +37,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + with: + submodules: recursive # Install the cosign tool except on PR # https://github.com/sigstore/cosign-installer From 019c7429eeb9f8b20acbd6d3b74df846f7d3f41d Mon Sep 17 00:00:00 2001 From: Akshay Dahiya Date: Sat, 18 Nov 2023 16:23:02 +0530 Subject: [PATCH 2/3] chore: update snapshotter_autofill to include web3_storage token and dynamic namespace --- snapshotter_autofill.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/snapshotter_autofill.sh b/snapshotter_autofill.sh index 635e9736..789293a6 100755 --- a/snapshotter_autofill.sh +++ b/snapshotter_autofill.sh @@ -42,17 +42,24 @@ if [ "$POWERLOOM_REPORTING_URL" ]; then echo "Found SLACK_REPORTING_URL ${POWERLOOM_REPORTING_URL}"; fi +if [ "$WEB3_STORAGE_TOKEN" ]; then + echo "Found WEB3_STORAGE_TOKEN ${WEB3_STORAGE_TOKEN}"; +fi + +if [ "$NAMESPACE" ]; then + echo "Found NAMESPACE ${NAMESPACE}"; +fi cp config/projects.example.json config/projects.json cp config/aggregator.example.json config/aggregator.json cp config/auth_settings.example.json config/auth_settings.json cp config/settings.example.json config/settings.json -export namespace=UNISWAPV2 - +export namespace="${NAMESPACE:-UNISWAPV2}" export ipfs_url="${IPFS_URL:-/dns/ipfs/tcp/5001}" export ipfs_api_key="${IPFS_API_KEY:-}" export ipfs_api_secret="${IPFS_API_SECRET:-}" +export web3_storage_token="${WEB3_STORAGE_TOKEN:-}" export slack_reporting_url="${SLACK_REPORTING_URL:-}" export powerloom_reporting_url="${POWERLOOM_REPORTING_URL:-}" @@ -72,6 +79,7 @@ echo "Using IPFS API KEY: ${ipfs_api_key}" echo "Using protocol state contract: ${PROTOCOL_STATE_CONTRACT}" echo "Using slack reporting url: ${slack_reporting_url}" echo "Using powerloom reporting url: ${powerloom_reporting_url}" +echo "Using web3 storage token: ${web3_storage_token}" sed -i'.backup' "s#relevant-namespace#$namespace#" config/settings.json @@ -81,6 +89,7 @@ sed -i'.backup' "s#https://rpc-url#$SOURCE_RPC_URL#" config/settings.json sed -i'.backup' "s#https://prost-rpc-url#$PROST_RPC_URL#" config/settings.json +sed -i'.backup' "s#web3-storage-token#$web3_storage_token#" settings.json sed -i'.backup' "s#ipfs-writer-url#$ipfs_url#" config/settings.json sed -i'.backup' "s#ipfs-writer-key#$ipfs_api_key#" config/settings.json sed -i'.backup' "s#ipfs-writer-secret#$ipfs_api_secret#" config/settings.json From 9ee447f91355814be0eaf520f5b80bf00a424146 Mon Sep 17 00:00:00 2001 From: Akshay Dahiya Date: Sat, 18 Nov 2023 16:43:03 +0530 Subject: [PATCH 3/3] fix: settings path in snapshotter_autofill for web3storage token --- snapshotter_autofill.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapshotter_autofill.sh b/snapshotter_autofill.sh index 789293a6..88857985 100755 --- a/snapshotter_autofill.sh +++ b/snapshotter_autofill.sh @@ -89,7 +89,7 @@ sed -i'.backup' "s#https://rpc-url#$SOURCE_RPC_URL#" config/settings.json sed -i'.backup' "s#https://prost-rpc-url#$PROST_RPC_URL#" config/settings.json -sed -i'.backup' "s#web3-storage-token#$web3_storage_token#" settings.json +sed -i'.backup' "s#web3-storage-token#$web3_storage_token#" config/settings.json sed -i'.backup' "s#ipfs-writer-url#$ipfs_url#" config/settings.json sed -i'.backup' "s#ipfs-writer-key#$ipfs_api_key#" config/settings.json sed -i'.backup' "s#ipfs-writer-secret#$ipfs_api_secret#" config/settings.json