Update dApp to work with the single-asset balance model.

README.md

@@ -10,25 +10,10 @@ backed by smart contracts on Stellar.
 ### Dependencies
 
 1. `soroban-cli v0.3.3`. See https://soroban.stellar.org/docs/getting-started/setup#install-the-soroban-cli
-2. `docker` for Standalone and Futurenet backends.
+2. `docker` (both Standalone and Futurenet backends require it).
 3. `Node.js v17`
 4. `Freighter wallet v2.9.1`. Download it from https://github.com/stellar/freighter/releases/tag/2.9.1 and Enable "Experimental Mode" in the settings (gear icon).
 
-### Backend (Local Sandbox)
-
-1. Run the backend with `soroban serve`
-2. Run `./initialize.sh sandbox` to load the contracts and initialize it.
-  - Note: this will create a `.soroban` sub-directory, to contain the sandbox
-    network data.
-3. Add the Sandbox custom network in Freighter
-    |   |   |
-    |---|---|
-    | Name | Sandbox |
-    | URL | http://localhost:8000/soroban/rpc |
-    | Passphrase | Local Sandbox Stellar Network ; September 2022 |
-    | Allow HTTP connection | Enabled |
-    | Switch to this network | Enabled |
-
 ### Backend (Local Standalone Network)
 
 1. Run the backend docker container with `./quickstart.sh standalone`, and wait for it to start.

components/molecules/form-pledge/index.tsx

@@ -2,6 +2,7 @@ import React, { FunctionComponent, useState } from 'react'
 import { AmountInput, Button, Checkbox } from '../../atoms'
 import { TransactionModal } from '../../molecules/transaction-modal'
 import styles from './style.module.css'
+import { getPublicKey } from "@stellar/freighter-api"
 import {
   useContractValue,
   useNetwork,
@@ -10,7 +11,6 @@ import {
 import * as SorobanClient from 'soroban-client'
 import BigNumber from 'bignumber.js'
 import * as convert from '../../../convert'
-import { Account } from 'soroban-client'
 import { Constants } from '../../../shared/constants'
 import { accountIdentifier, contractIdentifier } from '../../../shared/identifiers'
 import { Spacer } from '../../atoms/spacer'
@@ -43,6 +43,7 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
   const user = accountIdentifier(
     SorobanClient.StrKey.decodeEd25519PublicKey(props.account)
   )
+
   const spender = contractIdentifier(Buffer.from(props.crowdfundId, 'hex'))
   const allowanceScval = useContractValue(
     props.tokenId,
@@ -79,9 +80,7 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
       xdr.ScObject.scoVec([xdr.ScVal.scvSymbol('Invoker')])
     )
     let nonce = convert.bigNumberToI128(BigNumber(0))
-    const amountScVal = convert.bigNumberToI128(
-      parsedAmount.shiftedBy(props.decimals).decimalPlaces(0)
-    )
+    const amountScVal = convert.bigNumberToI128(parsedAmount)
 
     try {
       if (needsApproval) {
@@ -90,8 +89,11 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
           props.networkPassphrase,
           source,
           props.tokenId,
-          'approve',
-          invoker,
+          // We shouldn't need to track the allowance first, because this should
+          // be unique to the spender and will naturally decr appropriately when
+          // we call deposit later.
+          'incr_allow',
+          invoker, // isn't this supposed to be a Signature, but it's Obj(Vec(["Invoker"]))???
           nonce,
           spender,
           amountScVal
@@ -138,7 +140,9 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
     method: string,
     ...params: SorobanClient.xdr.ScVal[]
   ): SorobanClient.Transaction {
+    console.log("1")
     const contract = new SorobanClient.Contract(contractId)
+    console.log("2:", arguments)
     return new SorobanClient.TransactionBuilder(source, {
       // TODO: Figure out the fee
       fee: '100',
@@ -231,40 +235,87 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
 
     const amount = BigNumber(100)
 
-    // TODO: Check and handle approval
     return (
       <Button
-        title={`Mint ${amount.decimalPlaces(decimals).toString()} ${symbol}`}
+        title={`Mint ${amount.decimalPlaces(7).toString()} ${symbol}`}
         onClick={async () => {
           setSubmitting(true)
 
           if (!server) throw new Error("Not connected to server")
 
-          let { sequence } = await server.getAccount(Constants.TokenAdmin)
-          let source = new SorobanClient.Account(Constants.TokenAdmin, sequence)
-          let invoker = xdr.ScVal.scvObject(
-            xdr.ScObject.scoVec([xdr.ScVal.scvSymbol('Invoker')])
-          )
-          let nonce = convert.bigNumberToI128(BigNumber(0))
-          const recipient = accountIdentifier(
-            SorobanClient.StrKey.decodeEd25519PublicKey(account)
-          )
-          const amountScVal = convert.bigNumberToI128(
-            amount.shiftedBy(decimals).decimalPlaces(0)
-          )
-          let mint = contractTransaction(
-            networkPassphrase,
-            source,
-            props.tokenId,
-            'mint',
-            invoker,
-            nonce,
-            recipient,
-            amountScVal
-          )
-          let result = await sendTransaction(mint, { secretKey: Constants.TokenAdminSecretKey })
-          // TODO: Show some user feedback while we are awaiting, and then based on the result
-          console.debug(result)
+          let { sequence, balances } = await server.getAccount(Constants.TokenAdmin)
+          let adminSource = new SorobanClient.Account(Constants.TokenAdmin, sequence)
+
+          let wallet = await getPublicKey().then((pk) => server.getAccount(pk))
+          let walletSource = new SorobanClient.Account(wallet.id, wallet.sequence)
+
+          //
+          // 1. Establish a trustline to the admin (if necessary)
+          // 2. The admin sends us money (mint)
+          //
+          // We have to do this in two separate transactions because one
+          // requires approval from Freighter while the other can be done with
+          // the stored token issuer's secret key.
+          //
+          // FIXME: The `getAccount()` RPC endpoint doesn't return balance
+          //        information, so we never know whether or not the user needs
+          //        a trustline to receive the minted asset.
+          //
+          // if (!balances || balances.filter(b => (
+          if (balances?.filter(b => (
+            b.asset_code == symbol && b.asset_issuer == Constants.TokenAdmin
+          )).length === 0) {
+            const txResult1 = await sendTransaction(
+              new SorobanClient.TransactionBuilder(walletSource, {
+                networkPassphrase,
+                fee: "1000", // arbitrary
+              })
+              .setTimeout(60)
+              .addOperation(
+                SorobanClient.Operation.changeTrust({
+                  asset: new SorobanClient.Asset(symbol, Constants.TokenAdmin),
+                })
+              )
+              .build(), {
+                timeout: 60 * 1000, // should be enough time to approve the tx
+                skipAddingFootprint: true,
+                // omit `secretKey` to have Freighter prompt for signing
+              }
+            ).catch((err) => {
+              console.error(err)
+              setSubmitting(false)
+            })
+            console.debug(txResult1)
+          }
+
+          const txResult2 = await sendTransaction(
+            new SorobanClient.TransactionBuilder(adminSource, {
+              networkPassphrase,
+              fee: "1000",
+            })
+            .setTimeout(10)
+            .addOperation(
+              SorobanClient.Operation.payment({
+                destination: wallet.id,
+                asset: new SorobanClient.Asset(symbol, Constants.TokenAdmin),
+                amount: amount.toString(),
+              })
+            )
+            .build(), {
+              timeout: 10 * 1000,
+              skipAddingFootprint: true,
+              secretKey: Constants.TokenAdminSecretKey,
+            }
+          ).catch((err) => {
+            console.error(err)
+            setSubmitting(false)
+          })
+          console.debug(txResult2)
+
+          //
+          // TODO: Show some user feedback while we are awaiting, and then based
+          // on the result
+          //
           setSubmitting(false)
         }}
         disabled={isSubmitting}

components/organisms/pledge/index.tsx

@@ -35,7 +35,7 @@ const Pledge: FunctionComponent = () => {
       ),
       decimals: useContractValue(Constants.TokenId, 'decimals'),
       name: useContractValue(Constants.TokenId, 'name'),
-      symbol: useContractValue(Constants.TokenId, 'symbol'),
+      symbol: useContractValue(Constants.TokenId, 'symbol')
     }
   }
 
@@ -51,7 +51,7 @@ const Pledge: FunctionComponent = () => {
   const tokenName =
     token.name.result && convert.scvalToString(token.name.result)
   const tokenSymbol =
-    token.symbol.result && convert.scvalToString(token.symbol.result)
+    token.symbol.result && convert.scvalToString(token.symbol.result)?.replace("\u0000", "")
   const deadlineDate =
     deadline.result &&
     new Date(

initialize.sh

@@ -38,16 +38,10 @@ futurenet)
 esac
 
 
-echo Deploy the token contract
-TOKEN_ID="$(
-  soroban token create \
-    --admin "$TOKEN_ADMIN" \
-    --name "Example Token" \
-    --symbol "EXT" \
-    --decimal 2
-)"
+echo Wrap the Stellar asset
 mkdir -p .soroban
-echo "$TOKEN_ID" > .soroban/token_id
+TOKEN_ID=$(soroban token wrap --asset "EXT:$TOKEN_ADMIN")
+echo -n "$TOKEN_ID" > .soroban/token_id
 
 echo Build the crowdfund contract
 make build
@@ -61,7 +55,7 @@ echo "$CROWDFUND_ID" > .soroban/crowdfund_id
 
 echo "Contract deployed succesfully with ID: $CROWDFUND_ID"
 
-echo Initialize the crowdfund contract
+echo "Initialize the crowdfund contract"
 deadline="$(($(date +"%s") + 86400))"
 soroban invoke \
   --id "$CROWDFUND_ID" \
@@ -71,3 +65,5 @@ soroban invoke \
   --arg "1000000000" \
   --arg "$TOKEN_ID" \
   --wasm target/wasm32-unknown-unknown/release/soroban_crowdfund_contract.wasm
+
+echo "Done"

wallet/hooks/useSendTransaction.tsx

@@ -71,17 +71,26 @@ export function useSendTransaction<E = Error>(defaultTxn?: Transaction, defaultO
     for (let i = 0; i <= timeout; i+= sleepTime) {
       await sleep(sleepTime);
       try {
+        console.debug("tx id:", id)
         const response = await server.getTransactionStatus(id);
+        console.debug(response)
+
         switch (response.status) {
         case "pending": {
             continue;
           }
         case "success": {
-            if (response.results?.length != 1) {
-              throw new Error("Expected exactly one result");
-            }
             setState('success');
-            return SorobanClient.xdr.ScVal.fromXDR(Buffer.from(response.results[0].xdr, 'base64'));
+            let results = response.results
+            if (!results) {
+              // FIXME: Return a more sensible value for classic transactions.
+              return SorobanClient.xdr.ScVal.scvI32(-1)
+            }
+            if (results.length > 1) {
+              throw new Error(`Expected exactly one result, got ${response.results}.`);
+            }
+
+            return SorobanClient.xdr.ScVal.fromXDR(Buffer.from(results[0].xdr, 'base64'));
           }
         case "error": {
             setState('error');