Skip to content

fix: consistent usage of oraclePublicKey with oracle messages #230

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

Merged
matthewjablack merged 3 commits into from
Sep 5, 2025
Merged

fix: consistent usage of oraclePublicKey with oracle messages #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8143165
fix: consistent usage of oraclePublicKey with oracle messages
bennyhodl Sep 4, 2025
13a58b4
test: update oraclePubkey -> oraclePublicKey
matthewjablack Sep 4, 2025
ca2da49
test: update oraclePubkey -> oraclePublicKey in leveldb
matthewjablack Sep 5, 2025
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 packages/leveldb/__tests__/leveldb-dlc-store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('LeveldbDlcStore', () => {
// Create oracle announcement
const oracleAnnouncement = new OracleAnnouncement();
oracleAnnouncement.announcementSig = Buffer.alloc(64, 0xfa);
oracleAnnouncement.oraclePubkey = Buffer.alloc(32, 0xda);
oracleAnnouncement.oraclePublicKey = Buffer.alloc(32, 0xda);
oracleAnnouncement.oracleEvent = oracleEvent;

// Create oracle info
Expand Down
4 changes: 2 additions & 2 deletions packages/leveldb/__tests__/leveldb-oracle-store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ describe('LeveldbOracleStore', () => {
// Create oracle announcement
const oracleAnnouncement = new OracleAnnouncement();
oracleAnnouncement.announcementSig = Buffer.alloc(64, 0xfa);
oracleAnnouncement.oraclePubkey = Buffer.alloc(32, 0xda);
oracleAnnouncement.oraclePublicKey = Buffer.alloc(32, 0xda);
oracleAnnouncement.oracleEvent = oracleEvent;

// Create oracle attestation
const oracleAttestation = new OracleAttestation();
oracleAttestation.eventId = 'BTC-USD-OVER-50K-COINBASE';
oracleAttestation.oraclePubkey = Buffer.from(
oracleAttestation.oraclePublicKey = Buffer.from(
'1d5dcdba2e64cb116cc0c375a0856298f0058b778f46bfe625ac6576204889e4',
'hex',
);
Expand Down
2 changes: 1 addition & 1 deletion packages/leveldb/__tests__/leveldb-order-store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('LeveldbOrderStore', () => {
// Create oracle announcement
const oracleAnnouncement = new OracleAnnouncement();
oracleAnnouncement.announcementSig = Buffer.alloc(64, 0xfa);
oracleAnnouncement.oraclePubkey = Buffer.alloc(32, 0xda);
oracleAnnouncement.oraclePublicKey = Buffer.alloc(32, 0xda);
oracleAnnouncement.oracleEvent = oracleEvent;

// Create oracle info
Expand Down
8 changes: 4 additions & 4 deletions packages/messaging/__tests__/messages/ContractInfo.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('ContractInfo', () => {
'fab22628f6e2602e1671c286a2f63a9246794008627a1749639217f4214cb4a9494c93d1a852221080f44f697adb4355df59eb339f6ba0f9b01ba661a8b108d4',
'hex',
);
oracleAnnouncement.oraclePubkey = Buffer.from(
oracleAnnouncement.oraclePublicKey = Buffer.from(
'da078bbb1d34e7729e38e2ae34236e776da121af442626fa31e31ae55a279a0b',
'hex',
);
Expand Down Expand Up @@ -168,7 +168,7 @@ describe('ContractInfo', () => {
'c3347aa29db9f5e619483a92e746be91982bc66127e856bee62daeb91148cb92a1074a802a481c008ba44143c752e519c28d906658e5257d9d82e80ef66cbf0f',
'hex',
);
oracleAnnouncement.oraclePubkey = Buffer.from(
oracleAnnouncement.oraclePublicKey = Buffer.from(
'4f15b5e4b8000c33a8e5bbdbc6802375a7d6e7cefcfbf098aa51ce7da0f910c1',
'hex',
);
Expand Down Expand Up @@ -206,7 +206,7 @@ describe('ContractInfo', () => {
'fab22628f6e2602e1671c286a2f63a9246794008627a1749639217f4214cb4a9494c93d1a852221080f44f697adb4355df59eb339f6ba0f9b01ba661a8b108d4',
'hex',
);
oracleAnnouncement.oraclePubkey = Buffer.from(
oracleAnnouncement.oraclePublicKey = Buffer.from(
'da078bbb1d34e7729e38e2ae34236e776da121af442626fa31e31ae55a279a0b',
'hex',
);
Expand Down Expand Up @@ -304,7 +304,7 @@ describe('ContractInfo', () => {
'c3347aa29db9f5e619483a92e746be91982bc66127e856bee62daeb91148cb92a1074a802a481c008ba44143c752e519c28d906658e5257d9d82e80ef66cbf0f',
'hex',
);
oracleAnnouncement.oraclePubkey = Buffer.from(
oracleAnnouncement.oraclePublicKey = Buffer.from(
'4f15b5e4b8000c33a8e5bbdbc6802375a7d6e7cefcfbf098aa51ce7da0f910c1',
'hex',
);
Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/__tests__/messages/DlcOffer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe('DlcOffer', () => {
'fab22628f6e2602e1671c286a2f63a9246794008627a1749639217f4214cb4a9494c93d1a852221080f44f697adb4355df59eb339f6ba0f9b01ba661a8b108d4',
'hex',
);
announcement.oraclePubkey = Buffer.from(
announcement.oraclePublicKey = Buffer.from(
'da078bbb1d34e7729e38e2ae34236e776da121af442626fa31e31ae55a279a0b',
'hex',
);
Expand Down
42 changes: 25 additions & 17 deletions packages/messaging/__tests__/messages/OracleAnnouncement.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('OracleAnnouncement', () => {

instance.length = BigInt(164);
instance.announcementSig = announcementSig;
instance.oraclePubkey = oraclePubkey;
instance.oraclePublicKey = oraclePubkey;
instance.oracleEvent = OracleEvent.deserialize(
Buffer.from(
'fdd822' + // type oracle_event
Expand Down Expand Up @@ -113,7 +113,7 @@ describe('OracleAnnouncement', () => {

expect(instance.length).to.deep.equal(BigInt(164));
expect(instance.announcementSig).to.deep.equal(announcementSig);
expect(instance.oraclePubkey).to.deep.equal(oraclePubkey);
expect(instance.oraclePublicKey).to.deep.equal(oraclePubkey);
expect(instance.oracleEvent.serialize().toString('hex')).to.equal(
'fdd822' + // type oracle_event
'40' + // length
Expand All @@ -139,7 +139,7 @@ describe('OracleAnnouncement', () => {

instance.length = BigInt(164);
instance.announcementSig = announcementSig;
instance.oraclePubkey = oraclePubkey;
instance.oraclePublicKey = oraclePubkey;
instance.oracleEvent = OracleEvent.deserialize(
Buffer.from(
'fdd822' + // type oracle_event
Expand Down Expand Up @@ -170,7 +170,7 @@ describe('OracleAnnouncement', () => {

instance.length = BigInt(164);
instance.announcementSig = announcementSig;
instance.oraclePubkey = invalidOraclePubkey;
instance.oraclePublicKey = invalidOraclePubkey;
instance.oracleEvent = OracleEvent.deserialize(
Buffer.from(
'fdd822' + // type oracle_event
Expand Down Expand Up @@ -218,7 +218,7 @@ describe('OracleAnnouncement', () => {
'hex',
),
);
expect(instance.oraclePubkey).to.deep.equal(
expect(instance.oraclePublicKey).to.deep.equal(
Buffer.from(
'b8b005b07acf849ad2cec22107331dedbf5a607654fad4eafe39c278e27dde68',
'hex',
Expand Down Expand Up @@ -261,8 +261,8 @@ describe('OracleAnnouncement', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.announcementSig).to.be.instanceOf(Buffer);
expect(instance.announcementSig.length).to.equal(64);
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.oracleEvent).to.be.instanceOf(OracleEvent);
expect(instance.getEventId()).to.equal(
testVectors.atomic.metadata.eventId,
Expand All @@ -288,7 +288,9 @@ describe('OracleAnnouncement', () => {
const serialized = instance.serialize();
const deserialized = OracleAnnouncement.deserialize(serialized);
expect(deserialized.getEventId()).to.equal(instance.getEventId());
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
});
});

Expand All @@ -305,8 +307,8 @@ describe('OracleAnnouncement', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.announcementSig).to.be.instanceOf(Buffer);
expect(instance.announcementSig.length).to.equal(64);
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.oracleEvent).to.be.instanceOf(OracleEvent);
});

Expand All @@ -326,7 +328,9 @@ describe('OracleAnnouncement', () => {

const deserialized = OracleAnnouncement.deserialize(serialized);
expect(deserialized.getEventId()).to.equal(instance.getEventId());
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
});
});

Expand All @@ -342,8 +346,8 @@ describe('OracleAnnouncement', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.announcementSig).to.be.instanceOf(Buffer);
expect(instance.announcementSig.length).to.equal(64);
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.oracleEvent).to.be.instanceOf(OracleEvent);
expect(instance.getEventId()).to.equal('sports-match-001');
});
Expand All @@ -363,7 +367,9 @@ describe('OracleAnnouncement', () => {
const serialized = instance.serialize();
const deserialized = OracleAnnouncement.deserialize(serialized);
expect(deserialized.getEventId()).to.equal(instance.getEventId());
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
});
});

Expand All @@ -382,8 +388,8 @@ describe('OracleAnnouncement', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.announcementSig).to.be.instanceOf(Buffer);
expect(instance.announcementSig.length).to.equal(64);
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.oracleEvent).to.be.instanceOf(OracleEvent);
expect(instance.getEventId()).to.equal('btc-price-test');
});
Expand All @@ -408,7 +414,9 @@ describe('OracleAnnouncement', () => {
const serialized = instance.serialize();
const deserialized = OracleAnnouncement.deserialize(serialized);
expect(deserialized.getEventId()).to.equal(instance.getEventId());
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
});
});
});
Expand Down
42 changes: 25 additions & 17 deletions packages/messaging/__tests__/messages/OracleAttestation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('OracleAttestation', () => {
const instance = new OracleAttestation();

instance.eventId = 'BTC-USD-OVER-50K-COINBASE';
instance.oraclePubkey = oraclePubkey;
instance.oraclePublicKey = oraclePubkey;
instance.signatures.push(attestationSig);
instance.outcomes.push('NO');

Expand All @@ -50,7 +50,7 @@ describe('OracleAttestation', () => {
// Create a test instance and serialize it first for round-trip testing
const originalInstance = new OracleAttestation();
originalInstance.eventId = 'BTC-USD-OVER-50K-COINBASE';
originalInstance.oraclePubkey = oraclePubkey;
originalInstance.oraclePublicKey = oraclePubkey;
originalInstance.signatures.push(attestationSig);
originalInstance.outcomes.push('NO');

Expand All @@ -60,7 +60,7 @@ describe('OracleAttestation', () => {

expect(Number(instance.length)).to.be.greaterThan(0); // Length is calculated automatically
expect(instance.eventId).to.equal('BTC-USD-OVER-50K-COINBASE');
expect(instance.oraclePubkey).to.deep.equal(oraclePubkey);
expect(instance.oraclePublicKey).to.deep.equal(oraclePubkey);
expect(instance.signatures[0]).to.deep.equal(attestationSig);
expect(instance.outcomes[0]).to.equal('NO');
});
Expand All @@ -71,7 +71,7 @@ describe('OracleAttestation', () => {
const instance = new OracleAttestation();

instance.eventId = 'BTC-USD-OVER-50K-COINBASE';
instance.oraclePubkey = oraclePubkey;
instance.oraclePublicKey = oraclePubkey;
instance.signatures.push(attestationSig);
instance.outcomes.push('NO');

Expand All @@ -84,7 +84,7 @@ describe('OracleAttestation', () => {
const instance = new OracleAttestation();

instance.eventId = 'BTC-USD-OVER-50K-COINBASE';
instance.oraclePubkey = invalidOraclePubkey;
instance.oraclePublicKey = invalidOraclePubkey;
instance.signatures.push(attestationSig);
instance.outcomes.push('NO');

Expand Down Expand Up @@ -119,8 +119,8 @@ describe('OracleAttestation', () => {
it('deserializes Atomic oracle attestation', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.eventId).to.equal(testVectors.atomic.metadata.eventId);
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.signatures).to.be.an('array');
expect(instance.outcomes).to.be.an('array');
expect(instance.signatures.length).to.equal(instance.outcomes.length);
Expand Down Expand Up @@ -149,7 +149,9 @@ describe('OracleAttestation', () => {
const serialized = instance.serialize();
const deserialized = OracleAttestation.deserialize(serialized);
expect(deserialized.eventId).to.equal(instance.eventId);
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
expect(deserialized.outcomes).to.deep.equal(instance.outcomes);
});
});
Expand All @@ -170,8 +172,8 @@ describe('OracleAttestation', () => {
it('deserializes Lava oracle attestation', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.eventId).to.be.a('string');
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.signatures).to.be.an('array');
expect(instance.outcomes).to.be.an('array');
expect(instance.signatures.length).to.equal(instance.outcomes.length);
Expand All @@ -192,7 +194,9 @@ describe('OracleAttestation', () => {
const serialized = instance.serialize();
const deserialized = OracleAttestation.deserialize(serialized);
expect(deserialized.eventId).to.equal(instance.eventId);
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
expect(deserialized.outcomes).to.deep.equal(instance.outcomes);
});
});
Expand All @@ -216,8 +220,8 @@ describe('OracleAttestation', () => {
it('deserializes rust-dlc enum oracle attestation', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.eventId).to.equal('sports-match-001');
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.signatures).to.be.an('array');
expect(instance.outcomes).to.be.an('array');
expect(instance.signatures.length).to.equal(instance.outcomes.length);
Expand All @@ -237,7 +241,9 @@ describe('OracleAttestation', () => {
const serialized = instance.serialize();
const deserialized = OracleAttestation.deserialize(serialized);
expect(deserialized.eventId).to.equal(instance.eventId);
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
expect(deserialized.outcomes).to.deep.equal(instance.outcomes);
});
});
Expand All @@ -256,8 +262,8 @@ describe('OracleAttestation', () => {
it('deserializes rust-dlc numeric oracle attestation', () => {
expect(Number(instance.length)).to.be.greaterThan(0);
expect(instance.eventId).to.equal('btc-price-test');
expect(instance.oraclePubkey).to.be.instanceOf(Buffer);
expect(instance.oraclePubkey.length).to.equal(32);
expect(instance.oraclePublicKey).to.be.instanceOf(Buffer);
expect(instance.oraclePublicKey.length).to.equal(32);
expect(instance.signatures).to.be.an('array');
expect(instance.outcomes).to.be.an('array');
expect(instance.signatures.length).to.equal(instance.outcomes.length);
Expand All @@ -284,7 +290,9 @@ describe('OracleAttestation', () => {
const serialized = instance.serialize();
const deserialized = OracleAttestation.deserialize(serialized);
expect(deserialized.eventId).to.equal(instance.eventId);
expect(deserialized.oraclePubkey).to.deep.equal(instance.oraclePubkey);
expect(deserialized.oraclePublicKey).to.deep.equal(
instance.oraclePublicKey,
);
expect(deserialized.outcomes).to.deep.equal(instance.outcomes);
});
});
Expand Down
4 changes: 2 additions & 2 deletions packages/messaging/__tests__/messages/OracleEventContainer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('OracleEventContainer', () => {
'fab22628f6e2602e1671c286a2f63a9246794008627a1749639217f4214cb4a9494c93d1a852221080f44f697adb4355df59eb339f6ba0f9b01ba661a8b108d4',
'hex',
);
announcement.oraclePubkey = Buffer.from(
announcement.oraclePublicKey = Buffer.from(
'da078bbb1d34e7729e38e2ae34236e776da121af442626fa31e31ae55a279a0b',
'hex',
);
Expand All @@ -39,7 +39,7 @@ describe('OracleEventContainer', () => {
function createTestOracleAttestation(): OracleAttestation {
const attestation = new OracleAttestation();
attestation.eventId = 'BTC-USD-OVER-50K-COINBASE';
attestation.oraclePubkey = Buffer.from(
attestation.oraclePublicKey = Buffer.from(
'1d5dcdba2e64cb116cc0c375a0856298f0058b778f46bfe625ac6576204889e4',
'hex',
);
Expand Down
6 changes: 3 additions & 3 deletions packages/messaging/__tests__/messages/OrderNegotiationFields.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ describe('OrderNegotiationFields', () => {
const oracleInfo = new SingleOracleInfo();
const announcement = new OracleAnnouncement();
announcement.announcementSig = Buffer.alloc(64);
announcement.oraclePubkey = Buffer.alloc(32);
announcement.oraclePublicKey = Buffer.alloc(32);

const oracleEvent = new OracleEvent();
oracleEvent.oracleNonces = [Buffer.alloc(32)];
Expand Down Expand Up @@ -164,7 +164,7 @@ describe('OrderNegotiationFields', () => {
const oracleInfo = new SingleOracleInfo();
const announcement = new OracleAnnouncement();
announcement.announcementSig = Buffer.alloc(64);
announcement.oraclePubkey = Buffer.alloc(32);
announcement.oraclePublicKey = Buffer.alloc(32);

const oracleEvent = new OracleEvent();
oracleEvent.oracleNonces = [Buffer.alloc(32)];
Expand Down Expand Up @@ -264,7 +264,7 @@ describe('OrderNegotiationFields', () => {
const oracleInfo = new SingleOracleInfo();
const announcement = new OracleAnnouncement();
announcement.announcementSig = Buffer.alloc(64);
announcement.oraclePubkey = Buffer.alloc(32);
announcement.oraclePublicKey = Buffer.alloc(32);

const oracleEvent = new OracleEvent();
oracleEvent.oracleNonces = [Buffer.alloc(32)];
Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/__tests__/messages/OrderOffer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('OrderOffer', () => {
const oracleInfo = new SingleOracleInfo();
const announcement = new OracleAnnouncement();
announcement.announcementSig = Buffer.alloc(64);
announcement.oraclePubkey = Buffer.alloc(32);
announcement.oraclePublicKey = Buffer.alloc(32);

const oracleEvent = new OracleEvent();
oracleEvent.oracleNonces = [Buffer.alloc(32)];
Expand Down
Loading
Loading