@velocity-exchange/sdk 0.2.0 → 0.2.2

package/tests/tx/TransactionConfirmationManager.test.ts

@@ -222,6 +222,12 @@ describe('TransactionConfirmationManager_Polling_Tests', () => {
 			}
 		};
 
+		// Fake timers: the poll intervals (and the Date.now used for callTimes) must
+		// be driven deterministically. The previous real `setTimeout(1250)` wait was
+		// flaky under CI load — a slow runner let an extra 400ms poll fire (4 calls
+		// instead of 3). Ticking fake time aligns the 400ms/1200ms intervals exactly
+		// at 1200ms, so the third poll batches both signatures.
+		const clock = sinon.useFakeTimers();
 		const startTime = Date.now();
 
 		// Start both confirmation processes
@@ -238,11 +244,12 @@ describe('TransactionConfirmationManager_Polling_Tests', () => {
 			1200
 		);
 
-		// Wait for 1250ms to ensure we've hit the third 400ms interval and first 1200ms interval
-		await new Promise((resolve) => setTimeout(resolve, 1250));
+		// Advance fake time past the third 400ms interval / first 1200ms interval.
+		await clock.tickAsync(1250);
 
 		// Resolve both promises
 		await Promise.all([promise1, promise2]);
+		clock.restore();
 
 		// Check the call times and signatures
 		assert.strictEqual(callTimes.length, 3, 'Should have exactly 3 calls');

package/tests/user/getMarginCalculation.ts

@@ -261,7 +261,7 @@ describe('getMarginCalculation snapshot', () => {
 		const myMockSpotMarkets = _.cloneDeep(mockSpotMarkets);
 		myMockSpotMarkets[0].oracle = new PublicKey(2);
 		myMockSpotMarkets[1].oracle = new PublicKey(5);
-		myMockPerpMarkets[0].amm.oracle = new PublicKey(5);
+		myMockPerpMarkets[0].oracle = new PublicKey(5);
 
 		// Configure perp market 0 ratios to match on-chain test
 		myMockPerpMarkets[0].marginRatioInitial = 1000; // 10%

package/tests/user/helpers.ts

@@ -33,7 +33,6 @@ export const mockOrder: Order = {
 	price: ZERO,
 	baseAssetAmount: ZERO,
 	baseAssetAmountFilled: ZERO,
-	quoteAssetAmount: ZERO,
 	quoteAssetAmountFilled: ZERO,
 	direction: PositionDirection.LONG,
 	reduceOnly: false,
@@ -120,7 +119,7 @@ export async function makeMockUser(
 
 	const oraclePriceMap: Record<string, number> = {};
 	for (let i = 0; i < myMockPerpMarkets.length; i++) {
-		oraclePriceMap[myMockPerpMarkets[i].amm.oracle.toString()] =
+		oraclePriceMap[myMockPerpMarkets[i].oracle.toString()] =
 			perpOraclePriceList[i] ?? 1;
 	}
 	for (let i = 0; i < myMockSpotMarkets.length; i++) {
@@ -149,7 +148,7 @@ export async function makeMockUser(
 		return { data, slot: 0 };
 	}
 	function getOracleDataForPerpMarket(marketIndex: number) {
-		const oracle = getMockPerpMarket(marketIndex).amm.oracle;
+		const oracle = getMockPerpMarket(marketIndex).oracle;
 		return getMockOracle(oracle).data;
 	}
 	function getOracleDataForSpotMarket(marketIndex: number) {
@@ -160,7 +159,7 @@ export async function makeMockUser(
 	function getMMOracleDataForPerpMarket(
 		marketIndex: number
 	): MMOraclePriceData {
-		const oracle = getMockPerpMarket(marketIndex).amm.oracle;
+		const oracle = getMockPerpMarket(marketIndex).oracle;
 		return {
 			price: getMockOracle(oracle).data.price,
 			slot: getMockOracle(oracle).data.slot,

package/tests/user/marginCalculations.test.ts

@@ -237,7 +237,7 @@ describe('User margin calculations', () => {
 			const myMockPerpMarkets = _.cloneDeep(mockPerpMarkets);
 			const myMockSpotMarkets = _.cloneDeep(mockSpotMarkets);
 			const myMockUserAccount = _.cloneDeep(mockUserAccount);
-			myMockPerpMarkets[0].amm.orderStepSize = BASE_PRECISION;
+			myMockPerpMarkets[0].orderStepSize = BASE_PRECISION;
 
 			myMockUserAccount.spotPositions[0].marketIndex = 0;
 			myMockUserAccount.spotPositions[0].balanceType = SpotBalanceType.DEPOSIT;
@@ -276,7 +276,7 @@ describe('User margin calculations', () => {
 			const myMockPerpMarkets = _.cloneDeep(mockPerpMarkets);
 			const myMockSpotMarkets = _.cloneDeep(mockSpotMarkets);
 			const myMockUserAccount = _.cloneDeep(mockUserAccount);
-			myMockPerpMarkets[0].amm.orderStepSize = BASE_PRECISION;
+			myMockPerpMarkets[0].orderStepSize = BASE_PRECISION;
 
 			myMockUserAccount.perpPositions[0].marketIndex = 0;
 			myMockUserAccount.perpPositions[0].positionFlag =

package/tests/user/test.ts

@@ -47,7 +47,7 @@ async function makeMockUser(
 	// console.log(spotOraclePriceList, myMockSpotMarkets.length);
 
 	for (let i = 0; i < myMockPerpMarkets.length; i++) {
-		oraclePriceMap[myMockPerpMarkets[i].amm.oracle.toString()] =
+		oraclePriceMap[myMockPerpMarkets[i].oracle.toString()] =
 			perpOraclePriceList[i];
 	}
 	for (let i = 0; i < myMockSpotMarkets.length; i++) {
@@ -88,7 +88,7 @@ async function makeMockUser(
 	}
 
 	function getOracleDataForPerpMarket(marketIndex) {
-		const oracle = getMockPerpMarket(marketIndex).amm.oracle;
+		const oracle = getMockPerpMarket(marketIndex).oracle;
 		return getMockOracle(oracle).data;
 	}
 
@@ -100,7 +100,7 @@ async function makeMockUser(
 	function getMMOracleDataForPerpMarket(
 		marketIndex: number
 	): MMOraclePriceData {
-		const oracle = getMockPerpMarket(marketIndex).amm.oracle;
+		const oracle = getMockPerpMarket(marketIndex).oracle;
 		return getMockOracle(oracle).data as unknown as MMOraclePriceData;
 	}
 

package/tsconfig.browser.json

@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
+		"strict": true,
 		"module": "commonjs",
 		"target": "ES2019",
 		"esModuleInterop": true,
@@ -7,8 +8,9 @@
 		"outDir": "./lib/browser",
 		"resolveJsonModule": true,
 		"skipLibCheck": true,
+		"types": [],
 		"paths": {
-			"@solana/web3.js": ["./node_modules/@solana/web3.js"]
+			"@solana/web3.js": ["../../node_modules/@solana/web3.js"]
 		}
 	},
 	"include": ["src"],

package/tsconfig.json

@@ -9,10 +9,28 @@
 		"resolveJsonModule": true,
 		"skipLibCheck": true,
 		"declarationMap": true,
+		// Allowlist ambient @types instead of auto-including all of them: the
+		// hoisted root node_modules/@types holds broken @types/hapi__* stubs (no
+		// index.d.ts) that otherwise break the build (TS2688). node is for src;
+		// mocha/chai are the globals the ts-node/ts-mocha test run needs.
+		"types": ["node", "mocha", "chai"],
+		// Unify every @solana/web3.js specifier (including those inside dep .d.ts
+		// like solana-bankrun, which bundles its own copy) onto the single hoisted
+		// root install, so structurally-identical types don't clash nominally.
 		"paths": {
-			"@solana/web3.js": ["./node_modules/@solana/web3.js"]
+			"@solana/web3.js": ["../../node_modules/@solana/web3.js"]
 		}
 	},
 	"include": ["src"],
-	"exclude": ["node_modules", "tests"]
+	"exclude": ["node_modules", "tests"],
+	// `strict` (added with the SDK strict-mode pass) applies to the shipped `src`
+	// build + the sdk-typecheck gate (both `exclude` tests). The mocha suites run
+	// through ts-node, which would otherwise compile the test files under strict
+	// too — and the tests aren't strict-clean (implicit-any deps, uninitialized
+	// fixture fields). Scope strict to the build, not the test run.
+	"ts-node": {
+		"compilerOptions": {
+			"strict": false
+		}
+	}
 }

package/VERSION

@@ -1 +0,0 @@
-2.163.0-beta.13