@evvm/testnet-contracts 2.1.3 → 2.2.1

package/library/utils/GovernanceUtils.sol

@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+
+pragma solidity ^0.8.0;
+
+library ProposalStructs {
+    /**
+     * @dev Struct for managing address change proposals with time delay
+     * @param current Currently active address
+     * @param proposal Proposed new address waiting for approval
+     * @param timeToAccept Timestamp when the proposal can be accepted
+     */
+    struct AddressTypeProposal {
+        address current;
+        address proposal;
+        uint256 timeToAccept;
+    }
+
+    /**
+     * @dev Struct for managing uint256 value proposals with time delay
+     * @param current Currently active value
+     * @param proposal Proposed new value waiting for approval
+     * @param timeToAccept Timestamp when the proposal can be accepted
+     */
+    struct UintTypeProposal {
+        uint256 current;
+        uint256 proposal;
+        uint256 timeToAccept;
+    }
+
+    /**
+     * @dev Struct for managing boolean flag changes with time delay
+     * @param flag Current boolean state
+     * @param timeToAcceptChange Timestamp when the flag change can be executed
+     */
+    struct BoolTypeProposal {
+        bool flag;
+        uint256 timeToAcceptChange;
+    }
+}
+
+/**
+ * @title AdminControlled
+ * @notice Base contract for admin-controlled contracts with time-delayed governance
+ */
+abstract contract AdminControlled {
+    ProposalStructs.AddressTypeProposal public admin;
+
+    event AdminProposed(address indexed newAdmin, uint256 timeToAccept);
+    event AdminAccepted(address indexed newAdmin);
+
+    error SenderIsNotAdmin();
+    error ProposalNotReady();
+
+    modifier onlyAdmin() {
+        if (msg.sender != admin.current) revert SenderIsNotAdmin();
+        _;
+    }
+
+    /**
+     * @notice Proposes a new admin with time delay
+     * @param newAdmin Address of proposed admin
+     * @param delay Time delay before proposal can be accepted
+     */
+    function proposeAdmin(address newAdmin, uint256 delay) external onlyAdmin {
+        admin.proposal = newAdmin;
+        admin.timeToAccept = block.timestamp + delay;
+        emit AdminProposed(newAdmin, admin.timeToAccept);
+    }
+
+    /**
+     * @notice Accepts the admin proposal after time delay
+     */
+    function acceptAdminProposal() external onlyAdmin {
+        if (block.timestamp < admin.timeToAccept) revert ProposalNotReady();
+        admin.current = admin.proposal;
+        admin.proposal = address(0);
+        admin.timeToAccept = 0;
+        emit AdminAccepted(admin.current);
+    }
+}

package/library/utils/SignatureUtil.sol

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+
+pragma solidity ^0.8.0;
+
+import {SignatureRecover} from "@evvm/testnet-contracts/library/primitives/SignatureRecover.sol";
+import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
+
+library SignatureUtil {
+    function verifySignature(
+        uint256 evvmID,
+        string memory functionName,
+        string memory inputs,
+        bytes memory signature,
+        address expectedSigner
+    ) internal pure returns (bool) {
+        return
+            SignatureRecover.recoverSigner(
+                string.concat(
+                    AdvancedStrings.uintToString(evvmID),
+                    ",",
+                    functionName,
+                    ",",
+                    inputs
+                ),
+                signature
+            ) == expectedSigner;
+    }
+}

package/library/utils/nonces/AsyncNonce.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+
+pragma solidity ^0.8.0;
+
+abstract contract AsyncNonce {
+    error AsyncNonceAlreadyUsed();
+
+    mapping(address user => mapping(uint256 nonce => bool availability))
+        private asyncNonce;
+
+    function markAsyncNonceAsUsed(
+        address user,
+        uint256 nonce
+    ) internal virtual {
+        asyncNonce[user][nonce] = true;
+    }
+
+    function verifyAsyncNonce(
+        address user,
+        uint256 nonce
+    ) internal view virtual {
+        if (asyncNonce[user][nonce]) revert AsyncNonceAlreadyUsed();
+    }
+
+    function getIfUsedAsyncNonce(
+        address user,
+        uint256 nonce
+    ) public view virtual returns (bool) {
+        return asyncNonce[user][nonce];
+    }
+}

package/library/utils/nonces/SyncNonce.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+
+pragma solidity ^0.8.0;
+
+abstract contract SyncNonce {
+    error SyncNonceMismatch();
+
+    mapping(address user => uint256 nonce) private syncNonce;
+
+    function incrementSyncNonce(address user) internal virtual {
+        syncNonce[user]++;
+    }
+
+    function verifySyncNonce(
+        address user,
+        uint256 nonce
+    ) internal view virtual {
+        if (syncNonce[user] != nonce) revert SyncNonceMismatch();
+    }
+
+    function getNextCurrentSyncNonce(
+        address user
+    ) public view virtual returns (uint256) {
+        return syncNonce[user];
+    }
+}

package/library/utils/service/EvvmPayments.sol

@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+
+pragma solidity ^0.8.0;
+
+import {IEvvm, EvvmStructs} from "@evvm/testnet-contracts/interfaces/IEvvm.sol";
+
+abstract contract EvvmPayments {
+    IEvvm internal evvm;
+
+    constructor(address evvmAddress) {}
+
+    function requestPay(
+        address from,
+        address token,
+        uint256 amount,
+        uint256 priorityFee,
+        uint256 nonce,
+        bool priorityFlag,
+        bytes memory signature
+    ) internal virtual {
+        evvm.pay(
+            from,
+            address(this),
+            "",
+            token,
+            amount,
+            priorityFee,
+            nonce,
+            priorityFlag,
+            address(this),
+            signature
+        );
+    }
+
+    function requestDispersePay(
+        EvvmStructs.DispersePayMetadata[] memory toData,
+        address token,
+        uint256 amount,
+        uint256 priorityFee,
+        uint256 nonce,
+        bool priorityFlag,
+        bytes memory signature
+    ) internal virtual {
+        evvm.dispersePay(
+            address(this),
+            toData,
+            token,
+            amount,
+            priorityFee,
+            nonce,
+            priorityFlag,
+            address(this),
+            signature
+        );
+    }
+
+    function makeCaPay(
+        address to,
+        address token,
+        uint256 amount
+    ) internal virtual {
+        evvm.caPay(to, token, amount);
+    }
+
+    function makeDisperseCaPay(
+        EvvmStructs.DisperseCaPayMetadata[] memory toData,
+        address token,
+        uint256 amount
+    ) internal virtual {
+        evvm.disperseCaPay(toData, token, amount);
+    }
+
+    function _changeEvvmAddress(address newEvvmAddress) internal virtual {
+        evvm = IEvvm(newEvvmAddress);
+    }
+}

package/library/utils/service/StakingServiceUtils.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+pragma solidity ^0.8.0;
+
+import {IStaking} from "@evvm/testnet-contracts/interfaces/IStaking.sol";
+import {IEvvm} from "@evvm/testnet-contracts/interfaces/IEvvm.sol";
+
+abstract contract StakingServiceUtils {
+    IStaking internal staking;
+
+    constructor(address stakingAddress) {
+        staking = IStaking(stakingAddress);
+    }
+
+    function _makeStakeService(uint256 amountToStake) internal {
+        staking.prepareServiceStaking(amountToStake);
+        IEvvm(staking.getEvvmAddress()).caPay(
+            address(staking),
+            IEvvm(staking.getEvvmAddress()).getPrincipalTokenAddress(),
+            staking.priceOfStaking() * amountToStake
+        );
+        staking.confirmServiceStaking();
+    }
+
+    function _makeUnstakeService(uint256 amountToUnstake) internal {
+        staking.serviceUnstaking(amountToUnstake);
+    }
+
+    function _changeStakingAddress(address newStakingAddress) internal virtual {
+        staking = IStaking(newStakingAddress);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evvm/testnet-contracts",
-  "version": "2.1.3",
+  "version": "2.2.1",
   "type": "module",
   "description": "EVVM Testnet Contracts - Smart contracts and tools for scalable, modular, and cross-chain EVM virtualization",
   "files": [
@@ -36,18 +36,17 @@
     "access": "public"
   },
   "scripts": {
-    "build": "npm run copy-files",
+    "publish-package": "bun run copy-files && bun publish && bun run clean",
+    "prepare-publish": "bun run copy-files && bun run pack",
+    "build": "bun run copy-files",
     "copy-files": "cp -r src/contracts . && cp -r src/interfaces . && cp -r src/library .",
     "clean": "rm -rf contracts interfaces library",
-    "prepare-publish": "npm run copy-files && npm pack",
-    "publish-package": "npm run copy-files && npm publish && npm run clean",
-    "compile": "forge build",
-    "test": "forge test",
-    "deploy:anvil": "make deployLocalTestnet",
-    "deploy:sepolia": "make deployTestnet NETWORK=eth",
-    "deploy:arbitrum": "make deployTestnet NETWORK=arb",
-    "wizard": "tsx scripts/evvm-init.ts",
-    "wizard:deploy": "tsx scripts/evvm-init.ts --deploy"
+    "evvm": "bun run cli/index.ts",
+    "buildCli": "bun build cli/index.ts --compile --outfile evvm",
+    "build-all": "bun run build-linux && bun run build-windows && bun run build-macos",
+    "build-linux": "bun build cli/index.ts --compile --outfile .executables/evvm-linux-x64 && bun build cli/index.ts --compile --outfile .executables/evvm-linux-arm64 && bun build cli/index.ts --compile --outfile .executables/evvm-linux-x64-musl && bun build cli/index.ts --compile --outfile .executables/evvm-linux-arm64-musl",
+    "build-windows": "bun build cli/index.ts --compile --outfile .executables/evvm-windows-x64.exe",
+    "build-macos": "bun build cli/index.ts --compile --outfile .executables/evvm-darwin-x64 && bun build cli/index.ts --compile --outfile .executables/evvm-darwin-arm64"
   },
   "peerDependencies": {
     "@openzeppelin/contracts": "^5.0.0"
@@ -58,13 +57,12 @@
     "dotenv": "^16.4.5",
     "execa": "^8.0.1",
     "prompts": "^2.4.2",
-    "viem": "^2.39.0"
+    "viem": "^2.43.3"
   },
   "devDependencies": {
     "@types/node": "^20.11.0",
     "@types/prompts": "^2.4.9",
     "forge-std": "^1.0.0",
-    "tsx": "^4.7.0",
     "typescript": "^5.3.0"
   }
 }