From 8d790bf5c3ceaffedc56e2562af7e0f3a50fe09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Mon, 7 Oct 2024 16:41:09 -0300 Subject: [PATCH 1/9] fix: replace mainnet token --- js/src/main.ts | 2 +- program/src/processor.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/main.ts b/js/src/main.ts index bed7f6c..3c48a0b 100644 --- a/js/src/main.ts +++ b/js/src/main.ts @@ -27,7 +27,7 @@ export const VESTING_PROGRAM_ID = new PublicKey( ); export const TOKEN_MINT = new PublicKey( - 'FGG8y8JrZrAinbBwWAB2EacQgZVyzoerdMsU1LUaRkKv' + '2ummN5q6x8iQid7BFcRp7oMgF3UMEXR8LrUSPYzuMHQH' ); export const DEVNET_VESTING_PROGRAM_ID = new PublicKey( diff --git a/program/src/processor.rs b/program/src/processor.rs index efef6f1..c152623 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -24,7 +24,7 @@ use crate::{ }; pub const TOKEN_MINT: Pubkey = - solana_program::pubkey!("FGG8y8JrZrAinbBwWAB2EacQgZVyzoerdMsU1LUaRkKv"); + solana_program::pubkey!("2ummN5q6x8iQid7BFcRp7oMgF3UMEXR8LrUSPYzuMHQH"); pub struct Processor {} From f0cfcc7bf8f6f51bfc6433cd0da08b489d71188d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Mon, 7 Oct 2024 16:56:03 -0300 Subject: [PATCH 2/9] fix: short time deltas --- program/src/processor.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/src/processor.rs b/program/src/processor.rs index c152623..1443f23 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -199,7 +199,7 @@ impl Processor { 0 => { release_time = 0; } - 7_776_000 | 15_552_000 | 23_328_000 | 31_104_000 => { + 1800 | 3600 | 5400 | 7200 => { release_time = clock.unix_timestamp as u64 + schedule.time_delta; } _ => { @@ -435,7 +435,7 @@ impl Processor { } // Withdrawal period is 7 days = 7 * 86400 = 604_800 - schedule.release_time = clock.unix_timestamp as u64 + 604_800; + schedule.release_time = clock.unix_timestamp as u64 + 1800; // Pack the updated schedule back into the account data pack_schedule_into_slice( From f6584d6adef6e1a1fb498881e41b9f27880ed98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Mon, 7 Oct 2024 17:19:26 -0300 Subject: [PATCH 3/9] fix: rollback to long time deltas --- program/src/processor.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/src/processor.rs b/program/src/processor.rs index 1443f23..c152623 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -199,7 +199,7 @@ impl Processor { 0 => { release_time = 0; } - 1800 | 3600 | 5400 | 7200 => { + 7_776_000 | 15_552_000 | 23_328_000 | 31_104_000 => { release_time = clock.unix_timestamp as u64 + schedule.time_delta; } _ => { @@ -435,7 +435,7 @@ impl Processor { } // Withdrawal period is 7 days = 7 * 86400 = 604_800 - schedule.release_time = clock.unix_timestamp as u64 + 1800; + schedule.release_time = clock.unix_timestamp as u64 + 604_800; // Pack the updated schedule back into the account data pack_schedule_into_slice( From fa50cec6ca250a13fba43f0daeec6976f5905eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Mon, 7 Oct 2024 23:05:01 -0300 Subject: [PATCH 4/9] fix: yet another redeploy --- js/src/main.ts | 2 +- program/src/processor.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/main.ts b/js/src/main.ts index 3c48a0b..72a3aec 100644 --- a/js/src/main.ts +++ b/js/src/main.ts @@ -27,7 +27,7 @@ export const VESTING_PROGRAM_ID = new PublicKey( ); export const TOKEN_MINT = new PublicKey( - '2ummN5q6x8iQid7BFcRp7oMgF3UMEXR8LrUSPYzuMHQH' + 'BfCXVtDqQZbEr7TCppF5Mw4ZL5u67LrzTWQpoH5okFEt' ); export const DEVNET_VESTING_PROGRAM_ID = new PublicKey( diff --git a/program/src/processor.rs b/program/src/processor.rs index c152623..4eea075 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -24,7 +24,7 @@ use crate::{ }; pub const TOKEN_MINT: Pubkey = - solana_program::pubkey!("2ummN5q6x8iQid7BFcRp7oMgF3UMEXR8LrUSPYzuMHQH"); + solana_program::pubkey!("BfCXVtDqQZbEr7TCppF5Mw4ZL5u67LrzTWQpoH5okFEt"); pub struct Processor {} From 53da5181eaeb60326f890dc325c007ea05e03cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Tue, 8 Oct 2024 00:12:14 -0300 Subject: [PATCH 5/9] chore: yet another redeploy --- js/src/main.ts | 2 +- program/src/processor.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/main.ts b/js/src/main.ts index 72a3aec..5fd4859 100644 --- a/js/src/main.ts +++ b/js/src/main.ts @@ -27,7 +27,7 @@ export const VESTING_PROGRAM_ID = new PublicKey( ); export const TOKEN_MINT = new PublicKey( - 'BfCXVtDqQZbEr7TCppF5Mw4ZL5u67LrzTWQpoH5okFEt' + 'CivjW7ZGp7eaubEdGoDeVsTrYYRnyTf5mrp9pET7KFuk' ); export const DEVNET_VESTING_PROGRAM_ID = new PublicKey( diff --git a/program/src/processor.rs b/program/src/processor.rs index 4eea075..36ddba2 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -24,7 +24,7 @@ use crate::{ }; pub const TOKEN_MINT: Pubkey = - solana_program::pubkey!("BfCXVtDqQZbEr7TCppF5Mw4ZL5u67LrzTWQpoH5okFEt"); + solana_program::pubkey!("CivjW7ZGp7eaubEdGoDeVsTrYYRnyTf5mrp9pET7KFuk"); pub struct Processor {} From 4940cda6f128b7013686922f9ba637595965d9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Tue, 8 Oct 2024 00:30:53 -0300 Subject: [PATCH 6/9] feat: lower time deltas for test --- program/src/processor.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/src/processor.rs b/program/src/processor.rs index 36ddba2..ffcccf9 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -199,7 +199,7 @@ impl Processor { 0 => { release_time = 0; } - 7_776_000 | 15_552_000 | 23_328_000 | 31_104_000 => { + 1800 | 3600 | 5400 | 7200 => { release_time = clock.unix_timestamp as u64 + schedule.time_delta; } _ => { @@ -435,7 +435,7 @@ impl Processor { } // Withdrawal period is 7 days = 7 * 86400 = 604_800 - schedule.release_time = clock.unix_timestamp as u64 + 604_800; + schedule.release_time = clock.unix_timestamp as u64 + 1800; // Pack the updated schedule back into the account data pack_schedule_into_slice( From 9cfbf714da339a8b9bb31f7954654d56f0935435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Tue, 8 Oct 2024 10:27:38 -0300 Subject: [PATCH 7/9] fix: replace mint for squads --- js/src/main.ts | 2 +- program/src/processor.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/main.ts b/js/src/main.ts index 5fd4859..e9a7d32 100644 --- a/js/src/main.ts +++ b/js/src/main.ts @@ -27,7 +27,7 @@ export const VESTING_PROGRAM_ID = new PublicKey( ); export const TOKEN_MINT = new PublicKey( - 'CivjW7ZGp7eaubEdGoDeVsTrYYRnyTf5mrp9pET7KFuk' + 'B3SgiwWbGQPiMVB3EcpPF3gyhocA4XRgxFRfjhk84ms5' ); export const DEVNET_VESTING_PROGRAM_ID = new PublicKey( diff --git a/program/src/processor.rs b/program/src/processor.rs index ffcccf9..f8d16cd 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -24,7 +24,7 @@ use crate::{ }; pub const TOKEN_MINT: Pubkey = - solana_program::pubkey!("CivjW7ZGp7eaubEdGoDeVsTrYYRnyTf5mrp9pET7KFuk"); + solana_program::pubkey!("B3SgiwWbGQPiMVB3EcpPF3gyhocA4XRgxFRfjhk84ms5"); pub struct Processor {} From 556bdbccb077093ba10f2fa3345fd7ef02d7e0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Tue, 8 Oct 2024 13:30:40 -0300 Subject: [PATCH 8/9] fix: replace token for squads token --- js/src/main.ts | 2 +- program/src/processor.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/main.ts b/js/src/main.ts index e9a7d32..cab9705 100644 --- a/js/src/main.ts +++ b/js/src/main.ts @@ -27,7 +27,7 @@ export const VESTING_PROGRAM_ID = new PublicKey( ); export const TOKEN_MINT = new PublicKey( - 'B3SgiwWbGQPiMVB3EcpPF3gyhocA4XRgxFRfjhk84ms5' + '5k84VjAKoGPXa7ias1BNgKUrX7e61eMPWhZDqsiD4Bpe' ); export const DEVNET_VESTING_PROGRAM_ID = new PublicKey( diff --git a/program/src/processor.rs b/program/src/processor.rs index f8d16cd..550f425 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -24,7 +24,7 @@ use crate::{ }; pub const TOKEN_MINT: Pubkey = - solana_program::pubkey!("B3SgiwWbGQPiMVB3EcpPF3gyhocA4XRgxFRfjhk84ms5"); + solana_program::pubkey!("5k84VjAKoGPXa7ias1BNgKUrX7e61eMPWhZDqsiD4Bpe"); pub struct Processor {} From e3604821c2b68f3bce6afa1c2396a41568742117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wei=C3=9Fer=20Hase?= Date: Tue, 8 Oct 2024 14:24:55 -0300 Subject: [PATCH 9/9] chore: final release --- js/src/main.ts | 2 +- program/src/processor.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/main.ts b/js/src/main.ts index cab9705..79bb836 100644 --- a/js/src/main.ts +++ b/js/src/main.ts @@ -23,7 +23,7 @@ import bs58 from 'bs58'; * The vesting schedule program ID */ export const VESTING_PROGRAM_ID = new PublicKey( - 'AKUgi92CLv6ce4d6MNHZXeKUFU2SbnAzLc77JN63EGBA' + 'HE6bCtjsrra8DRbJnexKoVPSr5dYs57s3cuGHfotiQbq' ); export const TOKEN_MINT = new PublicKey( diff --git a/program/src/processor.rs b/program/src/processor.rs index 550f425..81de3ef 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -199,7 +199,7 @@ impl Processor { 0 => { release_time = 0; } - 1800 | 3600 | 5400 | 7200 => { + 7_776_000 | 15_552_000 | 23_328_000 | 31_104_000 => { release_time = clock.unix_timestamp as u64 + schedule.time_delta; } _ => { @@ -435,7 +435,7 @@ impl Processor { } // Withdrawal period is 7 days = 7 * 86400 = 604_800 - schedule.release_time = clock.unix_timestamp as u64 + 1800; + schedule.release_time = clock.unix_timestamp as u64 + 604_800; // Pack the updated schedule back into the account data pack_schedule_into_slice(