From 5181a8dfdbcc75407d685f203a032d5a124da1eb Mon Sep 17 00:00:00 2001 From: Piotr Macek <4007944+piotrm50@users.noreply.github.com> Date: Thu, 25 Jan 2024 16:05:38 +0100 Subject: [PATCH] Update iota.go version --- go.mod | 35 +++++++------- go.sum | 72 ++++++++++++++-------------- pkg/accountwallet/accountcreation.go | 4 +- pkg/accountwallet/utils.go | 5 +- pkg/evilwallet/evilwallet.go | 2 +- pkg/utils/utils.go | 2 +- 6 files changed, 61 insertions(+), 59 deletions(-) diff --git a/go.mod b/go.mod index f30ef03..1cdd74a 100644 --- a/go.mod +++ b/go.mod @@ -4,17 +4,18 @@ go 1.21 require ( github.com/iotaledger/hive.go/app v0.0.0-20231219135817-5e9eb90d6129 - github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231219095137-dd4674b3226e - github.com/iotaledger/hive.go/ds v0.0.0-20231219135817-5e9eb90d6129 - github.com/iotaledger/hive.go/ierrors v0.0.0-20231219135817-5e9eb90d6129 - github.com/iotaledger/hive.go/lo v0.0.0-20231219135817-5e9eb90d6129 - github.com/iotaledger/hive.go/log v0.0.0-20231219135817-5e9eb90d6129 - github.com/iotaledger/hive.go/runtime v0.0.0-20231219135817-5e9eb90d6129 + github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240123132714-180e65c33a1d + github.com/iotaledger/hive.go/ds v0.0.0-20240123132714-180e65c33a1d + github.com/iotaledger/hive.go/ierrors v0.0.0-20240123132714-180e65c33a1d + github.com/iotaledger/hive.go/lo v0.0.0-20240123132714-180e65c33a1d + github.com/iotaledger/hive.go/log v0.0.0-20240123125657-a8c21e9d57d3 + github.com/iotaledger/hive.go/runtime v0.0.0-20240123132714-180e65c33a1d github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00 - github.com/iotaledger/iota.go/v4 v4.0.0-20240116140157-9e8010cb282d + github.com/iotaledger/iota.go/v4 v4.0.0-20240125100757-710b71462194 github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 - golang.org/x/crypto v0.17.0 + go.uber.org/dig v1.17.1 + golang.org/x/crypto v0.18.0 ) require ( @@ -22,7 +23,7 @@ require ( github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/eclipse/paho.mqtt.golang v1.4.3 // indirect - github.com/ethereum/go-ethereum v1.13.7 // indirect + github.com/ethereum/go-ethereum v1.13.10 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/felixge/fgprof v0.9.3 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -33,10 +34,10 @@ require ( github.com/hashicorp/go-version v1.6.0 // 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-20231219135817-5e9eb90d6129 // indirect - github.com/iotaledger/hive.go/crypto v0.0.0-20231219135817-5e9eb90d6129 // indirect - github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231219095137-dd4674b3226e // indirect - github.com/iotaledger/hive.go/stringify v0.0.0-20231219135817-5e9eb90d6129 // indirect + github.com/iotaledger/hive.go/constraints v0.0.0-20240123132714-180e65c33a1d // indirect + github.com/iotaledger/hive.go/crypto v0.0.0-20240123132714-180e65c33a1d // indirect + github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240123132714-180e65c33a1d // indirect + github.com/iotaledger/hive.go/stringify v0.0.0-20240123132714-180e65c33a1d // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/kr/text v0.2.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect @@ -50,11 +51,11 @@ require ( github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e // indirect - go.uber.org/dig v1.17.1 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index e561fc5..359931b 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ 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.7 h1:71qnF0T75JuxLqLt0Qj6eZrB//awJ/yqpUPXQAaBFmA= -github.com/ethereum/go-ethereum v1.13.7/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= +github.com/ethereum/go-ethereum v1.13.10 h1:Ppdil79nN+Vc+mXfge0AuUgmKWuVv4eMqzoIVSdqZek= +github.com/ethereum/go-ethereum v1.13.10/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= @@ -175,30 +175,30 @@ github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJ github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/iotaledger/hive.go/app v0.0.0-20231219135817-5e9eb90d6129 h1:CHlhV0HAelYM7lwcEoDE7hZTQucf2ayIEoCi/RZxIyQ= github.com/iotaledger/hive.go/app v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:sQ+iVwZB/j8OxM1c81dsIcdzuFQMsXvrFK8dCfpQLCE= -github.com/iotaledger/hive.go/constraints v0.0.0-20231219135817-5e9eb90d6129 h1:qKZ0wkiHlzuVruEf2kKpFHhS0HVdudeA0c0nlHviUQk= -github.com/iotaledger/hive.go/constraints v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231219095137-dd4674b3226e h1:GQkpZq4zo24jzCUpE6N9ixB5/NxE6XjeQCdRktkRfOw= -github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20231219095137-dd4674b3226e/go.mod h1:f+10zIZdQcEXGx9An2Y8YGfKwtdL3i0VlY9Ct+KbZEw= -github.com/iotaledger/hive.go/crypto v0.0.0-20231219135817-5e9eb90d6129 h1:sFeW9IdZflb42dA/rCQd/PKJEwJ/9SZAwgptthBE6z8= -github.com/iotaledger/hive.go/crypto v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:YUdghEQkJkAO5GxEvpcKpSWtV5PxAIuW4hXIszROA2E= -github.com/iotaledger/hive.go/ds v0.0.0-20231219135817-5e9eb90d6129 h1:COOzb0dR+UiNlMHaGuhBdfBhNOq+c5B8OKduwDP8Wv8= -github.com/iotaledger/hive.go/ds v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:lDpFB4hkoUke5YxJ8ssmNNuY/qaxWaTQtVu/9y9BhKI= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231219135817-5e9eb90d6129 h1:OYwAFLARlHGbl1k1ZXTRi+KL1+RasTCGbCfvFMKTffI= -github.com/iotaledger/hive.go/ierrors v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= -github.com/iotaledger/hive.go/lo v0.0.0-20231219135817-5e9eb90d6129 h1:yxBuUmaOmhYEcTQ5pA8G2IBVT9PUaRnek6EinEshEnc= -github.com/iotaledger/hive.go/lo v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:kJ3T3R4oteGiO4KVlsHYoGWjl0StK2svlzqLjDPh7EQ= -github.com/iotaledger/hive.go/log v0.0.0-20231219135817-5e9eb90d6129 h1:9gGN1RNya+GOXF8+dJrS/eMjVVvnxdtLkwE0mc0vYzo= -github.com/iotaledger/hive.go/log v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:JQ7L06XNadFPtxCTKWOtzTtWQEgDHIt5NXAnQoPdu30= -github.com/iotaledger/hive.go/runtime v0.0.0-20231219135817-5e9eb90d6129 h1:SzetaTK9Hh5nTNneHO0arTg1+mZiNix5qUdTDRN79UM= -github.com/iotaledger/hive.go/runtime v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:kpzzMz84eIcjRPjJiDv04HBp+vGjW7udXyQ2t/ixjNM= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231219095137-dd4674b3226e h1:FOz9/O6yuNYFICP33gjHJ+0SBdzIm1oWfFhaEEiOq8Q= -github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231219095137-dd4674b3226e/go.mod h1:2Gl3qEk1CV9uFPF79JM0Fn4Da39P6SZO+uIF4YMy2kk= -github.com/iotaledger/hive.go/stringify v0.0.0-20231219135817-5e9eb90d6129 h1:wofknlXP6281s67NU+JFBmsKggu5cXZbKgyYoWbEYPU= -github.com/iotaledger/hive.go/stringify v0.0.0-20231219135817-5e9eb90d6129/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= +github.com/iotaledger/hive.go/constraints v0.0.0-20240123132714-180e65c33a1d h1:Q+/j/tD9mW7Phe7QV4R5nKOoBlT3rKfVkePcyg523Ng= +github.com/iotaledger/hive.go/constraints v0.0.0-20240123132714-180e65c33a1d/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240123132714-180e65c33a1d h1:u0fWPcVBIj0DL7QzTUzXhydj3zQ59cY0Sg0X3nH4u64= +github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240123132714-180e65c33a1d/go.mod h1:EuPbVaeJ4mYivGhTR1gGAkmTg5mlH88jMD8omW/4nd0= +github.com/iotaledger/hive.go/crypto v0.0.0-20240123132714-180e65c33a1d h1:2c9wCCTMFKNac9r9unQ6C6vT1Z0jN9avNzwFXhaFke8= +github.com/iotaledger/hive.go/crypto v0.0.0-20240123132714-180e65c33a1d/go.mod h1:A4fnYmb9bHEQz/x8uPymdDfxK1w5XTPKKbAKPOOi6XQ= +github.com/iotaledger/hive.go/ds v0.0.0-20240123132714-180e65c33a1d h1:TpFd/kxGKayA40XvagyHaw9dC6WAR3KNvMhm4+OJplQ= +github.com/iotaledger/hive.go/ds v0.0.0-20240123132714-180e65c33a1d/go.mod h1:Kvkw/9f9PCGa1kYBSbqTwfngERtX7KhljshZG+Q163E= +github.com/iotaledger/hive.go/ierrors v0.0.0-20240123132714-180e65c33a1d h1:HqNjhrBa0CBdOTXsByqonwaF81ptmwuyzByfPZSpnB0= +github.com/iotaledger/hive.go/ierrors v0.0.0-20240123132714-180e65c33a1d/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8= +github.com/iotaledger/hive.go/lo v0.0.0-20240123132714-180e65c33a1d h1:oz0jBPIqih0P9UhdvWf5UbrNmbk14WXvDR/PeqD5y+k= +github.com/iotaledger/hive.go/lo v0.0.0-20240123132714-180e65c33a1d/go.mod h1:gXiCwCmaUj0Dx/jkRO8ugYf2p6yzOjuFuaVBDzvpCXE= +github.com/iotaledger/hive.go/log v0.0.0-20240123125657-a8c21e9d57d3 h1:kF73eOhUMNYbr1X5TpP5CU/fgVN+ujnlyiQ08DTEyos= +github.com/iotaledger/hive.go/log v0.0.0-20240123125657-a8c21e9d57d3/go.mod h1:9qxXk5jZpbJw3Nl9PZpsSeAgeEtcLXjkhIgZ9e6Fxzc= +github.com/iotaledger/hive.go/runtime v0.0.0-20240123132714-180e65c33a1d h1:BTGHn+23Qp4f5SFBAJEou84ROCfGEDJCleH9ucNRBgk= +github.com/iotaledger/hive.go/runtime v0.0.0-20240123132714-180e65c33a1d/go.mod h1:vDPHQle8h94nSQnKunX973w6RIbiaft2UJhtNuMksHU= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240123132714-180e65c33a1d h1:eY7mWk+8sk8ijUJsNjUSJ1XsrN1Z6ple21EtkhusYQA= +github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240123132714-180e65c33a1d/go.mod h1:Cg5nGlQX0y6ikdhQcLH7baTqsk50RPm5PP5SHnSK+YQ= +github.com/iotaledger/hive.go/stringify v0.0.0-20240123132714-180e65c33a1d h1:pw2+b07e70vYkM9NW8P4bA+CG8MyFPrCy9THtnaMvw0= +github.com/iotaledger/hive.go/stringify v0.0.0-20240123132714-180e65c33a1d/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs= github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00 h1:j5udgLtSN6wQgFI9vnhkdJsqsVdJmwtoc0yOmT/Ila4= github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00/go.mod h1:gt+URx7DZu414nZME7jtGgxR4DVTSnNa1jF2trTUTZ0= -github.com/iotaledger/iota.go/v4 v4.0.0-20240116140157-9e8010cb282d h1:8eR1H4cMtqv7PqZvT5B0HKwTVVZTFPsuZbYcuzovAA4= -github.com/iotaledger/iota.go/v4 v4.0.0-20240116140157-9e8010cb282d/go.mod h1:66w9NjF5IDk4amUu+i54yPfSi3hLqpAOefotC0kZahs= +github.com/iotaledger/iota.go/v4 v4.0.0-20240125100757-710b71462194 h1:h5Blkq1FDFGijW52+GIKdI9jEYOEF8xYJW4VPQBME10= +github.com/iotaledger/iota.go/v4 v4.0.0-20240125100757-710b71462194/go.mod h1:ZsbAtAhfjPO88C4k6gOJQUHHlulAMhNCW1MVzMqEfA4= 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= @@ -303,8 +303,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= -github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= -github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= +github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= +github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= 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/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= @@ -348,11 +348,11 @@ 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.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= 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= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -378,8 +378,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.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= 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= @@ -392,8 +392,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -425,8 +425,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.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.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/pkg/accountwallet/accountcreation.go b/pkg/accountwallet/accountcreation.go index eb050f9..1a9d1fe 100644 --- a/pkg/accountwallet/accountcreation.go +++ b/pkg/accountwallet/accountcreation.go @@ -2,11 +2,11 @@ package accountwallet import ( "context" - "crypto/ed25519" "time" "github.com/iotaledger/evil-tools/pkg/models" "github.com/iotaledger/evil-tools/pkg/utils" + "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/iotaledger/hive.go/ierrors" "github.com/iotaledger/hive.go/lo" iotago "github.com/iotaledger/iota.go/v4" @@ -185,7 +185,7 @@ func (a *AccountWallet) createAccountCreationTransaction(inputs []*models.Output AddOutput(accountOutput). SetCreationSlot(currentSlot). AddCommitmentInput(&iotago.CommitmentInput{CommitmentID: lo.Return1(issuerResp.LatestCommitment.ID())}).AddBlockIssuanceCreditInput(&iotago.BlockIssuanceCreditInput{AccountID: accountID}). - WithTransactionCapabilities(iotago.TransactionCapabilitiesBitMaskWithCapabilities(iotago.WithTransactionCanDoAnything())).AllotAllMana(txBuilder.CreationSlot(), accountID) + WithTransactionCapabilities(iotago.TransactionCapabilitiesBitMaskWithCapabilities(iotago.WithTransactionCanDoAnything())).AllotAllMana(txBuilder.CreationSlot(), accountID, 0) // allot required mana to the implicit account a.logMissingMana(txBuilder, congestionResp.ReferenceManaCost, accountID) diff --git a/pkg/accountwallet/utils.go b/pkg/accountwallet/utils.go index 90ca30f..7e70aba 100644 --- a/pkg/accountwallet/utils.go +++ b/pkg/accountwallet/utils.go @@ -6,6 +6,7 @@ import ( "github.com/iotaledger/evil-tools/pkg/models" "github.com/iotaledger/evil-tools/pkg/utils" + hiveEd25519 "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/iotaledger/hive.go/ierrors" "github.com/iotaledger/hive.go/lo" iotago "github.com/iotaledger/iota.go/v4" @@ -21,7 +22,7 @@ func (a *AccountWallet) logMissingMana(finishedTxBuilder *builder.TransactionBui return } a.LogDebug(utils.SprintAvailableManaResult(availableMana)) - minRequiredAllottedMana, err := finishedTxBuilder.MinRequiredAllotedMana(a.Client.APIForSlot(finishedTxBuilder.CreationSlot()).ProtocolParameters().WorkScoreParameters(), rmc, issuerAccountID) + minRequiredAllottedMana, err := finishedTxBuilder.MinRequiredAllotedMana(rmc, issuerAccountID) if err != nil { a.LogError("could not calculate min required allotted mana") @@ -53,7 +54,7 @@ func (a *AccountWallet) GetAddrSignerForIndexes(outputs ...*models.OutputData) ( } func (a *AccountWallet) getAccountPublicKeys(pubKey crypto.PublicKey) (iotago.BlockIssuerKeys, error) { - ed25519PubKey, isEd25519 := pubKey.(ed25519.PublicKey) + ed25519PubKey, isEd25519 := pubKey.(hiveEd25519.PublicKey) if !isEd25519 { return nil, ierrors.New("Failed to create account: only Ed25519 keys are supported") } diff --git a/pkg/evilwallet/evilwallet.go b/pkg/evilwallet/evilwallet.go index 732a6f6..de2aebf 100644 --- a/pkg/evilwallet/evilwallet.go +++ b/pkg/evilwallet/evilwallet.go @@ -159,7 +159,7 @@ func (e *EvilWallet) PrepareAndPostBlockWithTxBuildData(ctx context.Context, clt } // handle allotment strategy - txBuilder.AllotAllMana(txBuilder.CreationSlot(), issuer.ID()) + txBuilder.AllotAllMana(txBuilder.CreationSlot(), issuer.ID(), 0) signedTx, err := txBuilder.Build(iotago.NewInMemoryAddressSigner(signingKeys...)) if err != nil { return iotago.EmptyBlockID, nil, ierrors.Wrap(err, "failed to build and sign transaction") diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 0811583..a3ef67d 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -90,7 +90,7 @@ func MinIssuerAccountAmount(protocolParameters iotago.ProtocolParameters) iotago Features: iotago.AccountOutputFeatures{ &iotago.BlockIssuerFeature{ BlockIssuerKeys: iotago.BlockIssuerKeys{ - &iotago.Ed25519PublicKeyBlockIssuerKey{}, + &iotago.Ed25519PublicKeyHashBlockIssuerKey{}, }, }, },