Skip to content

Commit

Permalink
Merge pull request #112 from ERC725Alliance/develop
Browse files Browse the repository at this point in the history
Release v0.9.2
  • Loading branch information
frozeman authored Mar 3, 2022
2 parents 8ecbc25 + f85e3ac commit dfdd027
Show file tree
Hide file tree
Showing 9 changed files with 173 additions and 37 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [0.9.2](https://github.com/ERC725Alliance/erc725.js/compare/v0.8.0...v0.9.2) (2022-02-21)
* add LSP1 schema ([4f849da](https://github.com/ERC725Alliance/erc725.js/commit/4f849dac01116e6f019e04fea950b42d2271910b))

### Bug Fixes
* update ERC725Y JSON Schemas to latest LSPs specs ([#92](https://github.com/ERC725Alliance/erc725.js/issues/92)) ([3485baa](https://github.com/ERC725Alliance/erc725.js/commit/3485baa347cf9a194bd0c4ea2a1e8c61922b63b9))
* wait until a promise is resolved when using ethereum provider ([5efe641](https://github.com/ERC725Alliance/erc725.js/commit/5efe6414b6e4a4250d8c402baa887a269e6f83ef))

## [0.9.1](https://github.com/ERC725Alliance/erc725.js/compare/v0.9.0...v0.9.1) (2022-02-01)

### Bug Fixes
Expand Down
39 changes: 32 additions & 7 deletions examples/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

112 changes: 85 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@erc725/erc725.js",
"version": "0.9.1",
"version": "0.9.2",
"description": "Library to interact with ERC725 smart contracts",
"main": "build/main/index.js",
"typings": "build/main/index.d.ts",
Expand Down
24 changes: 24 additions & 0 deletions src/providers/ethereumProviderWrapper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,29 @@ describe('EthereumProviderWrapper', () => {
assert.deepStrictEqual(error.message, 'some error');
}
});

it('should return a getData result', async () => {
const ethResults = [
'0x000000000000000000000000a78e0e7c9b1b36f7e25c5ccdfdba005ec37eadf4',
'0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000596f357c6aa34e3d9c3d971121a8616f071b07d2f34fce1da803f7c7ce711e73a28520066f697066733a2f2f516d64745753567a5162555a383269695a4d59684d5657414766446b7732665a52486a634a526e424875617a543800000000000000',
];
const mockProvider = {
request: () => {
return new Promise((resolve) => {
resolve(ethResults.shift());
});
},
};
const ethSource = new EthereumProviderWrapper(mockProvider);

const result = await ethSource.getData(
'0x5ef83ad9559033e6e941db7d7c495acdce616347d28e90c7ce47cbfcfcad3bc5',
'0x7cE38d75e4cC42f2e947DAcebaB8bb882bA6fC68',
);
assert.deepStrictEqual(
result,
'0x6f357c6aa34e3d9c3d971121a8616f071b07d2f34fce1da803f7c7ce711e73a28520066f697066733a2f2f516d64745753567a5162555a383269695a4d59684d5657414766446b7732665a52486a634a526e424875617a5438',
);
});
});
});
2 changes: 1 addition & 1 deletion src/providers/ethereumProviderWrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export class EthereumProviderWrapper {
}

async getData(address: string, keyHash: string) {
const result = this.getAllData(address, [keyHash]);
const result = await this.getAllData(address, [keyHash]);

try {
return result[0].value;
Expand Down
9 changes: 9 additions & 0 deletions src/schemas/LSP1UniversalReceiverDelegate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{
"name": "LSP1UniversalReceiverDelegate",
"key": "0x0cfc51aec37c55a4d0b1a65c6255c4bf2fbdf6277f3cc0730c45b828b6db8b47",
"keyType": "Singleton",
"valueType": "address",
"valueContent": "Address"
}
]
9 changes: 9 additions & 0 deletions src/schemas/LSP4DigitalAssetLegacy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{
"name": "SupportedStandards:LSP4DigitalCertificate",
"key": "0xeafec4d89fa9619884b6b89135626455000000000000000000000000abf0613c",
"keyType": "Mapping",
"valueContent": "0xabf0613c",
"valueType": "bytes"
}
]
6 changes: 5 additions & 1 deletion src/schemas/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { ERC725JSONSchema } from '../types/ERC725JSONSchema';

import LSP1UniversalReceiverDelegate from './LSP1UniversalReceiverDelegate.json';
import LSP3UniversalProfile from './LSP3UniversalProfile.json';
import LSP4DigitalAssetLegacy from './LSP4DigitalAssetLegacy.json';
import LSP4DigitalAsset from './LSP4DigitalAsset.json';
import LSP5ReceivedAssets from './LSP5ReceivedAssets.json';
import LSP6KeyManager from './LSP6KeyManager.json';

export default LSP3UniversalProfile.concat(
export default LSP1UniversalReceiverDelegate.concat(
LSP3UniversalProfile,
LSP4DigitalAssetLegacy,
LSP4DigitalAsset,
LSP5ReceivedAssets,
LSP6KeyManager,
Expand Down

0 comments on commit dfdd027

Please sign in to comment.