Merge branch 'main' into kloet/opt-memo

dfinity · Sep 22, 2023 · 981bbb8 · 981bbb8
2 parents ceb437d + 7174c98
commit 981bbb8
Show file tree

Hide file tree

Showing 27 changed files with 2,178 additions and 2,420 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,31 +33,31 @@
     "url": "https://github.com/dfinity/ic-js"
   },
   "devDependencies": {
-    "@size-limit/esbuild": "^8.2.4",
-    "@size-limit/preset-small-lib": "^8.2.4",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.15.11",
-    "@types/text-encoding": "^0.0.36",
-    "@typescript-eslint/eslint-plugin": "^5.57.1",
-    "esbuild": "^0.17.15",
-    "eslint": "^8.37.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.27.5",
+    "@size-limit/esbuild": "^9.0.0",
+    "@size-limit/preset-small-lib": "^9.0.0",
+    "@types/jest": "^29.5.5",
+    "@types/node": "^20.6.3",
+    "@types/text-encoding": "^0.0.37",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "esbuild": "^0.19.3",
+    "eslint": "^8.49.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
-    "node-fetch": "^3.3.1",
-    "prettier": "^3.0.0",
+    "jest": "^29.7.0",
+    "jest-mock-extended": "^3.0.5",
+    "node-fetch": "^3.3.2",
+    "prettier": "^3.0.3",
     "prettier-plugin-organize-imports": "^3.2.3",
-    "semver": "^7.5.3",
-    "size-limit": "^8.2.4",
+    "semver": "^7.5.4",
+    "size-limit": "^9.0.0",
     "text-encoding": "^0.7.0",
-    "ts-jest": "^29.1.0",
+    "ts-jest": "^29.1.1",
     "ts-protoc-gen": "^0.15.0",
-    "tsdoc-markdown": "^0.0.4",
-    "typescript": "^4.9.5",
-    "whatwg-fetch": "^3.6.2"
+    "tsdoc-markdown": "^0.1.0",
+    "typescript": "^5.2.2",
+    "whatwg-fetch": "^3.6.19"
   },
   "size-limit": [
     {
@@ -145,6 +145,6 @@
     }
   ],
   "overrides": {
-    "semver": "^7.5.3"
+    "semver": "^7.5.4"
   }
 }
diff --git a/packages/ckbtc/src/index.ts b/packages/ckbtc/src/index.ts
@@ -1,7 +1,7 @@
 export type {
-  Account as WithdrawalAccount,
   MinterInfo,
   RetrieveBtcOk,
+  Account as WithdrawalAccount,
 } from "../candid/minter";
 export * from "./enums/btc.enums";
 export * from "./errors/btc.errors";

diff --git a/packages/ckbtc/src/minter.canister.ts b/packages/ckbtc/src/minter.canister.ts
@@ -5,10 +5,10 @@ import {
   type QueryParams,
 } from "@dfinity/utils";
 import type {
-  Account as WithdrawalAccount,
+  _SERVICE as CkBTCMinterService,
   MinterInfo,
   RetrieveBtcOk,
-  _SERVICE as CkBTCMinterService,
+  Account as WithdrawalAccount,
 } from "../candid/minter";
 import { idlFactory as certifiedIdlFactory } from "../candid/minter.certified.idl";
 import { idlFactory } from "../candid/minter.idl";

diff --git a/packages/cmc/src/cmc.canister.spec.ts b/packages/cmc/src/cmc.canister.spec.ts
@@ -3,10 +3,10 @@ import { Principal } from "@dfinity/principal";
 import { arrayOfNumberToUint8Array } from "@dfinity/utils";
 import { mock } from "jest-mock-extended";
 import type {
+  _SERVICE as CMCService,
   IcpXdrConversionRateResponse,
   NotifyCreateCanisterResult,
   NotifyTopUpResult,
-  _SERVICE as CMCService,
 } from "../candid/cmc";
 import { CMCCanister } from "./cmc.canister";
 import {

diff --git a/packages/ic-management/src/types/ic-management.params.ts b/packages/ic-management/src/types/ic-management.params.ts
@@ -1,8 +1,8 @@
 import { Principal } from "@dfinity/principal";
 import { toNullable, type ServiceParam } from "@dfinity/utils";
 import type {
-  canister_settings,
   _SERVICE as IcManagementService,
+  canister_settings,
 } from "../../candid/ic-management";
 
 export interface CanisterSettings {

diff --git a/packages/ledger/README.md b/packages/ledger/README.md
@@ -40,7 +40,7 @@ const agent = await createAgent({
   host: HOST,
 });
 
-const { metadata } = LedgerCanister.create({
+const { metadata } = IcrcLedgerCanister.create({
   agent,
   canisterId: MY_LEDGER_CANISTER_ID,
 });

diff --git a/packages/ledger/src/index.canister.spec.ts b/packages/ledger/src/index.canister.spec.ts
@@ -3,8 +3,8 @@ import { Principal } from "@dfinity/principal";
 import { mock } from "jest-mock-extended";
 import type {
   Account,
-  Transaction,
   _SERVICE as IcrcIndexService,
+  Transaction,
 } from "../candid/icrc1_index";
 import { IndexError } from "./errors/index.errors";
 import { IcrcIndexCanister } from "./index.canister";

diff --git a/packages/ledger/src/ledger.canister.spec.ts b/packages/ledger/src/ledger.canister.spec.ts
@@ -5,9 +5,9 @@ import { mock } from "jest-mock-extended";
 import type {
   Allowance,
   ApproveArgs,
+  _SERVICE as IcrcLedgerService,
   TransferArg,
   TransferFromArgs,
-  _SERVICE as IcrcLedgerService,
 } from "../candid/icrc1_ledger";
 import { IcrcTransferError } from "./errors/ledger.errors";
 import { IcrcLedgerCanister } from "./ledger.canister";

diff --git a/packages/ledger/src/ledger.canister.ts b/packages/ledger/src/ledger.canister.ts
@@ -3,8 +3,8 @@ import { Canister, createServices, toNullable } from "@dfinity/utils";
 import type {
   Allowance,
   BlockIndex,
-  Tokens,
   _SERVICE as IcrcLedgerService,
+  Tokens,
 } from "../candid/icrc1_ledger";
 import { idlFactory as certifiedIdlFactory } from "../candid/icrc1_ledger.certified.idl";
 import { idlFactory } from "../candid/icrc1_ledger.idl";