Merge pull request #135 from polymorpher/spending-manager

v12: Extend daily limit to "spending limit"; Allow arbitrary time interval for spending limit; New library "SpendingManager";  Allow multiple contract calls in one operation; Fix various issues

Author: polymorpher

code/build/contracts/CommitManager.json

@@ -146,7 +146,7 @@ const AddressInput = ({ setAddressCallback, currentWallet, addressValue, extraSe
 
     if (validAddress) {
       const existingKnownAddress = knownAddresses[validAddress]
-
+      // console.log(addressObject)
       setAddressCallback(addressObject.label
         ? {
             ...addressObject,
@@ -222,10 +222,8 @@ const AddressInput = ({ setAddressCallback, currentWallet, addressValue, extraSe
     filterValue
   }) => {
     const oneAddress = util.safeOneAddress(address)
-    const addressDisplay = util.shouldShortenAddress({ label: label, isMobile })
-      ? util.ellipsisAddress(oneAddress)
-      : oneAddress
-
+    const addressDisplay = util.shouldShortenAddress({ label, isMobile }) ? util.ellipsisAddress(oneAddress) : oneAddress
+    const displayLabel = `${label ? `(${label})` : ''} ${addressDisplay}`
     return (
       <Select.Option key={addressDisplay} value={filterValue} style={{ padding: 0 }}>
         <Row align='left'>
@@ -236,7 +234,7 @@ const AddressInput = ({ setAddressCallback, currentWallet, addressValue, extraSe
                 type='text'
                 style={{ textAlign: 'left', height: '100%', padding: '5px' }}
                 onClick={() => {
-                  onSelectAddress({ value: address, label: addressDisplay, key, domainName })
+                  onSelectAddress({ value: address, label: displayLabel, key, domainName })
                 }}
               >
                 <Space direction={isMobile ? 'vertical' : 'horizontal'}>
@@ -250,7 +248,13 @@ const AddressInput = ({ setAddressCallback, currentWallet, addressValue, extraSe
             {
             displayDeleteButton
               ? (
-                <Button type='text' style={{ textAlign: 'left', height: '50px' }} onClick={() => deleteKnownAddress(address)}>
+                <Button
+                  type='text' style={{ textAlign: 'left', height: '50px' }} onClick={(e) => {
+                    deleteKnownAddress(address)
+                    e.stopPropagation()
+                    return false
+                  }}
+                >
                   <CloseOutlined />
                 </Button>
                 )

code/build/contracts/IONEWallet.json

@@ -2,7 +2,8 @@ const ONEConstants = require('../../../lib/constants')
 export default {
   interval: 30 * 1000,
   defaultDuration: 3600 * 1000 * 24 * 364,
-  defaultDailyLimit: 1000, // ONEs
+  defaultSpendingLimit: 1000, // ONEs
+  defaultSpendingInterval: ONEConstants.DefaultSpendingInterval,
   minDuration: 3600 * 1000 * 24 * 120,
   maxDuration: 3600 * 1000 * 24 * 364 * 2,
   maxTransferAttempts: 3,

code/build/contracts/ONEWallet.json

@@ -130,6 +130,7 @@ const sectionViews = {
 }
 
 const Create = ({ advancedSetting }) => {
+  // eslint-disable-next-line no-unused-vars
   const dev = useSelector(state => state.wallet.dev)
   const { isMobile, os } = useWindowDimensions()
   const dispatch = useDispatch()
@@ -163,7 +164,8 @@ const Create = ({ advancedSetting }) => {
     : oneWalletTreasurySelectOption
 
   const [lastResortAddress, setLastResortAddress] = useState(defaultRecoveryAddress)
-  const [dailyLimit, setDailyLimit] = useState(WalletConstants.defaultDailyLimit)
+  const [spendingLimit, setSpendingLimit] = useState(WalletConstants.defaultSpendingLimit) // ONEs, number
+  const [spendingInterval, setSpendingInterval] = useState(WalletConstants.defaultSpendingInterval) // seconds, number
 
   const [worker, setWorker] = useState()
   const [root, setRoot] = useState()
@@ -282,7 +284,8 @@ const Create = ({ advancedSetting }) => {
         lifespan: duration / WalletConstants.interval,
         slotSize,
         lastResortAddress: normalizedAddress,
-        dailyLimit: ONEUtil.toFraction(dailyLimit).toString()
+        spendingLimit: ONEUtil.toFraction(spendingLimit).toString(),
+        spendingInterval,
       })
       // console.log('Deployed. Received contract address', address)
       const wallet = {
@@ -293,11 +296,15 @@ const Create = ({ advancedSetting }) => {
         slotSize,
         effectiveTime,
         lastResortAddress: normalizedAddress,
-        dailyLimit: ONEUtil.toFraction(dailyLimit).toString(),
+        spendingLimit: ONEUtil.toFraction(spendingLimit).toString(),
         hseed: ONEUtil.hexView(hseed),
+        spendingInterval: spendingInterval * 1000,
+        majorVersion: ONEConstants.MajorVersion,
+        minorVersion: ONEConstants.MinorVersion,
         network,
         doubleOtp,
         ...securityParameters,
+        expert: !!advancedSetting,
       }
       await storeLayers()
       dispatch(walletActions.updateWallet(wallet))
@@ -431,11 +438,23 @@ const Create = ({ advancedSetting }) => {
         {advancedSetting &&
           <Row style={{ marginBottom: 16 }}>
             <Space direction='vertical' size='small'>
-              <Hint>Set up a daily spending limit:</Hint>
-              <InputBox
-                margin={16} width={200} value={dailyLimit}
-                onChange={({ target: { value } }) => setDailyLimit(parseInt(value || 0))} suffix='ONE'
-              />
+              <Hint>Set up a spending limit:</Hint>
+              <Space align='baseline'>
+                <InputBox
+                  margin={16} width={160} value={spendingLimit}
+                  onChange={({ target: { value } }) => setSpendingLimit(parseInt(value || 0))} suffix='ONE'
+                />
+                <Hint>per</Hint>
+                <InputBox
+                  margin={16} width={128} value={spendingInterval}
+                  onChange={({ target: { value } }) => setSpendingInterval(parseInt(value || 0))}
+                />
+                <Hint>seconds</Hint>
+              </Space>
+              <Row justify='end'>
+                <Hint>≈ {humanizeDuration(spendingInterval * 1000, { largest: 2, round: true })}</Hint>
+              </Row>
+
             </Space>
           </Row>}
         <Row style={{ marginBottom: 48 }}>
@@ -491,7 +510,7 @@ const Create = ({ advancedSetting }) => {
           <Space direction='vertical'>
             <Hint>No private key. No mnemonic. Simple and Secure. </Hint>
             <Hint>To learn more, visit <Link href='https://github.com/polymorpher/one-wallet/wiki'>1wallet Wiki</Link></Hint>
-            <Hint>In Beta, your wallet is subject to a daily spending limit of {WalletConstants.defaultDailyLimit} ONE</Hint>
+            <Hint>In Beta, your wallet is subject to a daily spending limit of {WalletConstants.defaultSpendingLimit} ONE</Hint>
           </Space>
         </Row>
       </AnimatedSection>