Skip to content

fix(swap-vm): correct maker traits hooks encoding #32

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

Merged
vbrvk merged 2 commits into from
Dec 8, 2025
Merged

fix(swap-vm): correct maker traits hooks encoding #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38ef6cb
fix(swap-vm): correct maker traits hooks encoding
vbrvk Dec 8, 2025
25b090e
chore: add more tests
vbrvk Dec 8, 2025
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
27 changes: 27 additions & 0 deletions typescript/swap-vm/src/swap-vm/maker-traits.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,31 @@ describe('MakerTraits', () => {
encodeDecodeTest(traits, maker)
})
})

it('should encode hooks to the maker', () => {
const maker = new Address('0x742d35cc6634c0532925a3b844bc454e4438f44e')
const traits = MakerTraits.new({
shouldUnwrap: false,
useAquaInsteadOfSignature: true,
allowZeroAmountIn: false,
preTransferInHook: new Interaction(maker, new HexString('0xdeadbeef01')),
postTransferInHook: new Interaction(maker, new HexString('0xdeadbeef02')),
preTransferOutHook: new Interaction(maker, new HexString('0xdeadbeef03')),
postTransferOutHook: new Interaction(maker, new HexString('0xdeadbeef04')),
})

const encoded = traits.encode(maker)
const decoded = MakerTraits.decode(encoded.traits, encoded.hooksData)

expect(decoded.postTransferInHook?.data).toEqual(traits.postTransferInHook?.data)
expect(decoded.postTransferInHook?.data).toEqual(traits.postTransferInHook?.data)
expect(decoded.preTransferOutHook?.data).toEqual(traits.preTransferOutHook?.data)
expect(decoded.postTransferOutHook?.data).toEqual(traits.postTransferOutHook?.data)

// target is zero after decoding because target is same as maker
expect(decoded.postTransferInHook?.target).toEqual(Address.ZERO_ADDRESS)
expect(decoded.postTransferInHook?.target).toEqual(Address.ZERO_ADDRESS)
expect(decoded.preTransferOutHook?.target).toEqual(Address.ZERO_ADDRESS)
expect(decoded.postTransferOutHook?.target).toEqual(Address.ZERO_ADDRESS)
})
})
4 changes: 2 additions & 2 deletions typescript/swap-vm/src/swap-vm/maker-traits.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ export class MakerTraits {
const { data, offsets } = MakerTraits.HOOKS.reduce(
(acc, hookName, i) => {
const hook = this[hookName]
const hasTarget = this.hasTargetForHook(hookName)
const hasTarget = this.hasTargetForHook(hookName, maker)
const encoded = hook && hasTarget ? hook.encode() : hook?.data || HexString.EMPTY

acc.sum += BigInt(encoded.bytesCount())
Expand All @@ -367,7 +367,7 @@ export class MakerTraits {

private hasTargetForHook(
hookName: (typeof MakerTraits.HOOKS)[number],
maker: Address = Address.ZERO_ADDRESS,
maker = Address.ZERO_ADDRESS,
): boolean {
const hook = this[hookName]

Expand Down
Loading