Skip to content

Commit

Permalink
fix meta
Browse files Browse the repository at this point in the history
  • Loading branch information
thedavidmeister committed Sep 7, 2023
1 parent ada321e commit a96ae9e
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
test:
strategy:
matrix:
meta-file: [src/concrete/OrderBook.meta.json, src/concrete/GenericPoolOrderBookFlashBorrower.meta.json]
meta-file: [src/concrete/OrderBook.meta.json, src/concrete/GenericPoolOrderBookV3FlashBorrower.meta.json]
name: Test metadata
runs-on: ubuntu-latest
steps:
Expand Down
Binary file removed meta/GenericPoolOrderBookFlashBorrower.rain.meta
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion script/DeployGenericPoolOrderBookV3FlashBorrower.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ contract DeployGenericPoolOrderBookV3FlashBorrower is Script {
// https://github.com/rainprotocol/rain.interpreter/actions/runs/6000630847/job/16273099850
address i9rDeployer = 0xCA0Ef6E0d9cd47d44aF5d87098f8482669303b06;

console2.log("DeployGenericPoolOrderBookFlashBorrower meta hash:");
console2.log("DeployGenericPoolOrderBookV3FlashBorrower meta hash:");
console2.logBytes32(keccak256(meta));

vm.startBroadcast(deployerPrivateKey);
Expand Down
2 changes: 1 addition & 1 deletion src/abstract/OrderBookV3FlashBorrower.sol
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ abstract contract OrderBookV3FlashBorrower is
/// @param exchangeData Arbitrary bytes that will be passed to `_exchange`
/// after the flash loan is taken. The inheriting contract is responsible
/// for decoding this data and defining how it controls interactions with
/// the external liquidity. For example, `GenericPoolOrderBookFlashBorrower`
/// the external liquidity. For example, `GenericPoolOrderBookV3FlashBorrower`
/// uses this data as a literal encoded external call.
function arb(TakeOrdersConfigV2 calldata takeOrders, uint256 minimumSenderOutput, bytes calldata exchangeData)
external
Expand Down
2 changes: 1 addition & 1 deletion src/concrete/GenericPoolOrderBookV3FlashBorrower.meta.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Generic pool order book flash borrower",
"abiName": "GenericPoolOrderBookFlashBorrower",
"abiName": "GenericPoolOrderBookV3FlashBorrower",
"desc": "A generic flash borrower that takes loans from an order book and can source external liquidity from any basic onchain AMM pool to cover the loan and specific orderbook orders. Supports expression based access gating.",
"alias": "generic-pool-order-book-flash-borrower",
"methods": [{
Expand Down
6 changes: 3 additions & 3 deletions src/concrete/GenericPoolOrderBookV3FlashBorrower.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import "src/interface/ierc3156/IERC3156FlashBorrower.sol";
import "src/abstract/OrderBookV3FlashBorrower.sol";

/// @dev Metadata hash for `DeployerDiscoverableMetaV1`.
/// - ABI for GenericPoolOrderBookFlashBorrower
/// - Interpreter caller metadata V1 for GenericPoolOrderBookFlashBorrower
bytes32 constant CALLER_META_HASH = bytes32(0x295e86c45bd31d4c2e939082f69bcace287690253b99ccfc80f39a620167e8a0);
/// - ABI for GenericPoolOrderBookV3FlashBorrower
/// - Interpreter caller metadata V1 for GenericPoolOrderBookV3FlashBorrower
bytes32 constant CALLER_META_HASH = bytes32(0x29f743ae23bd47eb7e739052b90fb5dfda4b0528b60f129ce63cdf73213da49f);

/// @title GenericPoolOrderBookV3FlashBorrower
/// Implements the OrderBookV3FlashBorrower interface for a external liquidity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ contract GenericPoolOrderBookV3FlashBorrowerTest is Test {
abi.encode(address(0), address(0), address(0))
);
bytes memory meta = vm.readFileBinary(GENERIC_POOL_ORDER_BOOK_FLASH_BORROWER_META_PATH);
console2.log("GenericPoolOrderBookFlashBorrowerTest meta hash:");
console2.log("GenericPoolOrderBookV3FlashBorrowerTest meta hash:");
console2.logBytes32(keccak256(meta));
implementation = address(
new GenericPoolOrderBookV3FlashBorrower(DeployerDiscoverableMetaV2ConstructionConfig(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: CAL
pragma solidity ^0.8.18;

string constant GENERIC_POOL_ORDER_BOOK_FLASH_BORROWER_META_PATH = "meta/GenericPoolOrderBookFlashBorrower.rain.meta";
string constant GENERIC_POOL_ORDER_BOOK_FLASH_BORROWER_META_PATH = "meta/GenericPoolOrderBookV3FlashBorrower.rain.meta";

0 comments on commit a96ae9e

Please sign in to comment.