From 66167ff0b737566236e33b9f97046489d2d78c05 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Sat, 19 Feb 2022 14:25:32 +0530 Subject: [PATCH 01/19] Changed contract --- packages/website/utils/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/utils/config.js b/packages/website/utils/config.js index f1c8a22..0b567ad 100644 --- a/packages/website/utils/config.js +++ b/packages/website/utils/config.js @@ -1,3 +1,3 @@ -export const contractAddress = "cura-0_0_13.creatify.testnet"; +export const contractAddress = "test2.ashen99.testnet"; export const graphUri = "https://api.thegraph.com/subgraphs/name/curaos/cc-project"; From 395be02a7aa4842588fd0b03d0fa280d70655a61 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 25 Feb 2022 15:35:14 +0530 Subject: [PATCH 02/19] Test 1 --- packages/website/utils/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/utils/config.js b/packages/website/utils/config.js index 0b567ad..4e20330 100644 --- a/packages/website/utils/config.js +++ b/packages/website/utils/config.js @@ -1,3 +1,3 @@ -export const contractAddress = "test2.ashen99.testnet"; +export const contractAddress = "test4.ashen99.testnet"; export const graphUri = "https://api.thegraph.com/subgraphs/name/curaos/cc-project"; From c1823f425c43dc19dca4b5e469f95bea9145ddff Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 25 Feb 2022 15:47:48 +0530 Subject: [PATCH 03/19] Test 1.1 --- packages/website/utils/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/utils/config.js b/packages/website/utils/config.js index 4e20330..ea62d5c 100644 --- a/packages/website/utils/config.js +++ b/packages/website/utils/config.js @@ -1,3 +1,3 @@ export const contractAddress = "test4.ashen99.testnet"; export const graphUri = - "https://api.thegraph.com/subgraphs/name/curaos/cc-project"; + "https://api.thegraph.com/subgraphs/name/asheni99/graph_test"; From f5105986aef4641adcdb3fe6f0603a889d49b2a5 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Thu, 3 Mar 2022 12:11:00 +0530 Subject: [PATCH 04/19] Test 1.2 --- packages/website/pages/explore/[id].tsx | 2 +- packages/website/pages/view.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/pages/explore/[id].tsx b/packages/website/pages/explore/[id].tsx index 50c1f06..40596ed 100644 --- a/packages/website/pages/explore/[id].tsx +++ b/packages/website/pages/explore/[id].tsx @@ -223,7 +223,7 @@ const SingleView = () => { ]} width={"100%"} /> - + {/**/} diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index 088124c..bc119ca 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -186,7 +186,7 @@ const View = () => { ]} width={"100%"} /> - + {/**/} } From f47b1b328802da49304c80165d70e7b7158b2f37 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Thu, 3 Mar 2022 12:13:59 +0530 Subject: [PATCH 05/19] Test 1.2.1 --- packages/website/pages/explore/[id].tsx | 12 ------------ packages/website/pages/view.tsx | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/packages/website/pages/explore/[id].tsx b/packages/website/pages/explore/[id].tsx index 40596ed..e897077 100644 --- a/packages/website/pages/explore/[id].tsx +++ b/packages/website/pages/explore/[id].tsx @@ -46,18 +46,6 @@ const GET_SINGLE_NFT = gql` id type timestamp - mintBy { - id - } - burnBy { - id - } - transferFrom { - id - } - transferTo { - id - } transactionHash } } diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index bc119ca..34556a3 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -38,18 +38,6 @@ const GET_OWNER_NFT = gql` id type timestamp - mintBy { - id - } - burnBy { - id - } - transferFrom { - id - } - transferTo { - id - } transactionHash } } From 39f3f9084ce45db713fc155c447aa507a027f3f9 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Thu, 3 Mar 2022 13:01:52 +0530 Subject: [PATCH 06/19] Test 1.2.2 --- packages/website/pages/view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index 34556a3..a870b5b 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -90,7 +90,7 @@ const View = () => { try { await contract.accept_bid( { - token_id: nft?.id, + tokenId: nft?.id, bidder: bidder, }, MARKET_ACCEPT_BID_GAS, From b1f9424bbb90687ebb20052e4d76f777a88a4d45 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 15:30:57 +0530 Subject: [PATCH 07/19] Test 1.3 --- packages/website/pages/view.tsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index a870b5b..af351d6 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -31,7 +31,9 @@ const GET_OWNER_NFT = gql` } bids { amount - bidder + bidder { + id + } sell_on_share } history { @@ -159,7 +161,17 @@ const View = () => { BURN - {bids && } + {bids && + ( + { ...a, [v.bidder?.id]: { + ...v, + "bidder": v.bidder?.id + }}), {}) + } + onAcceptBid={acceptBid} + /> + } Date: Fri, 4 Mar 2022 15:34:22 +0530 Subject: [PATCH 08/19] Test 1.4 --- packages/website/pages/view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index af351d6..7286b27 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -11,7 +11,7 @@ import { contractAddress } from "../utils/config"; import { alertMessageState, indexLoaderState } from "../state/recoil"; const CONTRACT_BURN_GAS = utils.format.parseNearAmount(`0.00000000029`); // 290 Tgas -const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000025`); // 250 Tgas +const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000030`); // 300 Tgas const YOCTO_NEAR = utils.format.parseNearAmount(`0.000000000000000000000001`); const HARDCODED_ROYALTY_ADDRESS = "sample.address"; From efa45466eacef0f3fc42bd89d3f9241831d7c715 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 15:46:17 +0530 Subject: [PATCH 09/19] Test 1.4.2 --- packages/website/pages/view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index 7286b27..0b15bb7 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -11,7 +11,7 @@ import { contractAddress } from "../utils/config"; import { alertMessageState, indexLoaderState } from "../state/recoil"; const CONTRACT_BURN_GAS = utils.format.parseNearAmount(`0.00000000029`); // 290 Tgas -const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000030`); // 300 Tgas +const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000300`); // 3000 Tgas const YOCTO_NEAR = utils.format.parseNearAmount(`0.000000000000000000000001`); const HARDCODED_ROYALTY_ADDRESS = "sample.address"; From 61077f9c91cb3898fde62cbcc3da06c9c193c34e Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 15:51:13 +0530 Subject: [PATCH 10/19] Test 1.4.3 --- packages/website/pages/view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index 0b15bb7..6d1d851 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -11,7 +11,7 @@ import { contractAddress } from "../utils/config"; import { alertMessageState, indexLoaderState } from "../state/recoil"; const CONTRACT_BURN_GAS = utils.format.parseNearAmount(`0.00000000029`); // 290 Tgas -const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000300`); // 3000 Tgas +const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000090`); // 900 Tgas const YOCTO_NEAR = utils.format.parseNearAmount(`0.000000000000000000000001`); const HARDCODED_ROYALTY_ADDRESS = "sample.address"; From 187ba2b0dbae1e6fea6ed93ea836e3937ec17879 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 15:54:02 +0530 Subject: [PATCH 11/19] Test 1.4.4 --- packages/website/pages/view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index 6d1d851..a212c4e 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -11,7 +11,7 @@ import { contractAddress } from "../utils/config"; import { alertMessageState, indexLoaderState } from "../state/recoil"; const CONTRACT_BURN_GAS = utils.format.parseNearAmount(`0.00000000029`); // 290 Tgas -const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000090`); // 900 Tgas +const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000040`); // 400 Tgas const YOCTO_NEAR = utils.format.parseNearAmount(`0.000000000000000000000001`); const HARDCODED_ROYALTY_ADDRESS = "sample.address"; From 16b72ed5c0c05d17f0680c392229889f5b5afe29 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 15:56:17 +0530 Subject: [PATCH 12/19] Test 1.4.5 --- packages/website/pages/view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/view.tsx b/packages/website/pages/view.tsx index a212c4e..7286b27 100644 --- a/packages/website/pages/view.tsx +++ b/packages/website/pages/view.tsx @@ -11,7 +11,7 @@ import { contractAddress } from "../utils/config"; import { alertMessageState, indexLoaderState } from "../state/recoil"; const CONTRACT_BURN_GAS = utils.format.parseNearAmount(`0.00000000029`); // 290 Tgas -const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000040`); // 400 Tgas +const MARKET_ACCEPT_BID_GAS = utils.format.parseNearAmount(`0.00000000030`); // 300 Tgas const YOCTO_NEAR = utils.format.parseNearAmount(`0.000000000000000000000001`); const HARDCODED_ROYALTY_ADDRESS = "sample.address"; From a330361d3d7963b8a64fab931cde56d2a4561f1c Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 22:03:41 +0530 Subject: [PATCH 13/19] Test 1.5 --- packages/website/pages/bids.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/bids.tsx b/packages/website/pages/bids.tsx index cdc8f1a..22ee29f 100644 --- a/packages/website/pages/bids.tsx +++ b/packages/website/pages/bids.tsx @@ -16,7 +16,7 @@ const CONTRACT_REMOVE_BID_GAS = utils.format.parseNearAmount(`0.00000000020`); / const GET_BIDS = gql` query bids($bidder: String) { - bids(first: 1, where: { id: $bidder }) { + bids(first: 1, where: { bidder: $bidder }) { nft bidder amount From 82c0dccd2c7f18bcbb6c63b23033e4e05f7384e3 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 22:07:33 +0530 Subject: [PATCH 14/19] Test 1.5.1 --- packages/website/pages/bids.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/bids.tsx b/packages/website/pages/bids.tsx index 22ee29f..1558307 100644 --- a/packages/website/pages/bids.tsx +++ b/packages/website/pages/bids.tsx @@ -48,7 +48,7 @@ const Bids = () => { setIndexLoader(true); try { await contract.remove_bid( - { token_id: token_id, bidder: bidder }, + { tokenId: token_id }, CONTRACT_REMOVE_BID_GAS ); setIndexLoader(false); From f74709452b68272d9d8d5f8ae65f4afac452897b Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 22:21:26 +0530 Subject: [PATCH 15/19] Test 1.5.2 --- packages/website/pages/explore/[id].tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/explore/[id].tsx b/packages/website/pages/explore/[id].tsx index e897077..3779873 100644 --- a/packages/website/pages/explore/[id].tsx +++ b/packages/website/pages/explore/[id].tsx @@ -103,7 +103,7 @@ const SingleView = () => { bid:{ amount: utils.format.parseNearAmount(amount), bidder: accountId, - recipient: nft.owner?.id, + recipient: nft?.id, sell_on_share: parseInt(resale) * 100, currency: `near`, } From e1c748f2907a33b340ed2550561e36075ed59e49 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Fri, 4 Mar 2022 22:35:05 +0530 Subject: [PATCH 16/19] Test 1.5.3 --- packages/website/utils/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/utils/config.js b/packages/website/utils/config.js index ea62d5c..ea1dc50 100644 --- a/packages/website/utils/config.js +++ b/packages/website/utils/config.js @@ -1,3 +1,3 @@ -export const contractAddress = "test4.ashen99.testnet"; +export const contractAddress = "test5.ashen99.testnet"; export const graphUri = "https://api.thegraph.com/subgraphs/name/asheni99/graph_test"; From bf927de5b698c112ea67d52137644710e128db54 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Wed, 23 Mar 2022 15:03:44 +0530 Subject: [PATCH 17/19] test 1 --- packages/website/utils/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/utils/config.js b/packages/website/utils/config.js index ea1dc50..0407365 100644 --- a/packages/website/utils/config.js +++ b/packages/website/utils/config.js @@ -1,3 +1,3 @@ -export const contractAddress = "test5.ashen99.testnet"; +export const contractAddress = "test6.ashen99.testnet"; export const graphUri = "https://api.thegraph.com/subgraphs/name/asheni99/graph_test"; From 7a993e5730fb04d8635375d85d97ed3e57ced545 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Thu, 28 Apr 2022 19:47:55 +0530 Subject: [PATCH 18/19] minor fix --- packages/website/pages/create.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/create.tsx b/packages/website/pages/create.tsx index 339935a..b5918b7 100644 --- a/packages/website/pages/create.tsx +++ b/packages/website/pages/create.tsx @@ -117,7 +117,7 @@ const Create = () => { const token_royalty = { split_between: { - [metadata?.mint_royalty_id?.id]: metadata?.mint_royalty_amount, + [metadata?.mint_royalty_id?.id]: Number(metadata?.mint_royalty_amount), }, percentage: 10, }; From 8e4c15bfe2c009dc1e095611af54bf3bf9bba945 Mon Sep 17 00:00:00 2001 From: AshenI99 Date: Thu, 28 Apr 2022 20:47:34 +0530 Subject: [PATCH 19/19] minor fix --- packages/website/pages/explore/[id].tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/pages/explore/[id].tsx b/packages/website/pages/explore/[id].tsx index dc33f26..34392d8 100644 --- a/packages/website/pages/explore/[id].tsx +++ b/packages/website/pages/explore/[id].tsx @@ -216,7 +216,7 @@ const SingleView = () => { {accountId && }