sorare-rewards 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 503bd2bc5d9b16f6c2ba4e9209c14920dc000730dc3466eea88534abe97187c2
-  data.tar.gz: c03342737d6af15c514932029928fb26acd255700811e8bd9de53f62f7a5a91e
+  metadata.gz: dd12e11f5b4eb146655a6944d6ffd4b541a3cfe926e38b5bb77e7235d4cc92fd
+  data.tar.gz: 12acbcb47c3d6f366855278b96d75ab787414f802cbbfe9c597f98a96867c8ae
 SHA512:
-  metadata.gz: 496c0f02f3c3735895c314d5f680a36fd3a2965a63d196f209efdd6cefcb6c9eaf5a8f5995c90a27ad36963cd68eb071f5467abf998738b856ca1a389dba87c6
-  data.tar.gz: 5386e7e1e7f95c9b703882e5623c0aeec9ce71b4d9d46e85f807601e2f918b76c095dbac01f26ccfacd2262a0384d4f83ec22857810629e5b29ff274bc6a2d66
+  metadata.gz: 858689cacfc5e20404a485c5500266c613c47ec4838fbf909b7975594a6e1eb59cc96d0e3fa14cdc3cfdf4cea2b0f1ad9cd01adc215d02c0369d3ef02a3a7351
+  data.tar.gz: ba9f2aa66b4332ba1611f38a9b7fad80582bc1d03f67530bb356d203d4a71f9405ac353461ea4f6383775a03145adb923ade0762b9f1d89041299f7aa2b27e74

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.0.2)
+    sorare-rewards (1.1.0)
       activesupport (~> 6.1)
       interactor (~> 3.0)
       json (~> 2)

data/lib/sorare/rewards/game_week_config.rb

@@ -12,7 +12,7 @@ module Sorare
         @config = config
       end
 
-      %w[cooldown limits prize_pool_currency].each do |key|
+      %w[cooldown limits prize_pool_currency rewards_ratio_per_cards_in_circulation].each do |key|
         define_method(key) do
           config[key]
         end

data/lib/sorare/rewards/interactors/supply/compute_for_rarity.rb

@@ -16,16 +16,14 @@ module Sorare
         def call
           context.rarity_supply = []
 
-          context.rewardable = compute_rewardable_supply!
+          context.rewardable = rewardable_supply
           distribute_in_tiers!
         end
 
-        def compute_rewardable_supply!
-          total_supply = supply.keys.sum do |player|
-            player_supply(player)
-          end
+        def rewardable_supply
+          total_float_supply = supply.keys.sum { |player| player_supply(player) }
 
-          rounded_supply(total_supply)
+          round_and_cap_supply(total_float_supply)
         end
 
         def distribute_in_tiers!
@@ -43,12 +41,15 @@ module Sorare
           end
         end
 
-        def player_supply(slug)
-          game_week.player(slug).reward_pool_supply_contribution(league, rarity)
+        def round_and_cap_supply(float_supply)
+          [
+            float_supply.floor + remaining_supply(float_supply.modulo(1)), # Supply limit
+            league.cards_in_circulation_limit(rarity) # Circulation limit
+          ].compact.min
         end
 
-        def rounded_supply(float_supply)
-          float_supply.floor + remaining_supply(float_supply.modulo(1))
+        def player_supply(slug)
+          game_week.player(slug).reward_pool_supply_contribution(league, rarity)
         end
 
         def remaining_supply(reward_probability)

data/lib/sorare/rewards/league.rb

@@ -17,12 +17,18 @@ module Sorare
         @game_week = game_week
       end
 
-      %w[playing_rate prize_pools].each do |key|
+      %w[playing_rate prize_pools cards_in_circulation].each do |key|
         define_method(key) do
           config[key]
         end
       end
 
+      def cards_in_circulation_limit(rarity)
+        return unless cards_in_circulation&.dig(rarity) && game_week.config.rewards_ratio_per_cards_in_circulation
+
+        (cards_in_circulation[rarity] * game_week.config.rewards_ratio_per_cards_in_circulation).floor
+      end
+
       def each_division_prize_pools
         prize_pools.each_with_index do |prize_pool, index|
           return to_enum(:each_division_prize_pools) unless block_given?

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorare-rewards
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - pierre