Skip to content

Commit d2b3800

Browse files
committed
incomplete basic UI code
1 parent 6a83233 commit d2b3800

File tree

6 files changed

+29
-20
lines changed

6 files changed

+29
-20
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ debug: build
134134
all: build
135135
.PHONY: all
136136

137-
build: curio sptool
137+
build: curio
138138
@[[ $$(type -P "curio") ]] && echo "Caution: you have \
139139
an existing curio binary in your PATH. This may cause problems if you don't run 'sudo make install'" || true
140140

cmd/curio/rpc/rpc.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ func (p *CurioAPI) LogSetLevel(ctx context.Context, subsystem, level string) err
250250
}
251251

252252
func ListenAndServe(ctx context.Context, dependencies *deps.Deps, shutdownChan chan struct{}) error {
253+
log.Errorf("ENTERED RPC SERVER")
253254
fh := &paths.FetchHandler{Local: dependencies.LocalStore, PfHandler: &paths.DefaultPartialFileHandler{}}
254255
remoteHandler := func(w http.ResponseWriter, r *http.Request) {
255256
if !auth.HasPerm(r.Context(), nil, lapi.PermAdmin) {
@@ -261,6 +262,8 @@ func ListenAndServe(ctx context.Context, dependencies *deps.Deps, shutdownChan c
261262
fh.ServeHTTP(w, r)
262263
}
263264

265+
log.Errorf("CREATED STORAGE HANDLER")
266+
264267
var authVerify func(context.Context, string) ([]auth.Permission, error)
265268
{
266269
privateKey, err := base64.StdEncoding.DecodeString(dependencies.Cfg.Apis.StorageRPCSecret)

cmd/curio/run.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ var runCmd = &cli.Command{
130130
}
131131
defer taskEngine.GracefullyTerminate()
132132

133+
log.Infof("WILL START RPC SERVER NOW")
133134
err = rpc.ListenAndServe(ctx, dependencies, shutdownChan) // Monitor for shutdown.
134135
if err != nil {
135136
return err

harmony/harmonydb/sql/20240730-market-migration.sql

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ CREATE TABLE market_mk12_deals (
2121

2222
piece_cid TEXT NOT NULL,
2323
piece_size BIGINT NOT NULL,
24-
length BIGINT DEFAULT NULL,
2524

2625
fast_retrieval BOOLEAN NOT NULL,
2726
announce_to_ipni BOOLEAN NOT NULL,
@@ -41,7 +40,12 @@ CREATE TABLE market_piece_metadata (
4140
piece_cid TEXT NOT NULL PRIMARY KEY,
4241

4342
version INT NOT NULL DEFAULT 2,
43+
<<<<<<< HEAD
4444
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP AT TIME ZONE 'UTC',
45+
=======
46+
47+
created_at TIMESTAMPTZ NOT NULL DEFAULT TIMEZONE('UTC', NOW()),
48+
>>>>>>> d1327dc (incomplete basic UI code)
4549

4650
indexed BOOLEAN NOT NULL DEFAULT FALSE,
4751
indexed_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP AT TIME ZONE 'UTC',
@@ -276,28 +280,32 @@ ALTER TABLE parked_piece_refs
276280
-- Table for old lotus market deals. This is just for deal
277281
-- which are still alive. It should not be used for any processing
278282
CREATE TABLE market_legacy_deals (
279-
signed_proposal_cid TEXT,
280-
sp_id BIGINT,
283+
signed_proposal_cid TEXT NOT NULL,
284+
sp_id BIGINT NOT NULL,
285+
client_peer_id TEXT NOT NULL,
281286

282-
proposal_signature BYTEA,
283-
proposal jsonb,
287+
proposal_signature BYTEA NOT NULL,
288+
proposal jsonb NOT NULL,
284289

285-
piece_cid TEXT,
286-
piece_size BIGINT,
290+
piece_cid TEXT NOT NULL,
291+
piece_size BIGINT NOT NULL,
287292

288-
offline BOOLEAN,
289-
verified BOOLEAN,
293+
offline BOOLEAN NOT NULL,
294+
verified BOOLEAN NOT NULL,
290295

291-
start_epoch BIGINT,
292-
end_epoch BIGINT,
296+
start_epoch BIGINT NOT NULL,
297+
end_epoch BIGINT NOT NULL,
293298

294-
publish_cid TEXT,
295-
chain_deal_id BIGINT,
299+
publish_cid TEXT NOT NULL,
300+
chain_deal_id BIGINT NOT NULL,
296301

297-
fast_retrieval BOOLEAN,
302+
piece_cid TEXT NOT NULL,
303+
piece_size BIGINT NOT NULL,
298304

299-
created_at TIMESTAMPTZ,
300-
sector_num BIGINT,
305+
fast_retrieval BOOLEAN NOT NULL,
306+
307+
created_at TIMESTAMPTZ NOT NULL,
308+
sector_num BIGINT NOT NULL,
301309

302310
primary key (sp_id, piece_cid, signed_proposal_cid)
303311
);

lib/paths/mocks/index.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/static/ux/curio-ux.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ class CurioUX extends LitElement {
164164
<img src="/favicon.svg" width="40" height="32" class="d-inline-block align-top me-2" alt="">
165165
<span class="fs-4">Curio</span>
166166
</a>
167-
<<<<<<< HEAD
168167
<hr>
169168
<ul class="nav nav-pills flex-column mb-auto">
170169
<li class="nav-item">

0 commit comments

Comments
 (0)