diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java index efd1c3a24e..71a2601331 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java @@ -19,6 +19,7 @@ import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.condition.PrivateTransactionVerifier; import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.contract.PrivateContractTransactions; import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions; +import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.contract.ContractTransactions; import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetTransactions; import org.junit.After; @@ -28,6 +29,7 @@ public class PrivacyAcceptanceTestBase { @ClassRule public static final TemporaryFolder privacy = new TemporaryFolder(); + protected final NetConditions net; protected final PrivacyTransactions privacyTransactions; protected final PrivateContractVerifier privateContractVerifier; protected final PrivateTransactionVerifier privateTransactionVerifier; @@ -35,8 +37,7 @@ public class PrivacyAcceptanceTestBase { protected final PrivateContractTransactions privateContractTransactions; protected final PrivacyCluster privacyCluster; protected final PrivacyAccountResolver privacyAccountResolver; - - protected final NetConditions net; + protected final ContractTransactions contractTransactions; public PrivacyAcceptanceTestBase() { net = new NetConditions(new NetTransactions()); @@ -47,6 +48,7 @@ public PrivacyAcceptanceTestBase() { privateContractTransactions = new PrivateContractTransactions(); privacyCluster = new PrivacyCluster(net); privacyAccountResolver = new PrivacyAccountResolver(); + contractTransactions = new ContractTransactions(); } @After diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/CrossContractReader.sol b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/CrossContractReader.sol new file mode 100644 index 0000000000..7df08c6f0d --- /dev/null +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/CrossContractReader.sol @@ -0,0 +1,60 @@ +/* + * Copyright 2018 ConsenSys AG. + * + * 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. + */ +pragma solidity >=0.4.0 <0.6.0; + +import "./EventEmitter.sol"; + +// compile with: +// solc CrossContractReader.sol --bin --abi --optimize --overwrite -o . +// then create web3j wrappers with: +// web3j solidity generate -b ./generated/CrossContractReader.bin -a ./generated/CrossContractReader.abi -o ../../../../../ -p tech.pegasys.pantheon.tests.web3j.generated +contract CrossContractReader { + uint counter; + + event NewEventEmitter( + address contractAddress + ); + + function read(address emitter_address) view public returns (uint) { + EventEmitter em = EventEmitter(emitter_address); + return em.value(); + } + + function deploy() public { + EventEmitter em = new EventEmitter(); + emit NewEventEmitter(address(em)); + } + + function deployRemote(address crossAddress) public { + CrossContractReader cross = CrossContractReader(crossAddress); + cross.deploy(); + } + + function increment() public { + counter++; + } + + function incrementRemote(address crossAddress) public { + CrossContractReader cross = CrossContractReader(crossAddress); + cross.increment(); + } + + function destroy() public { + selfdestruct(msg.sender); + } + + function remoteDestroy(address crossAddress) public { + CrossContractReader cross = CrossContractReader(crossAddress); + cross.destroy(); + } +} diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.abi b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.abi new file mode 100644 index 0000000000..36edfd6c59 --- /dev/null +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.abi @@ -0,0 +1 @@ +[{"constant":false,"inputs":[{"name":"crossAddress","type":"address"}],"name":"remoteDestroy","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"crossAddress","type":"address"}],"name":"deployRemote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"deploy","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"destroy","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"emitter_address","type":"address"}],"name":"read","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"increment","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"crossAddress","type":"address"}],"name":"incrementRemote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"contractAddress","type":"address"}],"name":"NewEventEmitter","type":"event"}] \ No newline at end of file diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.bin b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.bin new file mode 100644 index 0000000000..969f3c61b5 --- /dev/null +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.bin @@ -0,0 +1 @@ +608060405234801561001057600080fd5b506104b7806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c806383197ef01161005b57806383197ef0146100d8578063a087a87e146100e0578063d09de08a14610118578063e689ef8a146101205761007d565b8063305155f9146100825780635374ded2146100aa578063775c300c146100d0575b600080fd5b6100a86004803603602081101561009857600080fd5b50356001600160a01b0316610146565b005b6100a8600480360360208110156100c057600080fd5b50356001600160a01b03166101a2565b6100a86101e2565b6100a8610250565b610106600480360360208110156100f657600080fd5b50356001600160a01b0316610253565b60408051918252519081900360200190f35b6100a86102c5565b6100a86004803603602081101561013657600080fd5b50356001600160a01b03166102d0565b6000819050806001600160a01b03166383197ef06040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b505af115801561019a573d6000803e3d6000fd5b505050505050565b6000819050806001600160a01b031663775c300c6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b60006040516101f090610310565b604051809103906000f08015801561020c573d6000803e3d6000fd5b50604080516001600160a01b038316815290519192507f9ac6876e0aa40667ffeaa9b359b5ed924f4cdd0e029eb6e9c369e78c68f711fb919081900360200190a150565b33ff5b600080829050806001600160a01b0316633fa4f2456040518163ffffffff1660e01b815260040160206040518083038186803b15801561029257600080fd5b505afa1580156102a6573d6000803e3d6000fd5b505050506040513d60208110156102bc57600080fd5b50519392505050565b600080546001019055565b6000819050806001600160a01b031663d09de08a6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b6101658061031e8339019056fe608060405234801561001057600080fd5b50600080546001600160a01b03191633179055610133806100326000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c80633fa4f2451460415780636057361d14605957806367e404ce146075575b600080fd5b60476097565b60408051918252519081900360200190f35b607360048036036020811015606d57600080fd5b5035609d565b005b607b60ef565b604080516001600160a01b039092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a1600255600180546001600160a01b03191633179055565b6001546001600160a01b03169056fea265627a7a72305820964d6b1168cda84ea2a5bea18eef49bd496a1ff53f7be8178e00cca5dbec045764736f6c634300050a0032a265627a7a7230582079237493de0e17a01cb879d43a4a4eb29831a77717b1e156f133a8972139e94364736f6c634300050a0032 \ No newline at end of file diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.java new file mode 100644 index 0000000000..acb606a053 --- /dev/null +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/CrossContractReader.java @@ -0,0 +1,274 @@ +/* + * Copyright 2019 ConsenSys AG. + * + * 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. + */ +package tech.pegasys.pantheon.tests.web3j.generated; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import io.reactivex.Flowable; +import org.web3j.abi.EventEncoder; +import org.web3j.abi.TypeReference; +import org.web3j.abi.datatypes.Address; +import org.web3j.abi.datatypes.Event; +import org.web3j.abi.datatypes.Function; +import org.web3j.abi.datatypes.Type; +import org.web3j.abi.datatypes.generated.Uint256; +import org.web3j.crypto.Credentials; +import org.web3j.protocol.Web3j; +import org.web3j.protocol.core.DefaultBlockParameter; +import org.web3j.protocol.core.RemoteCall; +import org.web3j.protocol.core.methods.request.EthFilter; +import org.web3j.protocol.core.methods.response.Log; +import org.web3j.protocol.core.methods.response.TransactionReceipt; +import org.web3j.tx.Contract; +import org.web3j.tx.TransactionManager; +import org.web3j.tx.gas.ContractGasProvider; + +/** + * Auto generated code. + * + *

Do not modify! + * + *

Please use the web3j command line tools, + * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the codegen module to update. + * + *

Generated with web3j version 4.2.0. + */ +@SuppressWarnings("rawtypes") +public class CrossContractReader extends Contract { + private static final String BINARY = + "608060405234801561001057600080fd5b506104b7806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c806383197ef01161005b57806383197ef0146100d8578063a087a87e146100e0578063d09de08a14610118578063e689ef8a146101205761007d565b8063305155f9146100825780635374ded2146100aa578063775c300c146100d0575b600080fd5b6100a86004803603602081101561009857600080fd5b50356001600160a01b0316610146565b005b6100a8600480360360208110156100c057600080fd5b50356001600160a01b03166101a2565b6100a86101e2565b6100a8610250565b610106600480360360208110156100f657600080fd5b50356001600160a01b0316610253565b60408051918252519081900360200190f35b6100a86102c5565b6100a86004803603602081101561013657600080fd5b50356001600160a01b03166102d0565b6000819050806001600160a01b03166383197ef06040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b505af115801561019a573d6000803e3d6000fd5b505050505050565b6000819050806001600160a01b031663775c300c6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b60006040516101f090610310565b604051809103906000f08015801561020c573d6000803e3d6000fd5b50604080516001600160a01b038316815290519192507f9ac6876e0aa40667ffeaa9b359b5ed924f4cdd0e029eb6e9c369e78c68f711fb919081900360200190a150565b33ff5b600080829050806001600160a01b0316633fa4f2456040518163ffffffff1660e01b815260040160206040518083038186803b15801561029257600080fd5b505afa1580156102a6573d6000803e3d6000fd5b505050506040513d60208110156102bc57600080fd5b50519392505050565b600080546001019055565b6000819050806001600160a01b031663d09de08a6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b6101658061031e8339019056fe608060405234801561001057600080fd5b50600080546001600160a01b03191633179055610133806100326000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c80633fa4f2451460415780636057361d14605957806367e404ce146075575b600080fd5b60476097565b60408051918252519081900360200190f35b607360048036036020811015606d57600080fd5b5035609d565b005b607b60ef565b604080516001600160a01b039092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a1600255600180546001600160a01b03191633179055565b6001546001600160a01b03169056fea265627a7a72305820964d6b1168cda84ea2a5bea18eef49bd496a1ff53f7be8178e00cca5dbec045764736f6c634300050a0032a265627a7a7230582079237493de0e17a01cb879d43a4a4eb29831a77717b1e156f133a8972139e94364736f6c634300050a0032"; + + public static final String FUNC_REMOTEDESTROY = "remoteDestroy"; + + public static final String FUNC_DEPLOYREMOTE = "deployRemote"; + + public static final String FUNC_DESTROY = "destroy"; + + public static final String FUNC_READ = "read"; + + public static final String FUNC_INCREMENT = "increment"; + + public static final String FUNC_INCREMENTREMOTE = "incrementRemote"; + + public static final Event NEWEVENTEMITTER_EVENT = + new Event( + "NewEventEmitter", Arrays.>asList(new TypeReference

() {}));; + + @Deprecated + protected CrossContractReader( + String contractAddress, + Web3j web3j, + Credentials credentials, + BigInteger gasPrice, + BigInteger gasLimit) { + super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit); + } + + protected CrossContractReader( + String contractAddress, + Web3j web3j, + Credentials credentials, + ContractGasProvider contractGasProvider) { + super(BINARY, contractAddress, web3j, credentials, contractGasProvider); + } + + @Deprecated + protected CrossContractReader( + String contractAddress, + Web3j web3j, + TransactionManager transactionManager, + BigInteger gasPrice, + BigInteger gasLimit) { + super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit); + } + + protected CrossContractReader( + String contractAddress, + Web3j web3j, + TransactionManager transactionManager, + ContractGasProvider contractGasProvider) { + super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider); + } + + public RemoteCall remoteDestroy(String crossAddress) { + final Function function = + new Function( + FUNC_REMOTEDESTROY, + Arrays.asList(new org.web3j.abi.datatypes.Address(crossAddress)), + Collections.>emptyList()); + return executeRemoteCallTransaction(function); + } + + public RemoteCall deployRemote(String crossAddress) { + final Function function = + new Function( + FUNC_DEPLOYREMOTE, + Arrays.asList(new org.web3j.abi.datatypes.Address(crossAddress)), + Collections.>emptyList()); + return executeRemoteCallTransaction(function); + } + + public RemoteCall deploy() { + final Function function = + new Function(FUNC_DEPLOY, Arrays.asList(), Collections.>emptyList()); + return executeRemoteCallTransaction(function); + } + + public RemoteCall destroy() { + final Function function = + new Function( + FUNC_DESTROY, Arrays.asList(), Collections.>emptyList()); + return executeRemoteCallTransaction(function); + } + + public RemoteCall read(String emitter_address) { + final Function function = + new Function( + FUNC_READ, + Arrays.asList(new org.web3j.abi.datatypes.Address(emitter_address)), + Arrays.>asList(new TypeReference() {})); + return executeRemoteCallSingleValueReturn(function, BigInteger.class); + } + + public RemoteCall increment() { + final Function function = + new Function( + FUNC_INCREMENT, Arrays.asList(), Collections.>emptyList()); + return executeRemoteCallTransaction(function); + } + + public RemoteCall incrementRemote(String crossAddress) { + final Function function = + new Function( + FUNC_INCREMENTREMOTE, + Arrays.asList(new org.web3j.abi.datatypes.Address(crossAddress)), + Collections.>emptyList()); + return executeRemoteCallTransaction(function); + } + + public List getNewEventEmitterEvents( + TransactionReceipt transactionReceipt) { + List valueList = + extractEventParametersWithLog(NEWEVENTEMITTER_EVENT, transactionReceipt); + ArrayList responses = + new ArrayList(valueList.size()); + for (Contract.EventValuesWithLog eventValues : valueList) { + NewEventEmitterEventResponse typedResponse = new NewEventEmitterEventResponse(); + typedResponse.log = eventValues.getLog(); + typedResponse.contractAddress = (String) eventValues.getNonIndexedValues().get(0).getValue(); + responses.add(typedResponse); + } + return responses; + } + + public Flowable newEventEmitterEventFlowable(EthFilter filter) { + return web3j + .ethLogFlowable(filter) + .map( + new io.reactivex.functions.Function() { + @Override + public NewEventEmitterEventResponse apply(Log log) { + Contract.EventValuesWithLog eventValues = + extractEventParametersWithLog(NEWEVENTEMITTER_EVENT, log); + NewEventEmitterEventResponse typedResponse = new NewEventEmitterEventResponse(); + typedResponse.log = log; + typedResponse.contractAddress = + (String) eventValues.getNonIndexedValues().get(0).getValue(); + return typedResponse; + } + }); + } + + public Flowable newEventEmitterEventFlowable( + DefaultBlockParameter startBlock, DefaultBlockParameter endBlock) { + EthFilter filter = new EthFilter(startBlock, endBlock, getContractAddress()); + filter.addSingleTopic(EventEncoder.encode(NEWEVENTEMITTER_EVENT)); + return newEventEmitterEventFlowable(filter); + } + + @Deprecated + public static CrossContractReader load( + String contractAddress, + Web3j web3j, + Credentials credentials, + BigInteger gasPrice, + BigInteger gasLimit) { + return new CrossContractReader(contractAddress, web3j, credentials, gasPrice, gasLimit); + } + + @Deprecated + public static CrossContractReader load( + String contractAddress, + Web3j web3j, + TransactionManager transactionManager, + BigInteger gasPrice, + BigInteger gasLimit) { + return new CrossContractReader(contractAddress, web3j, transactionManager, gasPrice, gasLimit); + } + + public static CrossContractReader load( + String contractAddress, + Web3j web3j, + Credentials credentials, + ContractGasProvider contractGasProvider) { + return new CrossContractReader(contractAddress, web3j, credentials, contractGasProvider); + } + + public static CrossContractReader load( + String contractAddress, + Web3j web3j, + TransactionManager transactionManager, + ContractGasProvider contractGasProvider) { + return new CrossContractReader(contractAddress, web3j, transactionManager, contractGasProvider); + } + + public static RemoteCall deploy( + Web3j web3j, Credentials credentials, ContractGasProvider contractGasProvider) { + return deployRemoteCall( + CrossContractReader.class, web3j, credentials, contractGasProvider, BINARY, ""); + } + + @Deprecated + public static RemoteCall deploy( + Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) { + return deployRemoteCall( + CrossContractReader.class, web3j, credentials, gasPrice, gasLimit, BINARY, ""); + } + + public static RemoteCall deploy( + Web3j web3j, TransactionManager transactionManager, ContractGasProvider contractGasProvider) { + return deployRemoteCall( + CrossContractReader.class, web3j, transactionManager, contractGasProvider, BINARY, ""); + } + + @Deprecated + public static RemoteCall deploy( + Web3j web3j, + TransactionManager transactionManager, + BigInteger gasPrice, + BigInteger gasLimit) { + return deployRemoteCall( + CrossContractReader.class, web3j, transactionManager, gasPrice, gasLimit, BINARY, ""); + } + + public static class NewEventEmitterEventResponse { + public Log log; + + public String contractAddress; + } +} diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivateContractPublicStateAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivateContractPublicStateAcceptanceTest.java new file mode 100644 index 0000000000..e192651cc9 --- /dev/null +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivateContractPublicStateAcceptanceTest.java @@ -0,0 +1,163 @@ +/* + * Copyright 2019 ConsenSys AG. + * + * 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. + */ +package tech.pegasys.pantheon.tests.web3j.privacy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; +import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; +import tech.pegasys.pantheon.tests.web3j.generated.CrossContractReader; +import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter; + +import java.math.BigInteger; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.web3j.protocol.core.methods.response.TransactionReceipt; +import org.web3j.protocol.eea.response.PrivateTransactionReceipt; +import org.web3j.tx.exceptions.ContractCallException; + +public class PrivateContractPublicStateAcceptanceTest extends PrivacyAcceptanceTestBase { + private static final long POW_CHAIN_ID = 2018; + + private PrivacyNode minerNode; + + @Before + public void setUp() throws Exception { + minerNode = + privacyPantheon.createPrivateTransactionEnabledMinerNode( + "miner-node", privacyAccountResolver.resolve(0)); + privacyCluster.start(minerNode); + } + + @Test + public void mustAllowAccessToPublicStateFromPrivateTx() throws Exception { + final EventEmitter publicEventEmitter = + minerNode + .getPantheon() + .execute((contractTransactions.createSmartContract(EventEmitter.class))); + + final TransactionReceipt receipt = publicEventEmitter.store(BigInteger.valueOf(12)).send(); + assertNotNull(receipt); + + final CrossContractReader reader = + minerNode + .getPantheon() + .execute( + privateContractTransactions.createSmartContract( + CrossContractReader.class, + minerNode.getTransactionSigningKey(), + POW_CHAIN_ID, + minerNode.getEnclaveKey())); + Assert.assertEquals( + reader.read(publicEventEmitter.getContractAddress()).send(), BigInteger.valueOf(12)); + } + + @Test(expected = ContractCallException.class) + public void mustNotAllowAccessToPrivateStateFromPublicTx() throws Exception { + final EventEmitter privateEventEmitter = + minerNode + .getPantheon() + .execute( + (privateContractTransactions.createSmartContract( + EventEmitter.class, + minerNode.getTransactionSigningKey(), + POW_CHAIN_ID, + minerNode.getEnclaveKey()))); + + final TransactionReceipt receipt = privateEventEmitter.store(BigInteger.valueOf(12)).send(); + assertNotNull(receipt); + + final CrossContractReader publicReader = + minerNode + .getPantheon() + .execute(contractTransactions.createSmartContract(CrossContractReader.class)); + + publicReader.read(privateEventEmitter.getContractAddress()).send(); + } + + @Test + public void privateContractMustNotBeAbleToCallPublicContractWhichChangesState() throws Exception { + final CrossContractReader privateReader = + minerNode + .getPantheon() + .execute( + privateContractTransactions.createSmartContract( + CrossContractReader.class, + minerNode.getTransactionSigningKey(), + POW_CHAIN_ID, + minerNode.getEnclaveKey())); + + final CrossContractReader publicReader = + minerNode + .getPantheon() + .execute(contractTransactions.createSmartContract(CrossContractReader.class)); + + final PrivateTransactionReceipt transactionReceipt = + (PrivateTransactionReceipt) + privateReader.incrementRemote(publicReader.getContractAddress()).send(); + + assertEquals("0x", transactionReceipt.getOutput()); + } + + @Test + public void privateContractMustNotBeAbleToCallPublicContractWhichInstantiatesContract() + throws Exception { + final CrossContractReader privateReader = + minerNode + .getPantheon() + .execute( + privateContractTransactions.createSmartContract( + CrossContractReader.class, + minerNode.getTransactionSigningKey(), + POW_CHAIN_ID, + minerNode.getEnclaveKey())); + + final CrossContractReader publicReader = + minerNode + .getPantheon() + .execute(contractTransactions.createSmartContract(CrossContractReader.class)); + + final PrivateTransactionReceipt transactionReceipt = + (PrivateTransactionReceipt) + privateReader.deployRemote(publicReader.getContractAddress()).send(); + + assertEquals(0, transactionReceipt.getLogs().size()); + } + + @Test + public void privateContractMustNotBeAbleToCallSelfDetructOfPublicContract() throws Exception { + final CrossContractReader privateReader = + minerNode + .getPantheon() + .execute( + privateContractTransactions.createSmartContract( + CrossContractReader.class, + minerNode.getTransactionSigningKey(), + POW_CHAIN_ID, + minerNode.getEnclaveKey())); + + final CrossContractReader publicReader = + minerNode + .getPantheon() + .execute(contractTransactions.createSmartContract(CrossContractReader.class)); + + final PrivateTransactionReceipt transactionReceipt = + (PrivateTransactionReceipt) + privateReader.remoteDestroy(publicReader.getContractAddress()).send(); + + assertEquals("0x", transactionReceipt.getOutput()); + } +} diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ReadOnlyMutableAccount.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ReadOnlyMutableAccount.java new file mode 100644 index 0000000000..cc79790e42 --- /dev/null +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ReadOnlyMutableAccount.java @@ -0,0 +1,115 @@ +/* + * Copyright 2019 ConsenSys AG. + * + * 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. + */ +package tech.pegasys.pantheon.ethereum.core; + +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; + +import java.util.Map; +import java.util.NavigableMap; + +public class ReadOnlyMutableAccount implements MutableAccount { + + private MutableAccount mutableAccount; + + public ReadOnlyMutableAccount(final MutableAccount publicAccount) { + this.mutableAccount = publicAccount; + } + + @Override + public void setNonce(final long value) { + throw new UnsupportedOperationException(); + } + + @Override + public void setBalance(final Wei value) { + throw new UnsupportedOperationException(); + } + + @Override + public void setCode(final BytesValue code) { + throw new UnsupportedOperationException(); + } + + @Override + public void setVersion(final int version) { + throw new UnsupportedOperationException(); + } + + @Override + public void setStorageValue(final UInt256 key, final UInt256 value) { + throw new UnsupportedOperationException(); + } + + @Override + public void clearStorage() { + throw new UnsupportedOperationException(); + } + + @Override + public Map getUpdatedStorage() { + return mutableAccount.getUpdatedStorage(); + } + + @Override + public Address getAddress() { + return mutableAccount.getAddress(); + } + + @Override + public Hash getAddressHash() { + return mutableAccount.getAddressHash(); + } + + @Override + public long getNonce() { + return mutableAccount.getNonce(); + } + + @Override + public Wei getBalance() { + return mutableAccount.getBalance(); + } + + @Override + public BytesValue getCode() { + return mutableAccount.getCode(); + } + + @Override + public Hash getCodeHash() { + return mutableAccount.getCodeHash(); + } + + @Override + public int getVersion() { + return mutableAccount.getVersion(); + } + + @Override + public UInt256 getStorageValue(final UInt256 key) { + return mutableAccount.getStorageValue(key); + } + + @Override + public UInt256 getOriginalStorageValue(final UInt256 key) { + return mutableAccount.getOriginalStorageValue(key); + } + + @Override + public NavigableMap storageEntriesFrom( + final Bytes32 startKeyHash, final int limit) { + throw new UnsupportedOperationException(); + } +} diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java index 99b5dbe3e6..2d1d5fa4d1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java @@ -16,6 +16,7 @@ import tech.pegasys.pantheon.ethereum.core.Address; import tech.pegasys.pantheon.ethereum.core.Gas; import tech.pegasys.pantheon.ethereum.core.MutableAccount; +import tech.pegasys.pantheon.ethereum.core.ReadOnlyMutableAccount; import tech.pegasys.pantheon.ethereum.vm.EVM; import tech.pegasys.pantheon.ethereum.vm.GasCalculator; import tech.pegasys.pantheon.ethereum.vm.MessageFrame; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java index 7ca1a1dc8a..ff7840c279 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java @@ -32,6 +32,7 @@ import tech.pegasys.pantheon.ethereum.vm.GasCalculator; import tech.pegasys.pantheon.ethereum.vm.MessageFrame; import tech.pegasys.pantheon.ethereum.vm.OperationTracer; +import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutablePrivateWorldStateUpdater; import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayDeque; @@ -210,6 +211,10 @@ public Result processTransaction( final MessageFrame initialFrame; final Deque messageFrameStack = new ArrayDeque<>(); + + final WorldUpdater mutablePrivateWorldStateUpdater = + new DefaultMutablePrivateWorldStateUpdater(publicWorldState, privateWorldState.updater()); + if (transaction.isContractCreation()) { final Address privateContractAddress = Address.privateContractAddress(senderAddress, previousNonce, privacyGroupId); @@ -226,7 +231,7 @@ public Result processTransaction( .type(MessageFrame.Type.CONTRACT_CREATION) .messageFrameStack(messageFrameStack) .blockchain(blockchain) - .worldState(privateWorldState.updater()) + .worldState(mutablePrivateWorldStateUpdater) .address(privateContractAddress) .originator(senderAddress) .contract(privateContractAddress) @@ -255,7 +260,7 @@ public Result processTransaction( .type(MessageFrame.Type.MESSAGE_CALL) .messageFrameStack(messageFrameStack) .blockchain(blockchain) - .worldState(privateWorldState.updater()) + .worldState(mutablePrivateWorldStateUpdater) .address(to) .originator(senderAddress) .contract(to) diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java index bb8a23c87e..011a0342aa 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java @@ -15,6 +15,7 @@ import tech.pegasys.pantheon.ethereum.core.Address; import tech.pegasys.pantheon.ethereum.core.Gas; import tech.pegasys.pantheon.ethereum.core.MutableAccount; +import tech.pegasys.pantheon.ethereum.core.ReadOnlyMutableAccount; import tech.pegasys.pantheon.ethereum.core.Wei; import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; import tech.pegasys.pantheon.ethereum.vm.Code; @@ -89,6 +90,11 @@ private void fail(final MessageFrame frame) { private void spawnChildMessage(final MessageFrame frame) { final Address address = frame.getRecipientAddress(); final MutableAccount account = frame.getWorldState().getMutable(address); + if (account instanceof ReadOnlyMutableAccount) { + frame.setState(MessageFrame.State.EXCEPTIONAL_HALT); + return; + } + account.incrementNonce(); final Wei value = Wei.wrap(frame.getStackItem(0)); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java index 2e81e21810..2e65599865 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java @@ -15,6 +15,7 @@ import tech.pegasys.pantheon.ethereum.core.Account; import tech.pegasys.pantheon.ethereum.core.Gas; import tech.pegasys.pantheon.ethereum.core.MutableAccount; +import tech.pegasys.pantheon.ethereum.core.ReadOnlyMutableAccount; import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; import tech.pegasys.pantheon.ethereum.vm.EVM; import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; @@ -69,6 +70,9 @@ public Optional exceptionalHaltCondition( return Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE); } else if (frame.getRemainingGas().compareTo(minumumGasRemaining) < 0) { return Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS); + } else if (frame.getWorldState().getMutable(frame.getRecipientAddress()) + instanceof ReadOnlyMutableAccount) { + return Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE); } else { return Optional.empty(); } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java index 41b35c37d9..3e4bee3437 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java @@ -16,6 +16,7 @@ import tech.pegasys.pantheon.ethereum.core.Address; import tech.pegasys.pantheon.ethereum.core.Gas; import tech.pegasys.pantheon.ethereum.core.MutableAccount; +import tech.pegasys.pantheon.ethereum.core.ReadOnlyMutableAccount; import tech.pegasys.pantheon.ethereum.core.Wei; import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; import tech.pegasys.pantheon.ethereum.vm.EVM; @@ -64,7 +65,10 @@ public Optional exceptionalHaltCondition( final MessageFrame frame, final EnumSet previousReasons, final EVM evm) { + return frame.isStatic() + || frame.getWorldState().getMutable(frame.getRecipientAddress()) + instanceof ReadOnlyMutableAccount ? Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE) : Optional.empty(); } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java new file mode 100644 index 0000000000..037018c871 --- /dev/null +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java @@ -0,0 +1,96 @@ +/* + * Copyright 2019 ConsenSys AG. + * + * 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. + */ +package tech.pegasys.pantheon.ethereum.worldstate; + +import tech.pegasys.pantheon.ethereum.core.Account; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.MutableAccount; +import tech.pegasys.pantheon.ethereum.core.ReadOnlyMutableAccount; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.core.WorldUpdater; + +import java.util.Collection; + +public class DefaultMutablePrivateWorldStateUpdater implements WorldUpdater { + + private final WorldUpdater publicWorldUpdater; + private final WorldUpdater privateWorldUpdater; + + public DefaultMutablePrivateWorldStateUpdater( + final WorldUpdater publicWorldUpdater, final WorldUpdater privateWorldUpdater) { + this.publicWorldUpdater = publicWorldUpdater; + this.privateWorldUpdater = privateWorldUpdater; + } + + @Override + public MutableAccount createAccount(final Address address, final long nonce, final Wei balance) { + return privateWorldUpdater.createAccount(address); + } + + @Override + public MutableAccount createAccount(final Address address) { + return privateWorldUpdater.createAccount(address); + } + + @Override + public MutableAccount getOrCreate(final Address address) { + return privateWorldUpdater.getOrCreate(address); + } + + @Override + public MutableAccount getMutable(final Address address) { + final MutableAccount privateAccount = privateWorldUpdater.getMutable(address); + if (privateAccount != null && !privateAccount.isEmpty()) { + return privateAccount; + } + final MutableAccount publicAccount = publicWorldUpdater.getMutable(address); + if (publicAccount != null && !publicAccount.isEmpty()) { + return new ReadOnlyMutableAccount(publicAccount); + } + return null; + } + + @Override + public void deleteAccount(final Address address) { + privateWorldUpdater.deleteAccount(address); + } + + @Override + public Collection getTouchedAccounts() { + return privateWorldUpdater.getTouchedAccounts(); + } + + @Override + public void revert() { + privateWorldUpdater.revert(); + } + + @Override + public void commit() { + privateWorldUpdater.commit(); + } + + @Override + public Account get(final Address address) { + final Account privateAccount = privateWorldUpdater.get(address); + if (privateAccount != null && !privateAccount.isEmpty()) { + return privateAccount; + } + return publicWorldUpdater.get(address); + } + + @Override + public WorldUpdater updater() { + return this; + } +}