Skip to content

Commit aa05dd6

Browse files
fix mc
1 parent 585099c commit aa05dd6

2 files changed

Lines changed: 0 additions & 8 deletions

File tree

js/compressed-token/src/v3/instructions/update-mint.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,7 @@ function encodeUpdateMintInstructionData(
7373
leafIndex: params.leafIndex,
7474
proveByIndex: params.proveByIndex,
7575
rootIndex: params.rootIndex,
76-
<<<<<<< HEAD
77-
maxTopUp: 65535,
78-
=======
7976
maxTopUp: params.maxTopUp ?? MAX_TOP_UP,
80-
>>>>>>> 03b831af0 (fix: add delegate to packed accounts in decompress instruction, version-aware proof chunking)
8177
createMint: null,
8278
actions: [action],
8379
proof: params.proof,

js/compressed-token/src/v3/instructions/wrap.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,7 @@ export function createWrapInstruction(
7474
lamportsChangeAccountMerkleTreeIndex: 0,
7575
lamportsChangeAccountOwnerIndex: 0,
7676
outputQueue: 0,
77-
<<<<<<< HEAD
78-
maxTopUp: 65535,
79-
=======
8077
maxTopUp: maxTopUp ?? MAX_TOP_UP,
81-
>>>>>>> 03b831af0 (fix: add delegate to packed accounts in decompress instruction, version-aware proof chunking)
8278
cpiContext: null,
8379
compressions,
8480
proof: null,

0 commit comments

Comments
 (0)