Skip to content
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

Jump to bottom

Check whether claim has started in claim #153

Merged
merged 9 commits into from
Mar 28, 2024
Merged

Check whether claim has started in claim #153

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
73875c0
check whether unlock has begun before adding `claimLocked` ix in claim
Yolley Mar 28, 2024
74cf1ab
check claim values only if claim status does not exist yet
Yolley Mar 28, 2024
6b66adb
bump
Yolley Mar 28, 2024
d3ac9f3
fix nowTs check
Yolley Mar 28, 2024
1d0e824
to not convert to string before bn
Yolley Mar 28, 2024
0b078f4
validate unlockPeriod as currently it's not validated on the protocol…
Yolley Mar 28, 2024
4c57dbc
remove unlockPeriod validation for now as it may break other features
Yolley Mar 28, 2024
39c48a3
validate unlock period only for non instant airdrops
Yolley Mar 28, 2024
6f83928
fix error msg
Yolley Mar 28, 2024
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
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"packages": [
"packages/*"
],
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.10",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@streamflow/common",
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.10",
"description": "Common utilities and types used by streamflow packages.",
"homepage": "https://github.com/streamflow-finance/js-sdk/",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/distributor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@streamflow/distributor",
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.10",
"description": "JavaScript SDK to interact with Streamflow Airdrop protocol.",
"homepage": "https://github.com/streamflow-finance/js-sdk/",
"main": "dist/index.js",
Expand Down
10 changes: 9 additions & 1 deletion packages/distributor/solana/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@ export default class SolanaDistributorClient {
ixs.push(...(await prepareWrappedAccount(this.connection, invoker.publicKey, data.maxTotalClaim)));
}

const nowTs = new BN(Math.floor(Date.now() / 1000));
const endVestingTs = args.endVestingTs.eqn(0) ? nowTs : args.endVestingTs;
const startVestingTs = args.startVestingTs.eqn(0) ? nowTs : args.startVestingTs;
if (endVestingTs.gt(startVestingTs) && endVestingTs.sub(startVestingTs).lt(args.unlockPeriod)) {
throw new Error("Unlock Period can not be less than total Vesting duration!");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you mean vice verse unlock period can't be longer than duration

Suggested change
throw new Error("Unlock Period can not be less than total Vesting duration!");
throw new Error("The unlock period cannot be longer than the total vesting duration!");

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dam, you're right. 🌚

}

ixs.push(newDistributor(args, accounts, this.programId));
ixs.push(
createTransferCheckedInstruction(
Expand Down Expand Up @@ -180,7 +187,8 @@ export default class SolanaDistributorClient {
ixs.push(newClaim(args, accounts, this.programId));
}

if (data.amountLocked.gtn(0)) {
const nowTs = new BN(Math.floor(Date.now() / 1000));
if (claimStatus || (data.amountLocked.gtn(0) && nowTs.sub(distributor.startTs).gte(distributor.unlockPeriod))) {
ixs.push(claimLocked(accounts, this.programId));
}

Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@streamflow/eslint-config",
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.10",
"license": "ISC",
"main": "index.js",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/stream/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@streamflow/stream",
"version": "6.0.0-alpha.9",
"version": "6.0.0-alpha.10",
"description": "JavaScript SDK to interact with Streamflow protocol.",
"homepage": "https://github.com/streamflow-finance/js-sdk/",
"main": "dist/index.js",
Expand Down