forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
adds AUTH and AUTHCALL opcodes to Prague evms. adds a mutable authorizedBy:Address field to the MessageFrame adds AUTH opcode costing to gas calculators --------- Signed-off-by: Justin Florentine <justin+github@florentine.us>
- Loading branch information
Showing
9 changed files
with
717 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
evm/src/main/java/org/hyperledger/besu/evm/operation/AuthCallOperation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * Copyright contributors to Hyperledger Besu. | ||
| * | ||
| * 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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.evm.operation; | ||
|
|
||
| import static org.hyperledger.besu.evm.internal.Words.clampedToLong; | ||
|
|
||
| import org.hyperledger.besu.datatypes.Address; | ||
| import org.hyperledger.besu.datatypes.Wei; | ||
| import org.hyperledger.besu.evm.EVM; | ||
| import org.hyperledger.besu.evm.frame.ExceptionalHaltReason; | ||
| import org.hyperledger.besu.evm.frame.MessageFrame; | ||
| import org.hyperledger.besu.evm.gascalculator.GasCalculator; | ||
| import org.hyperledger.besu.evm.internal.Words; | ||
|
|
||
| import org.apache.tuweni.bytes.Bytes32; | ||
|
|
||
| /** Introduced via EIP-3074 to call another contract with a different authorization context. */ | ||
| public class AuthCallOperation extends AbstractCallOperation { | ||
|
|
||
| /** | ||
| * Instantiates a new AuthCallOperation. | ||
| * | ||
| * @param gasCalculator a Prague or later gas calculator | ||
| */ | ||
| public AuthCallOperation(final GasCalculator gasCalculator) { | ||
| super(0xF7, "AUTHCALL", 7, 1, gasCalculator); | ||
| } | ||
|
|
||
| @Override | ||
| protected Address to(final MessageFrame frame) { | ||
| return Words.toAddress(frame.getStackItem(1)); | ||
| } | ||
|
|
||
| @Override | ||
| protected Wei value(final MessageFrame frame) { | ||
| return Wei.wrap(frame.getStackItem(2)); | ||
| } | ||
|
|
||
| @Override | ||
| protected Wei apparentValue(final MessageFrame frame) { | ||
| return value(frame); | ||
| } | ||
|
|
||
| @Override | ||
| protected long inputDataOffset(final MessageFrame frame) { | ||
| return clampedToLong(frame.getStackItem(3)); | ||
| } | ||
|
|
||
| @Override | ||
| protected long inputDataLength(final MessageFrame frame) { | ||
| return clampedToLong(frame.getStackItem(4)); | ||
| } | ||
|
|
||
| @Override | ||
| protected long outputDataOffset(final MessageFrame frame) { | ||
| return clampedToLong(frame.getStackItem(5)); | ||
| } | ||
|
|
||
| @Override | ||
| protected long outputDataLength(final MessageFrame frame) { | ||
| return clampedToLong(frame.getStackItem(6)); | ||
| } | ||
|
|
||
| @Override | ||
| protected Address address(final MessageFrame frame) { | ||
| return to(frame); | ||
| } | ||
|
|
||
| @Override | ||
| protected Address sender(final MessageFrame frame) { | ||
| return frame.getAuthorizedBy(); | ||
| } | ||
|
|
||
| @Override | ||
| public long gasAvailableForChildCall(final MessageFrame frame) { | ||
| return gasCalculator().gasAvailableForChildCall(frame, gas(frame), !value(frame).isZero()); | ||
| } | ||
|
|
||
| @Override | ||
| public OperationResult execute(final MessageFrame frame, final EVM evm) { | ||
| if (frame.isStatic() && !value(frame).isZero()) { | ||
| return new OperationResult(cost(frame, true), ExceptionalHaltReason.ILLEGAL_STATE_CHANGE); | ||
| } else if (frame.getAuthorizedBy() != null) { | ||
| return super.execute(frame, evm); | ||
| } else { | ||
| frame.pushStackItem(Bytes32.ZERO); | ||
| return new OperationResult(cost(frame, true), null); | ||
| } | ||
| } | ||
| } |
109 changes: 109 additions & 0 deletions
109
evm/src/main/java/org/hyperledger/besu/evm/operation/AuthOperation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * Copyright contributors to Hyperledger Besu. | ||
| * | ||
| * 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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.evm.operation; | ||
|
|
||
| import static org.hyperledger.besu.evm.internal.Words.clampedToLong; | ||
|
|
||
| import org.hyperledger.besu.crypto.Hash; | ||
| import org.hyperledger.besu.crypto.SECPPublicKey; | ||
| import org.hyperledger.besu.crypto.SECPSignature; | ||
| import org.hyperledger.besu.crypto.SignatureAlgorithm; | ||
| import org.hyperledger.besu.crypto.SignatureAlgorithmFactory; | ||
| import org.hyperledger.besu.datatypes.Address; | ||
| import org.hyperledger.besu.evm.EVM; | ||
| import org.hyperledger.besu.evm.frame.MessageFrame; | ||
| import org.hyperledger.besu.evm.gascalculator.GasCalculator; | ||
| import org.hyperledger.besu.evm.internal.Words; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import org.apache.tuweni.bytes.Bytes; | ||
| import org.apache.tuweni.bytes.Bytes32; | ||
| import org.apache.tuweni.units.bigints.UInt256; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** The AUTH operation. */ | ||
| public class AuthOperation extends AbstractOperation { | ||
|
|
||
| /** The constant MAGIC defined by EIP-3074 */ | ||
| public static final byte MAGIC = 0x4; | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(AuthOperation.class); | ||
|
|
||
| private static final SignatureAlgorithm signatureAlgorithm = | ||
| SignatureAlgorithmFactory.getInstance(); | ||
|
|
||
| /** | ||
| * Instantiates a new AuthOperation. | ||
| * | ||
| * @param gasCalculator a Prague or later gas calculator | ||
| */ | ||
| public AuthOperation(final GasCalculator gasCalculator) { | ||
| super(0xF6, "AUTH", 3, 1, gasCalculator); | ||
| } | ||
|
|
||
| @Override | ||
| public OperationResult execute(final MessageFrame frame, final EVM evm) { | ||
| // create authority from stack | ||
| Address authority = Words.toAddress(frame.getStackItem(0)); | ||
| long offset = clampedToLong(frame.getStackItem(1)); | ||
| long length = clampedToLong(frame.getStackItem(2)); | ||
|
|
||
| byte yParity = frame.readMemory(offset, 1).get(0); | ||
| Bytes32 r = Bytes32.wrap(frame.readMemory(offset + 1, 32)); | ||
| Bytes32 s = Bytes32.wrap(frame.readMemory(offset + 33, 32)); | ||
| Bytes32 commit = Bytes32.wrap(frame.readMemory(offset + 65, 32)); | ||
| Bytes32 invoker = Bytes32.leftPad(frame.getContractAddress()); | ||
| Bytes32 senderNonce = | ||
| Bytes32.leftPad( | ||
| Bytes.ofUnsignedLong(frame.getWorldUpdater().getAccount(authority).getNonce())); | ||
| if (evm.getChainId().isEmpty()) { | ||
| frame.pushStackItem(UInt256.ZERO); | ||
| LOG.error("ChainId is not set"); | ||
| return new OperationResult(0, null); | ||
| } | ||
| Bytes authPreImage = | ||
| Bytes.concatenate( | ||
| Bytes.ofUnsignedShort(MAGIC), evm.getChainId().get(), senderNonce, invoker, commit); | ||
| Bytes32 messageHash = Hash.keccak256(authPreImage); | ||
|
|
||
| final long gasCost = | ||
| super.gasCalculator().authOperationGasCost(frame, offset, length, authority); | ||
| Optional<SECPPublicKey> publicKey; | ||
| try { | ||
| SECPSignature signature = | ||
| signatureAlgorithm.createSignature( | ||
| r.toUnsignedBigInteger(), s.toUnsignedBigInteger(), yParity); | ||
| publicKey = signatureAlgorithm.recoverPublicKeyFromSignature(messageHash, signature); | ||
| } catch (IllegalArgumentException e) { | ||
|
|
||
| frame.pushStackItem(UInt256.ZERO); | ||
| return new OperationResult(gasCost, null); | ||
| } | ||
| if (publicKey.isPresent()) { | ||
| Address signerAddress = Address.extract(publicKey.get()); | ||
| if (signerAddress.equals(authority)) { | ||
| frame.setAuthorizedBy(authority); | ||
| frame.pushStackItem(UInt256.ONE); | ||
| } else { | ||
| frame.pushStackItem(UInt256.ZERO); | ||
| } | ||
| } else { | ||
| frame.pushStackItem(UInt256.ZERO); | ||
| } | ||
| return new OperationResult(gasCost, null); | ||
| } | ||
| } |
Oops, something went wrong.