Merge branch 'develop' into enable-docker-tests

fluidity-money · Feb 15, 2024 · 3d1da7a · 3d1da7a
2 parents f440a27 + dcaa9dd
commit 3d1da7a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/.github/workflows/mainnet-db-migration-auto.yml b/.github/workflows/mainnet-db-migration-auto.yml
@@ -3,7 +3,7 @@ name: DB Migration - Mainnet (Auto)
 on:
   pull_request:
     branches:
-      - production
+      - develop
     types:
       - closed
 

diff --git a/.github/workflows/mainnet-microservices.yml b/.github/workflows/mainnet-microservices.yml
@@ -3,7 +3,7 @@ name: Microservices CI
 on:
   pull_request:
     branches:
-      - production
+      - develop
     types:
       - closed
 

diff --git a/database/102-up-timescale/20240205142155-lootbox_manual_rewarding_some_people.sql b/database/102-up-timescale/20240205142155-lootbox_manual_rewarding_some_people.sql
@@ -0,0 +1,23 @@
+
+-- migrate:up
+
+ALTER TYPE lootbox_source ADD VALUE 'manual_reward';
+
+INSERT INTO lootbox (address, source, transaction_hash, referrer, awarded_time, volume, reward_tier, lootbox_count, application, epoch) VALUES
+	('0x502254a79791c612af08d49d68449af38266f8dc', 'manual_reward', '', '', '2024-02-05 05:47:01.146448+00', 0, 3, 10, 'none', 'epoch_2'),
+	('0x896c882e4c37132dc63fe442b1305f70a68f7cf7', 'manual_reward', '', '', '2024-02-05 05:47:01.146448+00', 0, 3, 10, 'none', 'epoch_2'),
+	('0xe1ab77fa0c089dd578fa1e542e50d655a37c3b05', 'manual_reward', '', '', '2024-02-05 05:47:01.146448+00', 0, 3, 10, 'none', 'epoch_2'),
+	('0xb59e6d31dd9d2c38b5b1bbfe019be46800b917bf', 'manual_reward', '', '', '2024-02-05 05:47:01.146448+00', 0, 3, 10, 'none', 'epoch_2'),
+	('0x9de6107df383c348b18582b1a2e355491bbc1b5d', 'manual_reward', '', '', '2024-02-05 05:47:01.146448+00', 0, 3, 10, 'none', 'epoch_2'),
+	('0x7a6f38594496617f61f8358912f4ea69fe33d02f', 'manual_reward', '', '', '2024-02-05 05:47:01.146448+00', 0, 4, 5, 'none', 'epoch_2');
+
+-- migrate:down
+
+DELETE FROM lootbox WHERE
+	(address = '0x502254a79791c612af08d49d68449af38266f8dc' AND source = 'manual_reward' AND awarded_time = '2024-02-05 05:47:01.146448+00') OR
+	(address = '0x896c882e4c37132dc63fe442b1305f70a68f7cf7' AND source = 'manual_reward' AND awarded_time = '2024-02-05 05:47:01.146448+00') OR
+	(address = '0xe1ab77fa0c089dd578fa1e542e50d655a37c3b05' AND source = 'manual_reward' AND awarded_time = '2024-02-05 05:47:01.146448+00') OR
+	(address = '0xb59e6d31dd9d2c38b5b1bbfe019be46800b917bf' AND source = 'manual_reward' AND awarded_time = '2024-02-05 05:47:01.146448+00') OR
+	(address = '0x9de6107df383c348b18582b1a2e355491bbc1b5d' AND source = 'manual_reward' AND awarded_time = '2024-02-05 05:47:01.146448+00') OR
+	(address = '0x7a6f38594496617f61f8358912f4ea69fe33d02f' AND source = 'manual_reward' AND awarded_time = '2024-02-05 05:47:01.146448+00');
+
diff --git a/web/app.fluidity.money/config.toml b/web/app.fluidity.money/config.toml
@@ -356,7 +356,7 @@ fUSDC = "https://app.camelot.exchange/liquidity/?token1=0xaf88d065e77c8cC2239327
 name= "Ramses"
 
 [liquidity_providers.arbitrum.providers.link]
-fUSDC = "https://app.ramses.exchange/liquidity/v2/0xf73c87736008ad3af9973b357c97ab8c60d8ca63"
+fUSDC = "https://app.ramses.exchange/liquidity/v2/0x2c9a8c5814bbd8eb4f3531efb836f3d1fa185f38"
 
 [[liquidity_providers.arbitrum.providers]]
 name= "uniswap"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: DB Migration - Mainnet (Auto) @@
     on:
       pull_request:
         branches:
-          - production
+          - develop
         types:
           - closed
@@ Expand Down @@