Start to use augmint-js

.yarnrc

@@ -1,2 +1,2 @@
 --install.frozen-lockfile true
-save-prefix ""
+save-prefix ""

cypress.json

@@ -3,5 +3,6 @@
   "chromeWebSecurity": false,
   "defaultCommandTimeout": 20000,
   "projectId": "jvuuf8",
-  "viewport": "macbook-15"
+  "viewport": "macbook-15",
+  "video": false
 }

cypress/integration/locks.js

@@ -40,15 +40,17 @@ describe("Locks", function() {
 
     it("Should release locked A-EUR", function() {
         getLock(9, 50).then(() => {
+            cy.wait(1000); // to make sure the lock is releasable
             cy.get("[data-testid=lockMenuLink]")
                 .click()
                 .then(() => {
                     cy.get("[data-testid=lockCard] [data-testid=releaseLockButton]")
                         .first()
                         .click();
-                    cy.get("[data-testid=EthSubmissionSuccessPanel] > [data-testid=msgPanelOkButton]", {
-                        timeout: 20000
-                    });
+                    cy.get("[data-testid=EthSubmissionSuccessPanel] > [data-testid=msgPanelOkButton]");
+
+                    cy.get("[data-testid=EthConfirmationReceivedPanel]").contains("confirmation");
+                    cy.get("[data-testid=EthConfirmationReceivedPanel] > [data-testid=msgPanelClose]").click();
                 });
         });
     });

cypress/support/commands.js

@@ -156,15 +156,17 @@ Cypress.Commands.add("issueTo", (tokenAmount, to, options = {}) => {
         to = accounts[0];
     }
 
-    monetarySupervisorInstance.methods
-        .issueToReserve(tokenAmount)
-        .send({
-            from: accounts[0],
-            gas: 400000
+    const MONETARY_SUPERVISOR_PERMISSION = web3.utils.asciiToHex("MonetarySupervisor");
+    augmintTokenInstance.methods
+        .grantPermission(accounts[0], MONETARY_SUPERVISOR_PERMISSION)
+        .send({ from: accounts[0] })
+        .then(res => {
+            return augmintTokenInstance.methods.issueTo(to, tokenAmount).send({ from: accounts[0], gas: 500000 });
         })
         .then(res => {
-            augmintReservesInstance.methods
-                .withdraw(augmintTokenInstance._address, to, tokenAmount, 0, "token withdrawal for tests")
-                .send({ from: accounts[0], gas: 200000 });
+            return augmintTokenInstance.methods.revokePermission(
+                accounts[0],
+                web3.utils.asciiToHex("MonetarySupervisor")
+            );
         });
 });

package.json

@@ -9,11 +9,11 @@
     "yarn": "1.15.2"
   },
   "dependencies": {
-    "@augmint/js": "0.0.3",
+    "@augmint/js": "0.2.0",
     "bignumber.js": "5.0.0",
+    "bn.js": "4.11.8",
     "chart.js": "2.8.0",
     "ethereumjs-util": "6.1.0",
-    "ethers": "4.0.27",
     "moment": "2.24.0",
     "parse": "2.2.1",
     "react": "16.8.6",
@@ -44,8 +44,9 @@
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",
     "cypress:runrecord": "$(yarn bin)/cypress run --record --key 42b3c18f-e1cf-4c27-85ed-c223e420bd4a",
-    "ganache:start": "yarn augmint-cli ganache start",
-    "ganache:stop": "yarn augmint-cli ganache stop"
+    "ganache:start": "yarn augmint-cli ganache start --blockTime 1",
+    "ganache:stop": "yarn augmint-cli ganache stop",
+    "ganache:run": "yarn augmint-cli ganache run --blockTime 1"
   },
   "devDependencies": {
     "cypress": "3.2.0",
@@ -55,6 +56,9 @@
     "pretty-quick": "1.10.0",
     "wait-on": "3.2.0"
   },
+  "resolutions": {
+    "babel-jest": "24.7.1"
+  },
   "greenkeeper": {
     "ignore": [
       "bignumber.js"

src/components/transaction/index.js

@@ -65,7 +65,7 @@ class TxInfo extends React.Component {
             FROM_TRANSFER: "Incoming transfer",
             TO_TRANSFER: "Outgoing transfer"
         };
-        const type = this.getAddressType(tx.direction > 0 ? tx.args.from : tx.args.to);
+        const type = this.getAddressType(tx.direction > 0 ? tx.from : tx.to);
         return map[`${tx.direction > 0 ? "FROM" : "TO"}_${type}`];
     }
 
@@ -84,13 +84,13 @@ class TxInfo extends React.Component {
                 </div>
                 <TxDetails data-testid="txDetails">
                     <AccountAddress
-                        address={tx.direction < 0 ? tx.args.to : tx.args.from}
+                        address={tx.direction < 0 ? tx.to : tx.from}
                         title={tx.direction < 0 ? "To: " : "From: "}
                         shortAddress={true}
                         showCopyIcon={false}
                     />
                     <br />
-                    {tx.args.narrative}
+                    {tx.narrative}
                 </TxDetails>
             </div>
         );

src/containers/exchange/components/MyOrders.js

@@ -123,7 +123,7 @@ export default class OrderBook extends React.Component {
         const myOrders = [...buyOrders, ...sellOrders].sort((o1, o2) => o2.id - o1.id);
 
         const totalBuyAmount = orders
-            ? parseFloat(buyOrders.reduce((sum, order) => order.bn_ethAmount.add(sum), 0).toFixed(6))
+            ? parseFloat(buyOrders.reduce((sum, order) => order.bnEthAmount.add(sum), 0).toFixed(6))
             : "?";
         const totalSellAmount = orders ? sellOrders.reduce((sum, order) => order.amount + sum, 0).toFixed(2) : "?";
 

src/containers/exchange/components/OrderBook.js

@@ -10,7 +10,7 @@ import BigNumber from "bignumber.js";
 import styled from "styled-components";
 
 import { TOKEN_SELL, TOKEN_BUY } from "modules/reducers/orders";
-import { DECIMALS, DECIMALS_DIV, ETHEUR } from "utils/constants";
+import { DECIMALS, ETHEUR } from "utils/constants";
 import { floatNumberConverter } from "utils/converter";
 import { AEUR, ETH } from "components/augmint-ui/currencies";
 
@@ -113,14 +113,12 @@ const OrderItem = props => {
 const OrderList = props => {
     const { sellOrders, buyOrders, userAccountAddress, ethFiatRate, orderDirection } = props;
 
-    const totalEthBuyAmount = parseFloat(buyOrders.reduce((sum, order) => order.bn_ethAmount.add(sum), 0));
+    const totalEthBuyAmount = parseFloat(buyOrders.reduce((sum, order) => order.bnEthAmount.add(sum), 0));
     const totalEthSellAmount = sellOrders.reduce(
         (sum, order) => new BigNumber(((order.amount * order.price) / ethFiatRate).toFixed(5)).add(sum),
         0
     );
-    const totalAeurSellAmount = new BigNumber(sellOrders.reduce((sum, order) => order.bn_amount.add(sum), 0)).div(
-        DECIMALS_DIV
-    );
+    const totalAeurSellAmount = sellOrders.reduce((sum, order) => order.amount + sum, 0);
     const totalAeurBuyAmount = buyOrders.reduce(
         (sum, order) => new BigNumber(((ethFiatRate / order.price) * order.amount).toFixed(2)).add(sum),
         0

src/modules/augmintTokenProvider.js

@@ -7,6 +7,7 @@ import { fetchLatestTransfers, processNewTransfer } from "modules/reducers/userT
 import { fetchUserBalance } from "modules/reducers/userBalances";
 
 let isWatchSetup = false;
+let processedContractEvents; //** map of eventIds processed: Workaround for bug that web3 beta 36 fires events 2x with MetaMask */
 
 export default () => {
     const augmintToken = store.getState().contracts.latest.augmintToken;
@@ -18,7 +19,7 @@ export default () => {
         );
 
         refresh();
-        setupListeners();
+        setupContractEventListeners();
     }
 
     if (!isWatchSetup) {
@@ -30,11 +31,29 @@ export default () => {
     return;
 };
 
-const setupListeners = () => {
-    const augmintToken = store.getState().contracts.latest.augmintToken.ethersInstance;
+const setupContractEventListeners = async () => {
+    processedContractEvents = {};
 
-    augmintToken.on("AugmintTransfer", (...args) => {
-        onAugmintTransfer(...args);
+    const augmintToken = await store.getState().web3Connect.augmint.token;
+    augmintToken.instance.events.AugmintTransfer({}, (error, event) => {
+        // Workaround for bug that web3 beta 36 fires events 2x with MetaMask TODO: check with newer web3 versions if fixed
+        if (!processedContractEvents[event.id]) {
+            processedContractEvents[event.id] = true;
+            // event AugmintTransfer(address indexed from, address indexed to, uint amount, string narrative, uint fee);
+            console.debug("augmintTokenProvider.onAugmintTransfer: Dispatching refreshAugmintToken()");
+            store.dispatch(refreshAugmintToken());
+            const userAccount = store.getState().web3Connect.userAccount;
+            if (
+                event.returnValues.from.toLowerCase() === userAccount.toLowerCase() ||
+                event.returnValues.to.toLowerCase() === userAccount.toLowerCase()
+            ) {
+                console.debug(
+                    "augmintTokenProvider.onAugmintTransfer: Transfer to or from for current userAccount. Dispatching processTransfer & fetchUserBalance"
+                );
+                store.dispatch(fetchUserBalance(userAccount));
+                store.dispatch(processNewTransfer(event, userAccount));
+            }
+        }
     });
 
     // TODO: monetarySupervisor events: ParamsChanged, AcceptedLegacyAugmintTokenChanged,
@@ -64,7 +83,7 @@ const onAugmintTokenContractChange = (newVal, oldVal, objectPath) => {
         );
 
         refresh();
-        setupListeners();
+        setupContractEventListeners();
     }
 };
 
@@ -79,17 +98,3 @@ const onUserAccountChange = (newVal, oldVal, objectPath) => {
         store.dispatch(fetchLatestTransfers(newVal));
     }
 };
-
-const onAugmintTransfer = function(from, to, amount, narrative, fee, eventObject) {
-    // event AugmintTransfer(address indexed from, address indexed to, uint amount, string narrative, uint fee);
-    console.debug("augmintTokenProvider.onAugmintTransfer: Dispatching refreshAugmintToken()");
-    store.dispatch(refreshAugmintToken());
-    const userAccount = store.getState().web3Connect.userAccount;
-    if (from.toLowerCase() === userAccount.toLowerCase() || to.toLowerCase() === userAccount.toLowerCase()) {
-        console.debug(
-            "augmintTokenProvider.onAugmintTransfer: Transfer to or from for current userAccount. Dispatching processTransfer & fetchUserBalance"
-        );
-        store.dispatch(fetchUserBalance(userAccount));
-        store.dispatch(processNewTransfer(userAccount, eventObject));
-    }
-};

src/modules/ethereum/SolidityContract.js

@@ -1,19 +1,12 @@
-import { ethers } from "ethers";
-
-/*  using a mix of 2 different contract abstractions: web3.Contract and ethers.
-    It's a temporary workaround for some issues with web3 1.0 (e.g. getLogs, subscribe etc. )
-TODO: consolidate to use one library (likely web3 will be enough once websocket works with Metamask) */
 export default class SolidityContract {
     constructor(connection, contractAddress, abiFile) {
+        const web3 = connection.web3Instance;
         // TODO: web3.eth.Contract is async now. catch errors
         //   to find source of  "Uncaught (in promise) Error: Couldn't decode uint256 from ABI: 0x"
         //  error in console when incorrect contract address is passed
-        this.web3ContractInstance = new connection.web3Instance.eth.Contract(abiFile.abi, contractAddress);
-
-        const provider = connection.ethers.provider;
-        this.ethersInstance = new ethers.Contract(contractAddress, abiFile.abi, provider);
+        this.web3ContractInstance = new web3.eth.Contract(abiFile.abi, contractAddress);
 
-        this.address = ethers.utils.getAddress(contractAddress); // format it checksummed
+        this.address = web3.utils.toChecksumAddress(contractAddress); // format it checksummed
         this.abiVersionHash = abiFile && abiFile.abiHash;
         this.abiFile = abiFile;
         this.abi = abiFile.abi; // storing this to be ethereum js lib independent
@@ -35,7 +28,7 @@ export default class SolidityContract {
             default:
                 startBlock = 0;
         }
-        this.deployedAtBlock = ethers.utils.bigNumberify(startBlock).toHexString();
+        this.deployedAtBlock = web3.utils.toHex(startBlock);
         this.connection = connection;
     }