Skip to content

Commit dfcf16f

Browse files
authored
feat: merge-train/fairies (#24941)
BEGIN_COMMIT_OVERRIDE chore: remove archived Barretenberg mirror workflow and unused git-subrepo vendored files (#24928) chore: forward port sqlite changes (#24947) END_COMMIT_OVERRIDE
2 parents 11552a0 + 438f2d7 commit dfcf16f

168 files changed

Lines changed: 1365 additions & 13903 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/mirror-repos.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ Releases are driven by git tags. The current version is tracked in `.release-ple
3333

3434
There are many ways you can participate and help build high quality software. Check out the [contribution guide](CONTRIBUTING.md)!
3535

36-
## Syncing noir
37-
38-
We use marker commits and [git-subrepo](https://github.com/ingydotnet/git-subrepo) (for a subset of its intended use) to manage a mirror of noir. This tool was chosen because it makes code checkout and development as simple as possible (compared to submodules or subtrees), with the tradeoff of complexity around sync's.
39-
4036
## Development and CI
4137

4238
For a broad overview of the CI system take a look at [CI.md](CI.md).

barretenberg/.gitrepo

Lines changed: 0 additions & 12 deletions
This file was deleted.

cspell.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@
421421
".bootstrapped",
422422
"*.svg",
423423
"*.otf",
424-
"git-subrepo/",
425424
"*.snap",
426425
"package.json",
427426
"build-wasm",

docs/.gitrepo

Lines changed: 0 additions & 12 deletions
This file was deleted.

playground/src/components/navbar/components/NetworkSelector.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import AddIcon from '@mui/icons-material/Add';
77
import { AddNetworksDialog } from './AddNetworkDialog';
88
import CircularProgress from '@mui/material/CircularProgress';
99
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
10-
import { createStore } from '@aztec/kv-store/sqlite-opfs';
10+
import { AztecSQLiteOPFSStore, storePoolDirectory } from '@aztec/kv-store/sqlite-opfs';
1111
import { AztecContext } from '../../../aztecContext';
1212
import { navbarButtonStyle, navbarSelect } from '../../../styles/common';
1313
import { NETWORKS } from '../../../utils/networks';
@@ -50,10 +50,12 @@ export function NetworkSelector() {
5050
}
5151
setIsContextInitialized(true);
5252
WebLogger.create(setLogs, setTotalLogCount);
53-
const store = await createStore('playground_data', {
54-
dataDirectory: 'playground',
55-
dataStoreMapSizeKb: 1e6,
56-
});
53+
const store = await AztecSQLiteOPFSStore.open(
54+
WebLogger.getInstance().createLogger('playground_data'),
55+
'playground_data',
56+
false,
57+
storePoolDirectory('playground_data'),
58+
);
5759
const playgroundDB = PlaygroundDB.getInstance();
5860
playgroundDB.init(store, WebLogger.getInstance().createLogger('playground_db').info);
5961
setPlaygroundDB(PlaygroundDB.getInstance());

scripts/fix_subrepo_edge_case.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

scripts/git-subrepo/.fish.rc

Lines changed: 0 additions & 20 deletions
This file was deleted.

scripts/git-subrepo/.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

scripts/git-subrepo/.github/workflows/test.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)