Swap EthereumJ with Besu

hedera-node/pom.xml

@@ -26,6 +26,9 @@
     <ant-contrib.version>1.0b3</ant-contrib.version>
     <ant-nodeps.version>1.8.1</ant-nodeps.version>
     <jackson.version>2.11.2</jackson.version>
+    <besu.version>21.10.0-RC1</besu.version>
+    <tuweni.version>2.0.0</tuweni.version>
+    <besu-native.version>0.3.0</besu-native.version>
   </properties>
 
   <build>
@@ -292,6 +295,26 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tuweni</groupId>
+      <artifactId>tuweni-units</artifactId>
+      <version>${tuweni.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hyperledger.besu</groupId>
+      <artifactId>bls12-381</artifactId>
+      <version>${besu-native.version}</version>
+	</dependency>
+    <dependency>
+      <groupId>org.hyperledger.besu</groupId>
+      <artifactId>evm</artifactId>
+      <version>${besu.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hyperledger.besu</groupId>
+      <artifactId>besu-datatypes</artifactId>
+      <version>${besu.version}</version>
+    </dependency>
   </dependencies>
 
   <repositories>
@@ -310,6 +333,14 @@
       <id>local-repo-for-swirlds-sdk</id>
       <url>file:${project.basedir}/localSwirldsSDK</url>
     </repository>
+    <repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>besu</id>
+      <name>Hyperledger Besu</name>
+      <url>https://hyperledger.jfrog.io/artifactory/besu-maven</url>
+    </repository>
     <repository>
       <snapshots>
         <enabled>false</enabled>

hedera-node/src/main/java/com/hedera/services/context/properties/BootstrapProperties.java

@@ -210,6 +210,7 @@ public Set<String> allPropertyNames() {
 			"contracts.defaultLifetime",
 			"contracts.localCall.estRetBytes",
 			"contracts.maxGas",
+			"contracts.chainId",
 			"contracts.maxStorageKb",
 			"files.maxSizeKb",
 			"fees.minCongestionPeriod",
@@ -391,6 +392,7 @@ public static Function<String, Object> transformFor(String prop) {
 			entry("contracts.maxStorageKb", AS_INT),
 			entry("contracts.defaultLifetime", AS_LONG),
 			entry("contracts.maxGas", AS_INT),
+			entry("contracts.chainId", AS_INT),
 			entry("rates.intradayChangeLimitPercent", AS_INT),
 			entry("rates.midnightCheckInterval", AS_LONG),
 			entry("scheduling.whitelist", AS_FUNCTIONS),

hedera-node/src/main/java/com/hedera/services/context/properties/GlobalDynamicProperties.java

@@ -64,6 +64,7 @@ public class GlobalDynamicProperties {
 	private long minTxnDuration;
 	private int minValidityBuffer;
 	private int maxGas;
+	private int chainId;
 	private long defaultContractLifetime;
 	private int feesTokenTransferUsageMultiplier;
 	private boolean autoRenewEnabled;
@@ -128,6 +129,7 @@ public void reload() {
 		minTxnDuration = properties.getLongProperty("hedera.transaction.minValidDuration");
 		minValidityBuffer = properties.getIntProperty("hedera.transaction.minValidityBufferSecs");
 		maxGas = properties.getIntProperty("contracts.maxGas");
+		chainId = properties.getIntProperty("contracts.chainId");
 		defaultContractLifetime = properties.getLongProperty("contracts.defaultLifetime");
 		feesTokenTransferUsageMultiplier = properties.getIntProperty("fees.tokenTransferUsageMultiplier");
 		autoRenewEnabled = properties.getBooleanProperty("autorenew.isEnabled");
@@ -252,6 +254,10 @@ public int maxGas() {
 		return maxGas;
 	}
 
+	public int getChainId() {
+		return chainId;
+	}
+
 	public long defaultContractLifetime() {
 		return defaultContractLifetime;
 	}

hedera-node/src/main/java/com/hedera/services/contracts/ContractsModule.java

@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,8 +24,8 @@
 import com.hedera.services.context.properties.GlobalDynamicProperties;
 import com.hedera.services.contracts.annotations.BytecodeSource;
 import com.hedera.services.contracts.annotations.StorageSource;
-import com.hedera.services.contracts.execution.SoliditySigsVerifier;
-import com.hedera.services.contracts.execution.TxnAwareSoliditySigsVerifier;
+import com.hedera.services.contracts.sources.SoliditySigsVerifier;
+import com.hedera.services.contracts.sources.TxnAwareSoliditySigsVerifier;
 import com.hedera.services.contracts.persistence.BlobStoragePersistence;
 import com.hedera.services.contracts.sources.BlobStorageSource;
 import com.hedera.services.contracts.sources.LedgerAccountsSource;
@@ -38,17 +38,33 @@
 import com.hedera.services.sigs.verification.SyncVerifier;
 import com.hedera.services.state.merkle.MerkleAccount;
 import com.hedera.services.state.submerkle.EntityId;
-import com.hedera.services.utils.EntityNum;
+import com.hedera.services.contracts.gascalculator.GasCalculatorHederaV19;
+import com.hedera.services.contracts.operation.HederaBalanceOperation;
+import com.hedera.services.contracts.operation.HederaCallCodeOperation;
+import com.hedera.services.contracts.operation.HederaCallOperation;
+import com.hedera.services.contracts.operation.HederaCreateOperation;
+import com.hedera.services.contracts.operation.HederaDelegateCallOperation;
+import com.hedera.services.contracts.operation.HederaExtCodeCopyOperation;
+import com.hedera.services.contracts.operation.HederaExtCodeHashOperation;
+import com.hedera.services.contracts.operation.HederaExtCodeSizeOperation;
+import com.hedera.services.contracts.operation.HederaSStoreOperation;
+import com.hedera.services.contracts.operation.HederaSelfDestructOperation;
+import com.hedera.services.contracts.operation.HederaStaticCallOperation;
 import com.hedera.services.txns.validation.OptionValidator;
+import com.hedera.services.utils.EntityNum;
 import com.hederahashgraph.api.proto.java.AccountID;
 import com.swirlds.merkle.map.MerkleMap;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
+import dagger.multibindings.IntoSet;
 import org.ethereum.core.AccountState;
 import org.ethereum.datasource.Source;
 import org.ethereum.datasource.StoragePersistence;
 import org.ethereum.db.ServicesRepositoryRoot;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.operation.InvalidOperation;
+import org.hyperledger.besu.evm.operation.Operation;
 
 import javax.inject.Singleton;
 import java.util.Map;
@@ -151,4 +167,70 @@ public static Map<byte[], byte[]> provideStorageSource(Map<String, byte[]> blobS
 	public static Map<EntityId, Long> provideEntityExpiries(Map<String, byte[]> blobStore) {
 		return entityExpiryMapFrom(blobStore);
 	}
+
+	@Provides
+	@Singleton
+	@IntoSet
+	public static Operation provideCreate2Operation(GasCalculator gasCalculator) {
+		return new InvalidOperation(0xF5, gasCalculator);
+	}
+
+	@Binds
+	@Singleton
+	public abstract GasCalculator bindHederaGasCalculatorV19(GasCalculatorHederaV19 gasCalculator);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindBalanceOperation(HederaBalanceOperation balance);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindCallCodeOperation(HederaCallCodeOperation callCode);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindCallOperation(HederaCallOperation call);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindCreateOperation(HederaCreateOperation create);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindDelegateCallOperation(HederaDelegateCallOperation delegateCall);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindExtCodeCopyOperation(HederaExtCodeCopyOperation extCodeCopy);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindExtCodeHashOperation(HederaExtCodeHashOperation extCodeHash);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindExtCodeSizeOperation(HederaExtCodeSizeOperation extCodeSize);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindSelfDestructOperation(HederaSelfDestructOperation selfDestruct);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindSStoreOperation(HederaSStoreOperation sstore);
+
+	@Binds
+	@Singleton
+	@IntoSet
+	public abstract Operation bindStaticCallOperation(HederaStaticCallOperation staticCall);
 }

hedera-node/src/main/java/com/hedera/services/contracts/execution/CallEvmTxProcessor.java

@@ -0,0 +1,97 @@
+package com.hedera.services.contracts.execution;
+
+/*
+ * -
+ * ‌
+ * Hedera Services Node
+ * ​
+ * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC
+ * ​
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ‍
+ *
+ */
+
+import com.hedera.services.context.properties.GlobalDynamicProperties;
+import com.hedera.services.fees.HbarCentExchange;
+import com.hedera.services.fees.calculation.UsagePricesProvider;
+import com.hedera.services.store.contracts.HederaWorldState;
+import com.hedera.services.store.models.Account;
+import com.hederahashgraph.api.proto.java.HederaFunctionality;
+import org.apache.tuweni.bytes.Bytes;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.operation.Operation;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.Set;
+
+@Singleton
+public class CallEvmTxProcessor extends EvmTxProcessor {
+
+	@Inject
+	public CallEvmTxProcessor(
+			HederaWorldState worldState,
+			HbarCentExchange exchange,
+			UsagePricesProvider usagePrices,
+			GlobalDynamicProperties dynamicProperties,
+			GasCalculator gasCalculator,
+			Set<Operation> hederaOperations) {
+		super(worldState, exchange, usagePrices, dynamicProperties, gasCalculator, hederaOperations);
+	}
+
+	public TransactionProcessingResult execute(
+			final Account sender,
+			final Address receiver,
+			final long providedGasLimit,
+			final long value,
+			final Bytes callData,
+			final Instant consensusTime
+	) {
+		final long gasPrice = gasPriceTinyBarsGiven(consensusTime);
+
+		return super.execute(sender,
+				receiver,
+				gasPrice,
+				providedGasLimit,
+				value,
+				callData,
+				false,
+				consensusTime,
+				false,
+				Optional.empty());
+	}
+
+	@Override
+	protected HederaFunctionality getFunctionType() {
+		return HederaFunctionality.ContractCall;
+	}
+
+	@Override
+	protected MessageFrame buildInitialFrame(MessageFrame.Builder baseInitialFrame, HederaWorldState.Updater updater, Address to, Bytes payload) {
+		Bytes code = updater.get(to).getCode();
+		return baseInitialFrame
+				.type(MessageFrame.Type.MESSAGE_CALL)
+				.address(to)
+				.contract(to)
+				.inputData(payload)
+				.code(new Code(code, Hash.hash(code)))
+				.build();
+	}
+}