npm - @wharfkit/resources - Versions diffs - 1.5.0-rc2 → 1.5.0-rc4 - Mend

@wharfkit/resources 1.5.0-rc2 → 1.5.0-rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/lib/wharfkit-resources.d.ts +1 -23
package/lib/wharfkit-resources.js +20 -130
package/lib/wharfkit-resources.js.map +1 -1
package/lib/wharfkit-resources.m.js +20 -130
package/lib/wharfkit-resources.m.js.map +1 -1
package/package.json +1 -1
package/src/powerup/abstract.ts +11 -90
package/src/powerup/cpu.ts +1 -41
package/src/powerup/net.ts +0 -39
package/src/rex.ts +10 -9

package/lib/wharfkit-resources.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * @wharfkit/resources v1.5.0-rc2
+ * @wharfkit/resources v1.5.0-rc4
  * https://github.com/wharfkit/resources
  *
  * @license
@@ -61,18 +61,12 @@ declare abstract class PowerUpStateResource extends Struct {
     readonly default_block_cpu_limit: UInt64;
     readonly default_block_net_limit: UInt64;
     abstract per_day(options?: PowerUpStateOptions): number;
-    get allocated_legacy(): number;
     get allocated(): number;
-    get reserved_legacy(): number;
     get reserved(): Int64;
     get symbol(): Asset.Symbol;
-    utilization_increase_legacy(frac: any): number;
     utilization_increase(frac: UInt128): UInt128;
-    price_function_legacy(utilization: Int64): number;
     price_function(utilization: Int64): number;
-    price_integral_delta_legacy(start_utilization: Int64, end_utilization: Int64): number;
     price_integral_delta(start_utilization: Int64, end_utilization: Int64): number;
-    fee_legacy(utilization_increase: any, adjusted_utilization: any): number;
     fee(utilization_increase: UInt128, adjusted_utilization: Int64): number;
     determine_adjusted_utilization(options?: PowerUpStateOptions): Int64;
 }
@@ -81,21 +75,13 @@ declare class PowerUpStateResourceCPU extends PowerUpStateResource {
     per_day: (options?: PowerUpStateOptions | undefined) => number;
     ms_per_day(options?: PowerUpStateOptions): number;
     us_per_day(options?: PowerUpStateOptions): number;
-    weight_to_us_legacy(sample: UInt128, weight: number): number;
     weight_to_us(sample: UInt128Type, weight: Int64Type): UInt128;
-    us_to_weight_legacy(sample: UInt128, us: number): number;
     us_to_weight(sample: UInt128, us: Int64Type): Int64;
-    frac_legacy: (usage: SampleUsage, us: number) => number;
     frac: (usage: SampleUsage, us: number) => Int64;
-    frac_by_ms_legacy: (usage: SampleUsage, ms: number) => number;
     frac_by_ms: (usage: SampleUsage, ms: number) => Int64;
-    frac_by_us_legacy(usage: SampleUsage, us: number): number;
     frac_by_us(usage: SampleUsage, us: Int64Type): Int64;
-    price_per_legacy: (usage: SampleUsage, us?: number, options?: PowerUpStateOptions | undefined) => number;
     price_per: (usage: SampleUsage, us?: number, options?: PowerUpStateOptions | undefined) => number;
-    price_per_ms_legacy: (usage: SampleUsage, ms?: number, options?: PowerUpStateOptions | undefined) => number;
     price_per_ms: (usage: SampleUsage, ms?: number, options?: PowerUpStateOptions | undefined) => number;
-    price_per_us_legacy(usage: SampleUsage, us?: number, options?: PowerUpStateOptions): number;
     price_per_us(usage: SampleUsage, us?: number, options?: PowerUpStateOptions): number;
 }
@@ -103,21 +89,13 @@ declare class PowerUpStateResourceNET extends PowerUpStateResource {
     per_day: (options?: PowerUpStateOptions | undefined) => number;
     kb_per_day(options?: PowerUpStateOptions): number;
     bytes_per_day(options?: PowerUpStateOptions): number;
-    weight_to_bytes_legacy(sample: UInt128, weight: number): number;
     weight_to_bytes(sample: UInt128, weight: number): UInt128;
-    bytes_to_weight_legacy(sample: UInt128, bytes: number): number;
     bytes_to_weight(sample: UInt128, bytes: Int64Type): Int64;
-    frac_legacy: (usage: SampleUsage, bytes: number) => number;
     frac: (usage: SampleUsage, bytes: number) => Int64;
-    frac_by_kb_legacy: (usage: SampleUsage, kilobytes: number) => number;
     frac_by_kb: (usage: SampleUsage, kilobytes: number) => Int64;
-    frac_by_bytes_legacy(usage: SampleUsage, bytes: number): number;
     frac_by_bytes(usage: SampleUsage, bytes: Int64Type): Int64;
-    price_per_legacy: (usage: SampleUsage, bytes?: number, options?: PowerUpStateOptions | undefined) => number;
     price_per: (usage: SampleUsage, bytes?: number, options?: PowerUpStateOptions | undefined) => number;
-    price_per_kb_legacy: (usage: SampleUsage, kilobytes?: number, options?: PowerUpStateOptions | undefined) => number;
     price_per_kb: (usage: SampleUsage, kilobytes?: number, options?: PowerUpStateOptions | undefined) => number;
-    price_per_byte_legacy(usage: SampleUsage, bytes?: number, options?: PowerUpStateOptions): number;
     price_per_byte(usage: SampleUsage, bytes?: number, options?: PowerUpStateOptions): number;
 }

package/lib/wharfkit-resources.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * @wharfkit/resources v1.5.0-rc2
+ * @wharfkit/resources v1.5.0-rc4
  * https://github.com/wharfkit/resources
  *
  * @license
@@ -54,16 +54,10 @@ class PowerUpStateResource extends antelope.Struct {
         this.default_block_net_limit = antelope.UInt64.from(1048576000);
     }
     // Get the current number of allocated units (shift from REX -> PowerUp)
-    get allocated_legacy() {
-        return 1 - Number(this.weight_ratio) / Number(this.target_weight_ratio) / 100;
-    }
     get allocated() {
         return 1 - Number(this.weight_ratio.dividing(this.target_weight_ratio)) / 100;
     }
     // Get the current percentage of reserved units
-    get reserved_legacy() {
-        return new BN__default['default'](String(this.utilization)) / new BN__default['default'](String(this.weight));
-    }
     get reserved() {
         return this.utilization.dividing(this.weight);
     }
@@ -72,33 +66,13 @@ class PowerUpStateResource extends antelope.Struct {
         return this.min_price.symbol;
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L358
-    utilization_increase_legacy(frac) {
-        const { weight } = this;
-        const frac128 = antelope.UInt128.from(frac);
-        const utilization_increase = new BN__default['default'](weight.value.mul(new BN__default['default'](frac128.value))) / Math.pow(10, 15);
-        return Math.ceil(utilization_increase);
-    }
     utilization_increase(frac) {
-        return frac.multiplying(this.weight).dividing(antelope.UInt128.from(Math.pow(10, 15)), 'ceil');
+        const base = intToBigDecimal(frac);
+        const weight = intToBigDecimal(this.weight);
+        const multiplier = intToBigDecimal(Math.pow(10, 15));
+        return antelope.UInt128.from(base.multiply(weight).divide(multiplier, 15).ceil().getValue());
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L284-L298
-    price_function_legacy(utilization) {
-        const { exponent, weight } = this;
-        const max_price = this.max_price.value;
-        const min_price = this.min_price.value;
-        let price = min_price;
-        const new_exponent = Number(exponent) - 1.0;
-        if (new_exponent <= 0.0) {
-            return max_price;
-        }
-        else {
-            const util_weight = new BN__default['default'](Number(utilization)) / Number(weight);
-            console.log('old', String(util_weight));
-            console.log('diff', max_price - min_price);
-            price += (max_price - min_price) * Math.pow(util_weight, new_exponent);
-        }
-        return price;
-    }
     price_function(utilization) {
         const { weight } = this;
         let price = this.min_price.value;
@@ -109,27 +83,12 @@ class PowerUpStateResource extends antelope.Struct {
         else {
             // const util_weight = utilization.dividing(weight)
             const util_weight = intToBigDecimal(utilization).divide(intToBigDecimal(weight), 18);
-            console.log('new', String(util_weight.getValue()));
-            const difference = this.max_price.units.subtracting(this.min_price.units);
-            console.log('diff', String(difference));
-            price += difference.value * Math.pow(Number(util_weight.getValue()), new_exponent);
+            const difference = this.max_price.value - this.min_price.value;
+            price += difference * Math.pow(Number(util_weight.getValue()), new_exponent);
         }
         return price;
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L274-L280
-    price_integral_delta_legacy(start_utilization, end_utilization) {
-        const { exponent, weight } = this;
-        const max_price = this.max_price.value;
-        const min_price = this.min_price.value;
-        const coefficient = (max_price - min_price) / exponent.value;
-        const start_u = Number(start_utilization.dividing(weight));
-        const end_u = Number(end_utilization.dividing(weight));
-        const delta = min_price * end_u -
-            min_price * start_u +
-            coefficient * Math.pow(end_u, exponent.value) -
-            coefficient * Math.pow(start_u, exponent.value);
-        return delta;
-    }
     price_integral_delta(start_utilization, end_utilization) {
         const difference = antelope.Asset.fromUnits(this.max_price.units.subtracting(this.min_price.units), this.symbol);
         const coefficient = difference.value / this.exponent.value;
@@ -142,23 +101,6 @@ class PowerUpStateResource extends antelope.Struct {
         return delta;
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L262-L315
-    fee_legacy(utilization_increase, adjusted_utilization) {
-        const { utilization, weight } = this;
-        let start_utilization = antelope.Int64.from(utilization);
-        const end_utilization = start_utilization.adding(utilization_increase);
-        let fee = 0;
-        if (start_utilization < adjusted_utilization) {
-            const min = Math.min(utilization_increase, adjusted_utilization.subtracting(start_utilization));
-            fee += Number(new bigDecimal__default['default'](this.price_function_legacy(adjusted_utilization) * min)
-                .divide(new bigDecimal__default['default'](weight.toString()))
-                .getValue());
-            start_utilization = adjusted_utilization;
-        }
-        if (start_utilization.gt(end_utilization)) {
-            fee += this.price_integral_delta(start_utilization, end_utilization);
-        }
-        return fee;
-    }
     fee(utilization_increase, adjusted_utilization) {
         const { utilization, weight } = this;
         let start_utilization = antelope.Int64.from(utilization);
@@ -166,14 +108,12 @@ class PowerUpStateResource extends antelope.Struct {
         let fee = 0;
         if (start_utilization.lt(adjusted_utilization)) {
             const min = Math.min(Number(utilization_increase), Number(adjusted_utilization.subtracting(start_utilization)));
-            fee += Number(new bigDecimal__default['default'](String((this.price_function(adjusted_utilization) /
-                Math.pow(10, this.symbol.precision)) *
-                min))
-                .divide(new bigDecimal__default['default'](weight.toString()))
+            fee += Number(intToBigDecimal(this.price_function(adjusted_utilization) * min)
+                .divide(intToBigDecimal(weight))
                 .getValue());
             start_utilization = adjusted_utilization;
         }
-        if (start_utilization.gt(end_utilization)) {
+        if (start_utilization.lt(end_utilization)) {
             fee += this.price_integral_delta(start_utilization, end_utilization);
         }
         return fee;
@@ -249,16 +189,12 @@ let PowerUpStateResourceCPU = class PowerUpStateResourceCPU extends PowerUpState
         // Return smallest units per day, μs (microseconds)
         this.per_day = (options) => this.us_per_day(options);
         // Default frac generation by smallest unit type
-        this.frac_legacy = (usage, us) => this.frac_by_us_legacy(usage, us);
         this.frac = (usage, us) => this.frac_by_us(usage, us);
         // Frac generation by ms (milliseconds)
-        this.frac_by_ms_legacy = (usage, ms) => this.frac_by_us_legacy(usage, ms * 1000);
         this.frac_by_ms = (usage, ms) => this.frac_by_us(usage, ms * 1000);
         // Price generation by smallest units, μs (microseconds)
-        this.price_per_legacy = (usage, us = 1000, options) => this.price_per_us_legacy(usage, us, options);
         this.price_per = (usage, us = 1000, options) => this.price_per_us(usage, us, options);
         // Price generation by ms (milliseconds)
-        this.price_per_ms_legacy = (usage, ms = 1, options) => this.price_per_us_legacy(usage, ms * 1000, options);
         this.price_per_ms = (usage, ms = 1, options) => this.price_per_us(usage, ms * 1000, options);
     }
     // Return ms (milliseconds) per day
@@ -273,24 +209,14 @@ let PowerUpStateResourceCPU = class PowerUpStateResourceCPU extends PowerUpState
         return Number(limit) * 2 * 60 * 60 * 24;
     }
     // Convert weight to μs (microseconds)
-    weight_to_us_legacy(sample, weight) {
-        return Math.ceil((weight * Number(sample)) / BNPrecision);
-    }
     weight_to_us(sample, weight) {
         return antelope.UInt128.from(antelope.UInt128.from(weight).multiplying(antelope.Int64.from(sample)).dividing(BNPrecision, 'ceil'));
     }
     // Convert μs (microseconds) to weight
-    us_to_weight_legacy(sample, us) {
-        return Math.floor((us / Number(sample)) * BNPrecision);
-    }
     us_to_weight(sample, us) {
-        return antelope.Int64.from(us).multiplying(BNPrecision).dividing(antelope.Int64.from(sample), 'floor');
+        return antelope.Int64.from(us).multiplying(BNPrecision).dividing(sample, 'floor');
     }
     // Frac generation by μs (microseconds)
-    frac_by_us_legacy(usage, us) {
-        const frac = new BN__default['default'](this.us_to_weight_legacy(usage.cpu, us)) / Number(this.weight);
-        return Math.floor(frac * Math.pow(10, 15));
-    }
     frac_by_us(usage, us) {
         const precision = 15;
         const converted = intToBigDecimal(this.us_to_weight(usage.cpu, us));
@@ -300,20 +226,6 @@ let PowerUpStateResourceCPU = class PowerUpStateResourceCPU extends PowerUpState
         return antelope.Int64.from(frac.getValue());
     }
     // Price generation by μs (microseconds)
-    price_per_us_legacy(usage, us = 1000, options) {
-        // Determine the utilization increase by this action
-        const frac = antelope.UInt128.from(this.frac_legacy(usage, us));
-        const utilization_increase = this.utilization_increase_legacy(frac);
-        // Determine the adjusted utilization if needed
-        const adjusted_utilization = this.determine_adjusted_utilization(options);
-        // Derive the fee from the increase and utilization
-        const fee = this.fee_legacy(utilization_increase, adjusted_utilization);
-        // Force the fee up to the next highest value of precision
-        const precision = Math.pow(10, this.max_price.symbol.precision);
-        const value = Math.ceil(fee * precision) / precision;
-        // Return the modified fee
-        return value;
-    }
     price_per_us(usage, us = 1000, options) {
         // Determine the utilization increase by this action
         const frac = antelope.UInt128.from(this.frac(usage, us));
@@ -339,16 +251,12 @@ let PowerUpStateResourceNET = class PowerUpStateResourceNET extends PowerUpState
         // Return smallest units per day, bytes
         this.per_day = (options) => this.bytes_per_day(options);
         // Default frac generation by smallest unit type
-        this.frac_legacy = (usage, bytes) => this.frac_by_bytes_legacy(usage, bytes);
         this.frac = (usage, bytes) => this.frac_by_bytes(usage, bytes);
         // Frac generation by kb
-        this.frac_by_kb_legacy = (usage, kilobytes) => this.frac_by_bytes_legacy(usage, kilobytes * 1000);
         this.frac_by_kb = (usage, kilobytes) => this.frac_by_bytes(usage, kilobytes * 1000);
         // Price generation by smallest units, bytes
-        this.price_per_legacy = (usage, bytes = 1000, options) => this.price_per_byte_legacy(usage, bytes, options);
         this.price_per = (usage, bytes = 1000, options) => this.price_per_byte(usage, bytes, options);
         // Price generation by kb
-        this.price_per_kb_legacy = (usage, kilobytes = 1, options) => this.price_per_byte_legacy(usage, kilobytes * 1000, options);
         this.price_per_kb = (usage, kilobytes = 1, options) => this.price_per_byte(usage, kilobytes * 1000, options);
     }
     // Return kb per day
@@ -363,25 +271,14 @@ let PowerUpStateResourceNET = class PowerUpStateResourceNET extends PowerUpState
         return Number(limit) * 2 * 60 * 60 * 24;
     }
     // Convert weight to bytes
-    weight_to_bytes_legacy(sample, weight) {
-        return Math.ceil((weight * Number(sample)) / BNPrecision);
-    }
     weight_to_bytes(sample, weight) {
         return antelope.UInt128.from(antelope.UInt128.from(weight).multiplying(antelope.Int64.from(sample)).dividing(BNPrecision, 'ceil'));
     }
     // Convert bytes to weight
-    bytes_to_weight_legacy(sample, bytes) {
-        return Math.floor((bytes / Number(sample)) * BNPrecision);
-    }
     bytes_to_weight(sample, bytes) {
         return antelope.Int64.from(bytes).multiplying(BNPrecision).dividing(antelope.Int64.from(sample), 'floor');
     }
     // Frac generation by bytes
-    frac_by_bytes_legacy(usage, bytes) {
-        const { weight } = this;
-        const frac = new BN__default['default'](this.bytes_to_weight_legacy(usage.net, bytes)) / Number(weight);
-        return Math.floor(frac * Math.pow(10, 15));
-    }
     frac_by_bytes(usage, bytes) {
         const precision = 15;
         const converted = intToBigDecimal(this.bytes_to_weight(usage.net, bytes));
@@ -391,19 +288,6 @@ let PowerUpStateResourceNET = class PowerUpStateResourceNET extends PowerUpState
         return antelope.Int64.from(frac.getValue());
     }
     // Price generation by bytes
-    price_per_byte_legacy(usage, bytes = 1000, options) {
-        // Determine the utilization increase by this action
-        const frac = antelope.UInt128.from(this.frac_legacy(usage, bytes));
-        const utilization_increase = this.utilization_increase_legacy(frac);
-        // Determine the adjusted utilization if needed
-        const adjusted_utilization = this.determine_adjusted_utilization(options);
-        // Derive the fee from the increase and utilization
-        const fee = this.fee_legacy(utilization_increase, adjusted_utilization);
-        const precision = Math.pow(10, this.max_price.symbol.precision);
-        const value = Math.ceil(fee * precision) / precision;
-        // Return the modified fee
-        return value;
-    }
     price_per_byte(usage, bytes = 1000, options) {
         // Determine the utilization increase by this action
         const frac = antelope.UInt128.from(this.frac(usage, bytes));
@@ -531,11 +415,17 @@ exports.REXState = class REXState extends antelope.Struct {
         return this.total_lent.symbol.precision;
     }
     get value() {
-        return ((Number(this.total_lent.units) + Number(this.total_unlent.units)) /
-            Number(this.total_rex.units));
+        const lent = intToBigDecimal(this.total_lent.units);
+        const unlent = intToBigDecimal(this.total_unlent.units);
+        const rex = intToBigDecimal(this.total_rex.units);
+        return Number(lent.add(unlent).divide(rex, 18).getValue());
     }
     exchange(amount) {
-        return antelope.Asset.from((amount.value * this.total_lendable.value) / this.total_rex.value, this.symbol);
+        const value = intToBigDecimal(amount.units);
+        const lendable = intToBigDecimal(this.total_lendable.units);
+        const rex = intToBigDecimal(this.total_rex.units);
+        const tokens = value.multiply(lendable).divide(rex, this.precision);
+        return antelope.Asset.fromUnits(Number(tokens.getValue()), this.symbol);
     }
     cpu_price_per_ms(sample, ms = 1) {
         return this.cpu_price_per_us(sample, ms * 1000);

package/lib/wharfkit-resources.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"wharfkit-resources.js","sources":["../src/powerup/abstract.ts","../src/powerup/cpu.ts","../src/powerup/net.ts","../src/powerup.ts","../src/ram.ts","../src/rex.ts","../src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null],"names":["Struct","UInt64","BN","UInt128","Asset","Int64","bigDecimal","TimePointSec","__decorate","PowerUpState","Connector","ExchangeState","RAMState","REXState","APIClient","FetchProvider"],"mappings":"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"}
1	+ {"version":3,"file":"wharfkit-resources.js","sources":["../src/powerup/abstract.ts","../src/powerup/cpu.ts","../src/powerup/net.ts","../src/powerup.ts","../src/ram.ts","../src/rex.ts","../src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null],"names":["Struct","UInt64","UInt128","Asset","Int64","TimePointSec","__decorate","PowerUpState","Connector","ExchangeState","RAMState","REXState","BN","APIClient","FetchProvider","bigDecimal"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAesB,oBAAqB,SAAQA,eAAM;IAAzD;;QAiBa,4BAAuB,GAAWC,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACrD,4BAAuB,GAAWA,eAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;KA0GrE;;IArGG,IAAW,SAAS;QAChB,OAAO,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,GAAG,GAAG,CAAA;KAChF;;IAGD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KAChD;;IAGD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAA;KAC/B;;IAGD,oBAAoB,CAAC,IAAa;QAC9B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAClC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3C,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACpD,OAAOC,gBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;KACtF;;IAGD,cAAc,CAAC,WAAkB;QAC7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAA;QACrB,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;QAChD,IAAI,YAAY,IAAI,GAAG,EAAE;YACrB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA;SAC9B;aAAM;;YAEH,MAAM,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;YACpF,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA;YAC9D,KAAK,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;SAC/E;QACD,OAAO,KAAK,CAAA;KACf;;IAGD,oBAAoB,CAAC,iBAAwB,EAAE,eAAsB;QACjE,MAAM,UAAU,GAAGC,cAAK,CAAC,SAAS,CAC9B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EACtD,IAAI,CAAC,MAAM,CACd,CAAA;QACD,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;QAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC3D,MAAM,KAAK,GACP,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK;YAC5B,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,OAAO;YAC9B,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAClD,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QACxD,OAAO,KAAK,CAAA;KACf;;IAGD,GAAG,CAAC,oBAA6B,EAAE,oBAA2B;QAC1D,MAAM,EAAC,WAAW,EAAE,MAAM,EAAC,GAAG,IAAI,CAAA;QAElC,IAAI,iBAAiB,GAAGC,cAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC/C,MAAM,eAAe,GAAG,iBAAiB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAA;QAEtE,IAAI,GAAG,GAAG,CAAC,CAAA;QACX,IAAI,iBAAiB,CAAC,EAAE,CAAC,oBAAoB,CAAC,EAAE;YAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAChB,MAAM,CAAC,oBAAoB,CAAC,EAC5B,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAC9D,CAAA;YACD,GAAG,IAAI,MAAM,CACT,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG,GAAG,CAAC;iBAC3D,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;iBAC/B,QAAQ,EAAE,CAClB,CAAA;YAED,iBAAiB,GAAG,oBAAoB,CAAA;SAC3C;QACD,IAAI,iBAAiB,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE;YACvC,GAAG,IAAI,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAA;SACvE;QACD,OAAO,GAAG,CAAA;KACb;;IAGD,8BAA8B,CAAC,OAA6B;;QAExD,MAAM,EAAC,UAAU,EAAE,WAAW,EAAE,qBAAqB,EAAC,GAAG,IAAI,CAAA;QAC7D,IAAI,EAAC,oBAAoB,EAAC,GAAG,IAAI,CAAA;;QAEjC,IAAI,WAAW,CAAC,EAAE,CAAC,oBAAoB,CAAC,EAAE;;YAEtC,MAAM,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;YACxE,MAAM,GAAG,GAAGC,qBAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,EAAE,GAAG,IAAI,CAAA;YACzD,MAAM,IAAI,GAAG,oBAAoB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAA;YACrE,IAAI,KAAK,GACL,IAAI;gBACJ,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,qBAAqB,CAAC,cAAc,EAAE,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;YAClF,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;YAC1C,oBAAoB,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;SACnD;QACD,OAAO,oBAAoB,CAAA;KAC9B;CACJ;AA3H0BC;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;qDAAgB;AACfM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oDAAe;AACdM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;0DAAqB;AACpBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kEAA6B;AAC5BM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kEAA6B;AAC5BM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;iEAA4B;AAClBM;IAA/BN,eAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;+DAAiC;AAChCM;IAA/BN,eAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;8DAAgC;AACtCM;IAAxBN,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC;sDAAmB;AACnBM;IAAvBN,eAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;wDAAoB;AACpBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;uDAAkB;AACjBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;uDAAkB;AACjBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;yDAAoB;AACnBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kEAA6B;AACnBM;IAA/BN,eAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;mEAAqC;;ACvBxE,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,oBAAoB;IAAjE;;;QAEI,YAAO,GAAG,CAAC,OAA6B,KAAK,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;;QA6BrE,SAAI,GAAG,CAAC,KAAkB,EAAE,EAAU,KAAK,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;;QAGrE,eAAU,GAAG,CAAC,KAAkB,EAAE,EAAU,KAAK,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;;QAalF,cAAS,GAAG,CAAC,KAAkB,EAAE,EAAE,GAAG,IAAI,EAAE,OAA6B,KACrE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;;QAGzC,iBAAY,GAAG,CAAC,KAAkB,EAAE,EAAE,GAAG,CAAC,EAAE,OAA6B,KACrE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,CAAC,CAAA;KAiBnD;;IAhEG,UAAU,CAAC,OAA6B;QACpC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;KACzC;;IAGD,UAAU,CAAC,OAA6B;QACpC,MAAM,KAAK,GACP,OAAO,IAAI,OAAO,CAAC,uBAAuB;cACpC,OAAO,CAAC,uBAAuB;cAC/B,IAAI,CAAC,uBAAuB,CAAA;QACtC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;KAC1C;;IAGD,YAAY,CAAC,MAAmB,EAAE,MAAiB;QAC/C,OAAOE,gBAAO,CAAC,IAAI,CACfA,gBAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAACE,cAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CACrF,CAAA;KACJ;;IAGD,YAAY,CAAC,MAAe,EAAE,EAAa;QACvC,OAAOA,cAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC3E;;IASD,UAAU,CAAC,KAAkB,EAAE,EAAa;QACxC,MAAM,SAAS,GAAG,EAAE,CAAA;QACpB,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;QACnE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;QAC3D,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtE,OAAOA,cAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;;IAWD,YAAY,CAAC,KAAkB,EAAE,EAAE,GAAG,IAAI,EAAE,OAA6B;;QAErE,MAAM,IAAI,GAAGF,gBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAA;QAC/C,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;;QAE5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAA;;QAEzE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAA;;QAEhE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,SAAS,CAAA;;QAEpD,OAAO,KAAK,CAAA;KACf;CACJ,CAAA;AArEY,uBAAuB;IADnCF,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC;GAC1B,uBAAuB,CAqEnC;;ACrED,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,oBAAoB;IAAjE;;;QAEI,YAAO,GAAG,CAAC,OAA6B,KAAK,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;;QA6BxE,SAAI,GAAG,CAAC,KAAkB,EAAE,KAAa,KAAK,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;;QAG9E,eAAU,GAAG,CAAC,KAAkB,EAAE,SAAiB,KAC/C,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;;QAa/C,cAAS,GAAG,CAAC,KAAkB,EAAE,KAAK,GAAG,IAAI,EAAE,OAA6B,KACxE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;;QAG9C,iBAAY,GAAG,CAAC,KAAkB,EAAE,SAAS,GAAG,CAAC,EAAE,OAA6B,KAC5E,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,EAAE,OAAO,CAAC,CAAA;KAqB5D;;IArEG,UAAU,CAAC,OAA6B;QACpC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;KAC5C;;IAGD,aAAa,CAAC,OAA6B;QACvC,MAAM,KAAK,GACP,OAAO,IAAI,OAAO,CAAC,uBAAuB;cACpC,OAAO,CAAC,uBAAuB;cAC/B,IAAI,CAAC,uBAAuB,CAAA;QACtC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;KAC1C;;IAGD,eAAe,CAAC,MAAe,EAAE,MAAc;QAC3C,OAAOE,gBAAO,CAAC,IAAI,CACfA,gBAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAACE,cAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CACrF,CAAA;KACJ;;IAGD,eAAe,CAAC,MAAe,EAAE,KAAgB;QAC7C,OAAOA,cAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,CAACA,cAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAA;KAC1F;;IAUD,aAAa,CAAC,KAAkB,EAAE,KAAgB;QAC9C,MAAM,SAAS,GAAG,EAAE,CAAA;QACpB,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;QACzE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;QAC3D,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtE,OAAOA,cAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;;IAWD,cAAc,CAAC,KAAkB,EAAE,KAAK,GAAG,IAAI,EAAE,OAA6B;;QAE1E,MAAM,IAAI,GAAGF,gBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;QAClD,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;;QAG5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAA;;QAGzE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAA;;QAGhE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,SAAS,CAAA;;QAGpD,OAAO,KAAK,CAAA;KACf;CACJ,CAAA;AA1EY,uBAAuB;IADnCF,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC;GAC1B,uBAAuB,CA0EnC;;AC1EYO,oBAAY,GAAzB,MAAa,YAAa,SAAQP,eAAM;EAMvC;AAL0BM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;qDAAgB;AACCM;IAAtCN,eAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC;iDAA8B;AAC7BM;IAAtCN,eAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC;iDAA8B;AAC5CM;IAAvBN,eAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;0DAAsB;AACtBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;6DAAwB;AALrCO,oBAAY;IADxBP,eAAM,CAAC,IAAI,CAAC,cAAc,CAAC;GACfO,oBAAY,CAMxB;MAEY,UAAU;IACnB,YAAoB,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;KAAI;IAEnC,SAAS;;YACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;gBAC3D,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,aAAa;gBACpB,IAAI,EAAEA,oBAAY;aACrB,CAAC,CAAA;YACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAC1B;KAAA;;;ACrBQC,iBAAS,GAAtB,MAAa,SAAU,SAAQR,eAAM;EAGpC;AAF0BM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kDAAgB;AACbM;IAAxBN,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC;iDAAiB;AAFhCQ,iBAAS;IADrBR,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC;GACZQ,iBAAS,CAGrB;AAGYC,qBAAa,GAA1B,MAAa,aAAc,SAAQT,eAAM;EAIxC;AAH0BM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;qDAAe;AACZM;IAAxBN,eAAM,CAAC,KAAK,CAACQ,iBAAS,CAAC;mDAAiB;AAChBF;IAAxBN,eAAM,CAAC,KAAK,CAACQ,iBAAS,CAAC;oDAAkB;AAHjCC,qBAAa;IADzBT,eAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;GACjBS,qBAAa,CAIzB;AAGYC,gBAAQ,GAArB,MAAa,QAAS,SAAQD,qBAAa;IAChC,SAAS,CAAC,KAAa;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAA;QACtC,OAAON,cAAK,CAAC,SAAS,CAClB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAEC,cAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAC5B,CAAA;KACJ;IAEM,YAAY,CAAC,SAAiB;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;KAC1C;;IAGM,SAAS,CAAC,IAAW,EAAE,KAAY,EAAE,KAAY;;QAEpD,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;KAC5E;EACJ;AAnBYM,gBAAQ;IADpBV,eAAM,CAAC,IAAI,CAAC,UAAU,CAAC;GACXU,gBAAQ,CAmBpB;MAEY,MAAM;IACf,YAAoB,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;KAAI;IAEnC,SAAS;;YACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;gBAC3D,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,OAAO;gBACd,KAAK,EAAE,WAAW;gBAClB,IAAI,EAAEA,gBAAQ;aACjB,CAAC,CAAA;YACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAC1B;KAAA;;;AC7CQC,gBAAQ,GAArB,MAAa,QAAS,SAAQX,eAAM;IAUhC,IAAW,QAAQ;QACf,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;KAC3E;IAED,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;KAChC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAA;KAC1C;IAED,IAAW,KAAK;QACZ,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACjD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;KAC7D;IAED,QAAQ,CAAC,MAAa;QAClB,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC3C,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAC3D,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACnE,OAAOG,cAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;KACjE;IAED,gBAAgB,CAAC,MAAmB,EAAE,EAAE,GAAG,CAAC;QACxC,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;KAClD;IAED,gBAAgB,CAAC,MAAmB,EAAE,EAAE,GAAG,IAAI;QAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;KAChD;IAED,gBAAgB,CAAC,MAAmB,EAAE,SAAS,GAAG,CAAC;QAC/C,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;KAC3D;IAED,kBAAkB,CAAC,MAAmB,EAAE,KAAK,GAAG,IAAI;QAChD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;KACnD;IAED,SAAS,CAAC,MAAmB,EAAE,IAAI,GAAG,IAAI,EAAE,QAAiB,MAAM,CAAC,GAAG;;QAEnE,MAAM,MAAM,GAAGA,cAAK,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;;QAGlD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;;QAGvF,MAAM,SAAS,GAAG,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,CAAA;;QAGxD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;;QAGhD,MAAM,IAAI,GAAG,OAAO,GAAG,IAAI,CAAA;;QAG3B,OAAO,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;KAC7C;EACJ;AAvE0BG;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;iDAAgB;AACfM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oDAAmB;AAClBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;sDAAqB;AACpBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oDAAmB;AAClBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;wDAAuB;AACtBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;mDAAkB;AACjBM;IAAtBN,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;0DAAyB;AACvBM;IAAvBN,eAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;kDAAkB;AARhCW,gBAAQ;IADpBX,eAAM,CAAC,IAAI,CAAC,UAAU,CAAC;GACXW,gBAAQ,CAwEpB;MAEY,MAAM;IACf,YAAoB,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;KAAI;IAEnC,SAAS;;YACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;gBAC3D,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,OAAO;gBACd,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAEA,gBAAQ;aACjB,CAAC,CAAA;YACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAC1B;KAAA;;;MCjEQ,WAAW,GAAG,IAAIC,sBAAE,CAAC,GAAG,GAAG,IAAI,GAAG,IAAI,EAAC;MAEvC,SAAS;IAWlB,YAAY,OAAyB;;QALrC,kBAAa,GAAG,cAAc,CAAA;;QAG9B,WAAM,GAAG,OAAO,CAAA;QAqBhB,OAAE,GAAG;YACD,OAAO,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC;YAC7B,GAAG,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC;YACrB,GAAG,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC;SACxB,CAAA;;QArBG,IAAI,OAAO,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;SAC7C;;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;SAC/B;;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;SACzB;aAAM,IAAI,OAAO,CAAC,GAAG,EAAE;YACpB,IAAI,CAAC,GAAG,GAAG,IAAIC,kBAAS,CAAC,EAAC,QAAQ,EAAE,IAAIC,sBAAa,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAC,CAAC,CAAA;SAChF;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC/C;KACJ;IAQK,eAAe;;YACjB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YACvE,MAAM,EAAE,GAAGZ,gBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;YACrE,MAAM,IAAI,GAAGA,gBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;YAEvE,MAAM,UAAU,GAAGA,gBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YACzD,MAAM,UAAU,GAAGA,gBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YAEzD,OAAO;gBACH,OAAO;gBACP,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC;gBACxC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC;aAC7C,CAAA;SACJ;KAAA;;AAhDM,qBAAW,GAAG,WAAW,CAAA;AAmDpC,SAAS,OAAO,CAAC,GAAO,EAAE,GAAO;IAC7B,IAAI,CAAC,GAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACxB,MAAM,IAAI,GAAG,IAAIU,sBAAE,CAAC,CAAC,CAAC,CAAA;IACtB,MAAM,GAAG,GAAG,IAAIA,sBAAE,CAAC,CAAC,CAAC,CAAA;IACrB,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;QACpC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KACjB;IACD,OAAOV,gBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC1B,CAAC;SAEe,eAAe,CAAC,KAAmB;IAC/C,OAAO,IAAIa,8BAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;AACxC;;;;;;;;;"}

package/lib/wharfkit-resources.m.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * @wharfkit/resources v1.5.0-rc2
+ * @wharfkit/resources v1.5.0-rc4
  * https://github.com/wharfkit/resources
  *
  * @license
@@ -45,16 +45,10 @@ class PowerUpStateResource extends Struct {
         this.default_block_net_limit = UInt64.from(1048576000);
     }
     // Get the current number of allocated units (shift from REX -> PowerUp)
-    get allocated_legacy() {
-        return 1 - Number(this.weight_ratio) / Number(this.target_weight_ratio) / 100;
-    }
     get allocated() {
         return 1 - Number(this.weight_ratio.dividing(this.target_weight_ratio)) / 100;
     }
     // Get the current percentage of reserved units
-    get reserved_legacy() {
-        return new BN(String(this.utilization)) / new BN(String(this.weight));
-    }
     get reserved() {
         return this.utilization.dividing(this.weight);
     }
@@ -63,33 +57,13 @@ class PowerUpStateResource extends Struct {
         return this.min_price.symbol;
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L358
-    utilization_increase_legacy(frac) {
-        const { weight } = this;
-        const frac128 = UInt128.from(frac);
-        const utilization_increase = new BN(weight.value.mul(new BN(frac128.value))) / Math.pow(10, 15);
-        return Math.ceil(utilization_increase);
-    }
     utilization_increase(frac) {
-        return frac.multiplying(this.weight).dividing(UInt128.from(Math.pow(10, 15)), 'ceil');
+        const base = intToBigDecimal(frac);
+        const weight = intToBigDecimal(this.weight);
+        const multiplier = intToBigDecimal(Math.pow(10, 15));
+        return UInt128.from(base.multiply(weight).divide(multiplier, 15).ceil().getValue());
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L284-L298
-    price_function_legacy(utilization) {
-        const { exponent, weight } = this;
-        const max_price = this.max_price.value;
-        const min_price = this.min_price.value;
-        let price = min_price;
-        const new_exponent = Number(exponent) - 1.0;
-        if (new_exponent <= 0.0) {
-            return max_price;
-        }
-        else {
-            const util_weight = new BN(Number(utilization)) / Number(weight);
-            console.log('old', String(util_weight));
-            console.log('diff', max_price - min_price);
-            price += (max_price - min_price) * Math.pow(util_weight, new_exponent);
-        }
-        return price;
-    }
     price_function(utilization) {
         const { weight } = this;
         let price = this.min_price.value;
@@ -100,27 +74,12 @@ class PowerUpStateResource extends Struct {
         else {
             // const util_weight = utilization.dividing(weight)
             const util_weight = intToBigDecimal(utilization).divide(intToBigDecimal(weight), 18);
-            console.log('new', String(util_weight.getValue()));
-            const difference = this.max_price.units.subtracting(this.min_price.units);
-            console.log('diff', String(difference));
-            price += difference.value * Math.pow(Number(util_weight.getValue()), new_exponent);
+            const difference = this.max_price.value - this.min_price.value;
+            price += difference * Math.pow(Number(util_weight.getValue()), new_exponent);
         }
         return price;
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L274-L280
-    price_integral_delta_legacy(start_utilization, end_utilization) {
-        const { exponent, weight } = this;
-        const max_price = this.max_price.value;
-        const min_price = this.min_price.value;
-        const coefficient = (max_price - min_price) / exponent.value;
-        const start_u = Number(start_utilization.dividing(weight));
-        const end_u = Number(end_utilization.dividing(weight));
-        const delta = min_price * end_u -
-            min_price * start_u +
-            coefficient * Math.pow(end_u, exponent.value) -
-            coefficient * Math.pow(start_u, exponent.value);
-        return delta;
-    }
     price_integral_delta(start_utilization, end_utilization) {
         const difference = Asset.fromUnits(this.max_price.units.subtracting(this.min_price.units), this.symbol);
         const coefficient = difference.value / this.exponent.value;
@@ -133,23 +92,6 @@ class PowerUpStateResource extends Struct {
         return delta;
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L262-L315
-    fee_legacy(utilization_increase, adjusted_utilization) {
-        const { utilization, weight } = this;
-        let start_utilization = Int64.from(utilization);
-        const end_utilization = start_utilization.adding(utilization_increase);
-        let fee = 0;
-        if (start_utilization < adjusted_utilization) {
-            const min = Math.min(utilization_increase, adjusted_utilization.subtracting(start_utilization));
-            fee += Number(new bigDecimal(this.price_function_legacy(adjusted_utilization) * min)
-                .divide(new bigDecimal(weight.toString()))
-                .getValue());
-            start_utilization = adjusted_utilization;
-        }
-        if (start_utilization.gt(end_utilization)) {
-            fee += this.price_integral_delta(start_utilization, end_utilization);
-        }
-        return fee;
-    }
     fee(utilization_increase, adjusted_utilization) {
         const { utilization, weight } = this;
         let start_utilization = Int64.from(utilization);
@@ -157,14 +99,12 @@ class PowerUpStateResource extends Struct {
         let fee = 0;
         if (start_utilization.lt(adjusted_utilization)) {
             const min = Math.min(Number(utilization_increase), Number(adjusted_utilization.subtracting(start_utilization)));
-            fee += Number(new bigDecimal(String((this.price_function(adjusted_utilization) /
-                Math.pow(10, this.symbol.precision)) *
-                min))
-                .divide(new bigDecimal(weight.toString()))
+            fee += Number(intToBigDecimal(this.price_function(adjusted_utilization) * min)
+                .divide(intToBigDecimal(weight))
                 .getValue());
             start_utilization = adjusted_utilization;
         }
-        if (start_utilization.gt(end_utilization)) {
+        if (start_utilization.lt(end_utilization)) {
             fee += this.price_integral_delta(start_utilization, end_utilization);
         }
         return fee;
@@ -240,16 +180,12 @@ let PowerUpStateResourceCPU = class PowerUpStateResourceCPU extends PowerUpState
         // Return smallest units per day, μs (microseconds)
         this.per_day = (options) => this.us_per_day(options);
         // Default frac generation by smallest unit type
-        this.frac_legacy = (usage, us) => this.frac_by_us_legacy(usage, us);
         this.frac = (usage, us) => this.frac_by_us(usage, us);
         // Frac generation by ms (milliseconds)
-        this.frac_by_ms_legacy = (usage, ms) => this.frac_by_us_legacy(usage, ms * 1000);
         this.frac_by_ms = (usage, ms) => this.frac_by_us(usage, ms * 1000);
         // Price generation by smallest units, μs (microseconds)
-        this.price_per_legacy = (usage, us = 1000, options) => this.price_per_us_legacy(usage, us, options);
         this.price_per = (usage, us = 1000, options) => this.price_per_us(usage, us, options);
         // Price generation by ms (milliseconds)
-        this.price_per_ms_legacy = (usage, ms = 1, options) => this.price_per_us_legacy(usage, ms * 1000, options);
         this.price_per_ms = (usage, ms = 1, options) => this.price_per_us(usage, ms * 1000, options);
     }
     // Return ms (milliseconds) per day
@@ -264,24 +200,14 @@ let PowerUpStateResourceCPU = class PowerUpStateResourceCPU extends PowerUpState
         return Number(limit) * 2 * 60 * 60 * 24;
     }
     // Convert weight to μs (microseconds)
-    weight_to_us_legacy(sample, weight) {
-        return Math.ceil((weight * Number(sample)) / BNPrecision);
-    }
     weight_to_us(sample, weight) {
         return UInt128.from(UInt128.from(weight).multiplying(Int64.from(sample)).dividing(BNPrecision, 'ceil'));
     }
     // Convert μs (microseconds) to weight
-    us_to_weight_legacy(sample, us) {
-        return Math.floor((us / Number(sample)) * BNPrecision);
-    }
     us_to_weight(sample, us) {
-        return Int64.from(us).multiplying(BNPrecision).dividing(Int64.from(sample), 'floor');
+        return Int64.from(us).multiplying(BNPrecision).dividing(sample, 'floor');
     }
     // Frac generation by μs (microseconds)
-    frac_by_us_legacy(usage, us) {
-        const frac = new BN(this.us_to_weight_legacy(usage.cpu, us)) / Number(this.weight);
-        return Math.floor(frac * Math.pow(10, 15));
-    }
     frac_by_us(usage, us) {
         const precision = 15;
         const converted = intToBigDecimal(this.us_to_weight(usage.cpu, us));
@@ -291,20 +217,6 @@ let PowerUpStateResourceCPU = class PowerUpStateResourceCPU extends PowerUpState
         return Int64.from(frac.getValue());
     }
     // Price generation by μs (microseconds)
-    price_per_us_legacy(usage, us = 1000, options) {
-        // Determine the utilization increase by this action
-        const frac = UInt128.from(this.frac_legacy(usage, us));
-        const utilization_increase = this.utilization_increase_legacy(frac);
-        // Determine the adjusted utilization if needed
-        const adjusted_utilization = this.determine_adjusted_utilization(options);
-        // Derive the fee from the increase and utilization
-        const fee = this.fee_legacy(utilization_increase, adjusted_utilization);
-        // Force the fee up to the next highest value of precision
-        const precision = Math.pow(10, this.max_price.symbol.precision);
-        const value = Math.ceil(fee * precision) / precision;
-        // Return the modified fee
-        return value;
-    }
     price_per_us(usage, us = 1000, options) {
         // Determine the utilization increase by this action
         const frac = UInt128.from(this.frac(usage, us));
@@ -330,16 +242,12 @@ let PowerUpStateResourceNET = class PowerUpStateResourceNET extends PowerUpState
         // Return smallest units per day, bytes
         this.per_day = (options) => this.bytes_per_day(options);
         // Default frac generation by smallest unit type
-        this.frac_legacy = (usage, bytes) => this.frac_by_bytes_legacy(usage, bytes);
         this.frac = (usage, bytes) => this.frac_by_bytes(usage, bytes);
         // Frac generation by kb
-        this.frac_by_kb_legacy = (usage, kilobytes) => this.frac_by_bytes_legacy(usage, kilobytes * 1000);
         this.frac_by_kb = (usage, kilobytes) => this.frac_by_bytes(usage, kilobytes * 1000);
         // Price generation by smallest units, bytes
-        this.price_per_legacy = (usage, bytes = 1000, options) => this.price_per_byte_legacy(usage, bytes, options);
         this.price_per = (usage, bytes = 1000, options) => this.price_per_byte(usage, bytes, options);
         // Price generation by kb
-        this.price_per_kb_legacy = (usage, kilobytes = 1, options) => this.price_per_byte_legacy(usage, kilobytes * 1000, options);
         this.price_per_kb = (usage, kilobytes = 1, options) => this.price_per_byte(usage, kilobytes * 1000, options);
     }
     // Return kb per day
@@ -354,25 +262,14 @@ let PowerUpStateResourceNET = class PowerUpStateResourceNET extends PowerUpState
         return Number(limit) * 2 * 60 * 60 * 24;
     }
     // Convert weight to bytes
-    weight_to_bytes_legacy(sample, weight) {
-        return Math.ceil((weight * Number(sample)) / BNPrecision);
-    }
     weight_to_bytes(sample, weight) {
         return UInt128.from(UInt128.from(weight).multiplying(Int64.from(sample)).dividing(BNPrecision, 'ceil'));
     }
     // Convert bytes to weight
-    bytes_to_weight_legacy(sample, bytes) {
-        return Math.floor((bytes / Number(sample)) * BNPrecision);
-    }
     bytes_to_weight(sample, bytes) {
         return Int64.from(bytes).multiplying(BNPrecision).dividing(Int64.from(sample), 'floor');
     }
     // Frac generation by bytes
-    frac_by_bytes_legacy(usage, bytes) {
-        const { weight } = this;
-        const frac = new BN(this.bytes_to_weight_legacy(usage.net, bytes)) / Number(weight);
-        return Math.floor(frac * Math.pow(10, 15));
-    }
     frac_by_bytes(usage, bytes) {
         const precision = 15;
         const converted = intToBigDecimal(this.bytes_to_weight(usage.net, bytes));
@@ -382,19 +279,6 @@ let PowerUpStateResourceNET = class PowerUpStateResourceNET extends PowerUpState
         return Int64.from(frac.getValue());
     }
     // Price generation by bytes
-    price_per_byte_legacy(usage, bytes = 1000, options) {
-        // Determine the utilization increase by this action
-        const frac = UInt128.from(this.frac_legacy(usage, bytes));
-        const utilization_increase = this.utilization_increase_legacy(frac);
-        // Determine the adjusted utilization if needed
-        const adjusted_utilization = this.determine_adjusted_utilization(options);
-        // Derive the fee from the increase and utilization
-        const fee = this.fee_legacy(utilization_increase, adjusted_utilization);
-        const precision = Math.pow(10, this.max_price.symbol.precision);
-        const value = Math.ceil(fee * precision) / precision;
-        // Return the modified fee
-        return value;
-    }
     price_per_byte(usage, bytes = 1000, options) {
         // Determine the utilization increase by this action
         const frac = UInt128.from(this.frac(usage, bytes));
@@ -518,11 +402,17 @@ let REXState = class REXState extends Struct {
         return this.total_lent.symbol.precision;
     }
     get value() {
-        return ((Number(this.total_lent.units) + Number(this.total_unlent.units)) /
-            Number(this.total_rex.units));
+        const lent = intToBigDecimal(this.total_lent.units);
+        const unlent = intToBigDecimal(this.total_unlent.units);
+        const rex = intToBigDecimal(this.total_rex.units);
+        return Number(lent.add(unlent).divide(rex, 18).getValue());
     }
     exchange(amount) {
-        return Asset.from((amount.value * this.total_lendable.value) / this.total_rex.value, this.symbol);
+        const value = intToBigDecimal(amount.units);
+        const lendable = intToBigDecimal(this.total_lendable.units);
+        const rex = intToBigDecimal(this.total_rex.units);
+        const tokens = value.multiply(lendable).divide(rex, this.precision);
+        return Asset.fromUnits(Number(tokens.getValue()), this.symbol);
     }
     cpu_price_per_ms(sample, ms = 1) {
         return this.cpu_price_per_us(sample, ms * 1000);

package/lib/wharfkit-resources.m.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"wharfkit-resources.m.js","sources":["../src/powerup/abstract.ts","../src/powerup/cpu.ts","../src/powerup/net.ts","../src/powerup.ts","../src/ram.ts","../src/rex.ts","../src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"wharfkit-resources.m.js","sources":["../src/powerup/abstract.ts","../src/powerup/cpu.ts","../src/powerup/net.ts","../src/powerup.ts","../src/ram.ts","../src/rex.ts","../src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAesB,oBAAqB,SAAQ,MAAM;IAAzD;;QAiBa,4BAAuB,GAAW,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACrD,4BAAuB,GAAW,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;KA0GrE;;IArGG,IAAW,SAAS;QAChB,OAAO,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,GAAG,GAAG,CAAA;KAChF;;IAGD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KAChD;;IAGD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAA;KAC/B;;IAGD,oBAAoB,CAAC,IAAa;QAC9B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAClC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3C,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACpD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;KACtF;;IAGD,cAAc,CAAC,WAAkB;QAC7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAA;QACrB,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;QAChD,IAAI,YAAY,IAAI,GAAG,EAAE;YACrB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA;SAC9B;aAAM;;YAEH,MAAM,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;YACpF,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA;YAC9D,KAAK,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;SAC/E;QACD,OAAO,KAAK,CAAA;KACf;;IAGD,oBAAoB,CAAC,iBAAwB,EAAE,eAAsB;QACjE,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAC9B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EACtD,IAAI,CAAC,MAAM,CACd,CAAA;QACD,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;QAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC3D,MAAM,KAAK,GACP,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK;YAC5B,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,OAAO;YAC9B,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAClD,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QACxD,OAAO,KAAK,CAAA;KACf;;IAGD,GAAG,CAAC,oBAA6B,EAAE,oBAA2B;QAC1D,MAAM,EAAC,WAAW,EAAE,MAAM,EAAC,GAAG,IAAI,CAAA;QAElC,IAAI,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC/C,MAAM,eAAe,GAAG,iBAAiB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAA;QAEtE,IAAI,GAAG,GAAG,CAAC,CAAA;QACX,IAAI,iBAAiB,CAAC,EAAE,CAAC,oBAAoB,CAAC,EAAE;YAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAChB,MAAM,CAAC,oBAAoB,CAAC,EAC5B,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAC9D,CAAA;YACD,GAAG,IAAI,MAAM,CACT,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG,GAAG,CAAC;iBAC3D,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;iBAC/B,QAAQ,EAAE,CAClB,CAAA;YAED,iBAAiB,GAAG,oBAAoB,CAAA;SAC3C;QACD,IAAI,iBAAiB,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE;YACvC,GAAG,IAAI,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAA;SACvE;QACD,OAAO,GAAG,CAAA;KACb;;IAGD,8BAA8B,CAAC,OAA6B;;QAExD,MAAM,EAAC,UAAU,EAAE,WAAW,EAAE,qBAAqB,EAAC,GAAG,IAAI,CAAA;QAC7D,IAAI,EAAC,oBAAoB,EAAC,GAAG,IAAI,CAAA;;QAEjC,IAAI,WAAW,CAAC,EAAE,CAAC,oBAAoB,CAAC,EAAE;;YAEtC,MAAM,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;YACxE,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,EAAE,GAAG,IAAI,CAAA;YACzD,MAAM,IAAI,GAAG,oBAAoB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAA;YACrE,IAAI,KAAK,GACL,IAAI;gBACJ,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,qBAAqB,CAAC,cAAc,EAAE,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;YAClF,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;YAC1C,oBAAoB,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;SACnD;QACD,OAAO,oBAAoB,CAAA;KAC9B;CACJ;AA3H0B;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;qDAAgB;AACf;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oDAAe;AACd;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;0DAAqB;AACpB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kEAA6B;AAC5B;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kEAA6B;AAC5B;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;iEAA4B;AAClB;IAA/B,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;+DAAiC;AAChC;IAA/B,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;8DAAgC;AACtC;IAAxB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;sDAAmB;AACnB;IAAvB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;wDAAoB;AACpB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;uDAAkB;AACjB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;uDAAkB;AACjB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;yDAAoB;AACnB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kEAA6B;AACnB;IAA/B,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC;mEAAqC;;ACvBxE,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,oBAAoB;IAAjE;;;QAEI,YAAO,GAAG,CAAC,OAA6B,KAAK,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;;QA6BrE,SAAI,GAAG,CAAC,KAAkB,EAAE,EAAU,KAAK,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;;QAGrE,eAAU,GAAG,CAAC,KAAkB,EAAE,EAAU,KAAK,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;;QAalF,cAAS,GAAG,CAAC,KAAkB,EAAE,EAAE,GAAG,IAAI,EAAE,OAA6B,KACrE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;;QAGzC,iBAAY,GAAG,CAAC,KAAkB,EAAE,EAAE,GAAG,CAAC,EAAE,OAA6B,KACrE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,CAAC,CAAA;KAiBnD;;IAhEG,UAAU,CAAC,OAA6B;QACpC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;KACzC;;IAGD,UAAU,CAAC,OAA6B;QACpC,MAAM,KAAK,GACP,OAAO,IAAI,OAAO,CAAC,uBAAuB;cACpC,OAAO,CAAC,uBAAuB;cAC/B,IAAI,CAAC,uBAAuB,CAAA;QACtC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;KAC1C;;IAGD,YAAY,CAAC,MAAmB,EAAE,MAAiB;QAC/C,OAAO,OAAO,CAAC,IAAI,CACf,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CACrF,CAAA;KACJ;;IAGD,YAAY,CAAC,MAAe,EAAE,EAAa;QACvC,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC3E;;IASD,UAAU,CAAC,KAAkB,EAAE,EAAa;QACxC,MAAM,SAAS,GAAG,EAAE,CAAA;QACpB,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;QACnE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;QAC3D,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;;IAWD,YAAY,CAAC,KAAkB,EAAE,EAAE,GAAG,IAAI,EAAE,OAA6B;;QAErE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAA;QAC/C,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;;QAE5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAA;;QAEzE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAA;;QAEhE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,SAAS,CAAA;;QAEpD,OAAO,KAAK,CAAA;KACf;CACJ,CAAA;AArEY,uBAAuB;IADnC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC;GAC1B,uBAAuB,CAqEnC;;ACrED,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,oBAAoB;IAAjE;;;QAEI,YAAO,GAAG,CAAC,OAA6B,KAAK,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;;QA6BxE,SAAI,GAAG,CAAC,KAAkB,EAAE,KAAa,KAAK,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;;QAG9E,eAAU,GAAG,CAAC,KAAkB,EAAE,SAAiB,KAC/C,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;;QAa/C,cAAS,GAAG,CAAC,KAAkB,EAAE,KAAK,GAAG,IAAI,EAAE,OAA6B,KACxE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;;QAG9C,iBAAY,GAAG,CAAC,KAAkB,EAAE,SAAS,GAAG,CAAC,EAAE,OAA6B,KAC5E,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,EAAE,OAAO,CAAC,CAAA;KAqB5D;;IArEG,UAAU,CAAC,OAA6B;QACpC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;KAC5C;;IAGD,aAAa,CAAC,OAA6B;QACvC,MAAM,KAAK,GACP,OAAO,IAAI,OAAO,CAAC,uBAAuB;cACpC,OAAO,CAAC,uBAAuB;cAC/B,IAAI,CAAC,uBAAuB,CAAA;QACtC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;KAC1C;;IAGD,eAAe,CAAC,MAAe,EAAE,MAAc;QAC3C,OAAO,OAAO,CAAC,IAAI,CACf,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CACrF,CAAA;KACJ;;IAGD,eAAe,CAAC,MAAe,EAAE,KAAgB;QAC7C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAA;KAC1F;;IAUD,aAAa,CAAC,KAAkB,EAAE,KAAgB;QAC9C,MAAM,SAAS,GAAG,EAAE,CAAA;QACpB,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;QACzE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;QAC3D,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;;IAWD,cAAc,CAAC,KAAkB,EAAE,KAAK,GAAG,IAAI,EAAE,OAA6B;;QAE1E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;QAClD,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;;QAG5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAA;;QAGzE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAA;;QAGhE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,SAAS,CAAA;;QAGpD,OAAO,KAAK,CAAA;KACf;CACJ,CAAA;AA1EY,uBAAuB;IADnC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC;GAC1B,uBAAuB,CA0EnC;;IC1EY,YAAY,GAAzB,MAAa,YAAa,SAAQ,MAAM;EAMvC;AAL0B;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;6CAAgB;AACC;IAAtC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC;yCAA8B;AAC7B;IAAtC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC;yCAA8B;AAC5C;IAAvB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;kDAAsB;AACtB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;qDAAwB;AALrC,YAAY;IADxB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;GACf,YAAY,CAMxB;MAEY,UAAU;IACnB,YAAoB,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;KAAI;IAEzC,MAAM,SAAS;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;YAC3D,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,YAAY;SACrB,CAAC,CAAA;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAC1B;;;ICrBQ,SAAS,GAAtB,MAAa,SAAU,SAAQ,MAAM;EAGpC;AAF0B;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;0CAAgB;AACb;IAAxB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;yCAAiB;AAFhC,SAAS;IADrB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;GACZ,SAAS,CAGrB;IAGY,aAAa,GAA1B,MAAa,aAAc,SAAQ,MAAM;EAIxC;AAH0B;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;6CAAe;AACZ;IAAxB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;2CAAiB;AAChB;IAAxB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;4CAAkB;AAHjC,aAAa;IADzB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;GACjB,aAAa,CAIzB;IAGY,QAAQ,GAArB,MAAa,QAAS,SAAQ,aAAa;IAChC,SAAS,CAAC,KAAa;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAA;QACtC,OAAO,KAAK,CAAC,SAAS,CAClB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAC5B,CAAA;KACJ;IAEM,YAAY,CAAC,SAAiB;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;KAC1C;;IAGM,SAAS,CAAC,IAAW,EAAE,KAAY,EAAE,KAAY;;QAEpD,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;KAC5E;EACJ;AAnBY,QAAQ;IADpB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;GACX,QAAQ,CAmBpB;MAEY,MAAM;IACf,YAAoB,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;KAAI;IAEzC,MAAM,SAAS;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;YAC3D,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAA;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAC1B;;;IC7CQ,QAAQ,GAArB,MAAa,QAAS,SAAQ,MAAM;IAUhC,IAAW,QAAQ;QACf,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;KAC3E;IAED,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;KAChC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAA;KAC1C;IAED,IAAW,KAAK;QACZ,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACjD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;KAC7D;IAED,QAAQ,CAAC,MAAa;QAClB,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC3C,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAC3D,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACnE,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;KACjE;IAED,gBAAgB,CAAC,MAAmB,EAAE,EAAE,GAAG,CAAC;QACxC,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;KAClD;IAED,gBAAgB,CAAC,MAAmB,EAAE,EAAE,GAAG,IAAI;QAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;KAChD;IAED,gBAAgB,CAAC,MAAmB,EAAE,SAAS,GAAG,CAAC;QAC/C,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;KAC3D;IAED,kBAAkB,CAAC,MAAmB,EAAE,KAAK,GAAG,IAAI;QAChD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;KACnD;IAED,SAAS,CAAC,MAAmB,EAAE,IAAI,GAAG,IAAI,EAAE,QAAiB,MAAM,CAAC,GAAG;;QAEnE,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;;QAGlD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;;QAGvF,MAAM,SAAS,GAAG,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,CAAA;;QAGxD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;;QAGhD,MAAM,IAAI,GAAG,OAAO,GAAG,IAAI,CAAA;;QAG3B,OAAO,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;KAC7C;EACJ;AAvE0B;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;yCAAgB;AACf;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;4CAAmB;AAClB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;8CAAqB;AACpB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;4CAAmB;AAClB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;gDAAuB;AACtB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;2CAAkB;AACjB;IAAtB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;kDAAyB;AACvB;IAAvB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;0CAAkB;AARhC,QAAQ;IADpB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;GACX,QAAQ,CAwEpB;MAEY,MAAM;IACf,YAAoB,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;KAAI;IAEzC,MAAM,SAAS;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;YAC3D,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAA;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAC1B;;;MCjEQ,WAAW,GAAG,IAAI,EAAE,CAAC,GAAG,GAAG,IAAI,GAAG,IAAI,EAAC;MAEvC,SAAS;IAWlB,YAAY,OAAyB;;QALrC,kBAAa,GAAG,cAAc,CAAA;;QAG9B,WAAM,GAAG,OAAO,CAAA;QAqBhB,OAAE,GAAG;YACD,OAAO,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC;YAC7B,GAAG,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC;YACrB,GAAG,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC;SACxB,CAAA;;QArBG,IAAI,OAAO,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;SAC7C;;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;SAC/B;;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;SACzB;aAAM,IAAI,OAAO,CAAC,GAAG,EAAE;YACpB,IAAI,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,EAAC,QAAQ,EAAE,IAAI,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAC,CAAC,CAAA;SAChF;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC/C;KACJ;IAQD,MAAM,eAAe;QACjB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACvE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;QACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;QAEvE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAEzD,OAAO;YACH,OAAO;YACP,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC;YACxC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC;SAC7C,CAAA;KACJ;;AAhDM,qBAAW,GAAG,WAAW,CAAA;AAmDpC,SAAS,OAAO,CAAC,GAAO,EAAE,GAAO;IAC7B,IAAI,CAAC,GAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACxB,MAAM,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACtB,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACrB,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;QACpC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KACjB;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC1B,CAAC;SAEe,eAAe,CAAC,KAAmB;IAC/C,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;AACxC;;;;"}

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
     "name": "@wharfkit/resources",
     "description": "Library to assist in Antelope-blockchain resource calculations.",
-    "version": "1.5.0-rc2",
+    "version": "1.5.0-rc4",
     "homepage": "https://github.com/wharfkit/resources",
     "license": "BSD-3-Clause",
     "main": "lib/wharfkit-resources.js",

package/src/powerup/abstract.ts CHANGED Viewed

@@ -10,10 +10,8 @@ import {
     UInt8,
 } from '@wharfkit/antelope'
-import BN from 'bn.js'
-import {PowerUpStateOptions} from './options'
-import bigDecimal from 'js-big-decimal'
 import {intToBigDecimal} from '..'
+import {PowerUpStateOptions} from './options'
 export abstract class PowerUpStateResource extends Struct {
     @Struct.field('uint8') version!: UInt8
@@ -38,19 +36,11 @@ export abstract class PowerUpStateResource extends Struct {
     abstract per_day(options?: PowerUpStateOptions): number
     // Get the current number of allocated units (shift from REX -> PowerUp)
-    public get allocated_legacy() {
-        return 1 - Number(this.weight_ratio) / Number(this.target_weight_ratio) / 100
-    }
     public get allocated(): number {
         return 1 - Number(this.weight_ratio.dividing(this.target_weight_ratio)) / 100
     }
     // Get the current percentage of reserved units
-    public get reserved_legacy() {
-        return new BN(String(this.utilization)) / new BN(String(this.weight))
-    }
     public get reserved(): Int64 {
         return this.utilization.dividing(this.weight)
     }
@@ -61,36 +51,14 @@ export abstract class PowerUpStateResource extends Struct {
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L358
-    utilization_increase_legacy(frac) {
-        const {weight} = this
-        const frac128 = UInt128.from(frac)
-        const utilization_increase =
-            new BN(weight.value.mul(new BN(frac128.value))) / Math.pow(10, 15)
-        return Math.ceil(utilization_increase)
-    }
     utilization_increase(frac: UInt128) {
-        return frac.multiplying(this.weight).dividing(UInt128.from(Math.pow(10, 15)), 'ceil')
+        const base = intToBigDecimal(frac)
+        const weight = intToBigDecimal(this.weight)
+        const multiplier = intToBigDecimal(Math.pow(10, 15))
+        return UInt128.from(base.multiply(weight).divide(multiplier, 15).ceil().getValue())
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L284-L298
-    price_function_legacy(utilization: Int64): number {
-        const {exponent, weight} = this
-        const max_price: number = this.max_price.value
-        const min_price: number = this.min_price.value
-        let price = min_price
-        const new_exponent = Number(exponent) - 1.0
-        if (new_exponent <= 0.0) {
-            return max_price
-        } else {
-            const util_weight = new BN(Number(utilization)) / Number(weight)
-            console.log('old', String(util_weight))
-            console.log('diff', max_price - min_price)
-            price += (max_price - min_price) * Math.pow(util_weight, new_exponent)
-        }
-        return price
-    }
     price_function(utilization: Int64): number {
         const {weight} = this
         let price = this.min_price.value
@@ -100,30 +68,13 @@ export abstract class PowerUpStateResource extends Struct {
         } else {
             // const util_weight = utilization.dividing(weight)
             const util_weight = intToBigDecimal(utilization).divide(intToBigDecimal(weight), 18)
-            console.log('new', String(util_weight.getValue()))
-            const difference = this.max_price.units.subtracting(this.min_price.units)
-            console.log('diff', String(difference))
-            price += difference.value * Math.pow(Number(util_weight.getValue()), new_exponent)
+            const difference = this.max_price.value - this.min_price.value
+            price += difference * Math.pow(Number(util_weight.getValue()), new_exponent)
         }
         return price
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L274-L280
-    price_integral_delta_legacy(start_utilization: Int64, end_utilization: Int64): number {
-        const {exponent, weight} = this
-        const max_price: number = this.max_price.value
-        const min_price: number = this.min_price.value
-        const coefficient = (max_price - min_price) / exponent.value
-        const start_u = Number(start_utilization.dividing(weight))
-        const end_u = Number(end_utilization.dividing(weight))
-        const delta =
-            min_price * end_u -
-            min_price * start_u +
-            coefficient * Math.pow(end_u, exponent.value) -
-            coefficient * Math.pow(start_u, exponent.value)
-        return delta
-    }
     price_integral_delta(start_utilization: Int64, end_utilization: Int64): number {
         const difference = Asset.fromUnits(
             this.max_price.units.subtracting(this.min_price.units),
@@ -141,31 +92,6 @@ export abstract class PowerUpStateResource extends Struct {
     }
     // Mimic: https://github.com/EOSIO/eosio.contracts/blob/d7bc0a5cc8c0c2edd4dc61b0126517d0cb46fd94/contracts/eosio.system/src/powerup.cpp#L262-L315
-    fee_legacy(utilization_increase, adjusted_utilization) {
-        const {utilization, weight} = this
-        let start_utilization = Int64.from(utilization)
-        const end_utilization = start_utilization.adding(utilization_increase)
-        let fee = 0
-        if (start_utilization < adjusted_utilization) {
-            const min = Math.min(
-                utilization_increase,
-                adjusted_utilization.subtracting(start_utilization)
-            )
-            fee += Number(
-                new bigDecimal(this.price_function_legacy(adjusted_utilization) * min)
-                    .divide(new bigDecimal(weight.toString()))
-                    .getValue()
-            )
-            start_utilization = adjusted_utilization
-        }
-        if (start_utilization.gt(end_utilization)) {
-            fee += this.price_integral_delta(start_utilization, end_utilization)
-        }
-        return fee
-    }
     fee(utilization_increase: UInt128, adjusted_utilization: Int64) {
         const {utilization, weight} = this
@@ -179,19 +105,14 @@ export abstract class PowerUpStateResource extends Struct {
                 Number(adjusted_utilization.subtracting(start_utilization))
             )
             fee += Number(
-                new bigDecimal(
-                    String(
-                        (this.price_function(adjusted_utilization) /
-                            Math.pow(10, this.symbol.precision)) *
-                            min
-                    )
-                )
-                    .divide(new bigDecimal(weight.toString()))
+                intToBigDecimal(this.price_function(adjusted_utilization) * min)
+                    .divide(intToBigDecimal(weight))
                     .getValue()
             )
             start_utilization = adjusted_utilization
         }
-        if (start_utilization.gt(end_utilization)) {
+        if (start_utilization.lt(end_utilization)) {
             fee += this.price_integral_delta(start_utilization, end_utilization)
         }
         return fee

package/src/powerup/cpu.ts CHANGED Viewed

@@ -3,8 +3,6 @@ import {Int64, Int64Type, Struct, UInt128, UInt128Type} from '@wharfkit/antelope
 import {BNPrecision, intToBigDecimal, SampleUsage} from '..'
 import {PowerUpStateResource} from './abstract'
 import {PowerUpStateOptions} from './options'
-import BN from 'bn.js'
-import bigDecimal from 'js-big-decimal'
 @Struct.type('powerupstateresourcecpu')
 export class PowerUpStateResourceCPU extends PowerUpStateResource {
@@ -26,9 +24,6 @@ export class PowerUpStateResourceCPU extends PowerUpStateResource {
     }
     // Convert weight to μs (microseconds)
-    weight_to_us_legacy(sample: UInt128, weight: number): number {
-        return Math.ceil((weight * Number(sample)) / BNPrecision)
-    }
     weight_to_us(sample: UInt128Type, weight: Int64Type): UInt128 {
         return UInt128.from(
             UInt128.from(weight).multiplying(Int64.from(sample)).dividing(BNPrecision, 'ceil')
@@ -36,26 +31,17 @@ export class PowerUpStateResourceCPU extends PowerUpStateResource {
     }
     // Convert μs (microseconds) to weight
-    us_to_weight_legacy(sample: UInt128, us: number): number {
-        return Math.floor((us / Number(sample)) * BNPrecision)
-    }
     us_to_weight(sample: UInt128, us: Int64Type): Int64 {
-        return Int64.from(us).multiplying(BNPrecision).dividing(Int64.from(sample), 'floor')
+        return Int64.from(us).multiplying(BNPrecision).dividing(sample, 'floor')
     }
     // Default frac generation by smallest unit type
-    frac_legacy = (usage: SampleUsage, us: number) => this.frac_by_us_legacy(usage, us)
     frac = (usage: SampleUsage, us: number) => this.frac_by_us(usage, us)
     // Frac generation by ms (milliseconds)
-    frac_by_ms_legacy = (usage: SampleUsage, ms: number) => this.frac_by_us_legacy(usage, ms * 1000)
     frac_by_ms = (usage: SampleUsage, ms: number) => this.frac_by_us(usage, ms * 1000)
     // Frac generation by μs (microseconds)
-    frac_by_us_legacy(usage: SampleUsage, us: number) {
-        const frac = new BN(this.us_to_weight_legacy(usage.cpu, us)) / Number(this.weight)
-        return Math.floor(frac * Math.pow(10, 15))
-    }
     frac_by_us(usage: SampleUsage, us: Int64Type): Int64 {
         const precision = 15
         const converted = intToBigDecimal(this.us_to_weight(usage.cpu, us))
@@ -66,51 +52,25 @@ export class PowerUpStateResourceCPU extends PowerUpStateResource {
     }
     // Price generation by smallest units, μs (microseconds)
-    price_per_legacy = (usage: SampleUsage, us = 1000, options?: PowerUpStateOptions): number =>
-        this.price_per_us_legacy(usage, us, options)
     price_per = (usage: SampleUsage, us = 1000, options?: PowerUpStateOptions): number =>
         this.price_per_us(usage, us, options)
     // Price generation by ms (milliseconds)
-    price_per_ms_legacy = (usage: SampleUsage, ms = 1, options?: PowerUpStateOptions): number =>
-        this.price_per_us_legacy(usage, ms * 1000, options)
     price_per_ms = (usage: SampleUsage, ms = 1, options?: PowerUpStateOptions): number =>
         this.price_per_us(usage, ms * 1000, options)
     // Price generation by μs (microseconds)
-    price_per_us_legacy(usage: SampleUsage, us = 1000, options?: PowerUpStateOptions): number {
-        // Determine the utilization increase by this action
-        const frac = UInt128.from(this.frac_legacy(usage, us))
-        const utilization_increase = this.utilization_increase_legacy(frac)
-        // Determine the adjusted utilization if needed
-        const adjusted_utilization = this.determine_adjusted_utilization(options)
-        // Derive the fee from the increase and utilization
-        const fee = this.fee_legacy(utilization_increase, adjusted_utilization)
-        // Force the fee up to the next highest value of precision
-        const precision = Math.pow(10, this.max_price.symbol.precision)
-        const value = Math.ceil(fee * precision) / precision
-        // Return the modified fee
-        return value
-    }
     price_per_us(usage: SampleUsage, us = 1000, options?: PowerUpStateOptions): number {
         // Determine the utilization increase by this action
         const frac = UInt128.from(this.frac(usage, us))
         const utilization_increase = this.utilization_increase(frac)
         // Determine the adjusted utilization if needed
         const adjusted_utilization = this.determine_adjusted_utilization(options)
         // Derive the fee from the increase and utilization
         const fee = this.fee(utilization_increase, adjusted_utilization)
         // Force the fee up to the next highest value of precision
         const precision = Math.pow(10, this.max_price.symbol.precision)
         const value = Math.ceil(fee * precision) / precision
         // Return the modified fee
         return value
     }

package/src/powerup/net.ts CHANGED Viewed

@@ -3,7 +3,6 @@ import {Int64, Int64Type, Struct, UInt128} from '@wharfkit/antelope'
 import {BNPrecision, intToBigDecimal, SampleUsage} from '..'
 import {PowerUpStateResource} from './abstract'
 import {PowerUpStateOptions} from './options'
-import BN from 'bn.js'
 @Struct.type('powerupstateresourcenet')
 export class PowerUpStateResourceNET extends PowerUpStateResource {
@@ -25,9 +24,6 @@ export class PowerUpStateResourceNET extends PowerUpStateResource {
     }
     // Convert weight to bytes
-    weight_to_bytes_legacy(sample: UInt128, weight: number): number {
-        return Math.ceil((weight * Number(sample)) / BNPrecision)
-    }
     weight_to_bytes(sample: UInt128, weight: number): UInt128 {
         return UInt128.from(
             UInt128.from(weight).multiplying(Int64.from(sample)).dividing(BNPrecision, 'ceil')
@@ -35,29 +31,18 @@ export class PowerUpStateResourceNET extends PowerUpStateResource {
     }
     // Convert bytes to weight
-    bytes_to_weight_legacy(sample: UInt128, bytes: number): number {
-        return Math.floor((bytes / Number(sample)) * BNPrecision)
-    }
     bytes_to_weight(sample: UInt128, bytes: Int64Type): Int64 {
         return Int64.from(bytes).multiplying(BNPrecision).dividing(Int64.from(sample), 'floor')
     }
     // Default frac generation by smallest unit type
-    frac_legacy = (usage: SampleUsage, bytes: number) => this.frac_by_bytes_legacy(usage, bytes)
     frac = (usage: SampleUsage, bytes: number) => this.frac_by_bytes(usage, bytes)
     // Frac generation by kb
-    frac_by_kb_legacy = (usage: SampleUsage, kilobytes: number) =>
-        this.frac_by_bytes_legacy(usage, kilobytes * 1000)
     frac_by_kb = (usage: SampleUsage, kilobytes: number) =>
         this.frac_by_bytes(usage, kilobytes * 1000)
     // Frac generation by bytes
-    frac_by_bytes_legacy(usage: SampleUsage, bytes: number) {
-        const {weight} = this
-        const frac = new BN(this.bytes_to_weight_legacy(usage.net, bytes)) / Number(weight)
-        return Math.floor(frac * Math.pow(10, 15))
-    }
     frac_by_bytes(usage: SampleUsage, bytes: Int64Type): Int64 {
         const precision = 15
         const converted = intToBigDecimal(this.bytes_to_weight(usage.net, bytes))
@@ -68,38 +53,14 @@ export class PowerUpStateResourceNET extends PowerUpStateResource {
     }
     // Price generation by smallest units, bytes
-    price_per_legacy = (usage: SampleUsage, bytes = 1000, options?: PowerUpStateOptions) =>
-        this.price_per_byte_legacy(usage, bytes, options)
     price_per = (usage: SampleUsage, bytes = 1000, options?: PowerUpStateOptions) =>
         this.price_per_byte(usage, bytes, options)
     // Price generation by kb
-    price_per_kb_legacy = (
-        usage: SampleUsage,
-        kilobytes = 1,
-        options?: PowerUpStateOptions
-    ): number => this.price_per_byte_legacy(usage, kilobytes * 1000, options)
     price_per_kb = (usage: SampleUsage, kilobytes = 1, options?: PowerUpStateOptions): number =>
         this.price_per_byte(usage, kilobytes * 1000, options)
     // Price generation by bytes
-    price_per_byte_legacy(usage: SampleUsage, bytes = 1000, options?: PowerUpStateOptions): number {
-        // Determine the utilization increase by this action
-        const frac = UInt128.from(this.frac_legacy(usage, bytes))
-        const utilization_increase = this.utilization_increase_legacy(frac)
-        // Determine the adjusted utilization if needed
-        const adjusted_utilization = this.determine_adjusted_utilization(options)
-        // Derive the fee from the increase and utilization
-        const fee = this.fee_legacy(utilization_increase, adjusted_utilization)
-        const precision = Math.pow(10, this.max_price.symbol.precision)
-        const value = Math.ceil(fee * precision) / precision
-        // Return the modified fee
-        return value
-    }
     price_per_byte(usage: SampleUsage, bytes = 1000, options?: PowerUpStateOptions): number {
         // Determine the utilization increase by this action
         const frac = UInt128.from(this.frac(usage, bytes))

package/src/rex.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import {BNPrecision, Resources, SampleUsage} from './'
+import {BNPrecision, intToBigDecimal, Resources, SampleUsage} from './'
 import {Asset, Struct, UInt128, UInt64, UInt8} from '@wharfkit/antelope'
@@ -26,17 +26,18 @@ export class REXState extends Struct {
     }
     public get value() {
-        return (
-            (Number(this.total_lent.units) + Number(this.total_unlent.units)) /
-            Number(this.total_rex.units)
-        )
+        const lent = intToBigDecimal(this.total_lent.units)
+        const unlent = intToBigDecimal(this.total_unlent.units)
+        const rex = intToBigDecimal(this.total_rex.units)
+        return Number(lent.add(unlent).divide(rex, 18).getValue())
     }
     exchange(amount: Asset): Asset {
-        return Asset.from(
-            (amount.value * this.total_lendable.value) / this.total_rex.value,
-            this.symbol
-        )
+        const value = intToBigDecimal(amount.units)
+        const lendable = intToBigDecimal(this.total_lendable.units)
+        const rex = intToBigDecimal(this.total_rex.units)
+        const tokens = value.multiply(lendable).divide(rex, this.precision)
+        return Asset.fromUnits(Number(tokens.getValue()), this.symbol)
     }
     cpu_price_per_ms(sample: SampleUsage, ms = 1): number {