Merge pull request #29 from pnetwork-association/feat/merkl-preset

Feat/merkl preset

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dao-v2-ui",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "private": true,
   "homepage": ".",
   "dependencies": {

src/components/complex/CreateProposalModal/index.jsx

@@ -22,6 +22,7 @@ import Select from '../../base/Select'
 import AssetSelection from '../AssetSelection'
 import ChainSelection from '../ChainSelection'
 import { FaEye, FaEyeSlash } from 'react-icons/fa'
+import MerklDistributionFormula from '../MerklDistributionFormula'
 
 const UseScriptText = styled(Text)`
   font-size: 13px;
@@ -101,6 +102,12 @@ const CreateProposalModal = ({ show, onClose }) => {
             <ChainSelection {...props} />
           </div>
         )
+      case 'MerklDistributionFormula':
+        return (
+          <div key={id}>
+            <MerklDistributionFormula {...props} />
+          </div>
+        )
       case 'AssetSelection':
         return <AssetSelection key={id} {...props} />
       case 'Input':

src/components/complex/MerklDistributionFormula/index.jsx

@@ -0,0 +1,27 @@
+import Text from '../../base/Text'
+import Input from '../../base/Input'
+import { Col, Row } from 'react-bootstrap'
+
+const MerklDistributionFormula = (props) => {
+  return (
+    <div>
+      <Text size="sm">Distribution Formula:</Text>
+      <Row xs={1} md={3}>
+        <Col>
+          <Text size="sm">% PNT</Text>
+          <Input {...props[0]} />
+        </Col>
+        <Col>
+          <Text size="sm">% wETH</Text>
+          <Input {...props[1]} />
+        </Col>
+        <Col>
+          <Text size="sm">% Fees</Text>
+          <Input {...props[2]} />
+        </Col>
+      </Row>
+    </div>
+  )
+}
+
+export default MerklDistributionFormula

src/settings/index.js

@@ -23,7 +23,8 @@ const settings = {
     registrationManager: '0x906B067e392e2c5f9E4f101f36C0b8CdA4885EBf',
     feesManager: '0xDf951d2061b12922BFbF22cb17B17f3b39183570',
     pNetworkAssociationGnosisSafeAddress: '0xf1f6568a76559d85cF68E6597fA587544184dD46',
-    pNetworkV2EthereumVaultAddess: '0xe396757ec7e6ac7c8e5abe7285dde47b98f22db8'
+    pNetworkV2EthereumVaultAddess: '0xe396757ec7e6ac7c8e5abe7285dde47b98f22db8',
+    merklDistributionCreatorAddress: '0x8BB4C975Ff3c250e0ceEA271728547f3802B36Fd'
   },
   stakingManager: {
     minStakeDays: 7,
@@ -35,6 +36,7 @@ const settings = {
     estimatedSentinelRunningCost: 150
   },
   explorer: 'https://etherscan.io',
+  zeroAddress: '0x0000000000000000000000000000000000000000',
   assets: [
     {
       address: '0xf4ea6b892853413bd9d9f1a5d3a620a0ba39c5b2',

src/utils/__tests__/withdrawInflation.test.js

@@ -1,46 +1,7 @@
-import { ethers } from 'ethers'
-
 import { getVotePresets } from '../vote-presets'
 import { encodeCallScript } from '../voting-scripts'
-import { ethPNTContract, pNetworkV2Vault, vaultContract } from '../presets/utils'
-import BigNumber from 'bignumber.js'
-
-const DAO_V1_VOTING_ADDRESS = '0x2211bFD97b1c02aE8Ac305d206e9780ba7D8BfF4'
-const DAO_V1_TREASURY_ADDRESS = '0xDd92eb1478D3189707aB7F4a5aCE3a615cdD0476'
-const ETHPNT_ADDRESS = '0xf4ea6b892853413bd9d9f1a5d3a620a0ba39c5b2'
-const PNETWORKV2_VAULT_ADDRESS = '0xe396757ec7e6ac7c8e5abe7285dde47b98f22db8'
 
 describe('withdrawInflationAndPegin', () => {
-  const getLiquidityPoolsPresetActions = (_destinationAddress, _amount, _userData, _destinationChainId) => {
-    const withdrawInflationCalldata = ethPNTContract.encodeFunctionData('withdrawInflation', [
-      DAO_V1_TREASURY_ADDRESS,
-      _amount
-    ])
-
-    const transferCalldata = vaultContract.encodeFunctionData('transfer', [
-      ETHPNT_ADDRESS,
-      DAO_V1_VOTING_ADDRESS,
-      _amount
-    ])
-
-    const approveCalldata = ethPNTContract.encodeFunctionData('approve', [PNETWORKV2_VAULT_ADDRESS, _amount])
-
-    const pegInCalldata = pNetworkV2Vault.encodeFunctionData('pegIn(uint256, address, string, bytes, bytes4)', [
-      _amount,
-      ETHPNT_ADDRESS,
-      _destinationAddress,
-      _userData,
-      _destinationChainId
-    ])
-
-    return [
-      { to: ETHPNT_ADDRESS, calldata: withdrawInflationCalldata },
-      { to: DAO_V1_TREASURY_ADDRESS, calldata: transferCalldata },
-      { to: ETHPNT_ADDRESS, calldata: approveCalldata },
-      { to: PNETWORKV2_VAULT_ADDRESS, calldata: pegInCalldata }
-    ]
-  }
-
   test('Should match the generated script', async () => {
     const presets = getVotePresets({
       presetParams: { 0: '1', 2: '0xa41657bf225F8Ec7E2010C89c3F084172948264D' },