Skip to content

Patch the instruction discriminant to be 4 bytes #5

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Patch the instruction discriminant to be 4 bytes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions clients/js/src/generated/instructions/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
combineCodec,
getStructDecoder,
getStructEncoder,
getU8Decoder,
getU8Encoder,
getU32Decoder,
getU32Encoder,
transformEncoder,
type Address,
type Codec,
Expand All @@ -32,7 +32,7 @@ import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
export const DEPLOY_DISCRIMINATOR = 2;

export function getDeployDiscriminatorBytes() {
return getU8Encoder().encode(DEPLOY_DISCRIMINATOR);
return getU32Encoder().encode(DEPLOY_DISCRIMINATOR);
}

export type DeployInstruction<
Expand Down Expand Up @@ -65,13 +65,13 @@ export type DeployInstructionDataArgs = {};

export function getDeployInstructionDataEncoder(): Encoder<DeployInstructionDataArgs> {
return transformEncoder(
getStructEncoder([['discriminator', getU8Encoder()]]),
getStructEncoder([['discriminator', getU32Encoder()]]),
(value) => ({ ...value, discriminator: DEPLOY_DISCRIMINATOR })
);
}

export function getDeployInstructionDataDecoder(): Decoder<DeployInstructionData> {
return getStructDecoder([['discriminator', getU8Decoder()]]);
return getStructDecoder([['discriminator', getU32Decoder()]]);
}

export function getDeployInstructionDataCodec(): Codec<
Expand Down
10 changes: 5 additions & 5 deletions clients/js/src/generated/instructions/finalize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
combineCodec,
getStructDecoder,
getStructEncoder,
getU8Decoder,
getU8Encoder,
getU32Decoder,
getU32Encoder,
transformEncoder,
type Address,
type Codec,
Expand All @@ -33,7 +33,7 @@ import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
export const FINALIZE_DISCRIMINATOR = 5;

export function getFinalizeDiscriminatorBytes() {
return getU8Encoder().encode(FINALIZE_DISCRIMINATOR);
return getU32Encoder().encode(FINALIZE_DISCRIMINATOR);
}

export type FinalizeInstruction<
Expand Down Expand Up @@ -66,13 +66,13 @@ export type FinalizeInstructionDataArgs = {};

export function getFinalizeInstructionDataEncoder(): Encoder<FinalizeInstructionDataArgs> {
return transformEncoder(
getStructEncoder([['discriminator', getU8Encoder()]]),
getStructEncoder([['discriminator', getU32Encoder()]]),
(value) => ({ ...value, discriminator: FINALIZE_DISCRIMINATOR })
);
}

export function getFinalizeInstructionDataDecoder(): Decoder<FinalizeInstructionData> {
return getStructDecoder([['discriminator', getU8Decoder()]]);
return getStructDecoder([['discriminator', getU32Decoder()]]);
}

export function getFinalizeInstructionDataCodec(): Codec<
Expand Down
10 changes: 5 additions & 5 deletions clients/js/src/generated/instructions/retract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
combineCodec,
getStructDecoder,
getStructEncoder,
getU8Decoder,
getU8Encoder,
getU32Decoder,
getU32Encoder,
transformEncoder,
type Address,
type Codec,
Expand All @@ -32,7 +32,7 @@ import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
export const RETRACT_DISCRIMINATOR = 3;

export function getRetractDiscriminatorBytes() {
return getU8Encoder().encode(RETRACT_DISCRIMINATOR);
return getU32Encoder().encode(RETRACT_DISCRIMINATOR);
}

export type RetractInstruction<
Expand Down Expand Up @@ -61,13 +61,13 @@ export type RetractInstructionDataArgs = {};

export function getRetractInstructionDataEncoder(): Encoder<RetractInstructionDataArgs> {
return transformEncoder(
getStructEncoder([['discriminator', getU8Encoder()]]),
getStructEncoder([['discriminator', getU32Encoder()]]),
(value) => ({ ...value, discriminator: RETRACT_DISCRIMINATOR })
);
}

export function getRetractInstructionDataDecoder(): Decoder<RetractInstructionData> {
return getStructDecoder([['discriminator', getU8Decoder()]]);
return getStructDecoder([['discriminator', getU32Decoder()]]);
}

export function getRetractInstructionDataCodec(): Codec<
Expand Down
10 changes: 5 additions & 5 deletions clients/js/src/generated/instructions/transferAuthority.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
combineCodec,
getStructDecoder,
getStructEncoder,
getU8Decoder,
getU8Encoder,
getU32Decoder,
getU32Encoder,
transformEncoder,
type Address,
type Codec,
Expand All @@ -32,7 +32,7 @@ import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
export const TRANSFER_AUTHORITY_DISCRIMINATOR = 4;

export function getTransferAuthorityDiscriminatorBytes() {
return getU8Encoder().encode(TRANSFER_AUTHORITY_DISCRIMINATOR);
return getU32Encoder().encode(TRANSFER_AUTHORITY_DISCRIMINATOR);
}

export type TransferAuthorityInstruction<
Expand Down Expand Up @@ -66,13 +66,13 @@ export type TransferAuthorityInstructionDataArgs = {};

export function getTransferAuthorityInstructionDataEncoder(): Encoder<TransferAuthorityInstructionDataArgs> {
return transformEncoder(
getStructEncoder([['discriminator', getU8Encoder()]]),
getStructEncoder([['discriminator', getU32Encoder()]]),
(value) => ({ ...value, discriminator: TRANSFER_AUTHORITY_DISCRIMINATOR })
);
}

export function getTransferAuthorityInstructionDataDecoder(): Decoder<TransferAuthorityInstructionData> {
return getStructDecoder([['discriminator', getU8Decoder()]]);
return getStructDecoder([['discriminator', getU32Decoder()]]);
}

export function getTransferAuthorityInstructionDataCodec(): Codec<
Expand Down
8 changes: 3 additions & 5 deletions clients/js/src/generated/instructions/truncate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import {
getStructEncoder,
getU32Decoder,
getU32Encoder,
getU8Decoder,
getU8Encoder,
transformEncoder,
type Address,
type Codec,
Expand All @@ -35,7 +33,7 @@ import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
export const TRUNCATE_DISCRIMINATOR = 1;

export function getTruncateDiscriminatorBytes() {
return getU8Encoder().encode(TRUNCATE_DISCRIMINATOR);
return getU32Encoder().encode(TRUNCATE_DISCRIMINATOR);
}

export type TruncateInstruction<
Expand Down Expand Up @@ -73,7 +71,7 @@ export type TruncateInstructionDataArgs = { newSize: number };
export function getTruncateInstructionDataEncoder(): Encoder<TruncateInstructionDataArgs> {
return transformEncoder(
getStructEncoder([
['discriminator', getU8Encoder()],
['discriminator', getU32Encoder()],
['newSize', getU32Encoder()],
]),
(value) => ({ ...value, discriminator: TRUNCATE_DISCRIMINATOR })
Expand All @@ -82,7 +80,7 @@ export function getTruncateInstructionDataEncoder(): Encoder<TruncateInstruction

export function getTruncateInstructionDataDecoder(): Decoder<TruncateInstructionData> {
return getStructDecoder([
['discriminator', getU8Decoder()],
['discriminator', getU32Decoder()],
['newSize', getU32Decoder()],
]);
}
Expand Down
8 changes: 3 additions & 5 deletions clients/js/src/generated/instructions/write.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import {
getStructEncoder,
getU32Decoder,
getU32Encoder,
getU8Decoder,
getU8Encoder,
transformEncoder,
type Address,
type Codec,
Expand All @@ -39,7 +37,7 @@ import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
export const WRITE_DISCRIMINATOR = 0;

export function getWriteDiscriminatorBytes() {
return getU8Encoder().encode(WRITE_DISCRIMINATOR);
return getU32Encoder().encode(WRITE_DISCRIMINATOR);
}

export type WriteInstruction<
Expand Down Expand Up @@ -76,7 +74,7 @@ export type WriteInstructionDataArgs = {
export function getWriteInstructionDataEncoder(): Encoder<WriteInstructionDataArgs> {
return transformEncoder(
getStructEncoder([
['discriminator', getU8Encoder()],
['discriminator', getU32Encoder()],
['offset', getU32Encoder()],
['bytes', addEncoderSizePrefix(getBytesEncoder(), getU32Encoder())],
]),
Expand All @@ -86,7 +84,7 @@ export function getWriteInstructionDataEncoder(): Encoder<WriteInstructionDataAr

export function getWriteInstructionDataDecoder(): Decoder<WriteInstructionData> {
return getStructDecoder([
['discriminator', getU8Decoder()],
['discriminator', getU32Decoder()],
['offset', getU32Decoder()],
['bytes', addDecoderSizePrefix(getBytesDecoder(), getU32Decoder())],
]);
Expand Down
14 changes: 7 additions & 7 deletions clients/js/src/generated/programs/loaderV4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import {
containsBytes,
getU8Encoder,
getU32Encoder,
type Address,
type ReadonlyUint8Array,
} from '@solana/web3.js';
Expand Down Expand Up @@ -37,22 +37,22 @@ export function identifyLoaderV4Instruction(
instruction: { data: ReadonlyUint8Array } | ReadonlyUint8Array
): LoaderV4Instruction {
const data = 'data' in instruction ? instruction.data : instruction;
if (containsBytes(data, getU8Encoder().encode(0), 0)) {
if (containsBytes(data, getU32Encoder().encode(0), 0)) {
return LoaderV4Instruction.Write;
}
if (containsBytes(data, getU8Encoder().encode(1), 0)) {
if (containsBytes(data, getU32Encoder().encode(1), 0)) {
return LoaderV4Instruction.Truncate;
}
if (containsBytes(data, getU8Encoder().encode(2), 0)) {
if (containsBytes(data, getU32Encoder().encode(2), 0)) {
return LoaderV4Instruction.Deploy;
}
if (containsBytes(data, getU8Encoder().encode(3), 0)) {
if (containsBytes(data, getU32Encoder().encode(3), 0)) {
return LoaderV4Instruction.Retract;
}
if (containsBytes(data, getU8Encoder().encode(4), 0)) {
if (containsBytes(data, getU32Encoder().encode(4), 0)) {
return LoaderV4Instruction.TransferAuthority;
}
if (containsBytes(data, getU8Encoder().encode(5), 0)) {
if (containsBytes(data, getU32Encoder().encode(5), 0)) {
return LoaderV4Instruction.Finalize;
}
throw new Error(
Expand Down
2 changes: 1 addition & 1 deletion clients/rust/src/generated/instructions/deploy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl Deploy {

#[derive(BorshDeserialize, BorshSerialize)]
pub struct DeployInstructionData {
discriminator: u8,
discriminator: u32,
}

impl DeployInstructionData {
Expand Down
2 changes: 1 addition & 1 deletion clients/rust/src/generated/instructions/finalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl Finalize {

#[derive(BorshDeserialize, BorshSerialize)]
pub struct FinalizeInstructionData {
discriminator: u8,
discriminator: u32,
}

impl FinalizeInstructionData {
Expand Down
2 changes: 1 addition & 1 deletion clients/rust/src/generated/instructions/retract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl Retract {

#[derive(BorshDeserialize, BorshSerialize)]
pub struct RetractInstructionData {
discriminator: u8,
discriminator: u32,
}

impl RetractInstructionData {
Expand Down
2 changes: 1 addition & 1 deletion clients/rust/src/generated/instructions/transfer_authority.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ impl TransferAuthority {

#[derive(BorshDeserialize, BorshSerialize)]
pub struct TransferAuthorityInstructionData {
discriminator: u8,
discriminator: u32,
}

impl TransferAuthorityInstructionData {
Expand Down
2 changes: 1 addition & 1 deletion clients/rust/src/generated/instructions/truncate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl Truncate {

#[derive(BorshDeserialize, BorshSerialize)]
pub struct TruncateInstructionData {
discriminator: u8,
discriminator: u32,
}

impl TruncateInstructionData {
Expand Down
2 changes: 1 addition & 1 deletion clients/rust/src/generated/instructions/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl Write {

#[derive(BorshDeserialize, BorshSerialize)]
pub struct WriteInstructionData {
discriminator: u8,
discriminator: u32,
}

impl WriteInstructionData {
Expand Down
12 changes: 6 additions & 6 deletions program/idl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
],
"discriminant": {
"type": "u8",
"type": "u32",
"value": 0
}
},
Expand Down Expand Up @@ -73,7 +73,7 @@
}
],
"discriminant": {
"type": "u8",
"type": "u32",
"value": 1
}
},
Expand Down Expand Up @@ -108,7 +108,7 @@
],
"args": [],
"discriminant": {
"type": "u8",
"type": "u32",
"value": 2
}
},
Expand All @@ -134,7 +134,7 @@
],
"args": [],
"discriminant": {
"type": "u8",
"type": "u32",
"value": 3
}
},
Expand Down Expand Up @@ -168,7 +168,7 @@
],
"args": [],
"discriminant": {
"type": "u8",
"type": "u32",
"value": 4
}
},
Expand Down Expand Up @@ -202,7 +202,7 @@
],
"args": [],
"discriminant": {
"type": "u8",
"type": "u32",
"value": 5
}
}
Expand Down
10 changes: 10 additions & 0 deletions scripts/generate-idls.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ getProgramFolders().forEach((folder) => {
programName: cargo.package.name.replace(/-/g, '_'),
programId: cargo.package.metadata.solana['program-id'],
idlDir: programDir,
idlHook: (idl) => ({
...idl,
instructions: idl.instructions.map((instruction) => ({
...instruction,
discriminant: {
...instruction.discriminant,
type: "u32", // The legacy native program only accepts 4-byte instruction discriminants.
},
})),
}),
idlName: 'idl',
programDir,
binaryInstallDir,
Expand Down
Loading