Merge pull request #21 from 00labs/bump-version

Bump all versions
00labs · Jul 18, 2024 · bed6081 · bed6081
2 parents 72181d2 + ad85441
commit bed6081
Show file tree

Hide file tree

Showing 76 changed files with 282 additions and 1,115 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "test:all": "yarn test:sdk",
     "test:sdk": "yarn workspace @huma-finance/soroban-sdk test",
     "prepare": "husky install",
-    "binding": "ts-node scripts/bindings.ts"
+    "example": "yarn workspace @huma-finance/soroban-examples startDrawdownPayback"
   },
   "devDependencies": {
     "lerna": "^6.6.1"

diff --git a/packages/sdk/API.md b/packages/sdk/API.md
@@ -19,7 +19,7 @@ associated with the given pool name on the current chain.</p></dd>
 <dd><p>Approve allowance for sentinel if not enough allowance is approved.</p></dd>
 <dt><a href="#drawdown">drawdown(poolName, network, wallet, drawdownAmount)</a> ⇒ <code>Promise.&lt;SentTransaction&gt;</code></dt>
 <dd><p>Draws down from a pool.</p></dd>
-<dt><a href="#makePayment">makePayment(poolName, network, wallet, paymentAmount, principalOnly)</a> ⇒ <code>Promise.&lt;AssembledTransaction&gt;</code></dt>
+<dt><a href="#makePayment">makePayment(poolName, network, wallet, paymentAmount, principalOnly)</a> ⇒ <code>Promise.&lt;SentTransaction&gt;</code></dt>
 <dd><p>Makes a payment.</p></dd>
 <dt><a href="#approveSep41AllowanceIfInsufficient">approveSep41AllowanceIfInsufficient(network, wallet, tokenAddress, spenderAddress, allowanceAmount)</a> ⇒ <code>Promise.&lt;(SentTransaction.&lt;null&gt;|null)&gt;</code></dt>
 <dd><p>Approves an Sep41 allowance for a spender address, if the current allowance is insufficient.
@@ -135,12 +135,12 @@ associated with the given pool name on the current chain.</p>
 
 <a name="makePayment"></a>
 
-## makePayment(poolName, network, wallet, paymentAmount, principalOnly) ⇒ <code>Promise.&lt;AssembledTransaction&gt;</code>
+## makePayment(poolName, network, wallet, paymentAmount, principalOnly) ⇒ <code>Promise.&lt;SentTransaction&gt;</code>
 <p>Makes a payment.</p>
 
 **Kind**: global function  
-**Returns**: <code>Promise.&lt;AssembledTransaction&gt;</code> - <ul>
-<li>A Promise of the AssembledTransaction.</li>
+**Returns**: <code>Promise.&lt;SentTransaction&gt;</code> - <ul>
+<li>A Promise of the SentTransaction.</li>
 </ul>  
 
 | Param | Type | Description |

diff --git a/packages/sdk/src/helpers/CreditContractHelper.ts b/packages/sdk/src/helpers/CreditContractHelper.ts
@@ -1,9 +1,8 @@
 import {
   Client as PoolCreditClient,
   CreditRecord,
-  SentTransaction,
 } from '@huma-finance/soroban-pool-credit'
-
+import { SentTransaction } from '@stellar/stellar-sdk/lib/contract'
 import { StellarWallet } from '../services/StellarWallet'
 import {
   getCreditStorageClient,
@@ -129,7 +128,9 @@ export async function getAvailableCreditForPool(
     throw new Error('Could not find credit config or credit record')
   }
 
-  return creditConfig.credit_limit - creditRecord.unbilled_principal
+  return (
+    BigInt(creditConfig.credit_limit) - BigInt(creditRecord.unbilled_principal)
+  )
 }
 
 /**
@@ -255,7 +256,7 @@ export async function drawdown(
  * @param {StellarWallet} wallet - The stellar wallet.
  * @param {bigint} paymentAmount - The amount to payback.
  * @param {boolean} principalOnly - Whether this payment should ONLY apply to the principal
- * @returns {Promise<AssembledTransaction>} - A Promise of the AssembledTransaction.
+ * @returns {Promise<SentTransaction>} - A Promise of the SentTransaction.
  */
 export async function makePayment(
   poolName: POOL_NAME,

diff --git a/packages/sdk/src/helpers/Sep41ContractHelper.ts b/packages/sdk/src/helpers/Sep41ContractHelper.ts
@@ -1,4 +1,4 @@
-import { SentTransaction } from '@huma-finance/soroban-pool-credit'
+import { SentTransaction } from '@stellar/stellar-sdk/lib/contract'
 
 import { StellarWallet } from '../services'
 import {

diff --git a/packages/sdk/src/utils/client.ts b/packages/sdk/src/utils/client.ts
@@ -112,12 +112,12 @@ export const getTrancheVaultClient = (
   tranche: 'senior' | 'junior',
 ) => {
   const poolMetadata = findPoolMetadata(network, poolName)
-  if (!poolMetadata) {
+  if (!poolMetadata || !poolMetadata.contracts[`${tranche}Tranche`]) {
     return undefined
   }
 
   return new TrancheVaultClient({
-    contractId: poolMetadata.contracts[`${tranche}Tranche`],
+    contractId: poolMetadata.contracts[`${tranche}Tranche`]!,
     ...getCommonProps(network, wallet),
   })
 }

diff --git a/packages/sdk/src/utils/network.ts b/packages/sdk/src/utils/network.ts
@@ -41,8 +41,8 @@ export type PoolMetadata = {
     poolCredit: string
     creditManager: string
     creditStorage: string
-    seniorTranche: string
     juniorTranche: string
+    seniorTranche?: string
   }
 }
 
@@ -64,22 +64,20 @@ export const NetworkMetadatas: NetworkMetadata[] = [
         poolType: POOL_TYPE.Creditline,
         contracts: {
           humaConfig:
-            'CDEH36NMZK6AV5I675A2BSRIWLJGBVXWN5HHABKJKHNIGKSKJQVXPXFB',
+            'CBXUR3AZ55267TY5ZN3VDWMCLTYIXWRM3A6CY35WUI3IXERALALZFL5X',
           poolStorage:
-            'CBHY4NM3DVEBX3QTL3X5XEOAKHDMP44HDP7SBDTCOAMFU7LFIBMFEV4N',
-          pool: 'CAI6UQAXZ6ICE5QQ4WFEEDQLZORGMYBCL2RB2NVY6AGMH4XT6PCH7IPX',
+            'CDJ6XX2WBWREDZDGAOGLULXHSS4KNIPQHVPATG6KVDZ5J5HTTTLLDC43',
+          pool: 'CCEE4AEQXENDNCBBE6NJA43UOFXDHVCAIARAR2NAKPETKJ6HTS6QAOFW',
           poolManager:
-            'CCTCNYWWKPVFNPJDQUMJM6GFBU6IJSZH6CHPM5COJTBMWO64A4XVCXNV',
+            'CAPUJ7SFTTAM6I2O6MR2SKMFWWK7ZZCDIFWYPKQVDEPVGEHHSQXVMI77',
           poolCredit:
-            'CCYWDOW34SPB3FCR6A633B5GS5DPRRQKTTCT4DU7YYFDRT7XBOA2HYYY',
+            'CCANGNNOXXTCDJ4DTN6RQZ6LL7BPDKOFJFD62G4AQ7OG362PCVG4OK3U',
           creditManager:
-            'CDHYIC3ISV3F3RL7FROC3SI2GW65ZOJHMA2AMZJYLIRLWSDELFF3CR23',
+            'CDJ4B3MPTOIYQ3BUHAFSNNK3OIOMTB4H2L4LZLHTUWP2B6KX6KRZNCLW',
           creditStorage:
-            'CBZHE4LD4FYGELCFDVRNBLNO4743X4UJDIDC7CGYS3MLJ3CIHC4SGLHC',
+            'CCWDV53HATIFKR3WL2G64BA7AFA4HIAJWE3ADHJY54XQTM3EYCIN2SHS',
           juniorTranche:
-            'CAJZ4V2N5TOJ6GVOJOKTJSP3QYDNVC6O6TDO2V64GULQGZNRRFM5AS7V',
-          seniorTranche:
-            'CBQV4USFV4MBZTKK6W6SM576GVBZGZZHEHT7Y2OVIKNYG45L57LDL6SA',
+            'CC356H4PYZWNZ4G5P2LZUSD65PZK5OHAFDRM37QE27TZ5BOYRYQB7S7M',
         },
       },
     ],

diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json
@@ -25,6 +25,7 @@
     "paths": {
       "@": ["./"],
       "*": ["src/*", "node_modules/*"],
+      "@huma-finance/soroban-credit-manager": ["../tb-creditManager"],
       "@huma-finance/soroban-credit-storage": ["../tb-creditStorage"],
       "@huma-finance/soroban-huma-config": ["../tb-humaConfig"],
       "@huma-finance/soroban-pool": ["../tb-pool"],
@@ -38,6 +39,9 @@
     "skipLibCheck": true
   },
   "references": [
+    {
+      "path": "../tb-creditManager"
+    },
     {
       "path": "../tb-creditStorage"
     },

diff --git a/packages/tb-creditManager/README.md b/packages/tb-creditManager/README.md
@@ -8,7 +8,7 @@ This library was automatically generated by Soroban CLI using a command similar
 soroban contract bindings ts \
   --rpc-url https://soroban-testnet.stellar.org:443 \
   --network-passphrase "Test SDF Network ; September 2015" \
-  --contract-id CASGH7RO7Q4H3JOMACIFKIVZDIL7AFHYELXB5JQ6VWTMQ7IMO6GEBRQ5 \
+  --contract-id CDHYIC3ISV3F3RL7FROC3SI2GW65ZOJHMA2AMZJYLIRLWSDELFF3CR23 \
   --output-dir ./path/to/tb-creditManager
 ```
 
@@ -30,7 +30,7 @@ However, we've actually encountered [frustration](https://github.com/stellar/sor
 
 ```json
 "scripts": {
-  "postinstall": "soroban contract bindings ts --rpc-url https://soroban-testnet.stellar.org:443 --network-passphrase \"Test SDF Network ; September 2015\" --id CASGH7RO7Q4H3JOMACIFKIVZDIL7AFHYELXB5JQ6VWTMQ7IMO6GEBRQ5 --name tb-creditManager"
+  "postinstall": "soroban contract bindings ts --rpc-url https://soroban-testnet.stellar.org:443 --network-passphrase \"Test SDF Network ; September 2015\" --id CDHYIC3ISV3F3RL7FROC3SI2GW65ZOJHMA2AMZJYLIRLWSDELFF3CR23 --name tb-creditManager"
 }
 ```
 

diff --git a/packages/tb-creditManager/package.json b/packages/tb-creditManager/package.json
@@ -1,22 +1,15 @@
 {
   "version": "0.0.14",
   "name": "@huma-finance/soroban-credit-manager",
+  "exports": "./dist/index.js",
+  "typings": "dist/index.d.ts",
   "dependencies": {
-    "@stellar/freighter-api": "2.0.0",
-    "@stellar/stellar-sdk": "11.3.0",
+    "@stellar/stellar-sdk": "^12.1.0",
     "buffer": "6.0.3"
   },
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
   "scripts": {
-    "build": "node ./scripts/build.mjs"
+    "build": "tsc"
   },
-  "exports": {
-    "require": "./dist/cjs/index.js",
-    "import": "./dist/esm/index.js"
-  },
-  "typings": "dist/types/index.d.ts",
   "devDependencies": {
     "typescript": "5.3.3"
   },

diff --git a/packages/tb-creditManager/scripts/build.mjs b/packages/tb-creditManager/scripts/build.mjs
diff --git a/packages/tb-creditManager/scripts/tsconfig.cjs.json b/packages/tb-creditManager/scripts/tsconfig.cjs.json
diff --git a/packages/tb-creditManager/scripts/tsconfig.esm.json b/packages/tb-creditManager/scripts/tsconfig.esm.json
diff --git a/packages/tb-creditManager/scripts/tsconfig.types.json b/packages/tb-creditManager/scripts/tsconfig.types.json
diff --git a/packages/tb-creditManager/src/index.ts b/packages/tb-creditManager/src/index.ts
@@ -1,10 +1,12 @@
-import { ContractSpec, Address } from "@stellar/stellar-sdk";
 import { Buffer } from "buffer";
+import { Address } from "@stellar/stellar-sdk";
 import {
   AssembledTransaction,
-  ContractClient,
-  ContractClientOptions,
-} from "@stellar/stellar-sdk/lib/contract_client/index.js";
+  Client as ContractClient,
+  ClientOptions as ContractClientOptions,
+  Result,
+  Spec as ContractSpec,
+} from "@stellar/stellar-sdk/contract";
 import type {
   u32,
   i32,
@@ -17,11 +19,10 @@ import type {
   Option,
   Typepoint,
   Duration,
-} from "@stellar/stellar-sdk/lib/contract_client";
-import { Result } from "@stellar/stellar-sdk/lib/rust_types/index.js";
+} from "@stellar/stellar-sdk/contract";
 export * from "@stellar/stellar-sdk";
-export * from "@stellar/stellar-sdk/lib/contract_client/index.js";
-export * from "@stellar/stellar-sdk/lib/rust_types/index.js";
+export * as contract from "@stellar/stellar-sdk/contract";
+export * as rpc from "@stellar/stellar-sdk/rpc";
 
 if (typeof window !== "undefined") {
   //@ts-ignore Buffer exists
@@ -31,7 +32,7 @@ if (typeof window !== "undefined") {
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CASGH7RO7Q4H3JOMACIFKIVZDIL7AFHYELXB5JQ6VWTMQ7IMO6GEBRQ5",
+    contractId: "CDHYIC3ISV3F3RL7FROC3SI2GW65ZOJHMA2AMZJYLIRLWSDELFF3CR23",
   },
 } as const;
 
@@ -182,6 +183,13 @@ export const Errors = {
   713: { message: "" },
   714: { message: "" },
   715: { message: "" },
+  101: { message: "" },
+  1: { message: "" },
+  2: { message: "" },
+  3: { message: "" },
+  4: { message: "" },
+  5: { message: "" },
+  221: { message: "" },
 };
 export type PayPeriodDuration =
   | { tag: "Monthly"; values: void }

diff --git a/packages/tb-creditManager/tsconfig.json b/packages/tb-creditManager/tsconfig.json
@@ -3,10 +3,10 @@
   "compilerOptions": {
     "composite": true,
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
     "rootDir": "./src",
     "outDir": "dist",
-    "moduleResolution": "node",
+    "moduleResolution": "NodeNext",
     "declaration": true,
     "strictNullChecks": true,
     "skipLibCheck": true

diff --git a/packages/tb-creditStorage/README.md b/packages/tb-creditStorage/README.md
@@ -8,7 +8,7 @@ This library was automatically generated by Soroban CLI using a command similar
 soroban contract bindings ts \
   --rpc-url https://soroban-testnet.stellar.org:443 \
   --network-passphrase "Test SDF Network ; September 2015" \
-  --contract-id CAWXNUPJVXSPZ4WSWURNYYPECL3GDPLLP7LSSBMRXMDGWZ4ZXNIHMITS \
+  --contract-id CBZHE4LD4FYGELCFDVRNBLNO4743X4UJDIDC7CGYS3MLJ3CIHC4SGLHC \
   --output-dir ./path/to/tb-creditStorage
 ```
 
@@ -30,7 +30,7 @@ However, we've actually encountered [frustration](https://github.com/stellar/sor
 
 ```json
 "scripts": {
-  "postinstall": "soroban contract bindings ts --rpc-url https://soroban-testnet.stellar.org:443 --network-passphrase \"Test SDF Network ; September 2015\" --id CAWXNUPJVXSPZ4WSWURNYYPECL3GDPLLP7LSSBMRXMDGWZ4ZXNIHMITS --name tb-creditStorage"
+  "postinstall": "soroban contract bindings ts --rpc-url https://soroban-testnet.stellar.org:443 --network-passphrase \"Test SDF Network ; September 2015\" --id CBZHE4LD4FYGELCFDVRNBLNO4743X4UJDIDC7CGYS3MLJ3CIHC4SGLHC --name tb-creditStorage"
 }
 ```
 

diff --git a/packages/tb-creditStorage/package.json b/packages/tb-creditStorage/package.json
@@ -1,22 +1,15 @@
 {
   "version": "0.0.14",
   "name": "@huma-finance/soroban-credit-storage",
-  "dependencies": {
-    "@stellar/freighter-api": "2.0.0",
-    "@stellar/stellar-sdk": "11.3.0",
-    "buffer": "6.0.3"
-  },
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
+  "exports": "./dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "node ./scripts/build.mjs"
+    "build": "tsc"
   },
-  "exports": {
-    "require": "./dist/cjs/index.js",
-    "import": "./dist/esm/index.js"
+  "dependencies": {
+    "@stellar/stellar-sdk": "12.1.0",
+    "buffer": "6.0.3"
   },
-  "typings": "dist/types/index.d.ts",
   "devDependencies": {
     "typescript": "5.3.3"
   },