Skip to content

Commit

Permalink
Protonet fixes and docs
Browse files Browse the repository at this point in the history
  • Loading branch information
mikera committed Dec 3, 2024
1 parent 2e7db49 commit a77d873
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 5 deletions.
23 changes: 23 additions & 0 deletions convex-cli/GENESIS.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,26 @@ alias convex="java -jar ~/convex.jar"
### Upload keystore




### Managing with screen

Start screen session

```
screen
```

Run peer

```
convex peer start
```

Detach with Ctrl-a + Ctrl-d

Back to screen with:

```
screen -r
```
7 changes: 5 additions & 2 deletions convex-core/src/main/java/convex/core/cvm/ops/Invoke.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,11 @@ public Context execute(Context context) {
// Specific check for an error so we can add stack trace info
if (ctx.isError()) {
// getError()must be non-null at this point

ctx.getError().addTrace("In expression: "+RT.print(this));
try {
ctx.getError().addTrace("In expression: "+RT.print(this));
} catch (Exception e) {
ctx.getError().addTrace("TRACE FAILED");
}
}

return ctx;
Expand Down
11 changes: 8 additions & 3 deletions convex-core/src/main/java/convex/core/lang/impl/MultiFn.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,15 @@ public boolean printInternal(BlobBuilder bb, long limit) {
AVector<AClosure<T>> fns=getFunctions();
for (long i=0; i<num; i++) {
if (i>0) bb.append(' ');
bb.append('(');
AClosure<?> fn=Fn.ensureFunction(fns.get(i));
if (!fn.printInternal(bb,limit)) return false;;
bb.append(')');
if (fn==null) {
bb.append("nil");
if (!bb.check(limit)) return false;
} else {
bb.append('(');
if (!fn.printInternal(bb,limit)) return false;
bb.append(')');
}
}
return bb.check(limit);
}
Expand Down

0 comments on commit a77d873

Please sign in to comment.