Skip to content

Commit

Permalink
mina-signer
Browse files Browse the repository at this point in the history
  • Loading branch information
mitschabaude committed Feb 13, 2024
1 parent 9883ee2 commit 986796b
Show file tree
Hide file tree
Showing 29 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion generate-keys.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env node
import Client from './dist/node/mina-signer/MinaSigner.js';
import Client from './dist/node/mina-signer/mina-signer.js';

let client = new Client({ network: 'testnet' });

Expand Down
2 changes: 1 addition & 1 deletion src/lib/mina.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
transactionCommitments,
verifyAccountUpdateSignature,
} from '../mina-signer/src/sign-zkapp-command.js';
import { NetworkId } from '../mina-signer/src/TSTypes.js';
import { NetworkId } from '../mina-signer/src/types.js';
import { FetchMode, currentTransaction } from './mina/transaction-context.js';
import {
activeInstance,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/mina/mina-instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { Transaction, TransactionId } from '../mina.js';
import type { Account } from './account.js';
import type { NetworkValue } from '../precondition.js';
import type * as Fetch from '../fetch.js';
import type { NetworkId } from '../../mina-signer/src/TSTypes.js';
import type { NetworkId } from '../../mina-signer/src/types.js';

export {
Mina,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/nullifier.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Nullifier as JsonNullifier } from '../mina-signer/src/TSTypes.js';
import type { Nullifier as JsonNullifier } from '../mina-signer/src/types.js';
import { Struct } from './circuit_value.js';
import { Field, Group, Scalar } from './core.js';
import { Poseidon } from './hash.js';
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/build-web.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ set -e

tsc -p ../../tsconfig.mina-signer-web.json
node moveWebFiles.js
npx esbuild --bundle --minify dist/tmp/mina-signer/MinaSigner.js --outfile=./dist/web/index.js --format=esm --target=es2021
npx esbuild --bundle --minify dist/tmp/mina-signer/mina-signer.js --outfile=./dist/web/index.js --format=esm --target=es2021
npx rimraf dist/tmp
2 changes: 1 addition & 1 deletion src/mina-signer/index.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// this file is a wrapper for supporting commonjs imports

let Client = require('./MinaSigner.js');
let Client = require('./mina-signer.js');

module.exports = Client.default;
4 changes: 2 additions & 2 deletions src/mina-signer/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// this file is a wrapper for supporting types in both commonjs and esm projects

import Client from './MinaSigner.js';
export { type NetworkId } from './src/TSTypes.js';
import Client from './mina-signer.ts';
export { type NetworkId } from './src/types.ts';

export = Client;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PrivateKey, PublicKey } from '../provable/curve-bigint.js';
import * as Json from './src/TSTypes.js';
import type { SignedLegacy, Signed, NetworkId } from './src/TSTypes.js';
import * as Json from './src/types.js';
import type { SignedLegacy, Signed, NetworkId } from './src/types.js';

import {
isPayment,
Expand All @@ -10,7 +10,7 @@ import {
isSignedZkappCommand,
isStakeDelegation,
isZkappCommand,
} from './src/Utils.js';
} from './src/utils.js';
import * as TransactionJson from '../bindings/mina-transaction/gen/transaction-json.js';
import { ZkappCommand } from '../bindings/mina-transaction/gen/transaction-bigint.js';
import {
Expand Down Expand Up @@ -496,7 +496,7 @@ class Client {

/**
* Returns the network ID.
*
*
* @returns {NetworkId} The network ID.
*/
get networkId(): NetworkId {
Expand Down
4 changes: 2 additions & 2 deletions src/mina-signer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"homepage": "https://minaprotocol.com/",
"repository": "https://github.com/o1-labs/o1js",
"bugs": "https://github.com/o1-labs/o1js/issues",
"main": "dist/node/mina-signer/MinaSigner.js",
"main": "dist/node/mina-signer/mina-signer.js",
"types": "dist/node/mina-signer/index.d.ts",
"exports": {
"web": "./dist/web/index.js",
"require": "./dist/node/mina-signer/index.cjs",
"node": "./dist/node/mina-signer/MinaSigner.js",
"node": "./dist/node/mina-signer/mina-signer.js",
"default": "./dist/web/index.js"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/src/nullifier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
PrivateKey,
} from '../../provable/curve-bigint.js';
import { Field } from '../../provable/field-bigint.js';
import { Nullifier } from './TSTypes.js';
import { Nullifier } from './types.js';

export { createNullifier };

Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/src/random-transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from '../../bindings/mina-transaction/gen/transaction-bigint.js';
import { PrivateKey } from '../../provable/curve-bigint.js';
import { Signature } from './signature.js';
import { NetworkId } from './TSTypes.js';
import { NetworkId } from './types.js';

export { RandomTransaction };

Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/src/sign-legacy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from './signature.js';
import { Json } from '../../bindings/mina-transaction/gen/transaction-bigint.js';
import { bytesToBits, stringToBytes } from '../../bindings/lib/binable.js';
import { NetworkId } from './TSTypes.js';
import { NetworkId } from './types.js';

export {
signPayment,
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/src/sign-legacy.unit-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { PublicKey, Scalar } from '../../provable/curve-bigint.js';
import { Field } from '../../provable/field-bigint.js';
import { Random, test } from '../../lib/testing/property.js';
import { RandomTransaction } from './random-transaction.js';
import { NetworkId } from './TSTypes.js';
import { NetworkId } from './types.js';

let { privateKey, publicKey } = keypair;
let networks: NetworkId[] = ['testnet', 'mainnet'];
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/src/sign-zkapp-command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
verifyFieldElement,
} from './signature.js';
import { mocks } from '../../bindings/crypto/constants.js';
import { NetworkId } from './TSTypes.js';
import { NetworkId } from './types.js';

// external API
export { signZkappCommand, verifyZkappCommandSignature };
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/src/sign-zkapp-command.unit-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import { RandomTransaction } from './random-transaction.js';
import { Ml, MlHashInput } from '../../lib/ml/conversion.js';
import { FieldConst } from '../../lib/field.js';
import { mocks } from '../../bindings/crypto/constants.js';
import { NetworkId } from './TSTypes.js';
import { NetworkId } from './types.js';

// monkey-patch bigint to json
(BigInt.prototype as any).toJSON = function () {
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/src/signature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
import { base58 } from '../../lib/base58.js';
import { versionBytes } from '../../bindings/crypto/constants.js';
import { Pallas } from '../../bindings/crypto/elliptic-curve.js';
import { NetworkId } from './TSTypes.js';
import { NetworkId } from './types.js';

export {
sign,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type {
SignedAny,
SignedLegacy,
SignableData,
} from './TSTypes.js';
} from './types.js';

function hasCommonProperties(data: SignableData | ZkappCommand) {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/tests/client.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Client from '../dist/node/mina-signer/MinaSigner.js';
import Client from '../dist/node/mina-signer/mina-signer.js';

describe('Client Class Initialization', () => {
let client;
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/tests/keypair.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Client from '../dist/node/mina-signer/MinaSigner.js';
import Client from '../dist/node/mina-signer/mina-signer.js';

describe('Keypair', () => {
let client: Client;
Expand Down
4 changes: 2 additions & 2 deletions src/mina-signer/tests/message.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Client from '../dist/node/mina-signer/MinaSigner.js';
import type { PrivateKey } from '../dist/node/mina-signer/src/TSTypes.js';
import Client from '../dist/node/mina-signer/mina-signer.js';
import type { PrivateKey } from '../dist/node/mina-signer/src/types.js';

describe('Message', () => {
describe('Mainnet network', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/mina-signer/tests/payment.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Client from '../dist/node/mina-signer/MinaSigner.js';
import type { Keypair } from '../dist/node/mina-signer/src/TSTypes.js';
import Client from '../dist/node/mina-signer/mina-signer.js';
import type { Keypair } from '../dist/node/mina-signer/src/types.js';

describe('Payment', () => {
describe('Mainnet network', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/tests/rosetta.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Client from '../dist/node/mina-signer/MinaSigner.js';
import Client from '../dist/node/mina-signer/mina-signer.js';

describe('Rosetta', () => {
let client: Client;
Expand Down
4 changes: 2 additions & 2 deletions src/mina-signer/tests/stake-delegation.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Client from '../dist/node/mina-signer/MinaSigner.js';
import type { Keypair } from '../dist/node/mina-signer/src/TSTypes.js';
import Client from '../dist/node/mina-signer/mina-signer.js';
import type { Keypair } from '../dist/node/mina-signer/src/types.js';

describe('Stake Delegation', () => {
describe('Mainnet network', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/tests/verify-in-snark.unit-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Field } from '../../lib/core.js';
import { ZkProgram } from '../../lib/proof_system.js';
import Client from '../MinaSigner.js';
import Client from '../mina-signer.js';
import { PrivateKey, Signature } from '../../lib/signature.js';
import { expect } from 'expect';
import { Provable } from '../../lib/provable.js';
Expand Down
2 changes: 1 addition & 1 deletion src/mina-signer/tests/zkapp.unit-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ZkappCommand } from '../../bindings/mina-transaction/gen/transaction-bigint.js';
import * as TransactionJson from '../../bindings/mina-transaction/gen/transaction-json.js';
import Client from '../MinaSigner.js';
import Client from '../mina-signer.js';
import { accountUpdateExample } from '../src/test-vectors/accountUpdate.js';
import { expect } from 'expect';
import { Transaction } from '../../lib/mina.js';
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.mina-signer-web.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./tsconfig.mina-signer.json",
"include": ["./src/mina-signer/MinaSigner.ts", "./src/**/*.web.ts"],
"include": ["./src/mina-signer/mina-signer.ts", "./src/**/*.web.ts"],
"exclude": ["./src/examples"],
"compilerOptions": {
"outDir": "src/mina-signer/dist/tmp"
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.mina-signer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"include": ["./src/mina-signer/MinaSigner.ts"],
"include": ["./src/mina-signer/mina-signer.ts"],
"exclude": ["./src/**/*.unit-test.ts"],
"compilerOptions": {
"rootDir": "./src",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"./src/snarky.js",
"./src/bindings/js/wrapper.js",
"./src/mina-signer/src",
"./src/mina-signer/MinaSigner.ts",
"./src/mina-signer/mina-signer.ts",
"./src/js_crypto",
"./src/provable"
],
Expand Down

0 comments on commit 986796b

Please sign in to comment.