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

Refactor, change function selector synthetic sighash #167

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Refactor, change function selector synthetic sighash #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
355708e
Introduce FUNCTION_SELECTOR_SIGHASH, replace FALLBACK_FUNCTION_SIGHAS…
sifislag Nov 22, 2024
603d3bb
change value of FUNCTION_SELECTOR_SIGHASH
sifislag Nov 22, 2024
5cd05e1
Add constants to common.py, comment
sifislag Nov 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
16 changes: 8 additions & 8 deletions logic/context-sensitivity/abstract_context.dl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@

MaxContextDepth(sigHash, d) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
InputMaxContextDepth(d).


MaxContextDepth(sigHash, 20) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
!InputMaxContextDepth(_).
}

Expand Down Expand Up @@ -157,7 +157,7 @@
// Define our universe of contexts (including partial)
.decl IsPotentialContext(pubFun: symbol, ctx: PrivateContext)

IsPotentialContext(FALLBACK_FUNCTION_SIGHASH, ctx) :-
IsPotentialContext(FUNCTION_SELECTOR_SIGHASH, ctx) :-
InitialPrivateContext(ctx).

IsPotentialContext(publicFun, private) :-
Expand Down Expand Up @@ -193,7 +193,7 @@

InitialPrivateContext(nil).

InitialContext([FALLBACK_FUNCTION_SIGHASH, initialPrivateContext]) :-
InitialContext([FUNCTION_SELECTOR_SIGHASH, initialPrivateContext]) :-
InitialPrivateContext(initialPrivateContext).


Expand Down Expand Up @@ -287,14 +287,14 @@
// local.PublicFunctionJump(caller, sigHash, _),
// !MaxContextDepth(sigHash, -1),
// DecomposeContext(ctx, prevSigHash, _),
// prevSigHash != FALLBACK_FUNCTION_SIGHASH.
// prevSigHash != FUNCTION_SELECTOR_SIGHASH.
// .plan 1:(3,1,2)
// MergeContext(ctx, caller, newContext):-
// ReachableContext(ctx, caller),
// local.PublicFunctionJump(caller, sigHash, _),
// !MaxContextDepth(sigHash, -1),
// DecomposeContext(ctx, prevSigHash, pri),
// prevSigHash = FALLBACK_FUNCTION_SIGHASH,
// prevSigHash = FUNCTION_SELECTOR_SIGHASH,
// newContext = [sigHash, pri].
// .plan 1:(3,1,2)

Expand All @@ -304,14 +304,14 @@
local.PublicFunction(funcStart, sigHash, _),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, _),
prevSigHash != FALLBACK_FUNCTION_SIGHASH.
prevSigHash != FUNCTION_SELECTOR_SIGHASH.
.plan 1:(4,1,2,3)
MergeContextResponse(ctx, caller, funcStart, newContext) :-
MergeContextRequest(ctx, caller, funcStart),
local.PublicFunctionJump(caller, sigHash, _),
local.PublicFunction(funcStart, sigHash, _),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, FALLBACK_FUNCTION_SIGHASH, pri),
DecomposeContext(ctx, FUNCTION_SELECTOR_SIGHASH, pri),
newContext = [sigHash, pri].
.plan 1:(4,1,2,3)
MergeContextResponse(ctx, caller, funcStart, ctx) :-
Expand Down
10 changes: 5 additions & 5 deletions logic/context-sensitivity/finite_precise_context.dl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

MaxContextDepth(sigHash, d) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
InputMaxContextDepth(d).

// HERE: much deeper
MaxContextDepth(sigHash, 27) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
!InputMaxContextDepth(_).


Expand All @@ -41,7 +41,7 @@

InitialPrivateContext(nil).

InitialContext([FALLBACK_FUNCTION_SIGHASH, initialPrivateContext]) :-
InitialContext([FUNCTION_SELECTOR_SIGHASH, initialPrivateContext]) :-
InitialPrivateContext(initialPrivateContext).

DecomposeContext(ctx, publicFun, private):-
Expand Down Expand Up @@ -138,14 +138,14 @@
local.PublicFunction(caller, sigHash, _),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, _),
prevSigHash != FALLBACK_FUNCTION_SIGHASH.
prevSigHash != FUNCTION_SELECTOR_SIGHASH.
.plan 1:(3,1,2)
MergeContext(ctx, caller, newContext):-
ReachableContext(ctx, caller),
local.PublicFunction(caller, sigHash, _),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, pri),
prevSigHash = FALLBACK_FUNCTION_SIGHASH,
prevSigHash = FUNCTION_SELECTOR_SIGHASH,
newContext = [sigHash, pri].
.plan 1:(3,1,2)
#endif
Expand Down
10 changes: 5 additions & 5 deletions logic/context-sensitivity/finite_shrinking_context.dl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

MaxContextDepth(sigHash, d) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
InputMaxContextDepth(d).

// HERE: much deeper
MaxContextDepth(sigHash, 10) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
!InputMaxContextDepth(_).


Expand All @@ -41,7 +41,7 @@

InitialPrivateContext(nil).

InitialContext([FALLBACK_FUNCTION_SIGHASH, initialPrivateContext]) :-
InitialContext([FUNCTION_SELECTOR_SIGHASH, initialPrivateContext]) :-
InitialPrivateContext(initialPrivateContext).

DecomposeContext(ctx, publicFun, private):-
Expand Down Expand Up @@ -100,14 +100,14 @@
local.PublicFunction(caller, sigHash, _),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, _),
prevSigHash != FALLBACK_FUNCTION_SIGHASH.
prevSigHash != FUNCTION_SELECTOR_SIGHASH.
.plan 1:(3,1,2)
MergeContext(ctx, caller, newContext):-
ReachableContext(ctx, caller),
local.PublicFunction(caller, sigHash, _),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, pri),
prevSigHash = FALLBACK_FUNCTION_SIGHASH,
prevSigHash = FUNCTION_SELECTOR_SIGHASH,
newContext = [sigHash, pri].
.plan 1:(3,1,2)
#endif
Expand Down
14 changes: 7 additions & 7 deletions logic/context-sensitivity/hybrid_precise_context.dl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@

MaxImpreciseContextDepth(sigHash, d) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
InputMaxImpreciseContextDepth(d).

MaxImpreciseContextDepth(sigHash, 7) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH),
sigHash = FUNCTION_SELECTOR_SIGHASH),
!InputMaxImpreciseContextDepth(_).

// Not yet configurable via input file
.decl MaxPreciseContextDepth(sigHash: symbol, d: number)
MaxPreciseContextDepth(sigHash, 27) :-
(local.PublicFunction(_, sigHash, _);
sigHash = FALLBACK_FUNCTION_SIGHASH).
sigHash = FUNCTION_SELECTOR_SIGHASH).

//
// Much like PublicComponentContextSensitivity but need to change truncation logic
Expand All @@ -54,7 +54,7 @@
// Define our universe of contexts (including partial)
.decl IsPotentialContext(pubFun: symbol, ctx: PrivateContext)

IsPotentialContext(FALLBACK_FUNCTION_SIGHASH, ctx) :-
IsPotentialContext(FUNCTION_SELECTOR_SIGHASH, ctx) :-
InitialPrivateContext(ctx).

IsPotentialContext(publicFun, private) :-
Expand Down Expand Up @@ -105,7 +105,7 @@
InitialPrecisePrivateContext(initialPrivateContext);
InitialImprecisePrivateContext(initialPrivateContext).

InitialContext([FALLBACK_FUNCTION_SIGHASH, initialPrivateContext]) :-
InitialContext([FUNCTION_SELECTOR_SIGHASH, initialPrivateContext]) :-
InitialPrecisePrivateContext(initialPrivateContext). // ONLY PRECISE!!!

PrecisePrivateContext(ctx) :-
Expand Down Expand Up @@ -256,14 +256,14 @@
local.PublicFunction(caller, sigHash, _),
!MaxImpreciseContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, _),
prevSigHash != FALLBACK_FUNCTION_SIGHASH.
prevSigHash != FUNCTION_SELECTOR_SIGHASH.
.plan 1:(3,1,2)
MergeContext(ctx, caller, newContext) :-
ReachableContext(ctx, caller),
local.PublicFunction(caller, sigHash, _),
!MaxImpreciseContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, pri),
prevSigHash = FALLBACK_FUNCTION_SIGHASH,
prevSigHash = FUNCTION_SELECTOR_SIGHASH,
newContext = [sigHash, pri].
.plan 1:(3,1,2)
#endif
Expand Down
8 changes: 4 additions & 4 deletions logic/context-sensitivity/transactional_with_residual_context.dl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

// Define our universe of contexts (including partial)
.decl IsPotentialContext(pubFun: symbol, ctx: PrivateContext, residual: number)
IsPotentialContext(FALLBACK_FUNCTION_SIGHASH, ctx, 0) :-
IsPotentialContext(FUNCTION_SELECTOR_SIGHASH, ctx, 0) :-
InitialPrivateContext(ctx).

IsPotentialContext(publicFun, private, residual) :-
Expand Down Expand Up @@ -48,7 +48,7 @@
.plan 1:(2,1)


InitialContext([FALLBACK_FUNCTION_SIGHASH, initialPrivateContext, 0]) :-
InitialContext([FUNCTION_SELECTOR_SIGHASH, initialPrivateContext, 0]) :-
InitialPrivateContext(initialPrivateContext).

PrivateContextDepth(init, 0):-
Expand Down Expand Up @@ -109,14 +109,14 @@
local.PublicFunction(caller, sigHash),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, _, _),
prevSigHash != FALLBACK_FUNCTION_SIGHASH.
prevSigHash != FUNCTION_SELECTOR_SIGHASH.
.plan 1:(3,1,2)
MergeContext(ctx, caller, newContext):-
ReachableContext(ctx, caller),
local.PublicFunction(caller, sigHash),
!MaxContextDepth(sigHash, -1),
DecomposeContext(ctx, prevSigHash, pri, _),
prevSigHash = FALLBACK_FUNCTION_SIGHASH,
prevSigHash = FUNCTION_SELECTOR_SIGHASH,
newContext = [sigHash, pri, 0].
.plan 1:(3,1,2)
#endif
Expand Down
2 changes: 1 addition & 1 deletion logic/functions.dl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ IRFunctionCall(fromir, irfunc) :-
*/
.decl PubFun(entry:symbol, hex:symbol)

PubFun("0x0", FALLBACK_FUNCTION_SIGHASH):- global.sens.Context_PublicFunction(_, _).
PubFun("0x0", FUNCTION_SELECTOR_SIGHASH):- global.sens.Context_PublicFunction(_, _).
PubFun(entry, sigHash):- global.sens.Context_PublicFunction(_, sigHash), PublicFunctionFiltered(entry, sigHash).

// Intra-function edges (i.e., real CFG edges)
Expand Down
2 changes: 2 additions & 0 deletions logic/types_defs.dl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
#define CheckIsStackIndex(v) ((v) >= 0, (v) < MAX_STACK_HEIGHT)


// The following 4 constants as also defined in src/common.py
#define FUNCTION_SELECTOR "0x0"

#define FALLBACK_FUNCTION_SIGHASH "0x00000000"
#define RECEIVE_FUNCTION_SIGHASH "0xeeeeeeee"
#define FUNCTION_SELECTOR_SIGHASH "0xff5e1ec7"


.type Block <: symbol
Expand Down
6 changes: 6 additions & 0 deletions src/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@

SOUFFLE_COMPILED_SUFFIX = '_compiled'

# The following 4 constants are also defined in `logic/types_defs.dl`
FUNCTION_SELECTOR = "0x0"
FALLBACK_FUNCTION_SIGHASH = "0x00000000"
RECEIVE_FUNCTION_SIGHASH = "0xeeeeeeee"
FUNCTION_SELECTOR_SIGHASH = "0xff5e1ec7"

log = lambda msg: logging.log(logging.INFO + 1, msg)
log_debug = lambda msg: logging.log(logging.DEBUG, msg)

Expand Down