Skip to content
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

Support new message prefix #212

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Support new message prefix #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52fe878
Add support of the new message prefix
AllFi Dec 11, 2023
daaa614
Update prefix
AllFi Jan 25, 2024
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
1 change: 1 addition & 0 deletions zp-relayer/utils/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const constants = {
randomize: true,
},
MESSAGE_PREFIX_COMMON_V1: '0000',
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',
Expand Down
4 changes: 2 additions & 2 deletions zp-relayer/validation/tx/validateTx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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}`)
Expand Down
Loading