From fed12d37289e37390f058706357b6937c6f0dbcf Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 13:50:20 -0400 Subject: [PATCH 01/10] move libs/celestia-app to third_party/celestia-app and remove libs directory --- go.mod | 4 ++- go.sum | 31 +++++++++++++++++++ .../celestia-app/appconsts/appconsts.go | 0 .../appconsts/consensus_consts.go | 0 .../celestia-app/namespace/consts.go | 2 +- .../celestia-app/namespace/namespace.go | 0 .../celestia-app/namespace/namespace_test.go | 0 .../celestia-app/namespace/random_blob.go | 0 .../namespace/random_namespace.go | 0 .../shares/compact_shares_test.go | 6 ++-- .../celestia-app/shares/doc.go | 0 .../celestia-app/shares/info_byte.go | 2 +- .../celestia-app/shares/info_byte_test.go | 0 .../shares/parse_compact_shares.go | 0 .../celestia-app/shares/reserved_bytes.go | 2 +- .../shares/reserved_bytes_test.go | 0 .../celestia-app/shares/share_builder.go | 4 +-- .../celestia-app/shares/share_builder_test.go | 4 +-- .../celestia-app/shares/share_sequence.go | 4 +-- .../shares/share_sequence_test.go | 4 +-- .../celestia-app/shares/shares.go | 4 +-- .../celestia-app/shares/shares_test.go | 4 +-- .../shares/split_compact_shares.go | 4 +-- .../shares/split_compact_shares_test.go | 4 +-- .../shares/testdata/sample-block.json | 0 .../celestia-app/shares/utils.go | 0 .../celestia-app/shares/utils_test.go | 2 +- .../celestia-app/testfactory/txs.go | 0 28 files changed, 57 insertions(+), 24 deletions(-) rename {libs => third_party}/celestia-app/appconsts/appconsts.go (100%) rename {libs => third_party}/celestia-app/appconsts/consensus_consts.go (100%) rename {libs => third_party}/celestia-app/namespace/consts.go (97%) rename {libs => third_party}/celestia-app/namespace/namespace.go (100%) rename {libs => third_party}/celestia-app/namespace/namespace_test.go (100%) rename {libs => third_party}/celestia-app/namespace/random_blob.go (100%) rename {libs => third_party}/celestia-app/namespace/random_namespace.go (100%) rename {libs => third_party}/celestia-app/shares/compact_shares_test.go (96%) rename {libs => third_party}/celestia-app/shares/doc.go (100%) rename {libs => third_party}/celestia-app/shares/info_byte.go (94%) rename {libs => third_party}/celestia-app/shares/info_byte_test.go (100%) rename {libs => third_party}/celestia-app/shares/parse_compact_shares.go (100%) rename {libs => third_party}/celestia-app/shares/reserved_bytes.go (94%) rename {libs => third_party}/celestia-app/shares/reserved_bytes_test.go (100%) rename {libs => third_party}/celestia-app/shares/share_builder.go (97%) rename {libs => third_party}/celestia-app/shares/share_builder_test.go (98%) rename {libs => third_party}/celestia-app/shares/share_sequence.go (94%) rename {libs => third_party}/celestia-app/shares/share_sequence_test.go (96%) rename {libs => third_party}/celestia-app/shares/shares.go (97%) rename {libs => third_party}/celestia-app/shares/shares_test.go (98%) rename {libs => third_party}/celestia-app/shares/split_compact_shares.go (98%) rename {libs => third_party}/celestia-app/shares/split_compact_shares_test.go (98%) rename {libs => third_party}/celestia-app/shares/testdata/sample-block.json (100%) rename {libs => third_party}/celestia-app/shares/utils.go (100%) rename {libs => third_party}/celestia-app/shares/utils_test.go (96%) rename {libs => third_party}/celestia-app/testfactory/txs.go (100%) diff --git a/go.mod b/go.mod index 505e196cc2..00e928df37 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/rollkit/rollkit -go 1.20 +go 1.21 + +toolchain go1.21.0 require ( github.com/celestiaorg/go-header v0.3.1 diff --git a/go.sum b/go.sum index 468a673681..cac9d2c7b5 100644 --- a/go.sum +++ b/go.sum @@ -78,11 +78,13 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= +github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -98,6 +100,7 @@ github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= @@ -171,6 +174,7 @@ github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/i github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= +github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= @@ -209,6 +213,7 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -249,6 +254,7 @@ github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHq github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU= +github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -292,6 +298,7 @@ github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQY github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +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/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= @@ -315,9 +322,11 @@ github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5O github.com/docker/cli v20.10.14+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM= +github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v24.0.2+incompatible h1:eATx+oLz9WdNVkQrr0qjQ8HvRJ4bOOxfzEo8R+dA3cg= +github.com/docker/docker v24.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -367,6 +376,7 @@ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -516,6 +526,7 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= @@ -609,6 +620,7 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= +github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU= github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= @@ -684,6 +696,7 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= @@ -806,6 +819,7 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn 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/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -826,6 +840,7 @@ github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-addr-util v0.1.0/go.mod h1:6I3ZYuFr2O/9D+SoyM0zEw0EF3YkldtTX406BpdQMqw= github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= @@ -891,6 +906,7 @@ github.com/libp2p/go-libp2p-testing v0.7.0/go.mod h1:OLbdn9DbgdMwv00v+tlp1l3oe2C github.com/libp2p/go-libp2p-testing v0.9.0/go.mod h1:Td7kbdkWqYTJYQGTwzlgXwaqldraIanyjuRiAbK/XQU= github.com/libp2p/go-libp2p-testing v0.9.2/go.mod h1:Td7kbdkWqYTJYQGTwzlgXwaqldraIanyjuRiAbK/XQU= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= +github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg= github.com/libp2p/go-libp2p-tls v0.3.0/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY= github.com/libp2p/go-libp2p-tls v0.4.1/go.mod h1:EKCixHEysLNDlLUoKxv+3f/Lp90O2EXNjTr0UQDnrIw= github.com/libp2p/go-libp2p-transport-upgrader v0.5.0/go.mod h1:Rc+XODlB3yce7dvFV4q/RmyJGsFcCZRkeZMu/Zdg0mo= @@ -1055,6 +1071,7 @@ github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdx github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= 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= @@ -1185,14 +1202,17 @@ github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je4 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= +github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runc v1.1.7 h1:y2EZDS8sNng4Ksf0GUYNhKbTShZJPJg1FiXJNH/uoCk= +github.com/opencontainers/runc v1.1.7/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= @@ -1214,6 +1234,7 @@ github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM= github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4= +github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= @@ -1338,6 +1359,7 @@ github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtD github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/protobuf v1.3.2-alpha.regen.4 h1:c9jEnU+xm6vqyrQe3M94UFWqiXxRIKKnqBOh2EACmBE= github.com/regen-network/protobuf v1.3.2-alpha.regen.4/go.mod h1:/J8/bR1T/NXyIdQDLUaq15LjNE83nRzkyrLAMcPewig= github.com/remyoudompheng/go-dbus v0.0.0-20121104212943-b7232d34b1d5/go.mod h1:+u151txRmLpwxBmpYn9z3d1sdJdjRPQpsXuYeY9jNls= @@ -1349,6 +1371,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= 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/rollkit/celestia-openrpc v0.2.0 h1:miSxBgiKtDBZk0dUgreAMubIPXU/Qtf9Q36+E7yZdeE= github.com/rollkit/celestia-openrpc v0.2.0/go.mod h1:0fNIcIMbG0ZceCoh4tINNhuzhmebUMDV0cJqZboe/wg= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= @@ -1407,6 +1430,7 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= github.com/sivchari/nosnakecase v1.5.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= github.com/sivchari/tenv v1.6.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= @@ -1509,8 +1533,11 @@ github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= +github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= +github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= +github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= @@ -1575,6 +1602,7 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= gitlab.com/NebulousLabs/errors v0.0.0-20200929122200-06c536cf6975 h1:L/ENs/Ar1bFzUeKx6m3XjlmBgIUlykX9dzvp5k9NGxc= +gitlab.com/NebulousLabs/errors v0.0.0-20200929122200-06c536cf6975/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 h1:dizWJqTWjwyD8KGcMOwgrkqu1JIkofYgKkmDeNE7oAs= gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40/go.mod h1:rOnSnoRyxMI3fe/7KIbVcsHRGxe30OONv8dEgo+vCfA= gitlab.com/bosi/decorder v0.2.2/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= @@ -1623,6 +1651,7 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= 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/fx v1.20.0 h1:ZMC/pnRvhsthOZh9MZjMq5U8Or3mA9zBSPaLnzs3ihQ= @@ -1632,6 +1661,7 @@ go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpK go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= 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.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= @@ -2381,6 +2411,7 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/libs/celestia-app/appconsts/appconsts.go b/third_party/celestia-app/appconsts/appconsts.go similarity index 100% rename from libs/celestia-app/appconsts/appconsts.go rename to third_party/celestia-app/appconsts/appconsts.go diff --git a/libs/celestia-app/appconsts/consensus_consts.go b/third_party/celestia-app/appconsts/consensus_consts.go similarity index 100% rename from libs/celestia-app/appconsts/consensus_consts.go rename to third_party/celestia-app/appconsts/consensus_consts.go diff --git a/libs/celestia-app/namespace/consts.go b/third_party/celestia-app/namespace/consts.go similarity index 97% rename from libs/celestia-app/namespace/consts.go rename to third_party/celestia-app/namespace/consts.go index 51795f0f19..bcfed190d7 100644 --- a/libs/celestia-app/namespace/consts.go +++ b/third_party/celestia-app/namespace/consts.go @@ -4,7 +4,7 @@ import ( "bytes" "math" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" ) const ( diff --git a/libs/celestia-app/namespace/namespace.go b/third_party/celestia-app/namespace/namespace.go similarity index 100% rename from libs/celestia-app/namespace/namespace.go rename to third_party/celestia-app/namespace/namespace.go diff --git a/libs/celestia-app/namespace/namespace_test.go b/third_party/celestia-app/namespace/namespace_test.go similarity index 100% rename from libs/celestia-app/namespace/namespace_test.go rename to third_party/celestia-app/namespace/namespace_test.go diff --git a/libs/celestia-app/namespace/random_blob.go b/third_party/celestia-app/namespace/random_blob.go similarity index 100% rename from libs/celestia-app/namespace/random_blob.go rename to third_party/celestia-app/namespace/random_blob.go diff --git a/libs/celestia-app/namespace/random_namespace.go b/third_party/celestia-app/namespace/random_namespace.go similarity index 100% rename from libs/celestia-app/namespace/random_namespace.go rename to third_party/celestia-app/namespace/random_namespace.go diff --git a/libs/celestia-app/shares/compact_shares_test.go b/third_party/celestia-app/shares/compact_shares_test.go similarity index 96% rename from libs/celestia-app/shares/compact_shares_test.go rename to third_party/celestia-app/shares/compact_shares_test.go index 599b6f042d..18c66a4907 100644 --- a/libs/celestia-app/shares/compact_shares_test.go +++ b/third_party/celestia-app/shares/compact_shares_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" - "github.com/rollkit/rollkit/libs/celestia-app/testfactory" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/testfactory" ) func SplitTxs(txs coretypes.Txs) (txShares []Share, err error) { diff --git a/libs/celestia-app/shares/doc.go b/third_party/celestia-app/shares/doc.go similarity index 100% rename from libs/celestia-app/shares/doc.go rename to third_party/celestia-app/shares/doc.go diff --git a/libs/celestia-app/shares/info_byte.go b/third_party/celestia-app/shares/info_byte.go similarity index 94% rename from libs/celestia-app/shares/info_byte.go rename to third_party/celestia-app/shares/info_byte.go index ae954e7b02..224a1ddabc 100644 --- a/libs/celestia-app/shares/info_byte.go +++ b/third_party/celestia-app/shares/info_byte.go @@ -3,7 +3,7 @@ package shares import ( "fmt" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" ) // InfoByte is a byte with the following structure: the first 7 bits are diff --git a/libs/celestia-app/shares/info_byte_test.go b/third_party/celestia-app/shares/info_byte_test.go similarity index 100% rename from libs/celestia-app/shares/info_byte_test.go rename to third_party/celestia-app/shares/info_byte_test.go diff --git a/libs/celestia-app/shares/parse_compact_shares.go b/third_party/celestia-app/shares/parse_compact_shares.go similarity index 100% rename from libs/celestia-app/shares/parse_compact_shares.go rename to third_party/celestia-app/shares/parse_compact_shares.go diff --git a/libs/celestia-app/shares/reserved_bytes.go b/third_party/celestia-app/shares/reserved_bytes.go similarity index 94% rename from libs/celestia-app/shares/reserved_bytes.go rename to third_party/celestia-app/shares/reserved_bytes.go index 51a296b526..9fd0580f93 100644 --- a/libs/celestia-app/shares/reserved_bytes.go +++ b/third_party/celestia-app/shares/reserved_bytes.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" ) // NewReservedBytes returns a byte slice of length diff --git a/libs/celestia-app/shares/reserved_bytes_test.go b/third_party/celestia-app/shares/reserved_bytes_test.go similarity index 100% rename from libs/celestia-app/shares/reserved_bytes_test.go rename to third_party/celestia-app/shares/reserved_bytes_test.go diff --git a/libs/celestia-app/shares/share_builder.go b/third_party/celestia-app/shares/share_builder.go similarity index 97% rename from libs/celestia-app/shares/share_builder.go rename to third_party/celestia-app/shares/share_builder.go index bfa9eeb92a..ac88a686b9 100644 --- a/libs/celestia-app/shares/share_builder.go +++ b/third_party/celestia-app/shares/share_builder.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "errors" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) type Builder struct { diff --git a/libs/celestia-app/shares/share_builder_test.go b/third_party/celestia-app/shares/share_builder_test.go similarity index 98% rename from libs/celestia-app/shares/share_builder_test.go rename to third_party/celestia-app/shares/share_builder_test.go index 9a0c129226..b356fd7095 100644 --- a/libs/celestia-app/shares/share_builder_test.go +++ b/third_party/celestia-app/shares/share_builder_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) func TestShareBuilderIsEmptyShare(t *testing.T) { diff --git a/libs/celestia-app/shares/share_sequence.go b/third_party/celestia-app/shares/share_sequence.go similarity index 94% rename from libs/celestia-app/shares/share_sequence.go rename to third_party/celestia-app/shares/share_sequence.go index a79136f822..b5bf48fdd4 100644 --- a/libs/celestia-app/shares/share_sequence.go +++ b/third_party/celestia-app/shares/share_sequence.go @@ -3,8 +3,8 @@ package shares import ( "fmt" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) // ShareSequence represents a contiguous sequence of shares that are part of the diff --git a/libs/celestia-app/shares/share_sequence_test.go b/third_party/celestia-app/shares/share_sequence_test.go similarity index 96% rename from libs/celestia-app/shares/share_sequence_test.go rename to third_party/celestia-app/shares/share_sequence_test.go index 7cb41d876c..79f851b983 100644 --- a/libs/celestia-app/shares/share_sequence_test.go +++ b/third_party/celestia-app/shares/share_sequence_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) func TestShareSequenceRawData(t *testing.T) { diff --git a/libs/celestia-app/shares/shares.go b/third_party/celestia-app/shares/shares.go similarity index 97% rename from libs/celestia-app/shares/shares.go rename to third_party/celestia-app/shares/shares.go index 7fd0f7053a..c07d001b4c 100644 --- a/libs/celestia-app/shares/shares.go +++ b/third_party/celestia-app/shares/shares.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "fmt" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) // Share contains the raw share data (including namespace ID). diff --git a/libs/celestia-app/shares/shares_test.go b/third_party/celestia-app/shares/shares_test.go similarity index 98% rename from libs/celestia-app/shares/shares_test.go rename to third_party/celestia-app/shares/shares_test.go index c6a00912a2..e5f5292710 100644 --- a/libs/celestia-app/shares/shares_test.go +++ b/third_party/celestia-app/shares/shares_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) // // TestPadFirstIndexedBlob ensures that we are adding padding to the first share diff --git a/libs/celestia-app/shares/split_compact_shares.go b/third_party/celestia-app/shares/split_compact_shares.go similarity index 98% rename from libs/celestia-app/shares/split_compact_shares.go rename to third_party/celestia-app/shares/split_compact_shares.go index fb989db372..1d944e9b9f 100644 --- a/libs/celestia-app/shares/split_compact_shares.go +++ b/third_party/celestia-app/shares/split_compact_shares.go @@ -6,8 +6,8 @@ import ( coretypes "github.com/cometbft/cometbft/types" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) type ShareRange struct { diff --git a/libs/celestia-app/shares/split_compact_shares_test.go b/third_party/celestia-app/shares/split_compact_shares_test.go similarity index 98% rename from libs/celestia-app/shares/split_compact_shares_test.go rename to third_party/celestia-app/shares/split_compact_shares_test.go index c613dba008..77601ecdfa 100644 --- a/libs/celestia-app/shares/split_compact_shares_test.go +++ b/third_party/celestia-app/shares/split_compact_shares_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/rollkit/rollkit/libs/celestia-app/appconsts" - appns "github.com/rollkit/rollkit/libs/celestia-app/namespace" + "github.com/rollkit/rollkit/third_party/celestia-app/appconsts" + appns "github.com/rollkit/rollkit/third_party/celestia-app/namespace" ) // fillShare returns a share filled with filler so that the share length diff --git a/libs/celestia-app/shares/testdata/sample-block.json b/third_party/celestia-app/shares/testdata/sample-block.json similarity index 100% rename from libs/celestia-app/shares/testdata/sample-block.json rename to third_party/celestia-app/shares/testdata/sample-block.json diff --git a/libs/celestia-app/shares/utils.go b/third_party/celestia-app/shares/utils.go similarity index 100% rename from libs/celestia-app/shares/utils.go rename to third_party/celestia-app/shares/utils.go diff --git a/libs/celestia-app/shares/utils_test.go b/third_party/celestia-app/shares/utils_test.go similarity index 96% rename from libs/celestia-app/shares/utils_test.go rename to third_party/celestia-app/shares/utils_test.go index 576a66ce84..0e6f97fd38 100644 --- a/libs/celestia-app/shares/utils_test.go +++ b/third_party/celestia-app/shares/utils_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/rollkit/rollkit/libs/celestia-app/testfactory" + "github.com/rollkit/rollkit/third_party/celestia-app/testfactory" ) // func FuzzBlobSharesUsed(f *testing.F) { diff --git a/libs/celestia-app/testfactory/txs.go b/third_party/celestia-app/testfactory/txs.go similarity index 100% rename from libs/celestia-app/testfactory/txs.go rename to third_party/celestia-app/testfactory/txs.go From bf41c903e34d9ce23b17ce81188d2421452f35b8 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 13:54:12 -0400 Subject: [PATCH 02/10] create test directory and move mocks under test directory --- node/full_client_test.go | 2 +- node/full_node_integration_test.go | 2 +- node/full_node_test.go | 2 +- rpc/json/test_helpers.go | 2 +- state/executor_test.go | 2 +- {mocks => test/mocks}/Application.go | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename {mocks => test/mocks}/Application.go (100%) diff --git a/node/full_client_test.go b/node/full_client_test.go index aea618af51..78c72bbf53 100644 --- a/node/full_client_test.go +++ b/node/full_client_test.go @@ -32,8 +32,8 @@ import ( "github.com/rollkit/rollkit/conv" abciconv "github.com/rollkit/rollkit/conv/abci" mockda "github.com/rollkit/rollkit/da/mock" - "github.com/rollkit/rollkit/mocks" "github.com/rollkit/rollkit/store" + "github.com/rollkit/rollkit/test/mocks" "github.com/rollkit/rollkit/types" ) diff --git a/node/full_node_integration_test.go b/node/full_node_integration_test.go index 8833256a2e..7ff446548f 100644 --- a/node/full_node_integration_test.go +++ b/node/full_node_integration_test.go @@ -25,9 +25,9 @@ import ( "github.com/rollkit/rollkit/config" mockda "github.com/rollkit/rollkit/da/mock" "github.com/rollkit/rollkit/log/test" - "github.com/rollkit/rollkit/mocks" "github.com/rollkit/rollkit/p2p" "github.com/rollkit/rollkit/store" + "github.com/rollkit/rollkit/test/mocks" "github.com/rollkit/rollkit/types" testutils "github.com/celestiaorg/utils/test" diff --git a/node/full_node_test.go b/node/full_node_test.go index 1869180167..3ca1b1a7dd 100644 --- a/node/full_node_test.go +++ b/node/full_node_test.go @@ -22,7 +22,7 @@ import ( "github.com/rollkit/rollkit/config" "github.com/rollkit/rollkit/mempool" - "github.com/rollkit/rollkit/mocks" + "github.com/rollkit/rollkit/test/mocks" ) // simply check that node is starting and stopping without panicking diff --git a/rpc/json/test_helpers.go b/rpc/json/test_helpers.go index b5c4d859be..d398612183 100644 --- a/rpc/json/test_helpers.go +++ b/rpc/json/test_helpers.go @@ -19,8 +19,8 @@ import ( "github.com/rollkit/rollkit/config" "github.com/rollkit/rollkit/conv" - "github.com/rollkit/rollkit/mocks" "github.com/rollkit/rollkit/node" + "github.com/rollkit/rollkit/test/mocks" ) const ( diff --git a/state/executor_test.go b/state/executor_test.go index c573baea0a..147e616b11 100644 --- a/state/executor_test.go +++ b/state/executor_test.go @@ -22,7 +22,7 @@ import ( "github.com/rollkit/rollkit/mempool" mempoolv1 "github.com/rollkit/rollkit/mempool/v1" - "github.com/rollkit/rollkit/mocks" + "github.com/rollkit/rollkit/test/mocks" "github.com/rollkit/rollkit/types" ) diff --git a/mocks/Application.go b/test/mocks/Application.go similarity index 100% rename from mocks/Application.go rename to test/mocks/Application.go From 890f9a07caf446da320c3d002d5a0d0be7ef0ae8 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 14:01:33 -0400 Subject: [PATCH 03/10] move log/logger.go to third_party and log/test/logger.go to test/log/logger.go --- block/manager.go | 2 +- block/manager_test.go | 2 +- da/celestia/celestia.go | 2 +- da/celestia/mock/server.go | 2 +- da/da.go | 2 +- da/grpc/grpc.go | 2 +- da/mock/mock.go | 2 +- da/test/da_test.go | 2 +- node/full_node_integration_test.go | 2 +- p2p/client.go | 2 +- p2p/client_test.go | 2 +- p2p/gossip.go | 2 +- p2p/utils_test.go | 2 +- rpc/json/handler.go | 2 +- rpc/json/service.go | 2 +- rpc/json/ws.go | 2 +- state/executor.go | 2 +- {log/test => test/log}/loggers.go | 0 {log => third_party/log}/logger.go | 0 19 files changed, 17 insertions(+), 17 deletions(-) rename {log/test => test/log}/loggers.go (100%) rename {log => third_party/log}/logger.go (100%) diff --git a/block/manager.go b/block/manager.go index 39c4b94c52..a462f591e8 100644 --- a/block/manager.go +++ b/block/manager.go @@ -21,10 +21,10 @@ import ( "github.com/rollkit/rollkit/config" "github.com/rollkit/rollkit/da" - "github.com/rollkit/rollkit/log" "github.com/rollkit/rollkit/mempool" "github.com/rollkit/rollkit/state" "github.com/rollkit/rollkit/store" + "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" ) diff --git a/block/manager_test.go b/block/manager_test.go index 5591298b84..70d9939491 100644 --- a/block/manager_test.go +++ b/block/manager_test.go @@ -15,8 +15,8 @@ import ( "github.com/rollkit/rollkit/config" "github.com/rollkit/rollkit/da" mockda "github.com/rollkit/rollkit/da/mock" - "github.com/rollkit/rollkit/log/test" "github.com/rollkit/rollkit/store" + test "github.com/rollkit/rollkit/test/log" "github.com/rollkit/rollkit/types" ) diff --git a/da/celestia/celestia.go b/da/celestia/celestia.go index 0ddda1d5a5..84a5ed9b6c 100644 --- a/da/celestia/celestia.go +++ b/da/celestia/celestia.go @@ -16,7 +16,7 @@ import ( openrpcns "github.com/rollkit/celestia-openrpc/types/namespace" "github.com/rollkit/rollkit/da" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" pb "github.com/rollkit/rollkit/types/pb/rollkit" ) diff --git a/da/celestia/mock/server.go b/da/celestia/mock/server.go index 21f7067fc0..49cc8b82fd 100644 --- a/da/celestia/mock/server.go +++ b/da/celestia/mock/server.go @@ -14,8 +14,8 @@ import ( "github.com/rollkit/celestia-openrpc/types/blob" "github.com/rollkit/celestia-openrpc/types/header" mockda "github.com/rollkit/rollkit/da/mock" - "github.com/rollkit/rollkit/log" "github.com/rollkit/rollkit/store" + "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" ) diff --git a/da/da.go b/da/da.go index e5889ad74a..89b6a986c7 100644 --- a/da/da.go +++ b/da/da.go @@ -6,7 +6,7 @@ import ( ds "github.com/ipfs/go-datastore" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" ) diff --git a/da/grpc/grpc.go b/da/grpc/grpc.go index 48608f9f59..bc5ec8123b 100644 --- a/da/grpc/grpc.go +++ b/da/grpc/grpc.go @@ -10,7 +10,7 @@ import ( ds "github.com/ipfs/go-datastore" "github.com/rollkit/rollkit/da" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" "github.com/rollkit/rollkit/types/pb/dalc" "github.com/rollkit/rollkit/types/pb/rollkit" diff --git a/da/mock/mock.go b/da/mock/mock.go index 95565e3e81..b616385110 100644 --- a/da/mock/mock.go +++ b/da/mock/mock.go @@ -14,8 +14,8 @@ import ( "github.com/rollkit/celestia-openrpc/types/core" "github.com/rollkit/rollkit/da" - "github.com/rollkit/rollkit/log" "github.com/rollkit/rollkit/store" + "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" ) diff --git a/da/test/da_test.go b/da/test/da_test.go index f3bab33cae..d5f82d24f3 100644 --- a/da/test/da_test.go +++ b/da/test/da_test.go @@ -24,8 +24,8 @@ import ( "github.com/rollkit/rollkit/da/grpc/mockserv" "github.com/rollkit/rollkit/da/mock" "github.com/rollkit/rollkit/da/registry" - "github.com/rollkit/rollkit/log/test" "github.com/rollkit/rollkit/store" + test "github.com/rollkit/rollkit/test/log" "github.com/rollkit/rollkit/types" ) diff --git a/node/full_node_integration_test.go b/node/full_node_integration_test.go index 7ff446548f..1278188be6 100644 --- a/node/full_node_integration_test.go +++ b/node/full_node_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/rollkit/rollkit/config" mockda "github.com/rollkit/rollkit/da/mock" - "github.com/rollkit/rollkit/log/test" "github.com/rollkit/rollkit/p2p" "github.com/rollkit/rollkit/store" + test "github.com/rollkit/rollkit/test/log" "github.com/rollkit/rollkit/test/mocks" "github.com/rollkit/rollkit/types" diff --git a/p2p/client.go b/p2p/client.go index 06429a6409..619b5773e8 100644 --- a/p2p/client.go +++ b/p2p/client.go @@ -28,7 +28,7 @@ import ( tmcrypto "github.com/tendermint/tendermint/crypto" "github.com/rollkit/rollkit/config" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" ) // TODO(tzdybal): refactor to configuration parameters diff --git a/p2p/client_test.go b/p2p/client_test.go index d62913e383..83af04fc39 100644 --- a/p2p/client_test.go +++ b/p2p/client_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/require" "github.com/rollkit/rollkit/config" - "github.com/rollkit/rollkit/log/test" + test "github.com/rollkit/rollkit/test/log" ) func TestClientStartup(t *testing.T) { diff --git a/p2p/gossip.go b/p2p/gossip.go index 206a7fe529..a5489ef1c1 100644 --- a/p2p/gossip.go +++ b/p2p/gossip.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/peer" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" ) // GossipMessage represents message gossiped via P2P network (e.g. transaction, Block etc). diff --git a/p2p/utils_test.go b/p2p/utils_test.go index 027901b4f7..38e8505f5a 100644 --- a/p2p/utils_test.go +++ b/p2p/utils_test.go @@ -18,7 +18,7 @@ import ( "go.uber.org/multierr" "github.com/rollkit/rollkit/config" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" ) type testNet []*Client diff --git a/rpc/json/handler.go b/rpc/json/handler.go index 9ee4309d71..63271c03a0 100644 --- a/rpc/json/handler.go +++ b/rpc/json/handler.go @@ -15,7 +15,7 @@ import ( "github.com/gorilla/rpc/v2" "github.com/gorilla/rpc/v2/json2" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" ) type handler struct { diff --git a/rpc/json/service.go b/rpc/json/service.go index 8bc4c6e228..9a176f0d8a 100644 --- a/rpc/json/service.go +++ b/rpc/json/service.go @@ -12,7 +12,7 @@ import ( ctypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/gorilla/rpc/v2/json2" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" ) // GetHTTPHandler returns handler configured to serve Tendermint-compatible RPC. diff --git a/rpc/json/ws.go b/rpc/json/ws.go index 6dcbe42dc2..68d57e5d83 100644 --- a/rpc/json/ws.go +++ b/rpc/json/ws.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/websocket" - "github.com/rollkit/rollkit/log" + "github.com/rollkit/rollkit/third_party/log" ) type wsConn struct { diff --git a/state/executor.go b/state/executor.go index 1899f76bb9..6a2f4d3b9b 100644 --- a/state/executor.go +++ b/state/executor.go @@ -17,8 +17,8 @@ import ( "go.uber.org/multierr" abciconv "github.com/rollkit/rollkit/conv/abci" - "github.com/rollkit/rollkit/log" "github.com/rollkit/rollkit/mempool" + "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" ) diff --git a/log/test/loggers.go b/test/log/loggers.go similarity index 100% rename from log/test/loggers.go rename to test/log/loggers.go diff --git a/log/logger.go b/third_party/log/logger.go similarity index 100% rename from log/logger.go rename to third_party/log/logger.go From 4ac6c2ed44c59f8c6b3fd5d9699d82d773cedc2d Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 14:05:59 -0400 Subject: [PATCH 04/10] move docs/specifications to specs/src/specs and docs/lazy-adr to specs/lazy-adr --- {docs => specs}/lazy-adr/adr-001-node-interface.md | 0 {docs => specs}/lazy-adr/adr-002-mempool.md | 0 {docs => specs}/lazy-adr/adr-003-peer-discovery.md | 0 {docs => specs}/lazy-adr/adr-004-core-types.md | 0 {docs => specs}/lazy-adr/adr-005-serialization.md | 0 {docs => specs}/lazy-adr/adr-006-da-interface.md | 0 .../lazy-adr/adr-007-header-commit-to-shares.md | 0 .../adr-008-mempool-optimint-light-client.md | 0 .../lazy-adr/adr-009-state-fraud-proofs.md | 0 {docs => specs}/lazy-adr/adr-template.md | 0 .../lazy-adr/figures/header_shares_commit.jpg | Bin specs/src/SUMMARY.md | 1 + .../src/specs}/dependency-graph.drawio.svg | 0 .../src/specs}/rollkit-dependency-graph.md | 0 14 files changed, 1 insertion(+) rename {docs => specs}/lazy-adr/adr-001-node-interface.md (100%) rename {docs => specs}/lazy-adr/adr-002-mempool.md (100%) rename {docs => specs}/lazy-adr/adr-003-peer-discovery.md (100%) rename {docs => specs}/lazy-adr/adr-004-core-types.md (100%) rename {docs => specs}/lazy-adr/adr-005-serialization.md (100%) rename {docs => specs}/lazy-adr/adr-006-da-interface.md (100%) rename {docs => specs}/lazy-adr/adr-007-header-commit-to-shares.md (100%) rename {docs => specs}/lazy-adr/adr-008-mempool-optimint-light-client.md (100%) rename {docs => specs}/lazy-adr/adr-009-state-fraud-proofs.md (100%) rename {docs => specs}/lazy-adr/adr-template.md (100%) rename {docs => specs}/lazy-adr/figures/header_shares_commit.jpg (100%) rename {docs/specification => specs/src/specs}/dependency-graph.drawio.svg (100%) rename {docs/specification => specs/src/specs}/rollkit-dependency-graph.md (100%) diff --git a/docs/lazy-adr/adr-001-node-interface.md b/specs/lazy-adr/adr-001-node-interface.md similarity index 100% rename from docs/lazy-adr/adr-001-node-interface.md rename to specs/lazy-adr/adr-001-node-interface.md diff --git a/docs/lazy-adr/adr-002-mempool.md b/specs/lazy-adr/adr-002-mempool.md similarity index 100% rename from docs/lazy-adr/adr-002-mempool.md rename to specs/lazy-adr/adr-002-mempool.md diff --git a/docs/lazy-adr/adr-003-peer-discovery.md b/specs/lazy-adr/adr-003-peer-discovery.md similarity index 100% rename from docs/lazy-adr/adr-003-peer-discovery.md rename to specs/lazy-adr/adr-003-peer-discovery.md diff --git a/docs/lazy-adr/adr-004-core-types.md b/specs/lazy-adr/adr-004-core-types.md similarity index 100% rename from docs/lazy-adr/adr-004-core-types.md rename to specs/lazy-adr/adr-004-core-types.md diff --git a/docs/lazy-adr/adr-005-serialization.md b/specs/lazy-adr/adr-005-serialization.md similarity index 100% rename from docs/lazy-adr/adr-005-serialization.md rename to specs/lazy-adr/adr-005-serialization.md diff --git a/docs/lazy-adr/adr-006-da-interface.md b/specs/lazy-adr/adr-006-da-interface.md similarity index 100% rename from docs/lazy-adr/adr-006-da-interface.md rename to specs/lazy-adr/adr-006-da-interface.md diff --git a/docs/lazy-adr/adr-007-header-commit-to-shares.md b/specs/lazy-adr/adr-007-header-commit-to-shares.md similarity index 100% rename from docs/lazy-adr/adr-007-header-commit-to-shares.md rename to specs/lazy-adr/adr-007-header-commit-to-shares.md diff --git a/docs/lazy-adr/adr-008-mempool-optimint-light-client.md b/specs/lazy-adr/adr-008-mempool-optimint-light-client.md similarity index 100% rename from docs/lazy-adr/adr-008-mempool-optimint-light-client.md rename to specs/lazy-adr/adr-008-mempool-optimint-light-client.md diff --git a/docs/lazy-adr/adr-009-state-fraud-proofs.md b/specs/lazy-adr/adr-009-state-fraud-proofs.md similarity index 100% rename from docs/lazy-adr/adr-009-state-fraud-proofs.md rename to specs/lazy-adr/adr-009-state-fraud-proofs.md diff --git a/docs/lazy-adr/adr-template.md b/specs/lazy-adr/adr-template.md similarity index 100% rename from docs/lazy-adr/adr-template.md rename to specs/lazy-adr/adr-template.md diff --git a/docs/lazy-adr/figures/header_shares_commit.jpg b/specs/lazy-adr/figures/header_shares_commit.jpg similarity index 100% rename from docs/lazy-adr/figures/header_shares_commit.jpg rename to specs/lazy-adr/figures/header_shares_commit.jpg diff --git a/specs/src/SUMMARY.md b/specs/src/SUMMARY.md index 7faa8d2274..3c32e4f7a0 100644 --- a/specs/src/SUMMARY.md +++ b/specs/src/SUMMARY.md @@ -3,6 +3,7 @@ [Introduction](README.md) - [Template](./specs/template.md) +- [Dependency Graph](./specs/rollkist-dependency-graph.md) - [Block](./specs/block.md) - [DA](./specs/da.md) - [Mempool](./specs/mempool.md) diff --git a/docs/specification/dependency-graph.drawio.svg b/specs/src/specs/dependency-graph.drawio.svg similarity index 100% rename from docs/specification/dependency-graph.drawio.svg rename to specs/src/specs/dependency-graph.drawio.svg diff --git a/docs/specification/rollkit-dependency-graph.md b/specs/src/specs/rollkit-dependency-graph.md similarity index 100% rename from docs/specification/rollkit-dependency-graph.md rename to specs/src/specs/rollkit-dependency-graph.md From cb4f9ef2bc970660aebeb48ff57f182b1e4ba933 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 14:09:43 -0400 Subject: [PATCH 05/10] move mockserv Dockerfile to test directory --- Makefile | 2 +- {docker => test/docker}/mockserv.Dockerfile | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {docker => test/docker}/mockserv.Dockerfile (100%) diff --git a/Makefile b/Makefile index 8f6b79122f..0dc8c83abc 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ lint: vet @echo "--> Running markdownlint" @markdownlint --config .markdownlint.yaml '**/*.md' @echo "--> Running hadolint" - @hadolint docker/mockserv.Dockerfile + @hadolint test/docker/mockserv.Dockerfile @echo "--> Running yamllint" @yamllint --no-warnings . -c .yamllint.yml diff --git a/docker/mockserv.Dockerfile b/test/docker/mockserv.Dockerfile similarity index 100% rename from docker/mockserv.Dockerfile rename to test/docker/mockserv.Dockerfile From c23ee11c3eababfc37135db3ebe37c6beff4845f Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 14:22:36 -0400 Subject: [PATCH 06/10] remove conv directory and put the small amount of code in the appropriate places --- {conv => config}/addr.go | 9 +++++--- {conv => config}/addr_test.go | 26 ++++++++++------------ config/config.go | 26 ++++++++++++++++++++++ config/config_test.go | 25 +++++++++++++++++++++ conv/config.go | 31 -------------------------- conv/config_test.go | 35 ------------------------------ conv/errors.go | 7 ------ {conv => node}/crypto.go | 2 +- {conv => node}/crypto_test.go | 2 +- node/full_client.go | 2 +- node/full_client_test.go | 5 ++--- node/test_helpers.go | 3 +-- rpc/json/test_helpers.go | 3 +-- state/executor.go | 2 +- {conv => types}/abci/block.go | 0 {conv => types}/abci/block_test.go | 0 16 files changed, 77 insertions(+), 101 deletions(-) rename {conv => config}/addr.go (88%) rename {conv => config}/addr_test.go (78%) delete mode 100644 conv/config.go delete mode 100644 conv/config_test.go delete mode 100644 conv/errors.go rename {conv => node}/crypto.go (98%) rename {conv => node}/crypto_test.go (98%) rename {conv => types}/abci/block.go (100%) rename {conv => types}/abci/block_test.go (100%) diff --git a/conv/addr.go b/config/addr.go similarity index 88% rename from conv/addr.go rename to config/addr.go index 16f1c0a979..6bc60566f5 100644 --- a/conv/addr.go +++ b/config/addr.go @@ -1,15 +1,18 @@ -package conv +package config import ( + "errors" "strings" "github.com/multiformats/go-multiaddr" +) - "github.com/rollkit/rollkit/config" +var ( + errInvalidAddress = errors.New("invalid address format, expected [protocol://][@]:") ) // TranslateAddresses updates conf by changing Cosmos-style addresses to Multiaddr format. -func TranslateAddresses(conf *config.NodeConfig) error { +func TranslateAddresses(conf *NodeConfig) error { if conf.P2P.ListenAddress != "" { addr, err := GetMultiAddr(conf.P2P.ListenAddress) if err != nil { diff --git a/conv/addr_test.go b/config/addr_test.go similarity index 78% rename from conv/addr_test.go rename to config/addr_test.go index 839f6ded8a..c6e0d76235 100644 --- a/conv/addr_test.go +++ b/config/addr_test.go @@ -1,4 +1,4 @@ -package conv +package config import ( "strings" @@ -6,8 +6,6 @@ import ( "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/assert" - - "github.com/rollkit/rollkit/config" ) func TestTranslateAddresses(t *testing.T) { @@ -19,33 +17,33 @@ func TestTranslateAddresses(t *testing.T) { cases := []struct { name string - input config.NodeConfig - expected config.NodeConfig + input NodeConfig + expected NodeConfig expectedErr string }{ - {"empty", config.NodeConfig{}, config.NodeConfig{}, ""}, + {"empty", NodeConfig{}, NodeConfig{}, ""}, { "valid listen address", - config.NodeConfig{P2P: config.P2PConfig{ListenAddress: validCosmos}}, - config.NodeConfig{P2P: config.P2PConfig{ListenAddress: validRollkit}}, + NodeConfig{P2P: P2PConfig{ListenAddress: validCosmos}}, + NodeConfig{P2P: P2PConfig{ListenAddress: validRollkit}}, "", }, { "valid seed address", - config.NodeConfig{P2P: config.P2PConfig{Seeds: validCosmos + "," + validCosmos}}, - config.NodeConfig{P2P: config.P2PConfig{Seeds: validRollkit + "," + validRollkit}}, + NodeConfig{P2P: P2PConfig{Seeds: validCosmos + "," + validCosmos}}, + NodeConfig{P2P: P2PConfig{Seeds: validRollkit + "," + validRollkit}}, "", }, { "invalid listen address", - config.NodeConfig{P2P: config.P2PConfig{ListenAddress: invalidCosmos}}, - config.NodeConfig{}, + NodeConfig{P2P: P2PConfig{ListenAddress: invalidCosmos}}, + NodeConfig{}, errInvalidAddress.Error(), }, { "invalid seed address", - config.NodeConfig{P2P: config.P2PConfig{Seeds: validCosmos + "," + invalidCosmos}}, - config.NodeConfig{}, + NodeConfig{P2P: P2PConfig{Seeds: validCosmos + "," + invalidCosmos}}, + NodeConfig{}, errInvalidAddress.Error(), }, } diff --git a/config/config.go b/config/config.go index b3f67034c0..346e36fbe7 100644 --- a/config/config.go +++ b/config/config.go @@ -4,6 +4,8 @@ import ( "encoding/hex" "time" + cmcfg "github.com/cometbft/cometbft/config" + "github.com/spf13/cobra" "github.com/spf13/viper" @@ -56,6 +58,30 @@ type BlockManagerConfig struct { NamespaceID types.NamespaceID `mapstructure:"namespace_id"` } +// GetNodeConfig translates Tendermint's configuration into Rollkit configuration. +// +// This method only translates configuration, and doesn't verify it. If some option is missing in Tendermint's +// config, it's skipped during translation. +func GetNodeConfig(nodeConf *NodeConfig, cmConf *cmcfg.Config) { + if cmConf != nil { + nodeConf.RootDir = cmConf.RootDir + nodeConf.DBPath = cmConf.DBPath + if cmConf.P2P != nil { + nodeConf.P2P.ListenAddress = cmConf.P2P.ListenAddress + nodeConf.P2P.Seeds = cmConf.P2P.Seeds + } + if cmConf.RPC != nil { + nodeConf.RPC.ListenAddress = cmConf.RPC.ListenAddress + nodeConf.RPC.CORSAllowedOrigins = cmConf.RPC.CORSAllowedOrigins + nodeConf.RPC.CORSAllowedMethods = cmConf.RPC.CORSAllowedMethods + nodeConf.RPC.CORSAllowedHeaders = cmConf.RPC.CORSAllowedHeaders + nodeConf.RPC.MaxOpenConnections = cmConf.RPC.MaxOpenConnections + nodeConf.RPC.TLSCertFile = cmConf.RPC.TLSCertFile + nodeConf.RPC.TLSKeyFile = cmConf.RPC.TLSKeyFile + } + } +} + // GetViperConfig reads configuration parameters from Viper instance. // // This method is called in cosmos-sdk. diff --git a/config/config_test.go b/config/config_test.go index 68b383d447..109c0ad2cd 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -4,6 +4,8 @@ import ( "testing" "time" + cmcfg "github.com/cometbft/cometbft/config" + "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/stretchr/testify/assert" @@ -11,6 +13,29 @@ import ( "github.com/rollkit/rollkit/types" ) +func TestGetNodeConfig(t *testing.T) { + t.Parallel() + + cases := []struct { + name string + input *cmcfg.Config + expected NodeConfig + }{ + {"empty", nil, NodeConfig{}}, + {"Seeds", &cmcfg.Config{P2P: &cmcfg.P2PConfig{Seeds: "seeds"}}, NodeConfig{P2P: P2PConfig{Seeds: "seeds"}}}, + {"ListenAddress", &cmcfg.Config{P2P: &cmcfg.P2PConfig{ListenAddress: "127.0.0.1:7676"}}, NodeConfig{P2P: P2PConfig{ListenAddress: "127.0.0.1:7676"}}}, + {"RootDir", &cmcfg.Config{BaseConfig: cmcfg.BaseConfig{RootDir: "~/root"}}, NodeConfig{RootDir: "~/root"}}, + {"DBPath", &cmcfg.Config{BaseConfig: cmcfg.BaseConfig{DBPath: "./database"}}, NodeConfig{DBPath: "./database"}}, + } + + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + var actual NodeConfig + GetNodeConfig(&actual, c.input) + assert.Equal(t, c.expected, actual) + }) + } +} func TestViperAndCobra(t *testing.T) { t.Parallel() assert := assert.New(t) diff --git a/conv/config.go b/conv/config.go deleted file mode 100644 index 6511e04c54..0000000000 --- a/conv/config.go +++ /dev/null @@ -1,31 +0,0 @@ -package conv - -import ( - cmcfg "github.com/cometbft/cometbft/config" - - "github.com/rollkit/rollkit/config" -) - -// GetNodeConfig translates Tendermint's configuration into Rollkit configuration. -// -// This method only translates configuration, and doesn't verify it. If some option is missing in Tendermint's -// config, it's skipped during translation. -func GetNodeConfig(nodeConf *config.NodeConfig, cmConf *cmcfg.Config) { - if cmConf != nil { - nodeConf.RootDir = cmConf.RootDir - nodeConf.DBPath = cmConf.DBPath - if cmConf.P2P != nil { - nodeConf.P2P.ListenAddress = cmConf.P2P.ListenAddress - nodeConf.P2P.Seeds = cmConf.P2P.Seeds - } - if cmConf.RPC != nil { - nodeConf.RPC.ListenAddress = cmConf.RPC.ListenAddress - nodeConf.RPC.CORSAllowedOrigins = cmConf.RPC.CORSAllowedOrigins - nodeConf.RPC.CORSAllowedMethods = cmConf.RPC.CORSAllowedMethods - nodeConf.RPC.CORSAllowedHeaders = cmConf.RPC.CORSAllowedHeaders - nodeConf.RPC.MaxOpenConnections = cmConf.RPC.MaxOpenConnections - nodeConf.RPC.TLSCertFile = cmConf.RPC.TLSCertFile - nodeConf.RPC.TLSKeyFile = cmConf.RPC.TLSKeyFile - } - } -} diff --git a/conv/config_test.go b/conv/config_test.go deleted file mode 100644 index c77a2b3583..0000000000 --- a/conv/config_test.go +++ /dev/null @@ -1,35 +0,0 @@ -package conv - -import ( - "testing" - - "github.com/stretchr/testify/assert" - - cmcfg "github.com/cometbft/cometbft/config" - - "github.com/rollkit/rollkit/config" -) - -func TestGetNodeConfig(t *testing.T) { - t.Parallel() - - cases := []struct { - name string - input *cmcfg.Config - expected config.NodeConfig - }{ - {"empty", nil, config.NodeConfig{}}, - {"Seeds", &cmcfg.Config{P2P: &cmcfg.P2PConfig{Seeds: "seeds"}}, config.NodeConfig{P2P: config.P2PConfig{Seeds: "seeds"}}}, - {"ListenAddress", &cmcfg.Config{P2P: &cmcfg.P2PConfig{ListenAddress: "127.0.0.1:7676"}}, config.NodeConfig{P2P: config.P2PConfig{ListenAddress: "127.0.0.1:7676"}}}, - {"RootDir", &cmcfg.Config{BaseConfig: cmcfg.BaseConfig{RootDir: "~/root"}}, config.NodeConfig{RootDir: "~/root"}}, - {"DBPath", &cmcfg.Config{BaseConfig: cmcfg.BaseConfig{DBPath: "./database"}}, config.NodeConfig{DBPath: "./database"}}, - } - - for _, c := range cases { - t.Run(c.name, func(t *testing.T) { - var actual config.NodeConfig - GetNodeConfig(&actual, c.input) - assert.Equal(t, c.expected, actual) - }) - } -} diff --git a/conv/errors.go b/conv/errors.go deleted file mode 100644 index 90468cbbb9..0000000000 --- a/conv/errors.go +++ /dev/null @@ -1,7 +0,0 @@ -package conv - -import "errors" - -var ( - errInvalidAddress = errors.New("invalid address format, expected [protocol://][@]:") -) diff --git a/conv/crypto.go b/node/crypto.go similarity index 98% rename from conv/crypto.go rename to node/crypto.go index 12fe4f0cea..eb64bcaeba 100644 --- a/conv/crypto.go +++ b/node/crypto.go @@ -1,4 +1,4 @@ -package conv +package node import ( "errors" diff --git a/conv/crypto_test.go b/node/crypto_test.go similarity index 98% rename from conv/crypto_test.go rename to node/crypto_test.go index 81312c99ce..8dbfcccb12 100644 --- a/conv/crypto_test.go +++ b/node/crypto_test.go @@ -1,4 +1,4 @@ -package conv +package node import ( "testing" diff --git a/node/full_client.go b/node/full_client.go index 60fad876b7..5762303903 100644 --- a/node/full_client.go +++ b/node/full_client.go @@ -21,9 +21,9 @@ import ( "github.com/cometbft/cometbft/version" rconfig "github.com/rollkit/rollkit/config" - abciconv "github.com/rollkit/rollkit/conv/abci" "github.com/rollkit/rollkit/mempool" "github.com/rollkit/rollkit/types" + abciconv "github.com/rollkit/rollkit/types/abci" ) const ( diff --git a/node/full_client_test.go b/node/full_client_test.go index 78c72bbf53..5c453f7bfd 100644 --- a/node/full_client_test.go +++ b/node/full_client_test.go @@ -29,12 +29,11 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/rollkit/rollkit/config" - "github.com/rollkit/rollkit/conv" - abciconv "github.com/rollkit/rollkit/conv/abci" mockda "github.com/rollkit/rollkit/da/mock" "github.com/rollkit/rollkit/store" "github.com/rollkit/rollkit/test/mocks" "github.com/rollkit/rollkit/types" + abciconv "github.com/rollkit/rollkit/types/abci" ) var expectedInfo = abci.ResponseInfo{ @@ -784,7 +783,7 @@ func createGenesisValidators(t *testing.T, numNodes int, appCreator func(require nodeKey := &p2p.NodeKey{ PrivKey: vKeys[i], } - signingKey, err := conv.GetNodeKey(nodeKey) + signingKey, err := GetNodeKey(nodeKey) require.NoError(err) nodes[i], err = newFullNode( context.Background(), diff --git a/node/test_helpers.go b/node/test_helpers.go index e2e19d946c..c667682527 100644 --- a/node/test_helpers.go +++ b/node/test_helpers.go @@ -13,7 +13,6 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "github.com/rollkit/rollkit/config" - "github.com/rollkit/rollkit/conv" "github.com/rollkit/rollkit/types" ) @@ -123,7 +122,7 @@ func getGenesisValidatorSetWithSigner(n int) ([]cmtypes.GenesisValidator, crypto nodeKey := &p2p.NodeKey{ PrivKey: genesisValidatorKey, } - signingKey, _ := conv.GetNodeKey(nodeKey) + signingKey, _ := GetNodeKey(nodeKey) pubKey := genesisValidatorKey.PubKey() genesisValidators := []cmtypes.GenesisValidator{ diff --git a/rpc/json/test_helpers.go b/rpc/json/test_helpers.go index d398612183..9ce065205f 100644 --- a/rpc/json/test_helpers.go +++ b/rpc/json/test_helpers.go @@ -18,7 +18,6 @@ import ( "github.com/stretchr/testify/require" "github.com/rollkit/rollkit/config" - "github.com/rollkit/rollkit/conv" "github.com/rollkit/rollkit/node" "github.com/rollkit/rollkit/test/mocks" ) @@ -57,7 +56,7 @@ func getRPC(t *testing.T) (*mocks.Application, rpcclient.Client) { nodeKey := &p2p.NodeKey{ PrivKey: validatorKey, } - signingKey, _ := conv.GetNodeKey(nodeKey) + signingKey, _ := node.GetNodeKey(nodeKey) pubKey := validatorKey.PubKey() genesisValidators := []cmtypes.GenesisValidator{ diff --git a/state/executor.go b/state/executor.go index 6a2f4d3b9b..13db53ee70 100644 --- a/state/executor.go +++ b/state/executor.go @@ -16,10 +16,10 @@ import ( cmtypes "github.com/cometbft/cometbft/types" "go.uber.org/multierr" - abciconv "github.com/rollkit/rollkit/conv/abci" "github.com/rollkit/rollkit/mempool" "github.com/rollkit/rollkit/third_party/log" "github.com/rollkit/rollkit/types" + abciconv "github.com/rollkit/rollkit/types/abci" ) var ErrEmptyValSetGenerated = errors.New("applying the validator changes would result in empty set") diff --git a/conv/abci/block.go b/types/abci/block.go similarity index 100% rename from conv/abci/block.go rename to types/abci/block.go diff --git a/conv/abci/block_test.go b/types/abci/block_test.go similarity index 100% rename from conv/abci/block_test.go rename to types/abci/block_test.go From 65ff1124ab24c5ae792a5b0166b4e086139ce86c Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 14:28:17 -0400 Subject: [PATCH 07/10] Revert go.mod to g0 1.20 --- go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 00e928df37..505e196cc2 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/rollkit/rollkit -go 1.21 - -toolchain go1.21.0 +go 1.20 require ( github.com/celestiaorg/go-header v0.3.1 From 40fb35320bd3e428807631953630c8d388e9622b Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 14:29:42 -0400 Subject: [PATCH 08/10] update hadolint github ci --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5871b47539..e56f36393f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,7 +5,7 @@ on: workflow_call: inputs: GO_VERSION: - description: 'Go version to use' + description: "Go version to use" type: string required: true @@ -39,7 +39,7 @@ jobs: hadolint: uses: rollkit/.github/.github/workflows/reusable_dockerfile_lint.yml@v0.2.2 # yamllint disable-line rule:line-length with: - dockerfile: docker/mockserv.Dockerfile + dockerfile: test/docker/mockserv.Dockerfile yamllint: runs-on: ubuntu-latest From c581166c98e3daddca8d88a087615db1e582df63 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 20:27:12 -0400 Subject: [PATCH 09/10] fix broken links in markdowns --- README.md | 2 +- specs/src/SUMMARY.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 06eb81e30f..f3a2310c6b 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ Please join our [Community Discord](https://discord.com/invite/YsnTPcSfWQ) to as ## Dependency Graph To see our progress and a possible future of Rollkit visit our [Dependency -Graph](./docs/specification/rollkit-dependency-graph.md). +Graph](./specs/src/specs/rollkit-dependency-graph.md). ## Code of Conduct diff --git a/specs/src/SUMMARY.md b/specs/src/SUMMARY.md index 3c32e4f7a0..95db233859 100644 --- a/specs/src/SUMMARY.md +++ b/specs/src/SUMMARY.md @@ -3,7 +3,7 @@ [Introduction](README.md) - [Template](./specs/template.md) -- [Dependency Graph](./specs/rollkist-dependency-graph.md) +- [Dependency Graph](./specs/rollkit-dependency-graph.md) - [Block](./specs/block.md) - [DA](./specs/da.md) - [Mempool](./specs/mempool.md) From feb355123a0ee2404e67dbfbe3da8e6514289c00 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Fri, 29 Sep 2023 20:35:55 -0400 Subject: [PATCH 10/10] fix go 1.20 mod tidy --- go.sum | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/go.sum b/go.sum index cac9d2c7b5..468a673681 100644 --- a/go.sum +++ b/go.sum @@ -78,13 +78,11 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= -github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -100,7 +98,6 @@ github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= @@ -174,7 +171,6 @@ github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/i github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= -github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= @@ -213,7 +209,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -254,7 +249,6 @@ github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHq github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU= -github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -298,7 +292,6 @@ github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQY github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= -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/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= @@ -322,11 +315,9 @@ github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5O github.com/docker/cli v20.10.14+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM= -github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v24.0.2+incompatible h1:eATx+oLz9WdNVkQrr0qjQ8HvRJ4bOOxfzEo8R+dA3cg= -github.com/docker/docker v24.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -376,7 +367,6 @@ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -526,7 +516,6 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= @@ -620,7 +609,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= -github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU= github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= @@ -696,7 +684,6 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= @@ -819,7 +806,6 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn 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/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -840,7 +826,6 @@ github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= -github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-addr-util v0.1.0/go.mod h1:6I3ZYuFr2O/9D+SoyM0zEw0EF3YkldtTX406BpdQMqw= github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= @@ -906,7 +891,6 @@ github.com/libp2p/go-libp2p-testing v0.7.0/go.mod h1:OLbdn9DbgdMwv00v+tlp1l3oe2C github.com/libp2p/go-libp2p-testing v0.9.0/go.mod h1:Td7kbdkWqYTJYQGTwzlgXwaqldraIanyjuRiAbK/XQU= github.com/libp2p/go-libp2p-testing v0.9.2/go.mod h1:Td7kbdkWqYTJYQGTwzlgXwaqldraIanyjuRiAbK/XQU= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= -github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg= github.com/libp2p/go-libp2p-tls v0.3.0/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY= github.com/libp2p/go-libp2p-tls v0.4.1/go.mod h1:EKCixHEysLNDlLUoKxv+3f/Lp90O2EXNjTr0UQDnrIw= github.com/libp2p/go-libp2p-transport-upgrader v0.5.0/go.mod h1:Rc+XODlB3yce7dvFV4q/RmyJGsFcCZRkeZMu/Zdg0mo= @@ -1071,7 +1055,6 @@ github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdx github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= 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= @@ -1202,17 +1185,14 @@ github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je4 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= -github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= -github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runc v1.1.7 h1:y2EZDS8sNng4Ksf0GUYNhKbTShZJPJg1FiXJNH/uoCk= -github.com/opencontainers/runc v1.1.7/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= @@ -1234,7 +1214,6 @@ github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM= github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4= -github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= @@ -1359,7 +1338,6 @@ github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtD github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/protobuf v1.3.2-alpha.regen.4 h1:c9jEnU+xm6vqyrQe3M94UFWqiXxRIKKnqBOh2EACmBE= github.com/regen-network/protobuf v1.3.2-alpha.regen.4/go.mod h1:/J8/bR1T/NXyIdQDLUaq15LjNE83nRzkyrLAMcPewig= github.com/remyoudompheng/go-dbus v0.0.0-20121104212943-b7232d34b1d5/go.mod h1:+u151txRmLpwxBmpYn9z3d1sdJdjRPQpsXuYeY9jNls= @@ -1371,7 +1349,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= 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/rollkit/celestia-openrpc v0.2.0 h1:miSxBgiKtDBZk0dUgreAMubIPXU/Qtf9Q36+E7yZdeE= github.com/rollkit/celestia-openrpc v0.2.0/go.mod h1:0fNIcIMbG0ZceCoh4tINNhuzhmebUMDV0cJqZboe/wg= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= @@ -1430,7 +1407,6 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= github.com/sivchari/nosnakecase v1.5.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= github.com/sivchari/tenv v1.6.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= @@ -1533,11 +1509,8 @@ github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= -github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= -github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= -github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= @@ -1602,7 +1575,6 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= gitlab.com/NebulousLabs/errors v0.0.0-20200929122200-06c536cf6975 h1:L/ENs/Ar1bFzUeKx6m3XjlmBgIUlykX9dzvp5k9NGxc= -gitlab.com/NebulousLabs/errors v0.0.0-20200929122200-06c536cf6975/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 h1:dizWJqTWjwyD8KGcMOwgrkqu1JIkofYgKkmDeNE7oAs= gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40/go.mod h1:rOnSnoRyxMI3fe/7KIbVcsHRGxe30OONv8dEgo+vCfA= gitlab.com/bosi/decorder v0.2.2/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= @@ -1651,7 +1623,6 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= -go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= 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/fx v1.20.0 h1:ZMC/pnRvhsthOZh9MZjMq5U8Or3mA9zBSPaLnzs3ihQ= @@ -1661,7 +1632,6 @@ go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpK go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= 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.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= @@ -2411,7 +2381,6 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=