Bulk Silver Withdraw

client/src/Backend/GameLogic/ContractsAPI.ts

@@ -666,7 +666,10 @@ export class ContractsAPI extends EventEmitter {
   public async getPlayerById(playerId: EthAddress): Promise<Player | undefined> {
     const rawPlayer = await this.makeCall(this.contract.players, [playerId]);
     if (!rawPlayer.isInitialized) return undefined;
-    const player = decodePlayer(rawPlayer);
+    // This is horrible and unsustainable. We need some way to get Player + Silver token balance for
+    // bulk players as well.
+    const balance = await this.makeCall(this.contract.getSilverBalance, [playerId]);
+    const player = decodePlayer(rawPlayer, balance.toNumber());
 
     return player;
   }

client/src/Backend/GameLogic/GameManager.ts

@@ -2429,7 +2429,6 @@ class GameManager extends EventEmitter {
 
   public async withdrawSilver(
     locationId: LocationId,
-    amount: number,
     bypassChecks = false
   ): Promise<Transaction<UnconfirmedWithdrawSilver>> {
     try {
@@ -2442,21 +2441,15 @@ class GameManager extends EventEmitter {
         if (!planet) {
           throw new Error('tried to withdraw silver from an unknown planet');
         }
-        if (planet.planetType !== PlanetType.TRADING_POST) {
-          throw new Error('can only withdraw silver from spacetime rips');
+        if (planet.planetType !== PlanetType.SILVER_MINE) {
+          throw new Error('can only withdraw silver from asteroid');
         }
         if (planet.owner !== this.account) {
           throw new Error('can only withdraw silver from a planet you own');
         }
         if (planet.transactions?.hasTransaction(isUnconfirmedWithdrawSilverTx)) {
           throw new Error('a withdraw silver action is already in progress for this planet');
         }
-        if (amount > planet.silver) {
-          throw new Error('not enough silver to withdraw!');
-        }
-        if (amount === 0) {
-          throw new Error('must withdraw more than 0 silver!');
-        }
         if (planet.destroyed) {
           throw new Error("can't withdraw silver from a destroyed planet");
         }
@@ -2467,9 +2460,8 @@ class GameManager extends EventEmitter {
       const txIntent: UnconfirmedWithdrawSilver = {
         methodName: 'withdrawSilver',
         contract: this.contractsAPI.contract,
-        args: Promise.resolve([locationIdToDecStr(locationId), amount * CONTRACT_PRECISION]),
+        args: Promise.resolve([locationIdToDecStr(locationId)]),
         locationId,
-        amount,
       };
 
       // Always await the submitTransaction so we can catch rejections

client/src/Backend/GameLogic/GameUIManager.ts

@@ -397,18 +397,8 @@ class GameUIManager extends EventEmitter {
     this.gameManager.deactivateArtifact(locationId, artifactId);
   }
 
-  public withdrawSilver(locationId: LocationId, amount: number) {
-    const dontShowWarningStorageKey = `${this.getAccount()?.toLowerCase()}-withdrawnWarningAcked`;
-
-    if (localStorage.getItem(dontShowWarningStorageKey) !== 'true') {
-      localStorage.setItem(dontShowWarningStorageKey, 'true');
-      const confirmationText =
-        `Are you sure you want withdraw this silver? Once you withdraw it, you ` +
-        `cannot deposit it again. Your withdrawn silver amount will be added to your score. You'll only see this warning once!`;
-      if (!confirm(confirmationText)) return;
-    }
-
-    this.gameManager.withdrawSilver(locationId, amount);
+  public withdrawSilver(locationId: LocationId) {
+    this.gameManager.withdrawSilver(locationId);
   }
 
   public startWormholeFrom(planet: LocatablePlanet): Promise<LocatablePlanet | undefined> {

client/src/Frontend/Components/OpenPaneButtons.tsx

@@ -133,7 +133,7 @@ export function OpenPlanetInfoButton({
   return (
     <OpenPaneButton
       modal={modal}
-      title='Info'
+      title='More Info'
       shortcut={TOGGLE_PLANET_INFO_PANE}
       element={() => <PlanetInfoPane initialPlanetId={planetId} />}
       helpContent={PlanetInfoHelpContent()}

client/src/Frontend/Panes/PlanetContextPane.tsx

@@ -6,8 +6,6 @@ import { CapturePlanetButton } from '../Components/CapturePlanetButton';
 import { VerticalSplit } from '../Components/CoreUI';
 import { MineArtifactButton } from '../Components/MineArtifactButton';
 import {
-  OpenBroadcastPaneButton,
-  OpenHatPaneButton,
   OpenManagePlanetInventoryButton,
   OpenPlanetInfoButton,
   OpenUpgradeDetailsPaneButton,
@@ -53,15 +51,10 @@ function PlanetContextPaneContent({
   }
 
   let upgradeRow = null;
-  if (!p?.destroyed && owned) {
+  if (!p?.destroyed && owned && p?.planetType == PlanetType.PLANET) {
     upgradeRow = <OpenUpgradeDetailsPaneButton modal={modal} planetId={p?.locationId} />;
   }
 
-  let hatRow = null;
-  if (!p?.destroyed && owned) {
-    hatRow = <OpenHatPaneButton modal={modal} planetId={p?.locationId} />;
-  }
-
   let withdrawRow = null;
   if (!p?.destroyed && owned && p?.planetType === PlanetType.TRADING_POST) {
     withdrawRow = <WithdrawSilver wrapper={planet} />;
@@ -86,12 +79,10 @@ function PlanetContextPaneContent({
       <VerticalSplit>
         <>
           {upgradeRow}
-          <OpenBroadcastPaneButton modal={modal} planetId={p?.locationId} />
           <OpenPlanetInfoButton modal={modal} planetId={p?.locationId} />
         </>
         <>
           <OpenManagePlanetInventoryButton modal={modal} planetId={p?.locationId} />
-          {hatRow}
         </>
       </VerticalSplit>
       {withdrawRow}

client/src/Frontend/Utils/ShortcutConstants.ts

@@ -14,6 +14,7 @@ export const TOGGLE_TRANSACTIONS_PANE = "'";
 export const TOGGLE_PLANET_INVENTORY_PANE = 's';
 export const TOGGLE_HAT_PANE = 'x';
 export const TOGGLE_ABANDON = 'r';
+export const TOGGLE_WITHDRAW = ']';
 export const INVADE = 'y';
 export const MINE_ARTIFACT = 'f';
 export const TOGGLE_BROADCAST_PANE = 'z';

client/src/Frontend/Views/ArtifactRow.tsx

@@ -104,18 +104,25 @@ export function SelectArtifactRow({
   artifacts: Artifact[];
 }) {
   return (
-    <RowWrapper>
-      {artifacts.length > 0 &&
-        artifacts.map((a) => (
-          <span key={a.id}>
-            <ArtifactThumb
-              artifact={a}
-              selectedArtifact={selectedArtifact}
-              onArtifactChange={onArtifactChange}
-            />
-            <Spacer width={4} />
-          </span>
-        ))}
-    </RowWrapper>
+    <div
+      style={{
+        display: 'flex',
+        justifyContent: 'space-between',
+      }}
+    >
+      <RowWrapper>
+        {artifacts.length > 0 &&
+          artifacts.map((a) => (
+            <span key={a.id}>
+              <ArtifactThumb
+                artifact={a}
+                selectedArtifact={selectedArtifact}
+                onArtifactChange={onArtifactChange}
+              />
+              <Spacer width={4} />
+            </span>
+          ))}
+      </RowWrapper>
+    </div>
   );
 }