Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
96d501e
Merge pull request #4 from centrifuge/upgrade
mikiquantum Dec 21, 2019
828afe6
Merge branch 'master' of github.com:polkadot-js/apps
philipstanislaus Jan 20, 2020
6840f00
Merge pull request #6 from philipstanislaus/centrifuge-endpoints
philipstanislaus Jan 20, 2020
d2bf422
Merge branch 'master' of github.com:polkadot-js/apps
philipstanislaus Jan 28, 2020
ba7d52f
Add Centrifuge Endpoints
philipstanislaus Jan 28, 2020
17f6cb3
Add amber endpoint
philipstanislaus Feb 2, 2020
f9fc550
Merge branch 'master' of github.com:polkadot-js/apps
philipstanislaus Feb 2, 2020
db9a185
Merge branch 'master' into centrifuge-endpoints-testnets
philipstanislaus Feb 2, 2020
0370d00
Merge pull request #7 from philipstanislaus/centrifuge-endpoints-test…
philipstanislaus Feb 2, 2020
a4393d1
Add Centrifuge Endpoints
philipstanislaus Jan 28, 2020
a4159f2
Add amber endpoint
philipstanislaus Feb 2, 2020
7ca229f
Add preimage button to externals (#2228)
jacogr Feb 3, 2020
7013b8f
[CI Skip] 0.40.0-beta.2
actions-user Feb 3, 2020
bfb3b2d
Bump deps (#2229)
jacogr Feb 3, 2020
ee9d268
[CI Skip] 0.40.0-beta.3
actions-user Feb 3, 2020
0143d40
Change dockerfile to use local version as opposed to cloning polkadot…
philipstanislaus Feb 3, 2020
e8b7f65
[CI Skip] 0.40.0-beta.4
actions-user Feb 3, 2020
48accfb
Merge commit 'e8b7f658dea7a610ca68ea596a45bc1b37c1311c' into update
philipstanislaus Feb 3, 2020
b6d94c5
Merge branch 'master' into update
philipstanislaus Feb 5, 2020
f1bb6cd
Add type to support old balance lock functionality
philipstanislaus Feb 5, 2020
8866c00
Merge pull request #8 from philipstanislaus/update
philipstanislaus Feb 5, 2020
37afb93
Merge commit '8346474cd474550760580e781ea6f49adffc79de'
philipstanislaus Feb 11, 2020
4d2f5ae
Add type overwrites
philipstanislaus Feb 11, 2020
0e009dc
Fix type overwrites
philipstanislaus Feb 11, 2020
45bc406
Move types to spec overrides
philipstanislaus Feb 11, 2020
1ea899b
Make linter happy
philipstanislaus Feb 11, 2020
f81197e
Merge pull request #9 from philipstanislaus/type-overwrites
philipstanislaus Feb 11, 2020
61633fb
Merge commit '2d49680c9fa39c9abe688132ece5ab06dd850c52'
philipstanislaus Mar 11, 2020
a6f507c
Merge commit '31211324e53ae9f47ca6c946dfb59386af188ac1'
philipstanislaus Mar 12, 2020
3f7ed9b
Merge branch 'master' of github.com:polkadot-js/apps
mikiquantum Mar 12, 2020
7f11207
Merge pull request #10 from mikiquantum/update
mikiquantum Mar 12, 2020
bbec8c2
Upgrade Centrifuge types
philipstanislaus Mar 20, 2020
4791ade
Make linter happy
philipstanislaus Mar 20, 2020
7a2147c
Merge commit '4791adefbe19cf9c01b9dcf8ec715aea39839470' into upgrade
philipstanislaus Mar 20, 2020
4fba28f
Make linter happy
philipstanislaus Mar 20, 2020
80a4067
Merge pull request #12 from philipstanislaus/upgrade
mikiquantum Mar 23, 2020
c2942ff
Add bridge constants
mikiquantum Apr 25, 2020
46e0d12
more
mikiquantum Apr 27, 2020
ab95cb9
update latest
mikiquantum May 6, 2020
49a5b81
Merge pull request #14 from centrifuge/up-app
mikiquantum May 6, 2020
21e69b9
merge upstream
mikiquantum May 7, 2020
30da2c9
Merging collective fix
mikiquantum May 7, 2020
8186c55
Merge pull request #15 from centrifuge/collect
mikiquantum May 9, 2020
07fa1dd
Adding multi account data spec
mikiquantum May 19, 2020
a31dec4
Merge pull request #16 from centrifuge/add_multi
mikiquantum May 19, 2020
b0570f1
fix build
mikiquantum May 19, 2020
1e169eb
Merge pull request #17 from centrifuge/n_inc
mikiquantum May 19, 2020
39e6b02
pump nvm
mikiquantum May 19, 2020
649179b
Add Mainnet Endpoint
mikiquantum May 19, 2020
c32b225
Use Address defaults
mikiquantum Jun 10, 2020
6f90d6c
Merge pull request #18 from centrifuge/id_defaults
mikiquantum Jun 10, 2020
96d1def
revert Incides, too soon
mikiquantum Jun 11, 2020
3ef084c
Merge pull request #19 from centrifuge/revert_ind
mikiquantum Jun 11, 2020
8cb6e27
Merge branch 'master' of github.com:polkadot-js/apps into upgrade-2
philipstanislaus Jul 14, 2020
d0aac2c
Merge pull request #20 from centrifuge/upgrade-2
philipstanislaus Jul 15, 2020
83ae001
Update .nvmrc
mikiquantum Jul 16, 2020
713ce2d
patch missing council api function
mikiquantum Jul 23, 2020
a2324e7
Merge branch 'master' of github.com:centrifuge/polkadot-js-apps
mikiquantum Jul 23, 2020
6777aa4
Backport upstream fix
mikiquantum Jul 23, 2020
c5c96e2
Adding Centrifuge specific cfg
mikiquantum Jul 30, 2020
8495c76
Merge pull request #21 from centrifuge/cfg/override
mikiquantum Jul 30, 2020
830d039
upstream polkadot
mikiquantum Aug 6, 2020
69e4cf5
Update centrifuge types
mikiquantum Aug 6, 2020
8da267e
revert nvmrc
mikiquantum Aug 6, 2020
e670158
simplify amber name
mikiquantum Aug 6, 2020
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"afterSign": "electron-builder-notarize"
},
"resolutions": {
"@polkadot/api": "^1.28.0-beta.3",
"@polkadot/api-contract": "^1.28.0-beta.3",
"@polkadot/api": "^1.28.0-beta.4",
"@polkadot/api-contract": "^1.28.0-beta.4",
"@polkadot/keyring": "^3.1.0-beta.4",
"@polkadot/types": "^1.28.0-beta.3",
"@polkadot/types": "^1.28.0-beta.4",
"@polkadot/util": "^3.1.0-beta.4",
"@polkadot/util-crypto": "^3.1.0-beta.4",
"@polkadot/wasm-crypto": "^1.3.0-beta.29",
Expand Down
16 changes: 15 additions & 1 deletion packages/apps-config/src/api/spec/centrifuge-chain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,19 @@ export default {
Proof: {
leafHash: 'H256',
sortedHashes: 'H256'
}
},
// MultiAccount
MultiAccountData: {
threshold: 'u16',
signatories: 'Vec<AccountId>',
deposit: 'Balance',
depositor: 'AccountId'
},
Address: 'GenericAddress',
LookupSource: 'GenericAddress',
// Bridge constants
ChainId: 'u8',
ResourceId: '[u8; 32]',
'chainbridge::ChainId': 'u8',
DepositNonce: 'u64'
};
5 changes: 5 additions & 0 deletions packages/apps-config/src/settings/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ function createTest (t: TFunction): LinkOption[] {
value: 'wss://track-rpc.polkadot.io'
},
// alphabetical based on chain name
{
info: 'amber',
text: t<string>('rpc.amber', 'Amber (Centrifuge Testnet, hosted by Centrifuge)', { ns: 'apps-config' }),
value: 'wss://fullnode.amber.centrifuge.io'
},
{
info: 'nodle',
text: t<string>('rpc.arcadia', 'Arcadia (Nodle Testnet, hosted by Nodle)', { ns: 'apps-config' }),
Expand Down
2 changes: 1 addition & 1 deletion packages/page-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.11.2",
"@polkadot/api-contract": "^1.28.0-beta.3"
"@polkadot/api-contract": "^1.28.0-beta.4"
}
}
2 changes: 1 addition & 1 deletion packages/react-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.11.2",
"@polkadot/api": "^1.28.0-beta.3",
"@polkadot/api": "^1.28.0-beta.4",
"@polkadot/extension-dapp": "^0.33.0-beta.1",
"rxjs-compat": "^6.6.2"
}
Expand Down
112 changes: 56 additions & 56 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3031,57 +3031,57 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/api-contract@npm:^1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/api-contract@npm:1.28.0-beta.3"
"@polkadot/api-contract@npm:^1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/api-contract@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/api": 1.28.0-beta.3
"@polkadot/rpc-core": 1.28.0-beta.3
"@polkadot/types": 1.28.0-beta.3
"@polkadot/api": 1.28.0-beta.4
"@polkadot/rpc-core": 1.28.0-beta.4
"@polkadot/types": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
bn.js: ^5.1.2
rxjs: ^6.6.2
checksum: 2921294363cd6d4b4de1c0cf9f347836dfd4abde3f49975a07f280d4615691c48f7f1cdca1636778a80c1ee3832b5e651943b6eb4fd4a174f26e59f5d1b31841
checksum: 4c3a3be8d24bfe58cd31b44441d572e0111f915c71b53c8e6746e2dbb132314513f580c19e3c428c3d28e745987ec3b7485780fd6124272a77f7339344d4c613
languageName: node
linkType: hard

"@polkadot/api-derive@npm:1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/api-derive@npm:1.28.0-beta.3"
"@polkadot/api-derive@npm:1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/api-derive@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/api": 1.28.0-beta.3
"@polkadot/rpc-core": 1.28.0-beta.3
"@polkadot/rpc-provider": 1.28.0-beta.3
"@polkadot/types": 1.28.0-beta.3
"@polkadot/api": 1.28.0-beta.4
"@polkadot/rpc-core": 1.28.0-beta.4
"@polkadot/rpc-provider": 1.28.0-beta.4
"@polkadot/types": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
"@polkadot/util-crypto": ^3.1.0-beta.4
bn.js: ^5.1.2
memoizee: ^0.4.14
rxjs: ^6.6.2
checksum: b9515a20db334f0290de2102f8b6c82a6278cbb1d3a93e868cf2409c87a292edbf1ff3b2a462409b0788b42b6c93d45aa0b9392c4008aa9cec35abd9af3d8029
checksum: e1276bced38ed7c086c89225a0e22ae6f78276721444b4c6099e611032e554822899396b028d2020c2ba5d65c15d471cf54deb0f8e9d6f85584d58ee95950819
languageName: node
linkType: hard

"@polkadot/api@npm:^1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/api@npm:1.28.0-beta.3"
"@polkadot/api@npm:^1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/api@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/api-derive": 1.28.0-beta.3
"@polkadot/api-derive": 1.28.0-beta.4
"@polkadot/keyring": ^3.1.0-beta.4
"@polkadot/metadata": 1.28.0-beta.3
"@polkadot/rpc-core": 1.28.0-beta.3
"@polkadot/rpc-provider": 1.28.0-beta.3
"@polkadot/types": 1.28.0-beta.3
"@polkadot/types-known": 1.28.0-beta.3
"@polkadot/metadata": 1.28.0-beta.4
"@polkadot/rpc-core": 1.28.0-beta.4
"@polkadot/rpc-provider": 1.28.0-beta.4
"@polkadot/types": 1.28.0-beta.4
"@polkadot/types-known": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
"@polkadot/util-crypto": ^3.1.0-beta.4
bn.js: ^5.1.2
eventemitter3: ^4.0.4
rxjs: ^6.6.2
checksum: a5226589e7f2a0f59ff11ff13e0ee2575d7522ac26880d925916a4883930a532d8092d04fb6ff9325ab737a72cdf94ac7a9e75ea208954b14dec9dc7fc3a78e0
checksum: 3e93ab79daf4b059892d87730831e63181fe1faf21275674a5772b4df358d3a863f491ef0c94dd3753173e98dec5f113fde750f956157d58462d7d9ee45b30e3
languageName: node
linkType: hard

Expand Down Expand Up @@ -3112,7 +3112,7 @@ __metadata:
resolution: "@polkadot/app-contracts@workspace:packages/page-contracts"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/api-contract": ^1.28.0-beta.3
"@polkadot/api-contract": ^1.28.0-beta.4
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -3480,17 +3480,17 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/metadata@npm:1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/metadata@npm:1.28.0-beta.3"
"@polkadot/metadata@npm:1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/metadata@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/types": 1.28.0-beta.3
"@polkadot/types-known": 1.28.0-beta.3
"@polkadot/types": 1.28.0-beta.4
"@polkadot/types-known": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
"@polkadot/util-crypto": ^3.1.0-beta.4
bn.js: ^5.1.2
checksum: c1ef5b73d01e061ef7484eda816198267882452705f1fe59db93859ef6fa8be075e914e9596e7c787de7b97323b0d35d470b9a56c07bb277edaa03b02bf8f505
checksum: 86c99d8a22c25136c7878b38dd4975cd1da03832ec9f4fd14f19bcfd0b1b0511e915c75d705aa804b38aa03eee8f101f8b9f201fc6c924be3bff50b119d1f8aa
languageName: node
linkType: hard

Expand All @@ -3499,7 +3499,7 @@ __metadata:
resolution: "@polkadot/react-api@workspace:packages/react-api"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/api": ^1.28.0-beta.3
"@polkadot/api": ^1.28.0-beta.4
"@polkadot/extension-dapp": ^0.33.0-beta.1
rxjs-compat: ^6.6.2
languageName: unknown
Expand Down Expand Up @@ -3622,35 +3622,35 @@ __metadata:
languageName: unknown
linkType: soft

"@polkadot/rpc-core@npm:1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/rpc-core@npm:1.28.0-beta.3"
"@polkadot/rpc-core@npm:1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/rpc-core@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/metadata": 1.28.0-beta.3
"@polkadot/rpc-provider": 1.28.0-beta.3
"@polkadot/types": 1.28.0-beta.3
"@polkadot/metadata": 1.28.0-beta.4
"@polkadot/rpc-provider": 1.28.0-beta.4
"@polkadot/types": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
memoizee: ^0.4.14
rxjs: ^6.6.2
checksum: de8ff5001a2d10b4edf3b2958d77f0ff31be057d8eb26e98fc957ae16b547706abcafa931fa02e47317dd47506d81e7eb9fde3d4d6cd7f01478ce46d7d2524a7
checksum: 2648a77c3b8bb3ba1d55d37a3d49726171de14b08f4ba9a9241a0258f1d9fab89611bfccc7057ef3ff185fc8f72832fc9dae860f417dca94002266c29e5b18eb
languageName: node
linkType: hard

"@polkadot/rpc-provider@npm:1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/rpc-provider@npm:1.28.0-beta.3"
"@polkadot/rpc-provider@npm:1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/rpc-provider@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/metadata": 1.28.0-beta.3
"@polkadot/types": 1.28.0-beta.3
"@polkadot/metadata": 1.28.0-beta.4
"@polkadot/types": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
"@polkadot/util-crypto": ^3.1.0-beta.4
bn.js: ^5.1.2
eventemitter3: ^4.0.4
isomorphic-fetch: ^2.2.1
websocket: ^1.0.31
checksum: 96e7c46c64c176b75183a5747dbd1b558ab9272aee5d7c08057d7409a4db0524104d11cf8f7e278cc3c90ca6c733b00263d53f51a38d8cfb39c5a067449df2c2
checksum: e640b30f91124a7db48b6fec9eaacc5ddb8363e24641f41c89c95e67b11a91cdb099f5a2757f1c92763594bfcf1d9d0566d0d94209a7b9b4357c31b27aa9aa14
languageName: node
linkType: hard

Expand All @@ -3663,31 +3663,31 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/types-known@npm:1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/types-known@npm:1.28.0-beta.3"
"@polkadot/types-known@npm:1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/types-known@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/types": 1.28.0-beta.3
"@polkadot/types": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
bn.js: ^5.1.2
checksum: 85aee896bd460265ff7d33f73b7c0ceeac899202b7d16b15ebdb4a31d57b1798c60fce51b177ef6225ce5dcc694bc4e5d6b8ba4ba6f273bbe3a2ecf7fcf69e43
checksum: b6fd9975ae3032831e6b1cc97864ea88315441c63f9524403306c2d70cbaaf2805a4915452ed7be641758bde81b5116dafaad81997e009eec37fa9dddd091efd
languageName: node
linkType: hard

"@polkadot/types@npm:^1.28.0-beta.3":
version: 1.28.0-beta.3
resolution: "@polkadot/types@npm:1.28.0-beta.3"
"@polkadot/types@npm:^1.28.0-beta.4":
version: 1.28.0-beta.4
resolution: "@polkadot/types@npm:1.28.0-beta.4"
dependencies:
"@babel/runtime": ^7.11.2
"@polkadot/metadata": 1.28.0-beta.3
"@polkadot/metadata": 1.28.0-beta.4
"@polkadot/util": ^3.1.0-beta.4
"@polkadot/util-crypto": ^3.1.0-beta.4
"@types/bn.js": ^4.11.6
bn.js: ^5.1.2
memoizee: ^0.4.14
rxjs: ^6.6.2
checksum: 3e46e4b89c9200e45850cbb3559fcb9c7a7da441f7c944fedbff7613228010e75527c6d921c1b1a1531ee581a5194a9d0356225f64c8f9b50b469eb7a7c22283
checksum: 866a875fad164ff7ced60e9009fc3e773377f21ce06a074b78b9fc529b2d356fb119b92ebf7b377754fb9a30cf08c228addb3e0bf796c2a86e3a4c6c15e43709
languageName: node
linkType: hard

Expand Down