Browse Source

Load memo v2 into genesis for test validator (#15425)

* Load memo v2 into genesis for test validator

* feedback

* versions

* remove .so

* add .so
Justin Starry 4 years ago
parent
commit
7b67a6d208

+ 3 - 0
explorer/src/utils/tx.ts

@@ -34,6 +34,7 @@ export enum PROGRAM_NAMES {
   SPL_TOKEN = "SPL Token Program",
   SPL_TOKEN = "SPL Token Program",
   ASSOCIATED_TOKEN = "SPL Associated Token Program",
   ASSOCIATED_TOKEN = "SPL Associated Token Program",
   MEMO = "Memo Program",
   MEMO = "Memo Program",
+  MEMO_2 = "Memo Program 2",
   SWAP = "Swap Program",
   SWAP = "Swap Program",
   LENDING = "Lending Program",
   LENDING = "Lending Program",
 }
 }
@@ -51,6 +52,7 @@ export const SEARCHABLE_PROGRAMS: ProgramName[] = [
   PROGRAM_NAMES.SPL_TOKEN,
   PROGRAM_NAMES.SPL_TOKEN,
   PROGRAM_NAMES.ASSOCIATED_TOKEN,
   PROGRAM_NAMES.ASSOCIATED_TOKEN,
   PROGRAM_NAMES.MEMO,
   PROGRAM_NAMES.MEMO,
+  PROGRAM_NAMES.MEMO_2,
   PROGRAM_NAMES.SWAP,
   PROGRAM_NAMES.SWAP,
   PROGRAM_NAMES.LENDING,
   PROGRAM_NAMES.LENDING,
 ];
 ];
@@ -68,6 +70,7 @@ export const PROGRAM_NAME_BY_ID = {
   TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: PROGRAM_NAMES.SPL_TOKEN,
   TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: PROGRAM_NAMES.SPL_TOKEN,
   ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL: PROGRAM_NAMES.ASSOCIATED_TOKEN,
   ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL: PROGRAM_NAMES.ASSOCIATED_TOKEN,
   Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo: PROGRAM_NAMES.MEMO,
   Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo: PROGRAM_NAMES.MEMO,
+  MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr: PROGRAM_NAMES.MEMO_2,
   SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8: PROGRAM_NAMES.SWAP,
   SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8: PROGRAM_NAMES.SWAP,
   LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi: PROGRAM_NAMES.LENDING,
   LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi: PROGRAM_NAMES.LENDING,
 } as const;
 } as const;

+ 1 - 0
fetch-spl.sh

@@ -40,6 +40,7 @@ fetch_program() {
 
 
 fetch_program token 3.1.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
 fetch_program token 3.1.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
 fetch_program memo  1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111
 fetch_program memo  1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111
+fetch_program memo  3.0.0 MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr BPFLoader2111111111111111111111111111111111
 fetch_program associated-token-account 1.0.1 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
 fetch_program associated-token-account 1.0.1 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
 fetch_program feature-proposal 1.0.0 Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse BPFLoader2111111111111111111111111111111111
 fetch_program feature-proposal 1.0.0 Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse BPFLoader2111111111111111111111111111111111
 
 

+ 12 - 2
program-test/src/programs.rs

@@ -3,16 +3,26 @@ use solana_sdk::{account::Account, pubkey::Pubkey, rent::Rent};
 mod spl_token {
 mod spl_token {
     solana_sdk::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
     solana_sdk::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
 }
 }
-mod spl_memo {
+mod spl_memo_1_0 {
     solana_sdk::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
     solana_sdk::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
 }
 }
+mod spl_memo_3_0 {
+    solana_sdk::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
+}
 mod spl_associated_token_account {
 mod spl_associated_token_account {
     solana_sdk::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
     solana_sdk::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
 }
 }
 
 
 static SPL_PROGRAMS: &[(Pubkey, &[u8])] = &[
 static SPL_PROGRAMS: &[(Pubkey, &[u8])] = &[
     (spl_token::ID, include_bytes!("programs/spl_token-3.1.0.so")),
     (spl_token::ID, include_bytes!("programs/spl_token-3.1.0.so")),
-    (spl_memo::ID, include_bytes!("programs/spl_memo-1.0.0.so")),
+    (
+        spl_memo_1_0::ID,
+        include_bytes!("programs/spl_memo-1.0.0.so"),
+    ),
+    (
+        spl_memo_3_0::ID,
+        include_bytes!("programs/spl_memo-3.0.0.so"),
+    ),
     (
     (
         spl_associated_token_account::ID,
         spl_associated_token_account::ID,
         include_bytes!("programs/spl_associated-token-account-1.0.1.so"),
         include_bytes!("programs/spl_associated-token-account-1.0.1.so"),

BIN
program-test/src/programs/spl_memo-3.0.0.so