@coti-io/coti-contracts 1.3.0 → 1.3.1

package/contracts/utils/mpc/MpcInterface.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 interface ExtendedOperations {
 

package/hardhat.config.ts

@@ -8,7 +8,11 @@ dotenv.config()
 /** Bump estimated gas price / EIP-1559 fees by 30% on COTI networks (see hardhat/gasPriceBump.ts). */
 import "./hardhat/gasPriceBump"
 
-const accounts = process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : [];
+const accounts = process.env.PRIVATE_KEY
+  ? [process.env.PRIVATE_KEY]
+  : process.env.SIGNING_KEYS
+    ? process.env.SIGNING_KEYS.split(",").map((k) => k.trim()).filter(Boolean)
+    : [];
 
 const config: HardhatUserConfig = {
   defaultNetwork: "coti-testnet",
@@ -31,19 +35,6 @@ const config: HardhatUserConfig = {
           },
         }
       },
-      {
-        version: "0.8.19",
-        settings: {
-          viaIR: true,
-          optimizer: {
-            enabled: true,
-            runs: 10000
-          },
-          metadata: {
-            bytecodeHash: 'none',
-          },
-        }
-      }
     ]
   },
   networks: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coti-io/coti-contracts",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "A library for smart contract development on the COTI network.",
   "author": "COTI Development",
   "repository": {
@@ -40,9 +40,9 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@coti-io/coti-ethers": "^1.0.5",
-    "@coti-io/coti-sdk-typescript": "^1.0.6",
-    "@openzeppelin/contracts": "4.9.6",
+    "@coti-io/coti-ethers": "^1.0.6",
+    "@coti-io/coti-sdk-typescript": "^1.0.9",
+    "@openzeppelin/contracts": "5.4.0",
     "dotenv": "^16.4.5"
   }
 }

package/scripts/deployCotiTokenPoints004.ts

@@ -0,0 +1,61 @@
+import { ethers } from "hardhat";
+
+async function main() {
+  const [deployer] = await ethers.getSigners();
+  if (!deployer) {
+    throw new Error(
+      "No deployer signer found. Set PRIVATE_KEY in your environment."
+    );
+  }
+
+  const defaultAdmin =
+    process.env.TPS004_ADMIN || deployer.address;
+  const pauser = process.env.TPS004_PAUSER || deployer.address;
+  const minter = process.env.TPS004_MINTER || deployer.address;
+
+  console.log("Deploying CotiTokenPoints004...");
+  console.log("Deployer:", deployer.address);
+  console.log("Default admin:", defaultAdmin);
+  console.log("Pauser:", pauser);
+  console.log("Minter:", minter);
+
+  const provider = deployer.provider;
+  if (!provider) {
+    throw new Error("No provider found for deployer signer.");
+  }
+
+  const gasPrice = BigInt(await provider.send("eth_gasPrice", []));
+  const nonce = await provider.getTransactionCount(deployer.address, "latest");
+  const gasLimit = BigInt(process.env.TPS004_DEPLOY_GAS_LIMIT || "6000000");
+
+  const factory = await ethers.getContractFactory("CotiTokenPoints004");
+  const deployTxReq = await factory.getDeployTransaction(
+    defaultAdmin,
+    pauser,
+    minter
+  );
+  if (!deployTxReq.data) {
+    throw new Error("Failed to build deploy transaction data.");
+  }
+
+  const sentTx = await deployer.sendTransaction({
+    data: deployTxReq.data,
+    gasPrice,
+    nonce,
+    gasLimit,
+  });
+  console.log("Deployment tx hash:", sentTx.hash);
+  const receipt = await sentTx.wait();
+  if (!receipt || !receipt.contractAddress) {
+    throw new Error(
+      "Deployment transaction mined but no contract address found."
+    );
+  }
+
+  console.log("CotiTokenPoints004 deployed at:", receipt.contractAddress);
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

package/scripts/deployFixedRatioCoinDisperserUnlimitedWindow.ts

@@ -0,0 +1,68 @@
+import { ethers } from "hardhat";
+
+async function main() {
+  const [deployer] = await ethers.getSigners();
+  if (!deployer) {
+    throw new Error(
+      "No deployer signer found. Set PRIVATE_KEY in your environment."
+    );
+  }
+
+  const pointsToken =
+    process.env.POINTS_TOKEN ||
+    "0x9eC8c1459B92e8f19fE160E63e169e7EFAAA4359";
+  const owner =
+    process.env.DISPERSER_OWNER ||
+    "0x87a11daf013e02d38cabdfdbff25e0b0fa2c5fcd";
+
+  console.log("Deploying FixedRatioCoinDisperserUnlimitedWindow...");
+  console.log("Deployer:", deployer.address);
+  console.log("Points token:", pointsToken);
+  console.log("Owner:", owner);
+
+  const provider = deployer.provider;
+  if (!provider) {
+    throw new Error("No provider found for deployer signer.");
+  }
+
+  const gasPrice = BigInt(await provider.send("eth_gasPrice", []));
+  const nonce = await provider.getTransactionCount(deployer.address, "latest");
+  const gasLimit = BigInt(
+    process.env.DISPERSER_DEPLOY_GAS_LIMIT || "8000000"
+  );
+
+  const factory = await ethers.getContractFactory(
+    "FixedRatioCoinDisperserUnlimitedWindow"
+  );
+  const deployTxReq = await factory.getDeployTransaction(
+    pointsToken,
+    owner
+  );
+  if (!deployTxReq.data) {
+    throw new Error("Failed to build deploy transaction data.");
+  }
+
+  const sentTx = await deployer.sendTransaction({
+    data: deployTxReq.data,
+    gasPrice,
+    nonce,
+    gasLimit,
+  });
+  console.log("Deployment tx hash:", sentTx.hash);
+  const receipt = await sentTx.wait();
+  if (!receipt || !receipt.contractAddress) {
+    throw new Error(
+      "Deployment transaction mined but no contract address found."
+    );
+  }
+
+  console.log(
+    "FixedRatioCoinDisperserUnlimitedWindow deployed at:",
+    receipt.contractAddress
+  );
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

package/scripts/verifyCotiTokenPoints004.ts

@@ -0,0 +1,123 @@
+import fs from "fs";
+import path from "path";
+import { ethers } from "hardhat";
+
+function findBuildInfo(): string {
+  const dir = path.join("artifacts", "build-info");
+  for (const file of fs.readdirSync(dir)) {
+    if (!file.endsWith(".json")) continue;
+    const fullPath = path.join(dir, file);
+    const buildInfo = JSON.parse(fs.readFileSync(fullPath, "utf8")) as {
+      solcVersion: string;
+    };
+    const raw = fs.readFileSync(fullPath, "utf8");
+    if (
+      raw.includes("CotiTokenPoints004") &&
+      buildInfo.solcVersion === "0.8.20"
+    ) {
+      return fullPath;
+    }
+  }
+  throw new Error(
+    "No 0.8.20 build-info found for CotiTokenPoints004. Run `npx hardhat compile` first."
+  );
+}
+
+async function main() {
+  const address =
+    process.env.CONTRACT_ADDRESS ||
+    "0x3F577B64E5CE5F2d00607770368d623cECc4FF7D";
+  const defaultAdmin =
+    process.env.TPS004_ADMIN ||
+    "0x0BF9C15CbD9f0fac9fc6ab90F0603e89818489bd";
+  const pauser =
+    process.env.TPS004_PAUSER ||
+    "0x0BF9C15CbD9f0fac9fc6ab90F0603e89818489bd";
+  const minter =
+    process.env.TPS004_MINTER ||
+    "0xE16eD4D157D4AdB562a7a73D28CBA750Ac48d735";
+
+  const buildInfo = JSON.parse(fs.readFileSync(findBuildInfo(), "utf8")) as {
+    input: unknown;
+    solcVersion: string;
+    solcLongVersion?: string;
+  };
+
+  const commit =
+    buildInfo.solcLongVersion?.split("+commit.")[1] ?? "a1b79de6";
+
+  const iface = new ethers.Interface([
+    "constructor(address defaultAdmin, address pauser, address minter)",
+  ]);
+  const constructorArguments = iface
+    .encodeDeploy([defaultAdmin, pauser, minter])
+    .slice(2);
+
+  const params = new URLSearchParams({
+    apikey: "placeholder",
+    module: "contract",
+    action: "verifysourcecode",
+    contractaddress: address,
+    sourceCode: JSON.stringify(buildInfo.input),
+    codeformat: "solidity-standard-json-input",
+    contractname:
+      "contracts/token/points/CotiTokenPoints004.sol:CotiTokenPoints004",
+    compilerversion: `v${buildInfo.solcVersion}+commit.${commit}`,
+    constructorArguements: constructorArguments,
+  });
+
+  console.log("Submitting verification to Cotiscan...");
+  console.log("Contract:", address);
+  const submit = await fetch("https://mainnet.cotiscan.io/api", {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: params.toString(),
+  });
+  const submitJson = (await submit.json()) as {
+    status: string;
+    message: string;
+    result: string;
+  };
+  if (submitJson.status !== "1") {
+    throw new Error(
+      `Verification submit failed: ${submitJson.message} (${submitJson.result})`
+    );
+  }
+
+  const guid = submitJson.result;
+  console.log("Verification GUID:", guid);
+
+  for (let i = 0; i < 30; i++) {
+    await new Promise((r) => setTimeout(r, 5000));
+    const statusUrl = new URL("https://mainnet.cotiscan.io/api");
+    statusUrl.search = new URLSearchParams({
+      apikey: "placeholder",
+      module: "contract",
+      action: "checkverifystatus",
+      guid,
+    }).toString();
+    const statusRes = await fetch(statusUrl);
+    const statusJson = (await statusRes.json()) as {
+      status: string;
+      result: string;
+    };
+    console.log("Status:", statusJson.result);
+    if (statusJson.result.includes("Pass")) {
+      console.log("Contract verified:", address);
+      return;
+    }
+    if (
+      statusJson.result.includes("Fail") ||
+      statusJson.result.includes("Error")
+    ) {
+      throw new Error(`Verification failed: ${statusJson.result}`);
+    }
+  }
+
+  throw new Error("Verification timed out while polling Cotiscan");
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

package/scripts/verifyFixedRatioCoinDisperserUnlimitedWindow.ts

@@ -0,0 +1,112 @@
+import fs from "fs";
+import path from "path";
+import { ethers } from "hardhat";
+
+function findBuildInfo(): string {
+  const dir = path.join("artifacts", "build-info");
+  for (const file of fs.readdirSync(dir)) {
+    if (!file.endsWith(".json")) continue;
+    const fullPath = path.join(dir, file);
+    const raw = fs.readFileSync(fullPath, "utf8");
+    if (
+      raw.includes("FixedRatioCoinDisperserUnlimitedWindow") &&
+      raw.includes('"version": "0.8.20"')
+    ) {
+      return fullPath;
+    }
+  }
+  throw new Error(
+    "No 0.8.20 build-info found for FixedRatioCoinDisperserUnlimitedWindow. Run `npx hardhat compile` first."
+  );
+}
+
+async function main() {
+  const address =
+    process.env.CONTRACT_ADDRESS ||
+    "0x6f05f45897A3c8cBC4Cb384cB69d5425C13fbAe2";
+  const pointsToken =
+    process.env.POINTS_TOKEN ||
+    "0x9eC8c1459B92e8f19fE160E63e169e7EFAAA4359";
+  const owner =
+    process.env.DISPERSER_OWNER ||
+    "0x87a11daf013e02d38cabdfdbff25e0b0fa2c5fcd";
+
+  const buildInfo = JSON.parse(fs.readFileSync(findBuildInfo(), "utf8")) as {
+    input: unknown;
+    solcVersion: string;
+  };
+
+  const iface = new ethers.Interface([
+    "constructor(address _pointsToken, address _owner)",
+  ]);
+  const constructorArguments = iface
+    .encodeDeploy([pointsToken, owner])
+    .slice(2);
+
+  const params = new URLSearchParams({
+    apikey: "placeholder",
+    module: "contract",
+    action: "verifysourcecode",
+    contractaddress: address,
+    sourceCode: JSON.stringify(buildInfo.input),
+    codeformat: "solidity-standard-json-input",
+    contractname:
+      "contracts/disperse/coinByRatio/FixedRatioCoinDisperserUnlimitedWindow.sol:FixedRatioCoinDisperserUnlimitedWindow",
+    compilerversion: `v${buildInfo.solcVersion}+commit.a1b79de6`,
+    constructorArguements: constructorArguments,
+  });
+
+  console.log("Submitting verification to Cotiscan...");
+  const submit = await fetch("https://mainnet.cotiscan.io/api", {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: params.toString(),
+  });
+  const submitJson = (await submit.json()) as {
+    status: string;
+    message: string;
+    result: string;
+  };
+  if (submitJson.status !== "1") {
+    throw new Error(
+      `Verification submit failed: ${submitJson.message} (${submitJson.result})`
+    );
+  }
+
+  const guid = submitJson.result;
+  console.log("Verification GUID:", guid);
+
+  for (let i = 0; i < 30; i++) {
+    await new Promise((r) => setTimeout(r, 5000));
+    const statusUrl = new URL("https://mainnet.cotiscan.io/api");
+    statusUrl.search = new URLSearchParams({
+      apikey: "placeholder",
+      module: "contract",
+      action: "checkverifystatus",
+      guid,
+    }).toString();
+    const statusRes = await fetch(statusUrl);
+    const statusJson = (await statusRes.json()) as {
+      status: string;
+      result: string;
+    };
+    console.log("Status:", statusJson.result);
+    if (statusJson.result.includes("Pass")) {
+      console.log("Contract verified:", address);
+      return;
+    }
+    if (
+      statusJson.result.includes("Fail") ||
+      statusJson.result.includes("Error")
+    ) {
+      throw new Error(`Verification failed: ${statusJson.result}`);
+    }
+  }
+
+  throw new Error("Verification timed out while polling Cotiscan");
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

package/test/messaging/PrivateMessaging.test.ts

@@ -1,4 +1,4 @@
-import { loadFixture, time } from "@nomicfoundation/hardhat-network-helpers";
+import { time } from "@nomicfoundation/hardhat-network-helpers";
 import { expect } from "chai";
 import { ethers } from "hardhat";
 
@@ -14,7 +14,7 @@ describe("PrivateMessaging", () => {
   }
 
   it("records sent and inbox pages with viewer-specific ciphertext", async () => {
-    const { contract, alice, bob, carol, ct } = await loadFixture(deployFixture);
+    const { contract, alice, bob, carol, ct } = await deployFixture();
 
     await contract.recordSyntheticMessage(
       alice.address,
@@ -48,7 +48,7 @@ describe("PrivateMessaging", () => {
   });
 
   it("stores multipart messages and returns chunked ciphertexts", async () => {
-    const { contract, alice, bob, carol, ct } = await loadFixture(deployFixture);
+    const { contract, alice, bob, carol, ct } = await deployFixture();
 
     await contract.recordSyntheticMultipartMessage(
       alice.address,
@@ -80,7 +80,7 @@ describe("PrivateMessaging", () => {
   });
 
   it("splits epoch rewards by encrypted cell usage and gives final dust to the last claimant", async () => {
-    const { contract, alice, bob, ct } = await loadFixture(deployFixture);
+    const { contract, alice, bob, ct } = await deployFixture();
 
     await contract.fundEpoch(0, { value: 11n });
 
@@ -125,7 +125,7 @@ describe("PrivateMessaging", () => {
   });
 
   it("rejects active-epoch claims, double claims, and past-epoch funding", async () => {
-    const { contract, alice, bob, ct } = await loadFixture(deployFixture);
+    const { contract, alice, bob, ct } = await deployFixture();
 
     await contract.fundEpoch(0, { value: 9n });
     await contract.recordSyntheticMessage(