Merge pull request #1550 from o1-labs/merge/develop-main

Merge develop
o1-labs · Apr 10, 2024 · 609578c · 609578c
2 parents 3852aeb + 4edb66c
commit 609578c
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 11 deletions.
diff --git a/run-ci-tests.sh b/run-ci-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 case $TEST_TYPE in

diff --git a/run-integration-tests.sh b/run-integration-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 ./run src/examples/zkapps/hello-world/run.ts --bundle

diff --git a/run-jest-tests.sh b/run-jest-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 shopt -s globstar # to expand '**' into nested directories
 

diff --git a/run-minimal-mina-tests.sh b/run-minimal-mina-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 npm run dev

diff --git a/run-unit-tests.sh b/run-unit-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 shopt -s globstar # to expand '**' into nested directories./
 

diff --git a/src/bindings b/src/bindings
diff --git a/src/examples/zkapps/hello-world/hello-world.ts b/src/examples/zkapps/hello-world/hello-world.ts
@@ -9,7 +9,9 @@ import {
   state,
 } from 'o1js';
 
-export const adminPrivateKey = PrivateKey.random();
+export const adminPrivateKey = PrivateKey.fromBase58(
+  'EKFcef5HKXAn7V2rQntLiXtJr15dkxrsrQ1G4pnYemhMEAWYbkZW'
+);
 export const adminPublicKey = adminPrivateKey.toPublicKey();
 
 export class HelloWorld extends SmartContract {

diff --git a/src/lib/provable/field.ts b/src/lib/provable/field.ts
@@ -219,7 +219,7 @@ class Field {
   }
 
   /**
-   * Add a "field-like" value to this {@link Field} element.
+   * Add a field-like value to this {@link Field} element.
    *
    * @example
    * ```ts

diff --git a/src/mina b/src/mina
diff --git a/src/mina-signer/build-cjs.sh b/src/mina-signer/build-cjs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cp index.cjs dist/node/mina-signer/index.cjs

diff --git a/src/mina-signer/build-web.sh b/src/mina-signer/build-web.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 tsc -p ../../tsconfig.mina-signer-web.json
+1 −1		MINA_COMMIT
+136,518 −137,369		compiled/node_bindings/o1js_node.bc.cjs
+1 −1		compiled/node_bindings/o1js_node.bc.map
+796 −638		compiled/node_bindings/plonk_wasm.cjs
+206 −164		compiled/node_bindings/plonk_wasm.d.cts
+ −		compiled/node_bindings/plonk_wasm_bg.wasm
+344 −325		compiled/node_bindings/plonk_wasm_bg.wasm.d.ts
+106 −111		compiled/web_bindings/o1js_web.bc.js
+625 −564		compiled/web_bindings/plonk_wasm.d.ts
+1,982 −1,826		compiled/web_bindings/plonk_wasm.js
+ −		compiled/web_bindings/plonk_wasm_bg.wasm
+238 −219		compiled/web_bindings/plonk_wasm_bg.wasm.d.ts
+4 −6		crypto/bindings/conversion-core.ts
+4 −1		crypto/bindings/conversion-verifier-index.ts
+3 −3		crypto/bindings/kimchi-types.ts
+3 −4		crypto/bindings/srs.ts
+2 −16		ocaml/lib/pickles_bindings.ml
-Original file line number
+Diff line change
@@ Expand Up / @@ -219,7 +219,7 @@ class Field { @@
       }
       /**
-       * Add a "field-like" value to this {@link Field} element.
+       * Add a field-like value to this {@link Field} element.
        *
        * @example
        * ```ts
@@ Expand Down @@