diff --git a/cmd/koinos-p2p/main.go b/cmd/koinos-p2p/main.go index b065dd1..3be5a69 100644 --- a/cmd/koinos-p2p/main.go +++ b/cmd/koinos-p2p/main.go @@ -21,7 +21,7 @@ import ( "github.com/koinos/koinos-p2p/internal/node" "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/rpc" - util "github.com/koinos/koinos-util-golang" + util "github.com/koinos/koinos-util-golang/v2" flag "github.com/spf13/pflag" ) diff --git a/go.mod b/go.mod index 1f661e9..0b28c17 100644 --- a/go.mod +++ b/go.mod @@ -5,11 +5,10 @@ go 1.20 require ( filippo.io/keygen v0.0.0-20230306160926-5201437acf8e github.com/ipfs/go-log v1.0.5 - github.com/koinos/koinos-log-golang v1.0.0 github.com/koinos/koinos-log-golang/v2 v2.0.0 github.com/koinos/koinos-mq-golang v1.0.0 - github.com/koinos/koinos-proto-golang v1.4.1-0.20240320151344-141350779acd - github.com/koinos/koinos-util-golang v1.1.0 + github.com/koinos/koinos-proto-golang/v2 v2.0.1 + github.com/koinos/koinos-util-golang/v2 v2.0.0 github.com/libp2p/go-libp2p v0.30.0 github.com/libp2p/go-libp2p-gorpc v0.5.0 github.com/libp2p/go-libp2p-kad-dht v0.25.0 @@ -64,6 +63,7 @@ require ( github.com/jbenet/goprocess v0.1.4 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect + github.com/koinos/koinos-log-golang v1.0.0 // indirect github.com/koron/go-ssdp v0.0.4 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-cidranger v1.1.0 // indirect diff --git a/go.sum b/go.sum index 3742d31..0c7c6d3 100644 --- a/go.sum +++ b/go.sum @@ -889,7 +889,6 @@ github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSa github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY= github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= -github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -969,19 +968,11 @@ github.com/koinos/koinos-log-golang/v2 v2.0.0 h1:fOFySSI9+cdmIol9W0a4LQ7Bss1sV1p github.com/koinos/koinos-log-golang/v2 v2.0.0/go.mod h1:P4Xa5LX5Jt+KkzT3CuT9/i2yTrTaJVHN5jd51MM2Tmk= github.com/koinos/koinos-mq-golang v1.0.0 h1:zEslw0vsJN+Ki0WKZ/S2c+Tc7/BoEKOOyTGiVE0msmQ= github.com/koinos/koinos-mq-golang v1.0.0/go.mod h1:0tg4BPijVFyjZenhDGWNbWNq6X2pMwmllwA4tqEXEKI= -github.com/koinos/koinos-proto-golang v1.0.0/go.mod h1:ZonOOdmZcuEbRdOqqdfYRA2I4szYHy5aKzUveMWXBog= -github.com/koinos/koinos-proto-golang v1.0.1-0.20221123003957-336b725f600d/go.mod h1:ZonOOdmZcuEbRdOqqdfYRA2I4szYHy5aKzUveMWXBog= github.com/koinos/koinos-proto-golang v1.4.0/go.mod h1:PlOUon4jm6oN0Jpaw4N8M8DAOGfFjgbhL6M22RNBcJs= -github.com/koinos/koinos-proto-golang v1.4.1-0.20240320151344-141350779acd h1:GD69kuyS/SLkSIleYuuv8Oucd57AVuyZtnGvA+yNrcw= -github.com/koinos/koinos-proto-golang v1.4.1-0.20240320151344-141350779acd/go.mod h1:PlOUon4jm6oN0Jpaw4N8M8DAOGfFjgbhL6M22RNBcJs= -github.com/koinos/koinos-util-golang v1.0.0 h1:OIwBG7L8dLFh3xWwyE2EYd9XRnhH3UnwboddOX1j86w= -github.com/koinos/koinos-util-golang v1.0.0/go.mod h1:E7vZAMfTX7I3r+nKvbO08YsKDb3YxyuVaKV04Kuf3AI= -github.com/koinos/koinos-util-golang v1.0.1-0.20230227201720-214f4cbaf9b1 h1:E5WEW4fbv/OwODGu4WgE2FiBEzphrcjOqOwld8GX6FY= -github.com/koinos/koinos-util-golang v1.0.1-0.20230227201720-214f4cbaf9b1/go.mod h1:Vh7/QpPKO0wvq0W2MRAXilhKG8PM3tRXGD9Jtqi0IDs= -github.com/koinos/koinos-util-golang v1.0.1-0.20240320181411-8d456f5b6439 h1:hPw81Z2NJ0SUu4GWSJf6ZMdU6L2ChIIK9UpP6oUTnhk= -github.com/koinos/koinos-util-golang v1.0.1-0.20240320181411-8d456f5b6439/go.mod h1:gzfqMbbaWQ+7Mnq/L9sRmOFsSzlE6z94/RHn6Qvjvsc= -github.com/koinos/koinos-util-golang v1.1.0 h1:Ks7XEVlOZQ3YgwxUMf5txTHPIGA9EIHaBC0HNJcW4nc= -github.com/koinos/koinos-util-golang v1.1.0/go.mod h1:Vh7/QpPKO0wvq0W2MRAXilhKG8PM3tRXGD9Jtqi0IDs= +github.com/koinos/koinos-proto-golang/v2 v2.0.1 h1:IITpDm7ScWc+F0IWrXPKZBqwskzGqdh6v8khn3tNtXI= +github.com/koinos/koinos-proto-golang/v2 v2.0.1/go.mod h1:NBsQFaRECEbKqKIuRXE3BLR9aNWrRAmasrGlt/VvboY= +github.com/koinos/koinos-util-golang/v2 v2.0.0 h1:0OxpnOAVHTGjabmPtl7HctXB16eWqqQnCNj9t4ZspFQ= +github.com/koinos/koinos-util-golang/v2 v2.0.0/go.mod h1:89amqjqE0hn/EMirC8jQIXVbwCsusguofqmd1BtkK0Q= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0= github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk= diff --git a/internal/node/node.go b/internal/node/node.go index 67b3452..6ef6d36 100644 --- a/internal/node/node.go +++ b/internal/node/node.go @@ -14,16 +14,16 @@ import ( "filippo.io/keygen" - log "github.com/koinos/koinos-log-golang" + log "github.com/koinos/koinos-log-golang/v2" koinosmq "github.com/koinos/koinos-mq-golang" "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/p2p" "github.com/koinos/koinos-p2p/internal/rpc" - "github.com/koinos/koinos-proto-golang/koinos" - "github.com/koinos/koinos-proto-golang/koinos/broadcast" - prpc "github.com/koinos/koinos-proto-golang/koinos/rpc" - rpcp2p "github.com/koinos/koinos-proto-golang/koinos/rpc/p2p" - util "github.com/koinos/koinos-util-golang" + "github.com/koinos/koinos-proto-golang/v2/koinos" + "github.com/koinos/koinos-proto-golang/v2/koinos/broadcast" + prpc "github.com/koinos/koinos-proto-golang/v2/koinos/rpc" + rpcp2p "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/p2p" + util "github.com/koinos/koinos-util-golang/v2" libp2p "github.com/libp2p/go-libp2p" dht "github.com/libp2p/go-libp2p-kad-dht" diff --git a/internal/node/node_test.go b/internal/node/node_test.go index 0d69506..56602f9 100644 --- a/internal/node/node_test.go +++ b/internal/node/node_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/koinos/koinos-p2p/internal/options" - "github.com/koinos/koinos-proto-golang/koinos" - "github.com/koinos/koinos-proto-golang/koinos/protocol" - "github.com/koinos/koinos-proto-golang/koinos/rpc/block_store" - "github.com/koinos/koinos-proto-golang/koinos/rpc/chain" + "github.com/koinos/koinos-proto-golang/v2/koinos" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain" "github.com/multiformats/go-multihash" ) diff --git a/internal/p2p/applicator.go b/internal/p2p/applicator.go index 1ee5b7f..5f04d79 100644 --- a/internal/p2p/applicator.go +++ b/internal/p2p/applicator.go @@ -9,8 +9,8 @@ import ( "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/p2perrors" "github.com/koinos/koinos-p2p/internal/rpc" - "github.com/koinos/koinos-proto-golang/koinos/broadcast" - "github.com/koinos/koinos-proto-golang/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/broadcast" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" ) type blockEntry struct { diff --git a/internal/p2p/applicator_test.go b/internal/p2p/applicator_test.go index 14bfd93..602cdea 100644 --- a/internal/p2p/applicator_test.go +++ b/internal/p2p/applicator_test.go @@ -7,11 +7,11 @@ import ( "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/p2perrors" - "github.com/koinos/koinos-proto-golang/koinos" - "github.com/koinos/koinos-proto-golang/koinos/broadcast" - "github.com/koinos/koinos-proto-golang/koinos/protocol" - "github.com/koinos/koinos-proto-golang/koinos/rpc/block_store" - "github.com/koinos/koinos-proto-golang/koinos/rpc/chain" + "github.com/koinos/koinos-proto-golang/v2/koinos" + "github.com/koinos/koinos-proto-golang/v2/koinos/broadcast" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain" "github.com/multiformats/go-multihash" ) diff --git a/internal/p2p/connection_manager.go b/internal/p2p/connection_manager.go index 4d00578..3e7bdac 100644 --- a/internal/p2p/connection_manager.go +++ b/internal/p2p/connection_manager.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - log "github.com/koinos/koinos-log-golang" + log "github.com/koinos/koinos-log-golang/v2" "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/rpc" - util "github.com/koinos/koinos-util-golang" + util "github.com/koinos/koinos-util-golang/v2" gorpc "github.com/libp2p/go-libp2p-gorpc" "github.com/libp2p/go-libp2p/core/host" diff --git a/internal/p2p/error_handler.go b/internal/p2p/error_handler.go index 53a79c5..554855f 100644 --- a/internal/p2p/error_handler.go +++ b/internal/p2p/error_handler.go @@ -6,7 +6,7 @@ import ( "math" "time" - log "github.com/koinos/koinos-log-golang" + log "github.com/koinos/koinos-log-golang/v2" "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/p2perrors" "github.com/libp2p/go-libp2p/core/control" diff --git a/internal/p2p/fork_watchdog.go b/internal/p2p/fork_watchdog.go index 6018b00..5231117 100644 --- a/internal/p2p/fork_watchdog.go +++ b/internal/p2p/fork_watchdog.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/koinos/koinos-p2p/internal/p2perrors" - "github.com/koinos/koinos-proto-golang/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" ) type pairKey struct { diff --git a/internal/p2p/fork_watchdog_test.go b/internal/p2p/fork_watchdog_test.go index 8e10aa0..67b3b83 100644 --- a/internal/p2p/fork_watchdog_test.go +++ b/internal/p2p/fork_watchdog_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/koinos/koinos-p2p/internal/p2perrors" - "github.com/koinos/koinos-proto-golang/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" ) func TestForkWatchdog(t *testing.T) { diff --git a/internal/p2p/gossip.go b/internal/p2p/gossip.go index c7dc1b5..814cd44 100644 --- a/internal/p2p/gossip.go +++ b/internal/p2p/gossip.go @@ -8,12 +8,12 @@ import ( "sync/atomic" "time" - log "github.com/koinos/koinos-log-golang" + log "github.com/koinos/koinos-log-golang/v2" "github.com/koinos/koinos-p2p/internal/p2perrors" "github.com/koinos/koinos-p2p/internal/rpc" - "github.com/koinos/koinos-proto-golang/koinos/canonical" - "github.com/koinos/koinos-proto-golang/koinos/protocol" - util "github.com/koinos/koinos-util-golang" + "github.com/koinos/koinos-proto-golang/v2/koinos/canonical" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" + util "github.com/koinos/koinos-util-golang/v2" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/peer" diff --git a/internal/p2p/gossip_toggle.go b/internal/p2p/gossip_toggle.go index b7471fc..db6643b 100644 --- a/internal/p2p/gossip_toggle.go +++ b/internal/p2p/gossip_toggle.go @@ -5,7 +5,7 @@ import ( "sync" "time" - log "github.com/koinos/koinos-log-golang" + log "github.com/koinos/koinos-log-golang/v2" "github.com/koinos/koinos-p2p/internal/options" ) diff --git a/internal/p2p/lib_provider.go b/internal/p2p/lib_provider.go index abaccd8..8ae26fd 100644 --- a/internal/p2p/lib_provider.go +++ b/internal/p2p/lib_provider.go @@ -1,6 +1,6 @@ package p2p -import "github.com/koinos/koinos-proto-golang/koinos" +import "github.com/koinos/koinos-proto-golang/v2/koinos" // LastIrreversibleBlockProvider is an interface for providing the last irreversible block to PeerConnection type LastIrreversibleBlockProvider interface { diff --git a/internal/p2p/peer_connection.go b/internal/p2p/peer_connection.go index e02dd44..fd5e698 100644 --- a/internal/p2p/peer_connection.go +++ b/internal/p2p/peer_connection.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - log "github.com/koinos/koinos-log-golang" + log "github.com/koinos/koinos-log-golang/v2" "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/p2perrors" "github.com/koinos/koinos-p2p/internal/rpc" diff --git a/internal/p2p/transaction_cache.go b/internal/p2p/transaction_cache.go index 4b31291..f15a9b4 100644 --- a/internal/p2p/transaction_cache.go +++ b/internal/p2p/transaction_cache.go @@ -5,8 +5,8 @@ import ( "sync" "time" - log "github.com/koinos/koinos-log-golang" - "github.com/koinos/koinos-proto-golang/koinos/protocol" + log "github.com/koinos/koinos-log-golang/v2" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" ) type void struct{} diff --git a/internal/p2p/transaction_cache_test.go b/internal/p2p/transaction_cache_test.go index a125126..387bb08 100644 --- a/internal/p2p/transaction_cache_test.go +++ b/internal/p2p/transaction_cache_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/koinos/koinos-proto-golang/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" "github.com/stretchr/testify/assert" ) diff --git a/internal/p2p_test.go b/internal/p2p_test.go index f71af37..62a5045 100644 --- a/internal/p2p_test.go +++ b/internal/p2p_test.go @@ -9,11 +9,11 @@ import ( "github.com/koinos/koinos-p2p/internal/node" "github.com/koinos/koinos-p2p/internal/options" "github.com/koinos/koinos-p2p/internal/p2p" - "github.com/koinos/koinos-proto-golang/koinos" - "github.com/koinos/koinos-proto-golang/koinos/broadcast" - "github.com/koinos/koinos-proto-golang/koinos/protocol" - "github.com/koinos/koinos-proto-golang/koinos/rpc/block_store" - "github.com/koinos/koinos-proto-golang/koinos/rpc/chain" + "github.com/koinos/koinos-proto-golang/v2/koinos" + "github.com/koinos/koinos-proto-golang/v2/koinos/broadcast" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain" "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" "github.com/multiformats/go-multihash" diff --git a/internal/rpc/koinos_rpc.go b/internal/rpc/koinos_rpc.go index ce3991b..457c13a 100644 --- a/internal/rpc/koinos_rpc.go +++ b/internal/rpc/koinos_rpc.go @@ -9,13 +9,13 @@ import ( koinosmq "github.com/koinos/koinos-mq-golang" "github.com/koinos/koinos-p2p/internal/p2perrors" - "github.com/koinos/koinos-proto-golang/koinos/broadcast" - "github.com/koinos/koinos-proto-golang/koinos/canonical" - "github.com/koinos/koinos-proto-golang/koinos/chain" - "github.com/koinos/koinos-proto-golang/koinos/protocol" - "github.com/koinos/koinos-proto-golang/koinos/rpc" - "github.com/koinos/koinos-proto-golang/koinos/rpc/block_store" - chainrpc "github.com/koinos/koinos-proto-golang/koinos/rpc/chain" + "github.com/koinos/koinos-proto-golang/v2/koinos/broadcast" + "github.com/koinos/koinos-proto-golang/v2/koinos/canonical" + "github.com/koinos/koinos-proto-golang/v2/koinos/chain" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store" + chainrpc "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain" "github.com/multiformats/go-multihash" ) diff --git a/internal/rpc/local_rpc.go b/internal/rpc/local_rpc.go index b6d198d..e5be0de 100644 --- a/internal/rpc/local_rpc.go +++ b/internal/rpc/local_rpc.go @@ -3,9 +3,9 @@ package rpc import ( "context" - "github.com/koinos/koinos-proto-golang/koinos/protocol" - "github.com/koinos/koinos-proto-golang/koinos/rpc/block_store" - "github.com/koinos/koinos-proto-golang/koinos/rpc/chain" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/block_store" + "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/chain" "github.com/multiformats/go-multihash" ) diff --git a/internal/rpc/peer_rpc.go b/internal/rpc/peer_rpc.go index 62eed0b..0b92cf5 100644 --- a/internal/rpc/peer_rpc.go +++ b/internal/rpc/peer_rpc.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/koinos/koinos-p2p/internal/p2perrors" - "github.com/koinos/koinos-proto-golang/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" gorpc "github.com/libp2p/go-libp2p-gorpc" peer "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multihash" diff --git a/internal/rpc/remote_rpc.go b/internal/rpc/remote_rpc.go index cbbffbc..79c64ce 100644 --- a/internal/rpc/remote_rpc.go +++ b/internal/rpc/remote_rpc.go @@ -3,7 +3,7 @@ package rpc import ( "context" - "github.com/koinos/koinos-proto-golang/koinos/protocol" + "github.com/koinos/koinos-proto-golang/v2/koinos/protocol" "github.com/multiformats/go-multihash" )