From 52fe878d10d92b9ea1780d476c4f9f6ae41e7346 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Mon, 11 Dec 2023 16:21:11 +0300 Subject: [PATCH 1/2] Add support of the new message prefix --- zp-relayer/utils/constants.ts | 1 + zp-relayer/validation/tx/validateTx.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zp-relayer/utils/constants.ts b/zp-relayer/utils/constants.ts index 1fc2b0e7..f6d905fb 100644 --- a/zp-relayer/utils/constants.ts +++ b/zp-relayer/utils/constants.ts @@ -30,6 +30,7 @@ const constants = { randomize: true, }, MESSAGE_PREFIX_COMMON_V1: '0000', + MESSAGE_PREFIX_COMMON_V2: '0100', HEADER_TRACE_ID: 'zkbob-support-id' as const, HEADER_LIBJS: 'zkbob-libjs-version' as const, LIBJS_MIN_VERSION: '2.0.0', diff --git a/zp-relayer/validation/tx/validateTx.ts b/zp-relayer/validation/tx/validateTx.ts index 6a0da120..96095738 100644 --- a/zp-relayer/validation/tx/validateTx.ts +++ b/zp-relayer/validation/tx/validateTx.ts @@ -9,7 +9,7 @@ import type { Limits, Pool } from '@/pool' import type { NullifierSet } from '@/state/nullifierSet' import { web3 } from '@/services/web3' import { applyDenominator, contractCallRetry, numToHex, truncateMemoTxPrefix, unpackSignature } from '@/utils/helpers' -import { ZERO_ADDRESS, MESSAGE_PREFIX_COMMON_V1, MOCK_CALLDATA } from '@/utils/constants' +import { ZERO_ADDRESS, MESSAGE_PREFIX_COMMON_V1, MESSAGE_PREFIX_COMMON_V2, MOCK_CALLDATA } from '@/utils/constants' import { getTxProofField, parseDelta } from '@/utils/proofInputs' import type { TxPayload } from '@/queue/poolTxQueue' import type { PoolState } from '@/state/PoolState' @@ -189,7 +189,7 @@ function checkPoolId(deltaPoolId: BN, contractPoolId: BN) { function checkMemoPrefix(memo: string, txType: TxType) { const numItemsSuffix = truncateMemoTxPrefix(memo, txType).substring(4, 8) - if (numItemsSuffix === MESSAGE_PREFIX_COMMON_V1) { + if (numItemsSuffix === MESSAGE_PREFIX_COMMON_V1 || numItemsSuffix === MESSAGE_PREFIX_COMMON_V2) { return null } return new TxValidationError(`Memo prefix is incorrect: ${numItemsSuffix}`) From daaa614ba411c3e354464cc863dd2356e4160d08 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Thu, 25 Jan 2024 12:22:32 +0300 Subject: [PATCH 2/2] Update prefix --- zp-relayer/utils/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zp-relayer/utils/constants.ts b/zp-relayer/utils/constants.ts index f6d905fb..424af839 100644 --- a/zp-relayer/utils/constants.ts +++ b/zp-relayer/utils/constants.ts @@ -30,7 +30,7 @@ const constants = { randomize: true, }, MESSAGE_PREFIX_COMMON_V1: '0000', - MESSAGE_PREFIX_COMMON_V2: '0100', + MESSAGE_PREFIX_COMMON_V2: '0002', HEADER_TRACE_ID: 'zkbob-support-id' as const, HEADER_LIBJS: 'zkbob-libjs-version' as const, LIBJS_MIN_VERSION: '2.0.0',