From acba68f22845b807b3a4daad00be4e89b43165b1 Mon Sep 17 00:00:00 2001 From: 0xMere Date: Fri, 17 May 2024 17:28:14 +0200 Subject: [PATCH] Resolved requests --- .classpath | 2 +- src/main/java/it/unipr/EVMLiSA.java | 16 +++++----------- .../java/it/unipr/analysis/AbstractStack.java | 17 ----------------- .../it/unipr/analysis/EVMAbstractState.java | 2 -- .../java/it/unipr/analysis/KIntegerSet.java | 2 -- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/.classpath b/.classpath index 10bef3ac5..e9e43bfd4 100644 --- a/.classpath +++ b/.classpath @@ -38,7 +38,7 @@ - + diff --git a/src/main/java/it/unipr/EVMLiSA.java b/src/main/java/it/unipr/EVMLiSA.java index 5f2dd6feb..509332a89 100644 --- a/src/main/java/it/unipr/EVMLiSA.java +++ b/src/main/java/it/unipr/EVMLiSA.java @@ -296,8 +296,8 @@ private MyLogger newAnalysis(String CONTRACT_ADDR) throws Exception { if (numberOfAPIEtherscanRequest % 5 == 0) { try { - Thread.sleep(1001); // I can do max 5 API request in 1 sec - // to Etherscan.io + // I can do max 5 API request in 1 sec to Etherscan.io + Thread.sleep(1001); } catch (InterruptedException e) { e.printStackTrace(); } @@ -338,7 +338,6 @@ private MyLogger newAnalysis(String CONTRACT_ADDR) throws Exception { } private void runBenchmark() throws Exception { - // clean(); startOfExecutionTime = System.currentTimeMillis(); Object guardia = new Object(); @@ -451,11 +450,7 @@ public void run() { handler.start(); long timeToWait; -// int millisPerSmartContract = 25000 * 10; -// int extra = 120000; -// long blocks = smartContracts.size() / CORES * 20000; -// timeToWait = smartContracts.size() * millisPerSmartContract + extra + blocks; -// timeToWait = timeToWait * 100; + timeToWait = 1000 * 60 * 60 * 24 * 3; // 3 days // Statistics @@ -872,9 +867,8 @@ private void saveSmartContractsFromEtherscan() throws Exception { if (i % 5 == 0) { try { - Thread.sleep(1001); // I can do max 5 API - // request in 1 sec to - // Etherscan.io + // I can do max 5 API request in 1 sec to Etherscan.io + Thread.sleep(1001); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/src/main/java/it/unipr/analysis/AbstractStack.java b/src/main/java/it/unipr/analysis/AbstractStack.java index 6dfc8efd3..cdda0b0cf 100644 --- a/src/main/java/it/unipr/analysis/AbstractStack.java +++ b/src/main/java/it/unipr/analysis/AbstractStack.java @@ -97,23 +97,6 @@ else if (isTop()) @Override public String toString() { return this.stack.toString(); - // We use the bottom part for debugging -// String result = "{"; -// -// for (int i = STACK_LIMIT - size(); i < STACK_LIMIT; i++) { -// if (stack.get(i).isBottom()) -// result += Lattice.bottomRepresentation(); -// else if (stack.get(i).isBottom()) -// result += Lattice.topRepresentation(); -// else -// result += stack.get(i); -// -// if ((i + 1) != STACK_LIMIT) -// result += ", "; -// } -// -// result += "}"; -// return result; } @Override diff --git a/src/main/java/it/unipr/analysis/EVMAbstractState.java b/src/main/java/it/unipr/analysis/EVMAbstractState.java index 7d00ac996..0bdf63018 100644 --- a/src/main/java/it/unipr/analysis/EVMAbstractState.java +++ b/src/main/java/it/unipr/analysis/EVMAbstractState.java @@ -486,7 +486,6 @@ public EVMAbstractState smallStepSemantics(ValueExpression expression, ProgramPo KIntegerSet opnd1 = resultStack.pop(); KIntegerSet opnd2 = resultStack.pop(); -// resultStack.push(opnd2.equals(KIntegerSet.ZERO) && !opnd1.isTop() ? KIntegerSet.ZERO : opnd1.div(opnd2)); try { resultStack.push(opnd1.div(opnd2)); } catch (ArithmeticException e) { @@ -505,7 +504,6 @@ public EVMAbstractState smallStepSemantics(ValueExpression expression, ProgramPo KIntegerSet opnd1 = resultStack.pop(); KIntegerSet opnd2 = resultStack.pop(); -// resultStack.push(opnd2.equals(KIntegerSet.ZERO) && !opnd1.isTop() ? KIntegerSet.ZERO : opnd1.div(opnd2)); try { resultStack.push(opnd1.div(opnd2)); } catch (ArithmeticException e) { diff --git a/src/main/java/it/unipr/analysis/KIntegerSet.java b/src/main/java/it/unipr/analysis/KIntegerSet.java index 4c5b99366..b3ac6ad2f 100644 --- a/src/main/java/it/unipr/analysis/KIntegerSet.java +++ b/src/main/java/it/unipr/analysis/KIntegerSet.java @@ -191,8 +191,6 @@ else if (isTopNotJumpdest() || other.isTopNotJumpdest()) else elements.add(i.divide(j)); -// elements.add(i.divide(j, RoundingMode.FLOOR)); - return new KIntegerSet(elements); }