Skip to content

Commit 4a09180

Browse files
snawazsnawaz
committed
feat: Execute CommitDiff as BufferTask
1 parent 4ea5450 commit 4a09180

File tree

8 files changed

+108
-66
lines changed

8 files changed

+108
-66
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ magicblock-config-helpers = { path = "./magicblock-config-helpers" }
109109
magicblock-config-macro = { path = "./magicblock-config-macro" }
110110
magicblock-core = { path = "./magicblock-core" }
111111
magicblock-aperture = { path = "./magicblock-aperture" }
112-
magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "e8d03936", features = [
113-
"no-entrypoint",
112+
magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "ea1f2f916268132248fe8d5de5f07d76765dd937", features = [
113+
"no-entrypoint",
114114
] }
115115
magicblock-geyser-plugin = { path = "./magicblock-geyser-plugin" }
116116
magicblock-ledger = { path = "./magicblock-ledger" }

‎magicblock-committor-service/src/tasks/args_task.rs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,9 @@ impl BaseTask for ArgsTask {
8888
self: Box<Self>,
8989
) -> Result<Box<dyn BaseTask>, Box<dyn BaseTask>> {
9090
match self.task_type {
91-
ArgsTaskType::Commit(mut value) if value.is_commit_diff() => {
92-
// TODO (snawaz): Currently, we do not support executing CommitDiff
93-
// as BufferTask, which is why we're forcing CommitTask to use CommitState
94-
// before converting this task into BufferTask Once CommitDiff is supported
95-
// by BufferTask, we do not have to force_commit_state and we can remove
96-
// force_commit_state stuff, as it's essentially a downgrade.
97-
98-
value.force_commit_state();
99-
Ok(Box::new(BufferTask::new_preparation_required(
100-
BufferTaskType::Commit(value),
101-
)))
102-
}
10391
ArgsTaskType::Commit(value) => {
10492
Ok(Box::new(BufferTask::new_preparation_required(
105-
BufferTaskType::Commit(value),
93+
BufferTaskType::Commit(value.switch_to_buffer_strategy()),
10694
)))
10795
}
10896
ArgsTaskType::BaseAction(_)

‎magicblock-committor-service/src/tasks/buffer_task.rs‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use dlp::args::CommitStateFromBufferArgs;
21
use magicblock_committor_program::Chunks;
32
use solana_pubkey::Pubkey;
43
use solana_sdk::instruction::Instruction;
@@ -46,16 +45,18 @@ impl BufferTask {
4645

4746
fn preparation_required(task_type: &BufferTaskType) -> PreparationState {
4847
let BufferTaskType::Commit(ref commit_task) = task_type;
49-
let committed_data = commit_task.committed_account.account.data.clone();
50-
let chunks = Chunks::from_data_length(
51-
committed_data.len(),
52-
MAX_WRITE_CHUNK_SIZE,
53-
);
48+
let state_or_diff = if let Some(diff) = commit_task.compute_diff() {
49+
diff.to_vec()
50+
} else {
51+
commit_task.committed_account.account.data.clone()
52+
};
53+
let chunks =
54+
Chunks::from_data_length(state_or_diff.len(), MAX_WRITE_CHUNK_SIZE);
5455

5556
PreparationState::Required(PreparationTask {
5657
commit_id: commit_task.commit_id,
5758
pubkey: commit_task.committed_account.pubkey,
58-
committed_data,
59+
committed_data: state_or_diff,
5960
chunks,
6061
})
6162
}
@@ -64,31 +65,15 @@ impl BufferTask {
6465
impl BaseTask for BufferTask {
6566
fn instruction(&self, validator: &Pubkey) -> Instruction {
6667
let BufferTaskType::Commit(ref value) = self.task_type;
67-
let commit_id_slice = value.commit_id.to_le_bytes();
68-
let (commit_buffer_pubkey, _) =
69-
magicblock_committor_program::pdas::buffer_pda(
70-
validator,
71-
&value.committed_account.pubkey,
72-
&commit_id_slice,
73-
);
74-
75-
dlp::instruction_builder::commit_state_from_buffer(
76-
*validator,
77-
value.committed_account.pubkey,
78-
value.committed_account.account.owner,
79-
commit_buffer_pubkey,
80-
CommitStateFromBufferArgs {
81-
nonce: value.commit_id,
82-
lamports: value.committed_account.account.lamports,
83-
allow_undelegation: value.allow_undelegation,
84-
},
85-
)
68+
value.create_commit_ix(validator)
8669
}
8770

8871
/// No further optimizations
8972
fn optimize(
9073
self: Box<Self>,
9174
) -> Result<Box<dyn BaseTask>, Box<dyn BaseTask>> {
75+
// Since the buffer in BufferTask doesn't contribute to the size of
76+
// transaction, there is nothing we can do here to optimize/reduce the size.
9277
Err(self)
9378
}
9479

‎magicblock-committor-service/src/tasks/mod.rs‎

Lines changed: 88 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use dlp::{
2-
args::{CommitDiffArgs, CommitStateArgs},
2+
args::{CommitDiffArgs, CommitStateArgs, CommitStateFromBufferArgs},
33
compute_diff,
44
};
55
use dyn_clone::DynClone;
@@ -51,7 +51,6 @@ pub enum PreparationState {
5151
Cleanup(CleanupTask),
5252
}
5353

54-
#[cfg(test)]
5554
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
5655
pub enum TaskStrategy {
5756
Args,
@@ -114,7 +113,7 @@ pub struct CommitTask {
114113
pub allow_undelegation: bool,
115114
pub committed_account: CommittedAccount,
116115
base_account: Option<Account>,
117-
force_commit_state: bool,
116+
strategy: TaskStrategy,
118117
}
119118

120119
impl CommitTask {
@@ -151,29 +150,52 @@ impl CommitTask {
151150
allow_undelegation,
152151
committed_account,
153152
base_account,
154-
force_commit_state: false,
153+
strategy: TaskStrategy::Args,
155154
}
156155
}
157156

158157
pub fn is_commit_diff(&self) -> bool {
159-
!self.force_commit_state
160-
&& self.committed_account.account.data.len()
161-
> CommitTask::COMMIT_STATE_SIZE_THRESHOLD
158+
self.committed_account.account.data.len()
159+
> CommitTask::COMMIT_STATE_SIZE_THRESHOLD
162160
&& self.base_account.is_some()
163161
}
164162

165-
pub fn force_commit_state(&mut self) {
166-
self.force_commit_state = true;
163+
pub fn switch_to_buffer_strategy(mut self) -> Self {
164+
self.strategy = TaskStrategy::Buffer;
165+
self
167166
}
168167

169168
pub fn create_commit_ix(&self, validator: &Pubkey) -> Instruction {
170-
if let Some(fetched_account) = self.base_account.as_ref() {
171-
self.create_commit_diff_ix(validator, fetched_account)
172-
} else {
173-
self.create_commit_state_ix(validator)
169+
match self.strategy {
170+
TaskStrategy::Args => {
171+
if let Some(base_account) = self.base_account.as_ref() {
172+
self.create_commit_diff_ix(validator, base_account)
173+
} else {
174+
self.create_commit_state_ix(validator)
175+
}
176+
}
177+
TaskStrategy::Buffer => {
178+
if let Some(base_account) = self.base_account.as_ref() {
179+
self.create_commit_diff_from_buffer_ix(
180+
validator,
181+
base_account,
182+
)
183+
} else {
184+
self.create_commit_state_from_buffer_ix(validator)
185+
}
186+
}
174187
}
175188
}
176189

190+
pub fn compute_diff(&self) -> Option<dlp::rkyv::AlignedVec> {
191+
self.base_account.as_ref().map(|base_account| {
192+
compute_diff(
193+
base_account.data(),
194+
self.committed_account.account.data(),
195+
)
196+
})
197+
}
198+
177199
fn create_commit_state_ix(&self, validator: &Pubkey) -> Instruction {
178200
let args = CommitStateArgs {
179201
nonce: self.commit_id,
@@ -192,17 +214,13 @@ impl CommitTask {
192214
fn create_commit_diff_ix(
193215
&self,
194216
validator: &Pubkey,
195-
fetched_account: &Account,
217+
base_account: &Account,
196218
) -> Instruction {
197-
if self.force_commit_state {
198-
return self.create_commit_state_ix(validator);
199-
}
200-
201219
let args = CommitDiffArgs {
202220
nonce: self.commit_id,
203221
lamports: self.committed_account.account.lamports,
204222
diff: compute_diff(
205-
fetched_account.data(),
223+
base_account.data(),
206224
self.committed_account.account.data(),
207225
)
208226
.to_vec(),
@@ -216,6 +234,57 @@ impl CommitTask {
216234
args,
217235
)
218236
}
237+
238+
fn create_commit_state_from_buffer_ix(
239+
&self,
240+
validator: &Pubkey,
241+
) -> Instruction {
242+
let commit_id_slice = self.commit_id.to_le_bytes();
243+
let (commit_buffer_pubkey, _) =
244+
magicblock_committor_program::pdas::buffer_pda(
245+
validator,
246+
&self.committed_account.pubkey,
247+
&commit_id_slice,
248+
);
249+
250+
dlp::instruction_builder::commit_state_from_buffer(
251+
*validator,
252+
self.committed_account.pubkey,
253+
self.committed_account.account.owner,
254+
commit_buffer_pubkey,
255+
CommitStateFromBufferArgs {
256+
nonce: self.commit_id,
257+
lamports: self.committed_account.account.lamports,
258+
allow_undelegation: self.allow_undelegation,
259+
},
260+
)
261+
}
262+
263+
fn create_commit_diff_from_buffer_ix(
264+
&self,
265+
validator: &Pubkey,
266+
_fetched_account: &Account,
267+
) -> Instruction {
268+
let commit_id_slice = self.commit_id.to_le_bytes();
269+
let (commit_buffer_pubkey, _) =
270+
magicblock_committor_program::pdas::buffer_pda(
271+
validator,
272+
&self.committed_account.pubkey,
273+
&commit_id_slice,
274+
);
275+
276+
dlp::instruction_builder::commit_diff_from_buffer(
277+
*validator,
278+
self.committed_account.pubkey,
279+
self.committed_account.account.owner,
280+
commit_buffer_pubkey,
281+
CommitStateFromBufferArgs {
282+
nonce: self.commit_id,
283+
lamports: self.committed_account.account.lamports,
284+
allow_undelegation: self.allow_undelegation,
285+
},
286+
)
287+
}
219288
}
220289

221290
#[derive(Clone)]

‎test-integration/Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test-integration/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ magicblock-config = { path = "../magicblock-config" }
5757
magicblock-core = { path = "../magicblock-core" }
5858
magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "ea04d46", default-features = false }
5959
magicblock_magic_program_api = { package = "magicblock-magic-program-api", path = "../magicblock-magic-program-api" }
60-
magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "e8d03936", features = [
61-
"no-entrypoint",
60+
magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "ea1f2f916268132248fe8d5de5f07d76765dd937", features = [
61+
"no-entrypoint",
6262
] }
6363
magicblock-program = { path = "../programs/magicblock" }
6464
magicblock-rpc-client = { path = "../magicblock-rpc-client" }

‎test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,13 @@ fn test_committing_and_undelegating_huge_order_book_account() {
253253
println!("Important: use {rng_seed} as seed to regenerate the random inputs in case of test failure");
254254
let mut random = StdRng::seed_from_u64(rng_seed);
255255
let mut update = BookUpdate::default();
256-
update.bids.extend((0..random.gen_range(5..10)).map(|_| {
256+
update.bids.extend((0..random.gen_range(5..100)).map(|_| {
257257
OrderLevel {
258258
price: random.gen_range(75000..90000),
259259
size: random.gen_range(1..10),
260260
}
261261
}));
262-
update.asks.extend((0..random.gen_range(5..10)).map(|_| {
262+
update.asks.extend((0..random.gen_range(5..100)).map(|_| {
263263
OrderLevel {
264264
price: random.gen_range(125000..150000),
265265
size: random.gen_range(1..10),

0 commit comments

Comments
 (0)