From 07b1a5646156a71b63c17eeb86526e0760778ece Mon Sep 17 00:00:00 2001 From: Piotr Macek <4007944+piotrm50@users.noreply.github.com> Date: Wed, 2 Aug 2023 10:39:26 +0200 Subject: [PATCH 1/3] Adjust code for newly introduced rent structure for staking and issuer keys. --- go.mod | 2 +- go.sum | 4 ++-- pkg/tests/accounts_test.go | 10 +++++----- pkg/testsuite/testsuite.go | 6 ++++-- tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- tools/genesis-snapshot/presets/presets.go | 6 +++--- 11 files changed, 24 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index eb1d76694..5f032adc4 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230801123622-68977cefd26c github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 - github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c + github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 github.com/labstack/echo/v4 v4.11.1 github.com/libp2p/go-libp2p v0.29.0 github.com/multiformats/go-multiaddr v0.10.1 diff --git a/go.sum b/go.sum index c4095f7e4..a4fb6335f 100644 --- a/go.sum +++ b/go.sum @@ -286,8 +286,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b h1:MeK4C github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b/go.mod h1:zoeXg8m9SfQTQY/2713pkocWg0Fi8U5fnoffcqar2J8= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 h1:AN2pAMyIhsfxMUWm3GX/FgastZFP5Q7lzfYboURzgus= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7/go.mod h1:Dg0D7hAtieN4EUc7duZk6iWSikv5egQisl/XXY7zRBI= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c h1:LtUGM6yb/l++o65Gtaj6cGPH5TSuygY6O5HUshnjKqM= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 h1:epbgYfzE8S1NaaYxTLnFvkMFCG4J3dRU8CE6oBa/pq8= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/pkg/tests/accounts_test.go b/pkg/tests/accounts_test.go index 9af691431..18b9c3be7 100644 --- a/pkg/tests/accounts_test.go +++ b/pkg/tests/accounts_test.go @@ -26,9 +26,9 @@ func Test_TransitionAccount(t *testing.T) { // Nil address will be replaced with the address generated from genesis seed. // A single key may unlock multiple accounts; that's why it can't be used as a source for AccountID derivation. Address: nil, - // Set 3 time min amount to cover the rent. If it's too little, then the snapshot creation will fail. - // We need more to cover an additional key that is added in the test. - Amount: testsuite.MinIssuerAccountDeposit * 3, + // Set an amount enough to cover the rent and to cover an additional key that is added in the test. + // If it's too little, then the test will fail. + Amount: testsuite.MinIssuerAccountDeposit * 10, Mana: 0, // AccountID is derived from this field, so this must be set uniquely for each account. IssuerKey: oldGenesisOutputKey, @@ -236,7 +236,7 @@ func Test_TransitionAccount(t *testing.T) { ValidatorStakeChange: 0, StakeEndEpochChange: 0, FixedCostChange: 0, - DelegationStakeChange: 1914080, + DelegationStakeChange: 973040, }, false, ts.Nodes()...) ts.AssertAccountData(&accounts.AccountData{ @@ -247,7 +247,7 @@ func Test_TransitionAccount(t *testing.T) { PubKeys: ds.NewSet(newAccountBlockIssuerKey), StakeEndEpoch: 10, FixedCost: 421, - DelegationStake: 1966240, + DelegationStake: 973040, ValidatorStake: 10000, }, ts.Nodes()...) diff --git a/pkg/testsuite/testsuite.go b/pkg/testsuite/testsuite.go index d1b45f888..7f56b1211 100644 --- a/pkg/testsuite/testsuite.go +++ b/pkg/testsuite/testsuite.go @@ -31,8 +31,8 @@ import ( "github.com/iotaledger/iota.go/v4/tpkg" ) -const MinIssuerAccountDeposit = iotago.BaseToken(84400) -const MinValidatorAccountDeposit = iotago.BaseToken(88200) +const MinIssuerAccountDeposit = iotago.BaseToken(372900) +const MinValidatorAccountDeposit = iotago.BaseToken(702900) type TestSuite struct { Testing *testing.T @@ -96,6 +96,8 @@ func NewTestSuite(testingT *testing.T, opts ...options.Option[TestSuite]) *TestS 100, 1, 10, + 100, + 100, ), iotago.WithTimeProviderOptions( time.Now().Truncate(10*time.Second).Unix()-t.optsGenesisTimestampOffset, diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 48d961877..1ced12836 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230801123622-68977cefd26c github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota-core/tools/genesis-snapshot v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c + github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index 3b022004b..c06a890b4 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -191,8 +191,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230801123622-68977ce github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230801123622-68977cefd26c/go.mod h1:enUSP6xsqutBPBJDGC9hreRnSoaaKHUk7Vh4lp3L2c4= github.com/iotaledger/hive.go/stringify v0.0.0-20230801123622-68977cefd26c h1:4Zh32aSY8SPWlAEhlZwF9IyEHtzo8nrKakdxpKPcTW8= github.com/iotaledger/hive.go/stringify v0.0.0-20230801123622-68977cefd26c/go.mod h1:l/F3cA/+67QdNj+sohv2v4HhmsdOcWScoA+sVYoAE4c= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c h1:LtUGM6yb/l++o65Gtaj6cGPH5TSuygY6O5HUshnjKqM= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 h1:epbgYfzE8S1NaaYxTLnFvkMFCG4J3dRU8CE6oBa/pq8= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/tools/gendoc/go.mod b/tools/gendoc/go.mod index 38d0ef814..bcc84c43d 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -68,7 +68,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230801123622-68977cefd26c // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 23009ca58..48c61ea1a 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -288,8 +288,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b h1:MeK4C github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b/go.mod h1:zoeXg8m9SfQTQY/2713pkocWg0Fi8U5fnoffcqar2J8= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 h1:AN2pAMyIhsfxMUWm3GX/FgastZFP5Q7lzfYboURzgus= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7/go.mod h1:Dg0D7hAtieN4EUc7duZk6iWSikv5egQisl/XXY7zRBI= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c h1:LtUGM6yb/l++o65Gtaj6cGPH5TSuygY6O5HUshnjKqM= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 h1:epbgYfzE8S1NaaYxTLnFvkMFCG4J3dRU8CE6oBa/pq8= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index f70c2ee4c..2a382eac9 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230801123622-68977cefd26c github.com/iotaledger/hive.go/runtime v0.0.0-20230801123622-68977cefd26c github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c + github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.11.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index d49b7a447..d6606c17e 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -47,8 +47,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230801123622-68977ce github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230801123622-68977cefd26c/go.mod h1:enUSP6xsqutBPBJDGC9hreRnSoaaKHUk7Vh4lp3L2c4= github.com/iotaledger/hive.go/stringify v0.0.0-20230801123622-68977cefd26c h1:4Zh32aSY8SPWlAEhlZwF9IyEHtzo8nrKakdxpKPcTW8= github.com/iotaledger/hive.go/stringify v0.0.0-20230801123622-68977cefd26c/go.mod h1:l/F3cA/+67QdNj+sohv2v4HhmsdOcWScoA+sVYoAE4c= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c h1:LtUGM6yb/l++o65Gtaj6cGPH5TSuygY6O5HUshnjKqM= -github.com/iotaledger/iota.go/v4 v4.0.0-20230801163034-70beca23c22c/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9 h1:epbgYfzE8S1NaaYxTLnFvkMFCG4J3dRU8CE6oBa/pq8= +github.com/iotaledger/iota.go/v4 v4.0.0-20230802083632-50d5bff519d9/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= diff --git a/tools/genesis-snapshot/presets/presets.go b/tools/genesis-snapshot/presets/presets.go index 1869b26e4..8b362e830 100644 --- a/tools/genesis-snapshot/presets/presets.go +++ b/tools/genesis-snapshot/presets/presets.go @@ -22,7 +22,7 @@ var Base = []options.Option[snapshotcreator.Options]{ snapshotcreator.WithProtocolParameters( iotago.NewV3ProtocolParameters( iotago.WithNetworkOptions("default", "rms"), - iotago.WithSupplyOptions(10_000_000_000, 100, 1, 10), + iotago.WithSupplyOptions(10_000_000_000, 100, 1, 10, 100, 100), iotago.WithTimeProviderOptions(time.Now().Unix(), 10, 13), iotago.WithLivenessOptions(5, 10, 20, 30), ), @@ -93,7 +93,7 @@ var Docker = []options.Option[snapshotcreator.Options]{ snapshotcreator.WithProtocolParameters( iotago.NewV3ProtocolParameters( iotago.WithNetworkOptions("docker", "rms"), - iotago.WithSupplyOptions(10_000_000_000, 1, 1, 10), + iotago.WithSupplyOptions(10_000_000_000, 1, 1, 10, 100, 100), iotago.WithTimeProviderOptions(time.Now().Unix(), 10, 13), iotago.WithLivenessOptions(5, 10, 20, 30), ), @@ -144,7 +144,7 @@ var Feature = []options.Option[snapshotcreator.Options]{ snapshotcreator.WithProtocolParameters( iotago.NewV3ProtocolParameters( iotago.WithNetworkOptions("feature", "rms"), - iotago.WithSupplyOptions(10_000_000_000, 100, 1, 10), + iotago.WithSupplyOptions(10_000_000_000, 100, 1, 10, 100, 100), iotago.WithTimeProviderOptions(1689848996, 10, 13), iotago.WithLivenessOptions(5, 10, 20, 30), ), From 9054f1fa8816bd1ba6c88f52291fc6a78f0c0add Mon Sep 17 00:00:00 2001 From: Piotr Macek <4007944+piotrm50@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:42:51 +0200 Subject: [PATCH 2/3] Update iota.go --- go.mod | 2 +- go.sum | 4 ++-- tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 2af86e650..a78bf86cf 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 - github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 + github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd github.com/labstack/echo/v4 v4.11.1 github.com/libp2p/go-libp2p v0.29.0 github.com/multiformats/go-multiaddr v0.10.1 diff --git a/go.sum b/go.sum index de930cf75..079e26766 100644 --- a/go.sum +++ b/go.sum @@ -286,8 +286,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b h1:MeK4C github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b/go.mod h1:zoeXg8m9SfQTQY/2713pkocWg0Fi8U5fnoffcqar2J8= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 h1:AN2pAMyIhsfxMUWm3GX/FgastZFP5Q7lzfYboURzgus= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7/go.mod h1:Dg0D7hAtieN4EUc7duZk6iWSikv5egQisl/XXY7zRBI= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 h1:lFQ9AfNN5hcrhYjpQsUApK+KSryoF4i0HkDCONWv6dg= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 2e9a96427..6ebed2bdb 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota-core/tools/genesis-snapshot v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 + github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index 9c2260b8a..788425a80 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -191,8 +191,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b918394 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b9183942b168/go.mod h1:sCLs3xrJRKcru6UE1WnlvQw8bib74yy2A7s+caMtoZY= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 h1:OpD3/NapP84/dDj/5gpvD/Mrf9hTTnd5XyKWR6wBBkk= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168/go.mod h1:l/F3cA/+67QdNj+sohv2v4HhmsdOcWScoA+sVYoAE4c= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 h1:lFQ9AfNN5hcrhYjpQsUApK+KSryoF4i0HkDCONWv6dg= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/tools/gendoc/go.mod b/tools/gendoc/go.mod index 6f3ed6a61..2e9c9aeda 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -68,7 +68,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index 5b454ae60..b0bb2215d 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -288,8 +288,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b h1:MeK4C github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b/go.mod h1:zoeXg8m9SfQTQY/2713pkocWg0Fi8U5fnoffcqar2J8= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 h1:AN2pAMyIhsfxMUWm3GX/FgastZFP5Q7lzfYboURzgus= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7/go.mod h1:Dg0D7hAtieN4EUc7duZk6iWSikv5egQisl/XXY7zRBI= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 h1:lFQ9AfNN5hcrhYjpQsUApK+KSryoF4i0HkDCONWv6dg= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index e275646eb..ff32ac6b0 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/hive.go/runtime v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 + github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.11.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 311ffbe50..918fe5e1d 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -47,8 +47,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b918394 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b9183942b168/go.mod h1:sCLs3xrJRKcru6UE1WnlvQw8bib74yy2A7s+caMtoZY= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 h1:OpD3/NapP84/dDj/5gpvD/Mrf9hTTnd5XyKWR6wBBkk= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168/go.mod h1:l/F3cA/+67QdNj+sohv2v4HhmsdOcWScoA+sVYoAE4c= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7 h1:lFQ9AfNN5hcrhYjpQsUApK+KSryoF4i0HkDCONWv6dg= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803122651-f73e710c89e7/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= +github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= From 29fd0e5645901ebf371e90f833ff7e5216110e06 Mon Sep 17 00:00:00 2001 From: Piotr Macek <4007944+piotrm50@users.noreply.github.com> Date: Fri, 4 Aug 2023 08:12:19 +0200 Subject: [PATCH 3/3] Update iota.go --- go.mod | 2 +- go.sum | 4 ++-- tools/evil-spammer/go.mod | 2 +- tools/evil-spammer/go.sum | 4 ++-- tools/gendoc/go.mod | 2 +- tools/gendoc/go.sum | 4 ++-- tools/genesis-snapshot/go.mod | 2 +- tools/genesis-snapshot/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index a78bf86cf..41259e2b3 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 - github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd + github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b github.com/labstack/echo/v4 v4.11.1 github.com/libp2p/go-libp2p v0.29.0 github.com/multiformats/go-multiaddr v0.10.1 diff --git a/go.sum b/go.sum index 079e26766..a77d083de 100644 --- a/go.sum +++ b/go.sum @@ -286,8 +286,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b h1:MeK4C github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b/go.mod h1:zoeXg8m9SfQTQY/2713pkocWg0Fi8U5fnoffcqar2J8= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 h1:AN2pAMyIhsfxMUWm3GX/FgastZFP5Q7lzfYboURzgus= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7/go.mod h1:Dg0D7hAtieN4EUc7duZk6iWSikv5egQisl/XXY7zRBI= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b h1:gcDhylaGePNOgRkT8URD87rm6wAZeeUPTYQO3R+floE= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/evil-spammer/go.mod b/tools/evil-spammer/go.mod index 6ebed2bdb..311ae9757 100644 --- a/tools/evil-spammer/go.mod +++ b/tools/evil-spammer/go.mod @@ -17,7 +17,7 @@ require ( github.com/iotaledger/hive.go/runtime v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 github.com/iotaledger/iota-core/tools/genesis-snapshot v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd + github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b github.com/mr-tron/base58 v1.2.0 go.uber.org/atomic v1.11.0 ) diff --git a/tools/evil-spammer/go.sum b/tools/evil-spammer/go.sum index 788425a80..88b37ed22 100644 --- a/tools/evil-spammer/go.sum +++ b/tools/evil-spammer/go.sum @@ -191,8 +191,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b918394 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b9183942b168/go.mod h1:sCLs3xrJRKcru6UE1WnlvQw8bib74yy2A7s+caMtoZY= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 h1:OpD3/NapP84/dDj/5gpvD/Mrf9hTTnd5XyKWR6wBBkk= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168/go.mod h1:l/F3cA/+67QdNj+sohv2v4HhmsdOcWScoA+sVYoAE4c= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b h1:gcDhylaGePNOgRkT8URD87rm6wAZeeUPTYQO3R+floE= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/tools/gendoc/go.mod b/tools/gendoc/go.mod index 2e9c9aeda..7bb08b6f6 100644 --- a/tools/gendoc/go.mod +++ b/tools/gendoc/go.mod @@ -68,7 +68,7 @@ require ( github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 // indirect github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b // indirect github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 // indirect - github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd // indirect + github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum index b0bb2215d..707fd4fc4 100644 --- a/tools/gendoc/go.sum +++ b/tools/gendoc/go.sum @@ -288,8 +288,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b h1:MeK4C github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230801163503-b55ade45411b/go.mod h1:zoeXg8m9SfQTQY/2713pkocWg0Fi8U5fnoffcqar2J8= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7 h1:AN2pAMyIhsfxMUWm3GX/FgastZFP5Q7lzfYboURzgus= github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230801163327-a72de1469de7/go.mod h1:Dg0D7hAtieN4EUc7duZk6iWSikv5egQisl/XXY7zRBI= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b h1:gcDhylaGePNOgRkT8URD87rm6wAZeeUPTYQO3R+floE= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= 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/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod index ff32ac6b0..a956644de 100644 --- a/tools/genesis-snapshot/go.mod +++ b/tools/genesis-snapshot/go.mod @@ -10,7 +10,7 @@ require ( github.com/iotaledger/hive.go/lo v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/hive.go/runtime v0.0.0-20230803080824-b9183942b168 github.com/iotaledger/iota-core v0.0.0-00010101000000-000000000000 - github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd + github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b github.com/mr-tron/base58 v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.11.0 diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum index 918fe5e1d..c27735000 100644 --- a/tools/genesis-snapshot/go.sum +++ b/tools/genesis-snapshot/go.sum @@ -47,8 +47,8 @@ github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b918394 github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20230803080824-b9183942b168/go.mod h1:sCLs3xrJRKcru6UE1WnlvQw8bib74yy2A7s+caMtoZY= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168 h1:OpD3/NapP84/dDj/5gpvD/Mrf9hTTnd5XyKWR6wBBkk= github.com/iotaledger/hive.go/stringify v0.0.0-20230803080824-b9183942b168/go.mod h1:l/F3cA/+67QdNj+sohv2v4HhmsdOcWScoA+sVYoAE4c= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd h1:U/YruBHmfpjB8tbdJgcl6Wz+zVN6e6EKa/jh9jiy90w= -github.com/iotaledger/iota.go/v4 v4.0.0-20230803124200-59ff31d1e6dd/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b h1:gcDhylaGePNOgRkT8URD87rm6wAZeeUPTYQO3R+floE= +github.com/iotaledger/iota.go/v4 v4.0.0-20230804061106-7e29753c193b/go.mod h1:BGmYQp0ZX6OidxsNzH+GbwF2oc4wbsCSNHVnt0P+vl0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=