feat(ENG-279): Add vault account creation to INIT-VAULT

Cargo.toml

@@ -14,15 +14,18 @@ resolver = "3"
 [workspace.dependencies]
 bindgen = "0.72.1"
 heck = "0.5"
-mollusk-svm = "0.11.0"
+mollusk-svm = "0.12.0"
+mollusk-svm-programs-token = "0.12.0"
 pinocchio = "0.10.2"
 pinocchio-token = "0.5.0"
-pinocchio-token-2022 = "0.2.0"
+# "0.2.0" does not export GetAccountDataSize.
+pinocchio-token-2022 = {git = "https://github.com/anza-xyz/pinocchio", branch = "main"}
 proc-macro2 = "1.0.106"
 quote = "1.0.45"
 solana-account = "3.2"
 solana-sbpf = "0.16.0"
 solana-sdk = "4.0.1"
+spl-token-interface = "2.0.0"
 syn = {version = "2.0.117", features = ["full"]}
 ureq = "3.3.0"
 

docs/algorithms/INIT-MARKET-PDA.tex

@@ -11,15 +11,20 @@
   \INPUT $r_{10}$ = frame
   \COMMENT{Pointer to shifted input buffer for quote mint offsets.}
   \REQUIRE frame.input\_shifted
-  \COMMENT{Pointer to System Program ID in input buffer.}
-  \REQUIRE frame.sol\_instruction.program\_id
+  \REQUIRE *frame.system\_program\_id = input.system\_program.address
+  \REQUIRE frame.cpi[0].info.data\_len = \texttt{data.LEN\_ZERO}
+  \REQUIRE frame.cpi[1].info.data\_len = \texttt{data.LEN\_ZERO}
   \ENSURE $r_9$ = acct
   \ENSURE frame.input = input
+  \ENSURE frame.lamports\_per\_byte = acct.data.lamports\_per\_byte
+  \ENSURE frame.signers\_seeds.addr = \&frame.pda\_seeds
+  \ENSURE frame.signers\_seeds.len = \texttt{RegisterMarketFrame.PDA\_SEEDS\_N\_SEEDS}
 \PROCEDURE{INIT-MARKET-PDA}{input, insn, acct, frame}
   \COMMENT{Prepare CreateAccount instruction lamports, space fields.}
   \STATE frame.create\_account\_data.space = \texttt{MarketHeader.size}
   \STATE acct\_size = \texttt{MarketHeader.size} + \texttt{account.STORAGE\_OVERHEAD}
   \STATE lamports\_per\_byte = acct.data.lamports\_per\_byte
+  \STATE frame.lamports\_per\_byte = lamports\_per\_byte
   \STATE frame.create\_account\_data.lamports = acct\_size $\times$ lamports\_per\_byte
   \COMMENT{Initialize market PDA signer seeds.}
   \STATE frame.pda\_seeds[0].addr = input.base\_mint.address
@@ -68,6 +73,7 @@
   \STATE frame.signers\_seeds.addr = \&frame.pda\_seeds
   \STATE frame.signers\_seeds.len = \texttt{RegisterMarketFrame.PDA\_SEEDS\_N\_SEEDS}
   \COMMENT{Populate SolInstruction for CreateAccount CPI.}
+  \STATE frame.sol\_instruction.program\_id = frame.system\_program\_id
   \STATE frame.sol\_instruction.accounts = \&frame.cpi.account\_metas
   \STATE frame.sol\_instruction.account\_len =
     \texttt{register\_misc.CREATE\_ACCOUNT\_N\_ACCOUNTS}

docs/algorithms/INIT-VAULT.tex

@@ -13,11 +13,23 @@
     \texttt{true},
     \texttt{false}
   \}
-  \COMMENT{Pointer to owning token program address.}
+  \REQUIRE *frame.mint $\in$ \{
+    input.base\_mint,
+    input\_shifted.quote\_mint
+  \}
   \REQUIRE frame.token\_program\_id
-  \COMMENT{Pointer to input buffer.}
+  \REQUIRE frame.program\_id
   \REQUIRE frame.input
+  \REQUIRE frame.lamports\_per\_byte
   \REQUIRE frame.pda\_seeds[0].len = \texttt{Address.size}
+  \REQUIRE frame.pda\_seeds[2].addr = \&frame.bump
+  \REQUIRE frame.pda\_seeds[2].len = \texttt{u8.size}
+  \REQUIRE *frame.system\_program\_id = input.system\_program.address
+  \REQUIRE frame.signers\_seeds.addr = \&frame.pda\_seeds
+  \REQUIRE frame.signers\_seeds.len = \texttt{RegisterMarketFrame.PDA\_SEEDS\_N\_SEEDS}
+  \REQUIRE input.user.data\_len = \texttt{data.LEN\_ZERO}
+  \REQUIRE acct.data\_len = \texttt{data.LEN\_ZERO}
+  \REQUIRE frame.cpi[0].info.executable = \texttt{false}
 \FUNCTION{INIT-VAULT}{acct, frame}
   \STATE \CALL{Store}{frame}
   \STATE \CALL{Store}{acct}
@@ -27,7 +39,7 @@
   \STATE frame.pda\_seeds[1].len = \texttt{u8.size}
   \STATE syscall.seeds = \&frame.pda\_seeds
   \STATE syscall.seeds\_len = \texttt{register\_misc.TRY\_FIND\_VAULT\_PDA\_SEEDS\_LEN}
-  \STATE syscall.program\_id = frame.token\_program\_id
+  \STATE syscall.program\_id = frame.program\_id
   \STATE syscall.program\_address = \&frame.pda
   \STATE syscall.bump\_seed = \&frame.bump
   \STATE \CALL{sol-try-find-program-address}{}
@@ -39,6 +51,89 @@
       \RETURN \texttt{ErrorCode::InvalidQuoteVaultPubkey}
     \ENDIF
   \ENDIF
+  \COMMENT{Determine token account size.}
+  \IF{frame.token\_program\_is\_2022}
+    \COMMENT{Set up mint as CPI account.}
+    \STATE frame.cpi[0].info.is\_signer = \texttt{false}
+    \STATE frame.cpi[0].info.is\_writable = \texttt{false}
+    \STATE frame.cpi[0].meta.is\_signer = \texttt{false}
+    \STATE frame.cpi[0].meta.is\_writable = \texttt{false}
+    \STATE frame.cpi[0].meta.pubkey = \&mint.address
+    \STATE frame.cpi[0].info.key = \&mint.address
+    \STATE frame.cpi[0].info.owner = \&mint.owner
+    \STATE frame.cpi[0].info.lamports = \&mint.lamports
+    \STATE frame.cpi[0].info.data\_len = mint.data\_len
+    \STATE frame.cpi[0].info.data = \&mint.data
+    \COMMENT{Populate SolInstruction for GetAccountDataSize CPI.}
+    \STATE frame.sol\_instruction.program\_id = frame.token\_program\_id
+    \STATE frame.sol\_instruction.accounts = \&frame.cpi[0].meta
+    \STATE frame.sol\_instruction.account\_len =
+      \texttt{token.GET\_ACCOUNT\_DATA\_SIZE\_N\_ACCOUNTS}
+    \STATE frame.get\_account\_data\_size\_data =
+      \texttt{token.GET\_ACCOUNT\_DATA\_SIZE\_DISC}
+    \STATE frame.sol\_instruction.data = \&frame.get\_account\_data\_size\_data
+    \STATE frame.sol\_instruction.data\_len = \texttt{u8.size}
+    \COMMENT{Invoke GetAccountDataSize CPI (no signers).}
+    \STATE syscall.instruction = \&frame.sol\_instruction
+    \STATE syscall.account\_infos = \&frame.cpi[0].info
+    \STATE syscall.account\_infos\_len =
+      \texttt{token.GET\_ACCOUNT\_DATA\_SIZE\_N\_ACCOUNTS}
+    \STATE syscall.seeds\_len = \texttt{token.GET\_ACCOUNT\_DATA\_SIZE\_N\_SEEDS}
+    \STATE \CALL{sol-invoke-signed-c}{}
+    \COMMENT{Get return data.}
+    \STATE syscall.bytes = \&frame.token\_account\_data\_size
+    \STATE syscall.bytes\_len = \texttt{u64.size}
+    \STATE syscall.program\_id = \&frame.get\_return\_data\_program\_id
+    \STATE \CALL{sol-get-return-data}{}
+    \STATE acct\_size = frame.token\_account\_data\_size
+    \COMMENT{Override default return data nonzero return code.}
+    \STATE result = \texttt{entrypoint.RETURN\_SUCCESS}
+  \ELSE
+    \STATE acct\_size = \texttt{token.ACCOUNT\_SIZE}
+  \ENDIF
+  \COMMENT{Prepare CreateAccount instruction fields.}
+  \STATE frame.create\_account\_data.space = acct\_size
+  \STATE acct\_size = acct\_size + \texttt{account.STORAGE\_OVERHEAD}
+  \STATE frame.create\_account\_data.lamports =
+    acct\_size $\times$ frame.lamports\_per\_byte
+  \STATE frame.create\_account\_data.owner = frame.token\_program\_id
+  \COMMENT{Assign CPI account fields via immediates.}
+  \STATE frame.cpi[0].info.is\_signer = \texttt{true}
+  \STATE frame.cpi[0].info.is\_writable = \texttt{true}
+  \STATE frame.cpi[0].meta.is\_signer = \texttt{true}
+  \STATE frame.cpi[0].meta.is\_writable = \texttt{true}
+  \STATE frame.cpi[1].info.is\_signer = \texttt{true}
+  \STATE frame.cpi[1].info.is\_writable = \texttt{true}
+  \STATE frame.cpi[1].meta.is\_signer = \texttt{true}
+  \STATE frame.cpi[1].meta.is\_writable = \texttt{true}
+  \STATE frame.cpi[0].info.data\_len = \texttt{data.LEN\_ZERO}
+  \STATE frame.cpi[1].info.data\_len = \texttt{data.LEN\_ZERO}
+  \COMMENT{Assign CPI account fields via pointers.}
+  \STATE frame.cpi[0].meta.pubkey = \&input.user.address
+  \STATE frame.cpi[0].info.key = \&input.user.address
+  \STATE frame.cpi[0].info.owner = \&input.user.owner
+  \STATE frame.cpi[0].info.lamports = \&input.user.lamports
+  \STATE frame.cpi[0].info.data = \&input.user.data
+  \STATE frame.cpi[1].meta.pubkey = \&acct.address
+  \STATE frame.cpi[1].info.key = \&acct.address
+  \STATE frame.cpi[1].info.owner = \&acct.owner
+  \STATE frame.cpi[1].info.lamports = \&acct.lamports
+  \STATE frame.cpi[1].info.data = \&acct.data
+  \COMMENT{Populate SolInstruction for CreateAccount CPI.}
+  \STATE frame.sol\_instruction.program\_id = frame.system\_program\_id
+  \STATE frame.sol\_instruction.accounts = \&frame.cpi.account\_metas
+  \STATE frame.sol\_instruction.account\_len =
+    \texttt{register\_misc.CREATE\_ACCOUNT\_N\_ACCOUNTS}
+  \STATE frame.sol\_instruction.data = \&frame.create\_account\_data
+  \STATE frame.sol\_instruction.data\_len = \texttt{CreateAccountData.size}
+  \COMMENT{Invoke CreateAccount CPI.}
+  \STATE syscall.instruction = \&frame.sol\_instruction
+  \STATE syscall.account\_infos = \&frame.cpi.account\_infos
+  \STATE syscall.account\_infos\_len =
+    \texttt{register\_misc.CREATE\_ACCOUNT\_N\_ACCOUNTS}
+  \STATE syscall.seeds = \&frame.signers\_seeds
+  \STATE syscall.seeds\_len = \texttt{register\_misc.N\_PDA\_SIGNERS}
+  \STATE \CALL{sol-invoke-signed-c}{}
 \ENDFUNCTION
 \end{algorithmic}
 \end{algorithm}