Update to support scval value overhaul (#93)

* First pass at handling the xdr value overhaul

* update rust deps and token spec for the contract

* Update soroban-cli usage in ./initialize.sh

* Remove unneeded brackets

* Fix type in convert.ts

* Update soroban-client to 0.5.0

* Remove unused import

* Update package-lock.json

* Update soroban-react dep

* Fix missed scval update

* Update and run eslint

Cargo.toml

@@ -16,28 +16,28 @@ codegen-units = 1
 lto = true
 
 [workspace.dependencies.soroban-env-common]
-version = "0.0.14"
+version = "0.0.15"
 
 [workspace.dependencies.soroban-env-guest]
-version = "0.0.14"
+version = "0.0.15"
 
 [workspace.dependencies.soroban-env-macros]
-version = "0.0.14"
+version = "0.0.15"
 
 [workspace.dependencies.soroban-env-host]
-version = "0.0.14"
+version = "0.0.15"
 
 [workspace.dependencies.soroban-native-sdk-macros]
-version = "0.0.14"
+version = "0.0.15"
 
 [workspace.dependencies.soroban-spec]
-version = "0.6.0"
+version = "0.7.0"
 
 [workspace.dependencies.soroban-sdk]
-version = "0.6.0"
+version = "0.7.0"
 
 [workspace.dependencies.soroban-sdk-macros]
-version = "0.6.0"
+version = "0.7.0"
 
 [workspace.dependencies.stellar-xdr]
-version = "0.0.14"
+version = "0.0.15"

components/molecules/deposits/index.tsx

@@ -2,7 +2,6 @@ import React from 'react'
 import * as SorobanClient from 'soroban-client'
 import styles from './style.module.css'
 import { Utils } from '../../../shared/utils'
-import BigNumber from 'bignumber.js'
 import { Spacer } from '../../atoms/spacer'
 import * as convert from '../../../convert'
 import { Constants } from '../../../shared/constants'

components/organisms/pledge/index.tsx

@@ -59,12 +59,6 @@ const Pledge: FunctionComponent = () => {
     sorobanContext
   })
 
-  let started = useContractValue({ 
-    contractId: Constants.CrowdfundId,
-    method: 'started',
-    sorobanContext
-  })
-
   let targetAmountXdr = useContractValue({ 
     contractId: Constants.CrowdfundId,
     method: 'target',
@@ -84,19 +78,11 @@ const Pledge: FunctionComponent = () => {
     deadline.result &&
     new Date(
       convert.xdrUint64ToNumber(
-        deadline.result.obj()?.u64() ?? xdr.Int64.fromString('0')
+        deadline.result.u64() ?? xdr.Int64.fromString('0')
       ) * 1000
     )
   const targetAmount = convert.scvalToBigNumber(targetAmountXdr.result)
 
-  const startedDate =
-    started.result &&
-    new Date(
-      convert.xdrUint64ToNumber(
-        started.result.obj()?.u64() ?? xdr.Int64.fromString('0')
-      ) * 1000
-    )
-
   const isLoading = (): boolean | undefined => {
     return (
       token.balance.loading ||

convert.ts

@@ -7,42 +7,37 @@ export function scvalToBigNumber(scval: SorobanClient.xdr.ScVal | undefined): Bi
   case undefined: {
     return BigNumber(0);
   }
-  case xdr.ScValType.scvU63(): {
-    const {high, low} = scval.u63();
-    return bigNumberFromBytes(false, high, low);
-  }
   case xdr.ScValType.scvU32(): {
     return BigNumber(scval.u32());
   }
   case xdr.ScValType.scvI32(): {
     return BigNumber(scval.i32());
   }
-  case xdr.ScValType.scvObject(): {
-    let obj = scval.obj()!;
-    switch (obj.switch()) {
-    case xdr.ScObjectType.scoU64(): {
-      const {high, low} = obj.u64();
-      return bigNumberFromBytes(false, high, low);
-    }
-    case xdr.ScObjectType.scoI64(): {
-      const {high, low} = obj.i64();
-      return bigNumberFromBytes(true, high, low);
-    }
-    case xdr.ScObjectType.scoU128(): {
-      const parts = obj.u128();
-      const a = parts.hi();
-      const b = parts.lo();
-      return bigNumberFromBytes(false, a.high, a.low, b.high, b.low);
-    }
-    case xdr.ScObjectType.scoI128(): {
-      const parts = obj.i128();
-      const a = parts.hi();
-      const b = parts.lo();
-      return bigNumberFromBytes(true, a.high, a.low, b.high, b.low);
-    }
-    default:
-      throw new Error(`Invalid type for scvalToBigNumber: ${obj.switch().name}`);
-    }
+  case xdr.ScValType.scvU64(): {
+    const {high, low} = scval.u64();
+    return bigNumberFromBytes(false, high, low);
+  }
+  case xdr.ScValType.scvI64(): {
+    const {high, low} = scval.i64();
+    return bigNumberFromBytes(true, high, low);
+  }
+  case xdr.ScValType.scvU128(): {
+    const parts = scval.u128();
+    const a = parts.hi();
+    const b = parts.lo();
+    return bigNumberFromBytes(false, a.high, a.low, b.high, b.low);
+  }
+  case xdr.ScValType.scvI128(): {
+    const parts = scval.i128();
+    const a = parts.hi();
+    const b = parts.lo();
+    return bigNumberFromBytes(true, a.high, a.low, b.high, b.low);
+  }
+  case xdr.ScValType.scvU256(): {
+    return bigNumberFromBytes(false, ...scval.u256());
+  }
+  case xdr.ScValType.scvI256(): {
+    return bigNumberFromBytes(true, ...scval.i256());
   }
   default: {
     throw new Error(`Invalid type for scvalToBigNumber: ${scval?.switch().name}`);
@@ -96,7 +91,7 @@ export function bigNumberToI128(value: BigNumber): SorobanClient.xdr.ScVal {
     bigNumberFromBytes(false, ...padded.slice(8, 12)).toNumber()
   );
 
-  return xdr.ScVal.scvObject(xdr.ScObject.scoI128(new xdr.Int128Parts({lo, hi})));
+  return xdr.ScVal.scvI128(new xdr.Int128Parts({lo, hi}));
 }
 
 function bigintToBuf(bn: bigint): Buffer {
@@ -131,6 +126,6 @@ export function xdrUint64ToNumber(value: SorobanClient.xdr.Uint64): number {
 }
 
 export function scvalToString(value: SorobanClient.xdr.ScVal): string | undefined {
-  return value.obj()?.bin().toString();
+  return value.bytes().toString();
 }
 

initialize.sh

@@ -58,7 +58,7 @@ echo "$TOKEN_ADMIN_ADDRESS" > .soroban/token_admin_address
 echo Fund token-admin account from friendbot
 curl --silent -X POST "$FRIENDBOT_URL?addr=$TOKEN_ADMIN_ADDRESS" >/dev/null
 
-ARGS="--network $NETWORK --identity token-admin"
+ARGS="--network $NETWORK --source token-admin"
 
 echo Wrap the Stellar asset
 mkdir -p .soroban
@@ -85,7 +85,8 @@ soroban contract invoke \
   $ARGS \
   --wasm target/wasm32-unknown-unknown/release/soroban_crowdfund_contract.wasm \
   --id "$CROWDFUND_ID" \
-  --fn initialize -- \
+  -- \
+  initialize \
   --recipient "$TOKEN_ADMIN_ADDRESS" \
   --deadline "$deadline" \
   --target_amount "1000000000" \