v0.2.0 (#202)

* populate tzip-16 contract data when contracts are originated

The spec only requires that the 'description' and 'interfaces' fields
to be defined IIRC

* Remove update operators from market contract

This should resolve issue #130

* remove dead code

* Update metadata definition given Eugene's comments

* replaced nested code with async/await syntax

* feat: Update client/package.json version, use in splash page

* take out nested try/catch block

* remove more dead code

* form JSON correctly

* update faucet storage in contracts/src/nft-contracts-tzip16.ts

* move example metadata definition from ligo to typescript

* feat: Scaffold notifications, file upload as thunk

* update contracts given Michael/Eli's suggestions (will update tests)

* modify tests to reflect changes in contract's entrypoints

* feat: Upload artifact files on token creation submit

* more cleanup as per Michael's comments

* take out tzip12 contracts and related files/tests

* take out old contracts in `contracts/bin`

* combine market_case_1.ts/market_case_1.test.ts -> nft_market.test.ts

also put some important code into beforeEach block

* wip: Upgrade to edonet

* wip: Bypass typescript, 'edo2net' in wallet requestPermissions for Thanos

* fix - incorrectly used error

fa2_insufficient_balance should be fa2_token_undefined

* Put required price and amount given in the "WRONG_TEZ_PRICE" error.

* make sure tez doesn't get stuck on Sell/Cancel entry-points

* Transfers of zero amount MUST be treated as normal transfers.

In case of a zero amount transfer, the token_id validity remains
unverified. This has been addressed.

* wrap entrypoint name in parentheses

* include tz files

* chore: Remove unused environment variables from bin/dev-*/env scripts

* fix: Resolve issues with notification delivery

* fix(temp): Workaround edonet compatibility issues by referring to edo2net in client

* feat: Initial video NFT upload & display

* feat: Play/pause video on hover in token grid

* chore: Cleanup unused actions, IPFS form display

* fix: Readd bootstrap functions that were cleared during contracts/ refactor

* fix: Work around edo2net edge case that broke sandbox

* fix: Use createReadStream for non-pinata uploads

* fix: Fix token_metadata_map -> token_info regression

* doc: Update delphinet -> edonet in README

* Fix wallet connect (#203)

* Fix issue where already connected wallets would not auto reconnect

* fix: Fix redux warning, resolve disconnect issue, fix FOUC on reconnect

* refactor: Move wallet reconnect attempt state out of component and into system SDK

Co-authored-by: Philip Diaz <philip@tqgroup.io>

* Fixing yarn log:api to follow api-server and not bcd api

* fix: Update max request size in local nginx gateway

* chore: Bump server package.json version

* updated shield

Co-authored-by: Emmanuel Denloye-Ito <eod8tb@virginia.edu>
Co-authored-by: Joshua Dechant <josh@codecrafting.org>
Co-authored-by: Gregory Rocco <gregoryrocco@MBPSprueSupreme.nyc.rr.com>

Author: 4 people

README.md

@@ -1,12 +1,12 @@
 ![OpenMinter header](/docs/assets/minterhead.png)
 
-[![](https://img.shields.io/badge/license-MIT-brightgreen)](LICENSE) [![](https://img.shields.io/badge/Docker-20.10.x-blue)](https://www.docker.com/) [![](https://img.shields.io/badge/version-v0.1.2-orange)](https://github.com/tqtezos/minter)
+[![](https://img.shields.io/badge/license-MIT-brightgreen)](LICENSE) [![](https://img.shields.io/badge/Docker-20.10.x-blue)](https://www.docker.com/) [![](https://img.shields.io/badge/version-v0.2.0-orange)](https://github.com/tqtezos/minter)
 
 ## Notice
 
-This software is in beta. At the moment, the smart contracts 
+This software is in beta. At the moment, the smart contracts
 that OpenMinter uses have **not** been formally audited. Please
-use this software at your own risk. 
+use this software at your own risk.
 
 ## OpenMinter
 
@@ -17,7 +17,7 @@ contracts, see their NFTs across contracts, and enable marketplace
 capabilities to trade them.
 
 OpenMinter supports the following networks and software components:
-#### 🌐 Mainnet and Delphinet networks (Edonet soon)
+#### 🌐 Mainnet and Edonet networks
 #### 📦 Sandboxed development via [Flextesa][flextesa]
 #### 🎨 Creating multimedia NFTs
 #### 👛 Various wallets via [Beacon](https://www.walletbeacon.io/)
@@ -57,7 +57,7 @@ the `minter-ui-dev` and `minter-api-dev` Docker images.
 ### Configuration
 
 The Minter can be configured to run on three different networks: `sandbox`,
-`testnet` (currently set to delphinet), and `mainnet`.
+`testnet` (currently set to edonet), and `mainnet`.
 
 Each network has its own configuration file in the `config` folder under
 `minter.<network>.json`. The schema of these files can be defined as this

bin/dev-mainnet/env

@@ -1,8 +1,3 @@
 TEZOS_RPC_URL=https://mainnet-tezos.giganode.io
-
-BCD_API_URL=https://api.better-call.dev
-BCD_GUI_URL=https://better-call.dev
-
 BCD_NETWORK="mainnet"
-
 TZ_NETWORK=mainnet

bin/dev-sandbox/env

@@ -4,15 +4,9 @@ TEZOS_RPC_PROTO=http
 
 TEZOS_RPC_URL=${TEZOS_RPC_PROTO}://${TEZOS_RPC_HOST}:20000
 
-BCD_API_PORT=14000
-BCD_GUI_PORT=8009
-
-BCD_API_URL=http://bcdapi:${BCD_API_PORT}
-BCD_GUI_URL=http://localhost:${BCD_GUI_PORT}
-
 BCD_NETWORK="sandboxnet"
 
-FLEXTESA_DOCKER_IMG=registry.gitlab.com/tezos/flextesa:00b415f2-run
+FLEXTESA_DOCKER_IMG=registry.gitlab.com/tezos/flextesa:56f651af-run
 
 TZ_INDEX_DB_PATH=$PROJECT_ROOT_DIR/.tzindex
 FLEXTESA_DATA_DIR=$PROJECT_ROOT_DIR/.flextesa

bin/dev-testnet/env

@@ -1,8 +1,2 @@
-TEZOS_RPC_URL=https://delphinet-tezos.giganode.io
-
-BCD_API_URL=https://api.better-call.dev
-BCD_GUI_URL=https://better-call.dev
-
-BCD_NETWORK="delphinet"
-
+TEZOS_RPC_URL=https://edonet-tezos.giganode.io
 TZ_NETWORK=testnet

client/package.json

@@ -1,16 +1,16 @@
 {
   "name": "client",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "dependencies": {
     "@chakra-ui/react": "1.1.2",
     "@emotion/core": "10.0.28",
     "@emotion/react": "11.1.4",
     "@emotion/styled": "11.0.0",
     "@reduxjs/toolkit": "1.5.0",
-    "@taquito/beacon-wallet": "8.0.0-beta.5",
-    "@taquito/tzip16": "8.0.0-beta.5",
-    "@taquito/taquito": "8.0.0-beta.5",
+    "@taquito/beacon-wallet": "8.0.3-beta.0",
+    "@taquito/tzip16": "8.0.3-beta.0",
+    "@taquito/taquito": "8.0.3-beta.0",
     "@types/lodash": "4.14.165",
     "@types/react": "16.9.12",
     "@types/react-dom": "16.9.0",

client/src/components/App/index.tsx

@@ -1,18 +1,35 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Switch, Route } from 'wouter';
 import SplashPage from '../SplashPage';
 import CreateNonFungiblePage from '../CreateNonFungiblePage';
 import CollectionsCatalog from '../Collections/Catalog';
 import CollectionsTokenDetail from '../Collections/TokenDetail';
 import Header from '../common/Header';
 import { Flex } from '@chakra-ui/react';
+import Notifications from '../common/Notifications';
+import { useSelector, useDispatch } from '../../reducer';
+import { reconnectWallet } from '../../reducer/async/wallet';
 
 export default function App() {
+  const dispatch = useDispatch();
+  const walletReconnectAttempted = useSelector(
+    s => s.system.walletReconnectAttempted
+  );
+
+  useEffect(() => {
+    if (!walletReconnectAttempted) {
+      dispatch(reconnectWallet());
+    }
+  }, [walletReconnectAttempted, dispatch]);
+
+  if (!walletReconnectAttempted) {
+    return null;
+  }
+
   return (
     <Flex pos="absolute" w="100%" h="100%">
       <Flex justifyContent="space-between" width="100%" flexDir="column">
         <Header />
-
         <Switch>
           <Route path="/">
             <SplashPage />
@@ -32,6 +49,7 @@ export default function App() {
             )}
           </Route>
         </Switch>
+        <Notifications />
       </Flex>
     </Flex>
   );

client/src/components/Collections/Catalog/TokenGrid.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useLocation } from 'wouter';
 import { AspectRatio, Box, Flex, Grid, Image, Text } from '@chakra-ui/react';
 import { Wind, HelpCircle } from 'react-feather';
@@ -11,32 +11,71 @@ interface TokenTileProps extends Token {
   selectedCollection: string;
 }
 
+function MediaNotFound() {
+  return (
+    <Flex
+      flexDir="column"
+      align="center"
+      justify="center"
+      flex="1"
+      bg="gray.100"
+      color="gray.300"
+      height="100%"
+    >
+      <HelpCircle size="70px" />
+    </Flex>
+  );
+}
+
 function TokenImage(props: { src: string }) {
   const [errored, setErrored] = useState(false);
+  const [obj, setObj] = useState<{ url: string; type: string } | null>(null);
+  useEffect(() => {
+    (async () => {
+      let blob;
+      try {
+        blob = await fetch(props.src).then(r => r.blob());
+      } catch (e) {
+        return setErrored(true);
+      }
+      setObj({
+        url: URL.createObjectURL(blob),
+        type: blob.type
+      });
+    })();
+  }, [props.src]);
 
   if (errored) {
+    return <MediaNotFound />;
+  }
+
+  if (!obj) return null;
+
+  if (/^image\/.*/.test(obj.type)) {
     return (
-      <Flex
-        flexDir="column"
-        align="center"
-        justify="center"
+      <Image
+        src={props.src}
+        objectFit="contain"
         flex="1"
-        bg="gray.100"
-        color="gray.300"
+        onError={() => setErrored(true)}
+      />
+    );
+  }
+
+  if (/^video\/.*/.test(obj.type)) {
+    return (
+      <video
+        loop
+        onClick={e => e.preventDefault()}
+        onMouseEnter={e => e.currentTarget.play()}
+        onMouseLeave={e => e.currentTarget.pause()}
       >
-        <HelpCircle size="70px" />
-      </Flex>
+        <source src={obj.url} type={obj.type} />
+      </video>
     );
   }
 
-  return (
-    <Image
-      src={props.src}
-      objectFit="contain"
-      flex="1"
-      onError={() => setErrored(true)}
-    />
-  );
+  return <MediaNotFound />;
 }
 
 function TokenTile(props: TokenTileProps) {

client/src/components/Collections/TokenDetail/index.tsx

@@ -43,49 +43,72 @@ function NotFound() {
   );
 }
 
-function TokenImage(props: { src: string }) {
-  const [errored, setErrored] = useState(false);
-
-  if (errored) {
-    return (
-      <AspectRatio
-        ratio={4 / 3}
-        width="100%"
-        borderRadius="3px"
-        bg="gray.100"
-        overflow="hidden"
-      >
-        <Flex flexDir="column" align="center" justify="center">
-          <Box color="gray.300" pb={10}>
-            <HelpCircle size="100px" />
-          </Box>
-          <Heading color="gray.300" size="xl">
-            Image not found
-          </Heading>
-        </Flex>
-      </AspectRatio>
-    );
-  }
-
+function MediaNotFound() {
   return (
     <AspectRatio
-      ratio={1}
+      ratio={4 / 3}
       width="100%"
       borderRadius="3px"
-      boxShadow="0 0 5px rgba(0,0,0,.15)"
+      bg="gray.100"
       overflow="hidden"
     >
-      <Box>
-        <Image
-          src={props.src}
-          objectFit="contain"
-          onError={() => setErrored(true)}
-        />
-      </Box>
+      <Flex flexDir="column" align="center" justify="center">
+        <Box color="gray.300" pb={10}>
+          <HelpCircle size="100px" />
+        </Box>
+        <Heading color="gray.300" size="xl">
+          Image not found
+        </Heading>
+      </Flex>
     </AspectRatio>
   );
 }
 
+function TokenImage(props: { src: string }) {
+  const [errored, setErrored] = useState(false);
+  const [obj, setObj] = useState<{ url: string; type: string } | null>(null);
+  useEffect(() => {
+    (async () => {
+      let blob;
+      try {
+        blob = await fetch(props.src).then(r => r.blob());
+      } catch (e) {
+        return setErrored(true);
+      }
+      setObj({
+        url: URL.createObjectURL(blob),
+        type: blob.type
+      });
+    })();
+  }, [props.src]);
+
+  if (errored) {
+    return <MediaNotFound />;
+  }
+  if (!obj) return null;
+
+  if (/^image\/.*/.test(obj.type)) {
+    return (
+      <Image
+        src={props.src}
+        objectFit="contain"
+        flex="1"
+        onError={() => setErrored(true)}
+      />
+    );
+  }
+
+  if (/^video\/.*/.test(obj.type)) {
+    return (
+      <video controls>
+        <source src={obj.url} type={obj.type} />
+      </video>
+    );
+  }
+
+  return <MediaNotFound />;
+}
+
 interface TokenDetailProps {
   contractAddress: string;
   tokenId: number;
@@ -134,9 +157,22 @@ function TokenDetail({ contractAddress, tokenId }: TokenDetailProps) {
           </MinterButton>
         </Flex>
         <Flex align="center" justify="center" flex="1" px={16}>
-          <TokenImage
-            src={ipfsUriToGatewayUrl(system.config.network, token.artifactUri)}
-          />
+          <AspectRatio
+            ratio={1}
+            width="100%"
+            borderRadius="3px"
+            boxShadow="0 0 5px rgba(0,0,0,.15)"
+            overflow="hidden"
+          >
+            <Box>
+              <TokenImage
+                src={ipfsUriToGatewayUrl(
+                  system.config.network,
+                  token.artifactUri
+                )}
+              />
+            </Box>
+          </AspectRatio>
         </Flex>
       </Flex>
       <Flex w="50%" h="100%" flexDir="column">