Skip to content

Commit

Permalink
consistent message hashes (#72)
Browse files Browse the repository at this point in the history 
Signed-off-by: skosito <[email protected]>
  • Loading branch information
@skosito
skosito committed Jan 13, 2025
1 parent 6de0b61 commit 02acf98
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 21 deletions.
26 changes: 19 additions & 7 deletions programs/gateway/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ pub enum Errors {
EmptyReceiver,
}

/// Enumeration for instruction identifiers in message hashes.
#[repr(u8)]
enum InstructionId {
Withdraw = 1,
WithdrawSplToken = 2,
WhitelistSplToken = 3,
UnwhitelistSplToken = 4,
}

declare_id!("ZETAjseVjuFsxdRxo6MmTCvqFwb3ZHUx56Co3vCmGis");

#[program]
Expand Down Expand Up @@ -159,7 +168,7 @@ pub mod gateway {
signature,
recovery_id,
nonce,
"whitelist_spl_mint",
InstructionId::WhitelistSplToken as u8,
)?;
} else {
require!(
Expand Down Expand Up @@ -202,7 +211,7 @@ pub mod gateway {
signature,
recovery_id,
nonce,
"unwhitelist_spl_mint",
InstructionId::UnwhitelistSplToken as u8,
)?;
} else {
require!(
Expand Down Expand Up @@ -377,7 +386,8 @@ pub mod gateway {
}

let mut concatenated_buffer = Vec::new();
concatenated_buffer.extend_from_slice("withdraw".as_bytes());
concatenated_buffer.extend_from_slice(b"ZETACHAIN");
concatenated_buffer.push(InstructionId::Withdraw as u8);
concatenated_buffer.extend_from_slice(&pda.chain_id.to_be_bytes());
concatenated_buffer.extend_from_slice(&nonce.to_be_bytes());
concatenated_buffer.extend_from_slice(&amount.to_be_bytes());
Expand Down Expand Up @@ -435,7 +445,8 @@ pub mod gateway {
}

let mut concatenated_buffer = Vec::new();
concatenated_buffer.extend_from_slice("withdraw_spl_token".as_bytes());
concatenated_buffer.extend_from_slice(b"ZETACHAIN");
concatenated_buffer.push(InstructionId::WithdrawSplToken as u8);
concatenated_buffer.extend_from_slice(&pda.chain_id.to_be_bytes());
concatenated_buffer.extend_from_slice(&nonce.to_be_bytes());
concatenated_buffer.extend_from_slice(&amount.to_be_bytes());
Expand Down Expand Up @@ -581,7 +592,7 @@ fn validate_whitelist_tss_signature(
signature: [u8; 64],
recovery_id: u8,
nonce: u64,
instruction_name: &str,
instruction: u8,
) -> Result<()> {
if nonce != pda.nonce {
msg!(
Expand All @@ -593,10 +604,11 @@ fn validate_whitelist_tss_signature(
}

let mut concatenated_buffer = Vec::new();
concatenated_buffer.extend_from_slice(instruction_name.as_bytes());
concatenated_buffer.extend_from_slice(b"ZETACHAIN");
concatenated_buffer.push(instruction);
concatenated_buffer.extend_from_slice(&pda.chain_id.to_be_bytes());
concatenated_buffer.extend_from_slice(&whitelist_candidate.key().to_bytes());
concatenated_buffer.extend_from_slice(&nonce.to_be_bytes());
concatenated_buffer.extend_from_slice(&whitelist_candidate.key().to_bytes());
let computed_message_hash = hash(&concatenated_buffer[..]).to_bytes();

msg!("Computed message hash: {:?}", computed_message_hash);
Expand Down
38 changes: 24 additions & 14 deletions tests/gateway.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ async function withdrawSplToken(
gatewayProgram: Program<Gateway>
) {
const buffer = Buffer.concat([
Buffer.from("withdraw_spl_token", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x02]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
nonce.toArrayLike(Buffer, "be", 8),
amount.toArrayLike(Buffer, "be", 8),
Expand Down Expand Up @@ -373,7 +374,8 @@ describe("Gateway", () => {
try {
const nonce2 = nonce.addn(1);
const buffer = Buffer.concat([
Buffer.from("withdraw_spl_token", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x02]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
nonce2.toArrayLike(Buffer, "be", 8),
amount.toArrayLike(Buffer, "be", 8),
Expand Down Expand Up @@ -438,7 +440,8 @@ describe("Gateway", () => {
wallet.publicKey
);
const buffer = Buffer.concat([
Buffer.from("withdraw", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x01]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
nonce.toArrayLike(Buffer, "be", 8),
amount.toArrayLike(Buffer, "be", 8),
Expand Down Expand Up @@ -479,7 +482,8 @@ describe("Gateway", () => {
);

const buffer = Buffer.concat([
Buffer.from("withdraw", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x01]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
nonce.toArrayLike(Buffer, "be", 8),
amount.toArrayLike(Buffer, "be", 8),
Expand Down Expand Up @@ -522,7 +526,8 @@ describe("Gateway", () => {
);

const buffer = Buffer.concat([
Buffer.from("withdraw", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x01]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
nonce.subn(1).toArrayLike(Buffer, "be", 8), // wrong nonce
amount.toArrayLike(Buffer, "be", 8),
Expand Down Expand Up @@ -640,7 +645,8 @@ describe("Gateway", () => {
);

const buffer = Buffer.concat([
Buffer.from("withdraw_spl_token", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x02]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
nonce.subn(1).toArrayLike(Buffer, "be", 8), // wrong nonce
amount.toArrayLike(Buffer, "be", 8),
Expand Down Expand Up @@ -754,10 +760,11 @@ describe("Gateway", () => {
const nonce = pdaAccountData.nonce;

const buffer = Buffer.concat([
Buffer.from("unwhitelist_spl_mint", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x04]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
mint.publicKey.toBuffer(),
nonce.toArrayLike(Buffer, "be", 8),
mint.publicKey.toBuffer(),
]);
const message_hash = keccak256(buffer);
const signature = keyPair.sign(message_hash, "hex");
Expand Down Expand Up @@ -792,10 +799,11 @@ describe("Gateway", () => {
const nonce = pdaAccountData.nonce;

const buffer = Buffer.concat([
Buffer.from("whitelist_spl_mint", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x03]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
mint.publicKey.toBuffer(),
nonce.toArrayLike(Buffer, "be", 8),
mint.publicKey.toBuffer(),
]);
const message_hash = keccak256(buffer);
const signature = keyPair.sign(message_hash, "hex");
Expand Down Expand Up @@ -823,10 +831,11 @@ describe("Gateway", () => {
const nonce = pdaAccountData.nonce;

const buffer = Buffer.concat([
Buffer.from("whitelist_spl_mint", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x03]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
mint.publicKey.toBuffer(),
nonce.subn(1).toArrayLike(Buffer, "be", 8), // wrong nonce
mint.publicKey.toBuffer(),
]);
const message_hash = keccak256(buffer);
const signature = keyPair.sign(message_hash, "hex");
Expand Down Expand Up @@ -858,10 +867,11 @@ describe("Gateway", () => {
const nonce = pdaAccountData.nonce;

const buffer = Buffer.concat([
Buffer.from("whitelist_spl_mint", "utf-8"),
Buffer.from("ZETACHAIN", "utf-8"),
Buffer.from([0x03]),
chain_id_bn.toArrayLike(Buffer, "be", 8),
nonce.toArrayLike(Buffer, "be", 8),
mint.publicKey.toBuffer(),
nonce.toArrayLike(Buffer, "be", 8), // wrong nonce
]);
const message_hash = keccak256(buffer);
const signature = keyPair.sign(message_hash, "hex");
Expand Down

0 comments on commit 02acf98

Please sign in to comment.