@infinex/infinex-sdk - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

package.json

 {
   "name": "@infinex/infinex-sdk",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": false,
   "main": "./sdk/index.ts",
-  "type": "module",
   "files": [
@@ -32,3 +31,3 @@ "./sdk/contracts",
     "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@usecannon/cli": "2.14.3",
+    "@usecannon/cli": "2.15.1",
     "@wormhole-foundation/wormhole-query-sdk": "0.0.6",
@@ -51,3 +50,2 @@ "axios": "1.6.0",
     "typedoc": "^0.25.13",
-    "typescript": "^5.4.5",
     "vite": "^5.2.11",
@@ -67,3 +65,2 @@ "vitest": "^1.6.0",
     "clean": "rm -rf dist cache artifacts typechain deployments/test && pnpm cannon clean",
-    "check:types": "tsc --noEmit",
     "codecheck": "pnpm format && pnpm lint && pnpm slither && pnpm gitleaks",
@@ -83,4 +80,4 @@ "debug": "cannon test cannonfile.toml --wipe -- --force -vvvv --no-match-contract OLD_* --match-test ",
     "lint:sol": "solhint --max-warnings=0 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
-    "postinstall": "# forge install",
-    "preinstall": "# ./scripts/pnpm-checks.sh",
+    "postinstall": "forge install",
+    "preinstall": "./scripts/pnpm-checks.sh",
     "slither": "./scripts/run slither .",
@@ -95,3 +92,3 @@ "start": "CANNON_PROVIDER_URL=RPC_URL ./scripts/run cannon infinex:0.1.0@main -c CHAIN",
     "test:healthcheck": "vitest run --config ./vitest.config.ts healthcheck",
-    "test:sdk": "vitest run --config ./vitest.config.ts accountUpgrades",
+    "test:sdk": "vitest run --config ./vitest.config.ts",
     "test:upgrade": "cannon test cannonfile.upgrade.toml --wipe -- --force",
@@ -98,0 +95,0 @@ "tet": "cannon test cannonfile.toml --wipe -- --force --no-match-contract OLD_*"

sdk/abis/index.ts

 export { AccountFactoryAbi } from './AccountFactory';
+export { CtPStakingRewardsAbi } from './CtPStakingRewards';
 export { CurveStableSwapAppAbi } from './CurveStableSwapApp';
@@ -10,2 +11,3 @@ export { GovernancePointsAbi } from './GovernancePoints';
 export { OLD_RecoveryModuleAbi } from './OLD_RecoveryModule';
+export { RecoveryModuleAbi } from './RecoveryModule';
 export { InfinexProtocolConfigBeaconAbi } from './InfinexProtocolConfigBeacon';
@@ -12,0 +14,0 @@ export { BaseModuleAbi } from './BaseModule';

sdk/build.ts

@@ -1,11 +0,6 @@
-import { Abi as abiParser } from 'abitype/zod';
-import { readFile, readdir, rm, writeFile } from 'fs/promises';
+import { readdir, readFile, writeFile, rm } from 'fs/promises';
 import path from 'node:path';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
 import config from './config';
+import { Abi as abiParser } from 'abitype/zod';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
 const OUT_FOLDER_PATH = path.resolve(__dirname, '../out');
@@ -12,0 +7,0 @@ const ABIS_FOLDER_PATH = path.resolve(__dirname, './abis');

sdk/config.ts

@@ -11,2 +11,3 @@ export const InfinexContracts = [
   'InfinexProtocolConfigBeacon',
+  'RecoveryModule',
   'OLD_RecoveryModule',
@@ -13,0 +14,0 @@ 'OLD_StWStakingRewards',

sdk/contracts/external/erc20.ts

@@ -19,4 +19,2 @@ import {
   client,
-  transport,
-  account,
 }: {
@@ -32,19 +30,8 @@ address: Address;
 
-  const defaultClient = createClient({
-    transport: transport || http(httpTransport),
-  });
+  const defaultClient = createClient({ transport: http(httpTransport) });
 
-  const defaultWalletClient = createWalletClient({
-    transport: transport || http(httpTransport),
-    account: account || privateKeyToAccount(config.devWallet as Address),
-    chain: config.viemChain,
-  });
-
   const contract = getContract({
     address: getAddress(address),
     abi: erc20Abi,
-    client: {
-      public: client || defaultClient,
-      wallet: defaultWalletClient,
-    },
+    client: client || defaultClient,
   });
@@ -51,0 +38,0 @@

sdk/contracts/external/usdc.ts

 import { Account, createClient, Transport } from 'viem';
 import type { Config } from '../../types';
 import { erc20 } from './erc20';
+import type { Config } from '../../types';
 
@@ -9,4 +10,2 @@ export const usdc = ({
   client,
-  account,
-  transport,
 }: {
@@ -19,12 +18,4 @@ config: Config;
 }) => {
-  const usdcAddress = config.contracts.external.usdc;
-
-  return erc20({
-    config,
-    overrides,
-    client,
-    account,
-    transport,
-    address: usdcAddress,
-  });
+  const address = config.contracts.external.usdc;
+  return erc20({ address, config, overrides, client });
 };

sdk/contracts/infinex/accountFactory.ts

@@ -9,5 +9,5 @@ import {
 } from 'viem';
-import { privateKeyToAccount } from 'viem/accounts';
 import { AccountFactoryAbi } from '../../abis/AccountFactory';
 import type { Address, Config } from '../../types';
+import { privateKeyToAccount } from 'viem/accounts';
 import { getEncodedFunctions } from '../../utils/abi';
@@ -38,3 +38,2 @@
   });
-
   const defaultWalletClient = createWalletClient({
@@ -41,0 +40,0 @@ transport: transport || http(httpTransport),

sdk/contracts/infinex/index.ts

@@ -1,10 +0,11 @@
-export { accountFactory } from './accountFactory';
-export { accountUtilsModule } from './accountUtilsModule';
-export { baseModule } from './baseModule';
-export { bridgingModule } from './bridgingModule';
-export { forwarder } from './forwarder';
-export { governancePoints } from './governancePoints';
-export { infinexProtocolConfigBeacon } from './infinexProtocolConfigBeacon';
-export { iuupsImplementation } from './iuupsImplementation';
-export { recoveryModule } from './recoveryModule';
-export { stwStakingRewards } from './stwStakingRewards';
+export { accountFactory } from './accountFactory.ts';
+export { accountUtilsModule } from './accountUtilsModule.ts';
+export { baseModule } from './baseModule.ts';
+export { bridgingModule } from './bridgingModule.ts';
+export { forwarder } from './forwarder.ts';
+export { governancePoints } from './governancePoints.ts';
+export { infinexProtocolConfigBeacon } from './infinexProtocolConfigBeacon.ts';
+export { iuupsImplementation } from './iuupsImplementation.ts';
+export { recoveryModule } from './recoveryModule.ts';
+export { stwStakingRewards } from './stwStakingRewards.ts';
+export { ctpStakingRewards } from './ctpStakingRewards.ts';

sdk/contracts/infinex/infinexProtocolConfigBeacon.ts

@@ -1,8 +0,21 @@
-import type { Account, Address, Transport } from 'viem';
+import { InfinexProtocolConfigBeaconAbi } from '../../abis';
+import { getEncodedFunctions } from '../../utils/abi';
 import { createClient, createWalletClient, getContract, http } from 'viem';
+import type {
+  Transport,
+  Account,
+  GetContractReturnType,
+  Client,
+  Address,
+  Abi,
+} from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { InfinexProtocolConfigBeaconAbi } from '../../abis';
-import { Config } from '../../types';
-import { getEncodedFunctions } from '../../utils/abi';
+import { Config, GetEncodedFunctionsData } from '../../types';
 
+type InfinexContract<
+  TAbi extends Abi,
+  TClient extends Client,
+  TAddress extends Address,
+> = GetContractReturnType<TAbi, TClient, TAddress>;
+
 export const infinexProtocolConfigBeacon = ({
@@ -20,3 +33,9 @@ address,
   account?: Account;
-}) => {
+}): {
+  encode: GetEncodedFunctionsData<typeof InfinexProtocolConfigBeaconAbi>;
+} & InfinexContract<
+  typeof InfinexProtocolConfigBeaconAbi,
+  ReturnType<typeof createClient<Transport>>,
+  Address
+> => {
   const {
@@ -23,0 +42,0 @@ contracts: {

sdk/contracts/infinex/iuupsImplementation.ts

@@ -9,6 +9,6 @@ import {
 } from 'viem';
+import type { Address, Config } from '../../types';
 import { privateKeyToAccount } from 'viem/accounts';
 import { IUUPSImplementationAbi } from '../../abis';
-import type { Address, Config } from '../../types';
-import { getEncodedFunctions } from '../../utils/abi';
+import { getEncodedFunctions } from '../../utils';
 
@@ -15,0 +15,0 @@ export const iuupsImplementation = ({

sdk/contracts/infinex/recoveryModule.ts

@@ -10,3 +10,3 @@ import {
 import { privateKeyToAccount } from 'viem/accounts';
-import { OLD_RecoveryModuleAbi } from '../../abis/OLD_RecoveryModule';
+import { RecoveryModuleAbi } from '../../abis/RecoveryModule';
 import type { Address, Config } from '../../types';
@@ -42,3 +42,3 @@ import { getEncodedFunctions } from '../../utils/abi';
     address: address,
-    abi: OLD_RecoveryModuleAbi,
+    abi: RecoveryModuleAbi,
     client: {
@@ -52,6 +52,4 @@ public: defaultClient,
     ...contract,
-    encode: getEncodedFunctions<typeof OLD_RecoveryModuleAbi>(
-      OLD_RecoveryModuleAbi,
-    ),
+    encode: getEncodedFunctions<typeof RecoveryModuleAbi>(RecoveryModuleAbi),
   };
 };

sdk/env.ts

 import { z } from 'zod';
+import { Address } from './types';
 import { AddressSchema } from './schema';
-import { Address } from './types';
 
@@ -5,0 +5,0 @@ export const envSchema = z.object({

sdk/utils/index.ts

@@ -1,14 +0,13 @@
-import { randomBytes } from 'node:crypto';
+import * as infinexContracts from '../contracts/infinex';
+import * as externalContracts from '../contracts/external';
+import { Address, Config, EvmChains } from '../types';
+import { privateKeyToAccount } from 'viem/accounts';
 import {
-  bytesToBigInt,
   createPublicClient,
-  createWalletClient,
   encodePacked,
   http,
   keccak256,
+  bytesToBigInt,
 } from 'viem';
-import { privateKeyToAccount } from 'viem/accounts';
-import * as externalContracts from '../contracts/external';
-import * as infinexContracts from '../contracts/infinex';
-import { Address, Config, EvmChains } from '../types';
+import { randomBytes } from 'node:crypto';
 
@@ -47,6 +46,3 @@ export const createAccountSalt = (sudoKey: Address) => {
     external: {
-      usdc: externalContracts.usdc({
-        config,
-        account: privateKeyToAccount(config.devWallet as Address),
-      }),
+      usdc: externalContracts.usdc({ config }),
     },
@@ -57,7 +53,2 @@ accounts: {
     client: createPublicClient({ transport: http(config.httpTransport) }),
-    walletClient: createWalletClient({
-      transport: http(config.httpTransport),
-      account: privateKeyToAccount(config.devWallet as Address),
-      chain: config.viemChain,
-    }),
     config,
@@ -101,9 +92,3 @@ };
   chains?: Chain[],
-): Promise<
-  {
-    result: TExecResult;
-    chainName: EvmChains;
-    chainId: number;
-  }[]
-> => {
+): Promise<void[]> => {
   if (!chains) {
@@ -115,11 +100,6 @@ chains = initEvmChains(configs); // Ensure initEvmChains returns a Chain[]
     chains.map(async (chain) => {
-      return {
-        result: (await fn(chain)) as TExecResult,
-        chainName: chain.chain,
-        chainId: chain.config.chainId,
-      };
+      await fn(chain);
     }),
   );
 };
-
 export const initEvmChains = (configs: Record<string, Config>) => {
@@ -140,3 +120,3 @@ return Object.entries(configs).map(([, config]) => {
 
+export { createForwarderRequest } from './eip712';
 export { getEncodedFunctions } from './abi';
-export { createForwarderRequest } from './eip712';

New alerts

Install scripts

Supply chain risk

Install scripts are run when the package is installed. The majority of malware in npm is hidden in install scripts.

Found 2 instances in 1 package

Fixed alerts

Install scripts

Supply chain risk

Install scripts are run when the package is installed. The majority of malware in npm is hidden in install scripts.

Found 2 instances in 1 package

Improved metrics

Total package byte prevSize

232547

increased by5.75%

Dev dependency count

29

decreased by-3.33%

Number of package files

52

increased by4%

Lines of code

10853

increased by6.18%

Worsened metrics

Is type module

No

No dependency changes