diff --git a/contracts/go.mod b/contracts/go.mod index 4391fc40f..457d58105 100644 --- a/contracts/go.mod +++ b/contracts/go.mod @@ -2,17 +2,22 @@ module pkg.berachain.dev/polaris/contracts go 1.21 -require github.com/ethereum/go-ethereum v1.12.0 +require github.com/ethereum/go-ethereum v1.13.1 require ( github.com/DataDog/zstd v1.5.5 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VictoriaMetrics/fastcache v1.12.1 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cockroachdb/errors v1.11.1 // indirect - github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 // indirect github.com/cockroachdb/redact v1.1.5 // indirect + github.com/consensys/bavard v0.1.13 // indirect + github.com/consensys/gnark-crypto v0.11.2 // indirect + github.com/crate-crypto/go-kzg-4844 v0.3.0 // indirect github.com/deckarep/golang-set/v2 v2.3.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/ethereum/c-kzg-4844 v0.3.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect github.com/getsentry/sentry-go v0.23.0 // indirect @@ -21,9 +26,9 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/holiman/uint256 v1.2.3 // indirect - github.com/huin/goupnp v1.2.0 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect @@ -32,13 +37,17 @@ require ( github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/stretchr/testify v1.8.4 // indirect + github.com/supranational/blst v0.3.11 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.12.0 // indirect + golang.org/x/tools v0.12.1-0.20230818141832-9425c2e70961 // indirect google.golang.org/protobuf v1.31.0 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect + rsc.io/tmplfunc v0.0.3 // indirect ) diff --git a/contracts/go.sum b/contracts/go.sum index 6b3237d57..80c474c1c 100644 --- a/contracts/go.sum +++ b/contracts/go.sum @@ -1,10 +1,14 @@ github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40= github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c= +github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= @@ -20,12 +24,16 @@ github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZ github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 h1:Y7g+YeGJ+1Ni31uOplgf7mi+1X+Em5PzIx9WMPq/2zY= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98/go.mod h1:EDjiaAXc0FXiRmxDzcu1wIEJ093ohHMUWxrI6iku0XA= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= +github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= +github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= +github.com/consensys/gnark-crypto v0.11.2 h1:GJjjtWJ+db1xGao7vTsOgAOGgjfPe7eRGPL+xxMX0qE= +github.com/consensys/gnark-crypto v0.11.2/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= +github.com/crate-crypto/go-kzg-4844 v0.3.0 h1:UBlWE0CgyFqqzTI+IFyCzA7A3Zw4iip6uzRv5NIXG0A= +github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -35,8 +43,10 @@ github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5il github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= -github.com/ethereum/go-ethereum v1.12.0 h1:bdnhLPtqETd4m3mS8BGMNvBTf36bO5bx/hxE2zljOa0= -github.com/ethereum/go-ethereum v1.12.0/go.mod h1:/oo2X/dZLJjf2mJ6YT9wcWxa4nNJDBKDBU6sFIpx1Gs= +github.com/ethereum/c-kzg-4844 v0.3.1 h1:sR65+68+WdnMKxseNWxSJuAv2tsUrihTpVBTfM/U5Zg= +github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= +github.com/ethereum/go-ethereum v1.13.1 h1:UF2FaUKPIy5jeZk3X06ait3y2Q4wI+vJ1l7+UARp+60= +github.com/ethereum/go-ethereum v1.13.1/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= @@ -75,6 +85,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= @@ -84,8 +95,8 @@ github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iU github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= @@ -97,10 +108,15 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= +github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= +github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= +github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -141,6 +157,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= +github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -160,6 +178,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -171,7 +191,6 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -209,6 +228,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.12.1-0.20230818141832-9425c2e70961 h1:QmgpI5T0BWoYLKWtpEWHZlEdNz5jhoGqK7taBoUv4Gw= +golang.org/x/tools v0.12.1-0.20230818141832-9425c2e70961/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -226,12 +247,13 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= +rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= diff --git a/cosmos/go.mod b/cosmos/go.mod index 666a4e7a7..284856339 100644 --- a/cosmos/go.mod +++ b/cosmos/go.mod @@ -4,7 +4,7 @@ go 1.21 replace ( // We replace `go-ethereum` with `polaris-geth` in order include our required changes. - github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 + github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d // Required at the moment until a bug in the comsos-sdk is fixed. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) @@ -27,7 +27,7 @@ require ( github.com/cosmos/cosmos-sdk v0.50.0-rc.0.0.20230915171831-2196edacb99d github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.11 - github.com/ethereum/go-ethereum v1.12.0 + github.com/ethereum/go-ethereum v1.13.1 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 @@ -70,9 +70,8 @@ require ( github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 // indirect + github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/cometbft/cometbft-db v0.8.0 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.11.2 // indirect @@ -144,8 +143,9 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.1.1 // indirect github.com/hdevalence/ed25519consensus v0.1.0 // indirect + github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/huin/goupnp v1.2.0 // indirect + github.com/huin/goupnp v1.3.0 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -229,6 +229,7 @@ require ( golang.org/x/arch v0.4.0 // indirect golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect + golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.12.0 // indirect @@ -239,7 +240,6 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.0 // indirect diff --git a/cosmos/go.sum b/cosmos/go.sum index e50faef4a..22014cd2f 100644 --- a/cosmos/go.sum +++ b/cosmos/go.sum @@ -113,8 +113,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 h1:WRzIKM4RUH2YwhrpwMQ/VuU0UVbnsfrg+b+PrKkpH0E= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05/go.mod h1:sOleKuvS3KgH6rpLX1d100PZWiJMVsGXswyxeCHTplo= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d h1:w5V4L3haBlaaC0VMWd+WlLIS4U8J1YOIsdFaPf/qoWs= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -198,18 +198,16 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 h1:Y7g+YeGJ+1Ni31uOplgf7mi+1X+Em5PzIx9WMPq/2zY= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98/go.mod h1:EDjiaAXc0FXiRmxDzcu1wIEJ093ohHMUWxrI6iku0XA= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/cometbft/cometbft v0.38.0 h1:ogKnpiPX7gxCvqTEF4ly25/wAxUqf181t30P3vqdpdc= github.com/cometbft/cometbft v0.38.0/go.mod h1:5Jz0Z8YsHSf0ZaAqGvi/ifioSdVFPtEGrm8Y9T/993k= @@ -287,8 +285,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= -github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -577,6 +575,8 @@ github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= @@ -587,8 +587,8 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -1459,8 +1459,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/cosmos/x/evm/plugins/historical/historical_data.go b/cosmos/x/evm/plugins/historical/historical_data.go index cc6d665ba..4ea28c563 100644 --- a/cosmos/x/evm/plugins/historical/historical_data.go +++ b/cosmos/x/evm/plugins/historical/historical_data.go @@ -179,11 +179,6 @@ func (p *plugin) GetReceiptsByHash(blockHash common.Hash) (coretypes.Receipts, e if err != nil { return nil, err } - if err = receipts.DeriveFields( - p.cp.ChainConfig(), blockHash, block.NumberU64(), block.Time(), block.BaseFee(), block.Transactions(), - ); err != nil { - return nil, err - } - return receipts, nil + return coretypes.DeriveReceiptsFromBlock(p.cp.ChainConfig(), receipts, block) } diff --git a/cosmos/x/evm/plugins/txpool/mempool/mempool_reader.go b/cosmos/x/evm/plugins/txpool/mempool/mempool_reader.go index 43180e88c..bef1ad44e 100644 --- a/cosmos/x/evm/plugins/txpool/mempool/mempool_reader.go +++ b/cosmos/x/evm/plugins/txpool/mempool/mempool_reader.go @@ -39,9 +39,9 @@ func (etp *EthTxPool) Get(hash common.Hash) *coretypes.Transaction { // Pending is called when txs in the mempool are retrieved. // // NOT THREAD SAFE. -func (etp *EthTxPool) Pending(bool) map[common.Address]coretypes.Transactions { +func (etp *EthTxPool) Pending(bool) map[common.Address][]*coretypes.Transaction { pendingNonces := make(map[common.Address]uint64) - pending := make(map[common.Address]coretypes.Transactions) + pending := make(map[common.Address][]*coretypes.Transaction) etp.mu.RLock() defer etp.mu.RUnlock() @@ -81,9 +81,9 @@ func (etp *EthTxPool) Pending(bool) map[common.Address]coretypes.Transactions { // queued retrieves the content of the mempool. // // NOT THREAD SAFE. -func (etp *EthTxPool) queued() map[common.Address]coretypes.Transactions { +func (etp *EthTxPool) queued() map[common.Address][]*coretypes.Transaction { pendingNonces := make(map[common.Address]uint64) - queued := make(map[common.Address]coretypes.Transactions) + queued := make(map[common.Address][]*coretypes.Transaction) // After the lock is released we can iterate over the mempool. etp.mu.RLock() @@ -185,7 +185,7 @@ func (etp *EthTxPool) Stats() (int, int) { // queued transactions of this address, grouped by nonce. // // NOT THREAD SAFE. -func (etp *EthTxPool) ContentFrom(addr common.Address) (coretypes.Transactions, coretypes.Transactions) { +func (etp *EthTxPool) ContentFrom(addr common.Address) ([]*coretypes.Transaction, []*coretypes.Transaction) { pending, queued := etp.Content() return pending[addr], queued[addr] } @@ -195,7 +195,7 @@ func (etp *EthTxPool) ContentFrom(addr common.Address) (coretypes.Transactions, // // NOT THREAD SAFE. func (etp *EthTxPool) Content() ( - map[common.Address]coretypes.Transactions, map[common.Address]coretypes.Transactions, + map[common.Address][]*coretypes.Transaction, map[common.Address][]*coretypes.Transaction, ) { return etp.Pending(false), etp.queued() } diff --git a/e2e/hive/simulators/rpc-compat/tests/eth_getProof/get-account-proof-with-storage.io b/e2e/hive/simulators/rpc-compat/tests/eth_getProof/get-account-proof-with-storage.io index df9f7ebf5..d051ce621 100644 --- a/e2e/hive/simulators/rpc-compat/tests/eth_getProof/get-account-proof-with-storage.io +++ b/e2e/hive/simulators/rpc-compat/tests/eth_getProof/get-account-proof-with-storage.io @@ -1,2 +1,2 @@ ->> {"jsonrpc":"2.0","id":1,"method":"eth_getProof","params":["0xaa00000000000000000000000000000000000000",["0x01"],"0x3"]} -<< {"jsonrpc":"2.0","id":1,"result":{"address":"0xaa00000000000000000000000000000000000000","accountProof":[],"balance":"0x1","codeHash":"0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470","nonce":"0x0","storageHash":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","storageProof":[{"key":"0x01","value":"0x0","proof":[]}]}} +>> {"jsonrpc":"2.0","id":1,"method":"eth_getProof","params":["0xaa00000000000000000000000000000000000000",["0x1"],"0x3"]} +<< {"jsonrpc":"2.0","id":1,"result":{"address":"0xaa00000000000000000000000000000000000000","accountProof":[],"balance":"0x1","codeHash":"0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470","nonce":"0x0","storageHash":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","storageProof":[{"key":"0x1","value":"0x0","proof":[]}]}} diff --git a/e2e/localnet/go.mod b/e2e/localnet/go.mod index d7f2aa52f..87bd6a927 100644 --- a/e2e/localnet/go.mod +++ b/e2e/localnet/go.mod @@ -3,11 +3,11 @@ module pkg.berachain.dev/polaris/e2e/localnet go 1.21 // We replace `go-ethereum` with `polaris-geth` in order include our required changes. -replace github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 +replace github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d require ( - github.com/docker/docker v24.0.4+incompatible - github.com/ethereum/go-ethereum v1.12.0 + github.com/docker/docker v24.0.5+incompatible + github.com/ethereum/go-ethereum v1.13.1 github.com/onsi/ginkgo/v2 v2.12.0 github.com/onsi/gomega v1.27.10 github.com/ory/dockertest v3.3.5+incompatible @@ -37,6 +37,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect @@ -44,11 +45,12 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 // indirect + github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/cometbft/cometbft v0.38.0 // indirect github.com/cometbft/cometbft-db v0.8.0 // indirect + github.com/consensys/bavard v0.1.13 // indirect + github.com/consensys/gnark-crypto v0.11.2 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0 // indirect @@ -60,6 +62,7 @@ require ( github.com/cosmos/iavl v1.0.0-rc.1 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect + github.com/crate-crypto/go-kzg-4844 v0.3.0 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set/v2 v2.3.1 // indirect @@ -74,6 +77,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/emicklei/dot v1.6.0 // indirect + github.com/ethereum/c-kzg-4844 v0.3.1 // indirect github.com/fatih/color v1.15.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -133,6 +137,7 @@ require ( github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce // indirect github.com/oklog/run v1.1.0 // indirect @@ -164,6 +169,7 @@ require ( github.com/spf13/viper v1.16.0 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.2 // indirect + github.com/supranational/blst v0.3.11 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect @@ -188,11 +194,11 @@ require ( google.golang.org/grpc v1.58.1 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.0 // indirect nhooyr.io/websocket v1.8.6 // indirect pgregory.net/rapid v1.1.0 // indirect + rsc.io/tmplfunc v0.0.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/e2e/localnet/go.sum b/e2e/localnet/go.sum index 54a23c5a8..5a2a2ccf3 100644 --- a/e2e/localnet/go.sum +++ b/e2e/localnet/go.sum @@ -107,8 +107,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 h1:WRzIKM4RUH2YwhrpwMQ/VuU0UVbnsfrg+b+PrKkpH0E= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05/go.mod h1:sOleKuvS3KgH6rpLX1d100PZWiJMVsGXswyxeCHTplo= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d h1:w5V4L3haBlaaC0VMWd+WlLIS4U8J1YOIsdFaPf/qoWs= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -165,23 +165,25 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 h1:Y7g+YeGJ+1Ni31uOplgf7mi+1X+Em5PzIx9WMPq/2zY= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98/go.mod h1:EDjiaAXc0FXiRmxDzcu1wIEJ093ohHMUWxrI6iku0XA= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/cometbft/cometbft v0.38.0 h1:ogKnpiPX7gxCvqTEF4ly25/wAxUqf181t30P3vqdpdc= github.com/cometbft/cometbft v0.38.0/go.mod h1:5Jz0Z8YsHSf0ZaAqGvi/ifioSdVFPtEGrm8Y9T/993k= github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= +github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= +github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= +github.com/consensys/gnark-crypto v0.11.2 h1:GJjjtWJ+db1xGao7vTsOgAOGgjfPe7eRGPL+xxMX0qE= +github.com/consensys/gnark-crypto v0.11.2/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= @@ -218,6 +220,8 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/crate-crypto/go-kzg-4844 v0.3.0 h1:UBlWE0CgyFqqzTI+IFyCzA7A3Zw4iip6uzRv5NIXG0A= +github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -245,8 +249,8 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WA github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= -github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -273,6 +277,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/c-kzg-4844 v0.3.1 h1:sR65+68+WdnMKxseNWxSJuAv2tsUrihTpVBTfM/U5Zg= +github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= @@ -455,6 +461,7 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20230901174712-0191c66da455 h1:YhRUmI1ttDC4sxKY2V62BTI8hCXnyZBV9h38eAanInE= github.com/google/pprof v0.0.0-20230901174712-0191c66da455/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -528,6 +535,8 @@ github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= @@ -538,8 +547,8 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -596,6 +605,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= +github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= @@ -649,6 +660,9 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw= github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= +github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= +github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= @@ -870,6 +884,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= +github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= @@ -1375,8 +1391,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -1422,6 +1436,8 @@ pkg.berachain.dev/polaris/lib v0.0.0-20230919154905-0c53dfe1360a/go.mod h1:Qe/Pm rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= +rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/e2e/precompile/go.mod b/e2e/precompile/go.mod index d46f43eaa..076fa66aa 100644 --- a/e2e/precompile/go.mod +++ b/e2e/precompile/go.mod @@ -4,7 +4,7 @@ go 1.21 replace ( // We replace `go-ethereum` with `polaris-geth` in order include our required changes. - github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 + github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d // Required at the moment until a bug in the comsos-sdk is fixed. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) @@ -39,6 +39,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect @@ -46,11 +47,12 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 // indirect + github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/cometbft/cometbft v0.38.0 // indirect github.com/cometbft/cometbft-db v0.8.0 // indirect + github.com/consensys/bavard v0.1.13 // indirect + github.com/consensys/gnark-crypto v0.11.2 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0 // indirect @@ -61,6 +63,7 @@ require ( github.com/cosmos/iavl v1.0.0-rc.1 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect + github.com/crate-crypto/go-kzg-4844 v0.3.0 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set/v2 v2.3.1 // indirect @@ -70,13 +73,14 @@ require ( github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v24.0.4+incompatible // indirect + github.com/docker/docker v24.0.5+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/emicklei/dot v1.6.0 // indirect - github.com/ethereum/go-ethereum v1.12.0 // indirect + github.com/ethereum/c-kzg-4844 v0.3.1 // indirect + github.com/ethereum/go-ethereum v1.13.1 // indirect github.com/fatih/color v1.15.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -136,6 +140,7 @@ require ( github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce // indirect github.com/oklog/run v1.1.0 // indirect @@ -168,6 +173,7 @@ require ( github.com/spf13/viper v1.16.0 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.2 // indirect + github.com/supranational/blst v0.3.11 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect @@ -192,12 +198,12 @@ require ( google.golang.org/grpc v1.58.1 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.0 // indirect nhooyr.io/websocket v1.8.6 // indirect pgregory.net/rapid v1.1.0 // indirect pkg.berachain.dev/polaris/lib v0.0.0-20230919154905-0c53dfe1360a // indirect + rsc.io/tmplfunc v0.0.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/e2e/precompile/go.sum b/e2e/precompile/go.sum index 0fbc0d021..c0a615ecb 100644 --- a/e2e/precompile/go.sum +++ b/e2e/precompile/go.sum @@ -107,8 +107,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 h1:WRzIKM4RUH2YwhrpwMQ/VuU0UVbnsfrg+b+PrKkpH0E= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05/go.mod h1:sOleKuvS3KgH6rpLX1d100PZWiJMVsGXswyxeCHTplo= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d h1:w5V4L3haBlaaC0VMWd+WlLIS4U8J1YOIsdFaPf/qoWs= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -165,23 +165,25 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 h1:Y7g+YeGJ+1Ni31uOplgf7mi+1X+Em5PzIx9WMPq/2zY= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98/go.mod h1:EDjiaAXc0FXiRmxDzcu1wIEJ093ohHMUWxrI6iku0XA= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/cometbft/cometbft v0.38.0 h1:ogKnpiPX7gxCvqTEF4ly25/wAxUqf181t30P3vqdpdc= github.com/cometbft/cometbft v0.38.0/go.mod h1:5Jz0Z8YsHSf0ZaAqGvi/ifioSdVFPtEGrm8Y9T/993k= github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= +github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= +github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= +github.com/consensys/gnark-crypto v0.11.2 h1:GJjjtWJ+db1xGao7vTsOgAOGgjfPe7eRGPL+xxMX0qE= +github.com/consensys/gnark-crypto v0.11.2/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= @@ -218,6 +220,8 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/crate-crypto/go-kzg-4844 v0.3.0 h1:UBlWE0CgyFqqzTI+IFyCzA7A3Zw4iip6uzRv5NIXG0A= +github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -245,8 +249,8 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WA github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= -github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -273,6 +277,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/c-kzg-4844 v0.3.1 h1:sR65+68+WdnMKxseNWxSJuAv2tsUrihTpVBTfM/U5Zg= +github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= @@ -452,6 +458,7 @@ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20230901174712-0191c66da455 h1:YhRUmI1ttDC4sxKY2V62BTI8hCXnyZBV9h38eAanInE= github.com/google/pprof v0.0.0-20230901174712-0191c66da455/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -525,6 +532,8 @@ github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= @@ -535,8 +544,8 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -593,6 +602,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= +github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= @@ -646,6 +657,9 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw= github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= +github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= +github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= @@ -864,6 +878,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= +github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= @@ -1365,8 +1381,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -1414,6 +1428,8 @@ pkg.berachain.dev/polaris/lib v0.0.0-20230919154905-0c53dfe1360a/go.mod h1:Qe/Pm rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= +rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/e2e/testapp/go.mod b/e2e/testapp/go.mod index a9688413b..65baa74d8 100644 --- a/e2e/testapp/go.mod +++ b/e2e/testapp/go.mod @@ -4,7 +4,7 @@ go 1.21 replace ( // We replace `go-ethereum` with `polaris-geth` in order include our required changes. - github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 + github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d // Required at the moment until a bug in the comsos-sdk is fixed. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) @@ -37,7 +37,7 @@ require ( github.com/cosmos/cosmos-sdk v0.50.0-rc.0.0.20230915171831-2196edacb99d github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogoproto v1.4.11 // indirect - github.com/ethereum/go-ethereum v1.12.0 // indirect + github.com/ethereum/go-ethereum v1.13.1 // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect @@ -65,6 +65,7 @@ require ( github.com/99designs/keyring v1.2.1 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aws/aws-sdk-go v1.44.312 // indirect @@ -84,9 +85,8 @@ require ( github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 // indirect + github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/cometbft/cometbft-db v0.8.0 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.11.2 // indirect @@ -167,8 +167,9 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.1.1 // indirect github.com/hdevalence/ed25519consensus v0.1.0 // indirect + github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/huin/goupnp v1.2.0 // indirect + github.com/huin/goupnp v1.3.0 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -251,6 +252,7 @@ require ( golang.org/x/arch v0.4.0 // indirect golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect + golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -265,7 +267,6 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.0 // indirect diff --git a/e2e/testapp/go.sum b/e2e/testapp/go.sum index 55eacd0b3..968057f11 100644 --- a/e2e/testapp/go.sum +++ b/e2e/testapp/go.sum @@ -276,8 +276,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 h1:WRzIKM4RUH2YwhrpwMQ/VuU0UVbnsfrg+b+PrKkpH0E= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05/go.mod h1:sOleKuvS3KgH6rpLX1d100PZWiJMVsGXswyxeCHTplo= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d h1:w5V4L3haBlaaC0VMWd+WlLIS4U8J1YOIsdFaPf/qoWs= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -363,18 +363,16 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 h1:Y7g+YeGJ+1Ni31uOplgf7mi+1X+Em5PzIx9WMPq/2zY= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98/go.mod h1:EDjiaAXc0FXiRmxDzcu1wIEJ093ohHMUWxrI6iku0XA= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/cometbft/cometbft v0.38.0 h1:ogKnpiPX7gxCvqTEF4ly25/wAxUqf181t30P3vqdpdc= github.com/cometbft/cometbft v0.38.0/go.mod h1:5Jz0Z8YsHSf0ZaAqGvi/ifioSdVFPtEGrm8Y9T/993k= @@ -453,8 +451,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= -github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -781,6 +779,8 @@ github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= @@ -791,8 +791,8 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -1852,8 +1852,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/eth/core/chain_helpers.go b/eth/core/chain_helpers.go index 1f45e33e4..a60485c8b 100644 --- a/eth/core/chain_helpers.go +++ b/eth/core/chain_helpers.go @@ -32,12 +32,5 @@ func (bc *blockchain) deriveReceipts(receipts types.Receipts, blockHash common.H if block == nil { return nil, ErrBlockNotFound } - - // Derive receipts from block. - if err := receipts.DeriveFields( - bc.Config(), block.Hash(), block.Number().Uint64(), block.Time(), block.BaseFee(), block.Transactions(), - ); err != nil { - return nil, err - } - return receipts, nil + return types.DeriveReceiptsFromBlock(bc.Config(), receipts, block) } diff --git a/eth/core/host.go b/eth/core/host.go index b42a1e483..360c1a109 100644 --- a/eth/core/host.go +++ b/eth/core/host.go @@ -140,7 +140,7 @@ type ( // SendTx submits the tx to the transaction pool. SendTx(tx *types.Transaction) error // Pending returns all pending transactions in the transaction pool. - Pending(bool) map[common.Address]types.Transactions + Pending(bool) map[common.Address][]*types.Transaction // Get returns the transaction from the pool with the given hash. Get(common.Hash) *types.Transaction // Nonce returns the nonce of the given address in the transaction pool. @@ -151,10 +151,10 @@ type ( Stats() (int, int) // Content retrieves the data content of the transaction pool, returning all the pending as // well as queued transactions, grouped by account and nonce. - Content() (map[common.Address]types.Transactions, map[common.Address]types.Transactions) + Content() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction) // ContentFrom retrieves the data content of the transaction pool, returning the pending // as well as queued transactions of this address, grouped by nonce. - ContentFrom(addr common.Address) (types.Transactions, types.Transactions) + ContentFrom(addr common.Address) ([]*types.Transaction, []*types.Transaction) } ) diff --git a/eth/core/mock/txpool_plugin.mock.go b/eth/core/mock/txpool_plugin.mock.go index 4fad857b9..0f4d863af 100644 --- a/eth/core/mock/txpool_plugin.mock.go +++ b/eth/core/mock/txpool_plugin.mock.go @@ -23,10 +23,10 @@ var _ ethcore.TxPoolPlugin = &TxPoolPluginMock{} // // // make and configure a mocked ethcore.TxPoolPlugin // mockedTxPoolPlugin := &TxPoolPluginMock{ -// ContentFunc: func() (map[common.Address]types.Transactions, map[common.Address]types.Transactions) { +// ContentFunc: func() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction) { // panic("mock out the Content method") // }, -// ContentFromFunc: func(addr common.Address) (types.Transactions, types.Transactions) { +// ContentFromFunc: func(addr common.Address) ([]*types.Transaction, []*types.Transaction) { // panic("mock out the ContentFrom method") // }, // GetFunc: func(hash common.Hash) *types.Transaction { @@ -35,7 +35,7 @@ var _ ethcore.TxPoolPlugin = &TxPoolPluginMock{} // NonceFunc: func(address common.Address) uint64 { // panic("mock out the Nonce method") // }, -// PendingFunc: func(b bool) map[common.Address]types.Transactions { +// PendingFunc: func(b bool) map[common.Address][]*types.Transaction { // panic("mock out the Pending method") // }, // SendTxFunc: func(tx *types.Transaction) error { @@ -58,10 +58,10 @@ var _ ethcore.TxPoolPlugin = &TxPoolPluginMock{} // } type TxPoolPluginMock struct { // ContentFunc mocks the Content method. - ContentFunc func() (map[common.Address]types.Transactions, map[common.Address]types.Transactions) + ContentFunc func() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction) // ContentFromFunc mocks the ContentFrom method. - ContentFromFunc func(addr common.Address) (types.Transactions, types.Transactions) + ContentFromFunc func(addr common.Address) ([]*types.Transaction, []*types.Transaction) // GetFunc mocks the Get method. GetFunc func(hash common.Hash) *types.Transaction @@ -70,7 +70,7 @@ type TxPoolPluginMock struct { NonceFunc func(address common.Address) uint64 // PendingFunc mocks the Pending method. - PendingFunc func(b bool) map[common.Address]types.Transactions + PendingFunc func(b bool) map[common.Address][]*types.Transaction // SendTxFunc mocks the SendTx method. SendTxFunc func(tx *types.Transaction) error @@ -140,7 +140,7 @@ type TxPoolPluginMock struct { } // Content calls ContentFunc. -func (mock *TxPoolPluginMock) Content() (map[common.Address]types.Transactions, map[common.Address]types.Transactions) { +func (mock *TxPoolPluginMock) Content() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction) { if mock.ContentFunc == nil { panic("TxPoolPluginMock.ContentFunc: method is nil but TxPoolPlugin.Content was just called") } @@ -167,7 +167,7 @@ func (mock *TxPoolPluginMock) ContentCalls() []struct { } // ContentFrom calls ContentFromFunc. -func (mock *TxPoolPluginMock) ContentFrom(addr common.Address) (types.Transactions, types.Transactions) { +func (mock *TxPoolPluginMock) ContentFrom(addr common.Address) ([]*types.Transaction, []*types.Transaction) { if mock.ContentFromFunc == nil { panic("TxPoolPluginMock.ContentFromFunc: method is nil but TxPoolPlugin.ContentFrom was just called") } @@ -263,7 +263,7 @@ func (mock *TxPoolPluginMock) NonceCalls() []struct { } // Pending calls PendingFunc. -func (mock *TxPoolPluginMock) Pending(b bool) map[common.Address]types.Transactions { +func (mock *TxPoolPluginMock) Pending(b bool) map[common.Address][]*types.Transaction { if mock.PendingFunc == nil { panic("TxPoolPluginMock.PendingFunc: method is nil but TxPoolPlugin.Pending was just called") } diff --git a/eth/core/state/journal/logs.go b/eth/core/state/journal/logs.go index 50d32c2a0..18eb788e2 100644 --- a/eth/core/state/journal/logs.go +++ b/eth/core/state/journal/logs.go @@ -26,7 +26,6 @@ import ( "pkg.berachain.dev/polaris/lib/ds" "pkg.berachain.dev/polaris/lib/ds/stack" libtypes "pkg.berachain.dev/polaris/lib/types" - "pkg.berachain.dev/polaris/lib/utils" ) // Log defines the interface for tracking logs created during a state transition. @@ -49,8 +48,7 @@ type Log interface { // logs is a state plugin that tracks Ethereum logs. type logs struct { - ds.Stack[*coretypes.Log] // journal of logs that resets on every tx - + journal ds.Stack[*coretypes.Log] // journal of logs that resets on every tx txHash common.Hash txIndex int } @@ -58,7 +56,7 @@ type logs struct { // NewLogs returns a new `logs` journal. func NewLogs() Log { return &logs{ - Stack: stack.New[*coretypes.Log](initCapacity), + journal: stack.New[*coretypes.Log](initCapacity), } } @@ -69,9 +67,7 @@ func (l *logs) RegistryKey() string { // SetTxContext sets the transaction hash and index for the current transaction. func (l *logs) SetTxContext(thash common.Hash, ti int) { - // Reset the journal for a new transaction. - *l = *utils.MustGetAs[*logs](NewLogs()) - + l.journal = stack.New[*coretypes.Log](initCapacity) // Set the transaction hash and index. l.txHash = thash l.txIndex = ti @@ -86,25 +82,25 @@ func (l *logs) TxIndex() int { func (l *logs) AddLog(log *coretypes.Log) { log.TxHash = l.txHash log.TxIndex = uint(l.txIndex) - l.Push(log) + l.journal.Push(log) } // Logs returns the logs for the current tx with the existing metadata. func (l *logs) Logs() []*coretypes.Log { - size := l.Size() + size := l.journal.Size() buf := make([]*coretypes.Log, size) for i := 0; i < size; i++ { - buf[i] = l.PeekAt(i) + buf[i] = l.journal.PeekAt(i) } return buf } // GetLogs returns the logs for the tx with the given metadata. func (l *logs) GetLogs(_ common.Hash, blockNumber uint64, blockHash common.Hash) []*coretypes.Log { - size := l.Size() + size := l.journal.Size() buf := make([]*coretypes.Log, size) for i := 0; i < size; i++ { - buf[i] = l.PeekAt(i) + buf[i] = l.journal.PeekAt(i) buf[i].BlockHash = blockHash buf[i].BlockNumber = blockNumber } @@ -115,14 +111,14 @@ func (l *logs) GetLogs(_ common.Hash, blockNumber uint64, blockHash common.Hash) // // Snapshot implements `libtypes.Snapshottable`. func (l *logs) Snapshot() int { - return l.Size() + return l.journal.Size() } // RevertToSnapshot reverts the `Logs` store to a given snapshot id. // // RevertToSnapshot implements `libtypes.Snapshottable`. func (l *logs) RevertToSnapshot(id int) { - l.PopToSize(id) + l.journal.PopToSize(id) } // Finalize clears the journal of the tx logs. @@ -132,10 +128,10 @@ func (l *logs) Finalize() {} // Clone implements `libtypes.Cloneable`. func (l *logs) Clone() Log { - capacity := l.Capacity() - size := l.Size() + capacity := l.journal.Capacity() + size := l.journal.Size() clone := &logs{ - Stack: stack.New[*coretypes.Log](capacity), + journal: stack.New[*coretypes.Log](capacity), txHash: l.txHash, txIndex: l.txIndex, } @@ -143,8 +139,8 @@ func (l *logs) Clone() Log { // copy every individual log from the journal for i := 0; i < size; i++ { cpy := new(coretypes.Log) - *cpy = *l.PeekAt(i) - clone.Push(cpy) + *cpy = *l.journal.PeekAt(i) + clone.journal.Push(cpy) } return clone diff --git a/eth/core/state/journal/logs_test.go b/eth/core/state/journal/logs_test.go index 01091bbf9..165fe15ef 100644 --- a/eth/core/state/journal/logs_test.go +++ b/eth/core/state/journal/logs_test.go @@ -42,7 +42,7 @@ var _ = Describe("Logs", func() { BeforeEach(func() { l = utils.MustGetAs[*logs](NewLogs()) l.SetTxContext(thash, int(ti)) - Expect(l.Capacity()).To(Equal(32)) + Expect(l.journal.Capacity()).To(Equal(32)) }) It("should have the correct registry key", func() { @@ -52,21 +52,21 @@ var _ = Describe("Logs", func() { When("adding logs", func() { BeforeEach(func() { l.AddLog(&coretypes.Log{Address: a1}) - Expect(l.Size()).To(Equal(1)) - Expect(l.PeekAt(0).Address).To(Equal(a1)) - Expect(l.PeekAt(0).TxHash).To(Equal(thash)) - Expect(l.PeekAt(0).TxIndex).To(Equal(ti)) + Expect(l.journal.Size()).To(Equal(1)) + Expect(l.journal.PeekAt(0).Address).To(Equal(a1)) + Expect(l.journal.PeekAt(0).TxHash).To(Equal(thash)) + Expect(l.journal.PeekAt(0).TxIndex).To(Equal(ti)) }) It("should correctly snapshot and revert", func() { id := l.Snapshot() l.AddLog(&coretypes.Log{Address: a2}) - Expect(l.Size()).To(Equal(2)) - Expect(l.PeekAt(1).Address).To(Equal(a2)) + Expect(l.journal.Size()).To(Equal(2)) + Expect(l.journal.PeekAt(1).Address).To(Equal(a2)) l.RevertToSnapshot(id) - Expect(l.Size()).To(Equal(1)) + Expect(l.journal.Size()).To(Equal(1)) }) It("should correctly get logs", func() { @@ -88,18 +88,18 @@ var _ = Describe("Logs", func() { It("should correctly clone", func() { l.AddLog(&coretypes.Log{Address: a2}) - Expect(l.Size()).To(Equal(2)) - Expect(l.PeekAt(1).Address).To(Equal(a2)) + Expect(l.journal.Size()).To(Equal(2)) + Expect(l.journal.PeekAt(1).Address).To(Equal(a2)) l2 := utils.MustGetAs[*logs](l.Clone()) - Expect(l2.Size()).To(Equal(2)) - Expect(l2.PeekAt(0).Address).To(Equal(a1)) - Expect(l2.PeekAt(1).Address).To(Equal(a2)) + Expect(l2.journal.Size()).To(Equal(2)) + Expect(l2.journal.PeekAt(0).Address).To(Equal(a1)) + Expect(l2.journal.PeekAt(1).Address).To(Equal(a2)) l2.AddLog(&coretypes.Log{Address: a3}) - Expect(l2.Size()).To(Equal(3)) - Expect(l2.PeekAt(2).Address).To(Equal(a3)) - Expect(l.Size()).To(Equal(2)) + Expect(l2.journal.Size()).To(Equal(3)) + Expect(l2.journal.PeekAt(2).Address).To(Equal(a3)) + Expect(l.journal.Size()).To(Equal(2)) }) }) }) diff --git a/eth/core/state/journal/mock/state_plugin.go b/eth/core/state/journal/mock/state_plugin.go index aef54d0d3..72e69ac1c 100644 --- a/eth/core/state/journal/mock/state_plugin.go +++ b/eth/core/state/journal/mock/state_plugin.go @@ -26,7 +26,7 @@ import ( "pkg.berachain.dev/polaris/eth/common" ) -//go:generate moq -out ./state_plugin.mock.go -skip-ensure -pkg mock ../ suicideStatePlugin +//go:generate moq -out ./state_plugin.mock.go -skip-ensure -pkg mock ../ selfDestructStatePlugin var ( a1 = common.HexToAddress("0x1") @@ -34,8 +34,8 @@ var ( a4 = common.HexToAddress("0x4") ) -func NewSuicidesStatePluginMock() *suicideStatePluginMock { - return &suicideStatePluginMock{ +func NewSelfDestructsStatePluginMock() *selfDestructStatePluginMock { + return &selfDestructStatePluginMock{ GetCodeHashFunc: func(address common.Address) common.Hash { if address == a1 || address == a3 || address == a4 { return common.Hash{0x1} diff --git a/eth/core/state/journal/mock/state_plugin.mock.go b/eth/core/state/journal/mock/state_plugin.mock.go index e97e36510..be63bd5d2 100644 --- a/eth/core/state/journal/mock/state_plugin.mock.go +++ b/eth/core/state/journal/mock/state_plugin.mock.go @@ -9,12 +9,12 @@ import ( "sync" ) -// suicideStatePluginMock is a mock implementation of journal.suicideStatePlugin. +// selfDestructStatePluginMock is a mock implementation of journal.selfDestructStatePlugin. // -// func TestSomethingThatUsessuicideStatePlugin(t *testing.T) { +// func TestSomethingThatUsesselfDestructStatePlugin(t *testing.T) { // -// // make and configure a mocked journal.suicideStatePlugin -// mockedsuicideStatePlugin := &suicideStatePluginMock{ +// // make and configure a mocked journal.selfDestructStatePlugin +// mockedselfDestructStatePlugin := &selfDestructStatePluginMock{ // GetBalanceFunc: func(address common.Address) *big.Int { // panic("mock out the GetBalance method") // }, @@ -26,11 +26,11 @@ import ( // }, // } // -// // use mockedsuicideStatePlugin in code that requires journal.suicideStatePlugin +// // use mockedselfDestructStatePlugin in code that requires journal.selfDestructStatePlugin // // and then make assertions. // // } -type suicideStatePluginMock struct { +type selfDestructStatePluginMock struct { // GetBalanceFunc mocks the GetBalance method. GetBalanceFunc func(address common.Address) *big.Int @@ -66,9 +66,9 @@ type suicideStatePluginMock struct { } // GetBalance calls GetBalanceFunc. -func (mock *suicideStatePluginMock) GetBalance(address common.Address) *big.Int { +func (mock *selfDestructStatePluginMock) GetBalance(address common.Address) *big.Int { if mock.GetBalanceFunc == nil { - panic("suicideStatePluginMock.GetBalanceFunc: method is nil but suicideStatePlugin.GetBalance was just called") + panic("selfDestructStatePluginMock.GetBalanceFunc: method is nil but selfDestructStatePlugin.GetBalance was just called") } callInfo := struct { Address common.Address @@ -84,8 +84,8 @@ func (mock *suicideStatePluginMock) GetBalance(address common.Address) *big.Int // GetBalanceCalls gets all the calls that were made to GetBalance. // Check the length with: // -// len(mockedsuicideStatePlugin.GetBalanceCalls()) -func (mock *suicideStatePluginMock) GetBalanceCalls() []struct { +// len(mockedselfDestructStatePlugin.GetBalanceCalls()) +func (mock *selfDestructStatePluginMock) GetBalanceCalls() []struct { Address common.Address } { var calls []struct { @@ -98,9 +98,9 @@ func (mock *suicideStatePluginMock) GetBalanceCalls() []struct { } // GetCodeHash calls GetCodeHashFunc. -func (mock *suicideStatePluginMock) GetCodeHash(address common.Address) common.Hash { +func (mock *selfDestructStatePluginMock) GetCodeHash(address common.Address) common.Hash { if mock.GetCodeHashFunc == nil { - panic("suicideStatePluginMock.GetCodeHashFunc: method is nil but suicideStatePlugin.GetCodeHash was just called") + panic("selfDestructStatePluginMock.GetCodeHashFunc: method is nil but selfDestructStatePlugin.GetCodeHash was just called") } callInfo := struct { Address common.Address @@ -116,8 +116,8 @@ func (mock *suicideStatePluginMock) GetCodeHash(address common.Address) common.H // GetCodeHashCalls gets all the calls that were made to GetCodeHash. // Check the length with: // -// len(mockedsuicideStatePlugin.GetCodeHashCalls()) -func (mock *suicideStatePluginMock) GetCodeHashCalls() []struct { +// len(mockedselfDestructStatePlugin.GetCodeHashCalls()) +func (mock *selfDestructStatePluginMock) GetCodeHashCalls() []struct { Address common.Address } { var calls []struct { @@ -130,9 +130,9 @@ func (mock *suicideStatePluginMock) GetCodeHashCalls() []struct { } // SubBalance calls SubBalanceFunc. -func (mock *suicideStatePluginMock) SubBalance(address common.Address, intMoqParam *big.Int) { +func (mock *selfDestructStatePluginMock) SubBalance(address common.Address, intMoqParam *big.Int) { if mock.SubBalanceFunc == nil { - panic("suicideStatePluginMock.SubBalanceFunc: method is nil but suicideStatePlugin.SubBalance was just called") + panic("selfDestructStatePluginMock.SubBalanceFunc: method is nil but selfDestructStatePlugin.SubBalance was just called") } callInfo := struct { Address common.Address @@ -150,8 +150,8 @@ func (mock *suicideStatePluginMock) SubBalance(address common.Address, intMoqPar // SubBalanceCalls gets all the calls that were made to SubBalance. // Check the length with: // -// len(mockedsuicideStatePlugin.SubBalanceCalls()) -func (mock *suicideStatePluginMock) SubBalanceCalls() []struct { +// len(mockedselfDestructStatePlugin.SubBalanceCalls()) +func (mock *selfDestructStatePluginMock) SubBalanceCalls() []struct { Address common.Address IntMoqParam *big.Int } { diff --git a/eth/core/state/journal/suicides_test.go b/eth/core/state/journal/selfdestruct_test.go similarity index 60% rename from eth/core/state/journal/suicides_test.go rename to eth/core/state/journal/selfdestruct_test.go index bbb14be2f..564f1ceba 100644 --- a/eth/core/state/journal/suicides_test.go +++ b/eth/core/state/journal/selfdestruct_test.go @@ -29,15 +29,15 @@ import ( . "github.com/onsi/gomega" ) -var _ = Describe("Suicides", func() { - var s *suicides +var _ = Describe("SelfDestructs", func() { + var s *selfDestructs var a1 = common.HexToAddress("0x1") var a2 = common.HexToAddress("0x2") var a3 = common.HexToAddress("0x3") var a4 = common.HexToAddress("0x4") BeforeEach(func() { - s = utils.MustGetAs[*suicides](NewSuicides(mock.NewSuicidesStatePluginMock())) + s = utils.MustGetAs[*selfDestructs](NewSelfDestructs(mock.NewSelfDestructsStatePluginMock())) }) It("should have the correct registry key", func() { @@ -45,24 +45,24 @@ var _ = Describe("Suicides", func() { }) It("should work correctly in the scope of a tx", func() { - Expect(s.GetSuicides()).To(BeEmpty()) + Expect(s.GetSelfDestructs()).To(BeEmpty()) s.Snapshot() - Expect(s.Suicide(a2)).To(BeFalse()) // 0x2 doesn't have a valid code hash - Expect(s.Suicide(a1)).To(BeTrue()) - Expect(s.HasSuicided(a2)).To(BeFalse()) - Expect(s.HasSuicided(a1)).To(BeTrue()) + s.SelfDestruct(a2) + s.SelfDestruct(a1) + Expect(s.HasSelfDestructed(a2)).To(BeFalse()) + Expect(s.HasSelfDestructed(a1)).To(BeTrue()) snap2 := s.Snapshot() - Expect(s.Suicide(a3)).To(BeTrue()) - Expect(s.HasSuicided(a3)).To(BeTrue()) - Expect(s.HasSuicided(a1)).To(BeTrue()) - Expect(s.GetSuicides()).To(HaveLen(2)) + s.SelfDestruct(a3) + Expect(s.HasSelfDestructed(a3)).To(BeTrue()) + Expect(s.HasSelfDestructed(a1)).To(BeTrue()) + Expect(s.GetSelfDestructs()).To(HaveLen(2)) s.RevertToSnapshot(snap2) - Expect(s.HasSuicided(a1)).To(BeTrue()) - Expect(s.HasSuicided(a3)).To(BeFalse()) - Expect(s.GetSuicides()).To(HaveLen(1)) + Expect(s.HasSelfDestructed(a1)).To(BeTrue()) + Expect(s.HasSelfDestructed(a3)).To(BeFalse()) + Expect(s.GetSelfDestructs()).To(HaveLen(1)) s.Finalize() Expect(s.lastSnapshot).To(Equal(-1)) @@ -70,30 +70,30 @@ var _ = Describe("Suicides", func() { }) It("should not suicide when snapshot is not called", func() { - Expect(s.Suicide(a1)).To(BeFalse()) - Expect(s.HasSuicided(a1)).To(BeFalse()) + s.SelfDestruct(a1) + Expect(s.HasSelfDestructed(a1)).To(BeFalse()) }) It("should clone correctly", func() { s.Snapshot() - Expect(s.Suicide(a1)).To(BeTrue()) - Expect(s.HasSuicided(a1)).To(BeTrue()) + s.SelfDestruct(a1) + Expect(s.HasSelfDestructed(a1)).To(BeTrue()) s.Snapshot() - Expect(s.Suicide(a3)).To(BeTrue()) - Expect(s.HasSuicided(a3)).To(BeTrue()) - Expect(s.HasSuicided(a1)).To(BeTrue()) - Expect(s.GetSuicides()).To(HaveLen(2)) + s.SelfDestruct(a3) + Expect(s.HasSelfDestructed(a3)).To(BeTrue()) + Expect(s.HasSelfDestructed(a1)).To(BeTrue()) + Expect(s.GetSelfDestructs()).To(HaveLen(2)) - s2 := utils.MustGetAs[*suicides](s.Clone()) - Expect(s.HasSuicided(a3)).To(BeTrue()) - Expect(s.HasSuicided(a1)).To(BeTrue()) - Expect(s2.GetSuicides()).To(HaveLen(2)) + s2 := utils.MustGetAs[*selfDestructs](s.Clone()) + Expect(s.HasSelfDestructed(a3)).To(BeTrue()) + Expect(s.HasSelfDestructed(a1)).To(BeTrue()) + Expect(s2.GetSelfDestructs()).To(HaveLen(2)) s.Snapshot() s2.Snapshot() - Expect(s2.Suicide(a4)).To(BeTrue()) - Expect(s.HasSuicided(a4)).To(BeFalse()) + s2.SelfDestruct(a4) + Expect(s.HasSelfDestructed(a4)).To(BeFalse()) }) }) diff --git a/eth/core/state/journal/suicides.go b/eth/core/state/journal/selfdestructs.go similarity index 62% rename from eth/core/state/journal/suicides.go rename to eth/core/state/journal/selfdestructs.go index d6af52dfd..0d3e9d3c3 100644 --- a/eth/core/state/journal/suicides.go +++ b/eth/core/state/journal/selfdestructs.go @@ -35,8 +35,8 @@ import ( // 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470. var emptyCodeHash = crypto.Keccak256Hash(nil) -// `suicideStatePlugin` defines the required funtions from the StatePlugin for the suicide journal. -type suicideStatePlugin interface { +// `selfDestructStatePlugin` defines the required funtions from the StatePlugin for the suicide journal. +type selfDestructStatePlugin interface { // GetCodeHash returns the code hash of the given account. GetCodeHash(common.Address) common.Hash // GetBalance returns the balance of the given account. @@ -45,33 +45,35 @@ type suicideStatePlugin interface { SubBalance(common.Address, *big.Int) } -type Suicides interface { - // Suicides implements `libtypes.Controllable`. +type SelfDestructs interface { + // SelfDestructs implements `libtypes.Controllable`. libtypes.Controllable[string] - // Suicides implements `libtypes.Cloneable`. - libtypes.Cloneable[Suicides] - // Suicides marks the given address as suicided. - Suicide(common.Address) bool - // HasSuicided returns whether the address is suicided. - HasSuicided(common.Address) bool - // GetSuicides returns all suicided addresses from the tx. - GetSuicides() []common.Address + // SelfDestructs implements `libtypes.Cloneable`. + libtypes.Cloneable[SelfDestructs] + // SelfDestruct marks the given address as self destructed . + SelfDestruct(common.Address) + // Selfdestruct6780 marks the given address as self destructed post eip-6780 + Selfdestruct6780(common.Address) + // HasSelfDestructed returns whether the address is self destructed . + HasSelfDestructed(common.Address) bool + // GetSelfDestructs returns all self destructed addresses from the tx. + GetSelfDestructs() []common.Address } -// Dirty tracking of suicided accounts, we have to keep track of these manually, in order for the +// Dirty tracking of self destructed accounts, we have to keep track of these manually, in order for the // code and state to still be accessible even after the account has been deleted. -// NOTE: we are only supporting one suicided address per EVM call (and consequently per snapshot). -type suicides struct { +// NOTE: we are only supporting one self destructed address per EVM call (and consequently per snapshot). +type selfDestructs struct { // journal of suicide address per call, very rare to suicide so we alloc only 1 address journal ds.Stack[*common.Address] - ssp suicideStatePlugin - // lastSnapshot ensures that only 1 address is being suicided per snapshot + ssp selfDestructStatePlugin + // lastSnapshot ensures that only 1 address is being self destructed per snapshot lastSnapshot int } -// NewSuicides returns a new suicides journal. -func NewSuicides(ssp suicideStatePlugin) Suicides { - return &suicides{ +// NewSelfDestructs returns a new selfDestructs journal. +func NewSelfDestructs(ssp selfDestructStatePlugin) SelfDestructs { + return &selfDestructs{ journal: stack.New[*common.Address](initCapacity), ssp: ssp, lastSnapshot: -1, @@ -79,24 +81,24 @@ func NewSuicides(ssp suicideStatePlugin) Suicides { } // RegistryKey implements libtypes.Registrable. -func (s *suicides) RegistryKey() string { +func (s *selfDestructs) RegistryKey() string { return suicidesRegistryKey } -// Suicide implements the PolarisStateDB interface by marking the given address as suicided. +// SelfDestruct implements the PolarisStateDB interface by marking the given address as self destructed . // This clears the account balance, but the code and state of the address remains available // until after Commit is called. -func (s *suicides) Suicide(addr common.Address) bool { +func (s *selfDestructs) SelfDestruct(addr common.Address) { // ensure only one suicide per snapshot call if s.journal.Size() > s.lastSnapshot { // pushed one suicide for this contract call, can do no more - return false + return } // only smart contracts can commit suicide ch := s.ssp.GetCodeHash(addr) if (ch == common.Hash{}) || ch == emptyCodeHash { - return false + return } // Reduce it's balance to 0. @@ -104,12 +106,15 @@ func (s *suicides) Suicide(addr common.Address) bool { // add to journal. s.journal.Push(&addr) - return true } -// HasSuicided implements the PolarisStateDB interface by returning if the contract was suicided +func (s *selfDestructs) Selfdestruct6780(_ common.Address) { + // TODO: IMPLEMENT EIP-6780 +} + +// HasSelfDestructed implements the PolarisStateDB interface by returning if the contract was self destructed // in current transaction. -func (s *suicides) HasSuicided(addr common.Address) bool { +func (s *selfDestructs) HasSelfDestructed(addr common.Address) bool { for i := s.journal.Size() - 1; i >= 0; i-- { if *s.journal.PeekAt(i) == addr { return true @@ -118,8 +123,8 @@ func (s *suicides) HasSuicided(addr common.Address) bool { return false } -// GetSuicides implements state.SuicidesJournal. -func (s *suicides) GetSuicides() []common.Address { +// GetSelfDestructs implements state.SelfDestructsJournal. +func (s *selfDestructs) GetSelfDestructs() []common.Address { var suicidalAddrs []common.Address for i := 0; i < s.journal.Size(); i++ { suicidalAddrs = append(suicidalAddrs, *s.journal.PeekAt(i)) @@ -128,25 +133,25 @@ func (s *suicides) GetSuicides() []common.Address { } // Snapshot implements libtypes.Controllable. -func (s *suicides) Snapshot() int { +func (s *selfDestructs) Snapshot() int { s.lastSnapshot = s.journal.Size() return s.lastSnapshot } // RevertToSnapshot implements libtypes.Controllable. -func (s *suicides) RevertToSnapshot(id int) { +func (s *selfDestructs) RevertToSnapshot(id int) { s.journal.PopToSize(id) } // Finalize implements libtypes.Controllable. -func (s *suicides) Finalize() { - *s = *utils.MustGetAs[*suicides](NewSuicides(s.ssp)) +func (s *selfDestructs) Finalize() { + *s = *utils.MustGetAs[*selfDestructs](NewSelfDestructs(s.ssp)) } // Clone implements libtypes.Cloneable. -func (s *suicides) Clone() Suicides { +func (s *selfDestructs) Clone() SelfDestructs { size := s.journal.Size() - clone := &suicides{ + clone := &selfDestructs{ journal: stack.New[*common.Address](size), ssp: s.ssp, lastSnapshot: s.lastSnapshot, diff --git a/eth/core/state/statedb.go b/eth/core/state/statedb.go index b85008ed5..0ab9d3077 100644 --- a/eth/core/state/statedb.go +++ b/eth/core/state/statedb.go @@ -21,6 +21,8 @@ package state import ( + "fmt" + "pkg.berachain.dev/polaris/eth/common" "pkg.berachain.dev/polaris/eth/core/state/journal" coretypes "pkg.berachain.dev/polaris/eth/core/types" @@ -39,7 +41,7 @@ type stateDB struct { journal.Log journal.Refund journal.Accesslist - journal.Suicides + journal.SelfDestructs journal.TransientStorage // ctrl is used to manage snapshots and reverts across plugins and journals. @@ -50,14 +52,14 @@ type stateDB struct { func NewStateDB(sp Plugin) vm.PolarisStateDB { return newStateDBWithJournals( sp, journal.NewLogs(), journal.NewRefund(), journal.NewAccesslist(), - journal.NewSuicides(sp), journal.NewTransientStorage(), + journal.NewSelfDestructs(sp), journal.NewTransientStorage(), ) } // newStateDBWithJournals returns a vm.PolarisStateDB with the given StatePlugin and journals. func newStateDBWithJournals( sp Plugin, lj journal.Log, rj journal.Refund, aj journal.Accesslist, - sj journal.Suicides, tj journal.TransientStorage, + sj journal.SelfDestructs, tj journal.TransientStorage, ) vm.PolarisStateDB { // Build the controller and register the plugins and journals ctrl := snapshot.NewController[string, libtypes.Controllable[string]]() @@ -73,7 +75,7 @@ func newStateDBWithJournals( Log: lj, Refund: rj, Accesslist: aj, - Suicides: sj, + SelfDestructs: sj, TransientStorage: tj, ctrl: ctrl, } @@ -97,14 +99,15 @@ func (sdb *stateDB) RevertToSnapshot(id int) { // Commit state // ============================================================================= -// Finalise deletes the suicided accounts and finalizes all plugins, preparing the statedb for the +// Finalise deletes the SelfDestructd accounts and finalizes all plugins, preparing the statedb for the // next transaction. func (sdb *stateDB) Finalise(bool) { - sdb.DeleteAccounts(sdb.GetSuicides()) + sdb.DeleteAccounts(sdb.GetSelfDestructs()) sdb.ctrl.Finalize() } -func (sdb *stateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) { +func (sdb *stateDB) Commit(block uint64, deleteEmptyObjects bool) (common.Hash, error) { + _ = block // todo figure out what to do here. sdb.Finalise(deleteEmptyObjects) return common.Hash{}, nil } @@ -172,10 +175,18 @@ func (sdb *stateDB) GetCodeSize(addr common.Address) int { // Copy returns a new statedb with cloned plugin and journals. func (sdb *stateDB) Copy() StateDBI { - return newStateDBWithJournals( - sdb.Plugin.Clone(), sdb.Log.Clone(), sdb.Refund.Clone(), - sdb.Accesslist.Clone(), sdb.Suicides.Clone(), sdb.TransientStorage.Clone(), - ) + logs := sdb.Log.Clone() + if logs == nil { + panic("failed to clone logs") + } + statedb, ok := newStateDBWithJournals( + sdb.Plugin.Clone(), logs, sdb.Refund.Clone(), + sdb.Accesslist.Clone(), sdb.SelfDestructs.Clone(), sdb.TransientStorage.Clone(), + ).(StateDBI) + if !ok { + panic(fmt.Sprintf("failed to clone stateDB: %T", sdb.Plugin)) + } + return statedb } func (sdb *stateDB) DumpToCollector(_ DumpCollector, _ *DumpConfig) []byte { @@ -221,3 +232,7 @@ func (sdb *stateDB) GetProof(_ common.Address) ([][]byte, error) { func (sdb *stateDB) GetOrNewStateObject(_ common.Address) *StateObject { return nil } + +func (sdb *stateDB) GetStorageRoot(_ common.Address) common.Hash { + return common.Hash{} +} diff --git a/eth/core/state/statedb_test.go b/eth/core/state/statedb_test.go index e836d446c..2aae048a9 100644 --- a/eth/core/state/statedb_test.go +++ b/eth/core/state/statedb_test.go @@ -50,19 +50,19 @@ var _ = Describe("StateDB", func() { sdb = state.NewStateDB(sp) }) - It("Should suicide correctly", func() { + It("Should SelfDestruct correctly", func() { sdb.Snapshot() sdb.CreateAccount(alice) - Expect(sdb.Suicide(alice)).To(BeFalse()) - Expect(sdb.HasSuicided(alice)).To(BeFalse()) + sdb.SelfDestruct(alice) + Expect(sdb.HasSelfDestructed(alice)).To(BeFalse()) sdb.CreateAccount(bob) sdb.SetCode(bob, []byte{1, 2, 3}) sdb.AddBalance(bob, big.NewInt(10)) - Expect(sdb.Suicide(bob)).To(BeTrue()) + sdb.SelfDestruct(bob) Expect(sdb.GetBalance(bob).Uint64()).To(Equal(uint64(0))) - Expect(sdb.HasSuicided(bob)).To(BeTrue()) + Expect(sdb.HasSelfDestructed(bob)).To(BeTrue()) }) It("should snapshot/revert", func() { @@ -102,19 +102,19 @@ var _ = Describe("StateDB", func() { Expect(sp).To(BeTrue()) }) - It("should delete suicides on finalize", func() { + It("should delete SelfDestructs on finalize", func() { sdb.Snapshot() sdb.SetTxContext(common.Hash{}, 0) sdb.CreateAccount(bob) sdb.SetCode(bob, []byte{1, 2, 3}) sdb.AddBalance(bob, big.NewInt(10)) - Expect(sdb.Suicide(bob)).To(BeTrue()) + sdb.SelfDestruct(bob) Expect(sdb.GetBalance(bob).Uint64()).To(Equal(uint64(0))) - Expect(sdb.HasSuicided(bob)).To(BeTrue()) + Expect(sdb.HasSelfDestructed(bob)).To(BeTrue()) sdb.Finalise(true) - Expect(sdb.HasSuicided(bob)).To(BeFalse()) + Expect(sdb.HasSelfDestructed(bob)).To(BeFalse()) }) It("should handle saved errors", func() { diff --git a/eth/core/types/receipts.go b/eth/core/types/receipts.go index 818af2f89..45731531e 100644 --- a/eth/core/types/receipts.go +++ b/eth/core/types/receipts.go @@ -21,11 +21,36 @@ package types import ( + "math/big" "unsafe" + "github.com/ethereum/go-ethereum/consensus/misc/eip4844" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" + + "pkg.berachain.dev/polaris/eth/params" ) +// DeriveReceiptsFromBlock is a helper function for deriving receipts from a block. +func DeriveReceiptsFromBlock( + chainConfig *params.ChainConfig, receipts types.Receipts, block *types.Block, +) (types.Receipts, error) { + // calculate the blobGasPrice according to the excess blob gas. + var blobGasPrice = new(big.Int) + if chainConfig.IsCancun(block.Number(), block.Time()) { + blobGasPrice = eip4844.CalcBlobFee(*block.ExcessBlobGas()) + } + + // Derive receipts from block. + if err := receipts.DeriveFields( + chainConfig, block.Hash(), block.Number().Uint64(), block.Time(), + block.BaseFee(), blobGasPrice, block.Transactions(), + ); err != nil { + return nil, err + } + return receipts, nil +} + // MarshalReceipts marshals `Receipts`, as type `[]*ReceiptForStorage`, to bytes using rlp // encoding. func MarshalReceipts(receipts Receipts) ([]byte, error) { diff --git a/eth/core/vm/mock/evm.go b/eth/core/vm/mock/evm.go index 2dbc8540a..6d5d1ee7c 100644 --- a/eth/core/vm/mock/evm.go +++ b/eth/core/vm/mock/evm.go @@ -23,8 +23,6 @@ package mock import ( "math/big" - "github.com/ethereum/go-ethereum/core/state" - "pkg.berachain.dev/polaris/eth/core/vm" ) @@ -33,7 +31,7 @@ import ( func NewEVM() *PrecompileEVMMock { mockSDB := NewEmptyStateDB() return &PrecompileEVMMock{ - GetStateDBFunc: func() state.StateDBI { + GetStateDBFunc: func() vm.GethStateDB { return mockSDB }, GetContextFunc: func() *vm.BlockContext { diff --git a/eth/core/vm/mock/evm.mock.go b/eth/core/vm/mock/evm.mock.go index 511cde7fd..3fb6e9ac9 100644 --- a/eth/core/vm/mock/evm.mock.go +++ b/eth/core/vm/mock/evm.mock.go @@ -5,7 +5,6 @@ package mock import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/vm" "github.com/holiman/uint256" "math/big" @@ -30,7 +29,7 @@ import ( // GetContextFunc: func() *vm.BlockContext { // panic("mock out the GetContext method") // }, -// GetStateDBFunc: func() state.StateDBI { +// GetStateDBFunc: func() vm.StateDB { // panic("mock out the GetStateDB method") // }, // StaticCallFunc: func(caller vm.ContractRef, addr common.Address, input []byte, gas uint64) ([]byte, uint64, error) { @@ -56,7 +55,7 @@ type PrecompileEVMMock struct { GetContextFunc func() *vm.BlockContext // GetStateDBFunc mocks the GetStateDB method. - GetStateDBFunc func() state.StateDBI + GetStateDBFunc func() vm.StateDB // StaticCallFunc mocks the StaticCall method. StaticCallFunc func(caller vm.ContractRef, addr common.Address, input []byte, gas uint64) ([]byte, uint64, error) @@ -294,7 +293,7 @@ func (mock *PrecompileEVMMock) GetContextCalls() []struct { } // GetStateDB calls GetStateDBFunc. -func (mock *PrecompileEVMMock) GetStateDB() state.StateDBI { +func (mock *PrecompileEVMMock) GetStateDB() vm.StateDB { if mock.GetStateDBFunc == nil { panic("PrecompileEVMMock.GetStateDBFunc: method is nil but PrecompileEVM.GetStateDB was just called") } diff --git a/eth/core/vm/mock/statedb.go b/eth/core/vm/mock/statedb.go index feabadf6d..fc12baee8 100644 --- a/eth/core/vm/mock/statedb.go +++ b/eth/core/vm/mock/statedb.go @@ -70,9 +70,6 @@ func NewEmptyStateDB() *PolarisStateDBMock { FinaliseFunc: func(bool) { // no-op }, - ForEachStorageFunc: func(address common.Address, fn func(common.Hash, common.Hash) bool) error { - panic("mock out the ForEachStorage method") - }, GetBalanceFunc: func(address common.Address) *big.Int { return big.NewInt(0) }, @@ -100,7 +97,7 @@ func NewEmptyStateDB() *PolarisStateDBMock { GetStateFunc: func(address common.Address, hash common.Hash) common.Hash { return common.Hash{} }, - HasSuicidedFunc: func(address common.Address) bool { + HasSelfDestructedFunc: func(address common.Address) bool { return false }, PrepareFunc: func(rules params.Rules, sender common.Address, @@ -132,8 +129,7 @@ func NewEmptyStateDB() *PolarisStateDBMock { SubRefundFunc: func(v uint64) { }, - SuicideFunc: func(address common.Address) bool { - return false + SelfDestructFunc: func(address common.Address) { }, } mockedPolarisStateDB.LogsFunc = func() []*types.Log { diff --git a/eth/core/vm/mock/statedb.mock.go b/eth/core/vm/mock/statedb.mock.go index fdd9fb0bd..1b2a0a839 100644 --- a/eth/core/vm/mock/statedb.mock.go +++ b/eth/core/vm/mock/statedb.mock.go @@ -45,7 +45,7 @@ var _ vm.PolarisStateDB = &PolarisStateDBMock{} // AddressInAccessListFunc: func(addr common.Address) bool { // panic("mock out the AddressInAccessList method") // }, -// CommitFunc: func(deleteEmptyObjects bool) (common.Hash, error) { +// CommitFunc: func(v uint64, b bool) (common.Hash, error) { // panic("mock out the Commit method") // }, // CopyFunc: func() state.StateDBI { @@ -75,9 +75,6 @@ var _ vm.PolarisStateDB = &PolarisStateDBMock{} // FinaliseFunc: func(deleteEmptyObjects bool) { // panic("mock out the Finalise method") // }, -// ForEachStorageFunc: func(address common.Address, fn func(common.Hash, common.Hash) bool) error { -// panic("mock out the ForEachStorage method") -// }, // GetBalanceFunc: func(address common.Address) *big.Int { // panic("mock out the GetBalance method") // }, @@ -105,23 +102,20 @@ var _ vm.PolarisStateDB = &PolarisStateDBMock{} // GetOrNewStateObjectFunc: func(addr common.Address) *state.StateObject { // panic("mock out the GetOrNewStateObject method") // }, -// GetProofFunc: func(addr common.Address) ([][]byte, error) { -// panic("mock out the GetProof method") -// }, // GetRefundFunc: func() uint64 { // panic("mock out the GetRefund method") // }, // GetStateFunc: func(address common.Address, hash common.Hash) common.Hash { // panic("mock out the GetState method") // }, -// GetStorageProofFunc: func(a common.Address, key common.Hash) ([][]byte, error) { -// panic("mock out the GetStorageProof method") +// GetStorageRootFunc: func(addr common.Address) common.Hash { +// panic("mock out the GetStorageRoot method") // }, // GetTransientStateFunc: func(addr common.Address, key common.Hash) common.Hash { // panic("mock out the GetTransientState method") // }, -// HasSuicidedFunc: func(address common.Address) bool { -// panic("mock out the HasSuicided method") +// HasSelfDestructedFunc: func(address common.Address) bool { +// panic("mock out the HasSelfDestructed method") // }, // IntermediateRootFunc: func(deleteEmptyObjects bool) common.Hash { // panic("mock out the IntermediateRoot method") @@ -144,6 +138,12 @@ var _ vm.PolarisStateDB = &PolarisStateDBMock{} // RevertToSnapshotFunc: func(n int) { // panic("mock out the RevertToSnapshot method") // }, +// SelfDestructFunc: func(address common.Address) { +// panic("mock out the SelfDestruct method") +// }, +// Selfdestruct6780Func: func(address common.Address) { +// panic("mock out the Selfdestruct6780 method") +// }, // SetBalanceFunc: func(addr common.Address, amount *big.Int) { // panic("mock out the SetBalance method") // }, @@ -177,18 +177,12 @@ var _ vm.PolarisStateDB = &PolarisStateDBMock{} // StopPrefetcherFunc: func() { // panic("mock out the StopPrefetcher method") // }, -// StorageTrieFunc: func(addr common.Address) (state.Trie, error) { -// panic("mock out the StorageTrie method") -// }, // SubBalanceFunc: func(address common.Address, intMoqParam *big.Int) { // panic("mock out the SubBalance method") // }, // SubRefundFunc: func(v uint64) { // panic("mock out the SubRefund method") // }, -// SuicideFunc: func(address common.Address) bool { -// panic("mock out the Suicide method") -// }, // TxIndexFunc: func() int { // panic("mock out the TxIndex method") // }, @@ -221,7 +215,7 @@ type PolarisStateDBMock struct { AddressInAccessListFunc func(addr common.Address) bool // CommitFunc mocks the Commit method. - CommitFunc func(deleteEmptyObjects bool) (common.Hash, error) + CommitFunc func(v uint64, b bool) (common.Hash, error) // CopyFunc mocks the Copy method. CopyFunc func() state.StateDBI @@ -250,9 +244,6 @@ type PolarisStateDBMock struct { // FinaliseFunc mocks the Finalise method. FinaliseFunc func(deleteEmptyObjects bool) - // ForEachStorageFunc mocks the ForEachStorage method. - ForEachStorageFunc func(address common.Address, fn func(common.Hash, common.Hash) bool) error - // GetBalanceFunc mocks the GetBalance method. GetBalanceFunc func(address common.Address) *big.Int @@ -280,23 +271,20 @@ type PolarisStateDBMock struct { // GetOrNewStateObjectFunc mocks the GetOrNewStateObject method. GetOrNewStateObjectFunc func(addr common.Address) *state.StateObject - // GetProofFunc mocks the GetProof method. - GetProofFunc func(addr common.Address) ([][]byte, error) - // GetRefundFunc mocks the GetRefund method. GetRefundFunc func() uint64 // GetStateFunc mocks the GetState method. GetStateFunc func(address common.Address, hash common.Hash) common.Hash - // GetStorageProofFunc mocks the GetStorageProof method. - GetStorageProofFunc func(a common.Address, key common.Hash) ([][]byte, error) + // GetStorageRootFunc mocks the GetStorageRoot method. + GetStorageRootFunc func(addr common.Address) common.Hash // GetTransientStateFunc mocks the GetTransientState method. GetTransientStateFunc func(addr common.Address, key common.Hash) common.Hash - // HasSuicidedFunc mocks the HasSuicided method. - HasSuicidedFunc func(address common.Address) bool + // HasSelfDestructedFunc mocks the HasSelfDestructed method. + HasSelfDestructedFunc func(address common.Address) bool // IntermediateRootFunc mocks the IntermediateRoot method. IntermediateRootFunc func(deleteEmptyObjects bool) common.Hash @@ -319,6 +307,12 @@ type PolarisStateDBMock struct { // RevertToSnapshotFunc mocks the RevertToSnapshot method. RevertToSnapshotFunc func(n int) + // SelfDestructFunc mocks the SelfDestruct method. + SelfDestructFunc func(address common.Address) + + // Selfdestruct6780Func mocks the Selfdestruct6780 method. + Selfdestruct6780Func func(address common.Address) + // SetBalanceFunc mocks the SetBalance method. SetBalanceFunc func(addr common.Address, amount *big.Int) @@ -352,18 +346,12 @@ type PolarisStateDBMock struct { // StopPrefetcherFunc mocks the StopPrefetcher method. StopPrefetcherFunc func() - // StorageTrieFunc mocks the StorageTrie method. - StorageTrieFunc func(addr common.Address) (state.Trie, error) - // SubBalanceFunc mocks the SubBalance method. SubBalanceFunc func(address common.Address, intMoqParam *big.Int) // SubRefundFunc mocks the SubRefund method. SubRefundFunc func(v uint64) - // SuicideFunc mocks the Suicide method. - SuicideFunc func(address common.Address) bool - // TxIndexFunc mocks the TxIndex method. TxIndexFunc func() int @@ -412,8 +400,10 @@ type PolarisStateDBMock struct { } // Commit holds details about calls to the Commit method. Commit []struct { - // DeleteEmptyObjects is the deleteEmptyObjects argument value. - DeleteEmptyObjects bool + // V is the v argument value. + V uint64 + // B is the b argument value. + B bool } // Copy holds details about calls to the Copy method. Copy []struct { @@ -456,13 +446,6 @@ type PolarisStateDBMock struct { // DeleteEmptyObjects is the deleteEmptyObjects argument value. DeleteEmptyObjects bool } - // ForEachStorage holds details about calls to the ForEachStorage method. - ForEachStorage []struct { - // Address is the address argument value. - Address common.Address - // Fn is the fn argument value. - Fn func(common.Hash, common.Hash) bool - } // GetBalance holds details about calls to the GetBalance method. GetBalance []struct { // Address is the address argument value. @@ -512,11 +495,6 @@ type PolarisStateDBMock struct { // Addr is the addr argument value. Addr common.Address } - // GetProof holds details about calls to the GetProof method. - GetProof []struct { - // Addr is the addr argument value. - Addr common.Address - } // GetRefund holds details about calls to the GetRefund method. GetRefund []struct { } @@ -527,12 +505,10 @@ type PolarisStateDBMock struct { // Hash is the hash argument value. Hash common.Hash } - // GetStorageProof holds details about calls to the GetStorageProof method. - GetStorageProof []struct { - // A is the a argument value. - A common.Address - // Key is the key argument value. - Key common.Hash + // GetStorageRoot holds details about calls to the GetStorageRoot method. + GetStorageRoot []struct { + // Addr is the addr argument value. + Addr common.Address } // GetTransientState holds details about calls to the GetTransientState method. GetTransientState []struct { @@ -541,8 +517,8 @@ type PolarisStateDBMock struct { // Key is the key argument value. Key common.Hash } - // HasSuicided holds details about calls to the HasSuicided method. - HasSuicided []struct { + // HasSelfDestructed holds details about calls to the HasSelfDestructed method. + HasSelfDestructed []struct { // Address is the address argument value. Address common.Address } @@ -587,6 +563,16 @@ type PolarisStateDBMock struct { // N is the n argument value. N int } + // SelfDestruct holds details about calls to the SelfDestruct method. + SelfDestruct []struct { + // Address is the address argument value. + Address common.Address + } + // Selfdestruct6780 holds details about calls to the Selfdestruct6780 method. + Selfdestruct6780 []struct { + // Address is the address argument value. + Address common.Address + } // SetBalance holds details about calls to the SetBalance method. SetBalance []struct { // Addr is the addr argument value. @@ -658,11 +644,6 @@ type PolarisStateDBMock struct { // StopPrefetcher holds details about calls to the StopPrefetcher method. StopPrefetcher []struct { } - // StorageTrie holds details about calls to the StorageTrie method. - StorageTrie []struct { - // Addr is the addr argument value. - Addr common.Address - } // SubBalance holds details about calls to the SubBalance method. SubBalance []struct { // Address is the address argument value. @@ -675,11 +656,6 @@ type PolarisStateDBMock struct { // V is the v argument value. V uint64 } - // Suicide holds details about calls to the Suicide method. - Suicide []struct { - // Address is the address argument value. - Address common.Address - } // TxIndex holds details about calls to the TxIndex method. TxIndex []struct { } @@ -701,7 +677,6 @@ type PolarisStateDBMock struct { lockError sync.RWMutex lockExist sync.RWMutex lockFinalise sync.RWMutex - lockForEachStorage sync.RWMutex lockGetBalance sync.RWMutex lockGetCode sync.RWMutex lockGetCodeHash sync.RWMutex @@ -711,12 +686,11 @@ type PolarisStateDBMock struct { lockGetLogs sync.RWMutex lockGetNonce sync.RWMutex lockGetOrNewStateObject sync.RWMutex - lockGetProof sync.RWMutex lockGetRefund sync.RWMutex lockGetState sync.RWMutex - lockGetStorageProof sync.RWMutex + lockGetStorageRoot sync.RWMutex lockGetTransientState sync.RWMutex - lockHasSuicided sync.RWMutex + lockHasSelfDestructed sync.RWMutex lockIntermediateRoot sync.RWMutex lockIteratorDump sync.RWMutex lockLogs sync.RWMutex @@ -724,6 +698,8 @@ type PolarisStateDBMock struct { lockPrepare sync.RWMutex lockRawDump sync.RWMutex lockRevertToSnapshot sync.RWMutex + lockSelfDestruct sync.RWMutex + lockSelfdestruct6780 sync.RWMutex lockSetBalance sync.RWMutex lockSetCode sync.RWMutex lockSetNonce sync.RWMutex @@ -735,10 +711,8 @@ type PolarisStateDBMock struct { lockSnapshot sync.RWMutex lockStartPrefetcher sync.RWMutex lockStopPrefetcher sync.RWMutex - lockStorageTrie sync.RWMutex lockSubBalance sync.RWMutex lockSubRefund sync.RWMutex - lockSuicide sync.RWMutex lockTxIndex sync.RWMutex } @@ -979,19 +953,21 @@ func (mock *PolarisStateDBMock) AddressInAccessListCalls() []struct { } // Commit calls CommitFunc. -func (mock *PolarisStateDBMock) Commit(deleteEmptyObjects bool) (common.Hash, error) { +func (mock *PolarisStateDBMock) Commit(v uint64, b bool) (common.Hash, error) { if mock.CommitFunc == nil { panic("PolarisStateDBMock.CommitFunc: method is nil but PolarisStateDB.Commit was just called") } callInfo := struct { - DeleteEmptyObjects bool + V uint64 + B bool }{ - DeleteEmptyObjects: deleteEmptyObjects, + V: v, + B: b, } mock.lockCommit.Lock() mock.calls.Commit = append(mock.calls.Commit, callInfo) mock.lockCommit.Unlock() - return mock.CommitFunc(deleteEmptyObjects) + return mock.CommitFunc(v, b) } // CommitCalls gets all the calls that were made to Commit. @@ -999,10 +975,12 @@ func (mock *PolarisStateDBMock) Commit(deleteEmptyObjects bool) (common.Hash, er // // len(mockedPolarisStateDB.CommitCalls()) func (mock *PolarisStateDBMock) CommitCalls() []struct { - DeleteEmptyObjects bool + V uint64 + B bool } { var calls []struct { - DeleteEmptyObjects bool + V uint64 + B bool } mock.lockCommit.RLock() calls = mock.calls.Commit @@ -1287,42 +1265,6 @@ func (mock *PolarisStateDBMock) FinaliseCalls() []struct { return calls } -// ForEachStorage calls ForEachStorageFunc. -func (mock *PolarisStateDBMock) ForEachStorage(address common.Address, fn func(common.Hash, common.Hash) bool) error { - if mock.ForEachStorageFunc == nil { - panic("PolarisStateDBMock.ForEachStorageFunc: method is nil but PolarisStateDB.ForEachStorage was just called") - } - callInfo := struct { - Address common.Address - Fn func(common.Hash, common.Hash) bool - }{ - Address: address, - Fn: fn, - } - mock.lockForEachStorage.Lock() - mock.calls.ForEachStorage = append(mock.calls.ForEachStorage, callInfo) - mock.lockForEachStorage.Unlock() - return mock.ForEachStorageFunc(address, fn) -} - -// ForEachStorageCalls gets all the calls that were made to ForEachStorage. -// Check the length with: -// -// len(mockedPolarisStateDB.ForEachStorageCalls()) -func (mock *PolarisStateDBMock) ForEachStorageCalls() []struct { - Address common.Address - Fn func(common.Hash, common.Hash) bool -} { - var calls []struct { - Address common.Address - Fn func(common.Hash, common.Hash) bool - } - mock.lockForEachStorage.RLock() - calls = mock.calls.ForEachStorage - mock.lockForEachStorage.RUnlock() - return calls -} - // GetBalance calls GetBalanceFunc. func (mock *PolarisStateDBMock) GetBalance(address common.Address) *big.Int { if mock.GetBalanceFunc == nil { @@ -1618,38 +1560,6 @@ func (mock *PolarisStateDBMock) GetOrNewStateObjectCalls() []struct { return calls } -// GetProof calls GetProofFunc. -func (mock *PolarisStateDBMock) GetProof(addr common.Address) ([][]byte, error) { - if mock.GetProofFunc == nil { - panic("PolarisStateDBMock.GetProofFunc: method is nil but PolarisStateDB.GetProof was just called") - } - callInfo := struct { - Addr common.Address - }{ - Addr: addr, - } - mock.lockGetProof.Lock() - mock.calls.GetProof = append(mock.calls.GetProof, callInfo) - mock.lockGetProof.Unlock() - return mock.GetProofFunc(addr) -} - -// GetProofCalls gets all the calls that were made to GetProof. -// Check the length with: -// -// len(mockedPolarisStateDB.GetProofCalls()) -func (mock *PolarisStateDBMock) GetProofCalls() []struct { - Addr common.Address -} { - var calls []struct { - Addr common.Address - } - mock.lockGetProof.RLock() - calls = mock.calls.GetProof - mock.lockGetProof.RUnlock() - return calls -} - // GetRefund calls GetRefundFunc. func (mock *PolarisStateDBMock) GetRefund() uint64 { if mock.GetRefundFunc == nil { @@ -1713,39 +1623,35 @@ func (mock *PolarisStateDBMock) GetStateCalls() []struct { return calls } -// GetStorageProof calls GetStorageProofFunc. -func (mock *PolarisStateDBMock) GetStorageProof(a common.Address, key common.Hash) ([][]byte, error) { - if mock.GetStorageProofFunc == nil { - panic("PolarisStateDBMock.GetStorageProofFunc: method is nil but PolarisStateDB.GetStorageProof was just called") +// GetStorageRoot calls GetStorageRootFunc. +func (mock *PolarisStateDBMock) GetStorageRoot(addr common.Address) common.Hash { + if mock.GetStorageRootFunc == nil { + panic("PolarisStateDBMock.GetStorageRootFunc: method is nil but PolarisStateDB.GetStorageRoot was just called") } callInfo := struct { - A common.Address - Key common.Hash + Addr common.Address }{ - A: a, - Key: key, + Addr: addr, } - mock.lockGetStorageProof.Lock() - mock.calls.GetStorageProof = append(mock.calls.GetStorageProof, callInfo) - mock.lockGetStorageProof.Unlock() - return mock.GetStorageProofFunc(a, key) + mock.lockGetStorageRoot.Lock() + mock.calls.GetStorageRoot = append(mock.calls.GetStorageRoot, callInfo) + mock.lockGetStorageRoot.Unlock() + return mock.GetStorageRootFunc(addr) } -// GetStorageProofCalls gets all the calls that were made to GetStorageProof. +// GetStorageRootCalls gets all the calls that were made to GetStorageRoot. // Check the length with: // -// len(mockedPolarisStateDB.GetStorageProofCalls()) -func (mock *PolarisStateDBMock) GetStorageProofCalls() []struct { - A common.Address - Key common.Hash +// len(mockedPolarisStateDB.GetStorageRootCalls()) +func (mock *PolarisStateDBMock) GetStorageRootCalls() []struct { + Addr common.Address } { var calls []struct { - A common.Address - Key common.Hash + Addr common.Address } - mock.lockGetStorageProof.RLock() - calls = mock.calls.GetStorageProof - mock.lockGetStorageProof.RUnlock() + mock.lockGetStorageRoot.RLock() + calls = mock.calls.GetStorageRoot + mock.lockGetStorageRoot.RUnlock() return calls } @@ -1785,35 +1691,35 @@ func (mock *PolarisStateDBMock) GetTransientStateCalls() []struct { return calls } -// HasSuicided calls HasSuicidedFunc. -func (mock *PolarisStateDBMock) HasSuicided(address common.Address) bool { - if mock.HasSuicidedFunc == nil { - panic("PolarisStateDBMock.HasSuicidedFunc: method is nil but PolarisStateDB.HasSuicided was just called") +// HasSelfDestructed calls HasSelfDestructedFunc. +func (mock *PolarisStateDBMock) HasSelfDestructed(address common.Address) bool { + if mock.HasSelfDestructedFunc == nil { + panic("PolarisStateDBMock.HasSelfDestructedFunc: method is nil but PolarisStateDB.HasSelfDestructed was just called") } callInfo := struct { Address common.Address }{ Address: address, } - mock.lockHasSuicided.Lock() - mock.calls.HasSuicided = append(mock.calls.HasSuicided, callInfo) - mock.lockHasSuicided.Unlock() - return mock.HasSuicidedFunc(address) + mock.lockHasSelfDestructed.Lock() + mock.calls.HasSelfDestructed = append(mock.calls.HasSelfDestructed, callInfo) + mock.lockHasSelfDestructed.Unlock() + return mock.HasSelfDestructedFunc(address) } -// HasSuicidedCalls gets all the calls that were made to HasSuicided. +// HasSelfDestructedCalls gets all the calls that were made to HasSelfDestructed. // Check the length with: // -// len(mockedPolarisStateDB.HasSuicidedCalls()) -func (mock *PolarisStateDBMock) HasSuicidedCalls() []struct { +// len(mockedPolarisStateDB.HasSelfDestructedCalls()) +func (mock *PolarisStateDBMock) HasSelfDestructedCalls() []struct { Address common.Address } { var calls []struct { Address common.Address } - mock.lockHasSuicided.RLock() - calls = mock.calls.HasSuicided - mock.lockHasSuicided.RUnlock() + mock.lockHasSelfDestructed.RLock() + calls = mock.calls.HasSelfDestructed + mock.lockHasSelfDestructed.RUnlock() return calls } @@ -2051,6 +1957,70 @@ func (mock *PolarisStateDBMock) RevertToSnapshotCalls() []struct { return calls } +// SelfDestruct calls SelfDestructFunc. +func (mock *PolarisStateDBMock) SelfDestruct(address common.Address) { + if mock.SelfDestructFunc == nil { + panic("PolarisStateDBMock.SelfDestructFunc: method is nil but PolarisStateDB.SelfDestruct was just called") + } + callInfo := struct { + Address common.Address + }{ + Address: address, + } + mock.lockSelfDestruct.Lock() + mock.calls.SelfDestruct = append(mock.calls.SelfDestruct, callInfo) + mock.lockSelfDestruct.Unlock() + mock.SelfDestructFunc(address) +} + +// SelfDestructCalls gets all the calls that were made to SelfDestruct. +// Check the length with: +// +// len(mockedPolarisStateDB.SelfDestructCalls()) +func (mock *PolarisStateDBMock) SelfDestructCalls() []struct { + Address common.Address +} { + var calls []struct { + Address common.Address + } + mock.lockSelfDestruct.RLock() + calls = mock.calls.SelfDestruct + mock.lockSelfDestruct.RUnlock() + return calls +} + +// Selfdestruct6780 calls Selfdestruct6780Func. +func (mock *PolarisStateDBMock) Selfdestruct6780(address common.Address) { + if mock.Selfdestruct6780Func == nil { + panic("PolarisStateDBMock.Selfdestruct6780Func: method is nil but PolarisStateDB.Selfdestruct6780 was just called") + } + callInfo := struct { + Address common.Address + }{ + Address: address, + } + mock.lockSelfdestruct6780.Lock() + mock.calls.Selfdestruct6780 = append(mock.calls.Selfdestruct6780, callInfo) + mock.lockSelfdestruct6780.Unlock() + mock.Selfdestruct6780Func(address) +} + +// Selfdestruct6780Calls gets all the calls that were made to Selfdestruct6780. +// Check the length with: +// +// len(mockedPolarisStateDB.Selfdestruct6780Calls()) +func (mock *PolarisStateDBMock) Selfdestruct6780Calls() []struct { + Address common.Address +} { + var calls []struct { + Address common.Address + } + mock.lockSelfdestruct6780.RLock() + calls = mock.calls.Selfdestruct6780 + mock.lockSelfdestruct6780.RUnlock() + return calls +} + // SetBalance calls SetBalanceFunc. func (mock *PolarisStateDBMock) SetBalance(addr common.Address, amount *big.Int) { if mock.SetBalanceFunc == nil { @@ -2433,38 +2403,6 @@ func (mock *PolarisStateDBMock) StopPrefetcherCalls() []struct { return calls } -// StorageTrie calls StorageTrieFunc. -func (mock *PolarisStateDBMock) StorageTrie(addr common.Address) (state.Trie, error) { - if mock.StorageTrieFunc == nil { - panic("PolarisStateDBMock.StorageTrieFunc: method is nil but PolarisStateDB.StorageTrie was just called") - } - callInfo := struct { - Addr common.Address - }{ - Addr: addr, - } - mock.lockStorageTrie.Lock() - mock.calls.StorageTrie = append(mock.calls.StorageTrie, callInfo) - mock.lockStorageTrie.Unlock() - return mock.StorageTrieFunc(addr) -} - -// StorageTrieCalls gets all the calls that were made to StorageTrie. -// Check the length with: -// -// len(mockedPolarisStateDB.StorageTrieCalls()) -func (mock *PolarisStateDBMock) StorageTrieCalls() []struct { - Addr common.Address -} { - var calls []struct { - Addr common.Address - } - mock.lockStorageTrie.RLock() - calls = mock.calls.StorageTrie - mock.lockStorageTrie.RUnlock() - return calls -} - // SubBalance calls SubBalanceFunc. func (mock *PolarisStateDBMock) SubBalance(address common.Address, intMoqParam *big.Int) { if mock.SubBalanceFunc == nil { @@ -2533,38 +2471,6 @@ func (mock *PolarisStateDBMock) SubRefundCalls() []struct { return calls } -// Suicide calls SuicideFunc. -func (mock *PolarisStateDBMock) Suicide(address common.Address) bool { - if mock.SuicideFunc == nil { - panic("PolarisStateDBMock.SuicideFunc: method is nil but PolarisStateDB.Suicide was just called") - } - callInfo := struct { - Address common.Address - }{ - Address: address, - } - mock.lockSuicide.Lock() - mock.calls.Suicide = append(mock.calls.Suicide, callInfo) - mock.lockSuicide.Unlock() - return mock.SuicideFunc(address) -} - -// SuicideCalls gets all the calls that were made to Suicide. -// Check the length with: -// -// len(mockedPolarisStateDB.SuicideCalls()) -func (mock *PolarisStateDBMock) SuicideCalls() []struct { - Address common.Address -} { - var calls []struct { - Address common.Address - } - mock.lockSuicide.RLock() - calls = mock.calls.Suicide - mock.lockSuicide.RUnlock() - return calls -} - // TxIndex calls TxIndexFunc. func (mock *PolarisStateDBMock) TxIndex() int { if mock.TxIndexFunc == nil { diff --git a/eth/go.mod b/eth/go.mod index ab416a3a0..a6719d474 100644 --- a/eth/go.mod +++ b/eth/go.mod @@ -3,11 +3,11 @@ module pkg.berachain.dev/polaris/eth go 1.21 // We replace `go-ethereum` with `polaris-geth` in order include our required changes. -replace github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 +replace github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d require ( github.com/BurntSushi/toml v1.3.2 - github.com/ethereum/go-ethereum v1.12.0 + github.com/ethereum/go-ethereum v1.13.1 github.com/holiman/uint256 v1.2.3 github.com/onsi/ginkgo/v2 v2.12.0 github.com/onsi/gomega v1.27.10 @@ -18,6 +18,7 @@ require ( require ( github.com/DataDog/zstd v1.5.5 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/allegro/bigcache v1.2.1 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect @@ -30,9 +31,8 @@ require ( github.com/chenzhuoyu/iasm v0.9.0 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 // indirect + github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.11.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect @@ -41,7 +41,6 @@ require ( github.com/deckarep/golang-set/v2 v2.3.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/deepmap/oapi-codegen v1.13.4 // indirect - github.com/docker/docker v24.0.4+incompatible // indirect github.com/ethereum/c-kzg-4844 v0.3.1 // indirect github.com/fjl/memsize v0.0.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -69,8 +68,9 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/graph-gophers/graphql-go v1.5.0 // indirect github.com/hashicorp/go-bexpr v0.1.12 // indirect + github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/huin/goupnp v1.2.0 // indirect + github.com/huin/goupnp v1.3.0 // indirect github.com/influxdata/influxdb-client-go/v2 v2.12.3 // indirect github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect @@ -121,6 +121,7 @@ require ( golang.org/x/arch v0.4.0 // indirect golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect + golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.12.0 // indirect @@ -128,7 +129,6 @@ require ( golang.org/x/tools v0.12.1-0.20230818141832-9425c2e70961 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v3 v3.0.1 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) diff --git a/eth/go.sum b/eth/go.sum index 677f07c6b..fe135b3a8 100644 --- a/eth/go.sum +++ b/eth/go.sum @@ -2,6 +2,8 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40= github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= @@ -12,8 +14,8 @@ github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7D github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05 h1:WRzIKM4RUH2YwhrpwMQ/VuU0UVbnsfrg+b+PrKkpH0E= -github.com/berachain/polaris-geth v0.0.0-20230824153638-497f3de05c05/go.mod h1:sOleKuvS3KgH6rpLX1d100PZWiJMVsGXswyxeCHTplo= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d h1:w5V4L3haBlaaC0VMWd+WlLIS4U8J1YOIsdFaPf/qoWs= +github.com/berachain/polaris-geth v0.0.0-20230919212829-4a52af33e74d/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c= github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= @@ -38,18 +40,16 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 h1:Y7g+YeGJ+1Ni31uOplgf7mi+1X+Em5PzIx9WMPq/2zY= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98/go.mod h1:EDjiaAXc0FXiRmxDzcu1wIEJ093ohHMUWxrI6iku0XA= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.11.2 h1:GJjjtWJ+db1xGao7vTsOgAOGgjfPe7eRGPL+xxMX0qE= @@ -70,8 +70,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etly github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/deepmap/oapi-codegen v1.13.4 h1:lRRQ8JAXaz5/4oidKFyk3fFZFQsbv0BzRtvDKDnvIfM= github.com/deepmap/oapi-codegen v1.13.4/go.mod h1:/h5nFQbTAMz4S/WtBz8sBfamlGByYKDr21O2uoNgCYI= -github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= -github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/ethereum/c-kzg-4844 v0.3.1 h1:sR65+68+WdnMKxseNWxSJuAv2tsUrihTpVBTfM/U5Zg= github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ= @@ -156,13 +156,15 @@ github.com/graph-gophers/graphql-go v1.5.0 h1:fDqblo50TEpD0LY7RXk/LFVYEVqo3+tXMN github.com/graph-gophers/graphql-go v1.5.0/go.mod h1:YtmJZDLbF1YYNrlNAuiO5zAStUWc3XZT07iGsVqe1Os= github.com/hashicorp/go-bexpr v0.1.12 h1:XrdVhmwu+9iYxIUWxsGVG7NQwrhzJZ0vR6nbN5bLgrA= github.com/hashicorp/go-bexpr v0.1.12/go.mod h1:ACktpcSySkFNpcxWSClFrut7wicd9WzisnvHuw+g9K8= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/influxdata/influxdb-client-go/v2 v2.12.3 h1:28nRlNMRIV4QbtIUvxhWqaxn0IpXeMSkY/uJa/O/vC4= github.com/influxdata/influxdb-client-go/v2 v2.12.3/go.mod h1:IrrLUbCjjfkmRuaCiGQg4m2GbkaeJDcuWoxiWdQEbA0= @@ -423,8 +425,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/eth/miner/miner.go b/eth/miner/miner.go index 29c317d7e..02f53c60f 100644 --- a/eth/miner/miner.go +++ b/eth/miner/miner.go @@ -24,8 +24,10 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/consensus/misc" + "github.com/ethereum/go-ethereum/consensus/misc/eip1559" + "github.com/ethereum/go-ethereum/consensus/misc/eip4844" + "pkg.berachain.dev/polaris/eth/common" "pkg.berachain.dev/polaris/eth/core" "pkg.berachain.dev/polaris/eth/core/state" "pkg.berachain.dev/polaris/eth/core/txpool" @@ -103,6 +105,8 @@ func NewMiner(backend Backend) Miner { } // Prepare prepares the blockchain for processing a new block at the given height. +// +//nolint:funlen // todo:fix func (m *miner) Prepare(ctx context.Context, number uint64) *types.Header { // Prepare the State, Block, Configuration, Gas, and Historical plugins for the block. m.sp.Prepare(ctx) @@ -116,7 +120,7 @@ func (m *miner) Prepare(ctx context.Context, number uint64) *types.Header { } coinbase, timestamp := m.bp.GetNewBlockMetadata(number) - chainCfg := m.cp.ChainConfig() + chainConfig := m.cp.ChainConfig() // Build the new block header. parent := m.chain.CurrentFinalBlock() @@ -133,22 +137,63 @@ func (m *miner) Prepare(ctx context.Context, number uint64) *types.Header { Number: new(big.Int).SetUint64(number), GasLimit: m.gp.BlockGasLimit(), Time: timestamp, - BaseFee: misc.CalcBaseFee(chainCfg, parent), Difficulty: new(big.Int), } + // TODO: Settable in PrepareProposal. + // Set the extra field. + if /*len(w.extra) != 0*/ true { + header.Extra = nil + } + + // Set the randomness field from the beacon chain if it's available. + // TODO: Settable in PrepareProposal. + if /*genParams.random != (common.Hash{})*/ true { + // header.MixDigest = genParams.random + header.MixDigest = common.Hash{} + } + // TODO: we need to have header verification setup somewhere. // if err := misc.VerifyEip1559Header(chainCfg, parent, header); err != nil { // panic(err) // } + // Apply EIP-1559. + // TODO: Move to PrepareProposal. + if chainConfig.IsLondon(header.Number) { + header.BaseFee = eip1559.CalcBaseFee(chainConfig, parent) + // On switchover. + // TODO: implement. + // if !chainConfig.IsLondon(parent.Number) { + // parentGasLimit := parent.GasLimit * chainConfig.ElasticityMultiplier() + // header.GasLimit = core.CalcGasLimit(parentGasLimit, bc.gp.BlockGasLimit()) + // } + } + + // Apply EIP-4844, EIP-4788. + // TODO: Move to PrepareProposal. + if chainConfig.IsCancun(header.Number, header.Time) { + var excessBlobGas uint64 + if chainConfig.IsCancun(parent.Number, parent.Time) { + excessBlobGas = eip4844.CalcExcessBlobGas(*parent.ExcessBlobGas, *parent.BlobGasUsed) + } else { + // For the first post-fork block, both parent.data_gas_used and parent.excess_data_gas are evaluated as 0 + excessBlobGas = eip4844.CalcExcessBlobGas(0, 0) + } + header.BlobGasUsed = new(uint64) + header.ExcessBlobGas = &excessBlobGas + header.ParentBeaconRoot = &common.Hash{} + } + + m.logger.Info("preparing evm block", "seal_hash", header.Hash()) + // TODO: abstract the evm from the miner, so that the miner is only concerned with txs and blocks. var ( // TODO: we are hardcoding author to coinbase, this may be incorrect. // TODO: Suggestion -> implement Engine.Author() and allow host chain to decide. context = core.NewEVMBlockContext(header, m.chain, &header.Coinbase) vmenv = vm.NewGethEVMWithPrecompiles(context, - vm.TxContext{}, m.statedb, chainCfg, m.vmConfig, + vm.TxContext{}, m.statedb, chainConfig, m.vmConfig, m.backend.Host().GetPrecompilePlugin()) ) diff --git a/eth/polar/backend.go b/eth/polar/backend.go index 631d63b15..1fb91018d 100644 --- a/eth/polar/backend.go +++ b/eth/polar/backend.go @@ -38,6 +38,7 @@ import ( "pkg.berachain.dev/polaris/eth/common" "pkg.berachain.dev/polaris/eth/common/hexutil" "pkg.berachain.dev/polaris/eth/core" + "pkg.berachain.dev/polaris/eth/core/state" "pkg.berachain.dev/polaris/eth/core/types" "pkg.berachain.dev/polaris/eth/core/vm" "pkg.berachain.dev/polaris/eth/log" @@ -283,7 +284,7 @@ func (b *backend) BlockByNumberOrHash(ctx context.Context, blockNrOrHash rpc.Blo func (b *backend) StateAndHeaderByNumber( ctx context.Context, number rpc.BlockNumber, -) (vm.GethStateDB, *types.Header, error) { +) (state.StateDBI, *types.Header, error) { // TODO: handling pending better // // Pending state is only known by the miner // if number == rpc.PendingBlockNumber { @@ -314,7 +315,7 @@ func (b *backend) StateAndHeaderByNumber( func (b *backend) StateAndHeaderByNumberOrHash( ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash, -) (vm.GethStateDB, *types.Header, error) { +) (state.StateDBI, *types.Header, error) { if blockNr, ok := blockNrOrHash.Number(); ok { return b.StateAndHeaderByNumber(ctx, blockNr) } @@ -392,7 +393,7 @@ func (b *backend) GetTd(_ context.Context, hash common.Hash) *big.Int { } // GetEVM returns a new EVM to be used for simulating a transaction, estimating gas etc. -func (b *backend) GetEVM(_ context.Context, msg *core.Message, state vm.GethStateDB, +func (b *backend) GetEVM(_ context.Context, msg *core.Message, state state.StateDBI, header *types.Header, vmConfig *vm.Config, blockCtx *vm.BlockContext, ) (*vm.GethEVM, func() error) { if vmConfig == nil { @@ -477,16 +478,14 @@ func (b *backend) Stats() (int, int) { return pending, queued } -func (b *backend) TxPoolContent() ( - map[common.Address]types.Transactions, map[common.Address]types.Transactions, -) { +func (b *backend) TxPoolContent() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction) { pending, queued := b.polar.txPool.Content() b.logger.Debug("called eth.rpc.backend.TxPoolContent", "pending", len(pending), "queued", len(queued)) return pending, queued } func (b *backend) TxPoolContentFrom(addr common.Address) ( - types.Transactions, types.Transactions, + []*types.Transaction, []*types.Transaction, ) { pending, queued := b.polar.txPool.ContentFrom(addr) b.logger.Debug("called eth.rpc.backend.TxPoolContentFrom", diff --git a/eth/polar/node.go b/eth/polar/node.go index 202535b8a..2e0f17396 100644 --- a/eth/polar/node.go +++ b/eth/polar/node.go @@ -37,6 +37,9 @@ func NewGethNetworkingStack(config *node.Config) (NetworkingStack, error) { return nil, err } + // In Polaris we don't use P2P at the geth level. + node.SetP2PDisabled(true) + return &Node{ Node: node, }, nil diff --git a/go.work.sum b/go.work.sum index b6d12e038..29348f92d 100644 --- a/go.work.sum +++ b/go.work.sum @@ -138,24 +138,41 @@ cloud.google.com/go/vpcaccess v1.7.1/go.mod h1:FogoD46/ZU+JUBX9D606X21EnxiszYi2t cloud.google.com/go/webrisk v1.9.1/go.mod h1:4GCmXKcOa2BZcZPn6DCEvE7HypmEJcJkr4mtM+sqYPc= cloud.google.com/go/websecurityscanner v1.6.1/go.mod h1:Njgaw3rttgRHXzwCB8kgCYqv5/rGpFCsBOvPbYgszpg= cloud.google.com/go/workflows v1.11.1/go.mod h1:Z+t10G1wF7h8LgdY/EmRcQY8ptBD/nvofaL6FqlET6g= +gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= +github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= +github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= +github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190129172621-c8b1d7a94ddf/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM= github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA= github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= +github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= +github.com/aclements/go-gg v0.0.0-20170118225347-6dbb4e4fefb0/go.mod h1:55qNq4vcpkIuHowELi5C8e+1yUHtoLoOUR9QU5j7Tes= github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794/go.mod h1:7e+I0LQFUI9AXWxOfsQROs9xPhoJtbsyWcjJqDd4KPY= github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/ajstarks/svgo v0.0.0-20210923152817-c3b6e2f0c527/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= @@ -165,6 +182,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45M github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= +github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ= @@ -180,13 +198,15 @@ github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3h github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/crate-crypto/go-ipa v0.0.0-20220523130400-f11357ae11c7/go.mod h1:gFnFS95y8HstDP6P9pPwzrxOOC5TRDkwbM+ao15ChAI= +github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80/go.mod h1:gzbVz57IDJgQ9rLQwfSk696JGWof8ftznEL9GoAv3NI= github.com/creachadair/command v0.0.0-20220916173946-56a74cdd66b6/go.mod h1:jN7ZJM5YSVtD3SHmkAdN/cOC1dXiqg2Y9K5Sr5a8Nxw= github.com/cristalhq/acmd v0.11.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/dop251/goja v0.0.0-20230122112309-96b1610dd4f7/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs= +github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127/go.mod h1:QMWlm50DNe14hD7t24KEqZuUdC9sOTy8W6XbCU1mlw4= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= @@ -198,7 +218,7 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILDlzrGEckF6HKjXe48EgsY/l7K7vhY4MW8= -github.com/gballet/go-verkle v0.0.0-20220902153445-097bd83b7732/go.mod h1:o/XfIXWi4/GqbQirfRm5uTbXMG5NpqxkxblnbZ+QM9I= +github.com/gballet/go-verkle v0.0.0-20230607174250-df487255f46b/go.mod h1:CDncRYVRSDqwakm282WEkjfaAj1hxU/v5RXxk5nXOiI= github.com/getkin/kin-openapi v0.118.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc= github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= @@ -229,14 +249,14 @@ github.com/informalsystems/tm-load-test v1.3.0/go.mod h1:OQ5AQ9TbT5hKWBNIwsMjn6B github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= +github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267/go.mod h1:h1nSAbGFqGVzn6Jyl1R/iCcBUHN4g+gW1u9CoBTrb9E= github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/junk1tm/musttag v0.5.0/go.mod h1:PcR7BA+oREQYvHwgjIDmw3exJeds5JzRcvEJTfjrA0M= -github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I= github.com/kataras/golog v0.1.8/go.mod h1:rGPAin4hYROfk1qT9wZP6VY2rsb4zzc37QpdPjdkqVw= github.com/kataras/iris/v12 v12.2.0/go.mod h1:BLzBpEunc41GbE68OUaQlqX4jzi791mx5HU04uPb90Y= @@ -315,7 +335,9 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4 go.etcd.io/etcd/client/v2 v2.305.7/go.mod h1:GQGT5Z3TBuAQGvgPfhR7VPySu/SudxmEkRq9BgzFU6s= go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= +go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5/go.mod h1:UBKtEnL8aqnd+0JHqZ+2qoMDwtuy6cYhhKNoHLBiTQc= gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230720185612-659f7aaaa771/go.mod h1:3QoBVwTHkXbY1oRGzlhwhOykfcATQN43LJ6iT8Wy8kE= +gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= diff --git a/magefiles/go.mod b/magefiles/go.mod index ec676f23c..ad2c39986 100644 --- a/magefiles/go.mod +++ b/magefiles/go.mod @@ -6,7 +6,7 @@ require ( github.com/bufbuild/buf v1.26.1 github.com/carolynvs/magex v0.9.0 github.com/cosmos/gosec/v2 v2.0.0-20230124142343-bf28a33fadf2 - github.com/ethereum/go-ethereum v1.12.0 + github.com/ethereum/go-ethereum v1.13.1 github.com/golangci/golangci-lint v1.54.2 github.com/google/addlicense v1.1.1 github.com/magefile/mage v1.15.0 @@ -65,9 +65,8 @@ require ( github.com/chenzhuoyu/iasm v0.9.0 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 // indirect + github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.11.2 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect @@ -83,7 +82,7 @@ require ( github.com/denis-tingaikin/go-header v0.4.3 // indirect github.com/docker/cli v24.0.4+incompatible // indirect github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v24.0.4+incompatible // indirect + github.com/docker/docker v24.0.5+incompatible // indirect github.com/docker/docker-credential-helpers v0.8.0 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect @@ -155,9 +154,10 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect + github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/holiman/uint256 v1.2.3 // indirect - github.com/huin/goupnp v1.2.0 // indirect + github.com/huin/goupnp v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/influxdata/influxdb-client-go/v2 v2.12.3 // indirect github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect @@ -316,10 +316,8 @@ require ( gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gotest.tools/v3 v3.5.0 // indirect honnef.co/go/tools v0.4.5 // indirect mvdan.cc/gofumpt v0.5.0 // indirect mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect diff --git a/magefiles/go.sum b/magefiles/go.sum index 93ecc16e7..113bdc009 100644 --- a/magefiles/go.sum +++ b/magefiles/go.sum @@ -167,18 +167,16 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98 h1:Y7g+YeGJ+1Ni31uOplgf7mi+1X+Em5PzIx9WMPq/2zY= -github.com/cockroachdb/pebble v0.0.0-20230824192853-9bb0864bdb98/go.mod h1:EDjiaAXc0FXiRmxDzcu1wIEJ093ohHMUWxrI6iku0XA= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w= +github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.11.2 h1:GJjjtWJ+db1xGao7vTsOgAOGgjfPe7eRGPL+xxMX0qE= @@ -219,8 +217,8 @@ github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAA github.com/docker/cli v24.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= -github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -239,8 +237,8 @@ github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStB github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= github.com/ethereum/c-kzg-4844 v0.3.1 h1:sR65+68+WdnMKxseNWxSJuAv2tsUrihTpVBTfM/U5Zg= github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= -github.com/ethereum/go-ethereum v1.12.0 h1:bdnhLPtqETd4m3mS8BGMNvBTf36bO5bx/hxE2zljOa0= -github.com/ethereum/go-ethereum v1.12.0/go.mod h1:/oo2X/dZLJjf2mJ6YT9wcWxa4nNJDBKDBU6sFIpx1Gs= +github.com/ethereum/go-ethereum v1.13.1 h1:UF2FaUKPIy5jeZk3X06ait3y2Q4wI+vJ1l7+UARp+60= +github.com/ethereum/go-ethereum v1.13.1/go.mod h1:xHQKzwkHSl0gnSjZK1mWa06XEdm9685AHqhRknOzqGQ= github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= @@ -479,13 +477,15 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= +github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= -github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= +github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= @@ -1358,8 +1358,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=