From ebcafce4ff1fb2bbf71115177e2246ec2511c722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Mon, 26 Sep 2022 10:54:27 +0200 Subject: [PATCH 01/13] refactor: rename go module and fix imports --- block/manager.go | 14 +++++++------- block/manager_test.go | 10 +++++----- conv/abci/block.go | 2 +- conv/addr.go | 2 +- conv/addr_test.go | 2 +- conv/config.go | 2 +- conv/config_test.go | 2 +- da/celestia/celestia.go | 10 +++++----- da/celestia/mock/server.go | 10 +++++----- da/da.go | 6 +++--- da/grpc/grpc.go | 10 +++++----- da/grpc/mockserv/cmd/main.go | 6 +++--- da/grpc/mockserv/mockserv.go | 12 ++++++------ da/mock/mock.go | 8 ++++---- da/registry/registry.go | 8 ++++---- da/test/da_test.go | 20 ++++++++++---------- go.mod | 2 +- mempool/v1/mempool.go | 4 ++-- mempool/v1/mempool_bench_test.go | 2 +- mempool/v1/mempool_test.go | 2 +- node/integration_test.go | 12 ++++++------ node/node.go | 26 +++++++++++++------------- node/node_test.go | 6 +++--- p2p/client.go | 4 ++-- p2p/client_test.go | 4 ++-- p2p/gossip.go | 2 +- p2p/utils_test.go | 4 ++-- rpc/client/client.go | 6 +++--- rpc/client/client_test.go | 10 +++++----- rpc/json/handler.go | 2 +- rpc/json/service.go | 4 ++-- rpc/json/service_test.go | 8 ++++---- rpc/json/ws.go | 2 +- rpc/server.go | 6 +++--- state/executor.go | 8 ++++---- state/executor_test.go | 8 ++++---- state/indexer/block/kv/kv.go | 4 ++-- state/indexer/block/kv/kv_test.go | 4 ++-- state/indexer/block/null/null.go | 2 +- state/txindex/indexer_service.go | 2 +- state/txindex/indexer_service_test.go | 8 ++++---- state/txindex/kv/kv.go | 6 +++--- state/txindex/kv/kv_bench_test.go | 2 +- state/txindex/kv/kv_test.go | 4 ++-- state/txindex/null/null.go | 2 +- store/store.go | 4 ++-- store/store_test.go | 2 +- store/types.go | 2 +- types/pb/dalc/dalc.pb.go | 2 +- types/serialization.go | 2 +- types/serialization_test.go | 2 +- 51 files changed, 147 insertions(+), 147 deletions(-) diff --git a/block/manager.go b/block/manager.go index b2ae62220d..0c977c1568 100644 --- a/block/manager.go +++ b/block/manager.go @@ -15,13 +15,13 @@ import ( tmtypes "github.com/tendermint/tendermint/types" "go.uber.org/multierr" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/da" - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/mempool" - "github.com/celestiaorg/optimint/state" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/da" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/mempool" + "github.com/celestiaorg/rollmint/state" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" ) // defaultDABlockTime is used only if DABlockTime is not configured for manager diff --git a/block/manager_test.go b/block/manager_test.go index 1509dc7b66..6ce4e1125d 100644 --- a/block/manager_test.go +++ b/block/manager_test.go @@ -12,11 +12,11 @@ import ( "github.com/tendermint/tendermint/libs/log" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/da" - mockda "github.com/celestiaorg/optimint/da/mock" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/da" + mockda "github.com/celestiaorg/rollmint/da/mock" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" ) func TestInitialState(t *testing.T) { diff --git a/conv/abci/block.go b/conv/abci/block.go index 7f9703af07..984d4ba4cd 100644 --- a/conv/abci/block.go +++ b/conv/abci/block.go @@ -7,7 +7,7 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/types" ) // ToABCIHeaderPB converts Optimint header to Header format defined in ABCI. diff --git a/conv/addr.go b/conv/addr.go index 21469db15c..f9f41853fa 100644 --- a/conv/addr.go +++ b/conv/addr.go @@ -5,7 +5,7 @@ import ( "github.com/multiformats/go-multiaddr" - "github.com/celestiaorg/optimint/config" + "github.com/celestiaorg/rollmint/config" ) // TranslateAddresses updates conf by changing Cosmos-style addresses to Multiaddr format. diff --git a/conv/addr_test.go b/conv/addr_test.go index 764011dc61..12f6fa182e 100644 --- a/conv/addr_test.go +++ b/conv/addr_test.go @@ -7,7 +7,7 @@ import ( "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/assert" - "github.com/celestiaorg/optimint/config" + "github.com/celestiaorg/rollmint/config" ) func TestTranslateAddresses(t *testing.T) { diff --git a/conv/config.go b/conv/config.go index 8e7e254c0c..9f48a87b2d 100644 --- a/conv/config.go +++ b/conv/config.go @@ -3,7 +3,7 @@ package conv import ( tmcfg "github.com/tendermint/tendermint/config" - "github.com/celestiaorg/optimint/config" + "github.com/celestiaorg/rollmint/config" ) // GetNodeConfig translates Tendermint's configuration into Optimint configuration. diff --git a/conv/config_test.go b/conv/config_test.go index 46d5e0571b..3113aee4b4 100644 --- a/conv/config_test.go +++ b/conv/config_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/celestiaorg/optimint/config" + "github.com/celestiaorg/rollmint/config" tmcfg "github.com/tendermint/tendermint/config" ) diff --git a/da/celestia/celestia.go b/da/celestia/celestia.go index dd9d733a15..9010cbd68e 100644 --- a/da/celestia/celestia.go +++ b/da/celestia/celestia.go @@ -9,11 +9,11 @@ import ( "github.com/gogo/protobuf/proto" "github.com/celestiaorg/go-cnc" - "github.com/celestiaorg/optimint/da" - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" - pb "github.com/celestiaorg/optimint/types/pb/optimint" + "github.com/celestiaorg/rollmint/da" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" + pb "github.com/celestiaorg/rollmint/types/pb/optimint" ) // DataAvailabilityLayerClient use celestia-node public API. diff --git a/da/celestia/mock/server.go b/da/celestia/mock/server.go index a88d4defea..0fb05ba480 100644 --- a/da/celestia/mock/server.go +++ b/da/celestia/mock/server.go @@ -13,11 +13,11 @@ import ( mux2 "github.com/gorilla/mux" "github.com/celestiaorg/go-cnc" - "github.com/celestiaorg/optimint/da" - mockda "github.com/celestiaorg/optimint/da/mock" - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/da" + mockda "github.com/celestiaorg/rollmint/da/mock" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" ) // Server mocks celestia-node HTTP API. diff --git a/da/da.go b/da/da.go index 831e46cea9..b3e6d74d3a 100644 --- a/da/da.go +++ b/da/da.go @@ -1,9 +1,9 @@ package da import ( - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" ) // StatusCode is a type for DA layer return status. diff --git a/da/grpc/grpc.go b/da/grpc/grpc.go index 81c01179c5..94adac6d7c 100644 --- a/da/grpc/grpc.go +++ b/da/grpc/grpc.go @@ -7,11 +7,11 @@ import ( "google.golang.org/grpc" - "github.com/celestiaorg/optimint/da" - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" - "github.com/celestiaorg/optimint/types/pb/dalc" + "github.com/celestiaorg/rollmint/da" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" + "github.com/celestiaorg/rollmint/types/pb/dalc" ) // DataAvailabilityLayerClient is a generic client that proxies all DA requests via gRPC. diff --git a/da/grpc/mockserv/cmd/main.go b/da/grpc/mockserv/cmd/main.go index b69189f15d..2b49ee6623 100644 --- a/da/grpc/mockserv/cmd/main.go +++ b/da/grpc/mockserv/cmd/main.go @@ -6,9 +6,9 @@ import ( "net" "strconv" - grpcda "github.com/celestiaorg/optimint/da/grpc" - "github.com/celestiaorg/optimint/da/grpc/mockserv" - "github.com/celestiaorg/optimint/store" + grpcda "github.com/celestiaorg/rollmint/da/grpc" + "github.com/celestiaorg/rollmint/da/grpc/mockserv" + "github.com/celestiaorg/rollmint/store" ) func main() { diff --git a/da/grpc/mockserv/mockserv.go b/da/grpc/mockserv/mockserv.go index a9b70f6945..93639cd86c 100644 --- a/da/grpc/mockserv/mockserv.go +++ b/da/grpc/mockserv/mockserv.go @@ -7,12 +7,12 @@ import ( tmlog "github.com/tendermint/tendermint/libs/log" "google.golang.org/grpc" - grpcda "github.com/celestiaorg/optimint/da/grpc" - "github.com/celestiaorg/optimint/da/mock" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" - "github.com/celestiaorg/optimint/types/pb/dalc" - "github.com/celestiaorg/optimint/types/pb/optimint" + grpcda "github.com/celestiaorg/rollmint/da/grpc" + "github.com/celestiaorg/rollmint/da/mock" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" + "github.com/celestiaorg/rollmint/types/pb/dalc" + "github.com/celestiaorg/rollmint/types/pb/optimint" ) // GetServer creates and returns gRPC server instance. diff --git a/da/mock/mock.go b/da/mock/mock.go index 22140a7951..a2ffc27616 100644 --- a/da/mock/mock.go +++ b/da/mock/mock.go @@ -6,10 +6,10 @@ import ( "sync/atomic" "time" - "github.com/celestiaorg/optimint/da" - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/da" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" ) // DataAvailabilityLayerClient is intended only for usage in tests. diff --git a/da/registry/registry.go b/da/registry/registry.go index cf2344c13b..650866a4c1 100644 --- a/da/registry/registry.go +++ b/da/registry/registry.go @@ -1,10 +1,10 @@ package registry import ( - "github.com/celestiaorg/optimint/da" - "github.com/celestiaorg/optimint/da/celestia" - "github.com/celestiaorg/optimint/da/grpc" - "github.com/celestiaorg/optimint/da/mock" + "github.com/celestiaorg/rollmint/da" + "github.com/celestiaorg/rollmint/da/celestia" + "github.com/celestiaorg/rollmint/da/grpc" + "github.com/celestiaorg/rollmint/da/mock" ) // this is a central registry for all Data Availability Layer Clients diff --git a/da/test/da_test.go b/da/test/da_test.go index 6a1c0f9aba..89254f3718 100644 --- a/da/test/da_test.go +++ b/da/test/da_test.go @@ -12,16 +12,16 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/celestiaorg/optimint/da" - "github.com/celestiaorg/optimint/da/celestia" - cmock "github.com/celestiaorg/optimint/da/celestia/mock" - grpcda "github.com/celestiaorg/optimint/da/grpc" - "github.com/celestiaorg/optimint/da/grpc/mockserv" - "github.com/celestiaorg/optimint/da/mock" - "github.com/celestiaorg/optimint/da/registry" - "github.com/celestiaorg/optimint/log/test" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/da" + "github.com/celestiaorg/rollmint/da/celestia" + cmock "github.com/celestiaorg/rollmint/da/celestia/mock" + grpcda "github.com/celestiaorg/rollmint/da/grpc" + "github.com/celestiaorg/rollmint/da/grpc/mockserv" + "github.com/celestiaorg/rollmint/da/mock" + "github.com/celestiaorg/rollmint/da/registry" + "github.com/celestiaorg/rollmint/log/test" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" ) const mockDaBlockTime = 100 * time.Millisecond diff --git a/go.mod b/go.mod index e9f4a1ac74..bf93569b50 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/celestiaorg/optimint +module github.com/celestiaorg/rollmint go 1.18 diff --git a/mempool/v1/mempool.go b/mempool/v1/mempool.go index 28c02e877b..8359d75297 100644 --- a/mempool/v1/mempool.go +++ b/mempool/v1/mempool.go @@ -14,8 +14,8 @@ import ( "github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/mempool" - "github.com/celestiaorg/optimint/mempool/clist" + "github.com/celestiaorg/rollmint/mempool" + "github.com/celestiaorg/rollmint/mempool/clist" ) var _ mempool.Mempool = (*TxMempool)(nil) diff --git a/mempool/v1/mempool_bench_test.go b/mempool/v1/mempool_bench_test.go index 7cf6b0215f..634c8f65e8 100644 --- a/mempool/v1/mempool_bench_test.go +++ b/mempool/v1/mempool_bench_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/celestiaorg/optimint/mempool" + "github.com/celestiaorg/rollmint/mempool" ) func BenchmarkTxMempool_CheckTx(b *testing.B) { diff --git a/mempool/v1/mempool_test.go b/mempool/v1/mempool_test.go index 9052e87b9a..00c2e34640 100644 --- a/mempool/v1/mempool_test.go +++ b/mempool/v1/mempool_test.go @@ -23,7 +23,7 @@ import ( "github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/mempool" + "github.com/celestiaorg/rollmint/mempool" ) // application extends the KV store application by overriding CheckTx to provide diff --git a/node/integration_test.go b/node/integration_test.go index e3a9297d16..462e4c066c 100644 --- a/node/integration_test.go +++ b/node/integration_test.go @@ -21,12 +21,12 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/da" - mockda "github.com/celestiaorg/optimint/da/mock" - "github.com/celestiaorg/optimint/mocks" - "github.com/celestiaorg/optimint/p2p" - "github.com/celestiaorg/optimint/store" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/da" + mockda "github.com/celestiaorg/rollmint/da/mock" + "github.com/celestiaorg/rollmint/mocks" + "github.com/celestiaorg/rollmint/p2p" + "github.com/celestiaorg/rollmint/store" ) func TestAggregatorMode(t *testing.T) { diff --git a/node/node.go b/node/node.go index 60f133c204..d0fb99d913 100644 --- a/node/node.go +++ b/node/node.go @@ -18,19 +18,19 @@ import ( corep2p "github.com/tendermint/tendermint/p2p" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/block" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/da" - "github.com/celestiaorg/optimint/da/registry" - "github.com/celestiaorg/optimint/mempool" - mempoolv1 "github.com/celestiaorg/optimint/mempool/v1" - "github.com/celestiaorg/optimint/p2p" - "github.com/celestiaorg/optimint/state/indexer" - blockidxkv "github.com/celestiaorg/optimint/state/indexer/block/kv" - "github.com/celestiaorg/optimint/state/txindex" - "github.com/celestiaorg/optimint/state/txindex/kv" - "github.com/celestiaorg/optimint/store" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/block" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/da" + "github.com/celestiaorg/rollmint/da/registry" + "github.com/celestiaorg/rollmint/mempool" + mempoolv1 "github.com/celestiaorg/rollmint/mempool/v1" + "github.com/celestiaorg/rollmint/p2p" + "github.com/celestiaorg/rollmint/state/indexer" + blockidxkv "github.com/celestiaorg/rollmint/state/indexer/block/kv" + "github.com/celestiaorg/rollmint/state/txindex" + "github.com/celestiaorg/rollmint/state/txindex/kv" + "github.com/celestiaorg/rollmint/store" + "github.com/celestiaorg/rollmint/types" ) // prefixes used in KV store to separate main node data from DALC data diff --git a/node/node_test.go b/node/node_test.go index fa593054f7..d6877945f6 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -17,9 +17,9 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/mempool" - "github.com/celestiaorg/optimint/mocks" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/mempool" + "github.com/celestiaorg/rollmint/mocks" ) // simply check that node is starting and stopping without panicking diff --git a/p2p/client.go b/p2p/client.go index f559dadcdc..970893dadd 100644 --- a/p2p/client.go +++ b/p2p/client.go @@ -21,8 +21,8 @@ import ( "github.com/tendermint/tendermint/p2p" "go.uber.org/multierr" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/log" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/log" ) // TODO(tzdybal): refactor to configuration parameters diff --git a/p2p/client_test.go b/p2p/client_test.go index 6f0fec2b8d..bca94f9aca 100644 --- a/p2p/client_test.go +++ b/p2p/client_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/log/test" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/log/test" ) func TestClientStartup(t *testing.T) { diff --git a/p2p/gossip.go b/p2p/gossip.go index f56a862474..b88f4bd414 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/celestiaorg/optimint/log" + "github.com/celestiaorg/rollmint/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 39a767b54c..6ae97b073d 100644 --- a/p2p/utils_test.go +++ b/p2p/utils_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/multierr" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/log" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/log" ) type testNet []*Client diff --git a/rpc/client/client.go b/rpc/client/client.go index 9045d801ab..66de911e6f 100644 --- a/rpc/client/client.go +++ b/rpc/client/client.go @@ -20,9 +20,9 @@ import ( ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/types" - abciconv "github.com/celestiaorg/optimint/conv/abci" - "github.com/celestiaorg/optimint/mempool" - "github.com/celestiaorg/optimint/node" + abciconv "github.com/celestiaorg/rollmint/conv/abci" + "github.com/celestiaorg/rollmint/mempool" + "github.com/celestiaorg/rollmint/node" ) const ( diff --git a/rpc/client/client_test.go b/rpc/client/client_test.go index 5f44232c9d..603b590993 100644 --- a/rpc/client/client_test.go +++ b/rpc/client/client_test.go @@ -25,11 +25,11 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/config" - abciconv "github.com/celestiaorg/optimint/conv/abci" - "github.com/celestiaorg/optimint/mocks" - "github.com/celestiaorg/optimint/node" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/config" + abciconv "github.com/celestiaorg/rollmint/conv/abci" + "github.com/celestiaorg/rollmint/mocks" + "github.com/celestiaorg/rollmint/node" + "github.com/celestiaorg/rollmint/types" ) var expectedInfo = abci.ResponseInfo{ diff --git a/rpc/json/handler.go b/rpc/json/handler.go index d66a5ae72a..5143ae31b9 100644 --- a/rpc/json/handler.go +++ b/rpc/json/handler.go @@ -12,7 +12,7 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/celestiaorg/optimint/log" + "github.com/celestiaorg/rollmint/log" "github.com/gorilla/rpc/v2" "github.com/gorilla/rpc/v2/json2" ) diff --git a/rpc/json/service.go b/rpc/json/service.go index 358da7304b..af27c367a6 100644 --- a/rpc/json/service.go +++ b/rpc/json/service.go @@ -14,8 +14,8 @@ import ( rpcclient "github.com/tendermint/tendermint/rpc/client" ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/rpc/client" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/rpc/client" ) // GetHTTPHandler returns handler configured to serve Tendermint-compatible RPC. diff --git a/rpc/json/service_test.go b/rpc/json/service_test.go index 163060a4fd..eb8fcda3b9 100644 --- a/rpc/json/service_test.go +++ b/rpc/json/service_test.go @@ -24,10 +24,10 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/config" - "github.com/celestiaorg/optimint/mocks" - "github.com/celestiaorg/optimint/node" - "github.com/celestiaorg/optimint/rpc/client" + "github.com/celestiaorg/rollmint/config" + "github.com/celestiaorg/rollmint/mocks" + "github.com/celestiaorg/rollmint/node" + "github.com/celestiaorg/rollmint/rpc/client" ) func TestHandlerMapping(t *testing.T) { diff --git a/rpc/json/ws.go b/rpc/json/ws.go index 55b8a21eee..6606624188 100644 --- a/rpc/json/ws.go +++ b/rpc/json/ws.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/websocket" - "github.com/celestiaorg/optimint/log" + "github.com/celestiaorg/rollmint/log" ) type wsConn struct { diff --git a/rpc/server.go b/rpc/server.go index c63a3a6518..3aa1b78381 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -15,9 +15,9 @@ import ( rpcclient "github.com/tendermint/tendermint/rpc/client" "golang.org/x/net/netutil" - "github.com/celestiaorg/optimint/node" - "github.com/celestiaorg/optimint/rpc/client" - "github.com/celestiaorg/optimint/rpc/json" + "github.com/celestiaorg/rollmint/node" + "github.com/celestiaorg/rollmint/rpc/client" + "github.com/celestiaorg/rollmint/rpc/json" ) // Server handles HTTP and JSON-RPC requests, exposing Tendermint-compatible API. diff --git a/state/executor.go b/state/executor.go index 5feaa9bea9..c28e22fe77 100644 --- a/state/executor.go +++ b/state/executor.go @@ -15,10 +15,10 @@ import ( tmtypes "github.com/tendermint/tendermint/types" "go.uber.org/multierr" - abciconv "github.com/celestiaorg/optimint/conv/abci" - "github.com/celestiaorg/optimint/log" - "github.com/celestiaorg/optimint/mempool" - "github.com/celestiaorg/optimint/types" + abciconv "github.com/celestiaorg/rollmint/conv/abci" + "github.com/celestiaorg/rollmint/log" + "github.com/celestiaorg/rollmint/mempool" + "github.com/celestiaorg/rollmint/types" ) // BlockExecutor creates and applies blocks and maintains state. diff --git a/state/executor_test.go b/state/executor_test.go index 573366488d..24add8b607 100644 --- a/state/executor_test.go +++ b/state/executor_test.go @@ -17,10 +17,10 @@ import ( "github.com/tendermint/tendermint/proxy" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/mempool" - mempoolv1 "github.com/celestiaorg/optimint/mempool/v1" - "github.com/celestiaorg/optimint/mocks" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/mempool" + mempoolv1 "github.com/celestiaorg/rollmint/mempool/v1" + "github.com/celestiaorg/rollmint/mocks" + "github.com/celestiaorg/rollmint/types" ) func TestCreateBlock(t *testing.T) { diff --git a/state/indexer/block/kv/kv.go b/state/indexer/block/kv/kv.go index 74f59c882a..bc7f26333b 100644 --- a/state/indexer/block/kv/kv.go +++ b/state/indexer/block/kv/kv.go @@ -14,8 +14,8 @@ import ( "github.com/tendermint/tendermint/libs/pubsub/query" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/state/indexer" - "github.com/celestiaorg/optimint/store" + "github.com/celestiaorg/rollmint/state/indexer" + "github.com/celestiaorg/rollmint/store" ) var _ indexer.BlockIndexer = (*BlockerIndexer)(nil) diff --git a/state/indexer/block/kv/kv_test.go b/state/indexer/block/kv/kv_test.go index 44c83a1ee3..59a15b77f4 100644 --- a/state/indexer/block/kv/kv_test.go +++ b/state/indexer/block/kv/kv_test.go @@ -10,8 +10,8 @@ import ( "github.com/tendermint/tendermint/libs/pubsub/query" "github.com/tendermint/tendermint/types" - blockidxkv "github.com/celestiaorg/optimint/state/indexer/block/kv" - "github.com/celestiaorg/optimint/store" + blockidxkv "github.com/celestiaorg/rollmint/state/indexer/block/kv" + "github.com/celestiaorg/rollmint/store" ) func TestBlockIndexer(t *testing.T) { diff --git a/state/indexer/block/null/null.go b/state/indexer/block/null/null.go index 2933b760f5..cf4c681e9d 100644 --- a/state/indexer/block/null/null.go +++ b/state/indexer/block/null/null.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/celestiaorg/optimint/state/indexer" + "github.com/celestiaorg/rollmint/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" "github.com/tendermint/tendermint/types" ) diff --git a/state/txindex/indexer_service.go b/state/txindex/indexer_service.go index fd602aedb0..382ae2ed89 100644 --- a/state/txindex/indexer_service.go +++ b/state/txindex/indexer_service.go @@ -3,7 +3,7 @@ package txindex import ( "context" - "github.com/celestiaorg/optimint/state/indexer" + "github.com/celestiaorg/rollmint/state/indexer" "github.com/tendermint/tendermint/libs/service" "github.com/tendermint/tendermint/types" ) diff --git a/state/txindex/indexer_service_test.go b/state/txindex/indexer_service_test.go index b1908846d3..0dd9290f4b 100644 --- a/state/txindex/indexer_service_test.go +++ b/state/txindex/indexer_service_test.go @@ -9,10 +9,10 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/types" - blockidxkv "github.com/celestiaorg/optimint/state/indexer/block/kv" - "github.com/celestiaorg/optimint/state/txindex" - "github.com/celestiaorg/optimint/state/txindex/kv" - "github.com/celestiaorg/optimint/store" + blockidxkv "github.com/celestiaorg/rollmint/state/indexer/block/kv" + "github.com/celestiaorg/rollmint/state/txindex" + "github.com/celestiaorg/rollmint/state/txindex/kv" + "github.com/celestiaorg/rollmint/store" ) func TestIndexerServiceIndexesBlocks(t *testing.T) { diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go index 12a36cdd2d..7d1a3593f7 100644 --- a/state/txindex/kv/kv.go +++ b/state/txindex/kv/kv.go @@ -14,9 +14,9 @@ import ( "github.com/tendermint/tendermint/libs/pubsub/query" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/state/indexer" - "github.com/celestiaorg/optimint/state/txindex" - "github.com/celestiaorg/optimint/store" + "github.com/celestiaorg/rollmint/state/indexer" + "github.com/celestiaorg/rollmint/state/txindex" + "github.com/celestiaorg/rollmint/store" ) const ( diff --git a/state/txindex/kv/kv_bench_test.go b/state/txindex/kv/kv_bench_test.go index f757c0281b..566046306b 100644 --- a/state/txindex/kv/kv_bench_test.go +++ b/state/txindex/kv/kv_bench_test.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/libs/pubsub/query" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/store" + "github.com/celestiaorg/rollmint/store" ) func BenchmarkTxSearch(b *testing.B) { diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go index 5578d2fea8..48b9c05889 100644 --- a/state/txindex/kv/kv_test.go +++ b/state/txindex/kv/kv_test.go @@ -16,8 +16,8 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/state/txindex" - "github.com/celestiaorg/optimint/store" + "github.com/celestiaorg/rollmint/state/txindex" + "github.com/celestiaorg/rollmint/store" ) func TestTxIndex(t *testing.T) { diff --git a/state/txindex/null/null.go b/state/txindex/null/null.go index 6ea319bce6..40f7362b11 100644 --- a/state/txindex/null/null.go +++ b/state/txindex/null/null.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/celestiaorg/optimint/state/txindex" + "github.com/celestiaorg/rollmint/state/txindex" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/pubsub/query" ) diff --git a/store/store.go b/store/store.go index a974690d15..390e9de0b4 100644 --- a/store/store.go +++ b/store/store.go @@ -11,8 +11,8 @@ import ( tmtypes "github.com/tendermint/tendermint/types" "go.uber.org/multierr" - "github.com/celestiaorg/optimint/types" - pb "github.com/celestiaorg/optimint/types/pb/optimint" + "github.com/celestiaorg/rollmint/types" + pb "github.com/celestiaorg/rollmint/types/pb/optimint" ) var ( diff --git a/store/store_test.go b/store/store_test.go index f79bb8f9e0..b31bacf8c1 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -10,7 +10,7 @@ import ( tmstate "github.com/tendermint/tendermint/proto/tendermint/state" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/types.go b/store/types.go index 1e808222c8..f5b512709b 100644 --- a/store/types.go +++ b/store/types.go @@ -4,7 +4,7 @@ import ( tmstate "github.com/tendermint/tendermint/proto/tendermint/state" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/optimint/types" + "github.com/celestiaorg/rollmint/types" ) // Store is minimal interface for storing and retrieving blocks, commits and state. diff --git a/types/pb/dalc/dalc.pb.go b/types/pb/dalc/dalc.pb.go index d5a57ad598..cc8af11e80 100644 --- a/types/pb/dalc/dalc.pb.go +++ b/types/pb/dalc/dalc.pb.go @@ -6,7 +6,7 @@ package dalc import ( context "context" fmt "fmt" - optimint "github.com/celestiaorg/optimint/types/pb/optimint" + optimint "github.com/celestiaorg/rollmint/types/pb/optimint" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/types/serialization.go b/types/serialization.go index 5e5ddae737..cc9656dbb6 100644 --- a/types/serialization.go +++ b/types/serialization.go @@ -6,7 +6,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/types" - pb "github.com/celestiaorg/optimint/types/pb/optimint" + pb "github.com/celestiaorg/rollmint/types/pb/optimint" ) // MarshalBinary encodes Block into binary form and returns it. diff --git a/types/serialization_test.go b/types/serialization_test.go index 601840f1c3..8b163fa461 100644 --- a/types/serialization_test.go +++ b/types/serialization_test.go @@ -14,7 +14,7 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" tmtypes "github.com/tendermint/tendermint/types" - pb "github.com/celestiaorg/optimint/types/pb/optimint" + pb "github.com/celestiaorg/rollmint/types/pb/optimint" ) func TestBlockSerializationRoundTrip(t *testing.T) { From 063754c1283e3a049bcccd6fa59f67e4329f6457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 10:57:09 +0200 Subject: [PATCH 02/13] refactor: rename proto definitions --- da/celestia/celestia.go | 2 +- da/grpc/mockserv/mockserv.go | 4 +- proto/dalc/dalc.proto | 8 +- proto/get_deps.sh | 2 +- proto/protoc.sh | 2 +- .../rollmint.proto} | 4 +- proto/{optimint => rollmint}/state.proto | 4 +- proto/tendermint/abci/types.proto | 34 +- store/store.go | 2 +- types/pb/dalc/dalc.pb.go | 74 ++-- .../rollmint.pb.go} | 394 +++++++++--------- types/pb/{optimint => rollmint}/state.pb.go | 76 ++-- types/serialization.go | 2 +- types/serialization_test.go | 2 +- 14 files changed, 308 insertions(+), 302 deletions(-) rename proto/{optimint/optimint.proto => rollmint/rollmint.proto} (95%) rename proto/{optimint => rollmint}/state.proto (92%) rename types/pb/{optimint/optimint.pb.go => rollmint/rollmint.pb.go} (80%) rename types/pb/{optimint => rollmint}/state.pb.go (87%) diff --git a/da/celestia/celestia.go b/da/celestia/celestia.go index 9010cbd68e..50ffbb71a9 100644 --- a/da/celestia/celestia.go +++ b/da/celestia/celestia.go @@ -13,7 +13,7 @@ import ( "github.com/celestiaorg/rollmint/log" "github.com/celestiaorg/rollmint/store" "github.com/celestiaorg/rollmint/types" - pb "github.com/celestiaorg/rollmint/types/pb/optimint" + pb "github.com/celestiaorg/rollmint/types/pb/rollmint" ) // DataAvailabilityLayerClient use celestia-node public API. diff --git a/da/grpc/mockserv/mockserv.go b/da/grpc/mockserv/mockserv.go index 93639cd86c..842c23357f 100644 --- a/da/grpc/mockserv/mockserv.go +++ b/da/grpc/mockserv/mockserv.go @@ -2,6 +2,7 @@ package mockserv import ( "context" + "github.com/celestiaorg/rollmint/types/pb/rollmint" "os" tmlog "github.com/tendermint/tendermint/libs/log" @@ -12,7 +13,6 @@ import ( "github.com/celestiaorg/rollmint/store" "github.com/celestiaorg/rollmint/types" "github.com/celestiaorg/rollmint/types/pb/dalc" - "github.com/celestiaorg/rollmint/types/pb/optimint" ) // GetServer creates and returns gRPC server instance. @@ -68,7 +68,7 @@ func (m *mockImpl) CheckBlockAvailability(_ context.Context, request *dalc.Check func (m *mockImpl) RetrieveBlocks(context context.Context, request *dalc.RetrieveBlocksRequest) (*dalc.RetrieveBlocksResponse, error) { resp := m.mock.RetrieveBlocks(request.DAHeight) - blocks := make([]*optimint.Block, len(resp.Blocks)) + blocks := make([]*rollmint.Block, len(resp.Blocks)) for i := range resp.Blocks { blocks[i] = resp.Blocks[i].ToProto() } diff --git a/proto/dalc/dalc.proto b/proto/dalc/dalc.proto index 2c0bdb3224..37d01f017f 100644 --- a/proto/dalc/dalc.proto +++ b/proto/dalc/dalc.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package dalc; -option go_package = "github.com/celestiaorg/optimint/types/pb/dalc"; +option go_package = "github.com/celestiaorg/rollmint/types/pb/dalc"; -import "optimint/optimint.proto"; +import "rollmint/rollmint.proto"; import "gogoproto/gogo.proto"; enum StatusCode { @@ -19,7 +19,7 @@ message DAResponse { } message SubmitBlockRequest { - optimint.Block block = 1; + rollmint.Block block = 1; } message SubmitBlockResponse { @@ -41,7 +41,7 @@ message RetrieveBlocksRequest { message RetrieveBlocksResponse { DAResponse result = 1; - repeated optimint.Block blocks = 2; + repeated rollmint.Block blocks = 2; } service DALCService { diff --git a/proto/get_deps.sh b/proto/get_deps.sh index c0ce5ca931..2a7d5a15c9 100755 --- a/proto/get_deps.sh +++ b/proto/get_deps.sh @@ -2,7 +2,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" -TM_VERSION=v0.34.14 +TM_VERSION=v0.34.21 TM_PROTO_URL=https://raw.githubusercontent.com/tendermint/tendermint/$TM_VERSION/proto/tendermint TM_PROTO_FILES=( diff --git a/proto/protoc.sh b/proto/protoc.sh index 61444adebf..b362859627 100644 --- a/proto/protoc.sh +++ b/proto/protoc.sh @@ -3,4 +3,4 @@ set -eo pipefail buf generate --path="./proto/dalc" --template="buf.gen.yaml" --config="buf.yaml" -buf generate --path="./proto/optimint" --template="buf.gen.yaml" --config="buf.yaml" +buf generate --path="./proto/rollmint" --template="buf.gen.yaml" --config="buf.yaml" diff --git a/proto/optimint/optimint.proto b/proto/rollmint/rollmint.proto similarity index 95% rename from proto/optimint/optimint.proto rename to proto/rollmint/rollmint.proto index 5489b5fcaf..0e3aec6496 100644 --- a/proto/optimint/optimint.proto +++ b/proto/rollmint/rollmint.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package optimint; -option go_package = "github.com/celestiaorg/optimint/types/pb/optimint"; +package rollmint; +option go_package = "github.com/celestiaorg/rollmint/types/pb/rollmint"; import "tendermint/abci/types.proto"; // Version captures the consensus rules for processing a block in the blockchain, diff --git a/proto/optimint/state.proto b/proto/rollmint/state.proto similarity index 92% rename from proto/optimint/state.proto rename to proto/rollmint/state.proto index c6226fdb9f..d7380765e9 100644 --- a/proto/optimint/state.proto +++ b/proto/rollmint/state.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package optimint; -option go_package = "github.com/celestiaorg/optimint/types/pb/optimint"; +package rollmint; +option go_package = "github.com/celestiaorg/rollmint/types/pb/rollmint"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 8e3a909363..340800f46b 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -102,8 +102,7 @@ message RequestEndBlock { message RequestCommit {} // lists available snapshots -message RequestListSnapshots { -} +message RequestListSnapshots {} // offers a snapshot to the application message RequestOfferSnapshot { @@ -212,6 +211,12 @@ message ResponseCheckTx { repeated Event events = 7 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; string codespace = 8; + string sender = 9; + int64 priority = 10; + + // mempool_error is set by Tendermint. + // ABCI applictions creating a ResponseCheckTX should not set mempool_error. + string mempool_error = 11; } message ResponseDeliverTx { @@ -221,16 +226,17 @@ message ResponseDeliverTx { string info = 4; // nondeterministic int64 gas_wanted = 5 [json_name = "gas_wanted"]; int64 gas_used = 6 [json_name = "gas_used"]; - repeated Event events = 7 - [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic + repeated Event events = 7 [ + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "events,omitempty" + ]; // nondeterministic string codespace = 8; } message ResponseEndBlock { - repeated ValidatorUpdate validator_updates = 1 - [(gogoproto.nullable) = false]; - ConsensusParams consensus_param_updates = 2; - repeated Event events = 3 + repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; + ConsensusParams consensus_param_updates = 2; + repeated Event events = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; } @@ -364,10 +370,8 @@ message Evidence { // The height when the offense occurred int64 height = 3; // The corresponding time where the offense occurred - google.protobuf.Timestamp time = 4 [ - (gogoproto.nullable) = false, - (gogoproto.stdtime) = true - ]; + google.protobuf.Timestamp time = 4 + [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // Total voting power of the validator set in case the ABCI application does // not store historical validators. // https://github.com/tendermint/tendermint/issues/4581 @@ -402,6 +406,8 @@ service ABCIApplication { rpc EndBlock(RequestEndBlock) returns (ResponseEndBlock); rpc ListSnapshots(RequestListSnapshots) returns (ResponseListSnapshots); rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot); - rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk); - rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); + rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) + returns (ResponseLoadSnapshotChunk); + rpc ApplySnapshotChunk(RequestApplySnapshotChunk) + returns (ResponseApplySnapshotChunk); } diff --git a/store/store.go b/store/store.go index 390e9de0b4..e3af8d6121 100644 --- a/store/store.go +++ b/store/store.go @@ -12,7 +12,7 @@ import ( "go.uber.org/multierr" "github.com/celestiaorg/rollmint/types" - pb "github.com/celestiaorg/rollmint/types/pb/optimint" + pb "github.com/celestiaorg/rollmint/types/pb/rollmint" ) var ( diff --git a/types/pb/dalc/dalc.pb.go b/types/pb/dalc/dalc.pb.go index cc8af11e80..2b19c42566 100644 --- a/types/pb/dalc/dalc.pb.go +++ b/types/pb/dalc/dalc.pb.go @@ -6,7 +6,7 @@ package dalc import ( context "context" fmt "fmt" - optimint "github.com/celestiaorg/rollmint/types/pb/optimint" + rollmint "github.com/celestiaorg/rollmint/types/pb/rollmint" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" @@ -120,7 +120,7 @@ func (m *DAResponse) GetDAHeight() uint64 { } type SubmitBlockRequest struct { - Block *optimint.Block `protobuf:"bytes,1,opt,name=block,proto3" json:"block,omitempty"` + Block *rollmint.Block `protobuf:"bytes,1,opt,name=block,proto3" json:"block,omitempty"` } func (m *SubmitBlockRequest) Reset() { *m = SubmitBlockRequest{} } @@ -156,7 +156,7 @@ func (m *SubmitBlockRequest) XXX_DiscardUnknown() { var xxx_messageInfo_SubmitBlockRequest proto.InternalMessageInfo -func (m *SubmitBlockRequest) GetBlock() *optimint.Block { +func (m *SubmitBlockRequest) GetBlock() *rollmint.Block { if m != nil { return m.Block } @@ -349,7 +349,7 @@ func (m *RetrieveBlocksRequest) GetDAHeight() uint64 { type RetrieveBlocksResponse struct { Result *DAResponse `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"` - Blocks []*optimint.Block `protobuf:"bytes,2,rep,name=blocks,proto3" json:"blocks,omitempty"` + Blocks []*rollmint.Block `protobuf:"bytes,2,rep,name=blocks,proto3" json:"blocks,omitempty"` } func (m *RetrieveBlocksResponse) Reset() { *m = RetrieveBlocksResponse{} } @@ -392,7 +392,7 @@ func (m *RetrieveBlocksResponse) GetResult() *DAResponse { return nil } -func (m *RetrieveBlocksResponse) GetBlocks() []*optimint.Block { +func (m *RetrieveBlocksResponse) GetBlocks() []*rollmint.Block { if m != nil { return m.Blocks } @@ -416,38 +416,38 @@ var fileDescriptor_45d7d8eda2693dc1 = []byte{ // 542 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x8f, 0xd2, 0x4e, 0x14, 0xa6, 0xec, 0xfe, 0xf8, 0xb1, 0x0f, 0x65, 0x71, 0xd6, 0x5d, 0x2a, 0xab, 0x95, 0xd4, 0xdd, - 0x88, 0x26, 0xd2, 0x04, 0x8f, 0x1e, 0x4c, 0x69, 0xab, 0x62, 0x5c, 0x31, 0x2d, 0x5c, 0xbc, 0x90, - 0x69, 0x3b, 0x29, 0x13, 0xca, 0x0e, 0xdb, 0x19, 0x30, 0xfb, 0x27, 0x78, 0xf3, 0xcf, 0xf2, 0xb8, + 0x88, 0x26, 0xd2, 0x04, 0x8f, 0x1e, 0x4c, 0x69, 0xab, 0x62, 0x5c, 0x31, 0x53, 0xb8, 0x78, 0x21, + 0xd3, 0x76, 0x52, 0x1a, 0xca, 0x0e, 0xdb, 0x19, 0x30, 0xfb, 0x27, 0x78, 0xf3, 0xcf, 0xf2, 0xb8, 0x47, 0x4f, 0xc6, 0xc0, 0x3f, 0x62, 0x68, 0x0b, 0x0b, 0x2b, 0x92, 0xac, 0x97, 0xe6, 0xcd, 0xfb, - 0xe6, 0xbd, 0xf9, 0xbe, 0xbe, 0x2f, 0x0f, 0xf6, 0x7d, 0x1c, 0x7a, 0xda, 0xfc, 0x53, 0x1f, 0x45, - 0x4c, 0x30, 0xb4, 0x3b, 0x8f, 0x2b, 0x65, 0x36, 0x12, 0x74, 0x48, 0xcf, 0x85, 0xb6, 0x08, 0x12, - 0xb8, 0x72, 0x3f, 0x60, 0x01, 0x8b, 0x43, 0x6d, 0x1e, 0x25, 0x59, 0xf5, 0x0b, 0x80, 0xa9, 0xdb, - 0x84, 0x8f, 0xd8, 0x39, 0x27, 0xe8, 0x04, 0x76, 0x3d, 0xe6, 0x13, 0x59, 0xaa, 0x4a, 0xb5, 0x62, - 0xa3, 0x54, 0x8f, 0xbb, 0x3b, 0x02, 0x8b, 0x31, 0x37, 0x98, 0x4f, 0xec, 0x18, 0x45, 0x32, 0xfc, - 0x3f, 0x24, 0x9c, 0xe3, 0x80, 0xc8, 0xd9, 0xaa, 0x54, 0xdb, 0xb3, 0x17, 0x47, 0xf4, 0x0c, 0xf6, - 0x7c, 0xdc, 0xeb, 0x13, 0x1a, 0xf4, 0x85, 0xbc, 0x53, 0x95, 0x6a, 0xbb, 0xcd, 0x3b, 0xd3, 0x9f, - 0x8f, 0xf3, 0xa6, 0xfe, 0x2e, 0xce, 0xd9, 0x79, 0x1f, 0x27, 0x91, 0xfa, 0x0a, 0x90, 0x33, 0x76, - 0x87, 0x54, 0x34, 0x43, 0xe6, 0x0d, 0x6c, 0x72, 0x31, 0x26, 0x5c, 0xa0, 0x53, 0xf8, 0xcf, 0x9d, - 0x9f, 0x63, 0x06, 0x85, 0xc6, 0x7e, 0x7d, 0x29, 0x22, 0xb9, 0x96, 0xa0, 0xea, 0x6b, 0x38, 0x58, - 0x2b, 0x4e, 0xe9, 0xd7, 0x20, 0x17, 0x11, 0x3e, 0x0e, 0x45, 0x5a, 0x9e, 0x0a, 0xb8, 0x16, 0x68, - 0xa7, 0xb8, 0xfa, 0x1e, 0x1e, 0x19, 0x7d, 0xe2, 0x0d, 0xe2, 0x7a, 0x7d, 0x82, 0x69, 0x88, 0x5d, - 0x1a, 0x52, 0x71, 0xb9, 0x20, 0xb2, 0xa6, 0x44, 0xda, 0xaa, 0xe4, 0x02, 0x94, 0xbf, 0xf5, 0xba, - 0x2d, 0x2f, 0x74, 0x0a, 0x45, 0x1f, 0x0b, 0xdc, 0xc3, 0x49, 0x9b, 0x30, 0xf9, 0xc3, 0x79, 0xfb, - 0xee, 0x3c, 0xab, 0x2f, 0x92, 0x6a, 0x13, 0x0e, 0x6d, 0x22, 0x22, 0x4a, 0x26, 0x24, 0x7e, 0x95, + 0xe6, 0xbd, 0xf9, 0xbe, 0xbe, 0x2f, 0x0f, 0xf6, 0x3d, 0x12, 0xba, 0xda, 0xfc, 0x53, 0x1f, 0x45, + 0x4c, 0x30, 0xb4, 0x3b, 0x8f, 0x2b, 0xe5, 0x88, 0x85, 0xe1, 0x30, 0x38, 0x17, 0xda, 0x22, 0x48, + 0xe0, 0xca, 0x7d, 0x9f, 0xf9, 0x2c, 0x0e, 0xb5, 0x79, 0x94, 0x64, 0xd5, 0x2f, 0x00, 0xa6, 0x8e, + 0x29, 0x1f, 0xb1, 0x73, 0x4e, 0xd1, 0x09, 0xec, 0xba, 0xcc, 0xa3, 0xb2, 0x54, 0x95, 0x6a, 0xc5, + 0x46, 0xa9, 0x1e, 0x77, 0xb7, 0x05, 0x11, 0x63, 0x6e, 0x30, 0x8f, 0xe2, 0x18, 0x45, 0x32, 0xfc, + 0x3f, 0xa4, 0x9c, 0x13, 0x9f, 0xca, 0xd9, 0xaa, 0x54, 0xdb, 0xc3, 0x8b, 0x23, 0x7a, 0x06, 0x7b, + 0x1e, 0xe9, 0xf5, 0x69, 0xe0, 0xf7, 0x85, 0xbc, 0x53, 0x95, 0x6a, 0xbb, 0xcd, 0x3b, 0xd3, 0x9f, + 0x8f, 0xf3, 0xa6, 0xfe, 0x2e, 0xce, 0xe1, 0xbc, 0x47, 0x92, 0x48, 0x7d, 0x05, 0xc8, 0x1e, 0x3b, + 0xc3, 0x40, 0x34, 0x43, 0xe6, 0x0e, 0x30, 0xbd, 0x18, 0x53, 0x2e, 0xd0, 0x29, 0xfc, 0xe7, 0xcc, + 0xcf, 0x31, 0x83, 0x42, 0x63, 0xbf, 0xbe, 0x14, 0x91, 0x5c, 0x4b, 0x50, 0xf5, 0x35, 0x1c, 0xac, + 0x15, 0xa7, 0xf4, 0x6b, 0x90, 0x8b, 0x28, 0x1f, 0x87, 0x22, 0x2d, 0x4f, 0x05, 0x5c, 0x0b, 0xc4, + 0x29, 0xae, 0xbe, 0x87, 0x47, 0x46, 0x9f, 0xba, 0x83, 0xb8, 0x5e, 0x9f, 0x90, 0x20, 0x24, 0x4e, + 0x10, 0x06, 0xe2, 0x72, 0x41, 0x64, 0x4d, 0x89, 0xb4, 0x55, 0xc9, 0x05, 0x28, 0x7f, 0xeb, 0x75, + 0x5b, 0x5e, 0xe8, 0x14, 0x8a, 0x1e, 0x11, 0xa4, 0x47, 0x92, 0x36, 0x61, 0xf2, 0x87, 0xf3, 0xf8, + 0xee, 0x3c, 0xab, 0x2f, 0x92, 0x6a, 0x13, 0x0e, 0x31, 0x15, 0x51, 0x40, 0x27, 0x34, 0x7e, 0x95, 0xff, 0x03, 0xed, 0x01, 0x1c, 0xdd, 0xec, 0x71, 0x6b, 0xba, 0x4f, 0x21, 0x17, 0x0f, 0x84, 0xcb, - 0xd9, 0xea, 0xce, 0xa6, 0x79, 0xa5, 0xf0, 0xf3, 0x08, 0xe0, 0xda, 0x46, 0xe8, 0x18, 0xca, 0x4e, - 0x47, 0xef, 0x74, 0x9d, 0x9e, 0xd1, 0x36, 0xad, 0x5e, 0xf7, 0xa3, 0xf3, 0xc9, 0x32, 0x5a, 0x6f, - 0x5a, 0x96, 0x59, 0xca, 0xa0, 0x32, 0x1c, 0xac, 0x82, 0x4e, 0xd7, 0x30, 0x2c, 0xc7, 0x29, 0x49, - 0x37, 0x81, 0x4e, 0xeb, 0xcc, 0x6a, 0x77, 0x3b, 0xa5, 0x2c, 0x3a, 0x84, 0x7b, 0xab, 0x80, 0x65, - 0xdb, 0x6d, 0xbb, 0xb4, 0xd3, 0xf8, 0x9a, 0x85, 0x82, 0xa9, 0x7f, 0x30, 0x1c, 0x12, 0x4d, 0xa8, - 0x47, 0x90, 0x09, 0x85, 0x15, 0xd3, 0x20, 0x39, 0x75, 0xf7, 0x1f, 0x26, 0xac, 0x3c, 0xd8, 0x80, - 0x24, 0xc2, 0xd5, 0x0c, 0x22, 0x70, 0xb4, 0x79, 0xda, 0xe8, 0x49, 0x52, 0xb6, 0xd5, 0x57, 0x95, - 0x93, 0xed, 0x97, 0x96, 0xcf, 0x9c, 0x41, 0x71, 0x7d, 0x3a, 0xe8, 0x38, 0xa9, 0xdc, 0x38, 0xf7, - 0xca, 0xc3, 0xcd, 0xe0, 0xa2, 0x5d, 0xf3, 0xed, 0xf7, 0xa9, 0x22, 0x5d, 0x4d, 0x15, 0xe9, 0xd7, - 0x54, 0x91, 0xbe, 0xcd, 0x94, 0xcc, 0xd5, 0x4c, 0xc9, 0xfc, 0x98, 0x29, 0x99, 0xcf, 0x2f, 0x02, - 0x2a, 0xfa, 0x63, 0xb7, 0xee, 0xb1, 0xa1, 0xe6, 0x91, 0x90, 0x70, 0x41, 0x31, 0x8b, 0x82, 0xe5, - 0xf6, 0xd0, 0xc4, 0xe5, 0x88, 0x70, 0x6d, 0xe4, 0xc6, 0xab, 0xc6, 0xcd, 0xc5, 0x6b, 0xe3, 0xe5, - 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x98, 0xfb, 0x9a, 0x7e, 0x04, 0x00, 0x00, + 0xd9, 0xea, 0xce, 0xa6, 0x79, 0xa5, 0xf0, 0xf3, 0x08, 0xe0, 0xda, 0x46, 0xe8, 0x18, 0xca, 0x76, + 0x47, 0xef, 0x74, 0xed, 0x9e, 0xd1, 0x36, 0xad, 0x5e, 0xf7, 0xa3, 0xfd, 0xc9, 0x32, 0x5a, 0x6f, + 0x5a, 0x96, 0x59, 0xca, 0xa0, 0x32, 0x1c, 0xac, 0x82, 0x76, 0xd7, 0x30, 0x2c, 0xdb, 0x2e, 0x49, + 0x37, 0x81, 0x4e, 0xeb, 0xcc, 0x6a, 0x77, 0x3b, 0xa5, 0x2c, 0x3a, 0x84, 0x7b, 0xab, 0x80, 0x85, + 0x71, 0x1b, 0x97, 0x76, 0x1a, 0x5f, 0xb3, 0x50, 0x30, 0xf5, 0x0f, 0x86, 0x4d, 0xa3, 0x49, 0xe0, + 0x52, 0x64, 0x42, 0x61, 0xc5, 0x34, 0x48, 0x4e, 0xdd, 0xfd, 0x87, 0x09, 0x2b, 0x0f, 0x36, 0x20, + 0x89, 0x70, 0x35, 0x83, 0x28, 0x1c, 0x6d, 0x9e, 0x36, 0x7a, 0x92, 0x94, 0x6d, 0xf5, 0x55, 0xe5, + 0x64, 0xfb, 0xa5, 0xe5, 0x33, 0x67, 0x50, 0x5c, 0x9f, 0x0e, 0x3a, 0x4e, 0x2a, 0x37, 0xce, 0xbd, + 0xf2, 0x70, 0x33, 0xb8, 0x68, 0xd7, 0x7c, 0xfb, 0x7d, 0xaa, 0x48, 0x57, 0x53, 0x45, 0xfa, 0x35, + 0x55, 0xa4, 0x6f, 0x33, 0x25, 0x73, 0x35, 0x53, 0x32, 0x3f, 0x66, 0x4a, 0xe6, 0xf3, 0x0b, 0x3f, + 0x10, 0xfd, 0xb1, 0x53, 0x77, 0xd9, 0x50, 0x73, 0x69, 0x48, 0xb9, 0x08, 0x08, 0x8b, 0xfc, 0xe5, + 0xf6, 0xd0, 0xc4, 0xe5, 0x88, 0x72, 0x6d, 0xe4, 0xc4, 0xab, 0xc6, 0xc9, 0xc5, 0x6b, 0xe3, 0xe5, + 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x11, 0x62, 0x41, 0x7e, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1162,7 +1162,7 @@ func (m *SubmitBlockRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Block == nil { - m.Block = &optimint.Block{} + m.Block = &rollmint.Block{} } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1613,7 +1613,7 @@ func (m *RetrieveBlocksResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Blocks = append(m.Blocks, &optimint.Block{}) + m.Blocks = append(m.Blocks, &rollmint.Block{}) if err := m.Blocks[len(m.Blocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/types/pb/optimint/optimint.pb.go b/types/pb/rollmint/rollmint.pb.go similarity index 80% rename from types/pb/optimint/optimint.pb.go rename to types/pb/rollmint/rollmint.pb.go index 9a5112a048..f4d191a3b0 100644 --- a/types/pb/optimint/optimint.pb.go +++ b/types/pb/rollmint/rollmint.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: optimint/optimint.proto +// source: rollmint/rollmint.proto -package optimint +package rollmint import ( fmt "fmt" @@ -36,7 +36,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_c876654a788c67ff, []int{0} + return fileDescriptor_ed7ee25509332ba7, []int{0} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -116,7 +116,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_c876654a788c67ff, []int{1} + return fileDescriptor_ed7ee25509332ba7, []int{1} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -240,7 +240,7 @@ func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_c876654a788c67ff, []int{2} + return fileDescriptor_ed7ee25509332ba7, []int{2} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -299,7 +299,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_c876654a788c67ff, []int{3} + return fileDescriptor_ed7ee25509332ba7, []int{3} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -352,7 +352,7 @@ func (m *Data) Reset() { *m = Data{} } func (m *Data) String() string { return proto.CompactTextString(m) } func (*Data) ProtoMessage() {} func (*Data) Descriptor() ([]byte, []int) { - return fileDescriptor_c876654a788c67ff, []int{4} + return fileDescriptor_ed7ee25509332ba7, []int{4} } func (m *Data) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -412,7 +412,7 @@ func (m *Block) Reset() { *m = Block{} } func (m *Block) String() string { return proto.CompactTextString(m) } func (*Block) ProtoMessage() {} func (*Block) Descriptor() ([]byte, []int) { - return fileDescriptor_c876654a788c67ff, []int{5} + return fileDescriptor_ed7ee25509332ba7, []int{5} } func (m *Block) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -463,55 +463,55 @@ func (m *Block) GetLastCommit() *Commit { } func init() { - proto.RegisterType((*Version)(nil), "optimint.Version") - proto.RegisterType((*Header)(nil), "optimint.Header") - proto.RegisterType((*Commit)(nil), "optimint.Commit") - proto.RegisterType((*SignedHeader)(nil), "optimint.SignedHeader") - proto.RegisterType((*Data)(nil), "optimint.Data") - proto.RegisterType((*Block)(nil), "optimint.Block") + proto.RegisterType((*Version)(nil), "rollmint.Version") + proto.RegisterType((*Header)(nil), "rollmint.Header") + proto.RegisterType((*Commit)(nil), "rollmint.Commit") + proto.RegisterType((*SignedHeader)(nil), "rollmint.SignedHeader") + proto.RegisterType((*Data)(nil), "rollmint.Data") + proto.RegisterType((*Block)(nil), "rollmint.Block") } -func init() { proto.RegisterFile("optimint/optimint.proto", fileDescriptor_c876654a788c67ff) } +func init() { proto.RegisterFile("rollmint/rollmint.proto", fileDescriptor_ed7ee25509332ba7) } -var fileDescriptor_c876654a788c67ff = []byte{ +var fileDescriptor_ed7ee25509332ba7 = []byte{ // 593 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xc1, 0x6e, 0xd3, 0x4c, 0x10, 0xc7, 0xeb, 0x26, 0x4d, 0xd2, 0x49, 0xbe, 0x7e, 0xe9, 0x0a, 0x15, 0x97, 0x4a, 0xa6, 0x58, 0x42, 0x2a, 0x20, 0x25, 0x6a, 0x11, 0x12, 0x57, 0x0a, 0x48, 0x45, 0xdc, 0x5c, 0x89, 0x03, 0x97, - 0x68, 0x6d, 0x8f, 0xec, 0x15, 0xb1, 0x77, 0xb5, 0xbb, 0xa9, 0xe0, 0x0d, 0xe0, 0xc6, 0xeb, 0xf0, + 0x68, 0x63, 0x8f, 0xec, 0x15, 0xb6, 0x77, 0xb5, 0xbb, 0xa9, 0xe0, 0x0d, 0xe0, 0xc6, 0xeb, 0xf0, 0x06, 0x1c, 0x7b, 0xe4, 0x88, 0xda, 0x17, 0x41, 0x3b, 0xeb, 0xd8, 0xa9, 0xc4, 0x81, 0x4b, 0xb4, - 0xfb, 0xff, 0xff, 0x32, 0x3b, 0x33, 0x9e, 0x5d, 0xb8, 0x2f, 0x95, 0x15, 0x95, 0xa8, 0xed, 0x7c, - 0xbd, 0x98, 0x29, 0x2d, 0xad, 0x64, 0xa3, 0xf5, 0xfe, 0xc1, 0x91, 0xc5, 0x3a, 0x47, 0x4d, 0x10, - 0x4f, 0x33, 0x31, 0xb7, 0x5f, 0x14, 0x1a, 0x8f, 0xc5, 0xa7, 0x30, 0xfc, 0x80, 0xda, 0x08, 0x59, - 0xb3, 0x7b, 0xb0, 0x93, 0x2e, 0x65, 0xf6, 0x29, 0x0c, 0x8e, 0x83, 0x93, 0x7e, 0xe2, 0x37, 0x6c, - 0x0a, 0x3d, 0xae, 0x54, 0xb8, 0x4d, 0x9a, 0x5b, 0xc6, 0x3f, 0x7a, 0x30, 0xb8, 0x40, 0x9e, 0xa3, - 0x66, 0xcf, 0x60, 0x78, 0xe5, 0xff, 0x4d, 0x7f, 0x1a, 0x9f, 0xed, 0xcf, 0xda, 0x34, 0x9a, 0xb0, - 0xc9, 0x9a, 0x60, 0x8f, 0x60, 0x52, 0xf3, 0x0a, 0x8d, 0xe2, 0x19, 0x2e, 0x44, 0x4e, 0x21, 0x27, - 0xc9, 0xb8, 0xd5, 0xde, 0xe5, 0xec, 0x00, 0x06, 0x25, 0x8a, 0xa2, 0xb4, 0x61, 0x8f, 0xce, 0x6b, - 0x76, 0x8c, 0x41, 0xdf, 0x8a, 0x0a, 0xc3, 0x3e, 0xa9, 0xb4, 0x66, 0x27, 0x30, 0x5d, 0x72, 0x63, - 0x17, 0x25, 0xa5, 0xb2, 0x28, 0xb9, 0x29, 0xc3, 0x1d, 0x0a, 0xb9, 0xe7, 0x74, 0x9f, 0xe1, 0x05, - 0x37, 0x65, 0x4b, 0x66, 0xb2, 0xaa, 0x84, 0xf5, 0xe4, 0xa0, 0x23, 0x5f, 0x93, 0x4c, 0xe4, 0x11, - 0xec, 0xe6, 0xdc, 0x72, 0x8f, 0x0c, 0x09, 0x19, 0x39, 0x81, 0xcc, 0xc7, 0xb0, 0x97, 0xc9, 0xda, - 0x60, 0x6d, 0x56, 0xc6, 0x13, 0x23, 0x22, 0xfe, 0x6b, 0x55, 0xc2, 0x0e, 0x61, 0xc4, 0x95, 0xf2, - 0xc0, 0x2e, 0x01, 0x43, 0xae, 0x14, 0x59, 0x4f, 0x61, 0x9f, 0x12, 0xd1, 0x68, 0x56, 0x4b, 0xdb, - 0x04, 0x01, 0x62, 0xfe, 0x77, 0x46, 0xe2, 0x75, 0x62, 0x9f, 0xc0, 0x54, 0x69, 0xa9, 0xa4, 0x41, - 0xbd, 0xe0, 0x79, 0xae, 0xd1, 0x98, 0x70, 0xec, 0xd1, 0xb5, 0xfe, 0xca, 0xcb, 0x0e, 0xe5, 0x45, - 0xa1, 0xb1, 0xe0, 0x56, 0xea, 0x26, 0xea, 0xc4, 0xa3, 0x1b, 0xba, 0x8b, 0x1a, 0x73, 0x18, 0xf8, - 0x72, 0x37, 0x5a, 0x1d, 0xdc, 0x69, 0xf5, 0x43, 0x18, 0x6f, 0x76, 0xd4, 0x7f, 0x24, 0x28, 0xbb, - 0x6e, 0x46, 0x00, 0x46, 0x14, 0x35, 0xb7, 0x2b, 0x8d, 0x26, 0xec, 0x1d, 0xf7, 0x9c, 0xdf, 0x29, - 0x71, 0x0a, 0x93, 0x4b, 0x51, 0xd4, 0x98, 0x37, 0x33, 0x72, 0xe2, 0x0e, 0x72, 0xab, 0x66, 0x44, - 0xa6, 0xdd, 0x88, 0x78, 0x22, 0x69, 0x7c, 0x47, 0xfa, 0x4f, 0x44, 0xa7, 0xde, 0x21, 0x7d, 0xd2, - 0x49, 0xe3, 0xc7, 0xdf, 0x02, 0xe8, 0xbf, 0xe1, 0x96, 0xbb, 0xe9, 0xb4, 0x9f, 0x4d, 0x18, 0x50, - 0x16, 0x6e, 0xc9, 0x5e, 0x42, 0x28, 0x6a, 0x8b, 0xba, 0xc2, 0x5c, 0x70, 0x8b, 0x0b, 0x63, 0xdd, - 0xaf, 0x96, 0xd2, 0x9a, 0x70, 0x9b, 0xb0, 0x83, 0x4d, 0xff, 0xd2, 0xd9, 0x89, 0x73, 0xd9, 0x0b, - 0x18, 0xe1, 0x95, 0xc8, 0xb1, 0xce, 0x90, 0xca, 0x1a, 0x9f, 0x1d, 0xce, 0xba, 0xab, 0x33, 0x73, - 0x57, 0x67, 0xf6, 0xb6, 0x01, 0x92, 0x16, 0x8d, 0xbf, 0x06, 0xb0, 0x73, 0x4e, 0x57, 0xe5, 0xdf, - 0x2b, 0x8d, 0xa1, 0xef, 0xc6, 0xaa, 0xa9, 0x73, 0xaf, 0xe3, 0x5c, 0x51, 0x09, 0x79, 0xec, 0x14, - 0xc6, 0x1b, 0x53, 0x4b, 0x17, 0xe2, 0x6f, 0x2d, 0x81, 0x6e, 0x84, 0xcf, 0xdf, 0xff, 0xbc, 0x89, - 0x82, 0xeb, 0x9b, 0x28, 0xf8, 0x7d, 0x13, 0x05, 0xdf, 0x6f, 0xa3, 0xad, 0xeb, 0xdb, 0x68, 0xeb, - 0xd7, 0x6d, 0xb4, 0xf5, 0xf1, 0xb4, 0x10, 0xb6, 0x5c, 0xa5, 0xb3, 0x4c, 0x56, 0xf3, 0x0c, 0x97, - 0x68, 0xac, 0xe0, 0x52, 0x17, 0xed, 0xa3, 0xe1, 0xdf, 0x84, 0xb9, 0x4a, 0x5b, 0x25, 0x1d, 0xd0, - 0x03, 0xf1, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, 0xed, 0x29, 0xb9, 0x62, 0x04, 0x00, + 0xfb, 0xff, 0xff, 0x32, 0x3b, 0x33, 0x9e, 0x5d, 0xb8, 0xaf, 0x65, 0x59, 0x56, 0xa2, 0xb6, 0xf3, + 0xf5, 0x62, 0xa6, 0xb4, 0xb4, 0x92, 0x8d, 0xd6, 0xfb, 0x07, 0x47, 0x16, 0xeb, 0x0c, 0x35, 0x41, + 0x7c, 0x99, 0x8a, 0xb9, 0xfd, 0xa2, 0xd0, 0x78, 0x2c, 0x3e, 0x85, 0xe1, 0x07, 0xd4, 0x46, 0xc8, + 0x9a, 0xdd, 0x83, 0x9d, 0x65, 0x29, 0xd3, 0x4f, 0x61, 0x70, 0x1c, 0x9c, 0xf4, 0x13, 0xbf, 0x61, + 0x53, 0xe8, 0x71, 0xa5, 0xc2, 0x6d, 0xd2, 0xdc, 0x32, 0xfe, 0xd1, 0x83, 0xc1, 0x05, 0xf2, 0x0c, + 0x35, 0x7b, 0x06, 0xc3, 0x2b, 0xff, 0x6f, 0xfa, 0xd3, 0xf8, 0x6c, 0x7f, 0xd6, 0xa6, 0xd1, 0x84, + 0x4d, 0xd6, 0x04, 0x7b, 0x04, 0x93, 0x9a, 0x57, 0x68, 0x14, 0x4f, 0x71, 0x21, 0x32, 0x0a, 0x39, + 0x49, 0xc6, 0xad, 0xf6, 0x2e, 0x63, 0x07, 0x30, 0x28, 0x50, 0xe4, 0x85, 0x0d, 0x7b, 0x74, 0x5e, + 0xb3, 0x63, 0x0c, 0xfa, 0x56, 0x54, 0x18, 0xf6, 0x49, 0xa5, 0x35, 0x3b, 0x81, 0x69, 0xc9, 0x8d, + 0x5d, 0x14, 0x94, 0xca, 0xa2, 0xe0, 0xa6, 0x08, 0x77, 0x28, 0xe4, 0x9e, 0xd3, 0x7d, 0x86, 0x17, + 0xdc, 0x14, 0x2d, 0x99, 0xca, 0xaa, 0x12, 0xd6, 0x93, 0x83, 0x8e, 0x7c, 0x4d, 0x32, 0x91, 0x47, + 0xb0, 0x9b, 0x71, 0xcb, 0x3d, 0x32, 0x24, 0x64, 0xe4, 0x04, 0x32, 0x1f, 0xc3, 0x5e, 0x2a, 0x6b, + 0x83, 0xb5, 0x59, 0x19, 0x4f, 0x8c, 0x88, 0xf8, 0xaf, 0x55, 0x09, 0x3b, 0x84, 0x11, 0x57, 0xca, + 0x03, 0xbb, 0x04, 0x0c, 0xb9, 0x52, 0x64, 0x3d, 0x85, 0x7d, 0x4a, 0x44, 0xa3, 0x59, 0x95, 0xb6, + 0x09, 0x02, 0xc4, 0xfc, 0xef, 0x8c, 0xc4, 0xeb, 0xc4, 0x3e, 0x81, 0xa9, 0xd2, 0x52, 0x49, 0x83, + 0x7a, 0xc1, 0xb3, 0x4c, 0xa3, 0x31, 0xe1, 0xd8, 0xa3, 0x6b, 0xfd, 0x95, 0x97, 0x1d, 0xca, 0xf3, + 0x5c, 0x63, 0xce, 0xad, 0xd4, 0x4d, 0xd4, 0x89, 0x47, 0x37, 0x74, 0x17, 0x35, 0xe6, 0x30, 0xf0, + 0xe5, 0x6e, 0xb4, 0x3a, 0xb8, 0xd3, 0xea, 0x87, 0x30, 0xde, 0xec, 0xa8, 0xff, 0x48, 0x50, 0x74, + 0xdd, 0x8c, 0x00, 0x8c, 0xc8, 0x6b, 0x6e, 0x57, 0x1a, 0x4d, 0xd8, 0x3b, 0xee, 0x39, 0xbf, 0x53, + 0xe2, 0x25, 0x4c, 0x2e, 0x45, 0x5e, 0x63, 0xd6, 0xcc, 0xc8, 0x89, 0x3b, 0xc8, 0xad, 0x9a, 0x11, + 0x99, 0x76, 0x23, 0xe2, 0x89, 0xa4, 0xf1, 0x1d, 0xe9, 0x3f, 0x11, 0x9d, 0x7a, 0x87, 0xf4, 0x49, + 0x27, 0x8d, 0x1f, 0x7f, 0x0b, 0xa0, 0xff, 0x86, 0x5b, 0xee, 0xa6, 0xd3, 0x7e, 0x36, 0x61, 0x40, + 0x59, 0xb8, 0x25, 0x7b, 0x09, 0xa1, 0xa8, 0x2d, 0xea, 0x0a, 0x33, 0xc1, 0x2d, 0x2e, 0x8c, 0x75, + 0xbf, 0x5a, 0x4a, 0x6b, 0xc2, 0x6d, 0xc2, 0x0e, 0x36, 0xfd, 0x4b, 0x67, 0x27, 0xce, 0x65, 0x2f, + 0x60, 0x84, 0x57, 0x22, 0xc3, 0x3a, 0x45, 0x2a, 0x6b, 0x7c, 0x76, 0x38, 0xeb, 0xae, 0xce, 0xcc, + 0x5d, 0x9d, 0xd9, 0xdb, 0x06, 0x48, 0x5a, 0x34, 0xfe, 0x1a, 0xc0, 0xce, 0x39, 0x5d, 0x95, 0x7f, + 0xaf, 0x34, 0x86, 0xbe, 0x1b, 0xab, 0xa6, 0xce, 0xbd, 0x8e, 0x73, 0x45, 0x25, 0xe4, 0xb1, 0x53, + 0x18, 0x6f, 0x4c, 0x2d, 0x5d, 0x88, 0xbf, 0xb5, 0x04, 0xba, 0x11, 0x3e, 0x7f, 0xff, 0xf3, 0x26, + 0x0a, 0xae, 0x6f, 0xa2, 0xe0, 0xf7, 0x4d, 0x14, 0x7c, 0xbf, 0x8d, 0xb6, 0xae, 0x6f, 0xa3, 0xad, + 0x5f, 0xb7, 0xd1, 0xd6, 0xc7, 0xd3, 0x5c, 0xd8, 0x62, 0xb5, 0x9c, 0xa5, 0xb2, 0x9a, 0xa7, 0x58, + 0xa2, 0xb1, 0x82, 0x4b, 0x9d, 0xb7, 0x8f, 0x86, 0x7f, 0x13, 0xe6, 0x6a, 0xd9, 0x2a, 0xcb, 0x01, + 0x3d, 0x10, 0xcf, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xff, 0x4f, 0x18, 0x98, 0x62, 0x04, 0x00, 0x00, } @@ -536,12 +536,12 @@ func (m *Version) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.App != 0 { - i = encodeVarintOptimint(dAtA, i, uint64(m.App)) + i = encodeVarintRollmint(dAtA, i, uint64(m.App)) i-- dAtA[i] = 0x10 } if m.Block != 0 { - i = encodeVarintOptimint(dAtA, i, uint64(m.Block)) + i = encodeVarintRollmint(dAtA, i, uint64(m.Block)) i-- dAtA[i] = 0x8 } @@ -571,73 +571,73 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.AggregatorsHash) > 0 { i -= len(m.AggregatorsHash) copy(dAtA[i:], m.AggregatorsHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.AggregatorsHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.AggregatorsHash))) i-- dAtA[i] = 0x62 } if len(m.ProposerAddress) > 0 { i -= len(m.ProposerAddress) copy(dAtA[i:], m.ProposerAddress) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.ProposerAddress))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.ProposerAddress))) i-- dAtA[i] = 0x5a } if len(m.LastResultsHash) > 0 { i -= len(m.LastResultsHash) copy(dAtA[i:], m.LastResultsHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.LastResultsHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.LastResultsHash))) i-- dAtA[i] = 0x52 } if len(m.AppHash) > 0 { i -= len(m.AppHash) copy(dAtA[i:], m.AppHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.AppHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.AppHash))) i-- dAtA[i] = 0x4a } if len(m.ConsensusHash) > 0 { i -= len(m.ConsensusHash) copy(dAtA[i:], m.ConsensusHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.ConsensusHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.ConsensusHash))) i-- dAtA[i] = 0x42 } if len(m.DataHash) > 0 { i -= len(m.DataHash) copy(dAtA[i:], m.DataHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.DataHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.DataHash))) i-- dAtA[i] = 0x3a } if len(m.LastCommitHash) > 0 { i -= len(m.LastCommitHash) copy(dAtA[i:], m.LastCommitHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.LastCommitHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.LastCommitHash))) i-- dAtA[i] = 0x32 } if len(m.LastHeaderHash) > 0 { i -= len(m.LastHeaderHash) copy(dAtA[i:], m.LastHeaderHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.LastHeaderHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.LastHeaderHash))) i-- dAtA[i] = 0x2a } if m.Time != 0 { - i = encodeVarintOptimint(dAtA, i, uint64(m.Time)) + i = encodeVarintRollmint(dAtA, i, uint64(m.Time)) i-- dAtA[i] = 0x20 } if m.Height != 0 { - i = encodeVarintOptimint(dAtA, i, uint64(m.Height)) + i = encodeVarintRollmint(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x18 } if len(m.NamespaceId) > 0 { i -= len(m.NamespaceId) copy(dAtA[i:], m.NamespaceId) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.NamespaceId))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.NamespaceId))) i-- dAtA[i] = 0x12 } @@ -648,7 +648,7 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintOptimint(dAtA, i, uint64(size)) + i = encodeVarintRollmint(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -680,7 +680,7 @@ func (m *Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.Signatures) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Signatures[iNdEx]) copy(dAtA[i:], m.Signatures[iNdEx]) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.Signatures[iNdEx]))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.Signatures[iNdEx]))) i-- dAtA[i] = 0x1a } @@ -688,12 +688,12 @@ func (m *Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.HeaderHash) > 0 { i -= len(m.HeaderHash) copy(dAtA[i:], m.HeaderHash) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.HeaderHash))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.HeaderHash))) i-- dAtA[i] = 0x12 } if m.Height != 0 { - i = encodeVarintOptimint(dAtA, i, uint64(m.Height)) + i = encodeVarintRollmint(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x8 } @@ -727,7 +727,7 @@ func (m *SignedHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintOptimint(dAtA, i, uint64(size)) + i = encodeVarintRollmint(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -739,7 +739,7 @@ func (m *SignedHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintOptimint(dAtA, i, uint64(size)) + i = encodeVarintRollmint(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -775,7 +775,7 @@ func (m *Data) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintOptimint(dAtA, i, uint64(size)) + i = encodeVarintRollmint(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -785,7 +785,7 @@ func (m *Data) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.IntermediateStateRoots) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.IntermediateStateRoots[iNdEx]) copy(dAtA[i:], m.IntermediateStateRoots[iNdEx]) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.IntermediateStateRoots[iNdEx]))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.IntermediateStateRoots[iNdEx]))) i-- dAtA[i] = 0x12 } @@ -794,7 +794,7 @@ func (m *Data) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.Txs) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Txs[iNdEx]) copy(dAtA[i:], m.Txs[iNdEx]) - i = encodeVarintOptimint(dAtA, i, uint64(len(m.Txs[iNdEx]))) + i = encodeVarintRollmint(dAtA, i, uint64(len(m.Txs[iNdEx]))) i-- dAtA[i] = 0xa } @@ -829,7 +829,7 @@ func (m *Block) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintOptimint(dAtA, i, uint64(size)) + i = encodeVarintRollmint(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -841,7 +841,7 @@ func (m *Block) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintOptimint(dAtA, i, uint64(size)) + i = encodeVarintRollmint(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -853,7 +853,7 @@ func (m *Block) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintOptimint(dAtA, i, uint64(size)) + i = encodeVarintRollmint(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -861,8 +861,8 @@ func (m *Block) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func encodeVarintOptimint(dAtA []byte, offset int, v uint64) int { - offset -= sovOptimint(v) +func encodeVarintRollmint(dAtA []byte, offset int, v uint64) int { + offset -= sovRollmint(v) base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -879,10 +879,10 @@ func (m *Version) Size() (n int) { var l int _ = l if m.Block != 0 { - n += 1 + sovOptimint(uint64(m.Block)) + n += 1 + sovRollmint(uint64(m.Block)) } if m.App != 0 { - n += 1 + sovOptimint(uint64(m.App)) + n += 1 + sovRollmint(uint64(m.App)) } return n } @@ -895,49 +895,49 @@ func (m *Header) Size() (n int) { _ = l if m.Version != nil { l = m.Version.Size() - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.NamespaceId) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } if m.Height != 0 { - n += 1 + sovOptimint(uint64(m.Height)) + n += 1 + sovRollmint(uint64(m.Height)) } if m.Time != 0 { - n += 1 + sovOptimint(uint64(m.Time)) + n += 1 + sovRollmint(uint64(m.Time)) } l = len(m.LastHeaderHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.LastCommitHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.DataHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.ConsensusHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.AppHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.LastResultsHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.ProposerAddress) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } l = len(m.AggregatorsHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } return n } @@ -949,16 +949,16 @@ func (m *Commit) Size() (n int) { var l int _ = l if m.Height != 0 { - n += 1 + sovOptimint(uint64(m.Height)) + n += 1 + sovRollmint(uint64(m.Height)) } l = len(m.HeaderHash) if l > 0 { - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } if len(m.Signatures) > 0 { for _, b := range m.Signatures { l = len(b) - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } } return n @@ -972,11 +972,11 @@ func (m *SignedHeader) Size() (n int) { _ = l if m.Header != nil { l = m.Header.Size() - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } if m.Commit != nil { l = m.Commit.Size() - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } return n } @@ -990,19 +990,19 @@ func (m *Data) Size() (n int) { if len(m.Txs) > 0 { for _, b := range m.Txs { l = len(b) - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } } if len(m.IntermediateStateRoots) > 0 { for _, b := range m.IntermediateStateRoots { l = len(b) - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } } if len(m.Evidence) > 0 { for _, e := range m.Evidence { l = e.Size() - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } } return n @@ -1016,24 +1016,24 @@ func (m *Block) Size() (n int) { _ = l if m.Header != nil { l = m.Header.Size() - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } if m.Data != nil { l = m.Data.Size() - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } if m.LastCommit != nil { l = m.LastCommit.Size() - n += 1 + l + sovOptimint(uint64(l)) + n += 1 + l + sovRollmint(uint64(l)) } return n } -func sovOptimint(x uint64) (n int) { +func sovRollmint(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } -func sozOptimint(x uint64) (n int) { - return sovOptimint(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +func sozRollmint(x uint64) (n int) { + return sovRollmint(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *Version) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -1043,7 +1043,7 @@ func (m *Version) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1071,7 +1071,7 @@ func (m *Version) Unmarshal(dAtA []byte) error { m.Block = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1090,7 +1090,7 @@ func (m *Version) Unmarshal(dAtA []byte) error { m.App = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1104,12 +1104,12 @@ func (m *Version) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipOptimint(dAtA[iNdEx:]) + skippy, err := skipRollmint(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1131,7 +1131,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1159,7 +1159,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1172,11 +1172,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1195,7 +1195,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1208,11 +1208,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1229,7 +1229,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1248,7 +1248,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.Time = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1267,7 +1267,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1280,11 +1280,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1301,7 +1301,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1314,11 +1314,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1335,7 +1335,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1348,11 +1348,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1369,7 +1369,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1382,11 +1382,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1403,7 +1403,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1416,11 +1416,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1437,7 +1437,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1450,11 +1450,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1471,7 +1471,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1484,11 +1484,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1505,7 +1505,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1518,11 +1518,11 @@ func (m *Header) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1534,12 +1534,12 @@ func (m *Header) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipOptimint(dAtA[iNdEx:]) + skippy, err := skipRollmint(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1561,7 +1561,7 @@ func (m *Commit) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1589,7 +1589,7 @@ func (m *Commit) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1608,7 +1608,7 @@ func (m *Commit) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1621,11 +1621,11 @@ func (m *Commit) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1642,7 +1642,7 @@ func (m *Commit) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1655,11 +1655,11 @@ func (m *Commit) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1669,12 +1669,12 @@ func (m *Commit) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipOptimint(dAtA[iNdEx:]) + skippy, err := skipRollmint(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1696,7 +1696,7 @@ func (m *SignedHeader) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1724,7 +1724,7 @@ func (m *SignedHeader) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1737,11 +1737,11 @@ func (m *SignedHeader) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1760,7 +1760,7 @@ func (m *SignedHeader) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1773,11 +1773,11 @@ func (m *SignedHeader) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1791,12 +1791,12 @@ func (m *SignedHeader) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipOptimint(dAtA[iNdEx:]) + skippy, err := skipRollmint(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1818,7 +1818,7 @@ func (m *Data) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1846,7 +1846,7 @@ func (m *Data) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1859,11 +1859,11 @@ func (m *Data) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1878,7 +1878,7 @@ func (m *Data) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1891,11 +1891,11 @@ func (m *Data) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1910,7 +1910,7 @@ func (m *Data) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1923,11 +1923,11 @@ func (m *Data) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -1939,12 +1939,12 @@ func (m *Data) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipOptimint(dAtA[iNdEx:]) + skippy, err := skipRollmint(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1966,7 +1966,7 @@ func (m *Block) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1994,7 +1994,7 @@ func (m *Block) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2007,11 +2007,11 @@ func (m *Block) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -2030,7 +2030,7 @@ func (m *Block) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2043,11 +2043,11 @@ func (m *Block) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -2066,7 +2066,7 @@ func (m *Block) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowOptimint + return ErrIntOverflowRollmint } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2079,11 +2079,11 @@ func (m *Block) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if postIndex > l { return io.ErrUnexpectedEOF @@ -2097,12 +2097,12 @@ func (m *Block) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipOptimint(dAtA[iNdEx:]) + skippy, err := skipRollmint(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOptimint + return ErrInvalidLengthRollmint } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -2116,7 +2116,7 @@ func (m *Block) Unmarshal(dAtA []byte) error { } return nil } -func skipOptimint(dAtA []byte) (n int, err error) { +func skipRollmint(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 depth := 0 @@ -2124,7 +2124,7 @@ func skipOptimint(dAtA []byte) (n int, err error) { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowOptimint + return 0, ErrIntOverflowRollmint } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -2141,7 +2141,7 @@ func skipOptimint(dAtA []byte) (n int, err error) { case 0: for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowOptimint + return 0, ErrIntOverflowRollmint } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -2157,7 +2157,7 @@ func skipOptimint(dAtA []byte) (n int, err error) { var length int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowOptimint + return 0, ErrIntOverflowRollmint } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -2170,14 +2170,14 @@ func skipOptimint(dAtA []byte) (n int, err error) { } } if length < 0 { - return 0, ErrInvalidLengthOptimint + return 0, ErrInvalidLengthRollmint } iNdEx += length case 3: depth++ case 4: if depth == 0 { - return 0, ErrUnexpectedEndOfGroupOptimint + return 0, ErrUnexpectedEndOfGroupRollmint } depth-- case 5: @@ -2186,7 +2186,7 @@ func skipOptimint(dAtA []byte) (n int, err error) { return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } if iNdEx < 0 { - return 0, ErrInvalidLengthOptimint + return 0, ErrInvalidLengthRollmint } if depth == 0 { return iNdEx, nil @@ -2196,7 +2196,7 @@ func skipOptimint(dAtA []byte) (n int, err error) { } var ( - ErrInvalidLengthOptimint = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowOptimint = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupOptimint = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthRollmint = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowRollmint = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupRollmint = fmt.Errorf("proto: unexpected end of group") ) diff --git a/types/pb/optimint/state.pb.go b/types/pb/rollmint/state.pb.go similarity index 87% rename from types/pb/optimint/state.pb.go rename to types/pb/rollmint/state.pb.go index 06158ad228..2a2e790e0f 100644 --- a/types/pb/optimint/state.pb.go +++ b/types/pb/rollmint/state.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: optimint/state.proto +// source: rollmint/state.proto -package optimint +package rollmint import ( fmt "fmt" @@ -52,7 +52,7 @@ func (m *State) Reset() { *m = State{} } func (m *State) String() string { return proto.CompactTextString(m) } func (*State) ProtoMessage() {} func (*State) Descriptor() ([]byte, []int) { - return fileDescriptor_eff9abc4ea60e43b, []int{0} + return fileDescriptor_86999017b1330537, []int{0} } func (m *State) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -187,50 +187,50 @@ func (m *State) GetAppHash() []byte { } func init() { - proto.RegisterType((*State)(nil), "optimint.State") + proto.RegisterType((*State)(nil), "rollmint.State") } -func init() { proto.RegisterFile("optimint/state.proto", fileDescriptor_eff9abc4ea60e43b) } +func init() { proto.RegisterFile("rollmint/state.proto", fileDescriptor_86999017b1330537) } -var fileDescriptor_eff9abc4ea60e43b = []byte{ +var fileDescriptor_86999017b1330537 = []byte{ // 590 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4f, 0x6f, 0xd3, 0x30, 0x18, 0xc6, 0x1b, 0xf6, 0xa7, 0x99, 0xfb, 0x0f, 0xc2, 0x0e, 0x59, 0x07, 0x69, 0x40, 0x20, 0x15, 0x0e, 0x89, 0x60, 0x77, 0x24, 0xd2, 0x4a, 0xac, 0x62, 0x42, 0x28, 0x43, 0x3b, 0x70, 0x89, 0x9c, 0xc4, 0x24, 0x16, 0x69, 0x1c, 0xc5, 0xee, 0x04, 0xdf, 0x62, 0x1f, 0x6b, 0xc7, 0x1d, 0x39, 0x15, 0xd4, 0x7e, 0x0a, 0x6e, 0xc8, 0x76, 0x9c, 0x66, 0x2b, 0x87, 0xdd, 0x9a, 0xe7, 0x7d, 0xde, 0x5f, - 0x9f, 0xd7, 0xaf, 0x13, 0x70, 0x48, 0x0a, 0x86, 0xe7, 0x38, 0x67, 0x2e, 0x65, 0x90, 0x21, 0xa7, - 0x28, 0x09, 0x23, 0x86, 0xae, 0xd4, 0xe1, 0x61, 0x42, 0x12, 0x22, 0x44, 0x97, 0xff, 0x92, 0xf5, - 0xe1, 0x28, 0x21, 0x24, 0xc9, 0x90, 0x2b, 0x9e, 0xc2, 0xc5, 0x37, 0x97, 0xe1, 0x39, 0xa2, 0x0c, - 0xce, 0x8b, 0xca, 0x70, 0xcc, 0x50, 0x1e, 0xa3, 0x52, 0x80, 0x61, 0x18, 0x61, 0x97, 0xfd, 0x2c, - 0x10, 0xad, 0x8a, 0x4f, 0x1a, 0x45, 0xa1, 0xdf, 0xaa, 0xda, 0x5b, 0xd5, 0x4b, 0x98, 0xe1, 0x18, - 0x32, 0x52, 0x56, 0x8e, 0xa7, 0x5b, 0x8e, 0x02, 0x96, 0x70, 0xfe, 0x3f, 0xbc, 0x18, 0xaa, 0x89, - 0x7f, 0xfe, 0x77, 0x1f, 0xec, 0x9d, 0x73, 0xd5, 0x38, 0x01, 0xed, 0x4b, 0x54, 0x52, 0x4c, 0x72, - 0x53, 0xb3, 0xb5, 0x71, 0xe7, 0xed, 0x91, 0xb3, 0xe9, 0x74, 0xe4, 0x71, 0x5c, 0x48, 0x83, 0xaf, - 0x9c, 0xc6, 0x11, 0xd0, 0xa3, 0x14, 0xe2, 0x3c, 0xc0, 0xb1, 0xf9, 0xc0, 0xd6, 0xc6, 0x07, 0x7e, - 0x5b, 0x3c, 0xcf, 0x62, 0xe3, 0x25, 0xe8, 0xe3, 0x1c, 0x33, 0x0c, 0xb3, 0x20, 0x45, 0x38, 0x49, - 0x99, 0xb9, 0x63, 0x6b, 0xe3, 0x1d, 0xbf, 0x57, 0xa9, 0xa7, 0x42, 0x34, 0x5e, 0x83, 0x47, 0x19, - 0xa4, 0x2c, 0x08, 0x33, 0x12, 0x7d, 0x57, 0xce, 0x5d, 0xe1, 0x1c, 0xf0, 0x82, 0xc7, 0xf5, 0xca, - 0xeb, 0x83, 0x5e, 0xc3, 0x8b, 0x63, 0x73, 0x6f, 0x3b, 0xa8, 0x1c, 0x4e, 0x74, 0xcd, 0xa6, 0xde, - 0xe3, 0xeb, 0xe5, 0xa8, 0xb5, 0x5a, 0x8e, 0x3a, 0x67, 0x0a, 0x35, 0x9b, 0xfa, 0x9d, 0x9a, 0x3b, - 0x8b, 0x8d, 0x33, 0x30, 0x68, 0x30, 0xf9, 0xe2, 0xcc, 0x7d, 0x41, 0x1d, 0x3a, 0x72, 0xab, 0x8e, - 0xda, 0xaa, 0xf3, 0x45, 0x6d, 0xd5, 0xd3, 0x39, 0xf6, 0xea, 0xf7, 0x48, 0xf3, 0x7b, 0x35, 0x8b, - 0x57, 0x8d, 0x57, 0xe0, 0x20, 0x86, 0x6a, 0x8a, 0xb6, 0xad, 0x8d, 0x77, 0xbd, 0xee, 0x6a, 0x39, - 0xd2, 0xa7, 0xef, 0xe5, 0x08, 0xbe, 0x1e, 0xc3, 0x6a, 0x98, 0x0f, 0x60, 0x90, 0xa3, 0x1f, 0x2c, - 0xa8, 0xd7, 0x49, 0x4d, 0x5d, 0xfc, 0xb1, 0xb5, 0x3d, 0xce, 0x85, 0xf2, 0x9c, 0x23, 0xe6, 0xf7, - 0x79, 0x5b, 0xad, 0x50, 0xe3, 0x1d, 0x00, 0x0d, 0xc6, 0xc1, 0xbd, 0x18, 0x8d, 0x0e, 0x1e, 0x44, - 0x9c, 0x40, 0x03, 0x02, 0xee, 0x17, 0x84, 0xb7, 0x35, 0x82, 0x4c, 0x80, 0x25, 0x40, 0x72, 0xfc, - 0x06, 0x2f, 0x88, 0x52, 0x98, 0x27, 0x28, 0x36, 0x3b, 0x62, 0xaf, 0xc7, 0xdc, 0x25, 0x4f, 0x61, - 0xd3, 0x3d, 0x91, 0x16, 0xc3, 0x07, 0x0f, 0x23, 0x92, 0x53, 0x94, 0xd3, 0x05, 0x0d, 0xe4, 0x45, - 0x36, 0xbb, 0x22, 0xce, 0xb3, 0xed, 0x38, 0x13, 0xe5, 0xfc, 0x2c, 0x8c, 0xde, 0x2e, 0xdf, 0x8b, - 0x3f, 0x88, 0x6e, 0xcb, 0xc6, 0x27, 0xf0, 0xa2, 0x19, 0xec, 0x2e, 0xbf, 0x8e, 0xd7, 0x13, 0xf1, - 0xec, 0x4d, 0xbc, 0x3b, 0x7c, 0x95, 0x51, 0xdd, 0xd9, 0x12, 0xd1, 0x45, 0xc6, 0x68, 0x90, 0x42, - 0x9a, 0x9a, 0x7d, 0x5b, 0x1b, 0x77, 0xe5, 0x9d, 0xf5, 0xa5, 0x7e, 0x0a, 0x69, 0xca, 0xdf, 0x10, - 0x58, 0x14, 0xd2, 0x32, 0x10, 0x96, 0x36, 0x2c, 0x0a, 0x5e, 0xf2, 0x3e, 0x5e, 0xaf, 0x2c, 0xed, - 0x66, 0x65, 0x69, 0x7f, 0x56, 0x96, 0x76, 0xb5, 0xb6, 0x5a, 0x37, 0x6b, 0xab, 0xf5, 0x6b, 0x6d, - 0xb5, 0xbe, 0xbe, 0x49, 0x30, 0x4b, 0x17, 0xa1, 0x13, 0x91, 0xb9, 0x1b, 0xa1, 0x0c, 0x51, 0x86, - 0x21, 0x29, 0x13, 0xb7, 0xfe, 0x3a, 0x55, 0xef, 0x79, 0x58, 0x2b, 0xe1, 0xbe, 0xb8, 0xa6, 0x27, - 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x9e, 0xff, 0x6a, 0xc2, 0x04, 0x00, 0x00, + 0x9f, 0xd7, 0xaf, 0x13, 0x70, 0x58, 0x92, 0x2c, 0x9b, 0xe3, 0x9c, 0xb9, 0x94, 0x41, 0x86, 0x9c, + 0xa2, 0x24, 0x8c, 0x18, 0xba, 0x52, 0x87, 0x87, 0x09, 0x49, 0x88, 0x10, 0x5d, 0xfe, 0x4b, 0xd6, + 0x87, 0xa3, 0x84, 0x90, 0x24, 0x43, 0xae, 0x78, 0x0a, 0x17, 0xdf, 0x5c, 0x86, 0xe7, 0x88, 0x32, + 0x38, 0x2f, 0x2a, 0xc3, 0x31, 0x43, 0x79, 0x8c, 0x4a, 0x01, 0x86, 0x61, 0x84, 0x5d, 0xf6, 0xb3, + 0x40, 0xb4, 0x2a, 0x3e, 0x69, 0x14, 0x85, 0x7e, 0xab, 0x6a, 0x6f, 0x55, 0x2f, 0x61, 0x86, 0x63, + 0xc8, 0x48, 0x59, 0x39, 0x9e, 0x6e, 0x39, 0x0a, 0x58, 0xc2, 0xf9, 0xff, 0xf0, 0x62, 0xa8, 0x26, + 0xfe, 0xf9, 0xdf, 0x7d, 0xb0, 0x77, 0xce, 0x55, 0xe3, 0x04, 0xb4, 0x2f, 0x51, 0x49, 0x31, 0xc9, + 0x4d, 0xcd, 0xd6, 0xc6, 0x9d, 0xb7, 0x47, 0xce, 0xa6, 0xd3, 0x91, 0xc7, 0x71, 0x21, 0x0d, 0xbe, + 0x72, 0x1a, 0x47, 0x40, 0x8f, 0x52, 0x88, 0xf3, 0x00, 0xc7, 0xe6, 0x03, 0x5b, 0x1b, 0x1f, 0xf8, + 0x6d, 0xf1, 0x3c, 0x8b, 0x8d, 0x97, 0xa0, 0x8f, 0x73, 0xcc, 0x30, 0xcc, 0x82, 0x14, 0xe1, 0x24, + 0x65, 0xe6, 0x8e, 0xad, 0x8d, 0x77, 0xfc, 0x5e, 0xa5, 0x9e, 0x0a, 0xd1, 0x78, 0x0d, 0x1e, 0x65, + 0x90, 0xb2, 0x20, 0xcc, 0x48, 0xf4, 0x5d, 0x39, 0x77, 0x85, 0x73, 0xc0, 0x0b, 0x1e, 0xd7, 0x2b, + 0xaf, 0x0f, 0x7a, 0x0d, 0x2f, 0x8e, 0xcd, 0xbd, 0xed, 0xa0, 0x72, 0x38, 0xd1, 0x35, 0x9b, 0x7a, + 0x8f, 0xaf, 0x97, 0xa3, 0xd6, 0x6a, 0x39, 0xea, 0x9c, 0x29, 0xd4, 0x6c, 0xea, 0x77, 0x6a, 0xee, + 0x2c, 0x36, 0xce, 0xc0, 0xa0, 0xc1, 0xe4, 0x8b, 0x33, 0xf7, 0x05, 0x75, 0xe8, 0xc8, 0xad, 0x3a, + 0x6a, 0xab, 0xce, 0x17, 0xb5, 0x55, 0x4f, 0xe7, 0xd8, 0xab, 0xdf, 0x23, 0xcd, 0xef, 0xd5, 0x2c, + 0x5e, 0x35, 0x5e, 0x81, 0x83, 0x18, 0xaa, 0x29, 0xda, 0xb6, 0x36, 0xde, 0xf5, 0xba, 0xab, 0xe5, + 0x48, 0x9f, 0xbe, 0x97, 0x23, 0xf8, 0x7a, 0x0c, 0xab, 0x61, 0x3e, 0x80, 0x41, 0x8e, 0x7e, 0xb0, + 0xa0, 0x5e, 0x27, 0x35, 0x75, 0xf1, 0xc7, 0xd6, 0xf6, 0x38, 0x17, 0xca, 0x73, 0x8e, 0x98, 0xdf, + 0xe7, 0x6d, 0xb5, 0x42, 0x8d, 0x77, 0x00, 0x34, 0x18, 0x07, 0xf7, 0x62, 0x34, 0x3a, 0x78, 0x10, + 0x71, 0x02, 0x0d, 0x08, 0xb8, 0x5f, 0x10, 0xde, 0xd6, 0x08, 0x32, 0x01, 0x96, 0x00, 0xc9, 0xf1, + 0x1b, 0xbc, 0x20, 0x4a, 0x61, 0x9e, 0xa0, 0xd8, 0xec, 0x88, 0xbd, 0x1e, 0x73, 0x97, 0x3c, 0x85, + 0x4d, 0xf7, 0x44, 0x5a, 0x0c, 0x1f, 0x3c, 0x8c, 0x48, 0x4e, 0x51, 0x4e, 0x17, 0x34, 0x90, 0x17, + 0xd9, 0xec, 0x8a, 0x38, 0xcf, 0xb6, 0xe3, 0x4c, 0x94, 0xf3, 0xb3, 0x30, 0x7a, 0xbb, 0x7c, 0x2f, + 0xfe, 0x20, 0xba, 0x2d, 0x1b, 0x9f, 0xc0, 0x8b, 0x66, 0xb0, 0xbb, 0xfc, 0x3a, 0x5e, 0x4f, 0xc4, + 0xb3, 0x37, 0xf1, 0xee, 0xf0, 0x55, 0x46, 0x75, 0x67, 0x4b, 0x44, 0x17, 0x19, 0xa3, 0x41, 0x0a, + 0x69, 0x6a, 0xf6, 0x6d, 0x6d, 0xdc, 0x95, 0x77, 0xd6, 0x97, 0xfa, 0x29, 0xa4, 0x29, 0x7f, 0x43, + 0x60, 0x51, 0x48, 0xcb, 0x40, 0x58, 0xda, 0xb0, 0x28, 0x78, 0xc9, 0xfb, 0x78, 0xbd, 0xb2, 0xb4, + 0x9b, 0x95, 0xa5, 0xfd, 0x59, 0x59, 0xda, 0xd5, 0xda, 0x6a, 0xdd, 0xac, 0xad, 0xd6, 0xaf, 0xb5, + 0xd5, 0xfa, 0xfa, 0x26, 0xc1, 0x2c, 0x5d, 0x84, 0x4e, 0x44, 0xe6, 0x6e, 0x84, 0x32, 0x44, 0x19, + 0x86, 0xa4, 0x4c, 0xdc, 0xfa, 0xeb, 0x54, 0xbd, 0xe7, 0x61, 0xad, 0x84, 0xfb, 0xe2, 0x9a, 0x9e, + 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x44, 0xdb, 0xc0, 0x7e, 0xc2, 0x04, 0x00, 0x00, } func (m *State) Marshal() (dAtA []byte, err error) { diff --git a/types/serialization.go b/types/serialization.go index cc9656dbb6..d42a4d99ca 100644 --- a/types/serialization.go +++ b/types/serialization.go @@ -6,7 +6,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/types" - pb "github.com/celestiaorg/rollmint/types/pb/optimint" + pb "github.com/celestiaorg/rollmint/types/pb/rollmint" ) // MarshalBinary encodes Block into binary form and returns it. diff --git a/types/serialization_test.go b/types/serialization_test.go index 8b163fa461..55bbdba542 100644 --- a/types/serialization_test.go +++ b/types/serialization_test.go @@ -14,7 +14,7 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" tmtypes "github.com/tendermint/tendermint/types" - pb "github.com/celestiaorg/rollmint/types/pb/optimint" + pb "github.com/celestiaorg/rollmint/types/pb/rollmint" ) func TestBlockSerializationRoundTrip(t *testing.T) { From afb6c3fe15233953e26795e7a9b613ca7dd07f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 11:06:52 +0200 Subject: [PATCH 03/13] docs: rename to rollmint in README.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d36c69da22..76e58152b9 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# optimint +# rollmint ABCI-client implementation for Optimistic Rollups. Design document: -[![build-and-test](https://github.com/celestiaorg/optimint/actions/workflows/test.yml/badge.svg)](https://github.com/celestiaorg/optimint/actions/workflows/test.yml) -[![golangci-lint](https://github.com/celestiaorg/optimint/actions/workflows/lint.yml/badge.svg)](https://github.com/celestiaorg/optimint/actions/workflows/lint.yml) -[![Go Report Card](https://goreportcard.com/badge/github.com/celestiaorg/optimint)](https://goreportcard.com/report/github.com/celestiaorg/optimint) -[![codecov](https://codecov.io/gh/celestiaorg/optimint/branch/main/graph/badge.svg?token=CWGA4RLDS9)](https://codecov.io/gh/celestiaorg/optimint) -[![GoDoc](https://godoc.org/github.com/celestiaorg/optimint?status.svg)](https://godoc.org/github.com/celestiaorg/optimint) +[![build-and-test](https://github.com/celestiaorg/rollmint/actions/workflows/test.yml/badge.svg)](https://github.com/celestiaorg/rollmint/actions/workflows/test.yml) +[![golangci-lint](https://github.com/celestiaorg/rollmint/actions/workflows/lint.yml/badge.svg)](https://github.com/celestiaorg/rollmint/actions/workflows/lint.yml) +[![Go Report Card](https://goreportcard.com/badge/github.com/celestiaorg/rollmint)](https://goreportcard.com/report/github.com/celestiaorg/rollmint) +[![codecov](https://codecov.io/gh/celestiaorg/rollmint/branch/main/graph/badge.svg?token=CWGA4RLDS9)](https://codecov.io/gh/celestiaorg/rollmint) +[![GoDoc](https://godoc.org/github.com/celestiaorg/rollmint?status.svg)](https://godoc.org/github.com/celestiaorg/rollmint) [![Twitter Follow](https://img.shields.io/twitter/follow/CelestiaOrg?style=social)](https://twitter.com/CelestiaOrg) ## Building From Source @@ -18,8 +18,8 @@ Requires Go version >= 1.17. To build: ```sh -git clone https://github.com/celestiaorg/optimint.git -cd optimint +git clone https://github.com/celestiaorg/rollmint.git +cd rollmint go build -v ./... ``` @@ -40,7 +40,7 @@ To regenerate protobuf types: We welcome your contributions! Everyone is welcome to contribute, whether it's in the form of code, documentation, bug reports, feature requests, or anything else. -If you're looking for issues to work on, try looking at the [good first issue list](https://github.com/celestiaorg/optimint/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). Issues with this tag are suitable for a new external contributor and is a great way to find something you can help with! +If you're looking for issues to work on, try looking at the [good first issue list](https://github.com/celestiaorg/rollmint/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). Issues with this tag are suitable for a new external contributor and is a great way to find something you can help with! See [the contributing guide](./CONTRIBUTING.md) for more details. From 2de7d621cc3550a53148704a9caa6576d6a52a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 11:10:40 +0200 Subject: [PATCH 04/13] add copyright NOTICE file --- NOTICE | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 NOTICE diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000000..17619ce3f1 --- /dev/null +++ b/NOTICE @@ -0,0 +1,2 @@ +rollmint +Copyright 2021-2022 Celestia Labs From b2ac93dcb77c4dd2de9884f7de631b78a44b15b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 11:11:56 +0200 Subject: [PATCH 05/13] docs: rename to rollmint in contribution guide --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0230400a1a..91a8399c2d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## Finding an issue -GitHub issues are used to track the work associated with Optimint. That's where you can find things to work on. +GitHub issues are used to track the work associated with rollmint. That's where you can find things to work on. Issue labels have been used to help designate the priority, status and beginner-friendliness of various issues. Here are some of the ones that are most relevant to finding a good issue to work on: @@ -11,7 +11,7 @@ Issue labels have been used to help designate the priority, status and beginner- No explicit permission is needed to work on these issues but it would be good idea to tag the user who opened the issue and ask that the issue is assinged to yourself. -All issue labels can be [found here](https://github.com/celestiaorg/optimint/labels) for you to explore and see what peaks your interest. +All issue labels can be [found here](https://github.com/celestiaorg/rollmint/labels) for you to explore and see what peaks your interest. ## Contribution process From f661cb847b2918707cba90c78a412be3c3110823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 11:30:44 +0200 Subject: [PATCH 06/13] refactor: rename optimint to rollmint in the code --- block/manager.go | 4 ++-- config/config.go | 20 ++++++++++---------- conv/abci/block.go | 16 ++++++++-------- conv/addr_test.go | 6 +++--- conv/config.go | 2 +- da/da.go | 4 ++-- da/grpc/mockserv/cmd/main.go | 2 +- da/test/da_test.go | 2 +- node/node.go | 6 +++--- rpc/client/client.go | 10 +++++----- state/executor.go | 10 +++++----- store/store_test.go | 2 +- types/block.go | 6 +++--- types/serialization_test.go | 2 +- types/state.go | 2 +- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/block/manager.go b/block/manager.go index 0c977c1568..d2804a5a6a 100644 --- a/block/manager.go +++ b/block/manager.go @@ -27,7 +27,7 @@ import ( // defaultDABlockTime is used only if DABlockTime is not configured for manager const defaultDABlockTime = 30 * time.Second -// maxSubmitAttempts defines how many times Optimint will re-try to publish block to DA layer. +// maxSubmitAttempts defines how many times rollmint will re-try to publish block to DA layer. // This is temporary solution. It will be removed in future versions. const maxSubmitAttempts = 30 @@ -497,7 +497,7 @@ func (m *Manager) submitBlockToDA(ctx context.Context, block *types.Block) error for attempt := 1; ctx.Err() == nil && !submitted && attempt <= maxSubmitAttempts; attempt++ { res := m.dalc.SubmitBlock(block) if res.Code == da.StatusSuccess { - m.logger.Info("successfully submitted optimint block to DA layer", "optimintHeight", block.Header.Height, "daHeight", res.DAHeight) + m.logger.Info("successfully submitted rollmint block to DA layer", "rollmintHeight", block.Header.Height, "daHeight", res.DAHeight) submitted = true } else { m.logger.Error("DA layer submission failed", "error", res.Message, "attempt", attempt) diff --git a/config/config.go b/config/config.go index 51a33039f1..578d751a83 100644 --- a/config/config.go +++ b/config/config.go @@ -9,23 +9,23 @@ import ( ) const ( - flagAggregator = "optimint.aggregator" - flagDALayer = "optimint.da_layer" - flagDAConfig = "optimint.da_config" - flagBlockTime = "optimint.block_time" - flagDABlockTime = "optimint.da_block_time" - flagDAStartHeight = "optimint.da_start_height" - flagNamespaceID = "optimint.namespace_id" + flagAggregator = "rollmint.aggregator" + flagDALayer = "rollmint.da_layer" + flagDAConfig = "rollmint.da_config" + flagBlockTime = "rollmint.block_time" + flagDABlockTime = "rollmint.da_block_time" + flagDAStartHeight = "rollmint.da_start_height" + flagNamespaceID = "rollmint.namespace_id" ) -// NodeConfig stores Optimint node configuration. +// NodeConfig stores rollmint node configuration. type NodeConfig struct { // parameters below are translated from existing config RootDir string DBPath string P2P P2PConfig RPC RPCConfig - // parameters below are optimint specific and read from config + // parameters below are rollmint specific and read from config Aggregator bool `mapstructure:"aggregator"` BlockManagerConfig `mapstructure:",squash"` DALayer string `mapstructure:"da_layer"` @@ -62,7 +62,7 @@ func (nc *NodeConfig) GetViperConfig(v *viper.Viper) error { return nil } -// AddFlags adds Optimint specific configuration options to cobra Command. +// AddFlags adds rollmint specific configuration options to cobra Command. // // This function is called in cosmos-sdk. func AddFlags(cmd *cobra.Command) { diff --git a/conv/abci/block.go b/conv/abci/block.go index 984d4ba4cd..412c81f9d6 100644 --- a/conv/abci/block.go +++ b/conv/abci/block.go @@ -10,8 +10,8 @@ import ( "github.com/celestiaorg/rollmint/types" ) -// ToABCIHeaderPB converts Optimint header to Header format defined in ABCI. -// Caller should fill all the fields that are not available in Optimint header (like ChainID). +// ToABCIHeaderPB converts rollmint header to Header format defined in ABCI. +// Caller should fill all the fields that are not available in rollmint header (like ChainID). func ToABCIHeaderPB(header *types.Header) (tmproto.Header, error) { return tmproto.Header{ Version: tmversion.Consensus{ @@ -39,8 +39,8 @@ func ToABCIHeaderPB(header *types.Header) (tmproto.Header, error) { }, nil } -// ToABCIHeader converts Optimint header to Header format defined in ABCI. -// Caller should fill all the fields that are not available in Optimint header (like ChainID). +// ToABCIHeader converts rollmint header to Header format defined in ABCI. +// Caller should fill all the fields that are not available in rollmint header (like ChainID). func ToABCIHeader(header *types.Header) (tmtypes.Header, error) { return tmtypes.Header{ Version: tmversion.Consensus{ @@ -68,7 +68,7 @@ func ToABCIHeader(header *types.Header) (tmtypes.Header, error) { }, nil } -// ToABCIBlock converts Optimint block into block format defined by ABCI. +// ToABCIBlock converts rollmint block into block format defined by ABCI. // Returned block should pass `ValidateBasic`. func ToABCIBlock(block *types.Block) (*tmtypes.Block, error) { abciHeader, err := ToABCIHeader(&block.Header) @@ -96,7 +96,7 @@ func ToABCIBlock(block *types.Block) (*tmtypes.Block, error) { return &abciBlock, nil } -// ToABCIBlockMeta converts Optimint block into BlockMeta format defined by ABCI +// ToABCIBlockMeta converts rollmint block into BlockMeta format defined by ABCI func ToABCIBlockMeta(block *types.Block) (*tmtypes.BlockMeta, error) { tmblock, err := ToABCIBlock(block) if err != nil { @@ -112,8 +112,8 @@ func ToABCIBlockMeta(block *types.Block) (*tmtypes.BlockMeta, error) { }, nil } -// ToABCICommit converts Optimint commit into commit format defined by ABCI. -// This function only converts fields that are available in Optimint commit. +// ToABCICommit converts rollmint commit into commit format defined by ABCI. +// This function only converts fields that are available in rollmint commit. // Other fields (especially ValidatorAddress and Timestamp of Signature) has to be filled by caller. func ToABCICommit(commit *types.Commit) *tmtypes.Commit { tmCommit := tmtypes.Commit{ diff --git a/conv/addr_test.go b/conv/addr_test.go index 12f6fa182e..e868d17a3c 100644 --- a/conv/addr_test.go +++ b/conv/addr_test.go @@ -15,7 +15,7 @@ func TestTranslateAddresses(t *testing.T) { invalidCosmos := "foobar" validCosmos := "127.0.0.1:1234" - validOptimint := "/ip4/127.0.0.1/tcp/1234" + validRollmint := "/ip4/127.0.0.1/tcp/1234" cases := []struct { name string @@ -27,13 +27,13 @@ func TestTranslateAddresses(t *testing.T) { { "valid listen address", config.NodeConfig{P2P: config.P2PConfig{ListenAddress: validCosmos}}, - config.NodeConfig{P2P: config.P2PConfig{ListenAddress: validOptimint}}, + config.NodeConfig{P2P: config.P2PConfig{ListenAddress: validRollmint}}, "", }, { "valid seed address", config.NodeConfig{P2P: config.P2PConfig{Seeds: validCosmos + "," + validCosmos}}, - config.NodeConfig{P2P: config.P2PConfig{Seeds: validOptimint + "," + validOptimint}}, + config.NodeConfig{P2P: config.P2PConfig{Seeds: validRollmint + "," + validRollmint}}, "", }, { diff --git a/conv/config.go b/conv/config.go index 9f48a87b2d..0ec06669f1 100644 --- a/conv/config.go +++ b/conv/config.go @@ -6,7 +6,7 @@ import ( "github.com/celestiaorg/rollmint/config" ) -// GetNodeConfig translates Tendermint's configuration into Optimint configuration. +// GetNodeConfig translates Tendermint's configuration into rollmint 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. diff --git a/da/da.go b/da/da.go index b3e6d74d3a..bb49a0be92 100644 --- a/da/da.go +++ b/da/da.go @@ -8,7 +8,7 @@ import ( // StatusCode is a type for DA layer return status. // TODO: define an enum of different non-happy-path cases -// that might need to be handled by Optimint independent of +// that might need to be handled by rollmint independent of // the underlying DA chain. type StatusCode uint64 @@ -34,7 +34,7 @@ type BaseResult struct { type ResultSubmitBlock struct { BaseResult // Not sure if this needs to be bubbled up to other - // parts of Optimint. + // parts of rollmint. // Hash hash.Hash } diff --git a/da/grpc/mockserv/cmd/main.go b/da/grpc/mockserv/cmd/main.go index 2b49ee6623..ed03867c72 100644 --- a/da/grpc/mockserv/cmd/main.go +++ b/da/grpc/mockserv/cmd/main.go @@ -18,7 +18,7 @@ func main() { flag.StringVar(&conf.Host, "host", "0.0.0.0", "listening address") flag.Parse() - kv := store.NewDefaultKVStore(".", "db", "optimint") + kv := store.NewDefaultKVStore(".", "db", "rollmint") lis, err := net.Listen("tcp", conf.Host+":"+strconv.Itoa(conf.Port)) if err != nil { log.Panic(err) diff --git a/da/test/da_test.go b/da/test/da_test.go index 89254f3718..3de54dee5f 100644 --- a/da/test/da_test.go +++ b/da/test/da_test.go @@ -104,7 +104,7 @@ func doTestDALC(t *testing.T, dalc da.DataAvailabilityLayerClient) { h2 := resp.DAHeight assert.Equal(da.StatusSuccess, resp.Code) - // wait a bit more than mockDaBlockTime, so optimint blocks can be "included" in mock block + // wait a bit more than mockDaBlockTime, so rollmint blocks can be "included" in mock block time.Sleep(mockDaBlockTime + 20*time.Millisecond) check := dalc.CheckBlockAvailability(h1) diff --git a/node/node.go b/node/node.go index d0fb99d913..7de4ab8656 100644 --- a/node/node.go +++ b/node/node.go @@ -46,7 +46,7 @@ const ( genesisChunkSize = 16 * 1024 * 1024 // 16 MiB ) -// Node represents a client node in Optimint network. +// Node represents a client node in rollmint network. // It connects all the components and orchestrates their work. type Node struct { service.BaseService @@ -78,7 +78,7 @@ type Node struct { ctx context.Context } -// NewNode creates new Optimint node. +// NewNode creates new rollmint node. func NewNode( ctx context.Context, conf config.NodeConfig, @@ -104,7 +104,7 @@ func NewNode( logger.Info("WARNING: working in in-memory mode") baseKV = store.NewDefaultInMemoryKVStore() } else { - baseKV = store.NewDefaultKVStore(conf.RootDir, conf.DBPath, "optimint") + baseKV = store.NewDefaultKVStore(conf.RootDir, conf.DBPath, "rollmint") } mainKV := store.NewPrefixKV(baseKV, mainPrefix) dalcKV := store.NewPrefixKV(baseKV, dalcPrefix) diff --git a/rpc/client/client.go b/rpc/client/client.go index 66de911e6f..3661ef7589 100644 --- a/rpc/client/client.go +++ b/rpc/client/client.go @@ -34,15 +34,15 @@ const ( ) var ( - // ErrConsensusStateNotAvailable is returned because Optimint doesn't use Tendermint consensus. - ErrConsensusStateNotAvailable = errors.New("consensus state not available in Optimint") + // ErrConsensusStateNotAvailable is returned because rollmint doesn't use Tendermint consensus. + ErrConsensusStateNotAvailable = errors.New("consensus state not available in rollmint") ) var _ rpcclient.Client = &Client{} // Client implements tendermint RPC client interface. // -// This is the type that is used in communication between cosmos-sdk app and Optimint. +// This is the type that is used in communication between cosmos-sdk app and rollmint. type Client struct { *types.EventBus config *config.RPCConfig @@ -360,12 +360,12 @@ func (c *Client) NetInfo(ctx context.Context) (*ctypes.ResultNetInfo, error) { return &res, nil } -// DumpConsensusState always returns error as there is no consensus state in Optimint. +// DumpConsensusState always returns error as there is no consensus state in rollmint. func (c *Client) DumpConsensusState(ctx context.Context) (*ctypes.ResultDumpConsensusState, error) { return nil, ErrConsensusStateNotAvailable } -// ConsensusState always returns error as there is no consensus state in Optimint. +// ConsensusState always returns error as there is no consensus state in rollmint. func (c *Client) ConsensusState(ctx context.Context) (*ctypes.ResultConsensusState, error) { return nil, ErrConsensusStateNotAvailable } diff --git a/state/executor.go b/state/executor.go index c28e22fe77..76e4052e6f 100644 --- a/state/executor.go +++ b/state/executor.go @@ -108,7 +108,7 @@ func (e *BlockExecutor) CreateBlock(height uint64, lastCommit *types.Commit, las ProposerAddress: e.proposerAddress, }, Data: types.Data{ - Txs: toOptimintTxs(mempoolTxs), + Txs: toRollmintTxs(mempoolTxs), IntermediateStateRoots: types.IntermediateStateRoots{RawRootsList: nil}, Evidence: types.EvidenceData{Evidence: nil}, }, @@ -177,7 +177,7 @@ func (e *BlockExecutor) Commit(ctx context.Context, state types.State, block *ty func (e *BlockExecutor) updateState(state types.State, block *types.Block, abciResponses *tmstate.ABCIResponses, validatorUpdates []*tmtypes.Validator) (types.State, error) { nValSet := state.NextValidators.Copy() lastHeightValSetChanged := state.LastHeightValidatorsChanged - // Optimint can work without validators + // rollmint can work without validators if len(nValSet.Validators) > 0 { if len(validatorUpdates) > 0 { err := nValSet.UpdateWithChangeSet(validatorUpdates) @@ -232,7 +232,7 @@ func (e *BlockExecutor) commit(ctx context.Context, state types.State, block *ty maxBytes := state.ConsensusParams.Block.MaxBytes maxGas := state.ConsensusParams.Block.MaxGas - err = e.mempool.Update(int64(block.Header.Height), fromOptimintTxs(block.Data.Txs), deliverTxs, mempool.PreCheckMaxBytes(maxBytes), mempool.PostCheckMaxGas(maxGas)) + err = e.mempool.Update(int64(block.Header.Height), fromRollmintTxs(block.Data.Txs), deliverTxs, mempool.PreCheckMaxBytes(maxBytes), mempool.PostCheckMaxGas(maxGas)) if err != nil { return nil, 0, err } @@ -376,7 +376,7 @@ func (e *BlockExecutor) publishEvents(resp *tmstate.ABCIResponses, block *types. return err } -func toOptimintTxs(txs tmtypes.Txs) types.Txs { +func toRollmintTxs(txs tmtypes.Txs) types.Txs { optiTxs := make(types.Txs, len(txs)) for i := range txs { optiTxs[i] = []byte(txs[i]) @@ -384,7 +384,7 @@ func toOptimintTxs(txs tmtypes.Txs) types.Txs { return optiTxs } -func fromOptimintTxs(optiTxs types.Txs) tmtypes.Txs { +func fromRollmintTxs(optiTxs types.Txs) tmtypes.Txs { txs := make(tmtypes.Txs, len(optiTxs)) for i := range optiTxs { txs[i] = []byte(optiTxs[i]) diff --git a/store/store_test.go b/store/store_test.go index b31bacf8c1..5e3f8b13e2 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -77,7 +77,7 @@ func TestStoreLoad(t *testing.T) { //}}, } - tmpDir, err := os.MkdirTemp("", "optimint_test") + tmpDir, err := os.MkdirTemp("", "rollmint_test") require.NoError(t, err) defer func() { err := os.RemoveAll(tmpDir) diff --git a/types/block.go b/types/block.go index 02d4657bc0..2239af8939 100644 --- a/types/block.go +++ b/types/block.go @@ -4,7 +4,7 @@ import ( "encoding" ) -// Header defines the structure of Optimint block header. +// Header defines the structure of rollmint block header. type Header struct { // Block and App version Version Version @@ -52,7 +52,7 @@ type Version struct { App uint64 } -// Block defines the structure of Optimint block. +// Block defines the structure of rollmint block. type Block struct { Header Header Data Data @@ -62,7 +62,7 @@ type Block struct { var _ encoding.BinaryMarshaler = &Block{} var _ encoding.BinaryUnmarshaler = &Block{} -// Data defines Optimint block data. +// Data defines rollmint block data. type Data struct { Txs Txs IntermediateStateRoots IntermediateStateRoots diff --git a/types/serialization_test.go b/types/serialization_test.go index 55bbdba542..dface61e78 100644 --- a/types/serialization_test.go +++ b/types/serialization_test.go @@ -117,7 +117,7 @@ func TestStateRoundTrip(t *testing.T) { Block: 123, App: 456, }, - Software: "optimint", + Software: "rollmint", }, ChainID: "testchain", InitialHeight: 987, diff --git a/types/state.go b/types/state.go index 9260967354..0499d272ef 100644 --- a/types/state.go +++ b/types/state.go @@ -37,7 +37,7 @@ type State struct { LastBlockID types.BlockID LastBlockTime time.Time - // DAHeight identifies DA block containing the latest applied Optimint block. + // DAHeight identifies DA block containing the latest applied rollmint block. DAHeight uint64 // In the MVP implementation, there will be only one Validator From afc4607b759372301899ffa28cc5adf162e7aaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 13:18:36 +0200 Subject: [PATCH 07/13] docs: use rollmint in links --- da/test/da_test.go | 2 +- docs/lazy-adr/adr-004-core-types.md | 2 +- docs/lazy-adr/adr-007-header-commit-to-shares.md | 4 ++-- rpc/client/client.go | 2 +- rpc/client/client_test.go | 2 +- rpc/json/ws.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/da/test/da_test.go b/da/test/da_test.go index 3de54dee5f..e9e8326688 100644 --- a/da/test/da_test.go +++ b/da/test/da_test.go @@ -246,7 +246,7 @@ func getRandomBlock(height uint64, nTxs int) *types.Block { block.Data.IntermediateStateRoots.RawRootsList[i] = getRandomBytes(32) } - // TODO(tzdybal): see https://github.com/celestiaorg/optimint/issues/143 + // TODO(tzdybal): see https://github.com/celestiaorg/rollmint/issues/143 if nTxs == 0 { block.Data.Txs = nil block.Data.IntermediateStateRoots.RawRootsList = nil diff --git a/docs/lazy-adr/adr-004-core-types.md b/docs/lazy-adr/adr-004-core-types.md index 3329437e60..577984c1ca 100644 --- a/docs/lazy-adr/adr-004-core-types.md +++ b/docs/lazy-adr/adr-004-core-types.md @@ -210,4 +210,4 @@ For finishing the implementation these items need to be tackled at least: ## References -- +- diff --git a/docs/lazy-adr/adr-007-header-commit-to-shares.md b/docs/lazy-adr/adr-007-header-commit-to-shares.md index dcb8f85b7a..ec020e896e 100644 --- a/docs/lazy-adr/adr-007-header-commit-to-shares.md +++ b/docs/lazy-adr/adr-007-header-commit-to-shares.md @@ -10,7 +10,7 @@ 1. [PayForMessaage transactions](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/data_structures.md#signedtransactiondatapayformessage) include a commitment of roots of subtrees of the Celestia data root. This is a requirement for compact proofs that a message was or was not included correctly. 1. [Over the wire](https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/networking.md#wiretxpayformessage), PayForMessage transactions include (potentially) multiple signatures for the same message with different sizes of Celestia block, to allow for [non-interactive message inclusion](https://github.com/celestiaorg/celestia-specs/blob/master/src/rationale/message_block_layout.md#non-interactive-default-rules). -Rollup blocks must follow a similar strategy to the above. Specifically, the data root in rollup block headers [must commit to subtree roots in the Celestia data root](https://github.com/celestiaorg/optimint/issues/133), otherwise rollup nodes would not have any guarantees that the data behind the data root in a rollup block header is available. +Rollup blocks must follow a similar strategy to the above. Specifically, the data root in rollup block headers [must commit to subtree roots in the Celestia data root](https://github.com/celestiaorg/rollmint/issues/133), otherwise rollup nodes would not have any guarantees that the data behind the data root in a rollup block header is available. ## Alternative Approaches @@ -70,4 +70,4 @@ TODO ## References -1. +1. diff --git a/rpc/client/client.go b/rpc/client/client.go index 3661ef7589..c101d623e9 100644 --- a/rpc/client/client.go +++ b/rpc/client/client.go @@ -374,7 +374,7 @@ func (c *Client) ConsensusState(ctx context.Context) (*ctypes.ResultConsensusSta // // Currently, consensus params changes are not supported and this method returns params as defined in genesis. func (c *Client) ConsensusParams(ctx context.Context, height *int64) (*ctypes.ResultConsensusParams, error) { - // TODO(tzdybal): implement consensus params handling: https://github.com/celestiaorg/optimint/issues/291 + // TODO(tzdybal): implement consensus params handling: https://github.com/celestiaorg/rollmint/issues/291 params := c.node.GetGenesis().ConsensusParams return &ctypes.ResultConsensusParams{ BlockHeight: int64(c.normalizeHeight(height)), diff --git a/rpc/client/client_test.go b/rpc/client/client_test.go index 603b590993..37c26f4331 100644 --- a/rpc/client/client_test.go +++ b/rpc/client/client_test.go @@ -728,7 +728,7 @@ func getRandomBlock(height uint64, nTxs int) *types.Block { block.Data.IntermediateStateRoots.RawRootsList[i] = getRandomBytes(32) } - // TODO(tzdybal): see https://github.com/celestiaorg/optimint/issues/143 + // TODO(tzdybal): see https://github.com/celestiaorg/rollmint/issues/143 if nTxs == 0 { block.Data.Txs = nil block.Data.IntermediateStateRoots.RawRootsList = nil diff --git a/rpc/json/ws.go b/rpc/json/ws.go index 6606624188..6041d7edd7 100644 --- a/rpc/json/ws.go +++ b/rpc/json/ws.go @@ -68,7 +68,7 @@ func (h *handler) wsHandler(w http.ResponseWriter, r *http.Request) { } if mt != websocket.TextMessage { - // TODO(tzdybal): https://github.com/celestiaorg/optimint/issues/465 + // TODO(tzdybal): https://github.com/celestiaorg/rollmint/issues/465 h.logger.Debug("expected text message") continue } From 857dd0623eeb8fbb937095ad5a3dfaa73540ac3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 13:21:14 +0200 Subject: [PATCH 08/13] ci: rename to rollmint in docker workflows --- .github/workflows/docker-build-da-mockserv.yml | 2 +- .github/workflows/docker-build-ethermint-debug.yml | 6 +++--- .github/workflows/docker-build-test-ethermint.yml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-build-da-mockserv.yml b/.github/workflows/docker-build-da-mockserv.yml index 5f5b8c2f1a..649912b304 100644 --- a/.github/workflows/docker-build-da-mockserv.yml +++ b/.github/workflows/docker-build-da-mockserv.yml @@ -11,7 +11,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: celestiaorg/optimint-mockserv + IMAGE_NAME: celestiaorg/rollmint-mockserv jobs: docker-build: diff --git a/.github/workflows/docker-build-ethermint-debug.yml b/.github/workflows/docker-build-ethermint-debug.yml index 125ee86320..47cd3edca5 100644 --- a/.github/workflows/docker-build-ethermint-debug.yml +++ b/.github/workflows/docker-build-ethermint-debug.yml @@ -12,7 +12,7 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: celestiaorg/ethermint-debug - TAG_PREFIX: optimint- + TAG_PREFIX: rollmint- jobs: docker-build: @@ -40,10 +40,10 @@ jobs: ls mv ethermint .. cd .. - cp -R optimint ethermint + cp -R rollmint ethermint cd ethermint rm -rf .git - go mod edit -replace=github.com/celestiaorg/optimint=./optimint + go mod edit -replace=github.com/celestiaorg/rollmint=./rollmint go mod tidy -compat=1.17 -e - name: Docker meta id: meta diff --git a/.github/workflows/docker-build-test-ethermint.yml b/.github/workflows/docker-build-test-ethermint.yml index 7eec0a7d0f..c9a1abbe6a 100644 --- a/.github/workflows/docker-build-test-ethermint.yml +++ b/.github/workflows/docker-build-test-ethermint.yml @@ -12,7 +12,7 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: celestiaorg/ethermint - TAG_PREFIX: optimint- + TAG_PREFIX: rollmint- jobs: docker-build: @@ -37,16 +37,16 @@ jobs: with: repository: celestiaorg/ethermint path: ethermint - ref: optimint-v0.3.0-rebase + ref: rollmint-v0.3.0-rebase - name: Move Stuff and Tidy run: | ls mv ethermint .. cd .. - cp -R optimint ethermint + cp -R rollmint ethermint cd ethermint rm -rf .git - go mod edit -replace=github.com/celestiaorg/optimint=./optimint + go mod edit -replace=github.com/celestiaorg/rollmint=./rollmint go mod tidy -compat=1.17 -e - name: Docker meta id: meta @@ -91,14 +91,14 @@ jobs: with: repository: celestiaorg/ethermint path: ethermint - ref: optimint-v0.3.0-rebase + ref: rollmint-v0.3.0-rebase - name: Set up Go uses: actions/setup-go@v2 with: go-version: 1.17 - name: "Setup Cluster" run: | - export ETHERMINT_IMAGE_TAG=optimint-$(git rev-parse --short "$GITHUB_SHA") + export ETHERMINT_IMAGE_TAG=rollmint-$(git rev-parse --short "$GITHUB_SHA") echo $ETHERMINT_IMAGE_TAG cd ephemeral-cluster scripts/minimal-ethermint.sh From 52cafd5adef4e135615a8d8c923fd4fae0eb33da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 13:26:24 +0200 Subject: [PATCH 09/13] refactor: rename optiTxs to rollmintTxs --- state/executor.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/state/executor.go b/state/executor.go index 76e4052e6f..0a58ee8e1e 100644 --- a/state/executor.go +++ b/state/executor.go @@ -377,17 +377,17 @@ func (e *BlockExecutor) publishEvents(resp *tmstate.ABCIResponses, block *types. } func toRollmintTxs(txs tmtypes.Txs) types.Txs { - optiTxs := make(types.Txs, len(txs)) + rollmintTxs := make(types.Txs, len(txs)) for i := range txs { - optiTxs[i] = []byte(txs[i]) + rollmintTxs[i] = []byte(txs[i]) } - return optiTxs + return rollmintTxs } -func fromRollmintTxs(optiTxs types.Txs) tmtypes.Txs { - txs := make(tmtypes.Txs, len(optiTxs)) - for i := range optiTxs { - txs[i] = []byte(optiTxs[i]) +func fromRollmintTxs(rollmintTxs types.Txs) tmtypes.Txs { + txs := make(tmtypes.Txs, len(rollmintTxs)) + for i := range rollmintTxs { + txs[i] = []byte(rollmintTxs[i]) } return txs } From be462acebce3bc8bd4dc82155bb4b159f96481c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 13:33:13 +0200 Subject: [PATCH 10/13] docs: rename to rollmint in ADRs --- docs/lazy-adr/adr-001-node-interface.md | 11 ++++++++--- docs/lazy-adr/adr-003-peer-discovery.md | 7 ++++++- docs/lazy-adr/adr-004-core-types.md | 9 +++++---- docs/lazy-adr/adr-006-da-interface.md | 7 ++++--- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/docs/lazy-adr/adr-001-node-interface.md b/docs/lazy-adr/adr-001-node-interface.md index 8ba5a0901f..262520d791 100644 --- a/docs/lazy-adr/adr-001-node-interface.md +++ b/docs/lazy-adr/adr-001-node-interface.md @@ -1,4 +1,9 @@ -# Using Optimint `Node` as replacement of Tendermint `Node` +# Using rollmint `Node` as replacement of Tendermint `Node` + +## Changelog + +- 26.02.2021: Initial Draft +- 29.09.2022: Rename Optimint to rollmint Replacing on the `Node` level gives much flexibility. Still, significant amount of code can be reused, and there is no need to refactor lazyledger-core. Cosmos SDK is tigtly coupled with Tendermint with regards to node creation, RPC, app initialization, etc. De-coupling requires big refactoring of cosmos-sdk. @@ -28,7 +33,7 @@ We don't need to introduce common interface `Node`s, because the plan is to use * Pros: * May be possible to avoid Tendermint issues - * Should be possible to avoid dependency on Tendermint in Optimint + * Should be possible to avoid dependency on Tendermint in rollmint * Changes probably limited to cosmos-sdk (not required in tendermint/lazyledger-core) * Cons: * Reinventing the wheel @@ -46,4 +51,4 @@ easier. ## Development -For development, there is `master-optimint` branch in `cosmos-sdk` repository. Versions with `-optimint` suffix will be released from this branch for easier dependency management during development. +`cosmos-sdk-rollmit` is a repository dedicated for maintenance of rollmint-enabled version of Cosmos SDK. diff --git a/docs/lazy-adr/adr-003-peer-discovery.md b/docs/lazy-adr/adr-003-peer-discovery.md index 92d723251f..3dd477d6e5 100644 --- a/docs/lazy-adr/adr-003-peer-discovery.md +++ b/docs/lazy-adr/adr-003-peer-discovery.md @@ -1,10 +1,15 @@ # Peer Discovery +## Changelog + +- 31.03.2021: Initial Draft +- 29.09.2022: Rename Optimint to rollmint + Libp2p provides multiple ways to discover peers (DHT, mDNS, PubSub peer exchange). Currently there are no plans to support mDNS (as it's limited to local networks). ## Proposed network architecture -1. There will be a set of well-known, application-agnostic seed nodes. Every optimint client will be able to connect to such node, addresses will be saved in configuration. +1. There will be a set of well-known, application-agnostic seed nodes. Every rollmint client will be able to connect to such node, addresses will be saved in configuration. * This does not limit applications as they can still create independent networks with separate set of seed nodes. 2. Nodes in the network will serve DHT. It will be used for active peer discovery. Client of each ORU network will be able to find other peers in this particular network. * All nodes will cooperate on the same DHT. diff --git a/docs/lazy-adr/adr-004-core-types.md b/docs/lazy-adr/adr-004-core-types.md index 577984c1ca..4ef7c429a2 100644 --- a/docs/lazy-adr/adr-004-core-types.md +++ b/docs/lazy-adr/adr-004-core-types.md @@ -2,11 +2,12 @@ ## Changelog -- 19-04-2021: Initial Draft +- 19.04.2021: Initial Draft +- 29.09.2022: Rename Optimint to rollmint ## Context -This document describes the core data structures of any Optimint-powered blockchain. +This document describes the core data structures of any rollmint-powered blockchain. ## Alternative Approaches @@ -27,7 +28,7 @@ Where such tradeoffs are made, we explicitly comment on them. ### Transactions -In Optimint, like in Tendermint, Transactions are just an opaque slice of bytes: +In rollmint, like in Tendermint, Transactions are just an opaque slice of bytes: ```go type Tx []byte @@ -127,7 +128,7 @@ This could be seen as a state transition and the ConsensusHash in the header wou That said, none of the existing default Cosmos-SDK modules actually make use of this functionality though. Hence, we can treat the ConsensusParams as constants (for the same app version). We clearly need to communicate this to optimistic rollup chain developers. -Ideally, we should ensure this programmatically to guarantee that this assumption always holds inside optimint. +Ideally, we should ensure this programmatically to guarantee that this assumption always holds inside rollmint. The ConsensusParams have the exact same structure as in Tendermint. For the sake of self-containedness we still list them here: diff --git a/docs/lazy-adr/adr-006-da-interface.md b/docs/lazy-adr/adr-006-da-interface.md index c0cf7564dc..9fe3a03935 100644 --- a/docs/lazy-adr/adr-006-da-interface.md +++ b/docs/lazy-adr/adr-006-da-interface.md @@ -5,10 +5,11 @@ - 2021.04.30: Initial draft - 2021.06.03: Init method added - 2021.07.09: Added CheckBlockAvailability method, added KVStore to Init method, added missing result types +- 29.09.2022: Rename Optimint to rollmint ## Context -Optimint requires data availability layer. Different implementations are expected. +rollmint requires data availability layer. Different implementations are expected. ## Alternative Approaches @@ -49,7 +50,7 @@ type BlockRetriever interface { } // TODO define an enum of different non-happy-path cases -// that might need to be handled by Optimint independent of +// that might need to be handled by rollmint independent of // the underlying DA chain. type StatusCode uint64 @@ -72,7 +73,7 @@ type DAResult struct { type ResultSubmitBlock struct { DAResult // Not sure if this needs to be bubbled up to other - // parts of Optimint. + // parts of rollmint. // Hash hash.Hash } From 20b16844bf4094705478c7aec2da6b4bc8b6f565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 13:36:09 +0200 Subject: [PATCH 11/13] fixup! refactor: rename go module and fix imports --- da/grpc/mockserv/mockserv.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/grpc/mockserv/mockserv.go b/da/grpc/mockserv/mockserv.go index 842c23357f..c5e151d290 100644 --- a/da/grpc/mockserv/mockserv.go +++ b/da/grpc/mockserv/mockserv.go @@ -2,7 +2,6 @@ package mockserv import ( "context" - "github.com/celestiaorg/rollmint/types/pb/rollmint" "os" tmlog "github.com/tendermint/tendermint/libs/log" @@ -13,6 +12,7 @@ import ( "github.com/celestiaorg/rollmint/store" "github.com/celestiaorg/rollmint/types" "github.com/celestiaorg/rollmint/types/pb/dalc" + "github.com/celestiaorg/rollmint/types/pb/rollmint" ) // GetServer creates and returns gRPC server instance. From e69f2e5f657fb15e352506e2dee25259815a41bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Thu, 29 Sep 2022 13:39:54 +0200 Subject: [PATCH 12/13] docs: markdownlint -f ./docs --- docs/lazy-adr/adr-001-node-interface.md | 34 ++++++++++++------------- docs/lazy-adr/adr-003-peer-discovery.md | 24 ++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/lazy-adr/adr-001-node-interface.md b/docs/lazy-adr/adr-001-node-interface.md index 262520d791..acb8d85322 100644 --- a/docs/lazy-adr/adr-001-node-interface.md +++ b/docs/lazy-adr/adr-001-node-interface.md @@ -17,28 +17,28 @@ We don't need to introduce common interface `Node`s, because the plan is to use ### Interface required by cosmos-sdk -* BaseService (struct): - * Service (interface) - * Start() - * IsRunning() - * Stop() - * Logger -* Direct access: - * ConfigureRPC() - * EventBus() +- BaseService (struct): + - Service (interface) + - Start() + - IsRunning() + - Stop() + - Logger +- Direct access: + - ConfigureRPC() + - EventBus() ## Alternative approaches ### Create RPC from scratch -* Pros: - * May be possible to avoid Tendermint issues - * Should be possible to avoid dependency on Tendermint in rollmint - * Changes probably limited to cosmos-sdk (not required in tendermint/lazyledger-core) -* Cons: - * Reinventing the wheel - * Requires bigger, much more complicated changes in cosmos-sdk - * Probably can't upstream such changes to cosmos-sdk +- Pros: + - May be possible to avoid Tendermint issues + - Should be possible to avoid dependency on Tendermint in rollmint + - Changes probably limited to cosmos-sdk (not required in tendermint/lazyledger-core) +- Cons: + - Reinventing the wheel + - Requires bigger, much more complicated changes in cosmos-sdk + - Probably can't upstream such changes to cosmos-sdk ## `tendermint` vs `lazyledger-core` diff --git a/docs/lazy-adr/adr-003-peer-discovery.md b/docs/lazy-adr/adr-003-peer-discovery.md index 3dd477d6e5..632dced765 100644 --- a/docs/lazy-adr/adr-003-peer-discovery.md +++ b/docs/lazy-adr/adr-003-peer-discovery.md @@ -10,30 +10,30 @@ Libp2p provides multiple ways to discover peers (DHT, mDNS, PubSub peer exchange ## Proposed network architecture 1. There will be a set of well-known, application-agnostic seed nodes. Every rollmint client will be able to connect to such node, addresses will be saved in configuration. - * This does not limit applications as they can still create independent networks with separate set of seed nodes. + - This does not limit applications as they can still create independent networks with separate set of seed nodes. 2. Nodes in the network will serve DHT. It will be used for active peer discovery. Client of each ORU network will be able to find other peers in this particular network. - * All nodes will cooperate on the same DHT. - * ChainID will be used to advertise that client participates in a particular ORU network. + - All nodes will cooperate on the same DHT. + - ChainID will be used to advertise that client participates in a particular ORU network. 3. Nodes from multiple networks will help with peer discovery (via single DHT). 4. After connecting to nodes found in DHT, GossipSub will handle peer lists for clients. ### Pros -* Shared DHT should make it easier to find peers. -* Use of existing libraries. +- Shared DHT should make it easier to find peers. +- Use of existing libraries. ### Cons -* There may be some overhead for clients to handle DHT requests from other ORU networks. +- There may be some overhead for clients to handle DHT requests from other ORU networks. ## Alternatives 1. Joining public IPFS DHT for peer discovery. - * pros: large network - finding peers should be very easy - * cons: we may affect public IPFS network stability in case of misconfiguration, possibly lot of unrelated traffic + - pros: large network - finding peers should be very easy + - cons: we may affect public IPFS network stability in case of misconfiguration, possibly lot of unrelated traffic 2. Custom peer-exchange protocol. - * pros: full flexibility of implementation - * cons: need to create from scratch and test + - pros: full flexibility of implementation + - cons: need to create from scratch and test 3. Re-use of existing peer discovery mechanism like `discv5` - * pros: ready & battle-tested software - * cons: use different network stack, requires lot of integration + - pros: ready & battle-tested software + - cons: use different network stack, requires lot of integration From 75ee83114aac6905c195ed9153f808cefa39235e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Mon, 3 Oct 2022 12:33:10 +0200 Subject: [PATCH 13/13] fixup! refactor: rename proto definitions --- proto/get_deps.sh | 2 +- proto/tendermint/abci/types.proto | 34 +++++++++++++------------------ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/proto/get_deps.sh b/proto/get_deps.sh index 2a7d5a15c9..c0ce5ca931 100755 --- a/proto/get_deps.sh +++ b/proto/get_deps.sh @@ -2,7 +2,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" -TM_VERSION=v0.34.21 +TM_VERSION=v0.34.14 TM_PROTO_URL=https://raw.githubusercontent.com/tendermint/tendermint/$TM_VERSION/proto/tendermint TM_PROTO_FILES=( diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 340800f46b..8e3a909363 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -102,7 +102,8 @@ message RequestEndBlock { message RequestCommit {} // lists available snapshots -message RequestListSnapshots {} +message RequestListSnapshots { +} // offers a snapshot to the application message RequestOfferSnapshot { @@ -211,12 +212,6 @@ message ResponseCheckTx { repeated Event events = 7 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; string codespace = 8; - string sender = 9; - int64 priority = 10; - - // mempool_error is set by Tendermint. - // ABCI applictions creating a ResponseCheckTX should not set mempool_error. - string mempool_error = 11; } message ResponseDeliverTx { @@ -226,17 +221,16 @@ message ResponseDeliverTx { string info = 4; // nondeterministic int64 gas_wanted = 5 [json_name = "gas_wanted"]; int64 gas_used = 6 [json_name = "gas_used"]; - repeated Event events = 7 [ - (gogoproto.nullable) = false, - (gogoproto.jsontag) = "events,omitempty" - ]; // nondeterministic + repeated Event events = 7 + [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic string codespace = 8; } message ResponseEndBlock { - repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; - ConsensusParams consensus_param_updates = 2; - repeated Event events = 3 + repeated ValidatorUpdate validator_updates = 1 + [(gogoproto.nullable) = false]; + ConsensusParams consensus_param_updates = 2; + repeated Event events = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; } @@ -370,8 +364,10 @@ message Evidence { // The height when the offense occurred int64 height = 3; // The corresponding time where the offense occurred - google.protobuf.Timestamp time = 4 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + google.protobuf.Timestamp time = 4 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; // Total voting power of the validator set in case the ABCI application does // not store historical validators. // https://github.com/tendermint/tendermint/issues/4581 @@ -406,8 +402,6 @@ service ABCIApplication { rpc EndBlock(RequestEndBlock) returns (ResponseEndBlock); rpc ListSnapshots(RequestListSnapshots) returns (ResponseListSnapshots); rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot); - rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) - returns (ResponseLoadSnapshotChunk); - rpc ApplySnapshotChunk(RequestApplySnapshotChunk) - returns (ResponseApplySnapshotChunk); + rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk); + rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); }