Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote indexed merkle map to standard API #2114

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased](https://github.com/o1-labs/o1js/compare/6ff7f8470a...HEAD)

### Added

### Changed
- Export `IndexedMerkleMap` directly from index, instead of Experimental Namespace https://github.com/o1-labs/o1js/pull/2114

### Fixed

## [2.4.0](https://github.com/o1-labs/o1js/compare/fb625f...6ff7f8470a) - 2025-04-01

### Added
Expand Down
12 changes: 6 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ export { Gadgets } from './lib/provable/gadgets/gadgets.js';
export { Types } from './bindings/mina-transaction/v1/types.js';

export { MerkleList, MerkleListIterator } from './lib/provable/merkle-list.js';
import { IndexedMerkleMap, IndexedMerkleMapBase } from './lib/provable/merkle-tree-indexed.js';
import {
IndexedMerkleMap as IndexedMerkleMap_,
IndexedMerkleMapBase,
} from './lib/provable/merkle-tree-indexed.js';
export let IndexedMerkleMap = IndexedMerkleMap_;
export type IndexedMerkleMap = IndexedMerkleMapBase;
export { Option } from './lib/provable/option.js';

export * as Mina from './lib/mina/v1/mina.js';
Expand Down Expand Up @@ -129,7 +134,6 @@ import { Field } from './lib/provable/wrapped.js';

const Experimental_ = {
memoizeWitness,
IndexedMerkleMap,
V2: V2_,
};

Expand Down Expand Up @@ -165,10 +169,6 @@ namespace Experimental {
export let ProvableBigInt = ProvableBigInt_;
export let createProvableBigInt = createProvableBigInt_;

// indexed merkle map
export let IndexedMerkleMap = Experimental_.IndexedMerkleMap;
export type IndexedMerkleMap = IndexedMerkleMapBase;

// offchain state
export let OffchainState = OffchainState_.OffchainState;

Expand Down
3 changes: 2 additions & 1 deletion src/lib/mina/v1/actions/batch-reducer.unit-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
Bool,
Experimental,
Field,
IndexedMerkleMap,
method,
Poseidon,
Provable,
Expand All @@ -17,7 +18,7 @@ import {
assert,
} from '../../../../index.js';
import { TestInstruction, expectBalance, testLocal, transaction } from '../test/test-contract.js';
const { IndexedMerkleMap, BatchReducer } = Experimental;
const { BatchReducer } = Experimental;

const MINA = 1_000_000_000n;
const AMOUNT = 10n * MINA;
Expand Down
Loading