diff --git a/README.md b/README.md
index 156c928..0f91300 100644
--- a/README.md
+++ b/README.md
@@ -1,34 +1,33 @@
-# Ethereum Crowdfunding
+# Milkomeda Crowdfunding
(make sure Metamask is installed, otherwise you can't interact with the dapp)
Check smart contract for this example:
-https://ropsten.etherscan.io/address/0x218a7f73492434039e0b17fd0927a7b8c0875f3c
+http://use-util.cloud.milkomeda.com:4000/address/0x7ae28c580DccA503c7412CE94e844db6f75BE585/transactions
## Getting started
1. clone the repository
2. run npm install
3. install Metamask as Chrome extension
-4. create a wallet in Metamask (select ropsten test network, if you want to test things)
-
+4. create a wallet in Metamask
### Create smart contract
+
under src/contract/ you can find the contract.sol file. This is the contract I use for this example.
To use your own contract follow these steps:
+
1. go to the Remix IDE
2. paste in the contract.sol file
-3. deploy the contract on the network you want (e.g. mainnet or ropsten)
+3. deploy the contract on the network you want (e.g. mainnet or ropsten or Milkomeda)
4. copy the abi and the contract address
5. go to src/contract/abi.js and replace the abi with yours
6. go to src/contract/contract.js and replace the contract address with yours
-
## Project setup
-
### `npm start`
Runs the app in the development mode.Ethereum funding
+ Milkomeda funding
You need to enable JavaScript to run this app.
diff --git a/src/App.js b/src/App.js
index dd3c6ce..429c5cd 100644
--- a/src/App.js
+++ b/src/App.js
@@ -10,13 +10,12 @@ class App extends React.Component {
this.state = {
ratio: 0,
amount: "",
- name: "",
currentAmount: 0,
- totalAmount: 1,
- compatible: true
+ totalAmount: 1000,
+ compatible: true,
};
this.smartContractUrl =
- "https://ropsten.etherscan.io/address/0x218a7f73492434039e0b17fd0927a7b8c0875f3c";
+ "http://use-util.cloud.milkomeda.com:4000/address/0x7ae28c580DccA503c7412CE94e844db6f75BE585/transactions";
}
render() {
@@ -24,12 +23,13 @@ class App extends React.Component {
return (
-
Crowdfunding
+
Crowdfunding
+
Milkomeda
- {this.state.currentAmount.toLocaleString("de-DE")} ETH raised
- of {this.state.totalAmount.toLocaleString("de-DE")} ETH
+ {this.state.currentAmount.toLocaleString()} ADA raised of{" "}
+ {this.state.totalAmount.toLocaleString()} ADA
+ onChange={(event) =>
this.setState({ amount: event.target.value })
}
value={this.state.amount}
- placeholder="Amount"
- height="30px"
- width="150px"
- />
-
-
- this.setState({ name: event.target.value })
- }
- value={this.state.name}
- placeholder="Name (optional)"
+ placeholder="Ada amount"
height="30px"
width="150px"
/>
@@ -95,17 +85,21 @@ class App extends React.Component {
console.log(total);
this.setState({
ratio: (current / total) * 100,
- currentAmount: current,
- totalAmount: total
+ currentAmount: parseFloat(current),
+ totalAmount: parseFloat(total),
});
console.log(this.state.ratio);
}
componentDidMount() {
//check browser compatibility
- Contract.checkCompatible().then(res => {
- if (res) this.getAmount();
- else this.setState({ compatible: false });
+ Contract.checkCompatible().then((res) => {
+ if (res) {
+ this.getAmount();
+ setInterval(() => {
+ this.getAmount();
+ }, 2000);
+ } else this.setState({ compatible: false });
});
}
}
@@ -116,7 +110,7 @@ const NotCompatible = () => {
className={styles.bg}
style={{
flexDirection: "column",
- textAlign: "center"
+ textAlign: "center",
}}
>
Your browser is not Dapps compatible
diff --git a/src/components/Button/UniqeButton.module.css b/src/components/Button/UniqeButton.module.css
index fa9f4b2..0ce222d 100644
--- a/src/components/Button/UniqeButton.module.css
+++ b/src/components/Button/UniqeButton.module.css
@@ -10,6 +10,7 @@
.Button:hover {
opacity: 0.8;
+ cursor: pointer;
}
.Button:active {
diff --git a/src/contract/abi.js b/src/contract/abi.js
index e615159..1b14b70 100644
--- a/src/contract/abi.js
+++ b/src/contract/abi.js
@@ -1,75 +1,60 @@
-var abi = [
+export const abi = [
{
- constant: false,
- inputs: [
- {
- name: "amount",
- type: "uint256"
- }
- ],
- name: "changeTotalAmount",
- outputs: [],
- payable: false,
+ inputs: [],
stateMutability: "nonpayable",
- type: "function"
+ type: "constructor",
},
{
- constant: false,
inputs: [
{
+ internalType: "uint256",
name: "amount",
- type: "uint256"
- }
+ type: "uint256",
+ },
],
- name: "fund",
- outputs: [],
- payable: true,
- stateMutability: "payable",
- type: "function"
- },
- {
- constant: false,
- inputs: [],
- name: "getFunds",
+ name: "changeTotalAmount",
outputs: [],
- payable: false,
- stateMutability: "nonpayable",
- type: "function"
- },
- {
- inputs: [],
- payable: false,
stateMutability: "nonpayable",
- type: "constructor"
+ type: "function",
},
{
- constant: true,
inputs: [],
name: "currentAmount",
outputs: [
{
+ internalType: "uint256",
name: "",
- type: "uint256"
- }
+ type: "uint256",
+ },
],
- payable: false,
stateMutability: "view",
- type: "function"
+ type: "function",
+ },
+ {
+ inputs: [],
+ name: "fund",
+ outputs: [],
+ stateMutability: "payable",
+ type: "function",
},
{
- constant: true,
inputs: [],
name: "totalAmount",
outputs: [
{
+ internalType: "uint256",
name: "",
- type: "uint256"
- }
+ type: "uint256",
+ },
],
- payable: false,
stateMutability: "view",
- type: "function"
- }
+ type: "function",
+ },
+ {
+ inputs: [],
+ name: "widthdrawFunds",
+ outputs: [],
+ stateMutability: "nonpayable",
+ type: "function",
+ },
];
-
-export default abi;
diff --git a/src/contract/contract.js b/src/contract/contract.js
index 5d7c986..bc54f8c 100644
--- a/src/contract/contract.js
+++ b/src/contract/contract.js
@@ -1,9 +1,9 @@
-import abi from "./abi";
+import { abi } from "./abi";
import Web3 from "web3";
var web3;
var contract;
-const contractAddress = "0x218a7f73492434039e0b17fd0927a7b8c0875f3c";
+const contractAddress = "0x7ae28c580DccA503c7412CE94e844db6f75BE585";
const checkCompatible = async () => {
// Modern dapp browsers...
@@ -42,25 +42,25 @@ const current = async () => {
return web3.utils.fromWei(result, "ether");
};
-const fund = amount => {
+const fund = (amount) => {
let amountWei = web3.utils.toWei(amount.toString(), "ether");
contract.methods
- .fund(amountWei)
+ .fund()
.send({
from: window.ethereum.selectedAddress,
value: amountWei,
- gas: 3000000
+ gas: 3000000,
})
.then(() => console.log("Successfully funded!"));
};
-const changeTotal = amount => {
+const changeTotal = (amount) => {
let amountWei = web3.utils.toWei(amount.toString(), "ether");
contract.methods
.changeTotalAmount(amountWei)
.send({
from: window.ethereum.selectedAddress,
- gas: 3000000
+ gas: 3000000,
})
.then(() => console.log("Successfully changed total amount!"));
};
@@ -70,7 +70,7 @@ const widthdrawFunds = () => {
.withdrawFunds()
.send({
from: window.ethereum.selectedAddress,
- gas: 3000000
+ gas: 3000000,
})
.then(() => console.log("Successfull widthdrawal!"));
};
@@ -81,7 +81,7 @@ const fundContract = {
current,
changeTotal,
widthdrawFunds,
- checkCompatible
+ checkCompatible,
};
export default fundContract;
diff --git a/src/contract/contract.sol b/src/contract/contract.sol
index 201ed16..9f6556b 100644
--- a/src/contract/contract.sol
+++ b/src/contract/contract.sol
@@ -1,24 +1,22 @@
-pragma solidity ^0.5.1;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.7.0 <0.9.0;
contract Funding {
uint public totalAmount;
uint public currentAmount;
- address owner;
+ address payable owner;
- constructor() public {
- totalAmount = 15 ether;
+ constructor() {
+ totalAmount = 1000 ether;
currentAmount = 0 ether;
- owner = 0xeC8E34F1e3839312567Ed9a0B3528424F1d0824F;
+ owner = payable(msg.sender);
}
- function fund(uint amount) public payable {
- require(
- amount == msg.value,
- "expected amount doesn't equal transacted amount!"
- );
- currentAmount += amount;
+ function fund() public payable {
+ require(msg.value >= 0.1 ether, "Must be greater than 0.1 ADA");
+ currentAmount += msg.value;
}
function changeTotalAmount(uint amount) public {
@@ -33,10 +31,11 @@ contract Funding {
function widthdrawFunds() public {
require(
msg.sender == owner,
- "your are not an owner!"
+ "You are not the owner!"
);
+ require(
+ currentAmount >= totalAmount, "Target amount not reached yet"
+ );
owner.transfer(address(this).balance);
}
- }
-
-}
\ No newline at end of file
+}