Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-bikes-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@boostxyz/sdk": minor
---

derive signatureType from signature
72 changes: 54 additions & 18 deletions packages/sdk/src/Actions/EventAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export interface ActionClaimant {
*
* @type {SignatureType}
*/
signatureType: SignatureType;
signatureType?: SignatureType;
/**
* The 4 byte signature of the event or function
*
Expand Down Expand Up @@ -203,7 +203,7 @@ export interface ActionStep {
*
* @type {SignatureType}
*/
signatureType: SignatureType;
signatureType?: SignatureType;
/**
* The type of action being performed.
*
Expand Down Expand Up @@ -1378,6 +1378,35 @@ function _isEventActionPayloadSimple(
return Array.isArray((opts as EventActionPayloadSimple).actionSteps);
}

/**
* Determines whether a signature is an event or function signature based on its format.
* - 32-byte signatures (0x + 64 chars) that don't start with 28 zeros are event signatures
* - 4-byte signatures (0x + 8 chars) or 32-byte signatures with 28 leading zeros are function signatures
*
* @param {Hex} signature - The signature to check
* @returns {SignatureType} The detected signature type
*/
export function detectSignatureType(signature: Hex): SignatureType {
const hexWithoutPrefix = signature.slice(2);

// 4-byte function selectors (8 hex chars)
if (hexWithoutPrefix.length === 8) {
return SignatureType.FUNC;
}

// 32-byte selectors (64 hex chars)
if (hexWithoutPrefix.length === 64) {
// Check if it starts with 28 bytes (56 chars) of zeros
const leadingPart = hexWithoutPrefix.slice(0, 56);
if (leadingPart === '0'.repeat(56)) {
return SignatureType.FUNC;
}
return SignatureType.EVENT;
}

throw new Error('Invalid signature format');
}

/**
* Function to properly encode an event action payload.
*
Expand Down Expand Up @@ -1505,34 +1534,41 @@ export function prepareEventActionPayload({
{
actionClaimant: {
..._toRawActionStep(actionClaimant),
signatureType:
actionClaimant.signatureType ??
detectSignatureType(actionClaimant.signature),
signature: pad(actionClaimant.signature),
},
actionStepOne: {
..._toRawActionStep({
...actionStepOne,
signature: pad(actionStepOne.signature),
}),
..._toRawActionStep(actionStepOne),
signatureType:
actionStepOne.signatureType ??
detectSignatureType(actionStepOne.signature),
signature: pad(actionStepOne.signature),
actionType: actionStepOne.actionType || 0,
},
actionStepTwo: {
..._toRawActionStep({
...actionStepTwo,
signature: pad(actionStepTwo.signature),
}),
..._toRawActionStep(actionStepTwo),
signatureType:
actionStepTwo.signatureType ??
detectSignatureType(actionStepTwo.signature),
signature: pad(actionStepTwo.signature),
actionType: actionStepTwo.actionType || 0,
},
actionStepThree: {
..._toRawActionStep({
...actionStepThree,
signature: pad(actionStepThree.signature),
}),
..._toRawActionStep(actionStepThree),
signatureType:
actionStepThree.signatureType ??
detectSignatureType(actionStepThree.signature),
signature: pad(actionStepThree.signature),
actionType: actionStepThree.actionType || 0,
},
actionStepFour: {
..._toRawActionStep({
...actionStepFour,
signature: pad(actionStepFour.signature),
}),
..._toRawActionStep(actionStepFour),
signatureType:
actionStepFour.signatureType ??
detectSignatureType(actionStepFour.signature),
signature: pad(actionStepFour.signature),
actionType: actionStepFour.actionType || 0,
},
},
Expand Down
Loading