Merge branch 'master' into patch-10

Author: transmissions11

src/dapp-tests/integration/tests.sh

@@ -49,10 +49,52 @@ dapp_testnet() {
 
   # dynamic fee transaction (EIP-1559)
   seth send "$A_ADDR" "on()" --gas 0xffff --password /dev/null --from "$ACC" --keystore "$TMPDIR"/8545/keystore --prio-fee 2gwei --gas-price 10gwei
+
+  # clean up
+  killall geth
 }
 
 dapp_testnet
 
+# checks that seth send works with both checksummed and unchecksummed addresses
+seth_send_address_formats() {
+  TMPDIR=$(mktemp -d)
+
+  dapp testnet --dir "$TMPDIR" &
+  # give it a few secs to start up
+  sleep 180
+  read -r ACC BAL <<< "$(seth ls --keystore "$TMPDIR/8545/keystore")"
+
+  lower=$(echo "$ACC" | tr '[:upper:]' '[:lower:]')
+  export ETH_GAS=0xffff
+
+  zero=0x0000000000000000000000000000000000000000
+
+  # with checksummed
+  tx=$(seth send "$zero" --from "$ACC" --password /dev/null --value "$(seth --to-wei 1 ether)" --keystore "$TMPDIR"/8545/keystore --async)
+  [[ $(seth tx "$tx" from) = "$lower" ]]
+
+  # without checksum
+  tx=$(seth send "$zero" --from "$lower" --password /dev/null --value "$(seth --to-wei 1 ether)" --keystore "$TMPDIR"/8545/keystore --async)
+  [[ $(seth tx "$tx" from) = "$lower" ]]
+
+  # try again with eth_rpc_accounts
+  export ETH_RPC_ACCOUNTS=true
+
+  # with checksummed
+  tx=$(seth send "$zero" --from "$ACC" --password /dev/null --value "$(seth --to-wei 1 ether)" --keystore "$TMPDIR"/8545/keystore --async)
+  [[ $(seth tx "$tx" from) = "$lower" ]]
+
+  # without checksum
+  tx=$(seth send "$zero" --from "$lower" --password /dev/null --value "$(seth --to-wei 1 ether)" --keystore "$TMPDIR"/8545/keystore --async)
+  [[ $(seth tx "$tx" from) = "$lower" ]]
+
+  # clean up
+  killall geth
+}
+
+seth_send_address_formats
+
 test_hevm_symbolic() {
     solc --bin-runtime -o . --overwrite factor.sol
     # should find counterexample
@@ -371,8 +413,52 @@ test-lookup-address2() {
 }
 test-lookup-address2
 
+# SETH 4BYTE TESTS
+# seth 4byte
 test-4byte() {
     [[ $(seth 4byte a9059cbb | tail -n 1) = "transfer(address,uint256)" ]] || error
 }
-
 test-4byte
+
+# SETH FIXED POINT TESTS
+# seth --from-fix
+test-from-fix1() {
+    [[ $(seth --from-fix 6 1) = 1000000 ]] || error
+}
+test-from-fix1
+
+test-from-fix2() {
+    [[ $(seth --from-fix 18 1) = 1000000000000000000 ]] || error
+}
+test-from-fix2
+
+test-from-fix3() {
+    [[ $(seth --from-fix 6 1.2345) = 1234500 ]] || error
+}
+test-from-fix3
+
+test-from-fix4() {
+    [[ $(seth --from-fix 18 1.23456789) = 1234567890000000000 ]] || error
+}
+test-from-fix4
+
+# seth --to-fix
+test-to-fix1() {
+    [[ $(seth --to-fix 6 1000000) = 1.000000 ]] || error
+}
+test-to-fix1
+
+test-to-fix2() {
+    [[ $(seth --to-fix 18 1000000000000000000) = 1.000000000000000000 ]] || error
+}
+test-to-fix2
+
+test-to-fix3() {
+    [[ $(seth --to-fix 6 1234500) = 1.234500 ]] || error
+}
+test-to-fix3
+
+test-to-fix4() {
+    [[ $(seth --to-fix 18 1234567890000000000) = 1.234567890000000000 ]] || error
+}
+test-to-fix4

src/dapp-tests/pass/abstract.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.6.7;
+
+import {DSTest} from "ds-test/test.sol";
+
+// should not be run (no code)
+abstract contract MyTest is DSTest {
+    function testAbstract() public {
+        assertTrue(true);
+    }
+}
+
+// should run and pass
+contract TestMy is MyTest {
+    function testTrue() public {
+        assertTrue(true);
+    }
+}

src/dapp/CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Dapp remappings ignores non-directories in `DAPP_LIB`
 
+### Fixed
+
+- Dapp can correctly parse replay strings from invariant tests
+
 ## [0.34.1] - 2021-09-08
 
 ### Added

src/dapp/README.md

@@ -551,6 +551,8 @@ Spins up a geth testnet.
 
     dapp-verify-contract -- verify contract source on etherscan
     Usage: dapp verify-contract <path>:<contractname> <address> [constructorArgs]
+    
+Example: `dapp verify-contract src/auth/authorities/RolesAuthority.sol:RolesAuthority 0x9ed0e..`
 
 Requires `ETHERSCAN_API_KEY` to be set.
 

src/dapp/libexec/dapp/dapp---hevm-opts

@@ -16,7 +16,7 @@ opts=()
 [[ "$DAPP_TEST_CACHE" ]]          && opts+=(--cache "$DAPP_TEST_CACHE")
 [[ "$DAPP_TEST_MATCH" ]]          && opts+=(--match "$DAPP_TEST_MATCH")
 [[ "$DAPP_TEST_SOLVER" ]]         && opts+=(--solver "$DAPP_TEST_SOLVER")
-[[ "$DAPP_TEST_REPLAY" ]]         && opts+=(--replay \'"$DAPP_TEST_REPLAY"\')
+[[ "$DAPP_TEST_REPLAY" ]]         && opts+=(--replay "$DAPP_TEST_REPLAY")
 [[ "$DAPP_TEST_VERBOSITY" ]]      && opts+=(--verbose "$DAPP_TEST_VERBOSITY")
 [[ "$DAPP_TEST_COV_MATCH" ]]      && opts+=(--cov-match "$DAPP_TEST_COV_MATCH")
 [[ "$DAPP_TEST_FUZZ_RUNS" ]]      && opts+=(--fuzz-runs "$DAPP_TEST_FUZZ_RUNS")

src/hevm/CHANGELOG.md

@@ -1,5 +1,12 @@
 # hevm changelog
 
+## Unreleased
+
+## Fixed
+
+- Test contracts with no code (e.g. `abstract` contracts) are now skipped
+- Replay data for invariant tests is now displayed in a form that does not cause errors when used with `dapp test --replay`
+
 ## [0.48.1] - 2021-09-08
 
 ### Added

src/hevm/src/EVM/Dapp.hs

@@ -140,7 +140,7 @@ findUnitTests match =
       Nothing -> []
       Just _  ->
         let testNames = unitTestMethodsFiltered (regexMatches match) c
-        in [(view contractName c, testNames) | not (null testNames)]
+        in [(view contractName c, testNames) | not (BS.null (view runtimeCode c)) && not (null testNames)]
 
 unitTestMethodsFiltered :: (Text -> Bool) -> (SolcContract -> [(Test, [AbiType])])
 unitTestMethodsFiltered matcher c =

src/hevm/src/EVM/UnitTest.hs

@@ -581,7 +581,7 @@ exploreRun opts@UnitTestOptions{..} initialVm testName replayTxs = do
   then return ("\x1b[32m[PASS]\x1b[0m " <> testName <>  " (runs: " <> (pack $ show fuzzRuns) <>", depth: " <> pack (show depth) <> ")",
                Right (passOutput vm' opts testName), vm') -- no canonical "post vm"
   else let replayText = if null replayTxs
-                        then "\nReplay data: '(" <> pack (show testName) <> ", " <> pack (show (show (ByteStringS $ rlpencode counterex))) <> ")'"
+                        then "\nReplay data: '(" <> pack (show testName) <> "," <> pack (show (show (ByteStringS $ rlpencode counterex))) <> ")'"
                         else " (replayed)"
        in return ("\x1b[31m[FAIL]\x1b[0m " <> testName <> replayText, Left  (failOutput vm' opts testName), vm')
 

src/seth/CHANGELOG.md

@@ -8,12 +8,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- `seth --to-wei` now uses eth instead of wei as the default unit for conversions
 - `seth 4byte` command returns the response from querying [4byte.directory](https://www.4byte.directory/) for a given function signature
 - `seth 4byte-decode` command queries 4byte.directory for matching function signatures, uses one to decode the calldata, and prints the decoded calldata
 - `seth 4byte-event` command returns the response from querying 4byte.directory for a given event topic
 - `seth abi-encode` command returns the ABI encoded values without the function signature
 - `seth index` command returns the slot number for the specified mapping type and input data
+- `seth --from-fix` command converts fixed point numbers into parsed integers with the specified number of decimals
+
+### Fixed
+
+- Address lookup no longer fails if `ETH_RPC_ACCOUNTS` is set, and `ETH_FROM` is an unchecksummed address
 
 ## [0.11.0] - 2021-09-08
 

src/seth/README.md

@@ -57,6 +57,7 @@ hardware wallets—even if you use a remote RPC node like Infura's.
   - [`seth --calldata-decode`]
   - [`seth --from-ascii`]
   - [`seth --from-bin`]
+  - [`seth --from-fix`]
   - [`seth --from-wei`]
   - [`seth --max-int`]
   - [`seth --max-uint`]
@@ -65,6 +66,7 @@ hardware wallets—even if you use a remote RPC node like Infura's.
   - [`seth --to-ascii`]
   - [`seth --to-bytes32`]
   - [`seth --to-dec`]
+  - [`seth --to-fix`]
   - [`seth --to-hex`]
   - [`seth --to-int256`]
   - [`seth --to-uint256`]
@@ -374,6 +376,14 @@ Convert binary data into hex data.
 
 Reads binary data from standard input and prints it as hex data.
 
+### `seth --from-fix`
+
+Convert fixed point numbers into parsed integers with the specified number of decimals.
+
+    seth --from-fix <decimals> <value>
+
+For example, use `seth --to-fix 6 1` to convert 1 USDC into the parsed quantity of 1,000,000 USDC
+
 ### `seth --from-wei`
 
 Convert a wei amount into another unit (ETH by default).
@@ -430,6 +440,14 @@ Convert a hex value with 0x prefix into a decimal number.
 
     seth --to-dec <hexvalue>
 
+### `seth --to-fix`
+
+Convert parsed integers into fixed point with the specified number of decimals.
+
+    seth --to-fix <decimals> <value>
+
+For example, use `seth --to-fix 6 1000000` to convert the parsed amount of 1,000,000 USDC into a formatted amount of 1 USDC.
+
 ### `seth --to-hex`
 
 Convert a decimal number into a hex value.
@@ -708,8 +726,8 @@ ABI specification.
 
 ### `seth lookup-address`
 
-Print the address the provided ENS name resolves to. If the name is not
-owned or does not have a resolver configured, an `invalid data for
+Print the ENS name the provided address reverse resolves to. If the name is
+not owned or does not have a resolver configured, an `invalid data for
 function output` error will be thrown. An error will also be thrown
 if the forward and reverse resolution do not match.
 
@@ -865,7 +883,9 @@ Show all fields unless `<field>` is given.
 [`seth --abi-decode`]: #seth---abi-decode
 [`seth --from-ascii`]: #seth---from-ascii
 [`seth --from-bin`]: #seth---from-bin
+[`seth --from-fix`]: #seth---from-fix
 [`seth --from-wei`]: #seth---from-wei
+[`seth --to-fix`]: #seth---to-fix
 [`seth --to-wei`]: #seth---to-wei
 [`seth --to-int256`]: #seth---to-int256
 [`seth --to-uint256`]: #seth---to-uint256