Add Multi-File Etherscan Verification Option

src/dapp/libexec/dapp/dapp

@@ -35,6 +35,7 @@
 ###
 ###   Deployment options:
 ### verify                     verify contract on etherscan
+### verify-multiple            multifile verification on etherscan
 ###
 ###   Contract verifying options:
 ### async                      don't wait for confirmation
@@ -161,6 +162,7 @@ while [[ $1 ]]; do
        export HEVM_RPC=yes;;
 
     --verify)                 export DAPP_VERIFY_CONTRACT=yes;;
+    --verify-multiple)        export DAPP_VERIFY_CONTRACT_MULTIPLE=yes;;
 
     --async)                  export DAPP_ASYNC=yes;;
 

src/dapp/libexec/dapp/dapp-mk-standard-json

@@ -29,7 +29,10 @@ for root, dirnames, filenames in os.walk(src):
 tmpljson["sources"]={}
 for f in files:
     tmpljson["sources"][f]={}
-    tmpljson["sources"][f]["urls"] = [f]
+    if os.getenv('DAPP_VERIFY_CONTRACT_MULTIPLE') == "yes":
+        tmpljson["sources"][f]["content"] = [f.read()]
+    else:
+        tmpljson["sources"][f]["urls"] = [f]
 
 if os.getenv('DAPP_REMAPPINGS') is None or os.getenv('DAPP_REMAPPINGS') == "":
     tmpljson["settings"].pop("remappings", None)

src/dapp/libexec/dapp/dapp-verify-contract

@@ -6,12 +6,9 @@ set -e
 
 [[ $ETHERSCAN_API_KEY ]] || {
   cat >&2 <<.
-
   You need an Etherscan Api Key to verify contracts.
   Create one at https://etherscan.io/myapikey
-
   Then export it with \`export ETHERSCAN_API_KEY=xxxxxxxx'
-
 .
   exit 1
 }
@@ -36,12 +33,13 @@ esac
 
 path=${1?contractname}
 name=${path#*:}
+contractName=$(basename "$path")
 address=${2?contractaddress}
 
 # combined-json has a sourceList field
 if [[ $(jq .sourceList "$DAPP_JSON") == null ]]; then
     contract=$(<"$DAPP_JSON" jq -r ".contracts[\"${path/:*/}\"][\"$name\"]")
-else 
+else
     contract=$(<"$DAPP_JSON" jq -r ".contracts[\"$path\"]")
 fi
 meta=$(jshon <<<"$contract" -e metadata -u)
@@ -88,33 +86,56 @@ else
   optimized=0
 fi
 
-params=(
+if  [[ $DAPP_VERIFY_CONTRACT_MULTIPLE == yes ]]; then
+
+  # Standard Input JSON
+
+  inputJSON=$(dapp mk-standard-json)
+
+  params=(
   "module=contract" "action=verifysourcecode"
-  "contractname=$name" "contractaddress=$address"
-  "optimizationUsed=$optimized" "runs=$runs"
+  "contractname=$contractName" "contractaddress=$address"
+  "sourcecode=$inputJSON" "codeformat=solidity-standard-json-input"
   "apikey=$ETHERSCAN_API_KEY"
-)
+  )
+
+else
 
-source=$(hevm flatten --source-file "$file" --json-file "$DAPP_JSON" --dapp-root "$DAPP_ROOT")
+  params=(
+    "module=contract" "action=verifysourcecode"
+    "contractname=$name" "contractaddress=$address"
+    "optimizationUsed=$optimized" "runs=$runs"
+    "apikey=$ETHERSCAN_API_KEY"
+  )
 
-source=$(cat <<.
-// Verified using https://dapp.tools
+  source=$(hevm flatten --source-file "$file" --json-file "$DAPP_JSON" --dapp-root "$DAPP_ROOT")
 
-$source
+  source=$(cat <<.
+  //Verified using https://dapp.tools
+  "$source"
 .
-)
+  )
+
+fi
 
 query=$(printf "&%s" "${params[@]}")
 
 count=0
 while [ $count -lt 5 ]; do
   sleep 10
 
-  response=$(curl -fsS "$ETHERSCAN_API_URL" -d "$query" \
-  --data-urlencode "compilerversion=$version" \
-  --data-urlencode "sourceCode@"<(echo "$source") \
-  --data-urlencode "constructorArguements=$constructorArguments" -X POST)
-  # NOTE: the Arguements typo is in etherscan's API
+  if  [[ $DAPP_VERIFY_CONTRACT_MULTIPLE == yes ]]; then
+    response=$(curl -fsS "$ETHERSCAN_API_URL" -d "$query" \
+    --data-urlencode "compilerversion=$version" \
+    --data-urlencode "constructorArguements=$constructorArguments" -X POST)
+    # NOTE: the Arguements typo is in etherscan's API
+  else
+    response=$(curl -fsS "$ETHERSCAN_API_URL" -d "$query" \
+    --data-urlencode "compilerversion=$version" \
+    --data-urlencode "sourceCode@"<(echo "$source") \
+    --data-urlencode "constructorArguements=$constructorArguments" -X POST)
+    # NOTE: the Arguements typo is in etherscan's API
+  fi
 
   status=$(jshon <<<"$response" -e status -u)
   guid=$(jshon <<<"$response" -e result -u)