Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/limit orders #51

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Feature/limit orders #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
44ab98a
governance manfiest
abrzezinski94 Nov 19, 2024
9ea014c
Merge branch 'main' into feature/limit-orders
abrzezinski94 Nov 20, 2024
4fbb2bd
merge tool
abrzezinski94 Nov 27, 2024
d177ce7
limit orders
abrzezinski94 Nov 27, 2024
6d256c9
fix
abrzezinski94 Dec 1, 2024
9cae9aa
settle orders
abrzezinski94 Dec 4, 2024
4c117a0
add cancel order
abrzezinski94 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions actions/createProposal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ export const createProposal = async (
...instruction.prerequisiteInstructionsSigners
)
}
console.log(instruction.holdUpTime, '@#@#@#@#')
await withInsertTransaction(
insertInstructions,
programId,
Expand Down
2 changes: 1 addition & 1 deletion actions/executeTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const executeTransaction = async (

// Create proposal transaction
const proposalTransaction = new Transaction().add(
ComputeBudgetProgram.setComputeUnitLimit({ units: 1000000 }),
ComputeBudgetProgram.setComputeUnitLimit({ units: 2000000 }),
...instructions
)

Expand Down
9 changes: 8 additions & 1 deletion hooks/useGovernanceAssets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ export default function useGovernanceAssets() {
name: 'Mango Market v4',
image: '/img/mango.png',
},
[PackageEnum.Manifest]: {
name: 'Manifest',
},
[PackageEnum.MeanFinance]: {
name: 'Mean Finance',
image: '/img/meanfinance.png',
Expand Down Expand Up @@ -590,7 +593,11 @@ export default function useGovernanceAssets() {
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
██ ██ ███████ ██ ██ ██ ████ ██ ██ ██ ████ ██ ██ ██ ████ ██████ ███████
*/

[Instructions.PlaceLimitOrder]: {
name: 'Place limit order',
packageId: PackageEnum.Manifest,
isVisible: canUseAnyInstruction,
},
[Instructions.MeanCreateAccount]: {
name: 'Payment Stream: New account',
packageId: PackageEnum.MeanFinance,
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
},
"dependencies": {
"@blockworks-foundation/mango-mints-redemption": "0.0.11",
"@cks-systems/manifest-sdk": "0.1.72",
"@blockworks-foundation/mango-v4": "0.33.7",
"@blockworks-foundation/mango-v4-settings": "0.14.24",
"@blockworks-foundation/mangolana": "0.0.18",
Expand Down
6 changes: 5 additions & 1 deletion pages/dao/[symbol]/proposal/components/DryRunInstructionBtn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ const DryRunInstructionBtn = ({
? getInstructionDataFromBase64(instructionData?.serializedInstruction)
: null,
prerequisiteInstructionsToRun,
additionalInstructions?.map((x) => getInstructionDataFromBase64(x))
additionalInstructions?.map((x) =>
getInstructionDataFromBase64(
typeof x === 'string' ? x : x.serializedInstruction
)
)
)
setResult(result)
setIsOpen(true)
Expand Down
Loading
Loading