[FIL-227] Automatic allocator

fplus-database/Cargo.toml

@@ -23,4 +23,6 @@ serde = { version =  "1.0.164", features = ["derive", "std",
 "serde_derive", "alloc", "rc"] } 
 serial_test = "3.0.0"
 sha1 = "0.10.6"
-serde_json = "1.0.96"
+serde_json = "1.0.96"
+alloy = { version = "0.3.2", features = ["signers"] }
+sea-orm-newtype = "0.0.1"

fplus-database/src/database/applications.rs

@@ -446,3 +446,14 @@ pub async fn delete_application(
     application.delete(&conn).await?;
     Ok(())
 }
+
+pub async fn get_applications_by_client_id(
+    id: &String,
+) -> Result<Vec<ApplicationModel>, sea_orm::DbErr> {
+    let conn = get_database_connection().await?;
+    let result = Application::find()
+        .filter(Column::Id.eq(id))
+        .all(&conn)
+        .await?;
+    Ok(result)
+}

fplus-database/src/database/autoallocations.rs

@@ -0,0 +1,64 @@
+use crate::get_database_connection;
+use crate::models::autoallocations::AddressWrapper;
+use crate::models::autoallocations::{
+    Column, Entity as Autoallocations, Model as AutoallocationModel,
+};
+use alloy::primitives::Address;
+use chrono::{DateTime, FixedOffset};
+use sea_orm::{entity::*, query::*, DbBackend, DbErr, ExecResult};
+
+pub async fn get_last_client_autoallocation(
+    client_evm_address: impl Into<AddressWrapper>,
+) -> Result<Option<DateTime<FixedOffset>>, DbErr> {
+    let conn = get_database_connection().await?;
+    let response = Autoallocations::find()
+        .filter(Column::EvmWalletAddress.contains(client_evm_address.into()))
+        .one(&conn)
+        .await?;
+
+    Ok(response.map(|allocation| allocation.last_allocation))
+}
+
+pub async fn create_or_update_autoallocation(
+    client_evm_address: &Address,
+    days_to_next_autoallocation: &u64,
+) -> Result<u64, sea_orm::DbErr> {
+    let conn = get_database_connection().await?;
+    let client_address = client_evm_address.to_checksum(None);
+    let exec_res: ExecResult = conn
+        .execute(Statement::from_string(
+            DbBackend::Postgres,
+            format!(
+                "INSERT INTO autoallocations (evm_wallet_address, last_allocation)
+                VALUES ('{}', NOW())
+                ON CONFLICT (evm_wallet_address)
+                DO UPDATE SET last_allocation = NOW()
+                WHERE autoallocations.last_allocation <= NOW() - INTERVAL '{} days';",
+                client_address, days_to_next_autoallocation
+            ),
+        ))
+        .await?;
+    Ok(exec_res.rows_affected())
+}
+
+pub async fn get_autoallocation(
+    client_evm_address: impl Into<AddressWrapper>,
+) -> Result<Option<AutoallocationModel>, DbErr> {
+    let conn = get_database_connection().await?;
+    let response = Autoallocations::find()
+        .filter(Column::EvmWalletAddress.contains(client_evm_address.into()))
+        .one(&conn)
+        .await?;
+    Ok(response)
+}
+
+pub async fn delete_autoallocation(
+    client_evm_address: impl Into<AddressWrapper>,
+) -> Result<(), sea_orm::DbErr> {
+    let conn = get_database_connection().await?;
+    let client_autoallocation = get_autoallocation(client_evm_address).await?;
+    if let Some(client_autoallocation) = client_autoallocation {
+        client_autoallocation.delete(&conn).await?;
+    }
+    Ok(())
+}

fplus-database/src/database/mod.rs

@@ -1,3 +1,4 @@
 pub mod allocation_amounts;
 pub mod allocators;
 pub mod applications;
+pub mod autoallocations;

fplus-database/src/models/autoallocations.rs

@@ -0,0 +1,41 @@
+use alloy::primitives::{Address, AddressError};
+use chrono::{DateTime, FixedOffset};
+use sea_orm::entity::prelude::*;
+use sea_orm_newtype::DeriveNewType;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "autoallocations")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub evm_wallet_address: AddressWrapper,
+    pub last_allocation: DateTime<FixedOffset>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
+
+#[derive(Clone, Debug, PartialEq, DeriveNewType, Eq, Serialize, Deserialize)]
+#[sea_orm_newtype(try_from_into = "String", primary_key)]
+pub struct AddressWrapper(pub Address);
+
+impl TryFrom<String> for AddressWrapper {
+    type Error = AddressError;
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        Ok(AddressWrapper(Address::parse_checksummed(value, None)?))
+    }
+}
+
+impl From<AddressWrapper> for String {
+    fn from(value: AddressWrapper) -> Self {
+        value.0.to_checksum(None)
+    }
+}
+
+impl From<Address> for AddressWrapper {
+    fn from(value: Address) -> Self {
+        AddressWrapper(value)
+    }
+}

fplus-database/src/models/mod.rs

@@ -5,3 +5,4 @@ pub mod prelude;
 pub mod allocation_amounts;
 pub mod allocators;
 pub mod applications;
+pub mod autoallocations;

fplus-http-server/Cargo.toml

@@ -29,6 +29,3 @@ async-trait = "0.1.73"
 uuidv4 = "1.0.0"
 log = "0.4.20"
 cron = "0.12.1"
-alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features = [
-    "signers",
-] }

fplus-http-server/src/main.rs

@@ -108,6 +108,8 @@ async fn main() -> std::io::Result<()> {
             .service(router::allocator::delete)
             .service(router::allocator::create_allocator_from_json)
             .service(router::allocator::update_allocator_force)
+            .service(router::autoallocator::last_client_allocation)
+            .service(router::autoallocator::trigger_autoallocation)
         // .service(router::allocator::get_installation_ids)
     })
     .bind(("0.0.0.0", 8080))?

fplus-http-server/src/router/autoallocator.rs

@@ -0,0 +1,23 @@
+use actix_web::{get, post, web, HttpResponse, Responder};
+use fplus_database::database::autoallocations as autoallocations_db;
+use fplus_lib::core::autoallocator;
+use fplus_lib::core::{LastAutoallocationQueryParams, TriggerAutoallocationInfo};
+#[get("/autoallocator/last_client_allocation")]
+pub async fn last_client_allocation(
+    query: web::Query<LastAutoallocationQueryParams>,
+) -> impl Responder {
+    match autoallocations_db::get_last_client_autoallocation(query.evm_wallet_address).await {
+        Ok(last_client_allocation) => {
+            HttpResponse::Ok().body(serde_json::to_string_pretty(&last_client_allocation).unwrap())
+        }
+        Err(e) => HttpResponse::BadRequest().body(e.to_string()),
+    }
+}
+
+#[post("autoallocator/trigger_autoallocation")]
+pub async fn trigger_autoallocation(info: web::Json<TriggerAutoallocationInfo>) -> impl Responder {
+    match autoallocator::trigger_autoallocation(&info.into_inner()).await {
+        Ok(()) => HttpResponse::Ok().body(serde_json::to_string_pretty("Success").unwrap()),
+        Err(e) => HttpResponse::BadRequest().body(e.to_string()),
+    }
+}

fplus-http-server/src/router/mod.rs

@@ -2,6 +2,7 @@ use actix_web::{get, HttpResponse, Responder};
 
 pub mod allocator;
 pub mod application;
+pub mod autoallocator;
 pub mod blockchain;
 pub mod verifier;
 

fplus-lib/Cargo.toml

@@ -34,20 +34,10 @@ fplus-database = { path = "../fplus-database", version = "1.8.4"}
 pem = "1.0"
 anyhow = "1.0"
 regex = "1.0"
-alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features = [
-    "signers",
-    "providers",
-    "node-bindings",
-    "sol-types",
-    "json",
-    "network",
-    "rpc-types-eth",
-    "provider-http",
-    "dyn-abi",
-    "eip712",
-] }
 tempfile = "3.10.1"
 size = "0.5.0-preview2"
+alloy = { version = "0.3.2", features = ["full"] }
+fvm_shared = "4.4.0"
 
 [dev-dependencies]
 actix-rt = "2.9.0"

fplus-lib/src/config.rs

@@ -23,7 +23,7 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> {
             "https://fp-core.dp04sa0tdc6pk.us-east-1.cs.amazonlightsail.com",
         );
         m.insert("FILPLUS_ENV", "staging");
-        m.insert("GLIF_NODE_URL", "https://api.node.glif.io/rpc/v1");
+        m.insert("GLIF_NODE_URL", "http://localhost:1234/rpc/v1");
         m.insert("ISSUE_TEMPLATE_VERSION", "1.3");
         m.insert(
             "GITCOIN_PASSPORT_DECODER",
@@ -35,6 +35,16 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> {
         m.insert("RPC_URL", "https://mainnet.optimism.io");
         m.insert("DMOB_API_URL", "https://api.datacapstats.io/public/api");
         m.insert("DMOB_API_KEY", "5c993a17-7b18-4ead-a8a8-89dad981d87e");
+        m.insert("DAYS_TO_NEXT_AUTOALLOCATION", "14");
+        m.insert(
+            "ALLOCATOR_CONTRACT_ADDRESS",
+            "0x640bD4be149f40714D95aBcD414338bc7CfF39a3",
+        );
+        m.insert(
+            "AUTOALLOCATOR_PRIVATE_KEY",
+            "257d553b55d5928c7ec48c2f7d1288931640166e2c1269e05492914accf7e966",
+        );
+        m.insert("AUTOALLOCATION_AMOUNT", "68719476736"); // 68719476736 B == 64 GB
         m
     })
 }

fplus-lib/src/core/application/gitcoin_interaction.rs

@@ -15,6 +15,11 @@ use crate::config::get_env_var_or_default;
 use crate::error::LDNError;
 use anyhow::Result;
 
+pub trait ExpirableSolStruct: SolStruct {
+    fn get_expires_at(&self) -> &str;
+    fn get_issued_at(&self) -> &str;
+}
+
 sol! {
     #[allow(missing_docs)]
     function getScore(address user) view returns (uint256);
@@ -28,6 +33,34 @@ sol! {
         string issued_at;
         string expires_at;
     }
+
+    #[derive(Deserialize)]
+    struct KycAutoallocationApproval {
+        string message;
+        string client_fil_address;
+        string issued_at;
+        string expires_at;
+    }
+}
+
+impl ExpirableSolStruct for KycApproval {
+    fn get_expires_at(&self) -> &str {
+        &self.expires_at
+    }
+
+    fn get_issued_at(&self) -> &str {
+        &self.issued_at
+    }
+}
+
+impl ExpirableSolStruct for KycAutoallocationApproval {
+    fn get_expires_at(&self) -> &str {
+        &self.expires_at
+    }
+
+    fn get_issued_at(&self) -> &str {
+        &self.issued_at
+    }
 }
 
 pub async fn verify_on_gitcoin(address_from_signature: &Address) -> Result<f64, LDNError> {
@@ -73,8 +106,8 @@ fn calculate_score(response: Bytes) -> f64 {
     score as f64 / 10000.0
 }
 
-pub fn get_address_from_signature(
-    message: &KycApproval,
+pub fn get_address_from_signature<T: SolStruct>(
+    message: &T,
     signature: &str,
 ) -> Result<Address, LDNError> {
     let domain = eip712_domain! {

fplus-lib/src/core/autoallocator/metaallocator_interaction.rs

@@ -0,0 +1,77 @@
+use std::str::FromStr;
+
+use crate::config::get_env_var_or_default;
+use crate::error::LDNError;
+use alloy::{
+    network::{EthereumWallet, TransactionBuilder},
+    primitives::{Address, Bytes, U256},
+    providers::{Provider, ProviderBuilder},
+    rpc::types::eth::TransactionRequest,
+    signers::local::PrivateKeySigner,
+    sol,
+    sol_types::SolCall,
+};
+use anyhow::Result;
+use fvm_shared::address::{set_current_network, Address as FilecoinAddress, Network};
+sol! {
+  #[allow(missing_docs)]
+  function addVerifiedClient(bytes calldata clientAddress, uint256 amount);
+}
+
+pub async fn add_verified_client(address: &str, amount: &u64) -> Result<(), LDNError> {
+    let private_key = get_env_var_or_default("AUTOALLOCATOR_PRIVATE_KEY");
+    let signer: PrivateKeySigner = private_key.parse().expect("Should parse private key");
+    let wallet = EthereumWallet::from(signer);
+    let rpc_url = get_env_var_or_default("GLIF_NODE_URL")
+        .parse()
+        .map_err(|e| LDNError::New(format!("Failed to pase string to URL /// {}", e)))?;
+    let provider = ProviderBuilder::new()
+        .with_recommended_fillers()
+        .wallet(wallet)
+        .on_http(rpc_url);
+    let fil_address = decode_filecoin_address(address)?;
+    let amount = U256::try_from(*amount)
+        .map_err(|e| LDNError::New(format!("Failed to prase amount to U256 /// {}", e)))?;
+    let call = addVerifiedClientCall {
+        clientAddress: fil_address.into(),
+        amount,
+    }
+    .abi_encode();
+    let allocator_contract =
+        Address::parse_checksummed(get_env_var_or_default("ALLOCATOR_CONTRACT_ADDRESS"), None)
+            .map_err(|e| {
+                LDNError::New(format!(
+                    "Parse ALLOCATOR_CONTRACT_ADDRESS to Address failed: {}",
+                    e
+                ))
+            })?;
+    let input = Bytes::from(call);
+
+    let tx = TransactionRequest::default()
+        .with_to(allocator_contract)
+        .with_input(input)
+        .with_gas_limit(45_000_000);
+
+    provider
+        .send_transaction(tx)
+        .await
+        .map_err(|e| LDNError::New(format!("RPC error: {}", e)))?
+        .watch()
+        .await
+        .map_err(|e| LDNError::New(format!("Transaction failed: {}", e)))?;
+    Ok(())
+}
+
+fn decode_filecoin_address(address: &str) -> Result<Vec<u8>, LDNError> {
+    let address_prefix = address.get(0..1);
+    if let Some(address_prefix) = address_prefix {
+        if address_prefix.eq("f") {
+            set_current_network(Network::Mainnet);
+        } else if address_prefix.eq("t") {
+            set_current_network(Network::Testnet);
+        }
+    }
+    let fil_address = FilecoinAddress::from_str(address)
+        .map_err(|e| LDNError::New(format!("Failed to prase address from string /// {}", e)))?;
+    Ok(fil_address.to_bytes())
+}