From 4af559be1730b668af4b8e0ffa119d846ebd2a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toni=20Ram=C3=ADrez?= <58293609+ToniRamirezM@users.noreply.github.com> Date: Tue, 17 Sep 2024 18:03:35 +0200 Subject: [PATCH] change namespace (#65) --- etherman/config.go | 2 +- etherman/etherman.go | 6 +++--- etherman/etherscan/etherscan.go | 2 +- etherman/etherscan/etherscan_test.go | 2 +- etherman/ethgasstation/ethgasstation.go | 2 +- etherman/ethgasstation/ethgasstation_test.go | 2 +- etherman/wait.go | 2 +- ethtxmanager/config.go | 6 +++--- ethtxmanager/ethtxmanager.go | 4 ++-- ethtxmanager/memstorage.go | 2 +- go.mod | 7 +------ go.sum | 11 ----------- test/main.go | 8 ++++---- 13 files changed, 20 insertions(+), 36 deletions(-) diff --git a/etherman/config.go b/etherman/config.go index d7edb8a..fb9ba45 100644 --- a/etherman/config.go +++ b/etherman/config.go @@ -1,6 +1,6 @@ package etherman -import "github.com/0xPolygonHermez/zkevm-ethtx-manager/etherman/etherscan" +import "github.com/0xPolygon/zkevm-ethtx-manager/etherman/etherscan" // Config represents the configuration of the etherman type Config struct { diff --git a/etherman/etherman.go b/etherman/etherman.go index 2cd3778..3b89077 100644 --- a/etherman/etherman.go +++ b/etherman/etherman.go @@ -8,9 +8,9 @@ import ( "path/filepath" "time" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/etherman/etherscan" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/etherman/ethgasstation" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/etherman/etherscan" + "github.com/0xPolygon/zkevm-ethtx-manager/etherman/ethgasstation" + "github.com/0xPolygon/zkevm-ethtx-manager/log" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/keystore" diff --git a/etherman/etherscan/etherscan.go b/etherman/etherscan/etherscan.go index 824ae92..509e003 100644 --- a/etherman/etherscan/etherscan.go +++ b/etherman/etherscan/etherscan.go @@ -8,7 +8,7 @@ import ( "math/big" "net/http" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/common" + "github.com/0xPolygon/zkevm-ethtx-manager/common" ) type etherscanResponse struct { diff --git a/etherman/etherscan/etherscan_test.go b/etherman/etherscan/etherscan_test.go index 8741623..9059aa1 100644 --- a/etherman/etherscan/etherscan_test.go +++ b/etherman/etherscan/etherscan_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/etherman/ethgasstation/ethgasstation.go b/etherman/ethgasstation/ethgasstation.go index 6cf95d1..aeb7baa 100644 --- a/etherman/ethgasstation/ethgasstation.go +++ b/etherman/ethgasstation/ethgasstation.go @@ -8,7 +8,7 @@ import ( "math/big" "net/http" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/common" + "github.com/0xPolygon/zkevm-ethtx-manager/common" ) type ethGasStationResponse struct { diff --git a/etherman/ethgasstation/ethgasstation_test.go b/etherman/ethgasstation/ethgasstation_test.go index d5f0b23..0f451e6 100644 --- a/etherman/ethgasstation/ethgasstation_test.go +++ b/etherman/ethgasstation/ethgasstation_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/etherman/wait.go b/etherman/wait.go index d8a9aed..f7f2ba4 100644 --- a/etherman/wait.go +++ b/etherman/wait.go @@ -9,7 +9,7 @@ import ( "os/signal" "time" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/log" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" diff --git a/ethtxmanager/config.go b/ethtxmanager/config.go index e2902e7..cf59d80 100644 --- a/ethtxmanager/config.go +++ b/ethtxmanager/config.go @@ -1,9 +1,9 @@ package ethtxmanager import ( - "github.com/0xPolygonHermez/zkevm-ethtx-manager/config/types" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/etherman" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/config/types" + "github.com/0xPolygon/zkevm-ethtx-manager/etherman" + "github.com/0xPolygon/zkevm-ethtx-manager/log" ) // Config is configuration for ethereum transaction manager diff --git a/ethtxmanager/ethtxmanager.go b/ethtxmanager/ethtxmanager.go index 0766aa7..d5afcf6 100644 --- a/ethtxmanager/ethtxmanager.go +++ b/ethtxmanager/ethtxmanager.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/etherman" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/etherman" + "github.com/0xPolygon/zkevm-ethtx-manager/log" "github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer/l1_check_block" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" diff --git a/ethtxmanager/memstorage.go b/ethtxmanager/memstorage.go index 4df7f2c..d248745 100644 --- a/ethtxmanager/memstorage.go +++ b/ethtxmanager/memstorage.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/log" "github.com/ethereum/go-ethereum/common" ) diff --git a/go.mod b/go.mod index 3a82eef..d64d7f9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/0xPolygonHermez/zkevm-ethtx-manager +module github.com/0xPolygon/zkevm-ethtx-manager go 1.21.3 @@ -7,7 +7,6 @@ require ( github.com/ethereum/go-ethereum v1.14.8 github.com/hermeznetwork/tracerr v0.3.2 github.com/holiman/uint256 v1.3.1 - github.com/invopop/jsonschema v0.12.0 github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.27.0 ) @@ -15,10 +14,8 @@ require ( require ( github.com/DataDog/zstd v1.5.6 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/bits-and-blooms/bitset v1.14.2 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect - github.com/buger/jsonparser v1.1.1 // indirect github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect github.com/cockroachdb/pebble v1.1.2 // indirect github.com/consensys/bavard v0.1.13 // indirect @@ -36,7 +33,6 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/logrusorgru/aurora v2.0.3+incompatible // indirect - github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect @@ -47,7 +43,6 @@ require ( github.com/supranational/blst v0.3.13 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.8.0 // indirect - github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.26.0 // indirect diff --git a/go.sum b/go.sum index 235b6ad..134e3fb 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI= -github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= -github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= 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.14.2 h1:YXVoyPndbdvcEVcseEovVfp0qjJp7S+i5+xgp/Nfbdc= @@ -16,8 +14,6 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurT github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= -github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU= github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -94,11 +90,8 @@ github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= -github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= 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= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -112,8 +105,6 @@ github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2 github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= @@ -172,8 +163,6 @@ github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2n github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI= github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM= -github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= -github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= diff --git a/test/main.go b/test/main.go index 506bdd1..30baf25 100644 --- a/test/main.go +++ b/test/main.go @@ -6,10 +6,10 @@ import ( "math/rand" "time" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/config/types" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/etherman" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/ethtxmanager" - "github.com/0xPolygonHermez/zkevm-ethtx-manager/log" + "github.com/0xPolygon/zkevm-ethtx-manager/config/types" + "github.com/0xPolygon/zkevm-ethtx-manager/etherman" + "github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager" + "github.com/0xPolygon/zkevm-ethtx-manager/log" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto/kzg4844" )