diff --git a/benchmark/main.go b/benchmark/main.go index 20d2e8d4..03e44cc3 100644 --- a/benchmark/main.go +++ b/benchmark/main.go @@ -47,7 +47,7 @@ func main() { func DeployContractAndSubmitDataCommitment() error { logger := tmlog.NewTMLogger(os.Stdout) - path, err := os.MkdirTemp(os.TempDir(), "qgb_bench") + path, err := os.MkdirTemp(os.TempDir(), "blobstream_bench") if err != nil { return nil } @@ -107,13 +107,13 @@ func DeployContractAndSubmitDataCommitment() error { address, tx, bridge, err := evmClient.DeployBlobstreamContract(txOpts, backend, vs, vs.Nonce, true) if err != nil { - logger.Error("failed to deploy QGB contract") + logger.Error("failed to deploy Blobstream contract") return err } receipt, err := evmClient.WaitForTransaction(ctx, backend, tx) if err == nil && receipt != nil && receipt.Status == 1 { - logger.Info("deployed QGB contract", "proxy_address", address.Hex(), "tx_hash", tx.Hash().String()) + logger.Info("deployed Blobstream contract", "proxy_address", address.Hex(), "tx_hash", tx.Hash().String()) } txOpts.Nonce.Add(txOpts.Nonce, big.NewInt(1)) diff --git a/evm/evm_client.go b/evm/evm_client.go index 9b4384fe..8b1e381c 100644 --- a/evm/evm_client.go +++ b/evm/evm_client.go @@ -82,7 +82,7 @@ func (ec *Client) DeployBlobstreamContract( return gethcommon.Address{}, nil, nil, err } - ec.logger.Info("deploying QGB implementation contract...", "address", impAddr.Hex(), "tx_hash", impTx.Hash().Hex()) + ec.logger.Info("deploying Blobstream implementation contract...", "address", impAddr.Hex(), "tx_hash", impTx.Hash().Hex()) // encode the Blobstream contract initialization data using the chain parameters ethVsCheckpoint, err := contractInitValset.SignBytes() @@ -109,7 +109,7 @@ func (ec *Client) DeployBlobstreamContract( return gethcommon.Address{}, nil, nil, err } - ec.logger.Info("deploying QGB proxy contract...", "address", proxyAddr, "tx_hash", tx.Hash().Hex()) + ec.logger.Info("deploying Blobstream proxy contract...", "address", proxyAddr, "tx_hash", tx.Hash().Hex()) bridge, err := blobstreamwrapper.NewWrappers(proxyAddr, contractBackend) if err != nil { diff --git a/orchestrator/orchestrator_test.go b/orchestrator/orchestrator_test.go index 0f03b5ed..b3aef9b4 100644 --- a/orchestrator/orchestrator_test.go +++ b/orchestrator/orchestrator_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/celestiaorg/celestia-app/test/util/testnode" - qgbtesting "github.com/celestiaorg/orchestrator-relayer/testing" + blobstreamtesting "github.com/celestiaorg/orchestrator-relayer/testing" "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" @@ -198,13 +198,13 @@ func TestProcessWithoutValsetInStore(t *testing.T) { defer cancel() codec := encoding.MakeConfig(app.ModuleEncodingRegisters...).Codec - node := qgbtesting.NewTestNode( + node := blobstreamtesting.NewTestNode( ctx, t, - qgbtesting.CelestiaNetworkParams{ + blobstreamtesting.CelestiaNetworkParams{ GenesisOpts: []testnode.GenesisOption{ testnode.ImmediateProposals(codec), - qgbtesting.SetDataCommitmentWindowParams(codec, celestiatypes.Params{DataCommitmentWindow: 101}), + blobstreamtesting.SetDataCommitmentWindowParams(codec, celestiatypes.Params{DataCommitmentWindow: 101}), }, TimeIotaMs: 6048000, // to have enough time to sign attestations after they're pruned Pruning: "default", @@ -214,7 +214,7 @@ func TestProcessWithoutValsetInStore(t *testing.T) { _, err := node.CelestiaNetwork.WaitForHeight(400) require.NoError(t, err) - orch := qgbtesting.NewOrchestrator(t, node) + orch := blobstreamtesting.NewOrchestrator(t, node) latestNonce, err := orch.AppQuerier.QueryLatestAttestationNonce(ctx) require.NoError(t, err) diff --git a/relayer/relayer_test.go b/relayer/relayer_test.go index 586ccd78..302cb0bf 100644 --- a/relayer/relayer_test.go +++ b/relayer/relayer_test.go @@ -10,7 +10,7 @@ import ( "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" "github.com/celestiaorg/celestia-app/test/util/testnode" - qgbtesting "github.com/celestiaorg/orchestrator-relayer/testing" + blobstreamtesting "github.com/celestiaorg/orchestrator-relayer/testing" "github.com/celestiaorg/orchestrator-relayer/p2p" "github.com/ipfs/go-datastore" @@ -60,13 +60,13 @@ func TestUseValsetFromP2P(t *testing.T) { defer cancel() codec := encoding.MakeConfig(app.ModuleEncodingRegisters...).Codec - node := qgbtesting.NewTestNode( + node := blobstreamtesting.NewTestNode( ctx, t, - qgbtesting.CelestiaNetworkParams{ + blobstreamtesting.CelestiaNetworkParams{ GenesisOpts: []testnode.GenesisOption{ testnode.ImmediateProposals(codec), - qgbtesting.SetDataCommitmentWindowParams(codec, types.Params{DataCommitmentWindow: 101}), + blobstreamtesting.SetDataCommitmentWindowParams(codec, types.Params{DataCommitmentWindow: 101}), }, TimeIotaMs: 2000000, // so attestations are pruned after they're queried Pruning: "default", @@ -75,7 +75,7 @@ func TestUseValsetFromP2P(t *testing.T) { ) // process valset nonce so that it is added to the DHT - orch := qgbtesting.NewOrchestrator(t, node) + orch := blobstreamtesting.NewOrchestrator(t, node) vs, err := orch.AppQuerier.QueryLatestValset(ctx) require.NoError(t, err) err = orch.ProcessValsetEvent(ctx, *vs) @@ -104,7 +104,7 @@ func TestUseValsetFromP2P(t *testing.T) { err = orch.ProcessDataCommitmentEvent(ctx, *att, dataRootTupleRoot) require.NoError(t, err) - relayer := qgbtesting.NewRelayer(t, node) + relayer := blobstreamtesting.NewRelayer(t, node) go node.EVMChain.PeriodicCommit(ctx, time.Millisecond) _, _, _, err = relayer.EVMClient.DeployBlobstreamContract(node.EVMChain.Auth, node.EVMChain.Backend, *latestValset.ToValset(), latestValset.Nonce, true) require.NoError(t, err) diff --git a/store/init.go b/store/init.go index afe36b23..ee9c59e5 100644 --- a/store/init.go +++ b/store/init.go @@ -44,7 +44,7 @@ func Init(log tmlog.Logger, path string, options InitOptions) error { if err != nil { return err } - log.Info("initializing qgb store", "path", path) + log.Info("initializing Blobstream store", "path", path) err = initRoot(path) if err != nil { @@ -100,7 +100,7 @@ func Init(log tmlog.Logger, path string, options InitOptions) error { return err } - log.Info("qgb store initialized", "path", path) + log.Info("Blobstream store initialized", "path", path) return nil } diff --git a/testing/qgb.go b/testing/blobstream.go similarity index 100% rename from testing/qgb.go rename to testing/blobstream.go diff --git a/testing/celestia_network.go b/testing/celestia_network.go index 8ec98aec..559bf65e 100644 --- a/testing/celestia_network.go +++ b/testing/celestia_network.go @@ -91,7 +91,7 @@ func NewCelestiaNetwork(ctx context.Context, t *testing.T, params CelestiaNetwor WithTendermintConfig(tmCfg). WithAccounts(accounts). WithGenesisOptions(params.GenesisOpts...). - WithChainID("qgb-test"), + WithChainID("blobstream-test"), ) appRPC := clientContext.GRPCClient.Target()