Merge pull request #17673 from MinaProtocol/amcie-merge-release320-to-master

amcie-merge-release320-to-master

Author: amc-ie

.editorconfig

@@ -1,6 +1,3 @@
-# Ignore vendored code when calculating repo code %s
-# libsnark is lots of c++
-automation/** linguist-vendored
 # PragmataPro requires a license and costs $$, let's protect it with password
 # protected zip file
 frontend/website/static/font/PragmataPro.zip filter=lfs diff=lfs merge=lfs -text

.genesis-ledger.ml.jinja

@@ -38,43 +38,6 @@ maintenance/*.dot
 scripts/mina-local-network/genesis_ledger.json
 scripts/mina-local-network/annotated_ledger.json
 
-automation/*config.json
-automation/!bsconfig.json
-automation/*/venv/*
-automation/ec2.json
-automation/*credentials.json
-automation/token.pickle
-automation/.merlin
-automation/lib
-automation/keys/genesis/*
-automation/keys/keypairs/*
-automation/keys/keysets/*
-automation/keys/api-keys/*
-automation/keys/testnet-keys/*
-automation/keys/libp2p/*
-automation/src/*.js
-automation/node_modules/
-automation/terraform/testnets/**/keys
-
-automation/scripts/offline_fish_keys
-automation/scripts/offline_whale_keys
-automation/scripts/online_fish_keys
-automation/scripts/online_whale_keys
-automation/scripts/service_keys
-automation/scripts/genesis_ledger.json
-automation/scripts/annotated_ledger.json
-
-automation/**/__pycache__/**
-
-automation/nightly-logs
-
-automation/daemon.json
-
-automation/discord_webhook_url.txt
-automation/*-accounts.csv
-automation/gcloud-keyfile.json
-automation/services/watchdog/check_libp2p/check_libp2p
-
 *.backup
 
 *.terraform.lock.hcl
@@ -108,3 +71,5 @@ _coverage/
 # directory removed in this branch, but still existing in berkeley,
 # may appear as an untracked file occasionally
 /src/external
+
+CLAUDE.local.md

.gitattributes

@@ -29,7 +29,6 @@
 
 /src/lib/blake2/ @MinaProtocol/crypto-eng-reviewers
 /src/lib/mina_numbers/ @MinaProtocol/crypto-eng-reviewers
-/src/lib/crs/ @MinaProtocol/crypto-eng-reviewers
 /src/lib/crypto_params/ @MinaProtocol/crypto-eng-reviewers
 /src/lib/crypto @MinaProtocol/crypto-eng-reviewers
 /src/lib/dummy_values/ @MinaProtocol/crypto-eng-reviewers
@@ -40,8 +39,7 @@
 /src/lib/pickles_types/ @MinaProtocol/crypto-eng-reviewers
 /src/lib/pickles/ @MinaProtocol/crypto-eng-reviewers
 /src/lib/precomputed_values/ @MinaProtocol/crypto-eng-reviewers
-/src/lib/promise @MinaProtocol/protocol-eng-reviewers @MinaProtocol/product-eng-reviewers
-/src/lib/sha256_lib/ @MinaProtocol/crypto-eng-reviewers
+/src/lib/concurrency/promise @MinaProtocol/protocol-eng-reviewers @MinaProtocol/product-eng-reviewers
 /src/lib/signature_lib/ @MinaProtocol/crypto-eng-reviewers
 /src/lib/snarky @MinaProtocol/crypto-eng-reviewers
 /src/lib/snarky_blake2/ @MinaProtocol/crypto-eng-reviewers