diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc468c8..a8a82b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: uses: foundry-rs/foundry-toolchain@v1 - name: Install dependencies - run: forge install --no-git foundry-rs/forge-std OpenZeppelin/openzeppelin-contracts@v5.4.0 FhenixProtocol/cofhe-contracts FhenixProtocol/cofhe-mock-contracts OpenZeppelin/openzeppelin-foundry-upgrades + run: forge install --no-git foundry-rs/forge-std OpenZeppelin/openzeppelin-contracts@v5.4.0 FhenixProtocol/cofhe-contracts@v0.1.3 FhenixProtocol/cofhesdk@6af05d94 OpenZeppelin/openzeppelin-foundry-upgrades - name: Check formatting run: forge fmt --check @@ -50,7 +50,7 @@ jobs: uses: foundry-rs/foundry-toolchain@v1 - name: Install dependencies - run: forge install --no-git foundry-rs/forge-std OpenZeppelin/openzeppelin-contracts@v5.4.0 FhenixProtocol/cofhe-contracts FhenixProtocol/cofhe-mock-contracts OpenZeppelin/openzeppelin-foundry-upgrades + run: forge install --no-git foundry-rs/forge-std OpenZeppelin/openzeppelin-contracts@v5.4.0 FhenixProtocol/cofhe-contracts@v0.1.3 FhenixProtocol/cofhesdk@6af05d94 OpenZeppelin/openzeppelin-foundry-upgrades - name: Compile contracts run: forge build --sizes @@ -67,7 +67,7 @@ jobs: uses: foundry-rs/foundry-toolchain@v1 - name: Install dependencies - run: forge install --no-git foundry-rs/forge-std OpenZeppelin/openzeppelin-contracts@v5.4.0 FhenixProtocol/cofhe-contracts FhenixProtocol/cofhe-mock-contracts OpenZeppelin/openzeppelin-foundry-upgrades + run: forge install --no-git foundry-rs/forge-std OpenZeppelin/openzeppelin-contracts@v5.4.0 FhenixProtocol/cofhe-contracts@v0.1.3 FhenixProtocol/cofhesdk@6af05d94 OpenZeppelin/openzeppelin-foundry-upgrades - name: Run tests run: forge test -vvv diff --git a/foundry.toml b/foundry.toml index d48f56c..74471e9 100644 --- a/foundry.toml +++ b/foundry.toml @@ -16,7 +16,8 @@ remappings = [ "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/", "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/", "@fhenixprotocol/cofhe-contracts/=lib/cofhe-contracts/contracts/", - "@fhenixprotocol/cofhe-mock-contracts/=lib/cofhe-mock-contracts/contracts/", + "@cofhe/mock-contracts/=lib/cofhesdk/packages/mock-contracts/", + "@cofhe/foundry-plugin/=lib/cofhesdk/packages/foundry-plugin/", "openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/", "forge-std/=lib/forge-std/src/" ] diff --git a/reineira.json b/reineira.json index 98f1180..92042fc 100644 --- a/reineira.json +++ b/reineira.json @@ -9,8 +9,8 @@ "sdk": "^0.1.0", "contracts": "0.1", "solidity": "^0.8.24", - "hardhat": "~2.26.0", - "cofhejs": "^0.3.1" + "foundry": ">=0.2.0", + "@cofhe/sdk": "^0.5.1" }, "interfaces": { "IConditionResolver": "isConditionMet(uint256) + onConditionSet(uint256,bytes)",