Fixes some bugs and tidies things up

PegaSysEng · Sep 11, 2019 · 4fce9fb · 4fce9fb
1 parent 48f0720
commit 4fce9fb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/...rc/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java b/...rc/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java
@@ -151,18 +151,14 @@ protected void codeSuccess(final MessageFrame frame) {
         // Finalize contract creation, setting the contract code.
         final MutableAccount contract =
             frame.getWorldState().getOrCreate(frame.getContractAddress());
-        if (!(contract instanceof ReadOnlyMutableAccount)) {
-          contract.setCode(contractCode);
-          contract.setVersion(accountVersion);
-          LOG.trace(
-              "Successful creation of contract {} with code of size {} (Gas remaining: {})",
-              frame.getContractAddress(),
-              contractCode.size(),
-              frame.getRemainingGas());
-          frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
-        } else {
-          frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-        }
+        contract.setCode(contractCode);
+        contract.setVersion(accountVersion);
+        LOG.trace(
+            "Successful creation of contract {} with code of size {} (Gas remaining: {})",
+            frame.getContractAddress(),
+            contractCode.size(),
+            frame.getRemainingGas());
+        frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
       } else {
         frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
       }

diff --git a/...ech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java b/...ech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java
@@ -120,7 +120,6 @@ public BytesValue compute(final BytesValue input, final MessageFrame messageFram
         privateWorldStateArchive.getMutable(lastRootHash).get();
 
     final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
-
     final PrivateTransactionProcessor.Result result =
         privateTransactionProcessor.processTransaction(
             messageFrame.getBlockchain(),

diff --git a/...ore/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java b/...ore/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java
@@ -212,7 +212,7 @@ public Result processTransaction(
     final MessageFrame initialFrame;
     final Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
 
-    final WorldUpdater mungedUpUpdater =
+    final WorldUpdater mutablePrivateWorldStateUpdater =
         new DefaultMutablePrivateWorldStateUpdater(publicWorldState, privateWorldState.updater());
 
     if (transaction.isContractCreation()) {
@@ -231,7 +231,7 @@ public Result processTransaction(
               .type(MessageFrame.Type.CONTRACT_CREATION)
               .messageFrameStack(messageFrameStack)
               .blockchain(blockchain)
-              .worldState(mungedUpUpdater)
+              .worldState(mutablePrivateWorldStateUpdater)
               .address(privateContractAddress)
               .originator(senderAddress)
               .contract(privateContractAddress)
@@ -260,7 +260,7 @@ public Result processTransaction(
               .type(MessageFrame.Type.MESSAGE_CALL)
               .messageFrameStack(messageFrameStack)
               .blockchain(blockchain)
-              .worldState(mungedUpUpdater)
+              .worldState(mutablePrivateWorldStateUpdater)
               .address(to)
               .originator(senderAddress)
               .contract(to)

diff --git a/...ava/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java b/...ava/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java
@@ -55,7 +55,6 @@ public MutableAccount getMutable(final Address address) {
     }
     final MutableAccount publicAccount = publicWorldUpdater.getMutable(address);
     if (publicAccount != null && !publicAccount.isEmpty()) {
-      revert();
       return new ReadOnlyMutableAccount(publicAccount);
     }
     return null;