@mapprotocol/common-contracts 0.3.1 → 0.4.0

package/utils/dist/deployRecord.d.ts

@@ -0,0 +1,37 @@
+export interface DeploymentPath {
+    env: string;
+    chain: string;
+}
+export interface DeploymentOptions {
+    basePath?: string;
+    env: string;
+}
+/**
+ * Resolve deployment path from network name and env.
+ * @param network - hardhat network name (e.g. "Bsc", "Mapo_test", "Tron")
+ * @param env - deployment environment: "prod", "main", "test"
+ * @returns { env, chain } for deploy.json lookup
+ */
+export declare function resolveDeploymentPath(network: string, env: string): DeploymentPath;
+/**
+ * Read a deployed contract address from deploy.json.
+ * @param network - hardhat network name
+ * @param key - contract key (e.g. "Gateway", "Authority")
+ * @param opts - optional basePath and env overrides
+ */
+export declare function getDeploymentByKey(network: string, key: string, opts: DeploymentOptions): Promise<string>;
+/**
+ * Check if a contract address exists and is valid in deploy.json.
+ * @param network - hardhat network name
+ * @param key - contract key
+ * @param opts - optional basePath and env overrides
+ */
+export declare function hasDeployment(network: string, key: string, opts: DeploymentOptions): Promise<boolean>;
+/**
+ * Save a deployed contract address to deploy.json.
+ * @param network - hardhat network name
+ * @param key - contract key (e.g. "Gateway")
+ * @param addr - deployed address
+ * @param opts - optional basePath and env overrides
+ */
+export declare function saveDeployment(network: string, key: string, addr: string, opts: DeploymentOptions): Promise<void>;

package/utils/dist/deployRecord.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDeploymentPath = resolveDeploymentPath;
+exports.getDeploymentByKey = getDeploymentByKey;
+exports.hasDeployment = hasDeployment;
+exports.saveDeployment = saveDeployment;
+/**
+ * Deploy record — read/write deployed contract addresses from deploy.json
+ *
+ * Structure:
+ *   {
+ *     "prod": { "Mapo": { "Relay": "0x..." }, "Bsc": { "Gateway": "0x..." } },
+ *     "main": { "Mapo": { "Relay": "0x..." } },
+ *     "test": { "Mapo": { "Relay": "0x..." } }
+ *   }
+ */
+let fs = require("fs");
+let path = require("path");
+function defaultDeployPath() {
+    return path.join(process.cwd(), "deployments");
+}
+/**
+ * Resolve deployment path from network name and env.
+ * @param network - hardhat network name (e.g. "Bsc", "Mapo_test", "Tron")
+ * @param env - deployment environment: "prod", "main", "test"
+ * @returns { env, chain } for deploy.json lookup
+ */
+function resolveDeploymentPath(network, env) {
+    // Strip _test suffix from network name to get chain name
+    const chain = network.replace(/_?test$/i, "");
+    return { env, chain: chain.charAt(0).toUpperCase() + chain.slice(1) };
+}
+/**
+ * Read a deployed contract address from deploy.json.
+ * @param network - hardhat network name
+ * @param key - contract key (e.g. "Gateway", "Authority")
+ * @param opts - optional basePath and env overrides
+ */
+async function getDeploymentByKey(network, key, opts) {
+    const deployPath = opts.basePath || defaultDeployPath();
+    const { env, chain } = resolveDeploymentPath(network, opts.env);
+    const data = await readDeployFile(deployPath);
+    const addr = data[env]?.[chain]?.[key];
+    if (!addr)
+        throw new Error(`no ${key} deployment in ${env}.${chain}`);
+    return addr;
+}
+/**
+ * Check if a contract address exists and is valid in deploy.json.
+ * @param network - hardhat network name
+ * @param key - contract key
+ * @param opts - optional basePath and env overrides
+ */
+async function hasDeployment(network, key, opts) {
+    try {
+        const deployPath = opts.basePath || defaultDeployPath();
+        const { env, chain } = resolveDeploymentPath(network, opts.env);
+        const data = await readDeployFile(deployPath);
+        const addr = data[env]?.[chain]?.[key];
+        return !!addr && addr.length > 2 && addr !== "0x";
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Save a deployed contract address to deploy.json.
+ * @param network - hardhat network name
+ * @param key - contract key (e.g. "Gateway")
+ * @param addr - deployed address
+ * @param opts - optional basePath and env overrides
+ */
+async function saveDeployment(network, key, addr, opts) {
+    const deployPath = opts.basePath || defaultDeployPath();
+    const { env, chain } = resolveDeploymentPath(network, opts.env);
+    const data = await readDeployFile(deployPath);
+    if (!data[env])
+        data[env] = {};
+    if (!data[env][chain])
+        data[env][chain] = {};
+    data[env][chain][key] = addr;
+    const filePath = path.resolve(deployPath, "deploy.json");
+    await ensureDir(deployPath);
+    await fs.promises.writeFile(filePath, JSON.stringify(data, null, "\t"));
+}
+async function readDeployFile(basePath) {
+    const filePath = path.resolve(basePath, "deploy.json");
+    try {
+        const rawdata = await fs.promises.readFile(filePath, "utf-8");
+        return JSON.parse(rawdata);
+    }
+    catch {
+        return {};
+    }
+}
+async function ensureDir(dirPath) {
+    const absPath = path.resolve(dirPath);
+    try {
+        await fs.promises.stat(absPath);
+    }
+    catch {
+        await fs.promises.mkdir(absPath, { recursive: true });
+    }
+}

package/utils/dist/deployer.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Unified deployer — auto-routes to EVM or Tron based on network name.
+ *
+ * Usage in hardhat tasks:
+ *   const deployer = createDeployer(hre, { autoVerify: true });
+ *   let addr = await deployer.deploy("Gateway", [admin], salt);
+ *   let { proxy, implementation } = await deployer.deployProxy("Gateway", [admin], salt);
+ *   let newImpl = await deployer.upgrade("Gateway", proxyAddr);
+ */
+export interface DeployerOptions {
+    /**
+     * Auto-verify contracts after deploy/upgrade.
+     * Failures are logged as warnings, never thrown — call deployer.verify() for explicit error handling.
+     * Defaults to false.
+     */
+    autoVerify?: boolean;
+}
+export interface DeployResult {
+    address: string;
+    hex?: string;
+}
+export interface DeployProxyResult {
+    proxy: string;
+    implementation: string;
+    proxyHex?: string;
+    implementationHex?: string;
+}
+export interface Deployer {
+    /**
+     * Deploy a contract.
+     * @param contractName - artifact name
+     * @param args - constructor arguments as raw values
+     * @param salt - "" or omitted = direct deploy; non-empty string = CREATE2 factory (deterministic address)
+     */
+    deploy(contractName: string, args?: any[], salt?: string): Promise<DeployResult>;
+    deployProxy(contractName: string, initArgs?: any[], salt?: string): Promise<DeployProxyResult>;
+    upgrade(contractName: string, proxyAddr: string): Promise<DeployResult>;
+    /** Verify explicitly (throws on failure, unlike autoVerify which only warns). */
+    verify(contractName: string, address: string, constructorArgs?: any[], contractPath?: string): Promise<void>;
+    isTron: boolean;
+    network: string;
+}
+/**
+ * Create a unified deployer that auto-routes to EVM or Tron based on network.
+ * @param hre - hardhat runtime environment
+ * @param opts - options (autoVerify: auto-verify after deploy, defaults to false)
+ */
+export declare function createDeployer(hre: any, opts?: DeployerOptions): Deployer;

package/utils/dist/deployer.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDeployer = createDeployer;
+const tronHelper_1 = require("./tronHelper");
+const evmHelper_1 = require("./evmHelper");
+const verifier_1 = require("./verifier");
+/**
+ * Create a unified deployer that auto-routes to EVM or Tron based on network.
+ * @param hre - hardhat runtime environment
+ * @param opts - options (autoVerify: auto-verify after deploy, defaults to false)
+ */
+function createDeployer(hre, opts = {}) {
+    const network = hre.network.name;
+    const isTron = (0, tronHelper_1.isTronNetwork)(network);
+    const autoVerify = opts.autoVerify || false;
+    async function tryVerify(contractName, address, constructorArgs, contractPath) {
+        if (!autoVerify)
+            return;
+        try {
+            await (0, verifier_1.verify)(hre, { contractName, address, constructorArgs, contractPath });
+        }
+        catch (e) {
+            console.log(`[warn] auto-verify failed: ${e.message || e}`);
+        }
+    }
+    if (isTron) {
+        const client = tronHelper_1.TronClient.fromHre(hre);
+        return {
+            isTron: true,
+            network,
+            async deploy(contractName, args = [], salt = "") {
+                let result = await client.deploy(hre.artifacts, contractName, args, salt);
+                await tryVerify(contractName, result.base58, args);
+                return { address: result.base58, hex: result.hex };
+            },
+            async deployProxy(contractName, initArgs = [], salt = "") {
+                let result = await client.deployProxy(hre.artifacts, contractName, initArgs, salt);
+                await tryVerify(contractName, result.implementation.base58);
+                return {
+                    proxy: result.proxy.base58,
+                    implementation: result.implementation.base58,
+                    proxyHex: result.proxy.hex,
+                    implementationHex: result.implementation.hex,
+                };
+            },
+            async upgrade(contractName, proxyAddr) {
+                let result = await client.upgradeProxy(hre.artifacts, contractName, proxyAddr);
+                await tryVerify(contractName, result.base58);
+                return { address: result.base58, hex: result.hex };
+            },
+            async verify(contractName, address, constructorArgs, contractPath) {
+                await (0, verifier_1.verify)(hre, { contractName, address, constructorArgs, contractPath });
+            },
+        };
+    }
+    // EVM
+    const { ethers, artifacts } = hre;
+    return {
+        isTron: false,
+        network,
+        async deploy(contractName, args = [], salt = "") {
+            let addr = await (0, evmHelper_1.evmDeploy)(ethers, artifacts, contractName, args, salt);
+            await tryVerify(contractName, addr, args);
+            return { address: addr };
+        },
+        async deployProxy(contractName, initArgs = [], salt = "") {
+            let result = await (0, evmHelper_1.evmDeployProxy)(ethers, artifacts, contractName, initArgs, salt);
+            await tryVerify(contractName, result.implementation);
+            return { proxy: result.proxy, implementation: result.implementation };
+        },
+        async upgrade(contractName, proxyAddr) {
+            let addr = await (0, evmHelper_1.evmUpgradeProxy)(ethers, contractName, proxyAddr);
+            await tryVerify(contractName, addr);
+            return { address: addr };
+        },
+        async verify(contractName, address, constructorArgs, contractPath) {
+            await (0, verifier_1.verify)(hre, { contractName, address, constructorArgs, contractPath });
+        },
+    };
+}

package/utils/dist/evmHelper.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Deploy contract on EVM. If salt is provided, uses CREATE2 factory for deterministic address.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param artifacts - hardhat artifacts (hre.artifacts)
+ * @param contractName - contract name to deploy
+ * @param args - constructor arguments array
+ * @param salt - optional CREATE2 salt for deterministic address
+ * @returns deployed contract address (0x hex)
+ */
+export declare function evmDeploy(ethers: any, artifacts: any, contractName: string, args?: any[], salt?: string): Promise<string>;
+/**
+ * Deploy implementation + ERC1967 proxy in one step.
+ * If salt is provided, proxy is deployed via factory.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param artifacts - hardhat artifacts (hre.artifacts)
+ * @param contractName - implementation contract name
+ * @param initArgs - initialize() function arguments
+ * @param salt - optional CREATE2 salt for proxy
+ * @returns { proxy, implementation } addresses
+ */
+export declare function evmDeployProxy(ethers: any, artifacts: any, contractName: string, initArgs?: any[], salt?: string): Promise<{
+    proxy: string;
+    implementation: string;
+}>;
+/**
+ * Upgrade a UUPS proxy to a new implementation.
+ * Deploys new implementation, then calls upgradeToAndCall on the proxy.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param contractName - new implementation contract name
+ * @param proxyAddr - proxy address to upgrade
+ * @returns new implementation address
+ */
+export declare function evmUpgradeProxy(ethers: any, contractName: string, proxyAddr: string): Promise<string>;

package/utils/dist/evmHelper.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.evmDeploy = evmDeploy;
+exports.evmDeployProxy = evmDeployProxy;
+exports.evmUpgradeProxy = evmUpgradeProxy;
+/**
+ * Deploy contract on EVM. If salt is provided, uses CREATE2 factory for deterministic address.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param artifacts - hardhat artifacts (hre.artifacts)
+ * @param contractName - contract name to deploy
+ * @param args - constructor arguments array
+ * @param salt - optional CREATE2 salt for deterministic address
+ * @returns deployed contract address (0x hex)
+ */
+async function evmDeploy(ethers, artifacts, contractName, args = [], salt = "") {
+    if (salt) {
+        const { evmDeployByFactory } = require("./factory");
+        const artifact = await artifacts.readArtifact(contractName);
+        const constructorArgs = args.length > 0
+            ? ethers.AbiCoder.defaultAbiCoder().encode(artifact.abi
+                .find((x) => x.type === "constructor")
+                ?.inputs.map((i) => i.type) || [], args)
+            : "0x";
+        return evmDeployByFactory(ethers, salt, artifact.bytecode, constructorArgs);
+    }
+    const [deployer] = await ethers.getSigners();
+    console.log("deploy address is:", deployer.address);
+    const ContractFactory = await ethers.getContractFactory(contractName);
+    const contract = await (await ContractFactory.deploy(...args)).waitForDeployment();
+    const addr = await contract.getAddress();
+    console.log(`${contractName} deployed: ${addr}`);
+    return addr;
+}
+/**
+ * Deploy implementation + ERC1967 proxy in one step.
+ * If salt is provided, proxy is deployed via factory.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param artifacts - hardhat artifacts (hre.artifacts)
+ * @param contractName - implementation contract name
+ * @param initArgs - initialize() function arguments
+ * @param salt - optional CREATE2 salt for proxy
+ * @returns { proxy, implementation } addresses
+ */
+async function evmDeployProxy(ethers, artifacts, contractName, initArgs = [], salt = "") {
+    const ImplFactory = await ethers.getContractFactory(contractName);
+    const impl = await (await ImplFactory.deploy()).waitForDeployment();
+    const implAddr = await impl.getAddress();
+    console.log(`${contractName} implementation: ${implAddr}`);
+    const initData = ImplFactory.interface.encodeFunctionData("initialize", initArgs);
+    let proxyAddr;
+    if (salt) {
+        const { evmDeployByFactory } = require("./factory");
+        const proxyArtifact = await artifacts.readArtifact("ERC1967Proxy");
+        const constructorArgs = ethers.AbiCoder.defaultAbiCoder().encode(["address", "bytes"], [implAddr, initData]);
+        proxyAddr = await evmDeployByFactory(ethers, salt, proxyArtifact.bytecode, constructorArgs);
+    }
+    else {
+        const ProxyFactory = await ethers.getContractFactory("ERC1967Proxy");
+        const proxy = await (await ProxyFactory.deploy(implAddr, initData)).waitForDeployment();
+        proxyAddr = await proxy.getAddress();
+    }
+    console.log(`${contractName} proxy: ${proxyAddr}`);
+    return { proxy: proxyAddr, implementation: implAddr };
+}
+/**
+ * Upgrade a UUPS proxy to a new implementation.
+ * Deploys new implementation, then calls upgradeToAndCall on the proxy.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param contractName - new implementation contract name
+ * @param proxyAddr - proxy address to upgrade
+ * @returns new implementation address
+ */
+async function evmUpgradeProxy(ethers, contractName, proxyAddr) {
+    const [deployer] = await ethers.getSigners();
+    const ImplFactory = await ethers.getContractFactory(contractName);
+    const impl = await (await ImplFactory.deploy()).waitForDeployment();
+    const implAddr = await impl.getAddress();
+    const proxy = await ethers.getContractAt("BaseImplementation", proxyAddr, deployer);
+    const oldImpl = await proxy.getImplementation();
+    await (await proxy.upgradeToAndCall(implAddr, "0x")).wait();
+    console.log(`${contractName} upgraded: ${oldImpl} -> ${implAddr}`);
+    return implAddr;
+}

package/utils/dist/factory.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Deploy contract via CREATE3 factory on EVM chains.
+ * Address only depends on salt, not bytecode.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param salt - human-readable salt string
+ * @param bytecode - contract bytecode (artifact.bytecode)
+ * @param constructorArgs - ABI-encoded constructor arguments
+ * @returns deployed contract address
+ */
+export declare function evmDeployByFactory(ethers: any, salt: string, bytecode: string, constructorArgs?: string): Promise<string>;
+/**
+ * Get predicted factory address for a salt on EVM (CREATE3 — only needs salt).
+ * @param ethers - ethers from hardhat runtime
+ * @param salt - human-readable salt string
+ */
+export declare function evmGetFactoryAddress(ethers: any, salt: string): Promise<string>;
+/**
+ * Deploy contract via CREATE2 factory on Tron.
+ * Address depends on salt + creationCode (bytecode + constructor args).
+ * @param tronWeb - initialized tronweb instance
+ * @param artifacts - hardhat artifacts
+ * @param contractName - contract name to deploy
+ * @param salt - human-readable salt string
+ * @param args - constructor arguments array
+ * @param feeLimit - tron fee limit
+ * @returns deployed contract address (0x-prefixed hex)
+ */
+export declare function tronDeployByFactory(tronWeb: any, artifacts: any, contractName: string, salt: string, args?: any[], feeLimit?: number): Promise<string>;
+/**
+ * Get predicted factory address for a salt on Tron (CREATE2 — needs salt + codeHash).
+ * @param tronWeb - initialized tronweb instance
+ * @param salt - human-readable salt string
+ * @param codeHash - keccak256 of creationCode (bytecode + constructor args)
+ * @returns address in base58 format
+ */
+export declare function tronGetFactoryAddress(tronWeb: any, salt: string, codeHash: string): Promise<string>;

package/utils/dist/factory.js

@@ -0,0 +1,187 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.evmDeployByFactory = evmDeployByFactory;
+exports.evmGetFactoryAddress = evmGetFactoryAddress;
+exports.tronDeployByFactory = tronDeployByFactory;
+exports.tronGetFactoryAddress = tronGetFactoryAddress;
+/**
+ * Factory deployment — deterministic contract addresses across chains.
+ * EVM: CREATE3 factory at 0x6258e4d2950757A749a4d4683A7342261ce12471
+ * Tron: CREATE2 factory at TJAwD5VfMYMGWwdPi2aVcoQwVBfsuw5wQt
+ */
+const tronHelper_1 = require("./tronHelper");
+// Factory contract addresses
+const EVM_FACTORY = "0x6258e4d2950757A749a4d4683A7342261ce12471";
+const TRON_FACTORY = "TJAwD5VfMYMGWwdPi2aVcoQwVBfsuw5wQt";
+// EVM factory ABI (CREATE3 — getAddress only needs salt)
+// function deploy(bytes32 salt, bytes creationCode, uint256 value)
+// function getAddress(bytes32 salt) view returns (address)
+const EVM_FACTORY_ABI = [
+    {
+        "inputs": [{ "name": "salt", "type": "bytes32" }, { "name": "creationCode", "type": "bytes" }, { "name": "value", "type": "uint256" }],
+        "name": "deploy",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "name": "salt", "type": "bytes32" }],
+        "name": "getAddress",
+        "outputs": [{ "name": "", "type": "address" }],
+        "stateMutability": "view",
+        "type": "function"
+    }
+];
+// Tron factory ABI (CREATE2 — getAddress needs salt + codeHash)
+// function deploy(bytes32 salt, bytes creationCode, uint256 value) returns (address)
+// function getAddress(bytes32 salt, bytes32 codeHash) view returns (address)
+// function getAddressTron(bytes32 salt, bytes32 codeHash) view returns (address)
+const TRON_FACTORY_ABI = [
+    {
+        "inputs": [{ "name": "salt", "type": "bytes32" }, { "name": "creationCode", "type": "bytes" }, { "name": "value", "type": "uint256" }],
+        "name": "deploy",
+        "outputs": [{ "name": "addr", "type": "address" }],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "name": "salt", "type": "bytes32" }, { "name": "codeHash", "type": "bytes32" }],
+        "name": "getAddressTron",
+        "outputs": [{ "name": "", "type": "address" }],
+        "stateMutability": "view",
+        "type": "function"
+    }
+];
+// ============================================================
+// EVM Factory (CREATE3, ethers.js)
+// ============================================================
+/**
+ * Deploy contract via CREATE3 factory on EVM chains.
+ * Address only depends on salt, not bytecode.
+ * @param ethers - ethers from hardhat runtime (hre.ethers)
+ * @param salt - human-readable salt string
+ * @param bytecode - contract bytecode (artifact.bytecode)
+ * @param constructorArgs - ABI-encoded constructor arguments
+ * @returns deployed contract address
+ */
+async function evmDeployByFactory(ethers, salt, bytecode, constructorArgs = "0x") {
+    const [signer] = await ethers.getSigners();
+    const factory = new ethers.Contract(EVM_FACTORY, EVM_FACTORY_ABI, signer);
+    const code = await ethers.provider.getCode(EVM_FACTORY);
+    if (code === "0x")
+        throw new Error("factory not deployed on this chain");
+    const saltHash = ethers.keccak256(ethers.toUtf8Bytes(salt));
+    const predicted = await factory.getAddress(saltHash);
+    const existingCode = await ethers.provider.getCode(predicted);
+    if (existingCode !== "0x") {
+        console.log(`already deployed at ${predicted}`);
+        return predicted;
+    }
+    const fullBytecode = constructorArgs === "0x"
+        ? bytecode
+        : ethers.concat([bytecode, constructorArgs]);
+    const tx = await factory.deploy(saltHash, fullBytecode, 0);
+    await tx.wait();
+    // Verify contract was actually deployed
+    const deployedCode = await ethers.provider.getCode(predicted);
+    if (deployedCode === "0x") {
+        throw new Error(`factory deploy failed: no contract at predicted address ${predicted}`);
+    }
+    console.log(`deployed via factory at ${predicted}`);
+    return predicted;
+}
+/**
+ * Get predicted factory address for a salt on EVM (CREATE3 — only needs salt).
+ * @param ethers - ethers from hardhat runtime
+ * @param salt - human-readable salt string
+ */
+async function evmGetFactoryAddress(ethers, salt) {
+    const factory = new ethers.Contract(EVM_FACTORY, EVM_FACTORY_ABI, await ethers.provider);
+    const saltHash = ethers.keccak256(ethers.toUtf8Bytes(salt));
+    return factory.getAddress(saltHash);
+}
+// ============================================================
+// Tron Factory (CREATE2, tronweb)
+// ============================================================
+/**
+ * Deploy contract via CREATE2 factory on Tron.
+ * Address depends on salt + creationCode (bytecode + constructor args).
+ * @param tronWeb - initialized tronweb instance
+ * @param artifacts - hardhat artifacts
+ * @param contractName - contract name to deploy
+ * @param salt - human-readable salt string
+ * @param args - constructor arguments array
+ * @param feeLimit - tron fee limit
+ * @returns deployed contract address (0x-prefixed hex)
+ */
+async function tronDeployByFactory(tronWeb, artifacts, contractName, salt, args = [], feeLimit = 15000000000) {
+    const factory = await tronWeb.contract(TRON_FACTORY_ABI, TRON_FACTORY);
+    const saltHash = tronWeb.sha3(salt);
+    // Build creation code with constructor args
+    const artifact = await artifacts.readArtifact(contractName);
+    let creationCode = artifact.bytecode;
+    if (args.length > 0) {
+        const iface = new (require("ethers").Interface)(artifact.abi);
+        const encoded = iface.encodeDeploy(args);
+        creationCode = creationCode + encoded.slice(2);
+    }
+    // Check if already deployed
+    const codeHash = tronWeb.sha3(creationCode);
+    const predicted = await factory.getAddressTron(saltHash, codeHash).call();
+    const predictedHex = predicted.replace(/^41/, "0x");
+    try {
+        const existing = await tronWeb.trx.getContract(tronWeb.address.fromHex(predicted));
+        if (existing && existing.bytecode) {
+            console.log(`already deployed at ${(0, tronHelper_1.tronFromHex)(predicted)}`);
+            return predictedHex;
+        }
+    }
+    catch { }
+    // Deploy
+    console.log(`deploying ${contractName} via factory with salt "${salt}"...`);
+    const { sendAndWait } = require("./tronHelper");
+    const txResult = await sendAndWait(factory.deploy(saltHash, creationCode, 0), tronWeb, { feeLimit });
+    // Read actual address from Deployed event
+    let addrHex = predictedHex; // fallback to predicted
+    if (txResult.log && txResult.log.length > 0) {
+        // Deployed(address indexed addr, bytes32 indexed salt)
+        // First topic = event sig, second topic = addr
+        const addrTopic = txResult.log[0].topics?.[1];
+        if (addrTopic) {
+            addrHex = "0x" + addrTopic.slice(24); // last 20 bytes
+        }
+    }
+    // Verify contract was actually deployed
+    const addrBase58 = (0, tronHelper_1.tronFromHex)(addrHex);
+    try {
+        const deployed = await tronWeb.trx.getContract(addrBase58);
+        if (!deployed || !deployed.bytecode) {
+            throw new Error(`factory deploy failed: no contract at ${addrBase58}`);
+        }
+    }
+    catch (e) {
+        if (e.message?.includes("factory deploy failed"))
+            throw e;
+        // Contract might not be indexed yet, wait and retry
+        await new Promise(r => setTimeout(r, 3000));
+        const deployed = await tronWeb.trx.getContract(addrBase58);
+        if (!deployed || !deployed.bytecode) {
+            throw new Error(`factory deploy failed: no contract at ${addrBase58}`);
+        }
+    }
+    console.log(`${contractName} deployed: ${addrBase58} (${addrHex})`);
+    return addrHex;
+}
+/**
+ * Get predicted factory address for a salt on Tron (CREATE2 — needs salt + codeHash).
+ * @param tronWeb - initialized tronweb instance
+ * @param salt - human-readable salt string
+ * @param codeHash - keccak256 of creationCode (bytecode + constructor args)
+ * @returns address in base58 format
+ */
+async function tronGetFactoryAddress(tronWeb, salt, codeHash) {
+    const factory = await tronWeb.contract(TRON_FACTORY_ABI, TRON_FACTORY);
+    const saltHash = tronWeb.sha3(salt);
+    const addr = await factory.getAddressTron(saltHash, codeHash).call();
+    return (0, tronHelper_1.tronFromHex)(addr);
+}

package/utils/dist/index.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @mapprotocol/common-contracts/utils
+ *
+ * Shared TypeScript utilities for MAP Protocol contract operations.
+ *
+ * Quick start:
+ *   const deployer = createDeployer(hre, { autoVerify: true });
+ *   await deployer.deploy("MyContract", [arg1], "optional_salt");
+ *   await deployer.deployProxy("MyContract", [initArg], "optional_salt");
+ *   await deployer.upgrade("MyContract", proxyAddr);
+ */
+export { createDeployer, type Deployer, type DeployResult, type DeployProxyResult, type DeployerOptions } from "./deployer";
+export { resolveDeploymentPath, getDeploymentByKey, hasDeployment, saveDeployment, type DeploymentPath, type DeploymentOptions } from "./deployRecord";
+export { verify, type VerifyOptions } from "./verifier";
+export { getCodeHash, getProxyCodeHash, getCustomProxyCodeHash } from "./codeHash";
+export { addressToHex, isBase58, isTronAddress, isSolanaChain } from "./addressCodec";
+export { TronClient, tronFromHex, tronToHex, isTronNetwork, sendAndWait, waitForTx, type TronAddress } from "./tronHelper";