Skip to content

Commit af40ab2

Browse files
build: bump PocketIC v13 with II split and updated types
1 parent cc055a3 commit af40ab2

3 files changed

Lines changed: 33 additions & 10 deletions

File tree

cli/src/services/pocket-ic/pocket-ic.services.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ const buildInstanceConfig = async ({
7070
bitcoin: null,
7171
system: [],
7272
application: [SUBNET_CONFIG],
73-
verified_application: []
73+
verified_application: [],
74+
cloud_engine: []
7475
},
7576
state_dir: stateDir,
7677
icp_config: ICP_CONFIG,
@@ -80,7 +81,10 @@ const buildInstanceConfig = async ({
8081
...INSTANCE_HTTP_GATEWAY,
8182
port: parseInt(port)
8283
},
83-
incomplete_state: INCOMPLETE_STATE
84+
incomplete_state: INCOMPLETE_STATE,
85+
dogecoind_addr: null,
86+
mainnet_nns_subnet_id: null,
87+
disable_ingress_validation: null
8488
};
8589

8690
InstanceConfigSchema.parse(config);
@@ -106,7 +110,10 @@ const buildIcpFeatures = async (): Promise<IcpFeatures> => {
106110
nns_governance: mapIcpFeature(nns),
107111
sns: mapIcpFeature(sns),
108112
ii: mapIcpFeature(internet_identity),
109-
nns_ui: mapIcpFeature(nns_dapp)
113+
nns_ui: mapIcpFeature(nns_dapp),
114+
bitcoin: null,
115+
dogecoin: null,
116+
canister_migration: null
110117
};
111118

112119
return IcpFeaturesSchema.parse(icpFeatures);

cli/src/types/pocket-ic.ts

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ const IcpFeatureSchema = z.literal('DefaultConfig');
2828

2929
const SubnetInstructionConfigSchema = z.enum(['Production', 'Benchmarking']);
3030

31+
const CanisterCyclesCostScheduleSchema = z.enum(['Normal', 'Free']);
32+
33+
const RawPrincipalIdSchema = z.strictObject({
34+
// base64-encoded string
35+
principal_id: z.string()
36+
});
37+
3138
const BlobIdSchema = z.string();
3239
const SubnetStateConfigSchema = z.union([
3340
z.literal('New'),
@@ -42,7 +49,9 @@ const InitialTimeSchema = z.union([
4249

4350
const SubnetSpecSchema = z.strictObject({
4451
state_config: SubnetStateConfigSchema,
45-
instruction_config: SubnetInstructionConfigSchema
52+
instruction_config: SubnetInstructionConfigSchema,
53+
subnet_admins: zNullable(z.array(RawPrincipalIdSchema)),
54+
cost_schedule: CanisterCyclesCostScheduleSchema.default('Normal')
4655
});
4756

4857
const ExtendedSubnetConfigSetSchema = z.strictObject({
@@ -53,19 +62,20 @@ const ExtendedSubnetConfigSetSchema = z.strictObject({
5362
bitcoin: zNullable(SubnetSpecSchema),
5463
system: z.array(SubnetSpecSchema),
5564
application: z.array(SubnetSpecSchema),
65+
cloud_engine: z.array(SubnetSpecSchema).default([]),
5666
verified_application: z.array(SubnetSpecSchema)
5767
});
5868

5969
const InstanceHttpGatewayConfigSchema = z.strictObject({
6070
ip_addr: zNullable(z.string()),
6171
port: zNullable(z.number().int().min(0).max(65535)),
6272
domains: zNullable(z.array(z.string())),
63-
https_config: zNullable(HttpsConfigSchema)
73+
https_config: zNullable(HttpsConfigSchema),
74+
domain_custom_provider_local_file: zNullable(z.string())
6475
});
6576

6677
const IcpConfigSchema = z.strictObject({
6778
beta_features: zNullable(IcpConfigFlagSchema),
68-
canister_backtrace: zNullable(IcpConfigFlagSchema),
6979
function_name_length_limits: zNullable(IcpConfigFlagSchema),
7080
canister_execution_rate_limiting: zNullable(IcpConfigFlagSchema)
7181
});
@@ -78,7 +88,10 @@ export const IcpFeaturesSchema = z.strictObject({
7888
nns_governance: zNullable(IcpFeatureSchema),
7989
sns: zNullable(IcpFeatureSchema),
8090
ii: zNullable(IcpFeatureSchema),
81-
nns_ui: zNullable(IcpFeatureSchema)
91+
nns_ui: zNullable(IcpFeatureSchema),
92+
bitcoin: zNullable(IcpFeatureSchema),
93+
dogecoin: zNullable(IcpFeatureSchema),
94+
canister_migration: zNullable(IcpFeatureSchema)
8295
});
8396

8497
const IncompleteStateSchema = z.enum(['Disabled', 'Enabled']);
@@ -90,9 +103,12 @@ export const InstanceConfigSchema = z.strictObject({
90103
icp_config: zNullable(IcpConfigSchema),
91104
log_level: zNullable(z.string()),
92105
bitcoind_addr: zNullable(z.array(SocketAddrSchema)),
106+
dogecoind_addr: zNullable(z.array(SocketAddrSchema)),
93107
icp_features: zNullable(IcpFeaturesSchema),
94108
incomplete_state: zNullable(IncompleteStateSchema),
95-
initial_time: zNullable(InitialTimeSchema)
109+
initial_time: zNullable(InitialTimeSchema),
110+
mainnet_nns_subnet_id: zNullable(z.boolean()),
111+
disable_ingress_validation: zNullable(z.boolean())
96112
});
97113

98114
export type InstanceHttpGatewayConfig = z.infer<typeof InstanceHttpGatewayConfigSchema>;

ic.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"pocket-ic": {
3-
"commit": "d6026d28caf4733e831ae058cb9ee87443ad4c0b",
4-
"version": "12.0.0",
3+
"commit": "e9a67c25a407bf7252510ddcc680b5c7e6f657ed",
4+
"version": "13.0.0",
55
"artifacts": {
66
"linux/amd64": "https://github.com/dfinity/pocketic/releases/download/{version}/pocket-ic-x86_64-linux.gz",
77
"linux/arm64": "https://github.com/dfinity/pocketic/releases/download/{version}/pocket-ic-arm64-linux.gz"

0 commit comments

Comments
 (0)