diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000..9c4f71ca --- /dev/null +++ b/.flake8 @@ -0,0 +1,4 @@ +[flake8] +max-line-length = 88 +extend-ignore = E203 +exclude = .git,__pycache__,node_modules,.direnv diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d6e06dfc..60f94d2e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -45,3 +45,32 @@ jobs: - uses: articulate/actions-markdownlint@v1.1.0 # Check only if there are differences in the source code if: env.GIT_DIFF + python-lint: + name: Run flake8 on python integration tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v15 + - uses: cachix/cachix-action@v10 + with: + name: ethermint + - uses: technote-space/get-diff-action@v6.1.0 + with: + PATTERNS: | + **/**.py + - run: | + nix-shell -I nixpkgs=./nix -p test-env --run "make lint-py" + if: env.GIT_DIFF + gomod2nix: + name: Check gomod2nix.toml file is up to date + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.4 + - uses: cachix/install-nix-action@v15 + - uses: cachix/cachix-action@v10 + with: + name: ethermint + - name: run gomod2nix + run: | + nix run -f ./nix gomod2nix + git diff --no-ext-diff --exit-code diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 988078a4..a863901e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -111,6 +111,14 @@ jobs: with: name: ethermint signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}" + - uses: technote-space/get-diff-action@v6.1.0 + with: + PATTERNS: | + **/**.sol + **/**.go + go.mod + go.sum + tests/integration_tests/** - name: Run integration tests run: make run-integration-tests if: env.GIT_DIFF @@ -202,4 +210,4 @@ jobs: - name: Test simulation after import run: | make test-sim-after-import - if: env.GIT_DIFF \ No newline at end of file + if: env.GIT_DIFF diff --git a/Makefile b/Makefile index 60536b71..726d3586 100755 --- a/Makefile +++ b/Makefile @@ -394,12 +394,16 @@ lint: @@test -n "$$golangci-lint version | awk '$4 >= 1.42')" golangci-lint run --out-format=tab -n +lint-py: + flake8 --show-source --count --statistics \ + --format="::error file=%(path)s,line=%(row)d,col=%(col)d::%(path)s:%(row)d:%(col)d: %(code)s %(text)s" \ + format: find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -name '*.pb.go' -not -name '*.pb.gw.go' | xargs gofumpt -d -e -extra lint-fix: golangci-lint run --fix --out-format=tab --issues-exit-code=0 -.PHONY: lint lint-fix +.PHONY: lint lint-fix lint-py format-fix: find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -name '*.pb.go' -not -name '*.pb.gw.go' | xargs gofumpt -w -s diff --git a/default.nix b/default.nix index 970d2140..066b4093 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,5 @@ { lib , buildGoApplication -, nix-gitignore , rev ? "dirty" }: let @@ -17,21 +16,10 @@ let in buildGoApplication rec { inherit pname version tags ldflags; - src = (nix-gitignore.gitignoreSourcePure [ - "../*" # ignore all, then add whitelists - "!../x/" - "!../app/" - "!../cmd/" - "!../client/" - "!../server/" - "!../crypto/" - "!../rpc/" - "!../types/" - "!../encoding/" - "!../go.mod" - "!../go.sum" - "!../gomod2nix.toml" - ] ./.); + src = lib.sourceByRegex ./. [ + "^(x|app|cmd|client|server|crypto|rpc|types|encoding|ethereum|testutil|version|go.mod|go.sum|gomod2nix.toml)($|/.*)" + "^tests(/.*[.]go)?$" + ]; modules = ./gomod2nix.toml; doCheck = false; pwd = src; # needed to support replace diff --git a/gomod2nix.toml b/gomod2nix.toml index 98d193d0..87df9a17 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -1,9 +1,27 @@ schema = 3 [mod] + [mod."cloud.google.com/go"] + version = "v0.100.2" + hash = "sha256-wHV0FHvU4JjXh7h8reLpF+rdWJklx5DwsdrrDCTmjl0=" + [mod."cloud.google.com/go/compute"] + version = "v1.6.1" + hash = "sha256-S0BOrmPQOmzyMCEDIJJYyHa9YVImtJIYr5pH5+Ry1yI=" + [mod."cloud.google.com/go/iam"] + version = "v0.3.0" + hash = "sha256-/t1+ooeqksn8vSZhNFuWfQQpIQTxcN6nmeza2yorz0A=" + [mod."cloud.google.com/go/storage"] + version = "v1.14.0" + hash = "sha256-VyrDguWYk9ARFuX7ru6ElQjeMqytDgXs/RVQQ6HQDFM=" + [mod."cosmossdk.io/errors"] + version = "v1.0.0-beta.7" + hash = "sha256-XblGvIx6Wvvq6wggXjp+KbeJGXoe7AZH7hXEdauCezU=" + [mod."cosmossdk.io/math"] + version = "v1.0.0-beta.3" + hash = "sha256-lTQ27ZlL+kWlc+S//sJmyiOwaf9qS+YLv61I4OXi9XE=" [mod."filippo.io/edwards25519"] - version = "v1.0.0-beta.2" - hash = "sha256-pcbcYR1Kiarajit0b6f4/SDHap8jkLXmkiblMLWuZrs=" + version = "v1.0.0-rc.1" + hash = "sha256-3DboBqby2ejRU33FG96Z8JF5AJ8HP2rC/v++VyoQ2LQ=" [mod."github.com/99designs/keyring"] version = "v1.1.7-0.20210622111912-ef00f8ac3d76" hash = "sha256-oCalyOZWegRgKHZ1GvYHNkrMKh51j8cOE/K4yBPM5Oc=" @@ -11,9 +29,6 @@ schema = 3 [mod."github.com/ChainSafe/go-schnorrkel"] version = "v0.0.0-20200405005733-88cbf1b4c40d" hash = "sha256-i8RXZemJGlSjBT35oPm0SawFiBoIU5Pkq5xp4n/rzCY=" - [mod."github.com/DataDog/zstd"] - version = "v1.4.5" - hash = "sha256-WFHcU2EFRIIc1wSc0jN2VPeJzBMcZTIN5LFNBFk+NAY=" [mod."github.com/StackExchange/wmi"] version = "v0.0.0-20180116203802-5d049714c4a6" hash = "sha256-0yUxhZB3v3ZE3QY36zHs2cJ1S4GXptXIhyAi6sI2nOo=" @@ -26,9 +41,15 @@ schema = 3 [mod."github.com/armon/go-metrics"] version = "v0.4.0" hash = "sha256-mB6EFtn8BZ0u9TcJ6QTYw2SNAr4CnTVOMpiRKaoNH7k=" + [mod."github.com/aws/aws-sdk-go"] + version = "v1.40.45" + hash = "sha256-7m4jOfXs356SUZG9tR+z3Yfa/O0CorkSkOXg/AmbqRM=" [mod."github.com/beorn7/perks"] version = "v1.0.1" hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4=" + [mod."github.com/bgentry/go-netrc"] + version = "v0.0.0-20140422174119-9fd32a8b3d3d" + hash = "sha256-NDxQzO5C5M/aDz5/pjUHfZUh4VwIXovbb3irtxWCwjY=" [mod."github.com/bgentry/speakeasy"] version = "v0.1.0" hash = "sha256-Gt1vj6CFovLnO6wX5u2O4UfecY9V2J9WGw1ez4HMrgk=" @@ -45,26 +66,32 @@ schema = 3 version = "v1.0.3-0.20201208143702-a53e38424cce" hash = "sha256-4kasJReFcj25JRHx9dJMct3yDkHqVoHGUx5cu45Msfo=" [mod."github.com/cenkalti/backoff/v4"] - version = "v4.1.1" - hash = "sha256-35Dk9c8Om+NSVKGwu8MwJkB8ig8mDLRviCIYbIRAgiE=" + version = "v4.1.3" + hash = "sha256-u6MEDopHoTWAZoVvvXOKnAg++xre53YgQx0gmf6t2KU=" [mod."github.com/cespare/xxhash"] version = "v1.1.0" hash = "sha256-nVDTtXH9PC3yJ0THaQZEN243UP9xgLi/clt5xRqj3+M=" [mod."github.com/cespare/xxhash/v2"] version = "v2.1.2" hash = "sha256-YV9SmXDtmmgQylQUfrUgQLAPfqYexcHxegMBT+IX9qM=" + [mod."github.com/cockroachdb/apd/v2"] + version = "v2.0.2" + hash = "sha256-UrPHkvqVF8V78+kXKmjTHl79XsgDBnqFsje5BMYh0E4=" [mod."github.com/coinbase/rosetta-sdk-go"] - version = "v0.7.0" - hash = "sha256-W4cY7vr/+f6zjmO16WxF7XQBhW5mVrEfpYTNcu+y8yo=" + version = "v0.7.9" + hash = "sha256-ZWIXIXcHGjeCNgMrpXymry8/8esDDauGFfF/+gEoO1Y=" [mod."github.com/confio/ics23/go"] version = "v0.7.0" hash = "sha256-FjUQfDKtX+/13+UjJzbYPAkgM4GPZ0vk+dKz7/iRetw=" [mod."github.com/cosmos/btcutil"] version = "v1.0.4" hash = "sha256-JvcBXBdjdmnaW/nyf/tw/uaOAGn1b78yxrtl2/Rs3kA=" + [mod."github.com/cosmos/cosmos-proto"] + version = "v1.0.0-alpha7" + hash = "sha256-2wCH+toTF2A6MfFjOa13muEH5oBCcxAhZEqirNOrBA0=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.45.6" - hash = "sha256-dImgFIXEL4gDOF0gV7zqZLV7Di5rIpeRYgRpc9sY7k8=" + version = "v0.46.0" + hash = "sha256-q4msaICtVKCtcJATM8gH1xCrB+w2HksheGtz//9LO7o=" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0" hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA=" @@ -72,11 +99,12 @@ schema = 3 version = "v1.2.0" hash = "sha256-209TcVuXc5s/TcOvNlaQ1HEJAUDTEK3nxPhs+d8TEcY=" [mod."github.com/cosmos/iavl"] - version = "v0.17.3" - hash = "sha256-gRWMH/ijkw569JSYsAVnZljH3Q6ywTTc6P8DdyJKKAk=" - [mod."github.com/cosmos/ibc-go/v4"] - version = "v4.0.0-rc0" - hash = "sha256-jH0wAQTWnknL05/CLhnpdFYb4wjEatVMgJttsTqtdJg=" + version = "v0.19.0" + hash = "sha256-NunBVGJqJkpOMcTmFUCnXQiJSjgNEuxlMu+bkj33wIs=" + [mod."github.com/cosmos/ibc-go/v5"] + version = "v5.0.0-20220728121949-040aca93dda5" + hash = "sha256-G+hffr22KJZlbshH9HkqMP8m9XLKcSSzwpKCx9cphbo=" + replaced = "github.com/notional-labs/ibc-go/v5" [mod."github.com/cosmos/ledger-cosmos-go"] version = "v0.11.1" hash = "sha256-yli+VvVtZmHo2LPvCY6lYVUfcCDn3sBLDL+a8KIlqDA=" @@ -84,8 +112,8 @@ schema = 3 version = "v0.9.2" hash = "sha256-0YI+0A6wFBjiebBwzWOQjkgXkTakCrf7Gjg2xEaQdoM=" [mod."github.com/danieljoos/wincred"] - version = "v1.0.2" - hash = "sha256-jBLslm3UA6IDKlzgW6jIOnqxzOE5JjVx4Hm4LJ+vqPo=" + version = "v1.1.2" + hash = "sha256-Nnklfg12vmWCOhELGyoRqEF4w4srp0WbPwreaChYLKs=" [mod."github.com/davecgh/go-spew"] version = "v1.1.1" hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI=" @@ -99,11 +127,11 @@ schema = 3 version = "v0.0.0-20180107155436-c41aec40b27f" hash = "sha256-abLOtEcomAqCWLphd2X6WkD/ED764w6sa6unox4BXss=" [mod."github.com/dgraph-io/badger/v2"] - version = "v2.2007.2" - hash = "sha256-qd12+k05ooJG+eaD3UN/UK/bUyH8KZQ4GfTnNR/Xw4U=" + version = "v2.2007.4" + hash = "sha256-+KwqZJZpViv8S3TqUVvPXrFoMgWFyS3NoLsi4RR5fGk=" [mod."github.com/dgraph-io/ristretto"] - version = "v0.0.3" - hash = "sha256-z2vtpbiCNNfaysPEdOCgcyuPVM8jds1bcfegDJaRSew=" + version = "v0.1.0" + hash = "sha256-01jneg1+1x8tTfUTBZ+6mHkQaqXVnPYxLJyJhJQcvt4=" [mod."github.com/dgryski/go-farm"] version = "v0.0.0-20200201041132-a6ae2369ad13" hash = "sha256-aOMlPwFY36bLiiIx4HonbCYRAhagk5N6HAWN7Ygif+E=" @@ -117,8 +145,8 @@ schema = 3 version = "v1.0.0" hash = "sha256-gy4G1PnHD9iw2MitHX6y1y93qr3C9IncmXL7ttUMDs8=" [mod."github.com/dvsekhvalnov/jose2go"] - version = "v0.0.0-20200901110807-248326c1351b" - hash = "sha256-+ogb8WGT1LQbXmzhpiGd0gWg4x4Wyn5Rt7Soa5Il8hs=" + version = "v1.5.0" + hash = "sha256-dsju6Xt83pe5SRPN/pUOnDUQByZ6hrhKIXWs3sSu7t8=" [mod."github.com/edsrzf/mmap-go"] version = "v1.0.0" hash = "sha256-k1DYvCqO3BKNcGEve/nMW0RxzMkK2tGfXbUbycqcVSo=" @@ -144,8 +172,8 @@ schema = 3 version = "v0.5.1" hash = "sha256-t50m9ffvW8PiGvO+2svnLI+N/XaWaBS+ZlhwrEQn2gU=" [mod."github.com/go-ole/go-ole"] - version = "v1.2.1" - hash = "sha256-N2SnVxn4YH+jk2aT4/RWLKZMUaoOHTMPP1cS2E5HkIQ=" + version = "v1.2.6" + hash = "sha256-+oxitLeJxYF19Z6g+6CgmCHJ1Y5D8raMi2Cb3M6nXCs=" [mod."github.com/go-sourcemap/sourcemap"] version = "v2.1.3+incompatible" hash = "sha256-eXhXPPLnAy/rmt/zDgeqni2G3o58UtnHjR8vHLXvISI=" @@ -162,6 +190,12 @@ schema = 3 version = "v1.3.3-alpha.regen.1" hash = "sha256-TKa//aFXpWH+yK/cN1oaaqhipZpPUovekP6oA9vLIHY=" replaced = "github.com/regen-network/protobuf" + [mod."github.com/golang/glog"] + version = "v1.0.0" + hash = "sha256-bglITqRgzi52zc6FoYYnfCvrjFWV4RVOacPCnbEBom4=" + [mod."github.com/golang/groupcache"] + version = "v0.0.0-20210331224755-41bb18bfe9da" + hash = "sha256-7Gs7CS9gEYZkbu5P4hqPGBpeGZWC64VDwraSKFF+VR0=" [mod."github.com/golang/protobuf"] version = "v1.5.2" hash = "sha256-IVwooaIo46iq7euSSVWTBAdKd+2DUaJ67MtBao1DpBI=" @@ -169,14 +203,20 @@ schema = 3 version = "v0.0.4" hash = "sha256-Umx+5xHAQCN/Gi4HbtMhnDCSPFAXSsjVbXd8n5LhjAA=" [mod."github.com/google/btree"] - version = "v1.0.0" - hash = "sha256-5gr0RMnlvrzCke3kwpkf92WvW3x5nnKZesoulyoYRC0=" + version = "v1.0.1" + hash = "sha256-1PIeFGgUL4BK/StL/D12pg9bEQ5HfMT/fMLdus4pZTs=" + [mod."github.com/google/go-cmp"] + version = "v0.5.8" + hash = "sha256-8zkIo+Sr1NXMnj3PNmvjX2sZKnAKWXOFvmnX7D9bwxQ=" [mod."github.com/google/orderedcode"] version = "v0.0.1" hash = "sha256-KrExYovtUQrHGI1mPQf57jGw8soz7eWOC2xqEaV0uGk=" [mod."github.com/google/uuid"] version = "v1.3.0" hash = "sha256-QoR55eBtA94T2tBszyxfDtO7/pjZZSGb5vm7U0Xhs0Y=" + [mod."github.com/googleapis/gax-go/v2"] + version = "v2.4.0" + hash = "sha256-zzat4+3iF2XBTQ6RZAUgsCbfK0HgO0nYhM4utA5dqz0=" [mod."github.com/gorilla/handlers"] version = "v1.5.1" hash = "sha256-GnBAARgOx1E+hDMQ63SI17hdhGtLQxb31lZOmn5j/pU=" @@ -201,9 +241,21 @@ schema = 3 [mod."github.com/gtank/ristretto255"] version = "v0.1.2" hash = "sha256-fAoVTP1s5+f7/YtnzI+gaEz1MS+FuCgy3sT19ZHIxE4=" + [mod."github.com/hashicorp/go-cleanhttp"] + version = "v0.5.2" + hash = "sha256-N9GOKYo7tK6XQUFhvhImtL7PZW/mr4C4Manx/yPVvcQ=" + [mod."github.com/hashicorp/go-getter"] + version = "v1.6.1" + hash = "sha256-WPCbbfFbE617EIUXxq81p3XrvhkSvYOeuiaR7n23nr0=" [mod."github.com/hashicorp/go-immutable-radix"] version = "v1.3.1" hash = "sha256-65+A2HiVfS/GV9G+6/TkXXjzXhI/V98e6RlJWjxy+mg=" + [mod."github.com/hashicorp/go-safetemp"] + version = "v1.0.0" + hash = "sha256-g5i9m7FSRInQzZ4iRpIsoUu685AY7fppUwjhuZCezT8=" + [mod."github.com/hashicorp/go-version"] + version = "v1.4.0" + hash = "sha256-WhSIsdN9RjM9rMBVPboxk4uEJQXUx5lW7gpNu/hDSNA=" [mod."github.com/hashicorp/golang-lru"] version = "v0.5.5-0.20210104140557-80c98217689d" hash = "sha256-w5utLMR7p5pF9xX+mI3N9NyfQ8ixNXNTgfXDu8fudmc=" @@ -211,8 +263,8 @@ schema = 3 version = "v1.0.0" hash = "sha256-xsRCmYyBfglMxeWUvTZqkaRLSW+V2FvNodEDjTGg1WA=" [mod."github.com/hdevalence/ed25519consensus"] - version = "v0.0.0-20210204194344-59a8610d2b87" - hash = "sha256-QgOyyg2phYmreWbMzuSgDVY/unUUZhmbFsqvShCKgFs=" + version = "v0.0.0-20220222234857-c00d1f31bab3" + hash = "sha256-1ec2xc7l9oNtWJwVtx14HnozMZCe2DpfXmu1xI1Z/yo=" [mod."github.com/holiman/bloomfilter/v2"] version = "v2.0.3" hash = "sha256-5VsJMQzJSNd4F7yAl3iF/q6JodWOlE4dUvTQ0UGPe+k=" @@ -231,6 +283,9 @@ schema = 3 [mod."github.com/jackpal/go-nat-pmp"] version = "v1.0.2" hash = "sha256-L1D4Yoxnzihs795GZ+Q3AZsFP5c4iqyjTeyrudzPXtw=" + [mod."github.com/jmespath/go-jmespath"] + version = "v0.4.0" + hash = "sha256-xpT9g2qIXmPq7eeHUXHiDqJeQoHCudh44G/KCSFbcuo=" [mod."github.com/jmhodges/levigo"] version = "v1.0.0" hash = "sha256-xEd0mDBeq3eR/GYeXjoTVb2sPs8sTCosn5ayWkcgENI=" @@ -238,17 +293,20 @@ schema = 3 version = "v0.0.0-20190712205309-48d3d31d256d" hash = "sha256-bn04wkDnhQ0tb/YzmPf7MNJlApOl+z6+EAbUqH7Ti5Q=" [mod."github.com/klauspost/compress"] - version = "v1.13.6" - hash = "sha256-aUTfsB3IfJXil8SPgtAmU1t+l6Dxs03UBB9Pa6StuqM=" + version = "v1.15.1" + hash = "sha256-aHpB6o+cCu0Sv8cNBqetnpX5Xb4/Q3uDiWOGBf9pfj0=" [mod."github.com/lib/pq"] version = "v1.10.6" hash = "sha256-8EhFwY/9YH5L/fd6l2beOnC3VvpegRAmCCsnDVJBqBM=" [mod."github.com/libp2p/go-buffer-pool"] - version = "v0.0.2" - hash = "sha256-dcgL4tAHDJsevnvwIAXZmtKqB9h4986go/Yn3IlfPAY=" + version = "v0.1.0" + hash = "sha256-wQqGTtRWsfR9n0O/SXHVgECebbnNmHddxJIbG63OJBQ=" [mod."github.com/magiconair/properties"] version = "v1.8.6" hash = "sha256-xToSfpuePctkTdhJtsuKIEkXwfMZbnkFT98ahIfd4wY=" + [mod."github.com/mattn/go-colorable"] + version = "v0.1.12" + hash = "sha256-Y1vCt0ShrCz4wSmwsppCfeLPLKrWusc2zM2lUFwDMyI=" [mod."github.com/mattn/go-isatty"] version = "v0.0.14" hash = "sha256-e8zn5eCVh/B1HOP1PGXeXH0bGkIV0vKYP9KLwZni5as=" @@ -256,8 +314,8 @@ schema = 3 version = "v0.0.9" hash = "sha256-dK/kIPe1tcxEubwI4CWfov/HWRBgD/fqlPC3d5i30CY=" [mod."github.com/matttproud/golang_protobuf_extensions"] - version = "v1.0.1" - hash = "sha256-ystDNStxR90j4CK+AMcEQ5oyYFRgWoGdvWlS0XQMDLQ=" + version = "v1.0.2-0.20181231171920-c182affec369" + hash = "sha256-uovu7OycdeZ2oYQ7FhVxLey5ZX3T0FzShaRldndyGvc=" [mod."github.com/miguelmota/go-ethereum-hdwallet"] version = "v0.1.1" hash = "sha256-SoKy4Mwkbm0J2yQLDcIcBbo/J6auTNdlZslTvJrSknM=" @@ -267,6 +325,12 @@ schema = 3 [mod."github.com/minio/highwayhash"] version = "v1.0.2" hash = "sha256-UeHeepKtToyA5e/w3KdmpbCn+4medesZG0cAcU6P2cY=" + [mod."github.com/mitchellh/go-homedir"] + version = "v1.1.0" + hash = "sha256-oduBKXHAQG8X6aqLEpqZHs5DOKe84u6WkBwi4W6cv3k=" + [mod."github.com/mitchellh/go-testing-interface"] + version = "v1.0.0" + hash = "sha256-/Dpv/4i5xuK8hDH+q8YTdF6Jg6NNtfO4Wqig2JCWgrY=" [mod."github.com/mitchellh/mapstructure"] version = "v1.5.0" hash = "sha256-ztVhGQXs67MF8UadVvG72G3ly0ypQW0IRDdOOkjYwoE=" @@ -280,14 +344,14 @@ schema = 3 version = "v2.1.4" hash = "sha256-b/5ByIRFvmRp++0oGZCYcHhAFbk4Cborj2BmvmvVzV0=" [mod."github.com/onsi/gomega"] - version = "v1.19.0" - hash = "sha256-0bCCq8v8m2VqUM1zmS0NfXSjMXS39GXB1mTqkyaHVyQ=" + version = "v1.20.0" + hash = "sha256-cuUF+eUZ9p0kCpAFW+STmdG+wtu6s5xic7AQWtD2RAU=" [mod."github.com/pelletier/go-toml"] version = "v1.9.5" hash = "sha256-RJ9K1BTId0Mled7S66iGgxHkZ5JKEIsrrNaEfM8aImc=" [mod."github.com/pelletier/go-toml/v2"] - version = "v2.0.1" - hash = "sha256-GUj6zkM1ToK4v9pSkdXp07TTGwpnWoj+lPxpg9beSzQ=" + version = "v2.0.2" + hash = "sha256-z3JgSi7AKZul1Ta5NwpLVebKw30mGUKc+ijssiAClVU=" [mod."github.com/petermattis/goid"] version = "v0.0.0-20180202154549-b0b1615b78e5" hash = "sha256-TCyVuP7rAtrvlterVCapFtbf6UmIf72FXQvkQoDtDj4=" @@ -304,8 +368,8 @@ schema = 3 version = "v0.2.0" hash = "sha256-LTHxYPRgoggl+v89ly2/RkyPIuJlmZRdGs6ZRtK3zkk=" [mod."github.com/prometheus/common"] - version = "v0.32.1" - hash = "sha256-LdgJBz4EcjrBaZVr2CjDjM0hTwRFQIJE2yACEG631bQ=" + version = "v0.34.0" + hash = "sha256-M+v+7DntUBmiQNzfNmG3aLLufbl0XBQOubtYoNTzJDA=" [mod."github.com/prometheus/procfs"] version = "v0.7.3" hash = "sha256-ik0WpnpSjMwifPYfQTfu/eb5ilNj+eLJF0d5Dftp8A8=" @@ -328,8 +392,8 @@ schema = 3 version = "v1.8.2" hash = "sha256-FxBbQVb8zIoDGGaAJKfsYV0+POkh1tyX7P6A/Lk5Vsc=" [mod."github.com/rs/zerolog"] - version = "v1.23.0" - hash = "sha256-YxxKu0yJhnx1I9UKR6qd3PKfVWe3hGbFhx0esop46bM=" + version = "v1.27.0" + hash = "sha256-BxQtP2TROeSSpj9l1irocuSfxn55UL4ugzB/og7r8eE=" [mod."github.com/sasha-s/go-deadlock"] version = "v0.2.1-0.20190427202633-1595213edefa" hash = "sha256-BBOohTR+ktgJHAoYWh39/ui8MczcJECloc7tvxVBE50=" @@ -357,12 +421,15 @@ schema = 3 [mod."github.com/status-im/keycard-go"] version = "v0.0.0-20200402102358-957c09536969" hash = "sha256-yddXXuu6mEFEO2/K6c1tWymeBKzOcvLQnNsFGRjtfXk=" + [mod."github.com/stretchr/objx"] + version = "v0.4.0" + hash = "sha256-W6ycaeD/okr4udpCAGDsByr3OmiR0fuBzJUXHaHEFC0=" [mod."github.com/stretchr/testify"] version = "v1.8.0" hash = "sha256-LDxBAebK+A06y4vbH7cd1sVBOameIY81Xm8/9OPZh7o=" [mod."github.com/subosito/gotenv"] - version = "v1.3.0" - hash = "sha256-8AjkGo9t2W/VCr1bD6JJXRYUkRFyIOR5ipiAxhHnAEs=" + version = "v1.4.0" + hash = "sha256-H5mdiXO7LZ7ggJMjeiOLGWa1UbweXy/10KwEpFOrPv8=" [mod."github.com/syndtr/goleveldb"] version = "v1.0.1-0.20210819022825-2ae1ddf74ef7" hash = "sha256-36a4hgVQfwtS2zhylKpQuFhrjdc/Y8pF0dxc26jcZIU=" @@ -376,57 +443,74 @@ schema = 3 version = "v0.16.0" hash = "sha256-JW4zO/0vMzf1dXLePOqaMtiLUZgNbuIseh9GV+jQlf0=" [mod."github.com/tendermint/tendermint"] - version = "v0.34.20-0.20220517115723-e6f071164839" - hash = "sha256-9hcZo4gjO92klL5vTIyraYZaKIdNRcoxW/PCdA2m/4s=" + version = "v0.34.20" + hash = "sha256-j1PyOLf8xG9BLtnmDWEagqWvOOi7248bvx4VmB5bu/c=" [mod."github.com/tendermint/tm-db"] version = "v0.6.7" hash = "sha256-hl/3RrBrpkk2zA6dmrNlIYKs1/GfqegSscDSkA5Pjlo=" [mod."github.com/tklauser/go-sysconf"] - version = "v0.3.5" - hash = "sha256-QMf8CPGWnO6LoHtJPBIaY3ebDHmLDJaCAUWwNPtNCoU=" + version = "v0.3.10" + hash = "sha256-Zf2NsgM9+HeM949vCce4HQtSbfUiFpeiQ716yKcFyx4=" [mod."github.com/tklauser/numcpus"] - version = "v0.2.2" - hash = "sha256-nCxE51VHS97zkLu7Nd6QAWPrMiLQF3eNjqibdhkK1vk=" + version = "v0.4.0" + hash = "sha256-ndE82nOb3agubhEV7aRzEqqTlN4DPbKFHEm2+XZLn8k=" [mod."github.com/tyler-smith/go-bip39"] version = "v1.1.0" hash = "sha256-3YhWBtSwRLGwm7vNwqumphZG3uLBW1vwT9QkQ8JuSjU=" + [mod."github.com/ulikunitz/xz"] + version = "v0.5.8" + hash = "sha256-bfG3dssBUn+mSOAuKL+a/DTGGLUA+eASgLoGv/Gkqs0=" [mod."github.com/zondax/hid"] - version = "v0.9.0" - hash = "sha256-PvXtxXo/3C+DS9ZeGBlr4zXbIpaYNtMqLzxYhusFXNY=" + version = "v0.9.1-0.20220302062450-5552068d2266" + hash = "sha256-IZea8SHuLQxlltm1avieRVI054TWZg2jEoplodvNtwk=" [mod."go.etcd.io/bbolt"] version = "v1.3.6" hash = "sha256-DenVAmyN22xUiivk6fdJp4C9ZnUJXCMDUf8E0goRRV4=" + [mod."go.opencensus.io"] + version = "v0.23.0" + hash = "sha256-R3O9GyNtv6j0ic7s+2xkLLaLzbJEop0Otj1nJDFBjsg=" [mod."golang.org/x/crypto"] version = "v0.0.0-20220622213112-05595931fe9d" hash = "sha256-2c4wvwiQ0DJSJsApfmNoxCxx1siRCiJvW9hhrGlcvds=" [mod."golang.org/x/net"] - version = "v0.0.0-20220520000938-2e3eb7b945c2" - hash = "sha256-uCMgd3uUlLREUdD9CYRbYlbJgRQyOts0jC1Okjk8Al8=" + version = "v0.0.0-20220617184016-355a448f1bc9" + hash = "sha256-8Y7z3ThQw43/IwIFxYGwD8uE1N30C+jAGGdKBNsCM48=" + [mod."golang.org/x/oauth2"] + version = "v0.0.0-20220411215720-9780585627b5" + hash = "sha256-PubcNZWej7Pb8TnHNfXPkRo3Gj91YfePvvN5ImftEbs=" [mod."golang.org/x/sync"] version = "v0.0.0-20220513210516-0976fa681c29" hash = "sha256-26T9yWx1pkXjXzBn0yj+trVpXPX6rTtly9pPzwVgAyg=" [mod."golang.org/x/sys"] - version = "v0.0.0-20220520151302-bc2c85ada10a" - hash = "sha256-3xm4LbLhZjjeb8scaNFRa9zYb8z2fZj+/JBcoyXGPR8=" + version = "v0.0.0-20220615213510-4f61da869c0c" + hash = "sha256-lL5fiQlmn5fRo5PMH30rwOaE1djZdQsvgq+wsD606WI=" [mod."golang.org/x/term"] - version = "v0.0.0-20210927222741-03fcf44c2211" - hash = "sha256-DsX2xay7Y/0/bikp4vU8ArF0B6KHyqEc37PwgvmjhSs=" + version = "v0.0.0-20220526004731-065cf7ba2467" + hash = "sha256-VZgjOrrg+xPfDlAuUPSHVGvjTFBBfKvKFPqCvZbQzVY=" [mod."golang.org/x/text"] version = "v0.3.7" hash = "sha256-XH2pUzzQx95O0rak00grQvfACfL+EmZiV7ZzJBkX+XY=" + [mod."golang.org/x/xerrors"] + version = "v0.0.0-20220517211312-f3a8303e98df" + hash = "sha256-DaZLVDk7I1uScyvUeHGyosnGm6xZNq6XIJlJfwaX6hs=" + [mod."google.golang.org/api"] + version = "v0.81.0" + hash = "sha256-hG/Wanchjq75ymZy59/Rl8S9tl9Xw3x1gdjYCpkNfB8=" + [mod."google.golang.org/appengine"] + version = "v1.6.7" + hash = "sha256-zIxGRHiq4QBvRqkrhMGMGCaVL4iM4TtlYpAi/hrivS4=" [mod."google.golang.org/genproto"] version = "v0.0.0-20220628213854-d9e0b6570c03" hash = "sha256-sM4ik5KAdxxNYqhinnE/baQzjKgzrZ8fJURhZarcDO8=" [mod."google.golang.org/grpc"] - version = "v1.33.2" - hash = "sha256-0vOeuHDvRviofJmr4dOzUh4Y1y2X6ujGCcLcICVnQ0Q=" - replaced = "google.golang.org/grpc" + version = "v1.48.0" + hash = "sha256-sF2W+L5IHiCO1t/SsHpmht1tPiXJ2RBiiosk+BngfKA=" [mod."google.golang.org/protobuf"] - version = "v1.28.0" - hash = "sha256-p1cVM3OeEErh1WeNRAg4n3zYm/0qPTPmIiWNjRmJiMQ=" + version = "v1.28.1" + hash = "sha256-sTJYgvlv5is7vHNxcuigF2lNASp0QonhUgnrguhfHSU=" [mod."gopkg.in/ini.v1"] - version = "v1.66.4" - hash = "sha256-PZ5vwf47Pjv7lzaUlm/mIdkIfnwEpmSNYG1UIfGh3M4=" + version = "v1.66.6" + hash = "sha256-icGrattKhCLweSJqNhyOs6AavHapLFaOQ9xCA8wID08=" [mod."gopkg.in/natefinch/npipe.v2"] version = "v2.0.0-20160621034901-c1b8fa8bdcce" hash = "sha256-ytqeVZqn4kd2uc65HvEjPlpPA2VnBmPfu5DsFlO0o+g=" @@ -439,3 +523,6 @@ schema = 3 [mod."nhooyr.io/websocket"] version = "v1.8.6" hash = "sha256-DyaiCc/1iELrl6JSpz6WYMtFwUiSCOSoNF8IhSyP1ag=" + [mod."sigs.k8s.io/yaml"] + version = "v1.3.0" + hash = "sha256-RVp8vca2wxg8pcBDYospG7Z1dujoH7zXNu2rgZ1kky0=" diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh index c9e07000..3f771599 100755 --- a/scripts/run-integration-tests.sh +++ b/scripts/run-integration-tests.sh @@ -10,4 +10,4 @@ cd ../tests/integration_tests/contracts HUSKY_SKIP_INSTALL=1 npm install npm run typechain cd .. -nix-shell --run "pytest -vv -s" +pytest -vv -s diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py index bebf0264..53d709c6 100644 --- a/tests/integration_tests/conftest.py +++ b/tests/integration_tests/conftest.py @@ -2,6 +2,7 @@ import pytest from .network import setup_ethermint, setup_geth + @pytest.fixture(scope="session") def ethermint(tmp_path_factory): path = tmp_path_factory.mktemp("ethermint") diff --git a/tests/integration_tests/shell.nix b/tests/integration_tests/shell.nix index e6c64153..73003c17 100644 --- a/tests/integration_tests/shell.nix +++ b/tests/integration_tests/shell.nix @@ -9,4 +9,7 @@ pkgs.mkShell { pkgs.nodejs pkgs.test-env ]; + shellHook = '' + . ${../../scripts/.env} + ''; } diff --git a/tests/integration_tests/test_basic.py b/tests/integration_tests/test_basic.py index db2334a5..ed2b19fe 100644 --- a/tests/integration_tests/test_basic.py +++ b/tests/integration_tests/test_basic.py @@ -1,3 +1,3 @@ def test_basic(cluster): w3 = cluster.w3 - assert w3.eth.chain_id == 9000 \ No newline at end of file + assert w3.eth.chain_id == 9000