Update to latest Gold Star contracts & deploy mainnet (#1118)

Author: jribbink

.gitignore

@@ -40,4 +40,5 @@ docs/.obsidian
 # flow
 imports
 
-goldstar-testnet.pkey
+goldstar-testnet.pkey
+goldstar-mainnet.pkey

flow.json

@@ -12,14 +12,14 @@
         "testing": "0000000000000007"
       }
     },
-    "ManualChallenge": {
-      "source": "./src/cadence/contracts/ManualChallenge.cdc",
+    "LearnFlowChallenge": {
+      "source": "./src/cadence/contracts/LearnFlowChallenge.cdc",
       "aliases": {
         "testing": "0000000000000007"
       }
     },
-    "NoopChallenge": {
-      "source": "./src/cadence/contracts/NoopChallenge.cdc",
+    "ManualChallenge": {
+      "source": "./src/cadence/contracts/ManualChallenge.cdc",
       "aliases": {
         "testing": "0000000000000007"
       }
@@ -104,17 +104,27 @@
         "location": "emulator-account.pkey"
       }
     },
+    "goldstar-mainnet": {
+      "address": "e99f9883203ff565",
+      "key": {
+        "type": "file",
+        "location": "goldstar-mainnet.pkey"
+      }
+    },
     "goldstar-testnet": {
-      "address": "441ea660554acb42",
+      "address": "032b0464e2e8fccc",
       "key": {
         "type": "file",
         "location": "goldstar-testnet.pkey"
       }
     }
   },
   "deployments": {
+    "mainnet": {
+      "goldstar-mainnet": ["GoldStar", "LearnFlowChallenge"]
+    },
     "testnet": {
-      "goldstar-testnet": ["GoldStar", "NoopChallenge"]
+      "goldstar-testnet": ["GoldStar", "LearnFlowChallenge"]
     }
   }
 }

src/cadence/contracts/GoldStar.cdc

@@ -10,9 +10,6 @@ contract GoldStar {
     access(all)
     let adminStoragePath: StoragePath
 
-    access(all)
-    entitlement Owner
-
     access(all)
     entitlement UpdateHandle
 
@@ -94,7 +91,7 @@ contract GoldStar {
         access(all)
         var evmContracts: {String: Bool}
 
-        access(Owner | UpdateDeployedContracts)
+        access(UpdateDeployedContracts)
         fun addCadenceContract(address: Address, name: String) {
             if let names = self.cadenceContracts[address] {
                 names[name] = true
@@ -103,13 +100,13 @@ contract GoldStar {
             }
         }
 
-        access(Owner | UpdateDeployedContracts)
+        access(UpdateDeployedContracts)
         fun addEvmContract(address: [UInt8; 20]) {
             var addressString = String.encodeHex(address.toVariableSized())
             self.evmContracts[addressString] = true
         }
 
-        access(Owner | UpdateDeployedContracts)
+        access(UpdateDeployedContracts)
         fun removeCadenceContract(address: Address, name: String) {
             if let names = self.cadenceContracts[address] {
                 names.remove(key: name)
@@ -119,7 +116,7 @@ contract GoldStar {
             }
         }
 
-        access(Owner | UpdateDeployedContracts)
+        access(UpdateDeployedContracts)
         fun removeEvmContract(address: [UInt8; 20]) {
             var addressString = String.encodeHex(address.toVariableSized())
             self.evmContracts.remove(key: addressString)
@@ -136,12 +133,12 @@ contract GoldStar {
         access(all)
         var socials: {String: String}
 
-        access(Owner | UpdateSocials)
+        access(UpdateSocials)
         fun set(name: String, handle: String) {
             self.socials[name] = handle
         }
 
-        access(Owner | UpdateSocials)
+        access(UpdateSocials)
         fun remove(name: String) {
             self.socials.remove(key: name)
         }
@@ -156,14 +153,14 @@ contract GoldStar {
         access(all)
         var submissions: @{Type: {Submission}}
 
-        access(Owner | UpdateSubmissions)
+        access(UpdateSubmissions)
         fun add(_ submission: @{Submission}, challengeType: Type): &{Submission} {
             self.submissions[challengeType] <-! submission
             let ref = &self.submissions[challengeType] as &{Submission}?
             return ref!
         }
 
-        access(Owner | UpdateSubmissions)
+        access(UpdateSubmissions)
         fun remove(challengeType: Type): @{Submission}? {
             return <-self.submissions.remove(key: challengeType)
         }

src/cadence/contracts/NoopChallenge.cdc renamed to src/cadence/contracts/LearnFlowChallenge.cdc

@@ -1,7 +1,7 @@
 import "GoldStar"
 
 access(all)
-contract NoopChallenge {
+contract LearnFlowChallenge {
 
     access(all)
     resource Challenge: GoldStar.Challenge {
@@ -13,8 +13,8 @@ contract NoopChallenge {
         let description: String
 
         init() {
-            self.name = "NOOP Challenge"
-            self.description = "Nothing required for this challenge. All submissions are accepted."
+            self.name = "Learn Flow"
+            self.description = "Committed to learning and exploring Flow."
         }
 
         access(all)

src/cadence/transactions/NoopChallenge/AddChallenge.cdc renamed to src/cadence/transactions/LearnFlowChallenge/AddChallenge.cdc

@@ -1,5 +1,5 @@
 import "GoldStar"
-import "NoopChallenge"
+import "LearnFlowChallenge"
 
 transaction {
     let admin: &GoldStar.Admin
@@ -10,10 +10,10 @@ transaction {
     }
 
     execute {
-        if GoldStar.challenges[Type<@NoopChallenge.Challenge>()] != nil {
+        if GoldStar.challenges[Type<@LearnFlowChallenge.Challenge>()] != nil {
             return
         }
-        let challenge <- NoopChallenge.createChallenge()
+        let challenge <- LearnFlowChallenge.createChallenge()
         self.admin.addChallenge(<-challenge)
     }
 

src/cadence/transactions/NoopChallenge/Evaluate.cdc renamed to src/cadence/transactions/LearnFlowChallenge/Evaluate.cdc

@@ -1,5 +1,5 @@
 import "GoldStar"
-import "NoopChallenge"
+import "LearnFlowChallenge"
 
 transaction {
     let challengeType: Type
@@ -10,8 +10,8 @@ transaction {
             .borrow<auth(GoldStar.UpdateSubmissions) &GoldStar.Profile>(from: GoldStar.profileStoragePath)
             ?? panic("could not borrow reference to the Profile resource")
 
-        let submission <- NoopChallenge.createSubmission()
-        self.challengeType = Type<@NoopChallenge.Challenge>()
+        let submission <- LearnFlowChallenge.createSubmission()
+        self.challengeType = Type<@LearnFlowChallenge.Challenge>()
         self.submission = profile.submissions.add(
             <-submission,
             challengeType: self.challengeType

src/components/ChallengeModal.tsx

@@ -3,7 +3,7 @@ import { Button } from '../ui/design-system/src/lib/Components/Button';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faBrain } from '@fortawesome/free-solid-svg-icons';
 import Modal from '@site/src/ui/design-system/src/lib/Components/Modal';
-import { submitNoopChallenge } from '../utils/gold-star';
+import { submitLearnFlowChallenge } from '../utils/gold-star';
 import * as fcl from '@onflow/fcl';
 import { useProfile } from '../hooks/use-profile';
 import { useCurrentUser } from '../hooks/use-current-user';
@@ -21,7 +21,7 @@ const ChallengeModal: React.FC<{
   const completeChallenge = async () => {
     setTxStatus('Pending Approval...');
     try {
-      const txId = await submitNoopChallenge();
+      const txId = await submitLearnFlowChallenge();
 
       setTxStatus('Submitting Challenge...');
 
@@ -39,7 +39,9 @@ const ChallengeModal: React.FC<{
           {
             ...profile,
             submissions: {
-              [getChallengeIdentifier(GOLD_STAR_CHALLENGES.NOOP_CHALLENGE)]: {
+              [getChallengeIdentifier(
+                GOLD_STAR_CHALLENGES.LEARN_FLOW_CHALLENGE,
+              )]: {
                 completed: true,
               },
             },

src/hooks/use-progress.ts

@@ -41,7 +41,7 @@ export function useProgress() {
       completed:
         profile &&
         profile.submissions?.[
-          getChallengeIdentifier(GOLD_STAR_CHALLENGES.NOOP_CHALLENGE)
+          getChallengeIdentifier(GOLD_STAR_CHALLENGES.LEARN_FLOW_CHALLENGE)
         ]?.completed,
     },
   ] as ProgressItem[];

src/utils/constants.tsx

@@ -56,8 +56,8 @@ export const DISCORD_ANNOUNCEMENTS_CHANNEL_ID = '621529603718119424';
 export const DISCORD_DEV_UPDATES_CHANNEL_ID = '811693600403357706';
 
 export const GOLD_STAR_CHALLENGES = {
-  NOOP_CHALLENGE: {
-    contractName: 'NoopChallenge',
+  LEARN_FLOW_CHALLENGE: {
+    contractName: 'LearnFlowChallenge',
     resourceIdentifier: 'Challenge',
   },
 };

src/utils/gold-star.ts

@@ -2,7 +2,7 @@ import GetChallenges from '../cadence/scripts/GetChallenges.cdc';
 import GetProfile from '../cadence/scripts/GetProfile.cdc';
 import CreateProfile from '../cadence/transactions/GoldStar/CreateProfile.cdc';
 import UpdateProfile from '../cadence/transactions/GoldStar/UpdateProfile.cdc';
-import Evaluate from '../cadence/transactions/NoopChallenge/Evaluate.cdc';
+import Evaluate from '../cadence/transactions/LearnFlowChallenge/Evaluate.cdc';
 
 import * as fcl from '@onflow/fcl';
 import {
@@ -137,10 +137,10 @@ export const setProfile = async (profile: ProfileSettings) => {
 };
 
 /**
- * Submit a noop challenge
+ * Submit "Learn Flow" challenge
  * @returns The transaction ID
  */
-export const submitNoopChallenge = async () => {
+export const submitLearnFlowChallenge = async () => {
   return await fcl.mutate({
     cadence: Evaluate,
   });