Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 blocklock-solidity
Submodule blocklock-solidity updated 35 files
+10 −46 README.md
+2 −2 package-lock.json
+1 −1 package.json
+0 −67 script/DeployAllContracts.s.sol
+0 −23 script/DeployFactory.s.sol
+0 −96 script/README.md
+0 −14 script/json/README.md
+0 −9 script/libraries/Constants.sol
+0 −46 script/single-deployment/DeployBlocklockReceiver.s.sol
+0 −145 script/single-deployment/DeployBlocklockSender.s.sol
+0 −54 script/single-deployment/DeployBlocklockSignatureScheme.s.sol
+0 −90 script/single-deployment/DeployDecryptionSender.s.sol
+0 −48 script/single-deployment/DeploySignatureSchemeAddressProvider.s.sol
+0 −31 script/utils/EnvReader.sol
+0 −33 script/utils/JsonUtils.sol
+44 −33 src/AbstractBlocklockReceiver.sol
+34 −34 src/blocklock/BlocklockSender.sol
+7 −7 src/decryption-requests/DecryptionReceiverBase.sol
+42 −42 src/decryption-requests/DecryptionSender.sol
+2 −2 src/interfaces/IBlocklockReceiver.sol
+6 −4 src/interfaces/IBlocklockSender.sol
+2 −2 src/interfaces/IDecryptionReceiver.sol
+8 −8 src/interfaces/IDecryptionSender.sol
+3 −3 src/libraries/BLS.sol
+1 −1 src/libraries/TypesLib.sol
+8 −8 src/mocks/MockBlocklockReceiver.sol
+8 −8 src/mocks/MockBlocklockRevertingReceiver.sol
+8 −8 src/mocks/MockBlocklockStringReceiver.sol
+21 −105 test/forge/DirectFunding.t.sol
+23 −23 test/forge/SubscriptionFunding.t.sol
+23 −0 test/forge/base/Blocklock.t.sol
+1 −4 test/forge/base/Deployment.t.sol
+12 −14 test/hardhat/blocklock.test.ts
+274 −0 utils/mocks/create-blocklock-request.ts
+103 −0 utils/mocks/fetch-contract-data.ts
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blocklock-js",
"version": "0.0.8-rc6",
"version": "0.0.8-rc8",
"description": "A library for encrypting and decrypting data for the future",
"source": "src/index.ts",
"main": "./dist/cjs/index.cjs",
Expand Down
4 changes: 2 additions & 2 deletions src/blocklock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export class Blocklock {
const request = await this.blocklockSender.getRequest.staticCall(requestId)
const blockHeight = decodeCondition(request.condition)
return {
id: request.decryptionRequestID,
id: request.decryptionRequestId,
blockHeight: blockHeight,
ciphertext: parseSolidityCiphertext(request.ciphertext)
}
Expand All @@ -174,7 +174,7 @@ export class Blocklock {

return new Map(Array.from(
requests.map((event) => {
const id = event.args.requestID
const id = event.args.requestId
const blockHeight = decodeCondition(event.args.condition)

return [id, {
Expand Down
2 changes: 1 addition & 1 deletion src/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const FILECOIN_CALIBNET: NetworkConfig = {
name: "filecoin_calibnet",
chainId: 314159n,
contractAddress: "0xF00aB3B64c81b6Ce51f8220EB2bFaa2D469cf702",
publicKey: BLOCKLOCK_TESTNET_PUBLIC_KEY,
publicKey: BLOCKLOCK_MAINNET_PUBLIC_KEY,
ibeOpts: {
hash: keccak_256,
k: 128,
Expand Down
Loading