@tradeport/sui-trading-sdk 0.4.64 → 0.4.65

package/package.json

@@ -1,60 +1,66 @@
 {
-  "name": "@tradeport/sui-trading-sdk",
-  "license": "MIT",
-  "version": "0.4.64",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "devDependencies": {
-    "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "@changesets/cli": "^2.26.2",
-    "@types/jest": "^29.5.10",
-    "@types/ms": "^2.1.0",
-    "@types/node": "^20.10.0",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "@typescript-eslint/parser": "^6.13.1",
-    "babel-jest": "^29.7.0",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-config-xo": "^0.43.1",
-    "eslint-config-xo-typescript": "^1.0.1",
-    "husky": "^8.0.0",
-    "jest": "^29.7.0",
-    "lint-staged": "^16.2.7",
-    "prettier": "^3.1.0",
-    "ts-jest": "^29.1.1",
-    "tsup": "^8.0.1",
-    "typescript": "^5.3.2"
-  },
-  "dependencies": {
-    "@mysten/kiosk": "^0.7.13",
-    "@mysten/sui": "^1.17.0",
-    "@types/analytics-node": "^3.1.14",
-    "analytics-node": "^6.2.0",
-    "bignumber.js": "^9.3.1",
-    "graphql": "^16.12.0",
-    "graphql-request": "^6.1.0",
-    "ms": "^2.1.3"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "lint-staged": {
-    "*.ts": [
-      "eslint --fix",
-      "bash -c 'tsc --noEmit'",
-      "prettier --write"
-    ]
-  },
-  "scripts": {
-    "build": "tsup src/index.ts --sourcemap --format cjs,esm --dts",
-    "release": "pnpm run build && changeset publish",
-    "lint": "tsc && eslint --fix src/* --ignore-path .gitignore --ext .js,.ts",
-    "format": "prettier --write \"**/*.+(js|ts|json)\"",
-    "test": "jest",
-    "pre-commit": "lint-staged"
-  }
-}
+	"name": "@tradeport/sui-trading-sdk",
+	"license": "MIT",
+	"version": "0.4.65",
+	"main": "dist/index.js",
+	"module": "dist/index.mjs",
+	"types": "dist/index.d.ts",
+	"scripts": {
+		"build": "tsup src/index.ts --sourcemap --format cjs,esm --dts",
+		"release": "pnpm run build && changeset publish",
+		"lint": "tsc && eslint --fix src/* --ignore-path .gitignore --ext .js,.ts",
+		"format": "prettier --write \"**/*.+(js|ts|json)\"",
+		"test": "jest",
+		"prepare": "husky install",
+		"pre-commit": "lint-staged"
+	},
+	"devDependencies": {
+		"@babel/core": "^7.23.3",
+		"@babel/preset-env": "^7.23.3",
+		"@changesets/cli": "^2.26.2",
+		"@types/jest": "^29.5.10",
+		"@types/ms": "^2.1.0",
+		"@types/node": "^20.10.0",
+		"@typescript-eslint/eslint-plugin": "^6.13.1",
+		"@typescript-eslint/parser": "^6.13.1",
+		"babel-jest": "^29.7.0",
+		"dotenv": "^16.3.1",
+		"eslint": "^8.54.0",
+		"eslint-config-prettier": "^9.0.0",
+		"eslint-config-xo": "^0.43.1",
+		"eslint-config-xo-typescript": "^1.0.1",
+		"husky": "^8.0.0",
+		"jest": "^29.7.0",
+		"lint-staged": "^16.2.7",
+		"prettier": "^3.1.0",
+		"ts-jest": "^29.1.1",
+		"tsup": "^8.0.1",
+		"typescript": "^5.3.2"
+	},
+	"dependencies": {
+		"@mysten/kiosk": "^0.7.13",
+		"@mysten/sui": "^1.17.0",
+		"@types/analytics-node": "^3.1.14",
+		"analytics-node": "^6.2.0",
+		"bignumber.js": "^9.3.1",
+		"graphql": "^16.12.0",
+		"graphql-request": "^6.1.0",
+		"ms": "^2.1.3"
+	},
+	"publishConfig": {
+		"access": "public",
+		"registry": "https://registry.npmjs.org/"
+	},
+	"lint-staged": {
+		"*.ts": [
+			"eslint --fix",
+			"bash -c 'tsc --noEmit'",
+			"prettier --write"
+		]
+	},
+	"pnpm": {
+		"overrides": {
+			"@mysten/sui": "^1.45.2"
+		}
+	}
+}

package/src/helpers/kiosk/getRulePackageId.ts

@@ -4,6 +4,7 @@ import { addHexPrefix } from '../../utils/addHexPrefix';
 import { normalizedNftType } from '../../utils/normalizeNftType';
 import { getTransferPolicyRuleNamesFromSuiObject } from '../getTransferPolicyRuleNamesFromSuiObject';
 import { getNativeKioskTransferPolicies } from './getNativeKioskTransferPolicies';
+import { upgradeKioskRulesPackageId } from './upgradeKioskRulesPackageId';
 
 type RuleType = 'kiosk_royalty_rule' | 'royalty_rule' | 'personal_kiosk_rule' | 'kiosk_lock_rule';
 
@@ -54,5 +55,5 @@ export const getRulePackageId = async ({
 		rulePackageId = rule?.split('::')?.[0];
 	}
 
-	return addHexPrefix(rulePackageId);
+	return upgradeKioskRulesPackageId(addHexPrefix(rulePackageId));
 };

package/src/helpers/kiosk/getTransferPoliciesToResolve.ts

@@ -6,6 +6,7 @@ import {
 	getNativeKioskTransferPolicies,
 	knownTransferPolicyRules,
 } from './getNativeKioskTransferPolicies';
+import { upgradeKioskRulesPackageId } from './upgradeKioskRulesPackageId';
 
 interface RuleData {
 	rule: string;
@@ -132,6 +133,8 @@ export const getTransferPoliciesToResolve = async ({
 					rulePackageId = ruleData?.rule?.split('::')?.[0];
 				}
 
+				rulePackageId = upgradeKioskRulesPackageId(rulePackageId);
+
 				const moduleName = ruleData?.rule?.split('::')?.[1];
 
 				if (originByteRuleModules.includes(moduleName)) {

package/src/helpers/kiosk/upgradeKioskRulesPackageId.ts

@@ -0,0 +1,17 @@
+import { normalizeSuiAddress } from '@mysten/sui/utils';
+
+// @mysten/kiosk's mainnet rule defaults still point at v1 of the kiosk rules
+// package. The package has since been upgraded; newer collections (e.g. suirocks)
+// have linkage constraints that require the upgraded version, so calling v1
+// fails with InvalidLinkage. Remap the original packageId to the upgraded one
+// when it shows up in rule lookups.
+const KIOSK_RULES_ORIGINAL_PACKAGE_ID = normalizeSuiAddress(
+	'0x434b5bd8f6a7b05fede0ff46c6e511d71ea326ed38056e3bcd681d2d7c2a7879',
+);
+const KIOSK_RULES_UPGRADED_PACKAGE_ID =
+	'0xdfb4f1d4e43e0c3ad834dcd369f0d39005c872e118c9dc1c5da9765bb93ee5f3';
+
+export const upgradeKioskRulesPackageId = (packageId: string): string =>
+	normalizeSuiAddress(packageId) === KIOSK_RULES_ORIGINAL_PACKAGE_ID
+		? KIOSK_RULES_UPGRADED_PACKAGE_ID
+		: packageId;