workflow to deploy and upload contract to npm

.env.example

@@ -1,10 +1,13 @@
 # Network RPC URLs - Get this from Infura or Alchemy
-SEPOLIA_RPC_URL=https://sepolia.infura.io/v3/<INFURA_API_KEY>
+ARBITRUM_ONE_RPC_URL=
+ARBITRUM_SEPOLIA_RPC_URL=
 
 # Private key for deployment (without 0x prefix)
 # WARNING: Never commit your actual private key to git
-PRIVATE_KEY=your_private_key_here
+PRIVATE_KEY=
 
-# Etherscan API Key - Required for contract verification
-# Get this from https://etherscan.io/myapikey
-ETHERSCAN_API_KEY=<ETHERSCAN_API_KEY>
+# API keys for block explorers
+ARBISCAN_API_KEY=
+
+# Gas reporting flag (set to true to enable gas reporting)
+REPORT_GAS=

.github/workflows/deploy-contracts.yml

@@ -0,0 +1,144 @@
+name: Deploy Smart Contracts
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'contracts/**'
+
+  workflow_dispatch:
+    inputs:
+      network:
+        description: 'Network to deploy to (testnet/mainnet)'
+        required: true
+        default: 'testnet'
+        type: choice
+        options:
+          - testnet
+          - mainnet
+      version:
+        description: 'Custom version to use (e.g., 1.0.0). Leave empty for auto-increment.'
+        required: false
+        type: string
+        default: ''
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: 'package-lock.json'
+
+      - name: Install dependencies
+        run: npm install --legacy-peer-deps
+
+      - name: Compile contracts
+        run: npm run compile
+
+      - name: Generate TypeChain types
+        run: npm run typechain
+
+      - name: Deploy to Testnet
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.network == 'testnet')
+        run: npm run deploy:arbitrum-testnet
+        env:
+          ARBITRUM_SEPOLIA_RPC_URL: ${{ secrets.ARBITRUM_SEPOLIA_RPC_URL }}
+          PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
+          ARBISCAN_API_KEY: ${{ secrets.ARBISCAN_API_KEY }}
+
+      - name: Deploy to Mainnet
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.network == 'mainnet'
+        run: npm run deploy:arbitrum
+        env:
+          ARBITRUM_ONE_RPC_URL: ${{ secrets.ARBITRUM_ONE_RPC_URL }}
+          PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
+          ARBISCAN_API_KEY: ${{ secrets.ARBISCAN_API_KEY }}
+
+      - name: Verify Contracts on Testnet
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.network == 'testnet')
+        run: npm run verify:all-arbitrum-testnet
+        env:
+          ARBITRUM_SEPOLIA_RPC_URL: ${{ secrets.ARBITRUM_SEPOLIA_RPC_URL }}
+          ARBISCAN_API_KEY: ${{ secrets.ARBISCAN_API_KEY }}
+
+      - name: Verify Contracts on Mainnet
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.network == 'mainnet'
+        run: npm run verify:all-arbitrum
+        env:
+          ARBITRUM_ONE_RPC_URL: ${{ secrets.ARBITRUM_ONE_RPC_URL }}
+          ARBISCAN_API_KEY: ${{ secrets.ARBISCAN_API_KEY }}
+
+      - name: Upload Deployment Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: deployment-artifacts
+          path: |
+            scripts/deployed_addresses_arbitrum.json
+            typechain-types/
+          if-no-files-found: error
+
+  publish-package:
+    needs: deploy
+    if: github.event_name != 'pull_request'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: 'package-lock.json'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Download Deployment Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: deployment-artifacts
+          path: .
+
+      - name: Install dependencies
+        run: npm install --legacy-peer-deps
+
+      - name: Compile contracts
+        run: npm run compile
+
+      - name: Update package version
+        id: version
+        run: |
+          VERSION=$(npx ts-node scripts/update-version.ts)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "NEW_VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Generate Package
+        run: npx ts-node scripts/generate-package.ts
+
+      - name: Publish Package
+        run: |
+          cd package
+          npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
+          npm publish --access public
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+    #   - name: Create GitHub Release
+    #     uses: softprops/action-gh-release@v1
+    #     with:
+    #       tag_name: v${{ env.NEW_VERSION }}
+    #       name: Contracts v${{ env.NEW_VERSION }}
+    #       body: |
+    #         DeCleanup Network Smart Contracts Release
+    #         - Deployed to ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.network == 'mainnet' && 'Arbitrum Mainnet' || 'Arbitrum Testnet' }}
+    #         - Published to npm as @decleanup/contracts@${{ env.NEW_VERSION }}
+    #     env:
+    #       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 

.github/workflows/test-coverage.yml

@@ -22,11 +22,11 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '22'
           cache: 'npm'
 
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: Install bc
         run: sudo apt-get install -y bc

.gitignore

@@ -16,4 +16,5 @@ node_modules
 # Hardhat Ignition default folder for deployments against a local node
 ignition/deployments/chain-31337
 ignition/deployments
-issues
+issues
+package

contracts/RewardLogic.sol

@@ -15,6 +15,9 @@ contract RewardLogic is Ownable, IRewards {
     IDCUToken public dcuToken;
     INFTCollection public nftCollection;
 
+    // Authorization for external contracts
+    mapping(address => bool) public authorizedContracts;
+
     // Constants
     uint256 public constant NFT_CLAIM_REWARD = 10 ether; // 10 DCU for new NFT claims
     uint256 public constant LEVEL_UPGRADE_REWARD = 10 ether; // 10 DCU for level upgrades
@@ -49,6 +52,16 @@ contract RewardLogic is Ownable, IRewards {
         uint256 timestamp,
         string reason
     );
+
+    event NFTCollectionUpdated(
+        address indexed oldCollection,
+        address indexed newCollection
+    );
+
+    event ContractAuthorizationChanged(
+        address indexed contractAddress,
+        bool authorized
+    );
 
     /**
      * @dev Constructor sets the DCU token and NFT collection addresses
@@ -60,6 +73,28 @@ contract RewardLogic is Ownable, IRewards {
         nftCollection = INFTCollection(_nftCollection);
     }
 
+    /**
+     * @dev Set the NFT collection address
+     * @param _nftCollection Address of the new NFT collection contract
+     */
+    function setNFTCollection(address _nftCollection) external onlyOwner {
+        require(_nftCollection != address(0), "Invalid NFT collection address");
+        address oldCollection = address(nftCollection);
+        nftCollection = INFTCollection(_nftCollection);
+        emit NFTCollectionUpdated(oldCollection, _nftCollection);
+    }
+
+    /**
+     * @dev Authorize or revoke a contract to call distributeDCU
+     * @param contractAddress The contract address to authorize
+     * @param authorized Whether to authorize or revoke
+     */
+    function authorizeContract(address contractAddress, bool authorized) external onlyOwner {
+        require(contractAddress != address(0), "Invalid contract address");
+        authorizedContracts[contractAddress] = authorized;
+        emit ContractAuthorizationChanged(contractAddress, authorized);
+    }
+
     /**
      * @dev Calculate reward based on NFT holdings (base implementation)
      * @param user Address of the user to calculate reward for
@@ -129,7 +164,10 @@ contract RewardLogic is Ownable, IRewards {
      */
     function distributeDCU(address user, uint256 amount) external override {
         // Only authorized contracts can call this function
-        require(msg.sender == address(nftCollection), "Only authorized contracts can call");
+        require(
+            msg.sender == address(nftCollection) || authorizedContracts[msg.sender], 
+            "Only authorized contracts can call"
+        );
 
         // Verify user through the reward manager if available
         DCURewardManager rewardManager = DCURewardManager(address(0));
@@ -141,8 +179,8 @@ contract RewardLogic is Ownable, IRewards {
             // Continue even if we can't get the reward manager
         }
 
-        // If we have a reward manager, check eligibility
-        if (address(rewardManager) != address(0)) {
+        // If we have a reward manager and the caller is the NFT contract, check eligibility
+        if (address(rewardManager) != address(0) && msg.sender == address(nftCollection)) {
             try rewardManager.getVerificationStatus(user) returns (
                 bool poiVerified,
                 bool nftMinted,