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
15 changes: 15 additions & 0 deletions plugins/nextjs-plugin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,21 @@ export const withJuno = async (params?: {
...(icpIds?.cmcId !== undefined && {
[`${prefix}CMC_ID`]: icpIds.cmcId
}),
...(icpIds?.registryId !== undefined && {
[`${prefix}REGISTRY_ID`]: icpIds.registryId
}),
...(icpIds?.cyclesLedgerId !== undefined && {
[`${prefix}CYCLES_LEDGER_ID`]: icpIds.cyclesLedgerId
}),
...(icpIds?.cyclesIndexId !== undefined && {
[`${prefix}CYCLES_INDEX_ID`]: icpIds.cyclesIndexId
}),
...(icpIds?.snsWasmId !== undefined && {
[`${prefix}SNS_WASM_ID`]: icpIds.snsWasmId
}),
...(icpIds?.nnsDappId !== undefined && {
[`${prefix}NNS_DAPP_ID`]: icpIds.nnsDappId
}),
...(container !== undefined && {
[`${prefix}CONTAINER`]: container
})
Expand Down
12 changes: 11 additions & 1 deletion plugins/nextjs-plugin/src/tests/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ describe('withJuno', () => {
icpLedgerId: 'ledger-id',
icpIndexId: 'index-id',
nnsGovernanceId: 'nns-governance-id',
cmcId: 'cmc-id'
cmcId: 'cmc-id',
registryId: 'registry-id',
cyclesLedgerId: 'cycles-ledger-id',
cyclesIndexId: 'cycles-index-id',
snsWasmId: 'sns-wasm-id',
nnsDappId: 'nns-dapp-id'
},
container: 'http://localhost:1234'
});
Expand All @@ -41,6 +46,11 @@ describe('withJuno', () => {
NEXT_PUBLIC_ICP_INDEX_ID: 'index-id',
NEXT_PUBLIC_NNS_GOVERNANCE_ID: 'nns-governance-id',
NEXT_PUBLIC_CMC_ID: 'cmc-id',
NEXT_PUBLIC_REGISTRY_ID: 'registry-id',
NEXT_PUBLIC_CYCLES_INDEX_ID: 'cycles-index-id',
NEXT_PUBLIC_CYCLES_LEDGER_ID: 'cycles-ledger-id',
NEXT_PUBLIC_SNS_WASM_ID: 'sns-wasm-id',
NEXT_PUBLIC_NNS_DAPP_ID: 'nns-dapp-id',
NEXT_PUBLIC_CONTAINER: 'http://localhost:1234'
}
});
Expand Down
16 changes: 14 additions & 2 deletions plugins/plugin-tools/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ import {
} from '@junobuild/config-loader';
import {
CMC_ID,
CYCLES_INDEX_ID,
CYCLES_LEDGER_ID,
DOCKER_CONTAINER_URL,
DOCKER_SATELLITE_ID,
ICP_INDEX_ID,
ICP_LEDGER_ID,
INTERNET_IDENTITY_ID,
MODE_DEVELOPMENT,
NNS_GOVERNANCE_ID
NNS_DAPP_ID,
NNS_GOVERNANCE_ID,
REGISTRY_ID,
SNS_WASM_ID
} from './constants';
import {JunoPluginError} from './error';
import type {ConfigArgs, IcpIds, JunoParams} from './types';
Expand Down Expand Up @@ -121,12 +126,19 @@ const junoConfigOrbiterId = async ({mode}: ConfigArgs): Promise<string | undefin
return config?.orbiter?.ids?.[mode] ?? config?.orbiter?.id;
};

// For simplicity, we currently provide all IDs, even in development.
// So, we do not check the emulator configuration or defaults, we keep it simple here.
export const icpIds = (): IcpIds | undefined => ({
internetIdentityId: INTERNET_IDENTITY_ID,
icpLedgerId: ICP_LEDGER_ID,
icpIndexId: ICP_INDEX_ID,
nnsGovernanceId: NNS_GOVERNANCE_ID,
cmcId: CMC_ID
cmcId: CMC_ID,
registryId: REGISTRY_ID,
cyclesLedgerId: CYCLES_LEDGER_ID,
cyclesIndexId: CYCLES_INDEX_ID,
snsWasmId: SNS_WASM_ID,
nnsDappId: NNS_DAPP_ID
});

export const container = ({
Expand Down
5 changes: 5 additions & 0 deletions plugins/plugin-tools/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ export const ICP_LEDGER_ID = 'ryjl3-tyaaa-aaaaa-aaaba-cai';
export const ICP_INDEX_ID = 'qhbym-qaaaa-aaaaa-aaafq-cai';
export const NNS_GOVERNANCE_ID = 'rrkah-fqaaa-aaaaa-aaaaq-cai';
export const CMC_ID = 'rkp4c-7iaaa-aaaaa-aaaca-cai';
export const REGISTRY_ID = 'rwlgt-iiaaa-aaaaa-aaaaa-cai';
export const CYCLES_LEDGER_ID = 'um5iw-rqaaa-aaaaq-qaaba-cai';
export const CYCLES_INDEX_ID = 'ul4oc-4iaaa-aaaaq-qaabq-cai';
export const SNS_WASM_ID = 'qaa6y-5yaaa-aaaaa-aaafa-cai';
export const NNS_DAPP_ID = 'qoctq-giaaa-aaaaa-aaaea-cai';
14 changes: 12 additions & 2 deletions plugins/plugin-tools/src/tests/config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,17 @@ import {
} from '../config';
import {
CMC_ID,
CYCLES_INDEX_ID,
CYCLES_LEDGER_ID,
DOCKER_SATELLITE_ID,
ICP_INDEX_ID,
ICP_LEDGER_ID,
INTERNET_IDENTITY_ID,
MODE_DEVELOPMENT,
NNS_GOVERNANCE_ID
NNS_DAPP_ID,
NNS_GOVERNANCE_ID,
REGISTRY_ID,
SNS_WASM_ID
} from '../constants';
import {JunoPluginError} from '../error';

Expand Down Expand Up @@ -329,7 +334,12 @@ describe('config', () => {
icpLedgerId: ICP_LEDGER_ID,
icpIndexId: ICP_INDEX_ID,
nnsGovernanceId: NNS_GOVERNANCE_ID,
cmcId: CMC_ID
cmcId: CMC_ID,
registryId: REGISTRY_ID,
cyclesLedgerId: CYCLES_LEDGER_ID,
cyclesIndexId: CYCLES_INDEX_ID,
snsWasmId: SNS_WASM_ID,
nnsDappId: NNS_DAPP_ID
});
});
});
Expand Down
14 changes: 12 additions & 2 deletions plugins/plugin-tools/src/tests/init.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@ import * as configLoader from '@junobuild/config-loader';
import type {MockInstance} from 'vitest';
import {
CMC_ID,
CYCLES_INDEX_ID,
CYCLES_LEDGER_ID,
DOCKER_CONTAINER_URL,
DOCKER_SATELLITE_ID,
ICP_INDEX_ID,
ICP_LEDGER_ID,
INTERNET_IDENTITY_ID,
MODE_DEVELOPMENT,
NNS_GOVERNANCE_ID
NNS_DAPP_ID,
NNS_GOVERNANCE_ID,
REGISTRY_ID,
SNS_WASM_ID
} from '../constants';
import {initConfig} from '../init';
import type {ConfigArgs} from '../types';
Expand Down Expand Up @@ -38,7 +43,12 @@ describe('init', () => {
icpLedgerId: ICP_LEDGER_ID,
icpIndexId: ICP_INDEX_ID,
nnsGovernanceId: NNS_GOVERNANCE_ID,
cmcId: CMC_ID
cmcId: CMC_ID,
registryId: REGISTRY_ID,
cyclesLedgerId: CYCLES_LEDGER_ID,
cyclesIndexId: CYCLES_INDEX_ID,
snsWasmId: SNS_WASM_ID,
nnsDappId: NNS_DAPP_ID
};

let spyJunoConfigExist: MockInstance;
Expand Down
30 changes: 30 additions & 0 deletions plugins/plugin-tools/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,34 @@ export interface IcpIds {
* @type {string}
*/
cmcId: string;

/**
* The Registry ID.
* @type {string}
*/
registryId: string;

/**
* The Cycles Ledger ID.
* @type {string}
*/
cyclesLedgerId: string;

/**
* The Cycles Index ID.
* @type {string}
*/
cyclesIndexId: string;

/**
* The SNS-W ID.
* @type {string}
*/
snsWasmId: string;

/**
* The NNS-dapp ID.
* @type {string}
*/
nnsDappId: string;
}
15 changes: 15 additions & 0 deletions plugins/vite-plugin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,21 @@ export default function Juno(params?: JunoParams): Plugin {
...(icpIds?.cmcId !== undefined && {
[`${prefix}CMC_ID`]: JSON.stringify(icpIds.cmcId)
}),
...(icpIds?.registryId !== undefined && {
[`${prefix}REGISTRY_ID`]: JSON.stringify(icpIds.registryId)
}),
...(icpIds?.cyclesLedgerId !== undefined && {
[`${prefix}CYCLES_LEDGER_ID`]: JSON.stringify(icpIds.cyclesLedgerId)
}),
...(icpIds?.cyclesIndexId !== undefined && {
[`${prefix}CYCLES_INDEX_ID`]: JSON.stringify(icpIds.cyclesIndexId)
}),
...(icpIds?.snsWasmId !== undefined && {
[`${prefix}SNS_WASM_ID`]: JSON.stringify(icpIds.snsWasmId)
}),
...(icpIds?.nnsDappId !== undefined && {
[`${prefix}NNS_DAPP_ID`]: JSON.stringify(icpIds.nnsDappId)
}),
...(container !== undefined && {
[`${prefix}CONTAINER`]: JSON.stringify(container)
})
Expand Down
12 changes: 11 additions & 1 deletion plugins/vite-plugin/src/tests/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ describe('vite-plugin-juno', () => {
icpLedgerId: 'ledger-id',
icpIndexId: 'index-id',
nnsGovernanceId: 'nns-governance-id',
cmcId: 'cmc-id'
cmcId: 'cmc-id',
registryId: 'registry-id',
cyclesLedgerId: 'cycles-ledger-id',
cyclesIndexId: 'cycles-index-id',
snsWasmId: 'sns-wasm-id',
nnsDappId: 'nns-dapp-id'
},
container: 'http://localhost:1234'
});
Expand All @@ -44,6 +49,11 @@ describe('vite-plugin-juno', () => {
'import.meta.env.VITE_ICP_INDEX_ID': JSON.stringify('index-id'),
'import.meta.env.VITE_NNS_GOVERNANCE_ID': JSON.stringify('nns-governance-id'),
'import.meta.env.VITE_CMC_ID': JSON.stringify('cmc-id'),
'import.meta.env.VITE_REGISTRY_ID': JSON.stringify('registry-id'),
'import.meta.env.VITE_CYCLES_INDEX_ID': JSON.stringify('cycles-index-id'),
'import.meta.env.VITE_CYCLES_LEDGER_ID': JSON.stringify('cycles-ledger-id'),
'import.meta.env.VITE_SNS_WASM_ID': JSON.stringify('sns-wasm-id'),
'import.meta.env.VITE_NNS_DAPP_ID': JSON.stringify('nns-dapp-id'),
'import.meta.env.VITE_CONTAINER': JSON.stringify('http://localhost:1234')
}
});
Expand Down