From ff5c6c3e112c2a297254f9c38db960506ea8d22f Mon Sep 17 00:00:00 2001 From: Alicia Gansley Date: Fri, 27 Sep 2024 11:46:54 -0400 Subject: [PATCH 1/2] Change minted on floor.fun to minted on rally.xyz for zora mint comments --- scripts/floornfts | 1 + src/ingestors/zora-internal/zora-metadata.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 scripts/floornfts diff --git a/scripts/floornfts b/scripts/floornfts new file mode 160000 index 0000000..d6027b6 --- /dev/null +++ b/scripts/floornfts @@ -0,0 +1 @@ +Subproject commit d6027b6b92690115b7efa4d39dc0391fc2172aa0 diff --git a/src/ingestors/zora-internal/zora-metadata.ts b/src/ingestors/zora-internal/zora-metadata.ts index e80bb5e..59df4d4 100644 --- a/src/ingestors/zora-internal/zora-metadata.ts +++ b/src/ingestors/zora-internal/zora-metadata.ts @@ -141,7 +141,7 @@ export class ZoraMetadataProvider { const mintFeePerTokenWei = mintPriceWei; if (mintType === 'ZORA_TIMED') { //mint(address mintTo, uint256 quantity, address collection, uint256 tokenId, address mintReferral, string comment) - params = `[address, quantity, "${tokenDetails.collection.address}", tokenId, "${FLOOR_REFERRER_REWARDS_ADDRESS}", "Minted on floor.fun"]`; + params = `[address, quantity, "${tokenDetails.collection.address}", tokenId, "${FLOOR_REFERRER_REWARDS_ADDRESS}", "Minted on rally.xyz"]`; contractAddress = ZORA_TIMED_MINT_STRATEGY_ADDRESS; method = 'mint'; abi = ZORA_TIMED_MINT_ABI; From 5fd7f68162f53e24a1a4237f528c4e2f6358128b Mon Sep 17 00:00:00 2001 From: Alicia Gansley Date: Mon, 30 Sep 2024 17:23:32 -0400 Subject: [PATCH 2/2] Removing scripts submodule --- scripts/.gitignore | 1 - scripts/clones/.gitkeep | 0 scripts/{ => clones}/floornfts | 0 scripts/test-fork.sh | 58 ---------------------------------- 4 files changed, 59 deletions(-) delete mode 100644 scripts/.gitignore delete mode 100644 scripts/clones/.gitkeep rename scripts/{ => clones}/floornfts (100%) delete mode 100755 scripts/test-fork.sh diff --git a/scripts/.gitignore b/scripts/.gitignore deleted file mode 100644 index 6f2c5c0..0000000 --- a/scripts/.gitignore +++ /dev/null @@ -1 +0,0 @@ -clones/ \ No newline at end of file diff --git a/scripts/clones/.gitkeep b/scripts/clones/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/scripts/floornfts b/scripts/clones/floornfts similarity index 100% rename from scripts/floornfts rename to scripts/clones/floornfts diff --git a/scripts/test-fork.sh b/scripts/test-fork.sh deleted file mode 100755 index 35e1cdf..0000000 --- a/scripts/test-fork.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then - echo "Usage: $0 [branch-name]" - exit 1 -fi - -# if the URL is of the format https://github.com/pbkompasz/mobile-minting/tree/ingestor-highlight then pull both the branch name and the repo name -if [[ $1 == *"tree"* ]]; then - BRANCH_NAME=$(echo $1 | cut -d'/' -f7) - REPO_NAME=$(echo $1 | cut -d'/' -f5) - - # remove the tree part from the URL - GIT_URL=$(echo $1 | cut -d'/' -f1-5) - GIT_URL="$GIT_URL" -else - GIT_URL=$1 - BRANCH_NAME=${2:-main} -fi - -echo "GIT_URL: $GIT_URL" -echo "BRANCH_NAME: $BRANCH_NAME" - -ORG_NAME=$(basename $(dirname $GIT_URL) .git) - -echo "ORG_NAME: $ORG_NAME" - -cd clones - -# if the folder name exists, delete it -if [ -d $ORG_NAME ]; then - rm -rf $ORG_NAME -fi - -# Clone the fork into a directory with the name of the organization the fork is in -git clone $GIT_URL $ORG_NAME -cd $ORG_NAME - -# Move to the specified branch -git checkout $BRANCH_NAME - -# Install dependencies -yarn install - -# Add the floornfts/mobile-minting repo as a remote "floor" -git remote add floor https://github.com/floornfts/mobile-minting.git - -# Fetch the remote "floor" -git fetch floor - -# Merge main from "floor" into the current branch -git merge floor/main --no-edit - -# copy the .env.example file to .env -cp ../../../.env .env - -# Run tests -yarn test