Skip to content

Commit

Permalink
Merge pull request #329 from ERC725Alliance/develop
Browse files Browse the repository at this point in the history
Sync main
  • Loading branch information
CJ42 authored Oct 30, 2023
2 parents 42e105e + 1376391 commit 6982b23
Show file tree
Hide file tree
Showing 5 changed files with 289 additions and 153 deletions.
7 changes: 4 additions & 3 deletions docs/classes/ERC725.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,7 @@ myErc725.decodeData([
value: [
{
key: '0x7c8c3416d6cda87cd42c71ea1843df28ac4850354f988d55ee2eaa47b6dc05cd',
value:
'0x0000000000000000000000000000000000000000000000000000000000000002',
value: '0x00000000000000000000000000000002',
},
{
key: '0x7c8c3416d6cda87cd42c71ea1843df2800000000000000000000000000000000',
Expand Down Expand Up @@ -593,7 +592,7 @@ myErc725.encodeData([
],
values: [
'0x6f357c6a820464ddfac1bec070cc14a8daf04129871d458f2ca94368aae8391311af6361696670733a2f2f516d597231564a4c776572673670456f73636468564775676f3339706136727963455a4c6a7452504466573834554178',
'0x0000000000000000000000000000000000000000000000000000000000000002',
'0x00000000000000000000000000000002',
'0xd94353d9b005b3c0a9da169b768a31c57844e490',
'0xdaea594e385fc724449e3118b2db7e86dfba1826',
'0x1183790f29be3cdfd0a102862fea1a4a30b3adab',
Expand Down Expand Up @@ -704,6 +703,7 @@ ERC725.decodeMappingKey(
'0x35e6950bc8d21a1699e50000cafecafecafecafecafecafecafecafecafecafe',
'MyKeyName:<address>',
);
// Decoding will checksum addresses
// [{
// type: 'address',
// value: '0xCAfEcAfeCAfECaFeCaFecaFecaFECafECafeCaFe'
Expand Down Expand Up @@ -806,6 +806,7 @@ ERC725.encodePermissions({
ENCRYPT: false,
DECRYPT: false,
SIGN: false,
EXECUTE_RELAY_CALL: false
}),
// '0x0000000000000000000000000000000000000000000000000000000000000110'

Expand Down
4 changes: 2 additions & 2 deletions docs/providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const ethereumProvider = window.ethereum;
const erc725 = new ERC725([], '0x...', ethereumProvider);
```

## Web3
## Web3 (deprecated)

The following code snippet will use the web3 provider available at web3.providers from the corresponding `web3` library.
The following code snippet will use the web3 provider available at `web3.providers` from the corresponding `web3` library.

:::caution Warning

Expand Down
4 changes: 3 additions & 1 deletion docs/schemas.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ LSP4DigitalAssetLegacy.json
LSP4DigitalAsset.json
LSP5ReceivedAssets.json
LSP6KeyManager.json
LSP8IdentifiableDigitalAsset.json
LSP9Vault.json
LSP10ReceivedVaults.json
LSP12IssuedAssets.json
LSP17ContractExtension.json
```

You can import them from:
Expand All @@ -47,5 +49,5 @@ import LSP5 from '@erc725/erc725.js/schemas/LSP5ReceivedAssets.json';
const myErc725Contract = new ERC725js(LSP3, address, web3.currentProvider);

// You can retrieve the current loaded schema via
myErc725Contract.options.schemas
myErc725Contract.options.schemas;
```
Loading

0 comments on commit 6982b23

Please sign in to comment.