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

fix stuff #42

Merged
merged 24 commits into from
Feb 26, 2024
Merged

fix stuff #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1a68fca
start on direct grants
codenamejason Feb 12, 2024
e2655ee
updates on direct
codenamejason Feb 12, 2024
e4c2e16
smol updates
codenamejason Feb 13, 2024
f33933f
fix types in wrong file
codenamejason Feb 13, 2024
e647df3
fix types
codenamejason Feb 13, 2024
2266ebd
clean up
codenamejason Feb 13, 2024
c3d67aa
clean up
codenamejason Feb 13, 2024
1ad6736
adds hardhat
codenamejason Feb 13, 2024
37a3460
Merge branch 'direct-grants' into add-hardhat
codenamejason Feb 13, 2024
b21a9eb
adding hardhat tests
codenamejason Feb 13, 2024
a262447
layout some tests
codenamejason Feb 13, 2024
205dccc
remove unused files
codenamejason Feb 13, 2024
28417e7
update action
codenamejason Feb 13, 2024
6743e19
work on tests
codenamejason Feb 14, 2024
d5049f9
remove legacy test files
0xKurt Feb 14, 2024
631ec1a
fix package
0xKurt Feb 14, 2024
e0b8b9e
wip
0xKurt Feb 14, 2024
d41c263
add random to profile creation nonce
codenamejason Feb 15, 2024
7c3e8c1
updated with viem/tests still work 😵‍💫
codenamejason Feb 16, 2024
bc6ae78
version bump
0xKurt Feb 16, 2024
83164e5
exported direct grants
0xKurt Feb 16, 2024
c71d7ef
fix init data
0xKurt Feb 20, 2024
c4a7dab
fix type
0xKurt Feb 22, 2024
066911f
Merge branch 'main' into add-hardhat
codenamejason Feb 23, 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
4 changes: 2 additions & 2 deletions dist/strategies/DirectGrants/DirectGrantsStrategy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ class DirectGrantsStrategy {
}
getRegisterRecipientData(data) {
this.checkPoolId();
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, uint256, (uit256, string)"), [
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, uint256, (uint256, string)"), [
data.registryAnchor || types_1.ZERO_ADDRESS,
data.recipientAddress,
data.grantAmount,
Expand All @@ -332,7 +332,7 @@ class DirectGrantsStrategy {
this.checkPoolId();
const encodedParams = [];
data.forEach((registerData) => {
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, uint256, (uit256, string)"), [
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, uint256, (uint256, string)"), [
registerData.registryAnchor || types_1.ZERO_ADDRESS,
registerData.recipientAddress,
registerData.grantAmount,
Expand Down
2 changes: 1 addition & 1 deletion dist/strategies/DonationVotingMerkleDistributionStrategy/DonationVotingMerkleDistribution.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ class DonationVotingMerkleDistributionStrategy {
this.checkPoolId();
const encodedParams = [];
data.forEach((registerData) => {
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, (uit256, string)"), [
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, (uint256, string)"), [
registerData.registryAnchor || types_1.ZERO_ADDRESS,
registerData.recipientAddress,
[registerData.metadata.protocol, registerData.metadata.pointer],
Expand Down
2 changes: 1 addition & 1 deletion dist/strategies/MicroGrantsStrategy/MicroGrantsStrategy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ class MicroGrantsStrategy {
this.checkPoolId();
const encodedParams = [];
data.forEach((registerData) => {
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, uint256, (uit256, string)"), [
const encoded = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, address, uint256, (uint256, string)"), [
registerData.registryAnchor || types_1.ZERO_ADDRESS,
registerData.recipientAddress,
registerData.requestedAmount,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@allo-team/allo-v2-sdk",
"version": "1.0.50",
"version": "1.0.51",
"description": "sdk for allo v2",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
9 changes: 5 additions & 4 deletions src/strategies/DirectGrants/DirectGrantsStrategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,13 +427,14 @@ export class DirectGrantsStrategy {
public getRegisterRecipientData(data: RegisterData): TransactionData {
this.checkPoolId();
const encoded: `0x${string}` = encodeAbiParameters(
parseAbiParameters("address, address, uint256, (uit256, string)"),
parseAbiParameters("address, address, uint256, (uint256, string)"),
[
data.registryAnchor || ZERO_ADDRESS,
data.recipientAddress,
data.grantAmount,
[data.metadata.protocol, data.metadata.pointer],
]

],
);

const encodedData = encodeFunctionData({
Expand All @@ -455,13 +456,13 @@ export class DirectGrantsStrategy {

data.forEach((registerData) => {
const encoded: `0x${string}` = encodeAbiParameters(
parseAbiParameters("address, address, uint256, (uit256, string)"),
parseAbiParameters("address, address, uint256, (uint256, string)"),
[
registerData.registryAnchor || ZERO_ADDRESS,
registerData.recipientAddress,
registerData.grantAmount,
[registerData.metadata.protocol, registerData.metadata.pointer],
]
],
);

encodedParams.push(encoded);
Expand Down
2 changes: 1 addition & 1 deletion src/strategies/DonationVotingMerkleDistributionStrategy/DonationVotingMerkleDistribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ export class DonationVotingMerkleDistributionStrategy {

data.forEach((registerData) => {
const encoded: `0x${string}` = encodeAbiParameters(
parseAbiParameters("address, address, (uit256, string)"),
parseAbiParameters("address, address, (uint256, string)"),
[
registerData.registryAnchor || ZERO_ADDRESS,
registerData.recipientAddress,
Expand Down
2 changes: 1 addition & 1 deletion src/strategies/MicroGrantsStrategy/MicroGrantsStrategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ export class MicroGrantsStrategy {

data.forEach((registerData) => {
const encoded: `0x${string}` = encodeAbiParameters(
parseAbiParameters("address, address, uint256, (uit256, string)"),
parseAbiParameters("address, address, uint256, (uint256, string)"),
[
registerData.registryAnchor || ZERO_ADDRESS,
registerData.recipientAddress,
Expand Down
Loading