@@ -36,6 +36,9 @@ const OPENBOOK_PROGRAM_ID = new PublicKey(
3636 "opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb"
3737) ;
3838
39+ const META = new PublicKey ( "METADDFL6wWMWEoKTFJwcThTbUmtarRJZjRpzUvkxhr" ) ;
40+ const PROPH3t_PUBKEY = new PublicKey ( "65U66fcYuNfqN12vzateJhZ4bgDuxFWN9gMwraeQKByg" ) ;
41+
3942const provider = anchor . AnchorProvider . env ( ) ;
4043anchor . setProvider ( provider ) ;
4144
@@ -152,26 +155,34 @@ async function initializeDAO(META: any, USDC: any) {
152155}
153156
154157async function initializeProposal ( ) {
155- const accounts = [
156- {
157- pubkey : dao ,
158- isSigner : true ,
159- isWritable : true ,
160- } ,
161- {
162- pubkey : daoTreasury ,
163- isSigner : true ,
164- isWritable : false ,
165- } ,
166- ] ;
167- const data = autocratProgram . coder . instruction . encode (
168- "set_pass_threshold_bps" ,
169- {
170- passThresholdBps : 1000 ,
171- }
158+ const senderAcc = await token . getOrCreateAssociatedTokenAccount (
159+ provider . connection ,
160+ payer ,
161+ META ,
162+ daoTreasury ,
163+ true
164+ ) ;
165+
166+ const receiverAcc = await token . getOrCreateAssociatedTokenAccount (
167+ provider . connection ,
168+ payer ,
169+ META ,
170+ PROPH3t_PUBKEY
171+ ) ;
172+
173+ const transferIx = token . createTransferInstruction (
174+ senderAcc . address ,
175+ receiverAcc . address ,
176+ daoTreasury ,
177+ 1000 * 1_000_000_000 , // 1,000 META
172178 ) ;
179+
180+ const programId = transferIx . programId ;
181+ const accounts = transferIx . keys ;
182+ const data = transferIx . data ;
183+
173184 const instruction = {
174- programId : autocratProgram . programId ,
185+ programId,
175186 accounts,
176187 data,
177188 } ;
@@ -285,13 +296,10 @@ async function initializeProposal() {
285296 } )
286297 . rpc ( ) ;
287298
288- const daoBefore = await autocratProgram . account . dao . fetch ( dao ) ;
289-
290- const dummyURL = "https://www.eff.org/cyberspace-independence" ;
291-
299+ const proposalURL = "https://hackmd.io/ammvq88QRtayu7c9VLnHOA?view" ;
292300
293301 await autocratProgram . methods
294- . initializeProposal ( dummyURL , instruction )
302+ . initializeProposal ( proposalURL , instruction )
295303 . preInstructions ( [
296304 await autocratProgram . account . proposal . createInstruction (
297305 proposalKeypair ,
@@ -612,27 +620,12 @@ import { createCreateMetadataAccountV3Instruction, PROGRAM_ID } from '@metaplex-
612620const hotWallet = new PublicKey ( "65U66fcYuNfqN12vzateJhZ4bgDuxFWN9gMwraeQKByg" )
613621
614622async function main ( ) {
615- const storedDAO = await autocratProgram . account . dao . fetch ( dao ) ;
623+ await initializeProposal ( ) ;
624+ // const storedDAO = await autocratProgram.account.dao.fetch(dao);
616625
617626 // console.log(storedDAO);
618627
619- const usdcAcc = await token . getOrCreateAssociatedTokenAccount (
620- provider . connection ,
621- payer ,
622- storedDAO . usdcMint ,
623- payer . publicKey
624- ) ;
625- let proposal = ( await autocratProgram . account . proposal . all ( ) ) [ 0 ] ;
626-
627-
628- // await mintConditionalTokens(100 * 1_000_000_000, proposal.account.baseVault);
629- // await mintConditionalTokens(1000 * 1_000_000, proposal.account.quoteVault);
630-
631- // console.log(proposal.account);
632-
633- await placeOrdersOnBothSides ( proposal . account . openbookTwapPassMarket ) ;
634-
635- // const senderMetaAcc = await token.getOrCreateAssociatedTokenAccount(
628+ // const senderMetaAcc = await token.getOrCreateAssociatedTokenAccount(
636629 // provider.connection,
637630 // payer,
638631 // storedDAO.metaMint,
0 commit comments