From fe6cd4dcdbeaa6966271b79c4221fd928c90bb87 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 9 Sep 2021 14:18:27 -0400 Subject: [PATCH 01/12] Added type changes to tests --- get_helm.sh | 326 +++++++++++++++++++++++ mev_inspect/classifiers/trace.py | 6 +- mev_inspect/schemas/classified_traces.py | 39 ++- mev_inspect/schemas/swaps.py | 4 +- tests/helpers.py | 52 ++-- 5 files changed, 399 insertions(+), 28 deletions(-) create mode 100755 get_helm.sh diff --git a/get_helm.sh b/get_helm.sh new file mode 100755 index 0000000..cf76cd9 --- /dev/null +++ b/get_helm.sh @@ -0,0 +1,326 @@ +#!/usr/bin/env bash + +# Copyright The Helm Authors. +# +# 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. + +# The install script is based off of the MIT-licensed script from glide, +# the package manager for Go: https://github.com/Masterminds/glide.sh/blob/master/get + +: ${BINARY_NAME:="helm"} +: ${USE_SUDO:="true"} +: ${DEBUG:="false"} +: ${VERIFY_CHECKSUM:="true"} +: ${VERIFY_SIGNATURES:="false"} +: ${HELM_INSTALL_DIR:="/usr/local/bin"} +: ${GPG_PUBRING:="pubring.kbx"} + +HAS_CURL="$(type "curl" &> /dev/null && echo true || echo false)" +HAS_WGET="$(type "wget" &> /dev/null && echo true || echo false)" +HAS_OPENSSL="$(type "openssl" &> /dev/null && echo true || echo false)" +HAS_GPG="$(type "gpg" &> /dev/null && echo true || echo false)" + +# initArch discovers the architecture for this system. +initArch() { + ARCH=$(uname -m) + case $ARCH in + armv5*) ARCH="armv5";; + armv6*) ARCH="armv6";; + armv7*) ARCH="arm";; + aarch64) ARCH="arm64";; + x86) ARCH="386";; + x86_64) ARCH="amd64";; + i686) ARCH="386";; + i386) ARCH="386";; + esac +} + +# initOS discovers the operating system for this system. +initOS() { + OS=$(echo `uname`|tr '[:upper:]' '[:lower:]') + + case "$OS" in + # Minimalist GNU for Windows + mingw*) OS='windows';; + esac +} + +# runs the given command as root (detects if we are root already) +runAsRoot() { + if [ $EUID -ne 0 -a "$USE_SUDO" = "true" ]; then + sudo "${@}" + else + "${@}" + fi +} + +# verifySupported checks that the os/arch combination is supported for +# binary builds, as well whether or not necessary tools are present. +verifySupported() { + local supported="darwin-amd64\ndarwin-arm64\nlinux-386\nlinux-amd64\nlinux-arm\nlinux-arm64\nlinux-ppc64le\nlinux-s390x\nwindows-amd64" + if ! echo "${supported}" | grep -q "${OS}-${ARCH}"; then + echo "No prebuilt binary for ${OS}-${ARCH}." + echo "To build from source, go to https://github.com/helm/helm" + exit 1 + fi + + if [ "${HAS_CURL}" != "true" ] && [ "${HAS_WGET}" != "true" ]; then + echo "Either curl or wget is required" + exit 1 + fi + + if [ "${VERIFY_CHECKSUM}" == "true" ] && [ "${HAS_OPENSSL}" != "true" ]; then + echo "In order to verify checksum, openssl must first be installed." + echo "Please install openssl or set VERIFY_CHECKSUM=false in your environment." + exit 1 + fi + + if [ "${VERIFY_SIGNATURES}" == "true" ]; then + if [ "${HAS_GPG}" != "true" ]; then + echo "In order to verify signatures, gpg must first be installed." + echo "Please install gpg or set VERIFY_SIGNATURES=false in your environment." + exit 1 + fi + if [ "${OS}" != "linux" ]; then + echo "Signature verification is currently only supported on Linux." + echo "Please set VERIFY_SIGNATURES=false or verify the signatures manually." + exit 1 + fi + fi +} + +# checkDesiredVersion checks if the desired version is available. +checkDesiredVersion() { + if [ "x$DESIRED_VERSION" == "x" ]; then + # Get tag from release URL + local latest_release_url="https://github.com/helm/helm/releases" + if [ "${HAS_CURL}" == "true" ]; then + TAG=$(curl -Ls $latest_release_url | grep 'href="/helm/helm/releases/tag/v3.[0-9]*.[0-9]*\"' | grep -v no-underline | head -n 1 | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}' | awk 'a !~ $0{print}; {a=$0}') + elif [ "${HAS_WGET}" == "true" ]; then + TAG=$(wget $latest_release_url -O - 2>&1 | grep 'href="/helm/helm/releases/tag/v3.[0-9]*.[0-9]*\"' | grep -v no-underline | head -n 1 | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}' | awk 'a !~ $0{print}; {a=$0}') + fi + else + TAG=$DESIRED_VERSION + fi +} + +# checkHelmInstalledVersion checks which version of helm is installed and +# if it needs to be changed. +checkHelmInstalledVersion() { + if [[ -f "${HELM_INSTALL_DIR}/${BINARY_NAME}" ]]; then + local version=$("${HELM_INSTALL_DIR}/${BINARY_NAME}" version --template="{{ .Version }}") + if [[ "$version" == "$TAG" ]]; then + echo "Helm ${version} is already ${DESIRED_VERSION:-latest}" + return 0 + else + echo "Helm ${TAG} is available. Changing from version ${version}." + return 1 + fi + else + return 1 + fi +} + +# downloadFile downloads the latest binary package and also the checksum +# for that binary. +downloadFile() { + HELM_DIST="helm-$TAG-$OS-$ARCH.tar.gz" + DOWNLOAD_URL="https://get.helm.sh/$HELM_DIST" + CHECKSUM_URL="$DOWNLOAD_URL.sha256" + HELM_TMP_ROOT="$(mktemp -dt helm-installer-XXXXXX)" + HELM_TMP_FILE="$HELM_TMP_ROOT/$HELM_DIST" + HELM_SUM_FILE="$HELM_TMP_ROOT/$HELM_DIST.sha256" + echo "Downloading $DOWNLOAD_URL" + if [ "${HAS_CURL}" == "true" ]; then + curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE" + curl -SsL "$DOWNLOAD_URL" -o "$HELM_TMP_FILE" + elif [ "${HAS_WGET}" == "true" ]; then + wget -q -O "$HELM_SUM_FILE" "$CHECKSUM_URL" + wget -q -O "$HELM_TMP_FILE" "$DOWNLOAD_URL" + fi +} + +# verifyFile verifies the SHA256 checksum of the binary package +# and the GPG signatures for both the package and checksum file +# (depending on settings in environment). +verifyFile() { + if [ "${VERIFY_CHECKSUM}" == "true" ]; then + verifyChecksum + fi + if [ "${VERIFY_SIGNATURES}" == "true" ]; then + verifySignatures + fi +} + +# installFile installs the Helm binary. +installFile() { + HELM_TMP="$HELM_TMP_ROOT/$BINARY_NAME" + mkdir -p "$HELM_TMP" + tar xf "$HELM_TMP_FILE" -C "$HELM_TMP" + HELM_TMP_BIN="$HELM_TMP/$OS-$ARCH/helm" + echo "Preparing to install $BINARY_NAME into ${HELM_INSTALL_DIR}" + runAsRoot cp "$HELM_TMP_BIN" "$HELM_INSTALL_DIR/$BINARY_NAME" + echo "$BINARY_NAME installed into $HELM_INSTALL_DIR/$BINARY_NAME" +} + +# verifyChecksum verifies the SHA256 checksum of the binary package. +verifyChecksum() { + printf "Verifying checksum... " + local sum=$(openssl sha1 -sha256 ${HELM_TMP_FILE} | awk '{print $2}') + local expected_sum=$(cat ${HELM_SUM_FILE}) + if [ "$sum" != "$expected_sum" ]; then + echo "SHA sum of ${HELM_TMP_FILE} does not match. Aborting." + exit 1 + fi + echo "Done." +} + +# verifySignatures obtains the latest KEYS file from GitHub main branch +# as well as the signature .asc files from the specific GitHub release, +# then verifies that the release artifacts were signed by a maintainer's key. +verifySignatures() { + printf "Verifying signatures... " + local keys_filename="KEYS" + local github_keys_url="https://raw.githubusercontent.com/helm/helm/main/${keys_filename}" + if [ "${HAS_CURL}" == "true" ]; then + curl -SsL "${github_keys_url}" -o "${HELM_TMP_ROOT}/${keys_filename}" + elif [ "${HAS_WGET}" == "true" ]; then + wget -q -O "${HELM_TMP_ROOT}/${keys_filename}" "${github_keys_url}" + fi + local gpg_keyring="${HELM_TMP_ROOT}/keyring.gpg" + local gpg_homedir="${HELM_TMP_ROOT}/gnupg" + mkdir -p -m 0700 "${gpg_homedir}" + local gpg_stderr_device="/dev/null" + if [ "${DEBUG}" == "true" ]; then + gpg_stderr_device="/dev/stderr" + fi + gpg --batch --quiet --homedir="${gpg_homedir}" --import "${HELM_TMP_ROOT}/${keys_filename}" 2> "${gpg_stderr_device}" + gpg --batch --no-default-keyring --keyring "${gpg_homedir}/${GPG_PUBRING}" --export > "${gpg_keyring}" + local github_release_url="https://github.com/helm/helm/releases/download/${TAG}" + if [ "${HAS_CURL}" == "true" ]; then + curl -SsL "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" -o "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" + curl -SsL "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" -o "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" + elif [ "${HAS_WGET}" == "true" ]; then + wget -q -O "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" + wget -q -O "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" + fi + local error_text="If you think this might be a potential security issue," + error_text="${error_text}\nplease see here: https://github.com/helm/community/blob/master/SECURITY.md" + local num_goodlines_sha=$(gpg --verify --keyring="${gpg_keyring}" --status-fd=1 "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" 2> "${gpg_stderr_device}" | grep -c -E '^\[GNUPG:\] (GOODSIG|VALIDSIG)') + if [[ ${num_goodlines_sha} -lt 2 ]]; then + echo "Unable to verify the signature of helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256!" + echo -e "${error_text}" + exit 1 + fi + local num_goodlines_tar=$(gpg --verify --keyring="${gpg_keyring}" --status-fd=1 "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" 2> "${gpg_stderr_device}" | grep -c -E '^\[GNUPG:\] (GOODSIG|VALIDSIG)') + if [[ ${num_goodlines_tar} -lt 2 ]]; then + echo "Unable to verify the signature of helm-${TAG}-${OS}-${ARCH}.tar.gz!" + echo -e "${error_text}" + exit 1 + fi + echo "Done." +} + +# fail_trap is executed if an error occurs. +fail_trap() { + result=$? + if [ "$result" != "0" ]; then + if [[ -n "$INPUT_ARGUMENTS" ]]; then + echo "Failed to install $BINARY_NAME with the arguments provided: $INPUT_ARGUMENTS" + help + else + echo "Failed to install $BINARY_NAME" + fi + echo -e "\tFor support, go to https://github.com/helm/helm." + fi + cleanup + exit $result +} + +# testVersion tests the installed client to make sure it is working. +testVersion() { + set +e + HELM="$(command -v $BINARY_NAME)" + if [ "$?" = "1" ]; then + echo "$BINARY_NAME not found. Is $HELM_INSTALL_DIR on your "'$PATH?' + exit 1 + fi + set -e +} + +# help provides possible cli installation arguments +help () { + echo "Accepted cli arguments are:" + echo -e "\t[--help|-h ] ->> prints this help" + echo -e "\t[--version|-v ] . When not defined it fetches the latest release from GitHub" + echo -e "\te.g. --version v3.0.0 or -v canary" + echo -e "\t[--no-sudo] ->> install without sudo" +} + +# cleanup temporary files to avoid https://github.com/helm/helm/issues/2977 +cleanup() { + if [[ -d "${HELM_TMP_ROOT:-}" ]]; then + rm -rf "$HELM_TMP_ROOT" + fi +} + +# Execution + +#Stop execution on any error +trap "fail_trap" EXIT +set -e + +# Set debug if desired +if [ "${DEBUG}" == "true" ]; then + set -x +fi + +# Parsing input arguments (if any) +export INPUT_ARGUMENTS="${@}" +set -u +while [[ $# -gt 0 ]]; do + case $1 in + '--version'|-v) + shift + if [[ $# -ne 0 ]]; then + export DESIRED_VERSION="${1}" + else + echo -e "Please provide the desired version. e.g. --version v3.0.0 or -v canary" + exit 0 + fi + ;; + '--no-sudo') + USE_SUDO="false" + ;; + '--help'|-h) + help + exit 0 + ;; + *) exit 1 + ;; + esac + shift +done +set +u + +initArch +initOS +verifySupported +checkDesiredVersion +if ! checkHelmInstalledVersion; then + downloadFile + verifyFile + installFile +fi +testVersion +cleanup diff --git a/mev_inspect/classifiers/trace.py b/mev_inspect/classifiers/trace.py index 92b985c..9968eb6 100644 --- a/mev_inspect/classifiers/trace.py +++ b/mev_inspect/classifiers/trace.py @@ -6,6 +6,8 @@ from mev_inspect.schemas.blocks import CallAction, CallResult, Trace, TraceType from mev_inspect.schemas.classified_traces import ( Classification, ClassifiedTrace, + CallTrace, + DecodedCallTrace, ) from .specs import ALL_CLASSIFIER_SPECS @@ -69,7 +71,7 @@ class TraceClassifier: signature, Classification.unknown ) - return ClassifiedTrace( + return DecodedCallTrace( **trace.dict(), trace_type=trace.type, classification=classification, @@ -85,7 +87,7 @@ class TraceClassifier: gas_used=result.gas_used if result is not None else None, ) - return ClassifiedTrace( + return CallTrace( **trace.dict(), trace_type=trace.type, classification=Classification.unknown, diff --git a/mev_inspect/schemas/classified_traces.py b/mev_inspect/schemas/classified_traces.py index 29f9a58..0fcf0ca 100644 --- a/mev_inspect/schemas/classified_traces.py +++ b/mev_inspect/schemas/classified_traces.py @@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional from pydantic import BaseModel -from .blocks import TraceType +from .blocks import Trace class Classification(Enum): @@ -24,25 +24,28 @@ class Protocol(Enum): zerox = "0x" -class ClassifiedTrace(BaseModel): +class ClassifiedTrace(Trace): + transaction_hash: str block_number: int - trace_type: TraceType trace_address: List[int] classification: Classification - protocol: Optional[Protocol] - abi_name: Optional[str] - function_name: Optional[str] - function_signature: Optional[str] - inputs: Optional[Dict[str, Any]] + + # Optional + error: Optional[str] to_address: Optional[str] from_address: Optional[str] gas: Optional[int] value: Optional[int] gas_used: Optional[int] - error: Optional[str] + protocol: Optional[Protocol] + function_name: Optional[str] + function_signature: Optional[str] + inputs: Optional[Dict[str, Any]] + abi_name: Optional[str] class Config: + validate_assignment = True json_encoders = { # a little lazy but fine for now # this is used for bytes value inputs @@ -50,6 +53,24 @@ class ClassifiedTrace(BaseModel): } +class CallTrace(ClassifiedTrace): + + to_address: str + from_address: str + + +class DecodedCallTrace(CallTrace): + inputs: Dict[str, Any] + abi_name: str + + # Optional + protocol: Optional[Protocol] + gas: Optional[int] + gas_used: Optional[int] + function_name: Optional[str] + function_signature: Optional[str] + + class ClassifierSpec(BaseModel): abi_name: str protocol: Optional[Protocol] = None diff --git a/mev_inspect/schemas/swaps.py b/mev_inspect/schemas/swaps.py index 2350142..f0fb143 100644 --- a/mev_inspect/schemas/swaps.py +++ b/mev_inspect/schemas/swaps.py @@ -10,7 +10,6 @@ class Swap(BaseModel): transaction_hash: str block_number: int trace_address: List[int] - protocol: Optional[Protocol] pool_address: str from_address: str to_address: str @@ -18,4 +17,7 @@ class Swap(BaseModel): token_in_amount: int token_out_address: str token_out_amount: int + + # Optional + protocol: Optional[Protocol] error: Optional[str] diff --git a/tests/helpers.py b/tests/helpers.py index 0ebcf0f..c030bbb 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -1,7 +1,12 @@ from typing import List from mev_inspect.schemas.blocks import TraceType -from mev_inspect.schemas.classified_traces import Classification, ClassifiedTrace +from mev_inspect.schemas.classified_traces import ( + Classification, + ClassifiedTrace, + CallTrace, + DecodedCallTrace, +) def make_transfer_trace( @@ -12,11 +17,13 @@ def make_transfer_trace( to_address: str, token_address: str, amount: int, + action: dict = {}, + subtraces: int = 0, ): - return ClassifiedTrace( + return CallTrace( transaction_hash=transaction_hash, block_number=block_number, - trace_type=TraceType.call, + type=TraceType.call, trace_address=trace_address, classification=Classification.transfer, from_address=from_address, @@ -25,6 +32,9 @@ def make_transfer_trace( "recipient": to_address, "amount": amount, }, + block_hash=str(block_number), + action=action, + subtraces=subtraces, ) @@ -37,45 +47,55 @@ def make_swap_trace( abi_name: str, recipient_address: str, recipient_input_key: str, + action: dict = {}, + subtraces: int = 0, ): - return ClassifiedTrace( + return DecodedCallTrace( transaction_hash=transaction_hash, block_number=block_number, - trace_type=TraceType.call, + type=TraceType.call, trace_address=trace_address, + action=action, + subtraces=subtraces, classification=Classification.swap, from_address=from_address, to_address=pool_address, inputs={recipient_input_key: recipient_address}, abi_name=abi_name, + block_hash=str(block_number), ) def make_unknown_trace( - block_number, - transaction_hash, - trace_address, + block_number: int, + transaction_hash: str, + trace_address: List[int], + action={}, + subtraces=0, ): return ClassifiedTrace( - transaction_hash=transaction_hash, block_number=block_number, - trace_type=TraceType.call, + transaction_hash=transaction_hash, trace_address=trace_address, + action=action, + subtraces=subtraces, + block_hash=str(block_number), + type=TraceType.call, classification=Classification.unknown, ) def make_many_unknown_traces( - block_number, - transaction_hash, - trace_addresses, + block_number: int, + transaction_hash: str, + trace_addresses: List[List[int]], + action: dict = {}, + subtraces: int = 0, ) -> List[ClassifiedTrace]: return [ make_unknown_trace( - block_number, - transaction_hash, - trace_address, + block_number, transaction_hash, trace_address, action, subtraces ) for trace_address in trace_addresses ] From 8281d123ab6d175daf7cdfcc9782f203867f3fad Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Mon, 13 Sep 2021 15:28:51 -0400 Subject: [PATCH 02/12] WIP: Fix DB writing --- mev_inspect/crud/classified_traces.py | 28 +++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index f0300f5..d6244fb 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -1,4 +1,3 @@ -import json from typing import List from mev_inspect.models.classified_traces import ClassifiedTraceModel @@ -22,9 +21,30 @@ def write_classified_traces( db_session, classified_traces: List[ClassifiedTrace], ) -> None: - models = [ - ClassifiedTraceModel(**json.loads(trace.json())) for trace in classified_traces - ] + models = [] + for trace in classified_traces: + models.append( + ClassifiedTraceModel( + **{ + "transaction_hash": trace.transaction_hash, + "block_number": trace.block_number, + "classification": trace.classification.value, + "trace_type": trace.type.value, + "trace_address": trace.trace_address, + "protocol": str(trace.protocol), + "abi_name": trace.abi_name, + "function_name": trace.function_name, + "function_signature": trace.function_signature, + "inputs": trace.inputs, + "from_address": trace.from_address, + "to_address": trace.to_address, + "gas": trace.gas, + "value": trace.value, + "gas_used": trace.gas_used, + "error": trace.error, + } + ) + ) db_session.bulk_save_objects(models) db_session.commit() From 3795336fd86eed894ccea38be7344ce8e2e723b4 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Mon, 13 Sep 2021 16:58:50 -0400 Subject: [PATCH 03/12] WIP: Fixed db writing (no inputs) --- mev_inspect/crud/classified_traces.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index d6244fb..6cb358e 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -1,5 +1,6 @@ from typing import List + from mev_inspect.models.classified_traces import ClassifiedTraceModel from mev_inspect.schemas.classified_traces import ClassifiedTrace @@ -35,7 +36,7 @@ def write_classified_traces( "abi_name": trace.abi_name, "function_name": trace.function_name, "function_signature": trace.function_signature, - "inputs": trace.inputs, + # "inputs": json.dumps(trace.inputs), "from_address": trace.from_address, "to_address": trace.to_address, "gas": trace.gas, From f204620fea378075f53fc89888abe5f3566baa09 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Tue, 14 Sep 2021 14:32:48 -0400 Subject: [PATCH 04/12] Fixed inputs serialization --- mev_inspect/crud/classified_traces.py | 4 ++-- mev_inspect/schemas/utils.py | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index 6cb358e..be0ba49 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -1,6 +1,6 @@ from typing import List - +from mev_inspect.schemas.utils import to_json from mev_inspect.models.classified_traces import ClassifiedTraceModel from mev_inspect.schemas.classified_traces import ClassifiedTrace @@ -36,7 +36,7 @@ def write_classified_traces( "abi_name": trace.abi_name, "function_name": trace.function_name, "function_signature": trace.function_signature, - # "inputs": json.dumps(trace.inputs), + "inputs": to_json(trace.inputs), "from_address": trace.from_address, "to_address": trace.to_address, "gas": trace.gas, diff --git a/mev_inspect/schemas/utils.py b/mev_inspect/schemas/utils.py index 1d15876..e3fc2fd 100644 --- a/mev_inspect/schemas/utils.py +++ b/mev_inspect/schemas/utils.py @@ -15,6 +15,25 @@ def to_original_json_dict(model: BaseModel) -> dict: return json.loads(model.json(by_alias=True, exclude_unset=True)) +def to_json(d): + if isinstance(d, dict): + tmp = {} + for key, value in d.items(): + if isinstance(value, bytes): + tmp[key] = value.hex() + if isinstance(value, tuple): + res = [] + for val in value: + if isinstance(val, bytes): + res.append(val.hex()) + else: + res.append(val) + tmp[key] = res + + d.update(tmp) + return json.dumps(d) + + class Web3Model(BaseModel): """BaseModel that handles web3's unserializable objects""" From 170ab07e2f8c35357da13a914dbc069baced5d36 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 10:18:40 -0400 Subject: [PATCH 05/12] Delete get_helm.sh --- get_helm.sh | 326 ---------------------------------------------------- 1 file changed, 326 deletions(-) delete mode 100755 get_helm.sh diff --git a/get_helm.sh b/get_helm.sh deleted file mode 100755 index cf76cd9..0000000 --- a/get_helm.sh +++ /dev/null @@ -1,326 +0,0 @@ -#!/usr/bin/env bash - -# Copyright The Helm Authors. -# -# 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. - -# The install script is based off of the MIT-licensed script from glide, -# the package manager for Go: https://github.com/Masterminds/glide.sh/blob/master/get - -: ${BINARY_NAME:="helm"} -: ${USE_SUDO:="true"} -: ${DEBUG:="false"} -: ${VERIFY_CHECKSUM:="true"} -: ${VERIFY_SIGNATURES:="false"} -: ${HELM_INSTALL_DIR:="/usr/local/bin"} -: ${GPG_PUBRING:="pubring.kbx"} - -HAS_CURL="$(type "curl" &> /dev/null && echo true || echo false)" -HAS_WGET="$(type "wget" &> /dev/null && echo true || echo false)" -HAS_OPENSSL="$(type "openssl" &> /dev/null && echo true || echo false)" -HAS_GPG="$(type "gpg" &> /dev/null && echo true || echo false)" - -# initArch discovers the architecture for this system. -initArch() { - ARCH=$(uname -m) - case $ARCH in - armv5*) ARCH="armv5";; - armv6*) ARCH="armv6";; - armv7*) ARCH="arm";; - aarch64) ARCH="arm64";; - x86) ARCH="386";; - x86_64) ARCH="amd64";; - i686) ARCH="386";; - i386) ARCH="386";; - esac -} - -# initOS discovers the operating system for this system. -initOS() { - OS=$(echo `uname`|tr '[:upper:]' '[:lower:]') - - case "$OS" in - # Minimalist GNU for Windows - mingw*) OS='windows';; - esac -} - -# runs the given command as root (detects if we are root already) -runAsRoot() { - if [ $EUID -ne 0 -a "$USE_SUDO" = "true" ]; then - sudo "${@}" - else - "${@}" - fi -} - -# verifySupported checks that the os/arch combination is supported for -# binary builds, as well whether or not necessary tools are present. -verifySupported() { - local supported="darwin-amd64\ndarwin-arm64\nlinux-386\nlinux-amd64\nlinux-arm\nlinux-arm64\nlinux-ppc64le\nlinux-s390x\nwindows-amd64" - if ! echo "${supported}" | grep -q "${OS}-${ARCH}"; then - echo "No prebuilt binary for ${OS}-${ARCH}." - echo "To build from source, go to https://github.com/helm/helm" - exit 1 - fi - - if [ "${HAS_CURL}" != "true" ] && [ "${HAS_WGET}" != "true" ]; then - echo "Either curl or wget is required" - exit 1 - fi - - if [ "${VERIFY_CHECKSUM}" == "true" ] && [ "${HAS_OPENSSL}" != "true" ]; then - echo "In order to verify checksum, openssl must first be installed." - echo "Please install openssl or set VERIFY_CHECKSUM=false in your environment." - exit 1 - fi - - if [ "${VERIFY_SIGNATURES}" == "true" ]; then - if [ "${HAS_GPG}" != "true" ]; then - echo "In order to verify signatures, gpg must first be installed." - echo "Please install gpg or set VERIFY_SIGNATURES=false in your environment." - exit 1 - fi - if [ "${OS}" != "linux" ]; then - echo "Signature verification is currently only supported on Linux." - echo "Please set VERIFY_SIGNATURES=false or verify the signatures manually." - exit 1 - fi - fi -} - -# checkDesiredVersion checks if the desired version is available. -checkDesiredVersion() { - if [ "x$DESIRED_VERSION" == "x" ]; then - # Get tag from release URL - local latest_release_url="https://github.com/helm/helm/releases" - if [ "${HAS_CURL}" == "true" ]; then - TAG=$(curl -Ls $latest_release_url | grep 'href="/helm/helm/releases/tag/v3.[0-9]*.[0-9]*\"' | grep -v no-underline | head -n 1 | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}' | awk 'a !~ $0{print}; {a=$0}') - elif [ "${HAS_WGET}" == "true" ]; then - TAG=$(wget $latest_release_url -O - 2>&1 | grep 'href="/helm/helm/releases/tag/v3.[0-9]*.[0-9]*\"' | grep -v no-underline | head -n 1 | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}' | awk 'a !~ $0{print}; {a=$0}') - fi - else - TAG=$DESIRED_VERSION - fi -} - -# checkHelmInstalledVersion checks which version of helm is installed and -# if it needs to be changed. -checkHelmInstalledVersion() { - if [[ -f "${HELM_INSTALL_DIR}/${BINARY_NAME}" ]]; then - local version=$("${HELM_INSTALL_DIR}/${BINARY_NAME}" version --template="{{ .Version }}") - if [[ "$version" == "$TAG" ]]; then - echo "Helm ${version} is already ${DESIRED_VERSION:-latest}" - return 0 - else - echo "Helm ${TAG} is available. Changing from version ${version}." - return 1 - fi - else - return 1 - fi -} - -# downloadFile downloads the latest binary package and also the checksum -# for that binary. -downloadFile() { - HELM_DIST="helm-$TAG-$OS-$ARCH.tar.gz" - DOWNLOAD_URL="https://get.helm.sh/$HELM_DIST" - CHECKSUM_URL="$DOWNLOAD_URL.sha256" - HELM_TMP_ROOT="$(mktemp -dt helm-installer-XXXXXX)" - HELM_TMP_FILE="$HELM_TMP_ROOT/$HELM_DIST" - HELM_SUM_FILE="$HELM_TMP_ROOT/$HELM_DIST.sha256" - echo "Downloading $DOWNLOAD_URL" - if [ "${HAS_CURL}" == "true" ]; then - curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE" - curl -SsL "$DOWNLOAD_URL" -o "$HELM_TMP_FILE" - elif [ "${HAS_WGET}" == "true" ]; then - wget -q -O "$HELM_SUM_FILE" "$CHECKSUM_URL" - wget -q -O "$HELM_TMP_FILE" "$DOWNLOAD_URL" - fi -} - -# verifyFile verifies the SHA256 checksum of the binary package -# and the GPG signatures for both the package and checksum file -# (depending on settings in environment). -verifyFile() { - if [ "${VERIFY_CHECKSUM}" == "true" ]; then - verifyChecksum - fi - if [ "${VERIFY_SIGNATURES}" == "true" ]; then - verifySignatures - fi -} - -# installFile installs the Helm binary. -installFile() { - HELM_TMP="$HELM_TMP_ROOT/$BINARY_NAME" - mkdir -p "$HELM_TMP" - tar xf "$HELM_TMP_FILE" -C "$HELM_TMP" - HELM_TMP_BIN="$HELM_TMP/$OS-$ARCH/helm" - echo "Preparing to install $BINARY_NAME into ${HELM_INSTALL_DIR}" - runAsRoot cp "$HELM_TMP_BIN" "$HELM_INSTALL_DIR/$BINARY_NAME" - echo "$BINARY_NAME installed into $HELM_INSTALL_DIR/$BINARY_NAME" -} - -# verifyChecksum verifies the SHA256 checksum of the binary package. -verifyChecksum() { - printf "Verifying checksum... " - local sum=$(openssl sha1 -sha256 ${HELM_TMP_FILE} | awk '{print $2}') - local expected_sum=$(cat ${HELM_SUM_FILE}) - if [ "$sum" != "$expected_sum" ]; then - echo "SHA sum of ${HELM_TMP_FILE} does not match. Aborting." - exit 1 - fi - echo "Done." -} - -# verifySignatures obtains the latest KEYS file from GitHub main branch -# as well as the signature .asc files from the specific GitHub release, -# then verifies that the release artifacts were signed by a maintainer's key. -verifySignatures() { - printf "Verifying signatures... " - local keys_filename="KEYS" - local github_keys_url="https://raw.githubusercontent.com/helm/helm/main/${keys_filename}" - if [ "${HAS_CURL}" == "true" ]; then - curl -SsL "${github_keys_url}" -o "${HELM_TMP_ROOT}/${keys_filename}" - elif [ "${HAS_WGET}" == "true" ]; then - wget -q -O "${HELM_TMP_ROOT}/${keys_filename}" "${github_keys_url}" - fi - local gpg_keyring="${HELM_TMP_ROOT}/keyring.gpg" - local gpg_homedir="${HELM_TMP_ROOT}/gnupg" - mkdir -p -m 0700 "${gpg_homedir}" - local gpg_stderr_device="/dev/null" - if [ "${DEBUG}" == "true" ]; then - gpg_stderr_device="/dev/stderr" - fi - gpg --batch --quiet --homedir="${gpg_homedir}" --import "${HELM_TMP_ROOT}/${keys_filename}" 2> "${gpg_stderr_device}" - gpg --batch --no-default-keyring --keyring "${gpg_homedir}/${GPG_PUBRING}" --export > "${gpg_keyring}" - local github_release_url="https://github.com/helm/helm/releases/download/${TAG}" - if [ "${HAS_CURL}" == "true" ]; then - curl -SsL "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" -o "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" - curl -SsL "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" -o "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" - elif [ "${HAS_WGET}" == "true" ]; then - wget -q -O "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" - wget -q -O "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" "${github_release_url}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" - fi - local error_text="If you think this might be a potential security issue," - error_text="${error_text}\nplease see here: https://github.com/helm/community/blob/master/SECURITY.md" - local num_goodlines_sha=$(gpg --verify --keyring="${gpg_keyring}" --status-fd=1 "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256.asc" 2> "${gpg_stderr_device}" | grep -c -E '^\[GNUPG:\] (GOODSIG|VALIDSIG)') - if [[ ${num_goodlines_sha} -lt 2 ]]; then - echo "Unable to verify the signature of helm-${TAG}-${OS}-${ARCH}.tar.gz.sha256!" - echo -e "${error_text}" - exit 1 - fi - local num_goodlines_tar=$(gpg --verify --keyring="${gpg_keyring}" --status-fd=1 "${HELM_TMP_ROOT}/helm-${TAG}-${OS}-${ARCH}.tar.gz.asc" 2> "${gpg_stderr_device}" | grep -c -E '^\[GNUPG:\] (GOODSIG|VALIDSIG)') - if [[ ${num_goodlines_tar} -lt 2 ]]; then - echo "Unable to verify the signature of helm-${TAG}-${OS}-${ARCH}.tar.gz!" - echo -e "${error_text}" - exit 1 - fi - echo "Done." -} - -# fail_trap is executed if an error occurs. -fail_trap() { - result=$? - if [ "$result" != "0" ]; then - if [[ -n "$INPUT_ARGUMENTS" ]]; then - echo "Failed to install $BINARY_NAME with the arguments provided: $INPUT_ARGUMENTS" - help - else - echo "Failed to install $BINARY_NAME" - fi - echo -e "\tFor support, go to https://github.com/helm/helm." - fi - cleanup - exit $result -} - -# testVersion tests the installed client to make sure it is working. -testVersion() { - set +e - HELM="$(command -v $BINARY_NAME)" - if [ "$?" = "1" ]; then - echo "$BINARY_NAME not found. Is $HELM_INSTALL_DIR on your "'$PATH?' - exit 1 - fi - set -e -} - -# help provides possible cli installation arguments -help () { - echo "Accepted cli arguments are:" - echo -e "\t[--help|-h ] ->> prints this help" - echo -e "\t[--version|-v ] . When not defined it fetches the latest release from GitHub" - echo -e "\te.g. --version v3.0.0 or -v canary" - echo -e "\t[--no-sudo] ->> install without sudo" -} - -# cleanup temporary files to avoid https://github.com/helm/helm/issues/2977 -cleanup() { - if [[ -d "${HELM_TMP_ROOT:-}" ]]; then - rm -rf "$HELM_TMP_ROOT" - fi -} - -# Execution - -#Stop execution on any error -trap "fail_trap" EXIT -set -e - -# Set debug if desired -if [ "${DEBUG}" == "true" ]; then - set -x -fi - -# Parsing input arguments (if any) -export INPUT_ARGUMENTS="${@}" -set -u -while [[ $# -gt 0 ]]; do - case $1 in - '--version'|-v) - shift - if [[ $# -ne 0 ]]; then - export DESIRED_VERSION="${1}" - else - echo -e "Please provide the desired version. e.g. --version v3.0.0 or -v canary" - exit 0 - fi - ;; - '--no-sudo') - USE_SUDO="false" - ;; - '--help'|-h) - help - exit 0 - ;; - *) exit 1 - ;; - esac - shift -done -set +u - -initArch -initOS -verifySupported -checkDesiredVersion -if ! checkHelmInstalledVersion; then - downloadFile - verifyFile - installFile -fi -testVersion -cleanup From 71b7c99c1754528923e66db8c6422ea3e154e285 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 11:08:16 -0400 Subject: [PATCH 06/12] Added pydantic serialization, naming changes --- mev_inspect/crud/classified_traces.py | 4 ++-- mev_inspect/schemas/classified_traces.py | 6 ------ mev_inspect/schemas/utils.py | 19 ------------------- tests/helpers.py | 12 ++++++------ 4 files changed, 8 insertions(+), 33 deletions(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index be0ba49..25c6e2b 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -1,6 +1,6 @@ +import json from typing import List -from mev_inspect.schemas.utils import to_json from mev_inspect.models.classified_traces import ClassifiedTraceModel from mev_inspect.schemas.classified_traces import ClassifiedTrace @@ -36,7 +36,7 @@ def write_classified_traces( "abi_name": trace.abi_name, "function_name": trace.function_name, "function_signature": trace.function_signature, - "inputs": to_json(trace.inputs), + "inputs": json.loads(trace.json(include={"inputs"}))["inputs"], "from_address": trace.from_address, "to_address": trace.to_address, "gas": trace.gas, diff --git a/mev_inspect/schemas/classified_traces.py b/mev_inspect/schemas/classified_traces.py index 0fcf0ca..c84c32a 100644 --- a/mev_inspect/schemas/classified_traces.py +++ b/mev_inspect/schemas/classified_traces.py @@ -25,13 +25,10 @@ class Protocol(Enum): class ClassifiedTrace(Trace): - transaction_hash: str block_number: int trace_address: List[int] classification: Classification - - # Optional error: Optional[str] to_address: Optional[str] from_address: Optional[str] @@ -54,7 +51,6 @@ class ClassifiedTrace(Trace): class CallTrace(ClassifiedTrace): - to_address: str from_address: str @@ -62,8 +58,6 @@ class CallTrace(ClassifiedTrace): class DecodedCallTrace(CallTrace): inputs: Dict[str, Any] abi_name: str - - # Optional protocol: Optional[Protocol] gas: Optional[int] gas_used: Optional[int] diff --git a/mev_inspect/schemas/utils.py b/mev_inspect/schemas/utils.py index e3fc2fd..1d15876 100644 --- a/mev_inspect/schemas/utils.py +++ b/mev_inspect/schemas/utils.py @@ -15,25 +15,6 @@ def to_original_json_dict(model: BaseModel) -> dict: return json.loads(model.json(by_alias=True, exclude_unset=True)) -def to_json(d): - if isinstance(d, dict): - tmp = {} - for key, value in d.items(): - if isinstance(value, bytes): - tmp[key] = value.hex() - if isinstance(value, tuple): - res = [] - for val in value: - if isinstance(val, bytes): - res.append(val.hex()) - else: - res.append(val) - tmp[key] = res - - d.update(tmp) - return json.dumps(d) - - class Web3Model(BaseModel): """BaseModel that handles web3's unserializable objects""" diff --git a/tests/helpers.py b/tests/helpers.py index c030bbb..72afdef 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -17,8 +17,8 @@ def make_transfer_trace( to_address: str, token_address: str, amount: int, - action: dict = {}, - subtraces: int = 0, + action={}, + subtraces=0, ): return CallTrace( transaction_hash=transaction_hash, @@ -47,8 +47,8 @@ def make_swap_trace( abi_name: str, recipient_address: str, recipient_input_key: str, - action: dict = {}, - subtraces: int = 0, + action={}, + subtraces=0, ): return DecodedCallTrace( transaction_hash=transaction_hash, @@ -89,8 +89,8 @@ def make_many_unknown_traces( block_number: int, transaction_hash: str, trace_addresses: List[List[int]], - action: dict = {}, - subtraces: int = 0, + action={}, + subtraces=0, ) -> List[ClassifiedTrace]: return [ From 034b72c463d87fd7210cbe51fd4d2938932d4de0 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 11:11:05 -0400 Subject: [PATCH 07/12] Updated comments --- mev_inspect/schemas/swaps.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/mev_inspect/schemas/swaps.py b/mev_inspect/schemas/swaps.py index f0fb143..f17068a 100644 --- a/mev_inspect/schemas/swaps.py +++ b/mev_inspect/schemas/swaps.py @@ -17,7 +17,5 @@ class Swap(BaseModel): token_in_amount: int token_out_address: str token_out_amount: int - - # Optional protocol: Optional[Protocol] error: Optional[str] From cc9f3e993dbd6a58b63f910975142155608f50f0 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 11:20:28 -0400 Subject: [PATCH 08/12] Fixed helpers default attrs --- mev_inspect/crud/classified_traces.py | 34 +++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index 25c6e2b..78f51aa 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -26,24 +26,22 @@ def write_classified_traces( for trace in classified_traces: models.append( ClassifiedTraceModel( - **{ - "transaction_hash": trace.transaction_hash, - "block_number": trace.block_number, - "classification": trace.classification.value, - "trace_type": trace.type.value, - "trace_address": trace.trace_address, - "protocol": str(trace.protocol), - "abi_name": trace.abi_name, - "function_name": trace.function_name, - "function_signature": trace.function_signature, - "inputs": json.loads(trace.json(include={"inputs"}))["inputs"], - "from_address": trace.from_address, - "to_address": trace.to_address, - "gas": trace.gas, - "value": trace.value, - "gas_used": trace.gas_used, - "error": trace.error, - } + transaction_hash=trace.transaction_hash, + block_numbe=trace.block_number, + classification=trace.classification.value, + trace_type=trace.type.value, + trace_address=trace.trace_address, + protocol=str(trace.protocol), + abi_name=trace.abi_name, + function_name=trace.function_name, + function_signature=trace.function_signature, + inputs=json.loads(trace.json(include={"inputs"}))["inputs"], + from_address=trace.from_address, + to_address=trace.to_address, + gas=trace.gas, + value=trace.value, + gas_used=trace.gas_used, + error=trace.error, ) ) From 230a07f47d0b1b4d1c1b3423d3045b184d2a03d9 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 11:28:18 -0400 Subject: [PATCH 09/12] Simplified serialization --- mev_inspect/crud/classified_traces.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index 78f51aa..b2e90b4 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -22,8 +22,9 @@ def write_classified_traces( db_session, classified_traces: List[ClassifiedTrace], ) -> None: - models = [] for trace in classified_traces: + inputs_json = (json.loads(trace.json(include={"inputs"}))["inputs"],) + models = [] models.append( ClassifiedTraceModel( transaction_hash=trace.transaction_hash, @@ -35,7 +36,7 @@ def write_classified_traces( abi_name=trace.abi_name, function_name=trace.function_name, function_signature=trace.function_signature, - inputs=json.loads(trace.json(include={"inputs"}))["inputs"], + inputs=inputs_json, from_address=trace.from_address, to_address=trace.to_address, gas=trace.gas, From 7e7bd5bc0793a3f9be7c0db3a536042920f207ce Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 11:36:35 -0400 Subject: [PATCH 10/12] Removed action and subtraces arguments from helpers --- tests/helpers.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/helpers.py b/tests/helpers.py index 72afdef..540a327 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -17,8 +17,6 @@ def make_transfer_trace( to_address: str, token_address: str, amount: int, - action={}, - subtraces=0, ): return CallTrace( transaction_hash=transaction_hash, @@ -33,8 +31,8 @@ def make_transfer_trace( "amount": amount, }, block_hash=str(block_number), - action=action, - subtraces=subtraces, + action={}, + subtraces=0.0, ) @@ -47,16 +45,14 @@ def make_swap_trace( abi_name: str, recipient_address: str, recipient_input_key: str, - action={}, - subtraces=0, ): return DecodedCallTrace( transaction_hash=transaction_hash, block_number=block_number, type=TraceType.call, trace_address=trace_address, - action=action, - subtraces=subtraces, + action={}, + subtraces=0, classification=Classification.swap, from_address=from_address, to_address=pool_address, @@ -70,15 +66,13 @@ def make_unknown_trace( block_number: int, transaction_hash: str, trace_address: List[int], - action={}, - subtraces=0, ): return ClassifiedTrace( block_number=block_number, transaction_hash=transaction_hash, trace_address=trace_address, - action=action, - subtraces=subtraces, + action={}, + subtraces=0, block_hash=str(block_number), type=TraceType.call, classification=Classification.unknown, @@ -89,13 +83,13 @@ def make_many_unknown_traces( block_number: int, transaction_hash: str, trace_addresses: List[List[int]], - action={}, - subtraces=0, ) -> List[ClassifiedTrace]: return [ make_unknown_trace( - block_number, transaction_hash, trace_address, action, subtraces + block_number, + transaction_hash, + trace_address, ) for trace_address in trace_addresses ] From fbb0ebaffef65e59b205f4f7b8628c5dd6773699 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 11:57:16 -0400 Subject: [PATCH 11/12] Syntax fix --- mev_inspect/crud/classified_traces.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index b2e90b4..973c9fe 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -22,9 +22,9 @@ def write_classified_traces( db_session, classified_traces: List[ClassifiedTrace], ) -> None: + models = [] for trace in classified_traces: inputs_json = (json.loads(trace.json(include={"inputs"}))["inputs"],) - models = [] models.append( ClassifiedTraceModel( transaction_hash=trace.transaction_hash, From 1b0e05ec2f82bacd62b668b929b552e95ef390a5 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 16 Sep 2021 11:58:36 -0400 Subject: [PATCH 12/12] syntax --- mev_inspect/crud/classified_traces.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mev_inspect/crud/classified_traces.py b/mev_inspect/crud/classified_traces.py index 973c9fe..ad641fb 100644 --- a/mev_inspect/crud/classified_traces.py +++ b/mev_inspect/crud/classified_traces.py @@ -28,7 +28,7 @@ def write_classified_traces( models.append( ClassifiedTraceModel( transaction_hash=trace.transaction_hash, - block_numbe=trace.block_number, + block_number=trace.block_number, classification=trace.classification.value, trace_type=trace.type.value, trace_address=trace.trace_address,