Update mainnet accounts

piprate · Nov 17, 2024 · 71ef496 · 71ef496
1 parent 2b2a651
commit 71ef496
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ lib/go/iinft/bin
 
 # Flow emulator
 flowdb
+
+.keys
diff --git a/README.md b/README.md
@@ -11,9 +11,9 @@ The smart contracts are written in [Cadence](https://docs.onflow.org/cadence).
 
 | Contract          | Mainnet              | Testnet              |
 |-------------------|----------------------|----------------------|
-| Evergreen         | `0x3cb7ceeb625a600a` | `0x745b085dafdd4fc0` |
-| DigitalArt        | `0x3cb7ceeb625a600a` | `0x745b085dafdd4fc0` |
-| SequelMarketplace | `0x3cb7ceeb625a600a` | `0x745b085dafdd4fc0` |
+| Evergreen         | `0x9a02a1d17295f3e7` | `0xfdf325e9204fc94a` |
+| DigitalArt        | `0x9a02a1d17295f3e7` | `0xfdf325e9204fc94a` |
+| SequelMarketplace | `0x9a02a1d17295f3e7` | `0xfdf325e9204fc94a` |
 
 ## Contents
 

diff --git a/flow.json b/flow.json
@@ -26,22 +26,18 @@
 		"DigitalArt": {
 			"source": "./contracts/DigitalArt.cdc",
 			"aliases": {
-				"mainnet": "3cb7ceeb625a600a",
+				"mainnet": "9a02a1d17295f3e7",
 				"testnet": "fdf325e9204fc94a"
 			}
 		},
 		"Evergreen": {
 			"source": "./contracts/Evergreen.cdc",
 			"aliases": {
-				"mainnet": "3cb7ceeb625a600a",
+				"mainnet": "9a02a1d17295f3e7",
 				"testnet": "fdf325e9204fc94a"
 			}
 		},
-		"ExampleToken": {
-			"source": "./contracts/testing/ExampleToken.cdc",
-			"aliases": {
-			}
-		},
+		"ExampleToken": "./contracts/testing/ExampleToken.cdc",
 		"FlowToken": {
 			"source": "./contracts/standard/FlowToken.cdc",
 			"aliases": {
@@ -120,10 +116,18 @@
 		"SequelMarketplace": {
 			"source": "./contracts/SequelMarketplace.cdc",
 			"aliases": {
-				"mainnet": "3cb7ceeb625a600a",
+				"mainnet": "9a02a1d17295f3e7",
 				"testnet": "fdf325e9204fc94a"
 			}
 		},
+		"USDCFlow": {
+			"source": "",
+			"aliases": {
+				"mainnet": "f1ab99c82dee3526",
+				"testing": "0000000000000007",
+				"testnet": "64adf39cbc354fcb"
+			}
+		},
 		"ViewResolver": {
 			"source": "./contracts/standard/ViewResolver.cdc",
 			"aliases": {
@@ -132,13 +136,6 @@
 				"testing": "0000000000000001",
 				"testnet": "631e88ae7f1d7c20"
 			}
-		},
-		"USDCFlow": {
-			"aliases": {
-				"mainnet": "f1ab99c82dee3526",
-				"testing": "0000000000000007",
-				"testnet": "64adf39cbc354fcb"
-			}
 		}
 	},
 	"networks": {

diff --git a/flow.mainnet.json b/flow.mainnet.json
@@ -1,97 +1,133 @@
 {
   "contracts": {
-    "FungibleToken": {
-      "source": "./contracts/standard/FungibleToken.cdc",
+    "Art": {
+      "source": "./contracts/thirdparty/versus/Art.cdc",
+      "aliases": {
+        "mainnet": "d796ff17107bbff6",
+        "testnet": "99ca04281098b33d"
+      }
+    },
+    "Burner": {
+      "source": "./contracts/standard/Burner.cdc",
+      "aliases": {
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
+      }
+    },
+    "Content": {
+      "source": "./contracts/thirdparty/versus/Content.cdc",
       "aliases": {
-        "testnet": "0x9a0766d93b6608b7",
-        "mainnet" :"0xf233dcee88fe0abe"
+        "mainnet": "d796ff17107bbff6",
+        "testnet": "99ca04281098b33d"
       }
     },
     "FlowToken": {
       "source": "./contracts/standard/FlowToken.cdc",
       "aliases": {
-        "testnet": "0x7e60df042a9c0868",
-        "mainnet" : "0x1654653399040a61"
+        "mainnet": "1654653399040a61",
+        "testnet": "7e60df042a9c0868"
       }
     },
-    "NonFungibleToken": {
-      "source": "./contracts/standard/NonFungibleToken.cdc",
+    "FungibleToken": {
+      "source": "./contracts/standard/FungibleToken.cdc",
       "aliases": {
-        "testnet": "0x631e88ae7f1d7c20",
-        "mainnet": "0x1d7e57aa55817448"
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
       }
     },
-    "NFTStorefront": {
-      "source": "./contracts/standard/NFTStorefront.cdc",
+    "FungibleTokenMetadataViews": {
+      "source": "./contracts/standard/FungibleTokenMetadataViews.cdc",
+      "aliases": {
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
+      }
+    },
+    "FungibleTokenSwitchboard": {
+      "source": "./contracts/standard/FungibleTokenSwitchboard.cdc",
       "aliases": {
-        "testnet": "0x94b06cfca1d8a476",
-        "mainnet": "0x4eb8a10cb9f87357"
+        "mainnet": "f233dcee88fe0abe",
+        "testnet": "9a0766d93b6608b7"
       }
     },
     "MetadataViews": {
       "source": "./contracts/standard/MetadataViews.cdc",
       "aliases": {
-        "testnet": "0x631e88ae7f1d7c20",
-        "mainnet": "0x1d7e57aa55817448"
+        "mainnet": "1d7e57aa55817448",
+        "testnet": "631e88ae7f1d7c20"
       }
     },
-    "FungibleTokenSwitchboard": {
-      "source": "./contracts/standard/FungibleTokenSwitchboard.cdc",
+    "NFTCatalog": {
+      "source": "./contracts/thirdparty/nft_catalog/NFTCatalog.cdc",
+      "aliases": {
+        "mainnet": "49a7cda3a1eecc29",
+        "testnet": "324c34e1c517e4db"
+      }
+    },
+    "NFTRetrieval": {
+      "source": "./contracts/thirdparty/nft_catalog/NFTRetrieval.cdc",
       "aliases": {
-        "testnet": "0x745b085dafdd4fc0",
-        "mainnet": "0x3cb7ceeb625a600a"
+        "mainnet": "49a7cda3a1eecc29",
+        "testnet": "324c34e1c517e4db"
       }
     },
-    "FUSD": {
-      "source": "./contracts/standard/FUSD.cdc",
+    "NFTStorefront": {
+      "source": "./contracts/standard/NFTStorefront.cdc",
       "aliases": {
-        "testnet": "0xe223d8a629e49c68",
-        "mainnet": "0x3c5959b568896393"
+        "mainnet": "4eb8a10cb9f87357",
+        "testnet": "94b06cfca1d8a476"
       }
     },
-    "Evergreen": {
-      "source": "./contracts/Evergreen.cdc",
+    "NonFungibleToken": {
+      "source": "./contracts/standard/NonFungibleToken.cdc",
       "aliases": {
-        "testnet": "0x745b085dafdd4fc0",
-        "mainnet": "0x3cb7ceeb625a600a"
+        "mainnet": "1d7e57aa55817448",
+        "testnet": "631e88ae7f1d7c20"
       }
     },
-    "DigitalArt": {
-      "source": "./contracts/DigitalArt.cdc",
+    "USDCFlow": {
+      "source": "",
       "aliases": {
-        "testnet": "0x745b085dafdd4fc0",
-        "mainnet": "0x3cb7ceeb625a600a"
+        "mainnet": "f1ab99c82dee3526",
+        "testnet": "64adf39cbc354fcb"
       }
     },
-    "SequelMarketplace": {
-      "source": "./contracts/SequelMarketplace.cdc",
+    "ViewResolver": {
+      "source": "./contracts/standard/ViewResolver.cdc",
       "aliases": {
-        "testnet": "0x745b085dafdd4fc0",
-        "mainnet": "0x3cb7ceeb625a600a"
+        "mainnet": "1d7e57aa55817448",
+        "testnet": "631e88ae7f1d7c20"
       }
-    }
+    },
+    "Evergreen": "./contracts/Evergreen.cdc",
+    "DigitalArt": "./contracts/DigitalArt.cdc",
+    "SequelMarketplace": "./contracts/SequelMarketplace.cdc"
   },
   "networks": {
     "mainnet": "access.mainnet.nodes.onflow.org:9000",
     "testnet": "access.devnet.nodes.onflow.org:9000"
   },
   "accounts": {
     "mainnet-sequel-admin": {
-      "address": "0x3cb7ceeb625a600a",
-      "key": "${MAINNET_SEQUEL_ADMIN}"
+      "address": "9a02a1d17295f3e7",
+      "key": {
+        "type": "file",
+        "location": ".keys/mainnet-sequel-admin.pkey"
+      }
     },
     "mainnet-sequel-platform" : {
-      "address": "0xdaa82f4d11943b81",
-      "key": "${MAINNET_SEQUEL_PLATFORM}"
+      "address": "3be013520d983043",
+      "key": {
+        "type": "file",
+        "location": ".keys/mainnet-sequel-platform.pkey"
+      }
     }
   },
   "deployments": {
     "mainnet": {
       "mainnet-sequel-admin": [
         "Evergreen",
         "DigitalArt",
-        "SequelMarketplace",
-        "FungibleTokenSwitchboard"
+        "SequelMarketplace"
       ]
     }
   }

diff --git a/flow.testnet.json b/flow.testnet.json
@@ -84,19 +84,20 @@
         "testnet": "631e88ae7f1d7c20"
       }
     },
+    "USDCFlow": {
+      "source": "",
+      "aliases": {
+        "mainnet": "f1ab99c82dee3526",
+        "testnet": "64adf39cbc354fcb"
+      }
+    },
     "ViewResolver": {
       "source": "./contracts/standard/ViewResolver.cdc",
       "aliases": {
         "mainnet": "1d7e57aa55817448",
         "testnet": "631e88ae7f1d7c20"
       }
     },
-    "USDCFlow": {
-      "aliases": {
-        "mainnet": "f1ab99c82dee3526",
-        "testnet": "64adf39cbc354fcb"
-      }
-    },
     "Evergreen": "./contracts/Evergreen.cdc",
     "DigitalArt": "./contracts/DigitalArt.cdc",
     "SequelMarketplace": "./contracts/SequelMarketplace.cdc"

diff --git a/scripts/get_flow_balance.cdc b/scripts/get_flow_balance.cdc
@@ -1,13 +1,10 @@
-import FungibleToken from "../contracts/standard/FungibleToken.cdc"
 import FlowToken from "../contracts/standard/FlowToken.cdc"
 
-pub fun main(address: Address): UFix64 {
-  let account = getAccount(address)
+access(all) fun main(account: Address): UFix64 {
 
-  let vaultRef = account
-    .getCapability(/public/flowTokenBalance)
-    .borrow<&FlowToken.Vault{FungibleToken.Balance}>()
-    ?? panic("Cannot borrow FlowToken vault from acct storage")
+    let vaultRef = getAccount(account)
+        .capabilities.borrow<&FlowToken.Vault>(/public/flowTokenBalance)
+        ?? panic("Could not borrow Balance reference to the Vault")
 
-  return vaultRef.balance
+    return vaultRef.balance
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,3 +29,5 @@ lib/go/iinft/bin

		# Flow emulator
		flowdb

		.keys