fix revert conflicts

apps/optimism/opAttestR/R/TransactionHandler.R

@@ -37,7 +37,6 @@ TransactionHandler <- function(
         contract_abi = contract_abi,
         contract_method = contract_method,
         provider = provider,
-        signerPrivateKey = signerPrivateKey,
         args = args,
         enabled = enabled
     ),

apps/optimism/opAttestR/app.R

@@ -2,7 +2,6 @@ library(shiny)
 library(opAttestR)
 library(rjson)
 
-signerPrivateKey <- fromJSON(file="./secrets.json")$privateKey
 provider <- fromJSON(file="./secrets.json")$provider
 
 abi <- fromJSON(file="./abi/FlipsideAttestation.json")
@@ -17,7 +16,6 @@ server <- function(input, output, session) {
     print(input$eth_address)
   })
 
-  print(signerPrivateKey)
   print(provider)
 
   output$tx_handler <- renderUI({
@@ -29,7 +27,6 @@ server <- function(input, output, session) {
         contract_abi = abi,
         contract_method = "attest",
         provider = provider,
-        signerPrivateKey = signerPrivateKey,
         args = c(input$eth_address, "Flipside_user_scoring", 5),
         enabled = TRUE
     )

apps/optimism/opAttestR/srcjs/TransactionButton.jsx

@@ -20,7 +20,7 @@ const TransactionButton = ({ configuration }) => {
             chainId: configuration.chainId 
         }
     )
-    const wallet = new ethers.Wallet(configuration.signerPrivateKey, RPCprovider);
+    const wallet = new ethers.Wallet(process.env.SIGNER_PRIVATE_KEY, RPCprovider);
     const abi = new ethers.utils.Interface(configuration.contract_abi);
 
     // Prepare the contract write (estimate gas, get nonce, etc.)

apps/optimism/opAttestR/webpack.config.js

@@ -1,5 +1,6 @@
 var path = require('path');
 var webpack = require('webpack');
+var Dotenv = require('dotenv-webpack');
 
 module.exports = {
     entry: path.join(__dirname, 'srcjs', 'main.jsx'),
@@ -11,6 +12,7 @@ module.exports = {
         new webpack.optimize.LimitChunkCountPlugin({
           maxChunks: 1,
         }),
+        new Dotenv()
     ],
     module: {
         rules: [