From d33ae59fbf9ddb5c204ab763117ba566c6a2604a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 6 Nov 2020 00:01:31 +0000
Subject: [PATCH] SPL Associated Token Account plumbing (bp #13398) (#13430)

* Fetch associated-program-account

(cherry picked from commit 4d553f48799b03960e121ecbd0e301fb82c83348)

* Add SPL Associated Token Account Program label to explorer

(cherry picked from commit 2d24160376fe5a4067c724a3d0ae5a8b879a221b)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 explorer/src/utils/tx.ts | 2 ++
 fetch-spl.sh             | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/explorer/src/utils/tx.ts b/explorer/src/utils/tx.ts
index 55a7a5f46e..3296fd3678 100644
--- a/explorer/src/utils/tx.ts
+++ b/explorer/src/utils/tx.ts
@@ -34,6 +34,8 @@ export const PROGRAM_IDS = {
   Vest111111111111111111111111111111111111111: "Vest Program",
   [VOTE_PROGRAM_ID.toBase58()]: "Vote Program",
   TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: "SPL Token Program",
+  ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL:
+    "SPL Associated Token Account Program",
 } as const;
 
 export type LoaderName = typeof LOADER_IDS[keyof typeof LOADER_IDS];
diff --git a/fetch-spl.sh b/fetch-spl.sh
index 846edadb29..afcdc6e642 100755
--- a/fetch-spl.sh
+++ b/fetch-spl.sh
@@ -24,11 +24,12 @@ fetch_program() {
     cp ~/.cache/solana-spl/"$so" "$so"
   else
     echo "Downloading $name $version"
+    so_name="spl_${name//-/_}.so"
     (
       set -x
       curl -L --retry 5 --retry-delay 2 --retry-connrefused \
         -o "$so" \
-        "https://github.com/solana-labs/solana-program-library/releases/download/$name-v$version/spl_$name.so"
+        "https://github.com/solana-labs/solana-program-library/releases/download/$name-v$version/$so_name"
     )
 
     mkdir -p ~/.cache/solana-spl
@@ -37,8 +38,9 @@ fetch_program() {
 
 }
 
-fetch_program token 2.0.3 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader1111111111111111111111111111111111
+fetch_program token 2.0.3 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
 fetch_program memo  1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111
+fetch_program associated-token-account 1.0.1 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
 
 echo "${genesis_args[@]}" > spl-genesis-args.sh