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

setup FactoringPricePerShare entity #44

Merged
merged 4 commits into from
Jun 20, 2024
Merged

setup FactoringPricePerShare entity #44

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae1eef3
init
solidoracle Jun 18, 2024
b1521da
fix build
solidoracle Jun 18, 2024
e041693
deploy sepolia and fix test
solidoracle Jun 20, 2024
5a3aa38
price as array and add test
solidoracle Jun 20, 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 bulla-contracts/config/sepolia.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"bullaFinance": { "address": "0xB219ecd037E8A5410d2e8839586D9F3996685cfB", "startBlock": 5096555 },
"frendLend": { "address": "0x3E058834CE20A54F0755889c008D3fF62D33cE85", "startBlock": 5096555 },
"instantPayment": { "address": "0x1cD1A83C2965CB7aD55d60551877Eb390e9C3d7A", "startBlock": 5096555 },
"bullaFactoring": { "address": "0x55847492EabE59FcFC72EAb673170645B2D7A097", "startBlock": 5960360 }
"bullaFactoring": { "address": "0xe90D1384Aeb44212dBd959498592D6327B45609B", "startBlock": 5960360 }
}
7 changes: 7 additions & 0 deletions bulla-contracts/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,13 @@ type User @entity {
factoringEvents: [IEventLog!]!
}

type FactoringPricePerShare @entity {
id: ID!
address: Bytes! #address
pricePerShare: BigInt
lastUpdatedTimestamp: BigInt!
}

type BullaManager @entity {
id: ID!
address: Bytes #address
Expand Down
23 changes: 21 additions & 2 deletions bulla-contracts/src/functions/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { ClaimCreatedClaimAttachmentStruct } from "../../generated/BullaClaimERC
import { ERC20 } from "../../generated/BullaClaimERC721/ERC20";
import { BullaManager as BullaManagerContract } from "../../generated/BullaManager/BullaManager";
import { LoanOfferedLoanOfferAttachmentStruct } from "../../generated/FrendLend/FrendLend";
import { BullaManager, Token, User } from "../../generated/schema";
import { DepositMadeWithAttachmentAttachmentStruct, SharesRedeemedWithAttachmentAttachmentStruct } from "../../generated/BullaFactoring/BullaFactoring";
import { BullaManager, Token, User, FactoringPricePerShare } from "../../generated/schema";
import { BullaFactoring, DepositMadeWithAttachmentAttachmentStruct, SharesRedeemedWithAttachmentAttachmentStruct } from "../../generated/BullaFactoring/BullaFactoring";

export const ADDRESS_ZERO = "0x0000000000000000000000000000000000000000";

Expand Down Expand Up @@ -128,3 +128,22 @@ export const getOrCreateBullaManager = (event: ethereum.Event): BullaManager =>

return bullaManager;
};

export const getOrCreatePricePerShare = (event: ethereum.Event): FactoringPricePerShare => {
let price = FactoringPricePerShare.load(event.address.toHexString());
const bullaFactoringContract = BullaFactoring.bind(event.address);
const pricePerShareResult = bullaFactoringContract.pricePerShare();

if (!price) {
price = new FactoringPricePerShare(event.address.toHexString());
price.address = event.address;
price.pricePerShare = pricePerShareResult;
} else {
price.pricePerShare = pricePerShareResult;
}

price.lastUpdatedTimestamp = event.block.timestamp;
bengobeil marked this conversation as resolved.
Show resolved Hide resolved
price.save();

return price;
};
4 changes: 3 additions & 1 deletion bulla-contracts/src/mappings/BullaFactoring.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
createSharesRedeemedEvent,
createSharesRedeemedWithAttachmentEvent
} from "../functions/BullaFactoring";
import { getIPFSHash_depositWithAttachment, getIPFSHash_redeemWithAttachment, getOrCreateUser } from "../functions/common";
import { getIPFSHash_depositWithAttachment, getIPFSHash_redeemWithAttachment, getOrCreatePricePerShare, getOrCreateUser } from "../functions/common";

export function handleInvoiceFunded(event: InvoiceFunded): void {
const ev = event.params;
Expand All @@ -30,6 +30,7 @@ export function handleInvoiceFunded(event: InvoiceFunded): void {
InvoiceFundedEvent.fundedAmount = ev.fundedAmount;
InvoiceFundedEvent.originalCreditor = ev.originalCreditor;
const original_creditor = getOrCreateUser(ev.originalCreditor);
const price_per_share = getOrCreatePricePerShare(event);

InvoiceFundedEvent.eventName = "InvoiceFunded";
InvoiceFundedEvent.blockNumber = event.block.number;
Expand All @@ -41,6 +42,7 @@ export function handleInvoiceFunded(event: InvoiceFunded): void {

InvoiceFundedEvent.save();
original_creditor.save();
price_per_share.save();
}

export function handleInvoiceKickbackAmountSent(event: InvoiceKickbackAmountSent): void {
Expand Down
36 changes: 23 additions & 13 deletions bulla-contracts/tests/functions/BullaFactoring.testtools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,29 @@ import {
SharesRedeemed,
SharesRedeemedWithAttachment
} from "../../generated/BullaFactoring/BullaFactoring";
import { MULTIHASH_BYTES, MULTIHASH_FUNCTION, MULTIHASH_SIZE, toEthAddress, toUint256 } from "../helpers";

export const newInvoiceFundedEvent = (originatingClaimId: BigInt, fundedAmount: BigInt, originalCreditor: Address): InvoiceFunded => {
const event: InvoiceFunded = changetype<InvoiceFunded>(newMockEvent());

const invoiceId = new ethereum.EventParam("invoiceId", toUint256(originatingClaimId));
const fundedAmountParam = new ethereum.EventParam("fundedAmount", toUint256(fundedAmount));
const originalCreditorParam = new ethereum.EventParam("originalCreditor", toEthAddress(originalCreditor));

event.parameters = [invoiceId, fundedAmountParam, originalCreditorParam];

return event;
};
import { MOCK_BULLA_FACTORING_ADDRESS, MULTIHASH_BYTES, MULTIHASH_FUNCTION, MULTIHASH_SIZE, toEthAddress, toUint256 } from "../helpers";

export function newInvoiceFundedEvent(invoiceId: BigInt, fundedAmount: BigInt, originalCreditor: Address): InvoiceFunded {
const mockEvent = newMockEvent();
const invoiceFundedEvent = new InvoiceFunded(
mockEvent.address,
mockEvent.logIndex,
mockEvent.transactionLogIndex,
mockEvent.logType,
mockEvent.block,
mockEvent.transaction,
mockEvent.parameters,
mockEvent.receipt
);

invoiceFundedEvent.address = MOCK_BULLA_FACTORING_ADDRESS;
invoiceFundedEvent.parameters = new Array();
invoiceFundedEvent.parameters.push(new ethereum.EventParam("invoiceId", ethereum.Value.fromUnsignedBigInt(invoiceId)));
invoiceFundedEvent.parameters.push(new ethereum.EventParam("fundedAmount", ethereum.Value.fromUnsignedBigInt(fundedAmount)));
invoiceFundedEvent.parameters.push(new ethereum.EventParam("originalCreditor", ethereum.Value.fromAddress(originalCreditor)));

return invoiceFundedEvent;
}

export const newInvoiceKickbackAmountSentEvent = (originatingClaimId: BigInt, kickbackAmount: BigInt, originalCreditor: Address): InvoiceKickbackAmountSent => {
const event: InvoiceKickbackAmountSent = changetype<InvoiceKickbackAmountSent>(newMockEvent());
Expand Down
4 changes: 4 additions & 0 deletions bulla-contracts/tests/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const MOCK_INSTANT_PAYMENT_ADDRESS = Address.fromString("0xf1f41946c28824
export const MOCK_SAFE_ADDRESS = Address.fromString("0x2270B1f2996327eB772351ee8c5dbF98f9FD2FcF");
export const MOCK_SAFE_MODULE_ADDRESS = Address.fromString("0x70b841D46d227D458D9396e0c90A961e2B9D7a63");
export const MOCK_BULLA_TOKEN_ADDRESS = Address.fromString("0x90104Ff9aCd8EDB22BD5D030a11A1c2c66d95142");
export const MOCK_BULLA_FACTORING_ADDRESS = Address.fromString("0xd33abDe96F344FDe00B65650c8f68875D4c9e18A");
export const ADDRESS_ZERO = Address.fromString(addressZeroString);
export const ADDRESS_1 = Address.fromString("0xb8c18E036d46c5FB94d7DeBaAeD92aFabe65EE61");
export const ADDRESS_2 = Address.fromString("0xe2B28b58cc5d34872794E861fd1ba1982122B907");
Expand All @@ -49,6 +50,9 @@ export const setupContracts = (): void => {

/** setup BullaManager */
createMockedFunction(MOCK_MANAGER_ADDRESS, "description", "description():(bytes32)").returns([ethereum.Value.fromBytes(DESCRIPTION_BYTES)]);

/** setup BullaFactoring */
createMockedFunction(MOCK_BULLA_FACTORING_ADDRESS, "pricePerShare", "pricePerShare():(uint256)").returns([ethereum.Value.fromI32(1000000)]);
};

export const afterEach = (): void => {
Expand Down
Loading