Merge pull request #59 from district0x/vibemarket-integration

Vibemarket and toshi mart integration

Author: ginesdt

bb.edn

@@ -74,6 +74,18 @@
                                        (do
                                          (println "Starting Streamtide sidechain server")
                                          (shell (format "node sidechain_server/streamtide_sidechain_server.js %s" command-args))))}
+         watch-dummy-coin-service
+         {:doc "Watch and compile dummy coin service code CLJS -> JS in test/coin_service/**"
+          :requires ([babashka.cli :as cli])
+          :task (let [aliases (or *command-line-args* [])
+                      command-args (format "-M:dev:shadow-cljs%s watch dummy-coin-service"
+                                     (clojure.string/join "" aliases))]
+                  (println "Starting watch dummy-coin-service args:" command-args)
+                  (clojure command-args))}
+         run-dummy-coin-server {:doc "Start Node.js API server process"
+                           :task (do
+                                   (println "Starting Coin Dummy API server")
+                                   (shell "node test/coin_service/out/dummy_service.js"))}
          watch-server-tests {:doc "watch server tests"
                            :task (do
                                    (println "Watch and compile server code changes tests")

contracts/streamtide.sol

@@ -6,9 +6,10 @@ import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/utils/Context.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 
 
-contract MVPCLR is OwnableUpgradeable {
+contract MVPCLR is OwnableUpgradeable, ReentrancyGuard {
 
     event AdminAdded(address _admin);
     event AdminRemoved(address _admin);
@@ -33,6 +34,18 @@ contract MVPCLR is OwnableUpgradeable {
         uint256 roundId
     );
 
+    event DonateExternal(
+        address sender,
+        uint256 value,
+        address patronAddress,
+        uint256 roundId,
+        uint16 externalType,
+        address target,
+        bytes callData,
+        address token,
+        uint256 gained
+    );
+
     event FailedDistribute(
         address receiver,
         uint256 amount
@@ -130,24 +143,114 @@ contract MVPCLR is OwnableUpgradeable {
         emit PatronsAdded(addresses);
     }
 
-    function donate(address[] memory patronAddresses, uint256[] memory amounts) public payable {
+    function donate(
+        address[] memory patronAddresses,
+        uint256[] memory amounts,
+        bytes[] calldata metadata,
+        address[] calldata tokens
+    ) public payable nonReentrant {
         require(patronAddresses.length == amounts.length, "CLR:donate - Mismatch between number of patrons and amounts");
+        require(patronAddresses.length == metadata.length, "CLR:donate - mismatch patrons/metadata");
+        require(!isBlacklisted[_msgSender()], "Sender address is blacklisted");
+
         uint256 totalAmount = 0;
         uint256 donationRoundId = roundIsClosed() ? 0 : roundId;
+
         for (uint256 i = 0; i < patronAddresses.length; i++) {
-            address patronAddress = patronAddresses[i];
-            uint256 amount = amounts[i];
-            totalAmount += amount;
-            require(!isBlacklisted[_msgSender()], "Sender address is blacklisted");
-            require(isPatron[patronAddress], "CLR:donate - Not a valid recipient");
-            emit Donate(_msgSender(), amount, patronAddress, donationRoundId);
-            bool success = payable(patronAddress).send(amount);
-            require(success, "CLR:donate - Failed to send funds to recipient");
+            totalAmount += _processDonation(
+                patronAddresses[i],
+                amounts[i],
+                metadata[i],
+                tokens[i],
+                donationRoundId
+            );
         }
 
-        require(totalAmount <= msg.value, "CLR:donate - Total amount donated is greater than the value sent");
+        require(totalAmount <= msg.value, "CLR:donate - Total amount donated exceeds value sent");
     }
 
+    function _processDonation(
+        address patronAddress,
+        uint256 amount,
+        bytes calldata data,
+        address token,
+        uint256 donationRoundId
+    ) internal returns (uint256) {
+        require(!isBlacklisted[patronAddress], "Patron address is blacklisted");
+        require(isPatron[patronAddress], "CLR:donate - Not a valid recipient");
+
+        if (data.length > 0) {
+            _handleExternalDonation(patronAddress, amount, data, token, donationRoundId);
+        } else {
+            _handleDirectDonation(patronAddress, amount, donationRoundId);
+        }
+
+        return amount;
+    }
+
+    function _handleDirectDonation(
+        address patronAddress,
+        uint256 amount,
+        uint256 donationRoundId
+    ) internal {
+        bool success = payable(patronAddress).send(amount);
+        require(success, "CLR:donate - Failed to send funds to recipient");
+
+        emit Donate(_msgSender(), amount, patronAddress, donationRoundId);
+    }
+
+    function _handleExternalDonation(
+        address patronAddress,
+        uint256 amount,
+        bytes calldata data,
+        address token,
+        uint256 donationRoundId
+    ) internal {
+        (uint16 externalType, address target, bytes memory callData) = abi.decode(data, (uint16, address, bytes));
+        require(target != address(0), "CLR:donate - invalid target");
+        require(isContract(target), "CLR:donate - target must be contract");
+
+        uint256 gained = 0;
+        uint256 beforeBal = 0;
+
+        if (token != address(0)) {
+            beforeBal = IERC20(token).balanceOf(address(this));
+        }
+        {
+            (bool success, bytes memory returndata) = payable(target).call{value: amount}(callData);
+            require(success, _getRevertMsg(returndata));
+        }
+        if (token != address(0)) {
+            gained = IERC20(token).balanceOf(address(this)) - beforeBal;
+            if (gained > 0) {
+                IERC20(token).transfer(_msgSender(), gained);
+            }
+        }
+
+        emit DonateExternal(
+            _msgSender(),
+            amount,
+            patronAddress,
+            donationRoundId,
+            externalType,
+            target,
+            callData,
+            token,
+            gained
+        );
+    }
+
+    function isContract(address account) internal view returns (bool) {
+        return account.code.length > 0;
+    }
+
+    function _getRevertMsg(bytes memory returnData) private pure returns (string memory) {
+        if (returnData.length < 68) return "CLR:donate - external call failed";
+        assembly {
+            returnData := add(returnData, 0x04)
+        }
+        return abi.decode(returnData, (string));
+    }
 
     function distribute(address payable[] memory patrons, uint[] memory amounts, address token) public onlyAdmin {
         require(patrons.length == amounts.length, "Length of patrons and amounts must be the same");

deps.edn

@@ -19,14 +19,15 @@
   district0x/district-time {:mvn/version "1.0.1"}
   district0x/district-ui-component-form {:mvn/version "0.2.15"}
   district0x/district-ui-component-notification {:mvn/version "1.0.1"}
+  district0x/district-ui-conversion-rates {:mvn/version "1.0.1"}
   district0x/district-ui-graphql {:mvn/version "1.0.15"}
   district0x/district-ui-logging {:mvn/version "1.1.0"}
   district0x/district-ui-notification {:mvn/version "1.0.1"}
   district0x/district-ui-window-size {:mvn/version "1.0.1"}
   is.d0x/cljs-web3-next {:mvn/version "24.2.10"}
   is.d0x/district-server-config {:mvn/version "24.2.10"}
   is.d0x/district-server-db {:mvn/version "24.6.19"}
-  is.d0x/district-server-web3-events {:mvn/version "25.6.26"}
+  is.d0x/district-server-web3-events {:mvn/version "25.10.30"}
   is.d0x/re-frame-web3-fx {:mvn/version "24.2.10"}
   is.d0x/district-sendgrid {:mvn/version "24.2.10"}
   is.d0x/district-ui-reagent-render {:mvn/version "24.2.10"}

migrations/_99_update_streamtide.js

@@ -25,7 +25,7 @@ module.exports = async(deployer, network, accounts) => {
     }
 
     await status.step(async () => {
-        const streamtide = await deployer.deploy(Streamtide, Object.assign(opts, {gas: 2000000}));
+        const streamtide = await deployer.deploy(Streamtide, Object.assign(opts, {gas: 3000000}));
         return {[sk.streamtideAddr]: streamtide.address};
     });
 

resources/scss/layouts/profile.scss

@@ -133,18 +133,51 @@
 			}
 		}
 		.btsProfile {
-			width: 100%;
-			max-width: 412px;
-			margin: 0 auto 28.22px;
+			width: fit-content;
+			margin: 0 auto 28px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
 			.btBasic {
-				width: 100%;
-				margin-bottom: 13.38px;
-				font-size: 18px;
-				letter-spacing: 1.87px;
-				&:last-child {
-					margin-bottom: 0;
-				}
+              line-height: 24px;
+              display: inline-block;
+              white-space: normal;
+              text-align: center;
+              max-width: 100%;
+              height: unset;
+              padding: 14px 50px;
+              min-width: 280px;
+              margin-bottom: 13.38px;
+              font-size: 16px;
+              &:last-child {
+                  margin-bottom: 0;
+              }
 			}
+            .coin-link {
+                margin-bottom: 12px;
+                height: 100%;
+                display: block;
+                .coin-logo {
+                    height: 200px;
+                }
+                .coin-custom-logo {
+                    width: 138px;
+                    height: 200px;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    font-family: Arial, sans-serif;
+                    font-size: 26px;
+                    font-weight: bold;
+                    color: white;
+                    background: linear-gradient(135deg, #ff1edc, #0064ff);
+                    border-radius: 20px;
+                    text-transform: uppercase;
+                    box-shadow: 0 4px 10px rgba(0,0,0,0.3);
+                }
+
+
+            }
 		}
 		.medias {
 			.media {
@@ -309,7 +342,13 @@
 				margin-bottom: 34px;
 				.btBasic {
 					margin-bottom: 24px;
+                    font-size: 18px;
+                    letter-spacing: 1.87px;
+                    min-width: 350px;
 				}
+                .coin-link {
+                  margin-bottom: 20px;
+                }
 			}
 		}
 	}

resources/scss/layouts/profileEdit.scss

@@ -99,7 +99,7 @@
 				}
 			}
 		}
-		.generalInfo, .min-donation, .perks {
+		.generalInfo, .donation-config, .perks {
 			margin-bottom: 23px;
 			label.inputField {
 				display: flex;
@@ -520,9 +520,21 @@
 					min-width: 189px;
 				}
 			}
-			.min-donation {
+			.donations-configs {
 				margin-top: 3em;
-			}
+                a {
+                  color: goldenrod;
+                }
+			}
+            .donations-config {
+              margin-top: 15px;
+              margin-left: 1em;
+            }
+            .donation-config {
+              span {
+                min-width: fit-content;
+              }
+            }
 		}
 		.submitField {
 			background: $bgSite;