diff --git a/ads/go.mod b/ads/go.mod index 41a5ce875..67cd5e746 100644 --- a/ads/go.mod +++ b/ads/go.mod @@ -3,22 +3,20 @@ module github.com/iotaledger/hive.go/ads go 1.21 require ( - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/kvstore v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f + github.com/iotaledger/hive.go/ds v0.0.0-20231223024711-b7560933e508 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024711-b7560933e508 + github.com/iotaledger/hive.go/kvstore v0.0.0-20231223024711-b7560933e508 + github.com/iotaledger/hive.go/lo v0.0.0-20231223024711-b7560933e508 + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024711-b7560933e508 github.com/pokt-network/smt v0.6.1 github.com/stretchr/testify v1.8.4 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect - github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223024711-b7560933e508 // indirect + github.com/iotaledger/hive.go/runtime v0.0.0-20231223024711-b7560933e508 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231223024711-b7560933e508 // indirect github.com/kr/text v0.2.0 // indirect github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/ads/go.sum b/ads/go.sum index cf9275f84..83db8db4b 100644 --- a/ads/go.sum +++ b/ads/go.sum @@ -1,38 +1,26 @@ -github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= -github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -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/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= -github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231214115948-1e569feb231f h1:mzO5Qn8rh1IvpRtDEfeusen8vZfmXgTl0aRnxBCb8RI= -github.com/iotaledger/hive.go/kvstore v0.0.0-20231214115948-1e569feb231f/go.mod h1:UjkGs5jxiEwIFyzX4wfNk01dHuqDtTOtbzsSqoJR9Pw= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024711-b7560933e508 h1:quwjGf2j0LPyp82FzEQm6uWqGnsDaGqnmCej1PKkUPQ= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024711-b7560933e508/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024711-b7560933e508 h1:0j23oQESh+tJhjVmpfD8hrYw18DRa4hG1+uU7l4VCXY= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024711-b7560933e508/go.mod h1:2LreTPieQaMEhYMZmAfbfIwVKm9+bT7wUC1jsfGvYMU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024711-b7560933e508 h1:U75vU9XO5U+p/A3750Ytft4k2XyVljso19PN1BVMSds= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024711-b7560933e508/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231223024711-b7560933e508 h1:pQwHpY7EyBZ3ZZs7oPsoMjmVS7k/1MEltxC/BGZIaVA= +github.com/iotaledger/hive.go/kvstore v0.0.0-20231223024711-b7560933e508/go.mod h1:ET5O4JuZjsDdyO5DeumF8VKwLascBNdAlmyeXHigD8c= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024711-b7560933e508 h1:XS9n627lFAOJDvV1ktUk/J3aT71OXY+e4pPwM/jiSiQ= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024711-b7560933e508/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024711-b7560933e508 h1:wNSuoAC6NlDEBlvIfhdwWpEzSWO9QgmXdSfaiYX0Urw= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024711-b7560933e508/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024711-b7560933e508 h1:bUBwxhrBHNueGI2ysEJ1yfd+LIoWiJFg4QF9dROOJR8= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024711-b7560933e508/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024711-b7560933e508 h1:9j2zBst8RTXGZIvU9Gk/EQqrzKLgK2UpCJ43K4PQ6y8= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024711-b7560933e508/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= -github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= @@ -46,10 +34,6 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/app/go.mod b/app/go.mod index 28ca2ba1b..e61655d8d 100644 --- a/app/go.mod +++ b/app/go.mod @@ -5,41 +5,42 @@ go 1.21 require ( github.com/felixge/fgprof v0.9.3 github.com/hashicorp/go-version v1.6.0 - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024840-2cb11d4a5839 + github.com/iotaledger/hive.go/lo v0.0.0-20231223024840-2cb11d4a5839 + github.com/iotaledger/hive.go/log v0.0.0-20231223024840-2cb11d4a5839 + github.com/iotaledger/hive.go/runtime v0.0.0-20231223024840-2cb11d4a5839 github.com/knadh/koanf v1.5.0 - github.com/spf13/cast v1.5.1 + github.com/spf13/cast v1.6.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e - go.uber.org/dig v1.17.0 + go.uber.org/dig v1.17.1 gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect + github.com/ethereum/go-ethereum v1.13.8 // indirect github.com/fatih/structs v1.1.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/google/go-github v17.0.0+incompatible // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect + github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect + github.com/holiman/uint256 v1.2.4 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223024840-2cb11d4a5839 // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20231223024840-2cb11d4a5839 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024840-2cb11d4a5839 // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231223024840-2cb11d4a5839 // indirect github.com/kr/text v0.2.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5 // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect + github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/sys v0.15.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/app/go.sum b/app/go.sum index 503e7d55d..743050131 100644 --- a/app/go.sum +++ b/app/go.sum @@ -49,19 +49,19 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= +github.com/ethereum/go-ethereum v1.13.8 h1:1od+thJel3tM52ZUNQwvpYOeRHlbkVFZ5S8fhi0Lgsg= +github.com/ethereum/go-ethereum v1.13.8/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -111,8 +111,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= -github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f h1:pDhu5sgp8yJlEF/g6osliIIpF9K4F5jvkULXa4daRDQ= -github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20231212022811-ec68065c825e h1:bwOy7hAFd0C91URzMIEBfr6BAz29yk7Qj0cy6S7DJlU= +github.com/google/pprof v0.0.0-20231212022811-ec68065c825e/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -154,27 +154,27 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= -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/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f h1:hCW9/oobcvZ09tRcYBkGOnsbJrBZ9K5FzH7XzhXkJfQ= -github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f/go.mod h1:r/jMdRTQsVGvbSnFVFUJDaiAFrnZ0f3skoF0FA3HDKw= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024840-2cb11d4a5839 h1:CSDPnIytRMoDEvFnT2Pw13OrQDz1jtsX7sn20VP7Pw8= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024840-2cb11d4a5839/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024840-2cb11d4a5839 h1:wMmWzTtTg4AlKwN9zFtUOEds90drLqAkMEt5ehFKQvE= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024840-2cb11d4a5839/go.mod h1:2LreTPieQaMEhYMZmAfbfIwVKm9+bT7wUC1jsfGvYMU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024840-2cb11d4a5839 h1:p7YP2ME7yqN3IwU4GGIRo/KfKmt7/p4OaY3t3vn8Mxg= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024840-2cb11d4a5839/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024840-2cb11d4a5839 h1:rfLp/OYHMYa2tKoaH8QGRrz/VGDRqgO2PefvYVIFrr0= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024840-2cb11d4a5839/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/log v0.0.0-20231223024840-2cb11d4a5839 h1:pmb0keOWnFHYTqcRCLyqufTwlFiB9WFE+6amHJ35IPY= +github.com/iotaledger/hive.go/log v0.0.0-20231223024840-2cb11d4a5839/go.mod h1:9QT/3ZQB/sNlRgBxw07iJeD4a9e7GIRwNIdanIccx+Q= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024840-2cb11d4a5839 h1:3ArIQ8KGV9hd5De4tsS8mSfQ7xvt01KyA3KRFp9UckQ= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024840-2cb11d4a5839/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024840-2cb11d4a5839 h1:hKRbtQTvq9b4un0D7sDYxjU/ZCcvz5Clj0ygBIoZKQA= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024840-2cb11d4a5839/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024840-2cb11d4a5839 h1:qCn7BuKInfcBamzTCOFwboeocZIgS5XB46BPZgvQlTI= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024840-2cb11d4a5839/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= @@ -241,11 +241,11 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5 h1:+qIP3OMrT7SN5kLnTcVEISPOMB/97RyAKTg1UWA738E= -github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -282,8 +282,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -308,8 +308,8 @@ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dY go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/dig v1.17.0 h1:5Chju+tUvcC+N7N6EV08BJz41UZuO3BmHcN4A287ZLI= -go.uber.org/dig v1.17.0/go.mod h1:rTxpf7l5I0eBTlE6/9RL+lDybC7WFwY2QH55ZSjy1mU= +go.uber.org/dig v1.17.1 h1:Tga8Lz8PcYNsWsyHMZ1Vm0OQOUaJNDyvPImgbAu9YSc= +go.uber.org/dig v1.17.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -317,8 +317,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -345,8 +345,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -390,9 +390,8 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/apputils/config/json.go b/apputils/config/json.go index efac2f2d3..78929b929 100644 --- a/apputils/config/json.go +++ b/apputils/config/json.go @@ -3,6 +3,10 @@ package config import ( "encoding/json" + // we need to use this orderedmap implementation for serialization instead of our own, + // because the generic orderedmap in hive.go doesn't support marshaling to json. + // this orderedmap implementation uses map[string]any as underlying datastructure, + // which is a must instead of map[K]V, otherwise we can't correctly sort nested maps during unmarshaling. "github.com/iancoleman/orderedmap" flag "github.com/spf13/pflag" @@ -20,7 +24,7 @@ func newParameterMapJSON() *parameterMapJSON { } } -func (p *parameterMapJSON) AddEntry(entry interface{}) { +func (p *parameterMapJSON) AddEntry(entry any) { switch v := entry.(type) { case *parameter.ParameterGroup: newParamMapJSONGroup := newParameterMapJSON() diff --git a/apputils/go.mod b/apputils/go.mod index b2bd4a751..ba38a9bdc 100644 --- a/apputils/go.mod +++ b/apputils/go.mod @@ -5,15 +5,15 @@ go 1.21 require ( github.com/fbiville/markdown-table-formatter v0.3.0 github.com/iancoleman/orderedmap v0.3.0 - github.com/iotaledger/hive.go/app v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/app v0.0.0-20231223025010-152260160728 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025010-152260160728 github.com/spf13/pflag v1.0.5 ) require ( github.com/fatih/structs v1.1.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/runtime v0.0.0-20231223025010-152260160728 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/apputils/go.sum b/apputils/go.sum index ce4002998..709c42573 100644 --- a/apputils/go.sum +++ b/apputils/go.sum @@ -136,12 +136,12 @@ github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2 github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/app v0.0.0-20231214115948-1e569feb231f h1:t31qVvKWbd+0QMeFKr437WDyqtd4NFIGcjwxHpmS2RE= -github.com/iotaledger/hive.go/app v0.0.0-20231214115948-1e569feb231f/go.mod h1:7bg06SrhFQ71OEjN4Gx5ZrT8XbzFmdM2gAh3+iZk+nw= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= +github.com/iotaledger/hive.go/app v0.0.0-20231223025010-152260160728 h1:uUgE8L6tnFy6ls/gwEo16cB459FP/q3KvGgh5p7UZj0= +github.com/iotaledger/hive.go/app v0.0.0-20231223025010-152260160728/go.mod h1:EowdKxXnoe6QfJF315OssYyfX24LIcgAjTr78CqprMo= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025010-152260160728 h1:T/Asqf6FbK1NKmBPtSy+Yeiu8aSYe/eGu1w2e9yMzWo= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025010-152260160728/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025010-152260160728 h1:op0AOjFFVght0D+rDYAs1GdNcCRFkdEnuinnCH/LN4I= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025010-152260160728/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= diff --git a/apputils/parameter/parameter_group.go b/apputils/parameter/parameter_group.go index 6f18be31d..b5fec72ac 100644 --- a/apputils/parameter/parameter_group.go +++ b/apputils/parameter/parameter_group.go @@ -19,7 +19,7 @@ var ( type ParameterGroup struct { Parameters []*Parameter SubGroups []*ParameterGroup - Entries []interface{} + Entries []any Name string BaseName string Level int diff --git a/codegen/go.mod b/codegen/go.mod index fc2e6ba54..d01590380 100644 --- a/codegen/go.mod +++ b/codegen/go.mod @@ -3,8 +3,8 @@ module github.com/iotaledger/hive.go/codegen go 1.21 require ( - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025043-a39ab9035ea7 + github.com/iotaledger/hive.go/lo v0.0.0-20231223025043-a39ab9035ea7 ) -require github.com/iotaledger/hive.go/constraints v0.0.0-20231214025234-403cf8565777 // indirect +require github.com/iotaledger/hive.go/constraints v0.0.0-20231223023947-e2766095be96 // indirect diff --git a/codegen/go.sum b/codegen/go.sum index bef2cbb6e..f8baefc48 100644 --- a/codegen/go.sum +++ b/codegen/go.sum @@ -1,11 +1,11 @@ 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= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214025234-403cf8565777 h1:Ve7AFyTrPUvU8e4EfMxfzbhlH2nl7jRPebwio5vu8qQ= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214025234-403cf8565777/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223023947-e2766095be96 h1:Iza8XlyuQI6hSBQQZKqH20LYPuZmixrH6uRXBlFo5yE= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223023947-e2766095be96/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025043-a39ab9035ea7 h1:0I8QVKjCAo3cw5V2wlp7kFVE9IxLZzRWM/Drh4qyCuA= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025043-a39ab9035ea7/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025043-a39ab9035ea7 h1:TPWOLLh/XfaP9ZbyFmSlMCqm71afENc8llkxsytH0II= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025043-a39ab9035ea7/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/core/go.mod b/core/go.mod index eb60a6b04..129c41436 100644 --- a/core/go.mod +++ b/core/go.mod @@ -3,25 +3,21 @@ module github.com/iotaledger/hive.go/core go 1.21 require ( - github.com/iotaledger/hive.go/crypto v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/crypto v0.0.0-20231223025146-8ec4485a9d0f + github.com/iotaledger/hive.go/ds v0.0.0-20231223025146-8ec4485a9d0f + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025146-8ec4485a9d0f + github.com/iotaledger/hive.go/lo v0.0.0-20231223025146-8ec4485a9d0f + github.com/iotaledger/hive.go/runtime v0.0.0-20231223025146-8ec4485a9d0f github.com/mr-tron/base58 v1.2.0 github.com/stretchr/testify v1.8.4 ) require ( - github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect - github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223025146-8ec4485a9d0f // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231223025146-8ec4485a9d0f // indirect github.com/kr/text v0.2.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/core/go.sum b/core/go.sum index 39e8a1593..cc7ef5b42 100644 --- a/core/go.sum +++ b/core/go.sum @@ -1,32 +1,20 @@ -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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= -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.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -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/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= -github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/crypto v0.0.0-20231214115948-1e569feb231f h1:MCcPZOctVIvGXKZjoJAX3QjqVkT5guwhh/ivi9trQ5w= -github.com/iotaledger/hive.go/crypto v0.0.0-20231214115948-1e569feb231f/go.mod h1:nPzCdD6zmtoqgKVMmubeeFhLJ9HlFHwcKwCRRgqH9Ms= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025146-8ec4485a9d0f h1:R10HF3QRy4rD/lkuKlATezBs8Xi6yV2Jo/AVUnbe6tw= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025146-8ec4485a9d0f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/crypto v0.0.0-20231223025146-8ec4485a9d0f h1:Xx1xREPd48pmfaQ2vtfzrfB1Z4UceP7d+OtCh8DZ6YU= +github.com/iotaledger/hive.go/crypto v0.0.0-20231223025146-8ec4485a9d0f/go.mod h1:gsifUt12BCY+momgmC5QYhmG00ffuW0A5T5Sr72wyis= +github.com/iotaledger/hive.go/ds v0.0.0-20231223025146-8ec4485a9d0f h1:PzT8gEqKV+90Cggt/7S18DyAgPQnVE0+uFVAVVtQBhY= +github.com/iotaledger/hive.go/ds v0.0.0-20231223025146-8ec4485a9d0f/go.mod h1:2LreTPieQaMEhYMZmAfbfIwVKm9+bT7wUC1jsfGvYMU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025146-8ec4485a9d0f h1:rIwQ8zQiAt9Gr7pftehpArsIQ+i2b4KfSHPnPDZI28o= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025146-8ec4485a9d0f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025146-8ec4485a9d0f h1:kAWjZd1LCGs/E5BAZLsgr0VnLl04Z3GFFCu91bm0g+Y= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025146-8ec4485a9d0f/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025146-8ec4485a9d0f h1:PHxNGfY2EJLI5YgesMJv0uZQG2DTB048rHMLy3Tzol0= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025146-8ec4485a9d0f/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223025146-8ec4485a9d0f h1:ep6QYfwfjEryU2Uq5xP1aO5MRp06wp/NIqByooizpoQ= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223025146-8ec4485a9d0f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -34,8 +22,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -44,10 +32,6 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/crypto/go.mod b/crypto/go.mod index 8def66d5f..04727cc97 100644 --- a/crypto/go.mod +++ b/crypto/go.mod @@ -3,29 +3,29 @@ module github.com/iotaledger/hive.go/crypto go 1.21 require ( - filippo.io/edwards25519 v1.0.0 - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f - github.com/libp2p/go-libp2p v0.30.0 + filippo.io/edwards25519 v1.1.0 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025106-b6ad1c35fa4f + github.com/iotaledger/hive.go/lo v0.0.0-20231223025106-b6ad1c35fa4f + github.com/iotaledger/hive.go/runtime v0.0.0-20231223025106-b6ad1c35fa4f + github.com/libp2p/go-libp2p v0.32.2 github.com/mr-tron/base58 v1.2.0 github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.13.0 + golang.org/x/crypto v0.17.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223025106-b6ad1c35fa4f // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/minio/sha256-simd v1.0.1 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect - golang.org/x/sys v0.12.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + golang.org/x/sys v0.15.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/crypto/go.sum b/crypto/go.sum index 937d7a0b7..3f0356750 100644 --- a/crypto/go.sum +++ b/crypto/go.sum @@ -1,5 +1,5 @@ -filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= -filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -8,30 +8,28 @@ 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/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025106-b6ad1c35fa4f h1:7Py50oHpgxoyX8o/y+R2N2q7fhH/IL8B303lcoP2lKA= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025106-b6ad1c35fa4f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025106-b6ad1c35fa4f h1:fomT8ncSKiSiPNdtfqWBaIZl7+7i/VX6JDssdsMYOR8= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025106-b6ad1c35fa4f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025106-b6ad1c35fa4f h1:uUqHcMe3VMQa/Rxcx0PwKCfsxi8EHl6TOuVha7YU8j8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025106-b6ad1c35fa4f/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025106-b6ad1c35fa4f h1:c8Wtgf5o1a7Lct0oXNlb3NGqFPQ7GzCxrgUB1W9Ml2Y= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025106-b6ad1c35fa4f/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= +github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= -github.com/libp2p/go-libp2p v0.30.0 h1:9EZwFtJPFBcs/yJTnP90TpN1hgrT/EsFfM+OZuwV87U= -github.com/libp2p/go-libp2p v0.30.0/go.mod h1:nr2g5V7lfftwgiJ78/HrID+pwvayLyqKCEirT2Y3Byg= +github.com/libp2p/go-libp2p v0.32.2 h1:s8GYN4YJzgUoyeYNPdW7JZeZ5Ee31iNaIBfGYMAY4FQ= +github.com/libp2p/go-libp2p v0.32.2/go.mod h1:E0LKe+diV/ZVJVnOJby8VC5xzHF0660osg71skcxJvk= github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= @@ -40,8 +38,8 @@ github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aG github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= -github.com/multiformats/go-multiaddr v0.11.0 h1:XqGyJ8ufbCE0HmTDwx2kPdsrQ36AGPZNZX6s6xfJH10= -github.com/multiformats/go-multiaddr v0.11.0/go.mod h1:gWUm0QLR4thQ6+ZF6SXUw8YjtwQSPapICM+NmCkxHSM= +github.com/multiformats/go-multiaddr v0.12.0 h1:1QlibTFkoXJuDjjYsMHhE73TnzJQl8FSWatk/0gxGzE= +github.com/multiformats/go-multiaddr v0.12.0/go.mod h1:WmZXgObOQOYp9r3cslLlppkrz1FYSHmE834dfz/lWu8= github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g= github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk= github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg= @@ -50,8 +48,8 @@ github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7B github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM= github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8= github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -67,17 +65,15 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -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/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/ds/go.mod b/ds/go.mod index 85c9b74c2..c8e7dbe29 100644 --- a/ds/go.mod +++ b/ds/go.mod @@ -3,20 +3,21 @@ module github.com/iotaledger/hive.go/ds go 1.21 require ( - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f + github.com/iotaledger/hive.go/constraints v0.0.0-20231223024501-693ba063d354 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024501-693ba063d354 + github.com/iotaledger/hive.go/lo v0.0.0-20231223024501-693ba063d354 + github.com/iotaledger/hive.go/runtime v0.0.0-20231223024501-693ba063d354 + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024501-693ba063d354 github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.14.0 + golang.org/x/crypto v0.17.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect + github.com/ethereum/go-ethereum v1.13.8 // indirect + github.com/holiman/uint256 v1.2.4 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/sys v0.13.0 // indirect + golang.org/x/sys v0.15.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/ds/go.sum b/ds/go.sum index 42b9fca99..6ea430889 100644 --- a/ds/go.sum +++ b/ds/go.sum @@ -4,22 +4,22 @@ 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= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -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/ethereum/go-ethereum v1.13.8 h1:1od+thJel3tM52ZUNQwvpYOeRHlbkVFZ5S8fhi0Lgsg= +github.com/ethereum/go-ethereum v1.13.8/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024501-693ba063d354 h1:oL96JcMDDQ8tEqB7z59fwoqBhL2SS+R0BOiE4pYKUTE= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024501-693ba063d354/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024501-693ba063d354 h1:LiaHATfL9s0bGyy5aV3R1v9z+Po1XQFQ3cV4gtZBRkw= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024501-693ba063d354/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024501-693ba063d354 h1:hgvNlmllCGJTl4s0YWzkpA55B3UIPJzbYVcXx91Ttj4= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024501-693ba063d354/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024501-693ba063d354 h1:Q3I8nCi9lIQamCTbdPF2YhN31kPGaFwhAqmUBRCj0aQ= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024501-693ba063d354/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024501-693ba063d354 h1:THvgcgrA9Dagi/pUY8qZvFJ4RzpICCMJR2PDvL5utQ0= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024501-693ba063d354/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -32,10 +32,10 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/ds/orderedmap/orderedmap.go b/ds/orderedmap/orderedmap.go index 1fe409cb3..429724533 100644 --- a/ds/orderedmap/orderedmap.go +++ b/ds/orderedmap/orderedmap.go @@ -1,13 +1,9 @@ package orderedmap import ( - "context" "sync" "github.com/iotaledger/hive.go/ds/shrinkingmap" - "github.com/iotaledger/hive.go/ierrors" - "github.com/iotaledger/hive.go/serializer/v2" - "github.com/iotaledger/hive.go/serializer/v2/serix" ) // OrderedMap provides a concurrent-safe ordered map. @@ -21,18 +17,9 @@ type OrderedMap[K comparable, V any] struct { // New returns a new *OrderedMap. func New[K comparable, V any]() *OrderedMap[K, V] { - orderedMap := new(OrderedMap[K, V]) - orderedMap.Initialize() - - return orderedMap -} - -// Initialize returns the first map entry. -func (o *OrderedMap[K, V]) Initialize() { - o.mutex.Lock() - defer o.mutex.Unlock() - - o.dictionary = shrinkingmap.New[K, *Element[K, V]]() + return &OrderedMap[K, V]{ + dictionary: shrinkingmap.New[K, *Element[K, V]](), + } } // Head returns the first map entry. @@ -165,6 +152,10 @@ func (o *OrderedMap[K, V]) ForEachReverse(consumer func(key K, value V) bool) bo // Clear removes all elements from the OrderedMap. func (o *OrderedMap[K, V]) Clear() { + if o == nil { + return + } + o.mutex.Lock() defer o.mutex.Unlock() @@ -225,80 +216,19 @@ func (o *OrderedMap[K, V]) IsEmpty() bool { } // Clone returns a copy of the orderedMap. -func (o *OrderedMap[K, V]) Clone() (cloned *OrderedMap[K, V]) { - cloned = New[K, V]() - o.ForEach(func(key K, value V) bool { - cloned.Set(key, value) - - return true - }) - - return -} - -// Encode returns a serialized byte slice of the object. -func (o *OrderedMap[K, V]) Encode() ([]byte, error) { - seri := serializer.NewSerializer() - - seri.WriteNum(uint32(o.Size()), func(err error) error { - return ierrors.Wrap(err, "failed to write OrderedMap size to serializer") - }) - - o.ForEach(func(key K, val V) bool { - keyBytes, err := serix.DefaultAPI.Encode(context.Background(), key) - if err != nil { - seri.AbortIf(func(_ error) error { - return ierrors.Wrap(err, "failed to encode OrderedMap key") - }) - } - seri.WriteBytes(keyBytes, func(err error) error { - return ierrors.Wrap(err, "failed to write OrderedMap key to serializer") - }) - - valBytes, err := serix.DefaultAPI.Encode(context.Background(), val) - if err != nil { - seri.AbortIf(func(_ error) error { - return ierrors.Wrap(err, "failed to serialize OrderedMap value") - }) - } - seri.WriteBytes(valBytes, func(err error) error { - return ierrors.Wrap(err, "failed to write OrderedMap value to serializer") - }) - - return true - }) - - return seri.Serialize() -} - -// Decode deserializes bytes into a valid object. -func (o *OrderedMap[K, V]) Decode(b []byte) (bytesRead int, err error) { - o.Initialize() - - var mapSize uint32 - bytesReadSize, err := serix.DefaultAPI.Decode(context.Background(), b[bytesRead:], &mapSize) - if err != nil { - return 0, err +func (o *OrderedMap[K, V]) Clone() *OrderedMap[K, V] { + if o == nil { + return nil } - bytesRead += bytesReadSize - for i := uint32(0); i < mapSize; i++ { - var key K - bytesReadKey, err := serix.DefaultAPI.Decode(context.Background(), b[bytesRead:], &key) - if err != nil { - return 0, err - } - bytesRead += bytesReadKey + cloned := New[K, V]() - var value V - bytesReadValue, err := serix.DefaultAPI.Decode(context.Background(), b[bytesRead:], &value) - if err != nil { - return 0, err - } - bytesRead += bytesReadValue + o.mutex.RLock() + defer o.mutex.RUnlock() - o.Set(key, value) + for currentEntry := o.head; currentEntry != nil; currentEntry = currentEntry.next { + cloned.Set(currentEntry.key, currentEntry.value) } - return bytesRead, nil + return cloned } diff --git a/ds/orderedmap/orderedmap_test.go b/ds/orderedmap/orderedmap_test.go index fa3595600..a70b8f291 100644 --- a/ds/orderedmap/orderedmap_test.go +++ b/ds/orderedmap/orderedmap_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "github.com/iotaledger/hive.go/ds/orderedmap" - "github.com/iotaledger/hive.go/serializer/v2/serix" ) func TestOrderedMap_Size(t *testing.T) { @@ -217,23 +216,3 @@ func TestConcurrencySafe(t *testing.T) { require.Equal(t, 0, orderedMap.Size()) } - -func TestSerialization(t *testing.T) { - serix.DefaultAPI.RegisterTypeSettings("", serix.TypeSettings{}.WithLengthPrefixType(serix.LengthPrefixTypeAsByte)) - - orderedMap := orderedmap.New[string, uint8]() - - orderedMap.Set("a", 0) - orderedMap.Set("b", 1) - orderedMap.Set("c", 2) - - bytes, err := orderedMap.Encode() - require.NoError(t, err) - - decoded := new(orderedmap.OrderedMap[string, uint8]) - bytesRead, err := decoded.Decode(bytes) - require.NoError(t, err) - require.Equal(t, len(bytes), bytesRead) - - require.Equal(t, orderedMap, decoded) -} diff --git a/ds/reactive/set_impl.go b/ds/reactive/set_impl.go index 087e98dad..82ef5b74c 100644 --- a/ds/reactive/set_impl.go +++ b/ds/reactive/set_impl.go @@ -5,6 +5,7 @@ import ( "github.com/iotaledger/hive.go/ds" "github.com/iotaledger/hive.go/lo" + "github.com/iotaledger/hive.go/serializer/v2/serix" ) // region set ////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -101,11 +102,11 @@ func (s *set[ElementType]) Replace(elements ds.ReadableSet[ElementType]) (remove } // Decode decodes the set from a byte slice. -func (s *set[ElementType]) Decode(b []byte) (bytesRead int, err error) { +func (s *set[ElementType]) Decode(api *serix.API, b []byte) (bytesRead int, err error) { s.readableSet.mutex.Lock() defer s.readableSet.mutex.Unlock() - return s.value.Decode(b) + return s.value.Decode(api, b) } // ReadOnly returns a read-only version of the set. diff --git a/ds/reactive/set_test.go b/ds/reactive/set_test.go index 501e249bd..7bcc619de 100644 --- a/ds/reactive/set_test.go +++ b/ds/reactive/set_test.go @@ -359,11 +359,11 @@ func TestSet_Encoding(t *testing.T) { for i := 0; i < 3; i++ { testSet.Add(fmt.Sprintf("item%d", i)) } - bytes, err := testSet.Encode() + bytes, err := testSet.Encode(serix.DefaultAPI) require.NoError(t, err) decoded := newSet[string]() - consumed, err := decoded.Decode(bytes) + consumed, err := decoded.Decode(serix.DefaultAPI, bytes) require.NoError(t, err) require.Equal(t, len(bytes), consumed) diff --git a/ds/serializableorderedmap/serializable_orderedmap.go b/ds/serializableorderedmap/serializable_orderedmap.go new file mode 100644 index 000000000..b657097b4 --- /dev/null +++ b/ds/serializableorderedmap/serializable_orderedmap.go @@ -0,0 +1,87 @@ +package serializableorderedmap + +import ( + "context" + + "github.com/iotaledger/hive.go/ds/orderedmap" + "github.com/iotaledger/hive.go/ierrors" + "github.com/iotaledger/hive.go/serializer/v2" + "github.com/iotaledger/hive.go/serializer/v2/serix" +) + +// SerializableOrderedMap provides a concurrent-safe ordered map that is serializable. +type SerializableOrderedMap[K comparable, V any] struct { + *orderedmap.OrderedMap[K, V] +} + +// New returns a new *SerializableOrderedMap. +func New[K comparable, V any]() *SerializableOrderedMap[K, V] { + return &SerializableOrderedMap[K, V]{ + OrderedMap: orderedmap.New[K, V](), + } +} + +// Encode returns a serialized byte slice of the object. +func (o *SerializableOrderedMap[K, V]) Encode(api *serix.API) ([]byte, error) { + seri := serializer.NewSerializer() + + seri.WriteNum(uint32(o.Size()), func(err error) error { + return ierrors.Wrap(err, "failed to write SerializableOrderedMap size to serializer") + }) + + o.ForEach(func(key K, val V) bool { + keyBytes, err := api.Encode(context.Background(), key) + if err != nil { + seri.AbortIf(func(_ error) error { + return ierrors.Wrap(err, "failed to encode SerializableOrderedMap key") + }) + } + seri.WriteBytes(keyBytes, func(err error) error { + return ierrors.Wrap(err, "failed to write SerializableOrderedMap key to serializer") + }) + + valBytes, err := api.Encode(context.Background(), val) + if err != nil { + seri.AbortIf(func(_ error) error { + return ierrors.Wrap(err, "failed to serialize SerializableOrderedMap value") + }) + } + seri.WriteBytes(valBytes, func(err error) error { + return ierrors.Wrap(err, "failed to write SerializableOrderedMap value to serializer") + }) + + return true + }) + + return seri.Serialize() +} + +// Decode deserializes bytes into a valid object. +func (o *SerializableOrderedMap[K, V]) Decode(api *serix.API, b []byte) (bytesRead int, err error) { + var mapSize uint32 + bytesReadSize, err := api.Decode(context.Background(), b[bytesRead:], &mapSize) + if err != nil { + return 0, err + } + bytesRead += bytesReadSize + + for i := uint32(0); i < mapSize; i++ { + var key K + bytesReadKey, err := api.Decode(context.Background(), b[bytesRead:], &key) + if err != nil { + return 0, err + } + bytesRead += bytesReadKey + + var value V + bytesReadValue, err := api.Decode(context.Background(), b[bytesRead:], &value) + if err != nil { + return 0, err + } + bytesRead += bytesReadValue + + o.Set(key, value) + } + + return bytesRead, nil +} diff --git a/ds/serializableorderedmap/serializable_orderedmap_test.go b/ds/serializableorderedmap/serializable_orderedmap_test.go new file mode 100644 index 000000000..7221cf4f7 --- /dev/null +++ b/ds/serializableorderedmap/serializable_orderedmap_test.go @@ -0,0 +1,30 @@ +package serializableorderedmap_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/iotaledger/hive.go/ds/serializableorderedmap" + "github.com/iotaledger/hive.go/serializer/v2/serix" +) + +func TestSerialization(t *testing.T) { + serix.DefaultAPI.RegisterTypeSettings("", serix.TypeSettings{}.WithLengthPrefixType(serix.LengthPrefixTypeAsByte)) + + serializableOrderedMap := serializableorderedmap.New[string, uint8]() + + serializableOrderedMap.Set("a", 0) + serializableOrderedMap.Set("b", 1) + serializableOrderedMap.Set("c", 2) + + bytes, err := serializableOrderedMap.Encode(serix.DefaultAPI) + require.NoError(t, err) + + decoded := serializableorderedmap.New[string, uint8]() + bytesRead, err := decoded.Decode(serix.DefaultAPI, bytes) + require.NoError(t, err) + require.Equal(t, len(bytes), bytesRead) + + require.Equal(t, serializableOrderedMap, decoded) +} diff --git a/ds/set.go b/ds/set.go index a6eac7971..45eb046d0 100644 --- a/ds/set.go +++ b/ds/set.go @@ -2,6 +2,7 @@ package ds import ( "github.com/iotaledger/hive.go/ds/walker" + "github.com/iotaledger/hive.go/serializer/v2/serix" ) // region Set ////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -72,7 +73,7 @@ type ReadableSet[ElementType comparable] interface { ToSlice() []ElementType // Encode encodes the set into a byte slice. - Encode() ([]byte, error) + Encode(*serix.API) ([]byte, error) // String returns a string representation of the set. String() string @@ -111,7 +112,7 @@ type WriteableSet[ElementType comparable] interface { Replace(elements ReadableSet[ElementType]) (removedElements Set[ElementType]) // Decode decodes the set from a byte slice. - Decode(b []byte) (bytesRead int, err error) + Decode(*serix.API, []byte) (bytesRead int, err error) // ReadOnly returns a read-only version of the set. ReadOnly() ReadableSet[ElementType] diff --git a/ds/set_impl.go b/ds/set_impl.go index 90adae44b..f83e25055 100644 --- a/ds/set_impl.go +++ b/ds/set_impl.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/iotaledger/hive.go/ds/orderedmap" + "github.com/iotaledger/hive.go/ds/serializableorderedmap" "github.com/iotaledger/hive.go/ds/shrinkingmap" "github.com/iotaledger/hive.go/ds/types" "github.com/iotaledger/hive.go/ds/walker" @@ -145,13 +145,13 @@ func (s *set[ElementType]) apply(mutations SetMutations[ElementType]) (appliedMu // //nolint:tagliatelle // heck knows why this linter fails here type readableSet[T comparable] struct { - *orderedmap.OrderedMap[T, types.Empty] `serix:""` + *serializableorderedmap.SerializableOrderedMap[T, types.Empty] `serix:""` } // newReadableSet creates a new readable set with the given elements. func newReadableSet[T comparable](elements ...T) *readableSet[T] { r := &readableSet[T]{ - OrderedMap: orderedmap.New[T, types.Empty](), + SerializableOrderedMap: serializableorderedmap.New[T, types.Empty](), } for _, element := range elements { diff --git a/ds/set_test.go b/ds/set_test.go index f957a290f..d1f2c10c0 100644 --- a/ds/set_test.go +++ b/ds/set_test.go @@ -176,11 +176,11 @@ func TestSet_Encoding(t *testing.T) { serix.DefaultAPI.RegisterTypeSettings("", serix.TypeSettings{}.WithLengthPrefixType(serix.LengthPrefixTypeAsByte)) testSet := initSet(3, 0) - bytes, err := testSet.Encode() + bytes, err := testSet.Encode(serix.DefaultAPI) require.NoError(t, err) decoded := ds.NewSet[string]() - consumed, err := decoded.Decode(bytes) + consumed, err := decoded.Decode(serix.DefaultAPI, bytes) require.NoError(t, err) require.Equal(t, len(bytes), consumed) diff --git a/kvstore/go.mod b/kvstore/go.mod index c3ec6d6cf..1488f7d2e 100644 --- a/kvstore/go.mod +++ b/kvstore/go.mod @@ -4,23 +4,22 @@ go 1.21 require ( github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f + github.com/iotaledger/hive.go/ds v0.0.0-20231223024558-34cbd94e093b + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024558-34cbd94e093b + github.com/iotaledger/hive.go/runtime v0.0.0-20231223024558-34cbd94e093b + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024558-34cbd94e093b github.com/stretchr/testify v1.8.4 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect - github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223024558-34cbd94e093b // indirect + github.com/iotaledger/hive.go/lo v0.0.0-20231223024558-34cbd94e093b // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231223024558-34cbd94e093b // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect + github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect diff --git a/kvstore/go.sum b/kvstore/go.sum index 2a976647b..726b17518 100644 --- a/kvstore/go.sum +++ b/kvstore/go.sum @@ -1,46 +1,36 @@ -github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= -github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -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/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= -github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 h1:dTrD7X2PTNgli6EbS4tV9qu3QAm/kBU3XaYZV2xdzys= github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7/go.mod h1:ZRdPu684P0fQ1z8sXz4dj9H5LWHhz4a9oCtvjunkSrw= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024558-34cbd94e093b h1:5wS4MV4LpP2pVZoyXIdOw5Bb7ig4XRWM+UYfnIKi66s= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024558-34cbd94e093b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024558-34cbd94e093b h1:iKeVDNp12klvmRTGkh3HEcbPvs2y7u2+rVVZSW3gNzA= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024558-34cbd94e093b/go.mod h1:2LreTPieQaMEhYMZmAfbfIwVKm9+bT7wUC1jsfGvYMU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024558-34cbd94e093b h1:VHfNyDWVcbKu60SbYspK0U+WjvTCi/Ydr9IuNfvIVsU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024558-34cbd94e093b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024558-34cbd94e093b h1:wHdwTUEeskaIN9XoRXx/fmCv7WsXrvLR/VnL0rwkGoo= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024558-34cbd94e093b/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024558-34cbd94e093b h1:r3jeYVargwG9qxCW5y8mDceOJFw67GxKIBlNKaE5TUg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024558-34cbd94e093b/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024558-34cbd94e093b h1:L63qmu604mXybpU0z2JPMe0deDdAJfIBtprYUXlZZsw= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024558-34cbd94e093b/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024558-34cbd94e093b h1:VTJcfbkWxuZ864RymUOOtD0GGkf7fCYWd22nYEA01ks= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024558-34cbd94e093b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= -github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= @@ -52,10 +42,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/lo/go.mod b/lo/go.mod index 6e4de56df..a21eb885d 100644 --- a/lo/go.mod +++ b/lo/go.mod @@ -3,8 +3,8 @@ module github.com/iotaledger/hive.go/lo go 1.21 require ( - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/constraints v0.0.0-20231223023947-e2766095be96 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223023947-e2766095be96 github.com/stretchr/testify v1.8.4 ) diff --git a/lo/go.sum b/lo/go.sum index f8fc7dc12..c6c1106a0 100644 --- a/lo/go.sum +++ b/lo/go.sum @@ -1,9 +1,9 @@ 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= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223023947-e2766095be96 h1:Iza8XlyuQI6hSBQQZKqH20LYPuZmixrH6uRXBlFo5yE= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223023947-e2766095be96/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223023947-e2766095be96 h1:m1k/UMSrpzA/KZV+Uw70JTJeS8Jx8MXUC/sUTH6HOj0= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223023947-e2766095be96/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/log/go.mod b/log/go.mod index 0ab96b8b9..0385cf776 100644 --- a/log/go.mod +++ b/log/go.mod @@ -3,15 +3,16 @@ module github.com/iotaledger/hive.go/log go 1.21 require ( - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/ds v0.0.0-20231223024218-3b9576e01f09 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024218-3b9576e01f09 + github.com/iotaledger/hive.go/runtime v0.0.0-20231223024218-3b9576e01f09 ) require ( - github.com/ethereum/go-ethereum v1.13.5 // indirect + github.com/ethereum/go-ethereum v1.13.8 // indirect + github.com/holiman/uint256 v1.2.4 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223024218-3b9576e01f09 // indirect + github.com/iotaledger/hive.go/lo v0.0.0-20231223024218-3b9576e01f09 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024218-3b9576e01f09 // indirect ) diff --git a/log/go.sum b/log/go.sum index 96587552e..50693ef94 100644 --- a/log/go.sum +++ b/log/go.sum @@ -4,33 +4,33 @@ 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= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -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/ethereum/go-ethereum v1.13.8 h1:1od+thJel3tM52ZUNQwvpYOeRHlbkVFZ5S8fhi0Lgsg= +github.com/ethereum/go-ethereum v1.13.8/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024218-3b9576e01f09 h1:pxzEMfXaTu6k6rz0YVp2dgpK49Ou8pE9QJimH5WqS+M= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024218-3b9576e01f09/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024218-3b9576e01f09 h1:0mzeVGEe3qNI9sonN92w0KLqU16/gpzIJ1qeCHVxI7I= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024218-3b9576e01f09/go.mod h1:4+2p7WuAr3BfPDsTa40tPW6B0fCF/YkoCxenQWjdpkU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024218-3b9576e01f09 h1:pipc/p5OyOpr6dm17FUYqBBPcZNL7JuS4Pi6UXejW5c= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024218-3b9576e01f09/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024218-3b9576e01f09 h1:N2f+1/jiEqcoYVEwHmPfKmjYxjwls7zgpYdVAxwdorc= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024218-3b9576e01f09/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024218-3b9576e01f09 h1:X0ym+2Rd4/YONHYpQNBsHob4VODyXO7I0PZTD7VHlU8= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223024218-3b9576e01f09/go.mod h1:M66BK/hHNn8+WbUyI/Iib39JqNWD9NHYeQXxvYzdXFo= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024218-3b9576e01f09 h1:sp51hwY+7GAsFMuH2thcZuPIfrRVEGryuLG0JXvplV4= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024218-3b9576e01f09/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/logger/go.mod b/logger/go.mod index 723aa4b74..7ea10437f 100644 --- a/logger/go.mod +++ b/logger/go.mod @@ -3,26 +3,26 @@ module github.com/iotaledger/hive.go/logger go 1.21 require ( - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025310-09f78e11685d + github.com/iotaledger/hive.go/lo v0.0.0-20231223025310-09f78e11685d + github.com/iotaledger/hive.go/runtime v0.0.0-20231223025310-09f78e11685d github.com/stretchr/testify v1.8.4 - go.uber.org/zap v1.25.0 + go.uber.org/zap v1.26.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect - github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223025310-09f78e11685d // indirect + github.com/iotaledger/hive.go/ds v0.0.0-20231223025310-09f78e11685d // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231223025310-09f78e11685d // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/logger/go.sum b/logger/go.sum index 48ef3ef52..7abd51f51 100644 --- a/logger/go.sum +++ b/logger/go.sum @@ -1,44 +1,30 @@ -github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= -github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= -github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -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/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= -github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025310-09f78e11685d h1:7a3dGRe1lFwaIwzbyMjOANc95qMdikcAJTvU4jRgRUI= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025310-09f78e11685d/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ds v0.0.0-20231223025310-09f78e11685d h1:WXMt4qw/luzPCeCD/tqSPQ9i4iRW2m2o8hia5kz4sO4= +github.com/iotaledger/hive.go/ds v0.0.0-20231223025310-09f78e11685d/go.mod h1:2LreTPieQaMEhYMZmAfbfIwVKm9+bT7wUC1jsfGvYMU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025310-09f78e11685d h1:f33J7xL7lf2whmrpWu8m7tWSRqxaM44lQwM7SvOayMM= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025310-09f78e11685d/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025310-09f78e11685d h1:ZWoZqLdheG3csMY4QZKJ9BnIoXTAc5lC7TUh1fQ5Cl4= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025310-09f78e11685d/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025310-09f78e11685d h1:iNaxa99pXi5Kb87YqLpqCNRtUfVWzxpk2QbBXRaNpRA= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025310-09f78e11685d/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223025310-09f78e11685d h1:1mkEULUM/UwWO9dQpz64DQyedUFX7sln/LhUU5BntHk= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223025310-09f78e11685d/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= -github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= @@ -55,12 +41,8 @@ go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/run_update_and_commit_hive_submodules.sh b/run_update_and_commit_hive_submodules.sh index 5a4d51f62..45f30cad9 100755 --- a/run_update_and_commit_hive_submodules.sh +++ b/run_update_and_commit_hive_submodules.sh @@ -28,6 +28,15 @@ fi # Find all submodules by searching for subdirectories containing go.mod files SUBMODULES=$(find . -type f -name "go.mod" -exec dirname {} \; | sed -e 's/^\.\///' | sort) +# Declare an associative array to store submodule versions +declare -A SUBMODULE_VERSIONS + +# Get the current version of each submodule +for submodule in $SUBMODULES; do + version=$(grep -E "^module " "$submodule/go.mod" | awk '{print $2}' | sed "s|^$BASE_MODULE/||") + SUBMODULE_VERSIONS["$submodule"]="$version" +done + # Declare an associative array to store submodule inter-dependencies declare -A SUBMODULE_INTER_DEPENDENCIES @@ -37,6 +46,49 @@ for submodule in $SUBMODULES; do SUBMODULE_INTER_DEPENDENCIES["$submodule"]="$dependencies" done +# Create an empty string to store the ordered submodules +order="" + +# Function to recursively resolve dependencies and add them to the order array +resolve_dependencies() { + local submodule_with_base_and_version="$1" + local submodule_with_version="${submodule_with_base_and_version#${BASE_MODULE}/}" + local submodule="${submodule_with_version%/v[0-9]*}" + local visited="$2" + local dependencies="${SUBMODULE_INTER_DEPENDENCIES["$submodule"]}" + + if [[ -z "$visited" ]]; then + visited="$submodule_with_base_and_version " + else + visited+="$submodule_with_base_and_version " + fi + + # dependencies are always with base and version + for dependency in $dependencies; do + if [[ ! "$visited" =~ "$dependency" ]]; then + resolve_dependencies "$dependency" "$visited" + fi + done + + if [[ ! "$order" =~ "$submodule_with_base_and_version" ]]; then + order+="$submodule_with_base_and_version " + fi +} + +# Resolve the dependencies between the submodules +for submodule in $SUBMODULES; do + submodule_with_version="${SUBMODULE_VERSIONS["$submodule"]}" + submodule_with_base_and_version=$BASE_MODULE/$submodule_with_version + + if [[ ! "$order" =~ "$submodule_with_base_and_version" ]]; then + resolve_dependencies "$submodule_with_base_and_version" + fi +done + +# Trim leading and trailing spaces +order="${order%"${order##*[![:space:]]}"}" +order="${order#"${order%%[![:space:]]*}"}" + # Function that updates the inter-dependencies in the submodule update_submodule() { local submodule="$1" @@ -76,49 +128,10 @@ update_submodule() { popd >/dev/null } -# Create an empty string to store the ordered submodules -order="" - -# Function to recursively resolve dependencies and add them to the order array -resolve_dependencies() { - local submodule_with_base="$1" - local submodule="${submodule_with_base#${BASE_MODULE}/}" - - local visited="$2" - local dependencies="${SUBMODULE_INTER_DEPENDENCIES["$submodule"]}" - - if [[ -z "$visited" ]]; then - visited="$submodule_with_base " - else - visited+="$submodule_with_base " - fi - - for dependency in $dependencies; do - if [[ ! "$visited" =~ "$dependency" ]]; then - resolve_dependencies "$dependency" "$visited" - fi - done - - if [[ ! "$order" =~ "$submodule_with_base" ]]; then - order+="$submodule_with_base " - fi -} - -# Resolve the dependencies between the submodules -for submodule in $SUBMODULES; do - submodule_with_base=$BASE_MODULE/$submodule - if [[ ! "$order" =~ "$submodule_with_base" ]]; then - resolve_dependencies "$submodule_with_base" - fi -done - -# Trim leading and trailing spaces -order="${order%"${order##*[![:space:]]}"}" -order="${order#"${order%%[![:space:]]*}"}" - # Update submodules in the correct order -for submodule_with_base in $order; do - submodule="${submodule_with_base#${BASE_MODULE}/}" +for submodule_with_base_and_version in $order; do + submodule_with_version="${submodule_with_base_and_version#${BASE_MODULE}/}" + submodule="${submodule_with_version%/v[0-9]*}" update_submodule "$submodule" done diff --git a/runtime/go.mod b/runtime/go.mod index c4dfb3126..93bb9474d 100644 --- a/runtime/go.mod +++ b/runtime/go.mod @@ -3,25 +3,26 @@ module github.com/iotaledger/hive.go/runtime go 1.21 require ( - github.com/fjl/memsize v0.0.1 - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f - github.com/pelletier/go-toml/v2 v2.1.0 + github.com/fjl/memsize v0.0.2 + github.com/iotaledger/hive.go/constraints v0.0.0-20231223024336-954578715888 + github.com/iotaledger/hive.go/ds v0.0.0-20231223024336-954578715888 + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024336-954578715888 + github.com/iotaledger/hive.go/lo v0.0.0-20231223024336-954578715888 + github.com/iotaledger/hive.go/log v0.0.0-20231223024336-954578715888 + github.com/iotaledger/hive.go/stringify v0.0.0-20231223024336-954578715888 + github.com/pelletier/go-toml/v2 v2.1.1 github.com/sasha-s/go-deadlock v0.3.1 github.com/stretchr/testify v1.8.4 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect + github.com/ethereum/go-ethereum v1.13.8 // indirect + github.com/holiman/uint256 v1.2.4 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024336-954578715888 // indirect github.com/kr/text v0.2.0 // indirect - github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect + github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/runtime/go.sum b/runtime/go.sum index e35fba83f..dfdf1a6bd 100644 --- a/runtime/go.sum +++ b/runtime/go.sum @@ -6,39 +6,39 @@ 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= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ= -github.com/fjl/memsize v0.0.1/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -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/ethereum/go-ethereum v1.13.8 h1:1od+thJel3tM52ZUNQwvpYOeRHlbkVFZ5S8fhi0Lgsg= +github.com/ethereum/go-ethereum v1.13.8/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= +github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= +github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f h1:hCW9/oobcvZ09tRcYBkGOnsbJrBZ9K5FzH7XzhXkJfQ= -github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f/go.mod h1:r/jMdRTQsVGvbSnFVFUJDaiAFrnZ0f3skoF0FA3HDKw= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024336-954578715888 h1:VvNoSmAZCVhv0lSaHwjcvNf5fnIm3Hmaq6XPSQAypVs= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024336-954578715888/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024336-954578715888 h1:zNgPWW3IG3VMlcfos/mYxBDFRjkSOwgXVt1jnISNdAI= +github.com/iotaledger/hive.go/ds v0.0.0-20231223024336-954578715888/go.mod h1:4+2p7WuAr3BfPDsTa40tPW6B0fCF/YkoCxenQWjdpkU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024336-954578715888 h1:LrYivh9e7gmiUZqXgMvh0/R6sVU6qxxgKBcnDCpOUoo= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024336-954578715888/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024336-954578715888 h1:PcYl/huI55899hppihpdFed3g5spd9btX6omuCkvMHI= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024336-954578715888/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/log v0.0.0-20231223024336-954578715888 h1:Di+M1XvGZdPsZxyYKWMne/G6kPFze+6fiuuEg0OezYk= +github.com/iotaledger/hive.go/log v0.0.0-20231223024336-954578715888/go.mod h1:9QT/3ZQB/sNlRgBxw07iJeD4a9e7GIRwNIdanIccx+Q= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024336-954578715888 h1:C0U5q9ucFRwqM4SnKkXN06kUEMqcnMP+xaghgb2z1rc= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024336-954578715888/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024336-954578715888 h1:qsPDAoCrvmuKKwWQZ/wcXGvDXGMVE6E4scQeP68U7to= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223024336-954578715888/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b h1:vab8deKC4QoIfm9fJM59iuNz1ELGsuLoYYpiF+pHiG8= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -52,10 +52,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/serializer/go.mod b/serializer/go.mod index 98b060cb2..76cd75e5e 100644 --- a/serializer/go.mod +++ b/serializer/go.mod @@ -3,24 +3,24 @@ module github.com/iotaledger/hive.go/serializer/v2 go 1.21 require ( - github.com/ethereum/go-ethereum v1.12.2 + github.com/ethereum/go-ethereum v1.13.8 github.com/iancoleman/orderedmap v0.3.0 - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024147-fce840780d6a + github.com/iotaledger/hive.go/lo v0.0.0-20231223024147-fce840780d6a github.com/mr-tron/base58 v1.2.0 github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.9.0 + golang.org/x/crypto v0.17.0 ) require ( github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect - github.com/holiman/uint256 v1.2.3 // indirect - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect + github.com/holiman/uint256 v1.2.4 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20231223024147-fce840780d6a // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect - golang.org/x/sys v0.9.0 // indirect + golang.org/x/sys v0.15.0 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/serializer/go.sum b/serializer/go.sum index b9fa16656..69c4142d8 100644 --- a/serializer/go.sum +++ b/serializer/go.sum @@ -8,18 +8,20 @@ github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.12.2 h1:eGHJ4ij7oyVqUQn48LBz3B7pvQ8sV0wGJiIE6gDq/6Y= -github.com/ethereum/go-ethereum v1.12.2/go.mod h1:1cRAEV+rp/xX0zraSCBnu9Py3HQ+geRMj3HdR+k0wfI= -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/ethereum/go-ethereum v1.13.8 h1:1od+thJel3tM52ZUNQwvpYOeRHlbkVFZ5S8fhi0Lgsg= +github.com/ethereum/go-ethereum v1.13.8/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024147-fce840780d6a h1:HrzGBuLo6xqN1bWRhjm8HjehhdyXtLNRfmStxotJXMw= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223024147-fce840780d6a/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024147-fce840780d6a h1:3+jKu0IxBlLazvQ/olry2Fs7uzYPfYf0Ye5pOEWYt2Y= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024147-fce840780d6a/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024147-fce840780d6a h1:u7YqiwdCjzU5/4Gn4+ICsubcCa8fg+Ayqv3ZLjJ4uPc= +github.com/iotaledger/hive.go/lo v0.0.0-20231223024147-fce840780d6a/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -32,10 +34,10 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/serializer/serix/serix.go b/serializer/serix/serix.go index 82d0e9db1..4ac73435d 100644 --- a/serializer/serix/serix.go +++ b/serializer/serix/serix.go @@ -57,6 +57,10 @@ import ( "sync" "time" + // we need to use this orderedmap implementation for serialization instead of our own, + // because the generic orderedmap in hive.go doesn't support marshaling to json. + // this orderedmap implementation uses map[string]any as underlying datastructure, + // which is a must instead of map[K]V, otherwise we can't correctly sort nested maps during unmarshaling. "github.com/iancoleman/orderedmap" "github.com/iotaledger/hive.go/ierrors" diff --git a/serializer/serix/serix_test.go b/serializer/serix/serix_test.go index 01edce4b2..39e08ef55 100644 --- a/serializer/serix/serix_test.go +++ b/serializer/serix/serix_test.go @@ -342,8 +342,8 @@ type deSerializeTest struct { deSeriErr error } -// convert all *orderedmap.OrderedMap to map[string]interface{} -func convertOrderedMapToMap(m *orderedmap.OrderedMap) map[string]interface{} { +// convert all *orderedmap.OrderedMap to map[string]any +func convertOrderedMapToMap(m *orderedmap.OrderedMap) map[string]any { for k, v := range m.Values() { if v, ok := v.(*orderedmap.OrderedMap); ok { m.Set(k, convertOrderedMapToMap(v)) @@ -363,7 +363,7 @@ func (test *deSerializeTest) run(t *testing.T) { serixMapData, err := testAPI.MapEncode(context.Background(), test.source) require.NoError(t, err, "map serialization failed") - // convert all *orderedmap.OrderedMap in serixMapData to map[string]interface{} + // convert all *orderedmap.OrderedMap in serixMapData to map[string]any serixMapDataUnordered := convertOrderedMapToMap(serixMapData) // binary deserialize diff --git a/web/go.mod b/web/go.mod index 8f91df0b9..590a768f9 100644 --- a/web/go.mod +++ b/web/go.mod @@ -3,32 +3,28 @@ module github.com/iotaledger/hive.go/web go 1.21 require ( - github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f - github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f + github.com/iotaledger/hive.go/constraints v0.0.0-20231223025425-91257fbacf8b + github.com/iotaledger/hive.go/ds v0.0.0-20231223025425-91257fbacf8b + github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025425-91257fbacf8b + github.com/iotaledger/hive.go/lo v0.0.0-20231223025425-91257fbacf8b + github.com/iotaledger/hive.go/log v0.0.0-20231223025425-91257fbacf8b + github.com/iotaledger/hive.go/runtime v0.0.0-20231223025425-91257fbacf8b github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.14.0 - nhooyr.io/websocket v1.8.7 + golang.org/x/crypto v0.17.0 + nhooyr.io/websocket v1.8.10 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect - github.com/gin-gonic/gin v1.8.1 // indirect - github.com/go-playground/validator/v10 v10.11.1 // indirect + github.com/ethereum/go-ethereum v1.13.8 // indirect + github.com/holiman/uint256 v1.2.4 // indirect github.com/iancoleman/orderedmap v0.3.0 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223025425-91257fbacf8b // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20231223025425-91257fbacf8b // indirect github.com/kr/text v0.2.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5 // indirect + github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - google.golang.org/protobuf v1.29.1 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/web/go.sum b/web/go.sum index 6fb5b51e4..930bf0003 100644 --- a/web/go.sum +++ b/web/go.sum @@ -1,161 +1,60 @@ github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -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= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= -github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -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/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -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/ethereum/go-ethereum v1.13.8 h1:1od+thJel3tM52ZUNQwvpYOeRHlbkVFZ5S8fhi0Lgsg= +github.com/ethereum/go-ethereum v1.13.8/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE= -github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc= -github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc= -github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f h1:hCW9/oobcvZ09tRcYBkGOnsbJrBZ9K5FzH7XzhXkJfQ= -github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f/go.mod h1:r/jMdRTQsVGvbSnFVFUJDaiAFrnZ0f3skoF0FA3HDKw= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao= -github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025425-91257fbacf8b h1:W81pHkSxB5MOmXU0Rqal7zhAnGpXs37a0GT9rdWg8Qo= +github.com/iotaledger/hive.go/constraints v0.0.0-20231223025425-91257fbacf8b/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/ds v0.0.0-20231223025425-91257fbacf8b h1:6BO8/cLNkuIzv0eSurdPTSE44NgPxFF9e7lhBKo/5j4= +github.com/iotaledger/hive.go/ds v0.0.0-20231223025425-91257fbacf8b/go.mod h1:2LreTPieQaMEhYMZmAfbfIwVKm9+bT7wUC1jsfGvYMU= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025425-91257fbacf8b h1:+3vL7uezlE8Yb5ma/ks0Vrrky0cDU7uhJXFaedq2tDE= +github.com/iotaledger/hive.go/ierrors v0.0.0-20231223025425-91257fbacf8b/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025425-91257fbacf8b h1:K6ut135tZJJV++rRlWSdIwR8LfMBAUxROutAggpEgCo= +github.com/iotaledger/hive.go/lo v0.0.0-20231223025425-91257fbacf8b/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg= +github.com/iotaledger/hive.go/log v0.0.0-20231223025425-91257fbacf8b h1:fRqvAKTqeKIMILiL+G97ZdpzVyOPVtoYHrkdRqiYqqU= +github.com/iotaledger/hive.go/log v0.0.0-20231223025425-91257fbacf8b/go.mod h1:9QT/3ZQB/sNlRgBxw07iJeD4a9e7GIRwNIdanIccx+Q= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025425-91257fbacf8b h1:/Zw/hRE0DoHRaZuGAgr9m7qCAc4m5DEKhv20e0BzMT4= +github.com/iotaledger/hive.go/runtime v0.0.0-20231223025425-91257fbacf8b/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223025425-91257fbacf8b h1:jvs4EZn/ncS7e9XkwazFllEnipDU4gz9akyFXn3IKyM= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223025425-91257fbacf8b/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223025425-91257fbacf8b h1:H6M1sp4il3+5Z50lMGUAKReUovqw17DxTb4j10YV5Zo= +github.com/iotaledger/hive.go/stringify v0.0.0-20231223025425-91257fbacf8b/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= -github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5 h1:+qIP3OMrT7SN5kLnTcVEISPOMB/97RyAKTg1UWA738E= -github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= -google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/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.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= -nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= +nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=