Skip to content

fix: route approve and CTF operations through proxy wallet factory #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
suhailkakar wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix: route approve and CTF operations through proxy wallet factory #62

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
083a87b
fix: route CTF operations through proxy wallet factory
suhailkakar Apr 5, 2026
df81741
run formatter
suhailkakar Apr 5, 2026
fb1488a
fix: route approve through proxy wallet factory
suhailkakar Apr 5, 2026
544775c
format
suhailkakar Apr 5, 2026
0c63aca
remove redundant send_via_factory
suhailkakar Apr 5, 2026
41f965b
conditional statement cleanup
suhailkakar Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ path = "src/main.rs"

[dependencies]
polymarket-client-sdk = { version = "0.4", features = ["gamma", "data", "bridge", "clob", "ctf"] }
alloy = { version = "1.6.3", default-features = false, features = ["providers", "sol-types", "contract", "reqwest", "reqwest-rustls-tls", "signer-local", "signers"] }
alloy = { version = "1.6.3", default-features = false, features = ["providers", "rpc-types", "sol-types", "contract", "reqwest", "reqwest-rustls-tls", "signer-local", "signers"] }
clap = { version = "4", features = ["derive"] }
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
serde_json = "1"
Expand Down
168 changes: 114 additions & 54 deletions src/commands/approve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use alloy::primitives::U256;
use alloy::sol;
use alloy::sol_types::SolCall;
use anyhow::{Context, Result};
use clap::{Args, Subcommand};
use polymarket_client_sdk::types::{Address, address};
Expand All @@ -12,6 +13,8 @@ use crate::auth;
use crate::output::OutputFormat;
use crate::output::approve::{ApprovalStatus, print_approval_status, print_tx_result};

use super::proxy;

/// Polygon USDC (same address as `USDC_ADDRESS_STR`; `address!` requires a literal).
const USDC_ADDRESS: Address = address!("0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174");

Expand Down Expand Up @@ -81,20 +84,26 @@ pub async fn execute(
args: ApproveArgs,
output: OutputFormat,
private_key: Option<&str>,
signature_type: Option<&str>,
) -> Result<()> {
match args.command {
ApproveCommand::Check { address } => check(address, private_key, output).await,
ApproveCommand::Set => set(private_key, output).await,
ApproveCommand::Check { address } => {
check(address, private_key, signature_type, output).await
}
ApproveCommand::Set => set(private_key, signature_type, output).await,
}
}

async fn check(
address_arg: Option<Address>,
private_key: Option<&str>,
signature_type: Option<&str>,
output: OutputFormat,
) -> Result<()> {
let owner: Address = if let Some(addr) = address_arg {
addr
} else if proxy::is_proxy_mode(signature_type)? {
proxy::derive_proxy_address(private_key)?
} else {
let signer = auth::resolve_signer(private_key)?;
polymarket_client_sdk::auth::Signer::address(&signer)
Expand Down Expand Up @@ -135,13 +144,13 @@ async fn check(
print_approval_status(&statuses, &output)
}

async fn set(private_key: Option<&str>, output: OutputFormat) -> Result<()> {
let provider = auth::create_provider(private_key).await?;
async fn set(
private_key: Option<&str>,
signature_type: Option<&str>,
output: OutputFormat,
) -> Result<()> {
let use_proxy = proxy::is_proxy_mode(signature_type)?;
let config = contract_config(POLYGON, false).context("No contract config for Polygon")?;

let usdc = IERC20::new(USDC_ADDRESS, provider.clone());
let ctf = IERC1155::new(config.conditional_tokens, provider.clone());

let targets = approval_targets()?;
let total = targets.len() * 2;

Expand All @@ -152,53 +161,104 @@ async fn set(private_key: Option<&str>, output: OutputFormat) -> Result<()> {
let mut results: Vec<serde_json::Value> = Vec::new();
let mut step = 0;

for target in &targets {
step += 1;
let label = format!("USDC \u{2192} {}", target.name);
let tx_hash = usdc
.approve(target.address, U256::MAX)
.send()
.await
.context(format!("Failed to send USDC approval for {}", target.name))?
.watch()
.await
.context(format!(
"Failed to confirm USDC approval for {}",
target.name
))?;

match output {
OutputFormat::Table => print_tx_result(step, total, &label, tx_hash),
OutputFormat::Json => results.push(serde_json::json!({
"step": step,
"type": "erc20",
"contract": target.name,
"tx_hash": format!("{tx_hash}"),
})),
if use_proxy {
for target in &targets {
step += 1;
let label = format!("USDC \u{2192} {}", target.name);
let calldata = IERC20::approveCall {
spender: target.address,
value: U256::MAX,
}
.abi_encode();
let (tx_hash, _) = proxy::send_call(private_key, true, USDC_ADDRESS, calldata)
.await
.context(format!("Failed USDC approval for {}", target.name))?;

match output {
OutputFormat::Table => print_tx_result(step, total, &label, tx_hash),
OutputFormat::Json => results.push(serde_json::json!({
"step": step,
"type": "erc20",
"contract": target.name,
"tx_hash": format!("{tx_hash}"),
})),
}

step += 1;
let label = format!("CTF \u{2192} {}", target.name);
let calldata = IERC1155::setApprovalForAllCall {
operator: target.address,
approved: true,
}
.abi_encode();
let (tx_hash, _) =
proxy::send_call(private_key, true, config.conditional_tokens, calldata)
.await
.context(format!("Failed CTF approval for {}", target.name))?;

match output {
OutputFormat::Table => print_tx_result(step, total, &label, tx_hash),
OutputFormat::Json => results.push(serde_json::json!({
"step": step,
"type": "erc1155",
"contract": target.name,
"tx_hash": format!("{tx_hash}"),
})),
}
}

step += 1;
let label = format!("CTF \u{2192} {}", target.name);
let tx_hash = ctf
.setApprovalForAll(target.address, true)
.send()
.await
.context(format!("Failed to send CTF approval for {}", target.name))?
.watch()
.await
.context(format!(
"Failed to confirm CTF approval for {}",
target.name
))?;

match output {
OutputFormat::Table => print_tx_result(step, total, &label, tx_hash),
OutputFormat::Json => results.push(serde_json::json!({
"step": step,
"type": "erc1155",
"contract": target.name,
"tx_hash": format!("{tx_hash}"),
})),
} else {
let provider = auth::create_provider(private_key).await?;
let usdc = IERC20::new(USDC_ADDRESS, provider.clone());
let ctf = IERC1155::new(config.conditional_tokens, provider.clone());

for target in &targets {
step += 1;
let label = format!("USDC \u{2192} {}", target.name);
let tx_hash = usdc
.approve(target.address, U256::MAX)
.send()
.await
.context(format!("Failed to send USDC approval for {}", target.name))?
.watch()
.await
.context(format!(
"Failed to confirm USDC approval for {}",
target.name
))?;

match output {
OutputFormat::Table => print_tx_result(step, total, &label, tx_hash),
OutputFormat::Json => results.push(serde_json::json!({
"step": step,
"type": "erc20",
"contract": target.name,
"tx_hash": format!("{tx_hash}"),
})),
}

step += 1;
let label = format!("CTF \u{2192} {}", target.name);
let tx_hash = ctf
.setApprovalForAll(target.address, true)
.send()
.await
.context(format!("Failed to send CTF approval for {}", target.name))?
.watch()
.await
.context(format!(
"Failed to confirm CTF approval for {}",
target.name
))?;

match output {
OutputFormat::Table => print_tx_result(step, total, &label, tx_hash),
OutputFormat::Json => results.push(serde_json::json!({
"step": step,
"type": "erc1155",
"contract": target.name,
"tx_hash": format!("{tx_hash}"),
})),
}
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated
}
}

Expand Down
Loading
Loading