Skip to content
Merged
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
9 changes: 0 additions & 9 deletions frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,6 @@
}
],
"outputHashing": "all"
},
"staging": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.staging.ts"
}
],
"outputHashing": "all"
}
},
"defaultConfiguration": "production"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export class BenchmarksWalletsZkService {
return this.o1jsInterface.pipe(
filter(Boolean),
switchMap((o1js: any) => {
return fromPromise(o1js.sendZkApp(CONFIG.globalConfig?.graphQL, zkApps[0], this.updates));
// return fromPromise(o1js.deployZkApp(CONFIG.globalConfig?.graphQL, zkApps[0], this.updates));
return fromPromise(o1js.updateZkApp(CONFIG.globalConfig?.graphQL, zkApps[0], this.updates));
}),
map((response: any) => {
if (response.errors[0]) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<span class="mina-icon">arrow_drop_down</span>
</div>
</button>
<!-- <div class="tertiary" *ngIf="updates$ | async as updates">-->
<!-- {{ updates.step }} {{ updates.duration }}s-->
<!-- </div>-->
<div class="tertiary text-italic ml-10" *ngIf="updates$ | async as updates">
{{ updates.step }} <span class="secondary">{{ updates.duration }}<span *ngIf="updates.duration">s</span></span>
</div>
</form>
</div>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ export function reducer(state: BenchmarksWalletsState = initialState, action: Be

case BENCHMARKS_WALLETS_GET_ALL_TXS_SUCCESS: {
const allTxs = [...action.payload.mempoolTxs, ...action.payload.includedTxs];
console.log(allTxs);
return {
...state,
wallets: state.wallets.map((w: BenchmarksWallet) => {
Expand Down Expand Up @@ -306,7 +307,7 @@ export function reducer(state: BenchmarksWalletsState = initialState, action: Be
fee: state.sendingFeeZkapps,
nonce,
memo,
accountUpdates: 8,
accountUpdates: 2,
};
});
} else {
Expand All @@ -322,7 +323,7 @@ export function reducer(state: BenchmarksWalletsState = initialState, action: Be
fee: state.sendingFeeZkapps,
nonce: nonce.toString(),
memo,
accountUpdates: 8,
accountUpdates: 2,
};
nonce++;

Expand Down
4 changes: 4 additions & 0 deletions frontend/src/app/shared/constants/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import { hasValue } from '@openmina/shared';

export const CONFIG: Readonly<MinaEnv> = {
...environment,
globalConfig: {
...environment.globalConfig,
graphQL: getURL(environment.globalConfig.graphQL),
},
configs: environment.configs.map((config) => ({
...config,
url: getURL(config.url),
Expand Down
1 change: 1 addition & 0 deletions frontend/src/assets/environments/block_producers.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default {
'snarks': ['scan-state', 'work-pool'],
},
canAddNodes: true,
graphQL: 'http://localhost:11010/graphql',
},
configs: [
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/assets/environments/staging.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default {
'benchmarks': ['wallets'],
},
canAddNodes: false,
graphQL: 'http://adonagy.hz.minaprotocol.network:3000/graphql'
graphQL: 'https://adonagy.com/graphql'
},
configs: [
{
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/assets/o1js/o1jsWrapper.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions frontend/src/environments/environment.block_producers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const environment: Readonly<MinaEnv> = {
'snarks': ['scan-state', 'work-pool'],
},
canAddNodes: true,
graphQL: 'http://localhost:11010/graphql',
},
configs: [
{
Expand Down
36 changes: 0 additions & 36 deletions frontend/src/environments/environment.staging.ts

This file was deleted.

4 changes: 3 additions & 1 deletion frontend/src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ export const environment: Readonly<MinaEnv> = {
zk: ['test'],
},
canAddNodes: true,
graphQL: 'http://adonagy.hz.minaprotocol.network:3000/graphql',
graphQL: 'https://adonagy.com/graphql',
// graphQL: 'https://api.minascan.io/node/devnet/v1/graphql',
// graphQL: 'http://65.109.105.40:5000/graphql',
},
configs: [
// {
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.