Merge pull request #468 from Cryptonomic/as-features

NFT update
Cryptonomic · Mar 29, 2022 · 68a1c8d · 68a1c8d
2 parents a7cc98b + a9831f6
commit 68a1c8d
Show file tree

Hide file tree

Showing 23 changed files with 148 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tezori",
-  "version": "1.3.0-beta",
+  "version": "1.3.1-beta",
   "description": "An open-source wallet framework for the Tezos blockchain.",
   "main": "./src/main.prod.js",
   "scripts": {
@@ -194,6 +194,7 @@
     "node-sass": "4.14.1",
     "opencollective-postinstall": "2.0.2",
     "optimize-css-assets-webpack-plugin": "5.0.3",
+    "pngjs": "^6.0.0",
     "prettier": "2.0.5",
     "react-hot-loader": "4.12.21",
     "react-test-renderer": "16.13.1",

diff --git a/src/components/Media/style.ts b/src/components/Media/style.ts
@@ -38,7 +38,7 @@ export const ModalBox = styled.div`
     & img,
     & video,
     div {
-        width: max-content;
+        width: auto;
         height: auto;
         max-width: 90vw;
         max-height: 90vh;
@@ -81,6 +81,7 @@ export const PreviewIcon = styled.span`
 export const StyledImage = styled(Image)`
     & > img {
         border-radius: 8px;
+        image-rendering: pixelated;
     }
 `;
 

diff --git a/src/config.json b/src/config.json
@@ -1,13 +1,13 @@
 {
     "name": "Tezori",
-    "version": "1.3.0-beta",
+    "version": "1.3.1-beta",
     "blockExplorerHost": "https://arronax.io/tezos",
     "logo": "tezosLogo.png",
     "logoLink": "https://github.com/Cryptonomic/T2",
     "termsService": "https://github.com/Cryptonomic/T2",
     "privacyPolicy": "https://github.com/Cryptonomic/T2",
     "tagline": "containers.loginHome.tagline",
-    "LocalVersionIndex": "56",
+    "LocalVersionIndex": "57",
     "helpUrl": "https://github.com/Cryptonomic/T2",
     "aboutUrl": "",
     "ledgerAppUrl": "https://support.ledger.com/hc/en-us/articles/360016057774-Tezos-XTZ-",

diff --git a/src/constants/Token.ts b/src/constants/Token.ts
@@ -201,7 +201,7 @@ export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
         network: 'mainnet',
         address: 'KT1K6TyRSsAxukmjDWik1EoExSKsTg9wGEEX',
         displayName: 'Tezos Degen Club',
-        symbol: 'TBC',
+        symbol: 'TDC',
         balance: 0,
         transactions: [],
         activeTab: COLLECTION,
@@ -587,6 +587,24 @@ export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
         provider: NFT_PROVIDERS.OBJKT_GENERIC,
         hideOnLanding: true,
     },
+    {
+        network: 'mainnet',
+        address: 'KT1QYVvQb1NCMWLLSAT7YcYtmmuEiKtTHmwd',
+        displayName: 'Ottez Oysters',
+        symbol: 'Ottez Oysters',
+        balance: 0,
+        transactions: [],
+        activeTab: COLLECTION,
+        kind: TokenKind.objkt,
+        scale: 0,
+        precision: 0,
+        round: 0,
+        mapid: 137098,
+        nftMetadataMap: 137100,
+        holderLocation: 'key',
+        provider: NFT_PROVIDERS.OBJKT_GENERIC,
+        hideOnLanding: true,
+    },
     {
         network: 'mainnet',
         address: 'KT1Qm7MHmbdiBzoRs7xqBiqoRxw7T2cxTTJN',
@@ -774,6 +792,27 @@ export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
         helpLink: 'https://tzdropz.com',
         displayHelpLink: 'tzdropz.com/',
     },
+    {
+        network: 'mainnet',
+        address: 'KT1MxDwChiDwd6WBVs24g1NjERUoK622ZEFp',
+        displayName: '8bidou',
+        symbol: '8B',
+        balance: 0,
+        transactions: [],
+        activeTab: COLLECTION,
+        kind: TokenKind.objkt,
+        scale: 0,
+        precision: 0,
+        round: 0,
+        mapid: 113213,
+        nftMetadataMap: 113218,
+        holderLocation: 'key',
+        balancePath: '$.args[1].int',
+        provider: NFT_PROVIDERS.EIGHTB,
+        hideOnLanding: true,
+        helpLink: 'https://www.8bidou.com',
+        displayHelpLink: '8bidou.com',
+    },
     {
         network: 'mainnet',
         address: 'KT1VYsVfmobT7rsMVivvZ4J8i3bPiqz12NaH',
@@ -824,9 +863,29 @@ export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
         round: 2,
         mapid: 103270,
         balancePath: '$.args[1].int',
-        helpLink: 'https://objkt.com/',
+        helpLink: 'https://objkt.com',
         displayHelpLink: 'objkt.com',
     },
+    {
+        network: 'mainnet',
+        address: 'KT1AWoUQAuUudqpc75cGukWufbfim3GRn8h6',
+        displayName: 'Flex Fashion',
+        symbol: 'FF',
+        balance: 0,
+        transactions: [],
+        activeTab: COLLECTION,
+        kind: TokenKind.objkt,
+        scale: 0,
+        precision: 0,
+        round: 0,
+        mapid: 124575,
+        nftMetadataMap: 124577,
+        holderLocation: 'key',
+        provider: NFT_PROVIDERS.OBJKT_GENERIC,
+        helpLink: 'https://flex.fashion',
+        displayHelpLink: 'flex.fashion',
+        hideOnLanding: true,
+    },
     {
         network: 'mainnet',
         address: 'KT1XpYoPCxQnpgxLM22dkLDXBmTsDLc1S8nZ',
@@ -1634,6 +1693,9 @@ export const knownContractNames = {
     KT1NVXxerB7NFi12CGP79fwoLHhuaxPBV2tQ: 'Dogami Auction',
 
     KT1NkWx47WzJeHCSyB62WjLtFn4tRf3uXBur: 'Tezos Degen Club coin flip',
+
+    KT1BvWGFENd4CXW5F3u4n31xKfJhmBGipoqF: '8bidou Market',
+    KT1MxDwChiDwd6WBVs24g1NjERUoK622ZEFp: '8bidou NFT',
 };
 
 export const knownMarketMetadata = [

diff --git a/src/contracts/NFT/components/NFTMoreInfo/index.tsx b/src/contracts/NFT/components/NFTMoreInfo/index.tsx
@@ -62,6 +62,8 @@ export const NFTMoreInfo: FunctionComponent<NFTMoreInfoProps> = ({ nftObject })
             openArtifactLink(`https://objkt.com/asset/${nftObject.tokenAddress}/${nftObject.objectId}`);
         } else if (nftObject?.provider === NFT_PROVIDERS.DOGAMI) {
             openArtifactLink(`https://marketplace.dogami.com/dog/${nftObject.objectId}`);
+        } else if (nftObject?.provider === NFT_PROVIDERS.EIGHTB) {
+            openArtifactLink(`https://www.8bidou.com/listing/?id=${nftObject.objectId}`);
         }
     };
 

diff --git a/src/contracts/NFT/constants.ts b/src/contracts/NFT/constants.ts
@@ -26,6 +26,7 @@ export const NFT_PROVIDERS = {
     FXHASH: 'FXHASH',
     VERSUM: 'VERSUM',
     RARIBLE: 'RARIBLE',
+    EIGHTB: 'EIGHTB',
     IPFS: 'IPFS',
 
     OBJKT_GENERIC: 'OBJKT_GENERIC',

diff --git a/src/contracts/NFT/util.ts b/src/contracts/NFT/util.ts
@@ -2,6 +2,7 @@ import { ConseilQueryBuilder, ConseilOperator, KeyStore, MultiAssetTokenHelper,
 import { BigNumber } from 'bignumber.js';
 import { JSONPath } from 'jsonpath-plus';
 import { proxyFetch, ImageProxyServer, ImageProxyDataType } from 'nft-image-proxy';
+import * as png from 'pngjs';
 
 import { NFT_ACTION_TYPES, NFT_ERRORS, NFT_PROVIDERS } from './constants';
 import { TransferNFTError } from './exceptions';
@@ -580,9 +581,38 @@ export async function getObjktNFTDetails(tezosUrl: string, objectId: number | st
     };
 }
 
+export async function get8bidouDetails(tezosUrl: string, objectId: number | string, metadataMap: number) {
+    const packedNftId = TezosMessageUtils.encodeBigMapKey(Buffer.from(TezosMessageUtils.writePackedData(objectId, 'int'), 'hex'));
+    const nftInfo = await TezosNodeReader.getValueForBigMapKey(tezosUrl, metadataMap, packedNftId);
+
+    const creatorBytes = JSONPath({ path: '$.args[2].bytes', json: nftInfo })[0]; // $.args[1].string
+    const descriptionBytes = JSONPath({ path: '$.args[4].bytes', json: nftInfo })[0];
+    const nameBytes = JSONPath({ path: '$.args[3].bytes', json: nftInfo })[0];
+    const imageDataBytes = JSONPath({ path: '$.args[5].string', json: nftInfo })[0];
+
+    const nftCreators = Buffer.from(creatorBytes, 'hex').toString();
+    const nftDescription = Buffer.from(descriptionBytes, 'hex').toString();
+    const nftName = Buffer.from(nameBytes, 'hex').toString();
+
+    const image = new png.PNG({ width: 8, height: 8, bitDepth: 8, colorType: 2, inputColorType: 2, inputHasAlpha: false });
+    image.data = Buffer.from(imageDataBytes, 'hex');
+    const buffer = png.PNG.sync.write(image, { width: 8, height: 8, bitDepth: 8, colorType: 2, inputColorType: 2, inputHasAlpha: false });
+    const artifactUrl = `data:image/png;base64,${buffer.toString('base64')}`;
+
+    return {
+        name: nftName,
+        description: nftDescription,
+        creators: nftCreators,
+        artifactUrl,
+        artifactType: 'image/png',
+        artifactModerationMessage: undefined,
+        thumbnailUri: artifactUrl,
+    };
+}
+
 export async function getDogamiDetails(tezosUrl: string, objectId: number | string, metadataMap: number) {
     const packedNftId = TezosMessageUtils.encodeBigMapKey(Buffer.from(TezosMessageUtils.writePackedData(objectId, 'int'), 'hex'));
-    const nftInfo = await TezosNodeReader.getValueForBigMapKey(tezosUrl, metadataMap, packedNftId); // TODO: store in token definition
+    const nftInfo = await TezosNodeReader.getValueForBigMapKey(tezosUrl, metadataMap, packedNftId);
 
     const artifactUrlBytes = JSONPath({ path: '$.args[1][0].args[1].bytes', json: nftInfo })[0];
     const creatorBytes = JSONPath({ path: '$.args[1][2].args[1].bytes', json: nftInfo })[0];
@@ -855,6 +885,9 @@ export async function getCollection(tokenAddress: string, tokenMapId: number, qu
                     if (metadataMapId === 115420) {
                         // HACK: dogami
                         objectDetails = await getDogamiDetails(node.tezosUrl, objectId, metadataMapId);
+                    } else if (metadataMapId === 113218) {
+                        // HACK 8bidou
+                        objectDetails = await get8bidouDetails(node.tezosUrl, objectId, metadataMapId);
                     } else {
                         objectDetails = await getObjktNFTDetails(node.tezosUrl, objectId, metadataMapId, urlPath);
                     }

diff --git a/src/featureModals/Beacon/BeaconAuthorization.tsx b/src/featureModals/Beacon/BeaconAuthorization.tsx
@@ -33,27 +33,9 @@ import { createMessageAction } from '../../reduxContent/message/actions';
 import { ModalWrapper, ModalContainer, Container, ButtonContainer, InvokeButton, WhiteBtn, Footer } from '../style';
 
 import { estimateOperationGroupFee, sendOperations, queryHicEtNuncSwap } from './thunks';
-import { WrapPassword, OperationDetailHeader } from './style';
+import { WrapPassword, OperationDetailHeader, LabelText } from './style';
 import { beaconClient } from './BeaconMessageRouter';
 
-const AddCircleWrapper = styled(AddCircle)<{ active: number }>`
-    &&& {
-        fill: #7b91c0;
-        width: ${ms(1)};
-        height: ${ms(1)};
-        opacity: ${({ active }) => (active ? 1 : 0.5)};
-        cursor: ${({ active }) => (active ? 'pointer' : 'default')};
-    }
-`;
-
-export const LabelText = styled.span`
-    display: block;
-    margin-bottom: 0px;
-    font-size: 12px;
-    color: ${({ theme: { colors } }) => colors.gray5};
-    font-weight: 400;
-`;
-
 interface Props {
     open: boolean;
     managerBalance: number;
@@ -149,12 +131,15 @@ const BeaconAuthorize = ({ open, managerBalance, onClose }: Props) => {
     useEffect(() => {
         if (!estimates.estimatedFee) {
             setFee('0');
-        } else if (typeof estimates.estimatedFee === 'string') {
-            setFeeError(estimates.estimatedFee);
+            setFeeError('');
+        } else if (estimates.feeError && estimates.feeError.length > 0) {
+            setFeeError(estimates.feeError);
         } else {
+            setFeeError('');
             setFee(formatAmount(estimates.estimatedFee));
             setCustomFee(formatAmount(estimates.estimatedFee));
         }
+
         if (typeof estimates.estimatedStorage === 'number') {
             setCustomStorageLimit(estimates.estimatedStorage);
         }

diff --git a/src/featureModals/Beacon/style.ts b/src/featureModals/Beacon/style.ts
@@ -10,3 +10,11 @@ export const OperationDetailHeader = styled.div`
     font-size: 12px;
     float: left;
 `;
+
+export const LabelText = styled.span`
+    display: block;
+    margin-bottom: 0px;
+    font-size: 12px;
+    color: ${({ theme: { colors } }) => colors.gray5};
+    font-weight: 400;
+`;
diff --git a/src/featureModals/Beacon/thunks.ts b/src/featureModals/Beacon/thunks.ts
@@ -15,7 +15,7 @@ import { getMainNode } from '../../utils/settings';
 export function estimateOperationGroupFee(publicKeyHash: string, operations: any[]): any {
     // TODO: type
     const store = useStore<RootState>();
-    const [fee, setFee] = useState({ estimatedFee: 0, estimatedGas: 0, estimatedStorage: 0 });
+    const [fee, setFee] = useState({ estimatedFee: 0, estimatedGas: 0, estimatedStorage: 0, feeError: '' });
 
     useEffect(() => {
         const estimateInvocation = async () => {
@@ -31,10 +31,11 @@ export function estimateOperationGroupFee(publicKeyHash: string, operations: any
                 const estimate = await TezosNodeWriter.estimateOperationGroup(tezosUrl, 'main', formedOperations);
                 const estimatedGas = estimate.operationResources.reduce((a, c) => (a += c.gas), 0);
                 const estimatedStorage = estimate.operationResources.reduce((a, c) => (a += c.storageCost), 0);
-                setFee({ estimatedFee: estimate.estimatedFee, estimatedGas, estimatedStorage });
+                setFee({ estimatedFee: estimate.estimatedFee, estimatedGas, estimatedStorage, feeError: '' });
             } catch (e) {
+                const err = e as Error;
                 console.log('estimateInvocation failed with ', e);
-                setFee(e.message);
+                setFee({ estimatedFee: -1, estimatedGas: -1, estimatedStorage: -1, feeError: err.message });
             }
         };
 

diff --git a/src/locales/de.json b/src/locales/de.json
@@ -395,6 +395,7 @@
                 "ONEOF": "oneof.com",
                 "FXHASH": "fxhash.xyz",
                 "RARIBLE": "rarible.com",
+                "EIGHTB": "8bidou.com",
                 "IPFS": "IPFS"
             }
         },

diff --git a/src/locales/en-US.json b/src/locales/en-US.json
@@ -448,6 +448,7 @@
                 "ONEOF": "oneof.com",
                 "FXHASH": "fxhash.xyz",
                 "RARIBLE": "rarible.com",
+                "EIGHTB": "8bidou.com",
                 "IPFS": "IPFS"
             }
         },

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -395,6 +395,7 @@
                 "ONEOF": "oneof.com",
                 "FXHASH": "fxhash.xyz",
                 "RARIBLE": "rarible.com",
+                "EIGHTB": "8bidou.com",
                 "IPFS": "IPFS"
             }
         },

diff --git a/src/locales/fr.json b/src/locales/fr.json
@@ -395,6 +395,7 @@
                 "ONEOF": "oneof.com",
                 "FXHASH": "fxhash.xyz",
                 "RARIBLE": "rarible.com",
+                "EIGHTB": "8bidou.com",
                 "IPFS": "IPFS"
             }
         },

diff --git a/src/locales/he.json b/src/locales/he.json
@@ -395,6 +395,7 @@
                 "ONEOF": "oneof.com",
                 "FXHASH": "fxhash.xyz",
                 "RARIBLE": "rarible.com",
+                "EIGHTB": "8bidou.com",
                 "IPFS": "IPFS"
             }
         },

diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -395,6 +395,7 @@
                 "ONEOF": "oneof.com",
                 "FXHASH": "fxhash.xyz",
                 "RARIBLE": "rarible.com",
+                "EIGHTB": "8bidou.com",
                 "IPFS": "IPFS"
             }
         },

diff --git a/src/locales/ko.json b/src/locales/ko.json
@@ -395,6 +395,7 @@
                 "ONEOF": "oneof.com",
                 "FXHASH": "fxhash.xyz",
                 "RARIBLE": "rarible.com",
+                "EIGHTB": "8bidou.com",
                 "IPFS": "IPFS"
             }
         },