This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PrivacyMarkerTransaction to be signed with a randomly generated key (#…
- Loading branch information
Showing
18 changed files
with
465 additions
and
96 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
45 changes: 45 additions & 0 deletions
45
...on/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.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,45 @@ | ||
| /* | ||
| * 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.privacy.markertransaction; | ||
|
|
||
| import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; | ||
| import tech.pegasys.pantheon.ethereum.core.Address; | ||
| import tech.pegasys.pantheon.ethereum.core.Transaction; | ||
| import tech.pegasys.pantheon.ethereum.core.Util; | ||
| import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; | ||
| import tech.pegasys.pantheon.ethereum.util.NonceProvider; | ||
|
|
||
| public class FixedKeySigningPrivateMarkerTransactionFactory | ||
| extends PrivateMarkerTransactionFactory { | ||
|
|
||
| private final NonceProvider nonceProvider; | ||
| private final KeyPair signingKey; | ||
| private final Address sender; | ||
|
|
||
| public FixedKeySigningPrivateMarkerTransactionFactory( | ||
| final Address privacyPrecompileAddress, | ||
| final NonceProvider nonceProvider, | ||
| final KeyPair signingKey) { | ||
| super(privacyPrecompileAddress); | ||
| this.nonceProvider = nonceProvider; | ||
| this.signingKey = signingKey; | ||
| this.sender = Util.publicKeyToAddress(signingKey.getPublicKey()); | ||
| } | ||
|
|
||
| @Override | ||
| public Transaction create( | ||
| final String transactionEnclaveKey, final PrivateTransaction privateTransaction) { | ||
| return create( | ||
| transactionEnclaveKey, privateTransaction, nonceProvider.getNonce(sender), signingKey); | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
.../pegasys/pantheon/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.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,50 @@ | ||
| /* | ||
| * 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.privacy.markertransaction; | ||
|
|
||
| import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; | ||
| import tech.pegasys.pantheon.ethereum.core.Address; | ||
| import tech.pegasys.pantheon.ethereum.core.Transaction; | ||
| import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; | ||
| import tech.pegasys.pantheon.util.bytes.BytesValues; | ||
|
|
||
| public abstract class PrivateMarkerTransactionFactory { | ||
|
|
||
| private final Address privacyPrecompileAddress; | ||
|
|
||
| public PrivateMarkerTransactionFactory(final Address privacyPrecompileAddress) { | ||
| this.privacyPrecompileAddress = privacyPrecompileAddress; | ||
| } | ||
|
|
||
| private Address getPrivacyPrecompileAddress() { | ||
| return privacyPrecompileAddress; | ||
| } | ||
|
|
||
| public abstract Transaction create( | ||
| final String transactionEnclaveKey, final PrivateTransaction privateTransaction); | ||
|
|
||
| protected Transaction create( | ||
| final String transactionEnclaveKey, | ||
| final PrivateTransaction privateTransaction, | ||
| final long nonce, | ||
| final KeyPair signingKey) { | ||
| return Transaction.builder() | ||
| .nonce(nonce) | ||
| .gasPrice(privateTransaction.getGasPrice()) | ||
| .gasLimit(privateTransaction.getGasLimit()) | ||
| .to(getPrivacyPrecompileAddress()) | ||
| .value(privateTransaction.getValue()) | ||
| .payload(BytesValues.fromBase64(transactionEnclaveKey)) | ||
| .signAndBuild(signingKey); | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
...heon/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.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,32 @@ | ||
| /* | ||
| * 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.privacy.markertransaction; | ||
|
|
||
| import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; | ||
| import tech.pegasys.pantheon.ethereum.core.Address; | ||
| import tech.pegasys.pantheon.ethereum.core.Transaction; | ||
| import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; | ||
|
|
||
| public class RandomSigningPrivateMarkerTransactionFactory extends PrivateMarkerTransactionFactory { | ||
|
|
||
| public RandomSigningPrivateMarkerTransactionFactory(final Address privacyPrecompileAddress) { | ||
| super(privacyPrecompileAddress); | ||
| } | ||
|
|
||
| @Override | ||
| public Transaction create( | ||
| final String transactionEnclaveKey, final PrivateTransaction privateTransaction) { | ||
| final KeyPair signingKey = KeyPair.generate(); | ||
| return create(transactionEnclaveKey, privateTransaction, 0, signingKey); | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/NonceProvider.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,21 @@ | ||
| /* | ||
| * 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.util; | ||
|
|
||
| import tech.pegasys.pantheon.ethereum.core.Address; | ||
|
|
||
| @FunctionalInterface | ||
| public interface NonceProvider { | ||
|
|
||
| long getNonce(final Address address); | ||
| } |
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
Oops, something went wrong.