Merge pull request #1233 from ConsenSys/revert-1231-consensysengineering-privacy-support-using-precompile-v3

Revert "Privacy Precompile: enables private transactions with extended obfuscated fields"

Author: nmvalera

accounts/abi/bind/backend.go

@@ -84,9 +84,6 @@ type ContractTransactor interface {
 	SendTransaction(ctx context.Context, tx *types.Transaction, args PrivateTxArgs) error
 	// PreparePrivateTransaction send the private transaction to Tessera/Constellation's /storeraw API using HTTP
 	PreparePrivateTransaction(data []byte, privateFrom string) (common.EncryptedPayloadHash, error)
-	// DistributeTransaction distributes the private transaction payload to its private recipients, and sends the
-	// private transaction to the nodes PTM, returning a PTM hash for the Private Marker Transaction
-	DistributeTransaction(ctx context.Context, tx *types.Transaction, args PrivateTxArgs) (string, error)
 }
 
 // ContractFilterer defines the methods needed to access log events using one-off

accounts/abi/bind/backends/simulated.go

@@ -602,10 +602,6 @@ func (b *SimulatedBackend) PreparePrivateTransaction(data []byte, privateFrom st
 	return common.EncryptedPayloadHash{}, nil
 }
 
-func (b *SimulatedBackend) DistributeTransaction(ctx context.Context, tx *types.Transaction, args bind.PrivateTxArgs) (string, error) {
-	return tx.Hash().String(), nil
-}
-
 // FilterLogs executes a log filter operation, blocking during execution and
 // returning all the results in one batch.
 //

accounts/abi/bind/base.go

@@ -63,9 +63,8 @@ type TransactOpts struct {
 	Context context.Context // Network context to support cancellation and timeouts (nil = no timeout)
 
 	// Quorum
-	PrivateFrom              string   // The public key of the Tessera/Constellation identity to send this tx from.
-	PrivateFor               []string // The public keys of the Tessera/Constellation identities this tx is intended for.
-	IsUsingPrivacyPrecompile bool
+	PrivateFrom string   // The public key of the Tessera/Constellation identity to send this tx from.
+	PrivateFor  []string // The public keys of the Tessera/Constellation identities this tx is intended for.
 }
 
 // FilterOpts is the collection of options to fine tune filtering for events
@@ -277,11 +276,6 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
 		}
 		payload = hash.Bytes()
 		rawTx = c.createPrivateTransaction(rawTx, payload)
-
-		if opts.IsUsingPrivacyPrecompile {
-			rawTx, _ = c.createMarkerTx(opts, rawTx, PrivateTxArgs{PrivateFor: opts.PrivateFor})
-			opts.PrivateFor = nil
-		}
 	}
 
 	// Choose signer to sign transaction
@@ -430,25 +424,6 @@ func (c *BoundContract) createPrivateTransaction(tx *types.Transaction, payload
 	return privateTx
 }
 
-// (Quorum) createMarkerTx creates a new public privacy marker transaction for the given private tx, distributing tx to the specified privateFor recipients
-func (c *BoundContract) createMarkerTx(opts *TransactOpts, tx *types.Transaction, args PrivateTxArgs) (*types.Transaction, error) {
-	// Choose signer to sign transaction
-	if opts.Signer == nil {
-		return nil, errors.New("no signer to authorize the transaction with")
-	}
-	signedTx, err := opts.Signer(types.QuorumPrivateTxSigner{}, opts.From, tx)
-	if err != nil {
-		return nil, err
-	}
-
-	hash, err := c.transactor.DistributeTransaction(ensureContext(opts.Context), signedTx, args)
-	if err != nil {
-		return nil, err
-	}
-
-	return types.NewTransaction(signedTx.Nonce(), common.QuorumPrivacyPrecompileContractAddress(), tx.Value(), tx.Gas(), tx.GasPrice(), common.FromHex(hash)), nil
-}
-
 // ensureContext is a helper method to ensure a context is not nil, even if the
 // user specified it as such.
 func ensureContext(ctx context.Context) context.Context {

accounts/abi/bind/bind_quorum_test.go

@@ -171,11 +171,6 @@ func checkWhisper(ctx *cli.Context) {
 func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	stack, cfg := makeConfigNode(ctx)
 
-	//Must occur before registering the extension service, as it needs an initialised PTM to be enabled
-	if err := quorumInitialisePrivacy(ctx); err != nil {
-		utils.Fatalf("Error initialising Private Transaction Manager: %s", err.Error())
-	}
-
 	// Quorum - returning `ethService` too for the Raft and extension service
 	backend, ethService := utils.RegisterEthService(stack, &cfg.Eth)
 

cmd/geth/config.go

@@ -182,7 +182,6 @@ var (
 		utils.EVMCallTimeOutFlag,
 		utils.MultitenancyFlag,
 		utils.RevertReasonFlag,
-		utils.QuorumEnablePrivacyMarker,
 		utils.QuorumPTMUnixSocketFlag,
 		utils.QuorumPTMUrlFlag,
 		utils.QuorumPTMTimeoutFlag,

cmd/geth/main.go

@@ -527,7 +527,6 @@ func (api *RetestethAPI) mineBlock() error {
 					statedb, pvtstdb,
 					header, tx, &header.GasUsed, *api.blockchain.GetVMConfig(),
 					false,
-					nil,
 				)
 				if err != nil {
 					statedb.RevertToSnapshot(snap)

cmd/geth/retesteth.go

@@ -260,7 +260,6 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.MultitenancyFlag,
 			utils.RevertReasonFlag,
 			utils.PrivateCacheTrieJournalFlag,
-			utils.QuorumEnablePrivacyMarker,
 		},
 	},
 	{

cmd/geth/usage.go

@@ -866,11 +866,6 @@ var (
 		Value: eth.DefaultConfig.PrivateTrieCleanCacheJournal,
 	}
 
-	QuorumEnablePrivacyMarker = cli.BoolFlag{
-		Name:  "privacymarker.enable",
-		Usage: "Enable use of privacy marker transactions (PMT) for this node.",
-	}
-
 	// Quorum Private Transaction Manager connection options
 	QuorumPTMUnixSocketFlag = DirectoryFlag{
 		Name:  "ptm.socket",
@@ -1715,8 +1710,6 @@ func setQuorumConfig(ctx *cli.Context, cfg *eth.Config) error {
 	cfg.EVMCallTimeOut = time.Duration(ctx.GlobalInt(EVMCallTimeOutFlag.Name)) * time.Second
 	cfg.EnableMultitenancy = ctx.GlobalBool(MultitenancyFlag.Name)
 	cfg.SaveRevertReason = ctx.GlobalBool(RevertReasonFlag.Name)
-	cfg.QuorumPrivacyMarkerTransactionsEnabled = ctx.GlobalBool(QuorumEnablePrivacyMarker.Name)
-
 	setIstanbul(ctx, cfg)
 	setRaft(ctx, cfg)
 	if ctx.GlobalIsSet(PrivateCacheTrieJournalFlag.Name) {