More isolated declarations in typescript

paulmillr · Jan 19, 2025 · bcb2407 · bcb2407
1 parent 2fc44dc
commit bcb2407
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 12 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,10 @@
 {
-	"typescript.tsdk": "node_modules\\typescript\\lib"
+  "files.exclude": {
+    "*.{js,d.ts,js.map}": true,
+    "esm/*.{js,d.ts,js.map}": true,
+    "audit": true,
+    "coverage": true,
+    "esm": true,
+    "{LICENSE,SECURITY.md,.gitignore,.prettierrc.json,package-lock.json}": true
+  }
 }
diff --git a/jsr.json b/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@paulmillr/micro-eth-signer",
-  "version": "0.13.3-pre",
+  "version": "0.13.3",
   "exports": {
     ".": "./src/index.ts",
     "./abi": "./src/abi/index.ts",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "micro-eth-signer",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Minimal library for Ethereum transactions, addresses and smart contracts",
   "files": [
     "*.js",

diff --git a/src/net/uniswap-common.ts b/src/net/uniswap-common.ts
@@ -77,7 +77,19 @@ export async function awaitDeep<T, E extends boolean | undefined>(
   return trBack(out);
 }
 
-export const COMMON_BASES = ['WETH', 'DAI', 'USDC', 'USDT', 'COMP', 'MKR', 'WBTC', 'AMPL']
+export type CommonBase = {
+  contract: string;
+} & import('../abi/decoder.js').ContractInfo;
+export const COMMON_BASES: CommonBase[] = [
+  'WETH',
+  'DAI',
+  'USDC',
+  'USDT',
+  'COMP',
+  'MKR',
+  'WBTC',
+  'AMPL',
+]
   .map((i) => tokenFromSymbol(i))
   .filter((i) => !!i);
 export const WETH: string = tokenFromSymbol('WETH')!.contract;

diff --git a/src/net/uniswap-v2.ts b/src/net/uniswap-v2.ts
@@ -21,12 +21,12 @@ const PAIR_CONTRACT = [
   },
 ] as const;
 
-export function create2(from: Uint8Array, salt: Uint8Array, initCodeHash: Uint8Array) {
+export function create2(from: Uint8Array, salt: Uint8Array, initCodeHash: Uint8Array): string {
   const cat = concatBytes(new Uint8Array([255]), from, salt, initCodeHash);
   return ethHex.encode(keccak_256(cat).slice(12));
 }
 
-export function pairAddress(a: string, b: string, factory: string = FACTORY_ADDRESS) {
+export function pairAddress(a: string, b: string, factory: string = FACTORY_ADDRESS): string {
   // This is completely broken: '0x11' '0x11' will return '0x1111'. But this is how it works in sdk.
   const data = concatBytes(...uni.sortTokens(a, b).map((i) => ethHex.decode(i)));
   return create2(ethHex.decode(factory), keccak_256(data), INIT_CODE_HASH);
@@ -140,7 +140,17 @@ export function txData(
     slippagePercent: number;
     feeOnTransfer: boolean;
   } = TX_DEFAULT_OPT
-) {
+): {
+  to: string;
+  value: bigint;
+  data: any;
+  allowance:
+    | {
+        token: string;
+        amount: bigint;
+      }
+    | undefined;
+} {
   opt = { ...TX_DEFAULT_OPT, ...opt };
   if (!uni.isValidUniAddr(input) || !uni.isValidUniAddr(output) || !uni.isValidEthAddr(to))
     throw new Error('Invalid address');
@@ -182,8 +192,8 @@ export function txData(
 // Here goes Exchange API. Everything above is SDK. Supports almost everything from official sdk except liquidity stuff.
 export default class UniswapV2 extends uni.UniswapAbstract {
   name = 'Uniswap V2';
-  contract = UNISWAP_V2_ROUTER_CONTRACT;
-  bestPath(fromCoin: string, toCoin: string, inputAmount: bigint) {
+  contract: string = UNISWAP_V2_ROUTER_CONTRACT;
+  bestPath(fromCoin: string, toCoin: string, inputAmount: bigint): Promise<Path> {
     return bestPath(this.net, fromCoin, toCoin, inputAmount);
   }
   txData(

diff --git a/src/net/uniswap-v3.ts b/src/net/uniswap-v3.ts
@@ -125,7 +125,17 @@ export function txData(
   amountIn?: bigint,
   amountOut?: bigint,
   opt: TxOpt = uni.DEFAULT_SWAP_OPT
-) {
+): {
+  to: string;
+  value: bigint;
+  data: Uint8Array;
+  allowance:
+    | {
+        token: string;
+        amount: bigint;
+      }
+    | undefined;
+} {
   opt = { ...uni.DEFAULT_SWAP_OPT, ...opt };
   const err = 'Uniswap v3: ';
   if (!uni.isValidUniAddr(input)) throw new Error(err + 'invalid input address');
@@ -198,8 +208,8 @@ export function txData(
 // Here goes Exchange API. Everything above is SDK.
 export default class UniswapV3 extends uni.UniswapAbstract {
   name = 'Uniswap V3';
-  contract = UNISWAP_V3_ROUTER_CONTRACT;
-  bestPath(fromCoin: string, toCoin: string, inputAmount: bigint) {
+  contract: string = UNISWAP_V3_ROUTER_CONTRACT;
+  bestPath(fromCoin: string, toCoin: string, inputAmount: bigint): Promise<Route> {
     return bestPath(this.net, fromCoin, toCoin, inputAmount);
   }
   txData(