@agoric/fast-usdc 0.1.1-dev-fdc566c.0 → 0.1.1-dev-2288a0c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-fdc566c.0+fdc566c",
+  "version": "0.1.1-dev-2288a0c.0+2288a0c",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
@@ -22,9 +22,9 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-fdc566c.0+fdc566c",
-    "@agoric/vats": "0.15.2-dev-fdc566c.0+fdc566c",
-    "@agoric/zone": "0.2.3-dev-fdc566c.0+fdc566c",
+    "@agoric/swingset-liveslots": "0.10.3-dev-2288a0c.0+2288a0c",
+    "@agoric/vats": "0.15.2-dev-2288a0c.0+2288a0c",
+    "@agoric/zone": "0.2.3-dev-2288a0c.0+2288a0c",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -32,16 +32,16 @@
     "ts-blank-space": "^0.4.4"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-fdc566c.0+fdc566c",
-    "@agoric/cosmic-proto": "0.4.1-dev-fdc566c.0+fdc566c",
-    "@agoric/ertp": "0.16.3-dev-fdc566c.0+fdc566c",
-    "@agoric/internal": "0.3.3-dev-fdc566c.0+fdc566c",
-    "@agoric/notifier": "0.6.3-dev-fdc566c.0+fdc566c",
-    "@agoric/orchestration": "0.1.1-dev-fdc566c.0+fdc566c",
-    "@agoric/store": "0.9.3-dev-fdc566c.0+fdc566c",
-    "@agoric/vat-data": "0.5.3-dev-fdc566c.0+fdc566c",
-    "@agoric/vow": "0.1.1-dev-fdc566c.0+fdc566c",
-    "@agoric/zoe": "0.26.3-dev-fdc566c.0+fdc566c",
+    "@agoric/client-utils": "0.1.1-dev-2288a0c.0+2288a0c",
+    "@agoric/cosmic-proto": "0.4.1-dev-2288a0c.0+2288a0c",
+    "@agoric/ertp": "0.16.3-dev-2288a0c.0+2288a0c",
+    "@agoric/internal": "0.3.3-dev-2288a0c.0+2288a0c",
+    "@agoric/notifier": "0.6.3-dev-2288a0c.0+2288a0c",
+    "@agoric/orchestration": "0.1.1-dev-2288a0c.0+2288a0c",
+    "@agoric/store": "0.9.3-dev-2288a0c.0+2288a0c",
+    "@agoric/vat-data": "0.5.3-dev-2288a0c.0+2288a0c",
+    "@agoric/vow": "0.1.1-dev-2288a0c.0+2288a0c",
+    "@agoric/zoe": "0.26.3-dev-2288a0c.0+2288a0c",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fdc566ceba2386ac9cccd2e095741dcd316b575b"
+  "gitHead": "2288a0cbfa5956216597ea9d9202f8c8e1ac90c9"
 }

package/src/type-guards.js

@@ -113,7 +113,6 @@ const NatAmountShape = { brand: BrandShape, value: M.nat() };
 export const FeeConfigShape = {
   flat: NatAmountShape,
   variableRate: RatioShape,
-  maxVariable: NatAmountShape,
   contractRate: RatioShape,
 };
 harden(FeeConfigShape);

package/src/types.ts

@@ -62,9 +62,11 @@ export interface PendingTx extends CctpTxEvidence {
 }
 
 export type FeeConfig = {
+  /** flat fee charged for every advance */
   flat: Amount<'nat'>;
+  /** proportion of advance kept as a fee */
   variableRate: Ratio;
-  maxVariable: Amount<'nat'>;
+  /** proportion of fees that goes to the contract (remaining goes to LPs) */
   contractRate: Ratio;
 };
 

package/src/utils/fees.js

@@ -4,7 +4,7 @@ import { Fail } from '@endo/errors';
 import { mustMatch } from '@endo/patterns';
 import { FeeConfigShape } from '../type-guards.js';
 
-const { add, isGTE, min, subtract } = AmountMath;
+const { add, isGTE, subtract } = AmountMath;
 
 /**
  * @import {Amount} from '@agoric/ertp';
@@ -15,7 +15,7 @@ const { add, isGTE, min, subtract } = AmountMath;
 /** @param {FeeConfig} feeConfig */
 export const makeFeeTools = feeConfig => {
   mustMatch(feeConfig, FeeConfigShape, 'Must provide feeConfig');
-  const { flat, variableRate, maxVariable } = feeConfig;
+  const { flat, variableRate } = feeConfig;
   const feeTools = harden({
     /**
      * Calculate the net amount to advance after withholding fees.
@@ -34,8 +34,7 @@ export const makeFeeTools = feeConfig => {
      * @throws {Error} if requested does not exceed fees
      */
     calculateAdvanceFee(requested) {
-      const variable = min(multiplyBy(requested, variableRate), maxVariable);
-      const fee = add(variable, flat);
+      const fee = add(multiplyBy(requested, variableRate), flat);
       !isGTE(fee, requested) || Fail`Request must exceed fees.`;
       return fee;
     },