Merge branch 'main' into fix/sf-656

.eslintrc.js

@@ -0,0 +1,43 @@
+module.exports = {
+  root: true,
+
+  parserOptions: {
+    sourceType: 'module',
+  },
+
+  extends: ['@metamask/eslint-config'],
+
+  overrides: [
+    {
+      files: ['*.js'],
+      extends: ['@metamask/eslint-config-nodejs'],
+    },
+
+    {
+      files: ['*.ts', '*.tsx'],
+      extends: ['@metamask/eslint-config-typescript'],
+    },
+
+    {
+      files: ['*.test.ts', '*.test.js'],
+      extends: ['@metamask/eslint-config-jest'],
+      rules: {
+        '@typescript-eslint/no-shadow': [
+          'error',
+          { allow: ['describe', 'expect', 'it'] },
+        ],
+      },
+    },
+  ],
+
+  ignorePatterns: [
+    '!.prettierrc.js',
+    '**/!.eslintrc.js',
+    '**/dist*/',
+    '**/*__GENERATED__*',
+    '**/build',
+    '**/public',
+    '**/.cache',
+    '**/example',
+  ],
+};

.prettierrc.js

@@ -1,11 +1,8 @@
-// https://prettier.io/docs/en/options.html
+// All of these are defaults except singleQuote, but we specify them
+// for explicitness
 module.exports = {
+  quoteProps: 'as-needed',
   singleQuote: true,
-  printWidth: 120,
   tabWidth: 2,
-  useTabs: false,
-  semi: true,
   trailingComma: 'all',
-  bracketSpacing: true,
-  arrowParens: 'always',
 };

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  "packages/starknet-snap": "2.8.0",
-  "packages/wallet-ui": "1.22.0",
-  "packages/get-starknet": "1.0.0"
+  "packages/starknet-snap": "2.9.0",
+  "packages/wallet-ui": "1.23.0",
+  "packages/get-starknet": "1.1.0"
 }

.yarnrc.yml

@@ -10,8 +10,10 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: '@yarnpkg/plugin-workspace-tools'
+    spec: "@yarnpkg/plugin-workspace-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
-    spec: 'https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js'
+    spec: "https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js"
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
 
 yarnPath: .yarn/releases/yarn-3.2.1.cjs

packages/get-starknet/.eslintignore

@@ -0,0 +1,2 @@
+dist/
+js/

packages/get-starknet/.eslintrc.js

@@ -1,15 +1,42 @@
 module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-  },
-  extends: ['plugin:@typescript-eslint/recommended'],
-  parser: '@typescript-eslint/parser',
+  extends: ['../../.eslintrc.js'],
+
   parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-  },
-  plugins: ['@typescript-eslint'],
-  rules: {
+    tsconfigRootDir: __dirname,
   },
+
+  overrides: [
+    {
+      files: ['snap.config.ts'],
+      extends: ['@metamask/eslint-config-nodejs'],
+    },
+    {
+      files: ['*.ts', '*.tsx'],
+      extends: ['@metamask/eslint-config-typescript'],
+      rules: {
+        'valid-jsdoc': 'off',
+        'jsdoc/require-description': 'off',
+        'jsdoc/require-returns': 'off',
+        'jsdoc/require-param-description': 'off',
+        'jsdoc/match-description': 'off',
+      },
+    },
+    {
+      files: ['*.test.ts'],
+      extends: ['@metamask/eslint-config-jest'],
+      rules: {
+        '@typescript-eslint/no-shadow': ['error', { allow: ['describe', 'expect', 'it'] }],
+        '@typescript-eslint/unbound-method': 'off',
+      },
+    },
+
+    {
+      files: ['*.ts'],
+      rules: {
+        'import/no-nodejs-modules': 'off',
+      },
+    },
+  ],
+
+  ignorePatterns: ['!.eslintrc.js', 'dist/', '**/test', '.nyc_output/', 'coverage/'],
 };

packages/get-starknet/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.1.0](https://github.com/Consensys/starknet-snap/compare/get-starknet-v1.0.0...get-starknet-v1.1.0) (2024-07-16)
+
+
+### Features
+
+* clean up and update dependency ([#259](https://github.com/Consensys/starknet-snap/issues/259)) ([fcb83e1](https://github.com/Consensys/starknet-snap/commit/fcb83e128fd4e483cdf9f4670e4e70e1d3876f7a))
+
 ## 1.0.0 (2024-06-21)
 
 

packages/get-starknet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@consensys/get-starknet",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "license": "(Apache-2.0 OR MIT)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,12 +23,23 @@
   "keywords": [],
   "author": "Consensys",
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
+    "@metamask/eslint-config": "^12.2.0",
+    "@metamask/eslint-config-jest": "^12.1.0",
+    "@metamask/eslint-config-nodejs": "^12.1.0",
+    "@metamask/eslint-config-typescript": "^12.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.42.1",
+    "@typescript-eslint/parser": "^5.42.1",
     "dotenv": "^16.4.5",
-    "eslint": "^8.13.0",
+    "eslint": "^8.45.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "~2.26.0",
+    "eslint-plugin-jest": "^27.1.5",
+    "eslint-plugin-jsdoc": "^41.1.2",
+    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.1.1",
     "get-starknet-core": "^3.2.0",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "serve": "14.2.1",
     "ts-loader": "^9.5.1",

packages/get-starknet/src/accounts.ts

@@ -1,7 +1,5 @@
-import { MetaMaskSnap } from './snap';
-import {
+import type {
   Abi,
-  Account,
   AllowArray,
   CairoVersion,
   Call,
@@ -15,9 +13,13 @@ import {
   SignerInterface,
   TypedData,
 } from 'starknet';
+import { Account } from 'starknet';
+
+import type { MetaMaskSnap } from './snap';
 
 export class MetaMaskAccount extends Account {
   #snap: MetaMaskSnap;
+
   #address: string;
 
   constructor(

packages/get-starknet/src/signer.ts

@@ -1,5 +1,4 @@
-import { MetaMaskSnap } from './snap';
-import {
+import type {
   Abi,
   ArraySignatureType,
   Call,
@@ -9,12 +8,14 @@ import {
   Signature,
   SignerInterface,
   TypedData,
-  ec,
-  num,
 } from 'starknet';
+import { ec, num as numUtils } from 'starknet';
+
+import type { MetaMaskSnap } from './snap';
 
 export class MetaMaskSigner implements SignerInterface {
   #snap: MetaMaskSnap;
+
   #address: string;
 
   constructor(snap: MetaMaskSnap, address: string) {
@@ -28,7 +29,7 @@ export class MetaMaskSigner implements SignerInterface {
 
   async signMessage(typedData: TypedData, accountAddress: string): Promise<Signature> {
     const result = (await this.#snap.signMessage(typedData, false, accountAddress)) as ArraySignatureType;
-    return new ec.starkCurve.Signature(num.toBigInt(result[0]), num.toBigInt(result[1]));
+    return new ec.starkCurve.Signature(numUtils.toBigInt(result[0]), numUtils.toBigInt(result[1]));
   }
 
   async signTransaction(
@@ -42,16 +43,16 @@ export class MetaMaskSigner implements SignerInterface {
       transactionsDetail,
       abis,
     )) as ArraySignatureType;
-    return new ec.starkCurve.Signature(num.toBigInt(result[0]), num.toBigInt(result[1]));
+    return new ec.starkCurve.Signature(numUtils.toBigInt(result[0]), numUtils.toBigInt(result[1]));
   }
 
   async signDeployAccountTransaction(transaction: DeployAccountSignerDetails): Promise<Signature> {
     const result = (await this.#snap.signDeployAccountTransaction(this.#address, transaction)) as ArraySignatureType;
-    return new ec.starkCurve.Signature(num.toBigInt(result[0]), num.toBigInt(result[1]));
+    return new ec.starkCurve.Signature(numUtils.toBigInt(result[0]), numUtils.toBigInt(result[1]));
   }
 
   async signDeclareTransaction(transaction: DeclareSignerDetails): Promise<Signature> {
     const result = (await this.#snap.signDeclareTransaction(this.#address, transaction)) as ArraySignatureType;
-    return new ec.starkCurve.Signature(num.toBigInt(result[0]), num.toBigInt(result[1]));
+    return new ec.starkCurve.Signature(numUtils.toBigInt(result[0]), numUtils.toBigInt(result[1]));
   }
 }