Merge pull request #923 from tablelandnetwork/sander/deploy-missions

Deploy missions
tablelandnetwork · Sep 20, 2023 · e401214 · e401214
2 parents 9a61b91 + 2c78e43
commit e401214
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 24 deletions.
diff --git a/animation_url/package-lock.json b/animation_url/package-lock.json
diff --git a/animation_url/package.json b/animation_url/package.json
@@ -16,7 +16,7 @@
     "@playwright/test": "^1.27.1",
     "@sveltejs/adapter-auto": "^1.0.0-next.87",
     "@sveltejs/kit": "1.0.0-next.532",
-    "@tableland/rigs": "^0.3.2",
+    "@tableland/rigs": "^0.3.3",
     "@tableland/sdk": "^4.3.2",
     "@typescript-eslint/eslint-plugin": "^5.49.0",
     "@typescript-eslint/parser": "^5.59.1",

diff --git a/ethereum/deployments.ts b/ethereum/deployments.ts
@@ -52,7 +52,7 @@ export const deployments: RigsDeployments = {
     royaltyContractAddress: "0x9BE9627e25c9f348C1edB6E46dBCa2a6669e2D56",
     pilotsAddress: "0xFe688e894AAA2A8F4740d09DA8c434Eb0B1AFb5D",
     votingContractAddress: "0xE9Fb4f78f23457F69f516c6806E5C9e8756C8c57",
-    missionContractAddress: "", // TODO fill in
+    missionContractAddress: "0x486dDBd9D085a4a8252A156AB96ec5763b3dF9B4",
     tablelandChain: "arbitrum",
     tablelandHost: "https://tableland.network",
     contractTable: "rigs_contract_42161_12",
@@ -69,8 +69,8 @@ export const deployments: RigsDeployments = {
     ftSnapshotTable: "ft_snapshot_42161_20",
     votesTable: "votes_42161_21",
     optionsTable: "options_42161_22",
-    missionsTable: "", // TODO fill in
-    missionContributionsTable: "", // TODO fill in
+    missionsTable: "missions_42161_23",
+    missionContributionsTable: "mission_contributions_42161_24",
     displayAttributes: true,
   },
   // testnets

diff --git a/ethereum/package-lock.json b/ethereum/package-lock.json
diff --git a/ethereum/package.json b/ethereum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tableland/rigs",
-  "version": "0.3.3-pre0",
+  "version": "0.3.3",
   "description": "Tableland Rigs contract",
   "engines": {
     "node": ">=14.0.0"

diff --git a/ethereum/scripts/deployMissionBoard.ts b/ethereum/scripts/deployMissionBoard.ts
@@ -1,4 +1,4 @@
-import { ethers, network, rigsConfig, rigsDeployment, mainnet } from "hardhat";
+import { ethers, network, rigsConfig, mainnet } from "hardhat";
 import { Wallet, providers, Signer, BigNumber } from "ethers";
 import type { MissionsManager } from "../typechain-types";
 import { Database } from "@tableland/sdk";
@@ -28,10 +28,9 @@ async function main() {
     throw Error("missing signer/Tableland private key");
   }
 
-  if (tablesConfig.tablelandAlchemyKey) {
-    const provider = new providers.AlchemyProvider(
-      rigsDeployment.tablelandChain,
-      tablesConfig.tablelandAlchemyKey
+  if (tablesConfig.tablelandProviderUrl) {
+    const provider = new providers.JsonRpcProvider(
+      tablesConfig.tablelandProviderUrl
     );
     signer = signer.connect(provider);
   }

diff --git a/ethereum/scripts/verify.ts b/ethereum/scripts/verify.ts
@@ -24,6 +24,9 @@ async function main() {
   if (rigsDeployment.votingContractAddress === "") {
     throw Error(`no votingContractAddress entry for '${network.name}'`);
   }
+  if (rigsDeployment.missionContractAddress === "") {
+    throw Error(`no missionContractAddress entry for '${network.name}'`);
+  }
 
   // Verify rigs
   const rigs = (await ethers.getContractFactory("TablelandRigs")).attach(

diff --git a/garage/package-lock.json b/garage/package-lock.json
diff --git a/garage/package.json b/garage/package.json
@@ -14,7 +14,7 @@
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@rainbow-me/rainbowkit": "^1.0.3",
-    "@tableland/rigs": "^0.3.3-pre0",
+    "@tableland/rigs": "^0.3.3",
     "@tableland/sdk": "^4.4.2",
     "alchemy-sdk": "^2.8.3",
     "chakra-react-select": "^4.4.2",