Skip to content
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.

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

Playlist ID offset in legacy indexing #3574

Closed
wants to merge 110 commits into from
Closed
Show file tree
Hide file tree
Changes from 109 commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
b7db9cd
add playlists metadata upload route and test
csjiang Apr 27, 2022
55d6d27
wip
csjiang Apr 27, 2022
7a73925
Merge branch 'master' into PLAT-112_upload_playlist_metadata
csjiang Apr 27, 2022
abc96aa
working implementation
csjiang Apr 27, 2022
ecd4f4d
Merge branch 'master' into PLAT-112_upload_playlist_metadata
csjiang Apr 27, 2022
1731429
remove ipfs-http-client dep
csjiang Apr 27, 2022
7da4bd3
Merge branch 'master' into PLAT-112_upload_playlist_metadata
csjiang Apr 27, 2022
1c79cf4
add down migration
csjiang Apr 27, 2022
6c621fe
Merge branch 'master' into PLAT-112_upload_playlist_metadata
csjiang Apr 28, 2022
f11a0ab
Merge branch 'master' into PLAT-112_upload_playlist_metadata
csjiang Apr 28, 2022
d5ab3e1
Merge branch 'master' into PLAT-112_upload_playlist_metadata
csjiang Apr 29, 2022
095d9b4
Merge branch 'master' into PLAT-112_upload_playlist_metadata
hareeshnagaraj Jun 14, 2022
3100858
Fixing lint changes
hareeshnagaraj Jun 14, 2022
54be630
WORKING MIGRATION AFTER FIX
hareeshnagaraj Jun 15, 2022
5497968
Properly functioning up/down migration, optimizing separately
hareeshnagaraj Jun 15, 2022
589b406
Corresponding model changes
hareeshnagaraj Jun 15, 2022
9420962
Addressing rest of comments
hareeshnagaraj Jun 16, 2022
de41a3c
Update playlist image sizes multihash field
hareeshnagaraj Jun 16, 2022
5f7317e
Fix hyphenated migration
hareeshnagaraj Jun 16, 2022
c67c6df
Minor update
hareeshnagaraj Jun 16, 2022
1c17501
Adding test case
hareeshnagaraj Jun 16, 2022
771f4c7
Added imageDIR test
hareeshnagaraj Jun 16, 2022
6fef564
Merge branch 'master' into PLAT-112_upload_playlist_metadata_hn
hareeshnagaraj Jun 21, 2022
b2cbd33
Removing try/catch
hareeshnagaraj Jun 23, 2022
b02bcca
Updated migration
hareeshnagaraj Jun 23, 2022
52568fa
More details added to migration
hareeshnagaraj Jun 23, 2022
6818e6c
Merge branch 'master' into PLAT-112_upload_playlist_metadata_hn
hareeshnagaraj Jun 23, 2022
55179f7
SENDING TXS NOW FUNCTIONING - cleanup required but all good
hareeshnagaraj Jun 23, 2022
e4eee72
Service level changes
hareeshnagaraj Jun 24, 2022
58aa13b
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jun 24, 2022
3525c96
Minor update
hareeshnagaraj Jun 27, 2022
4beae40
CN API for metadata
hareeshnagaraj Jun 27, 2022
1d190f8
API write functioning fully w/libs, now moving to TS etc.
hareeshnagaraj Jun 28, 2022
d9bc483
ID selection functioning
hareeshnagaraj Jun 29, 2022
6a40e4d
Typescript for new data layer interactions - can be split into multip…
hareeshnagaraj Jun 30, 2022
462c8ed
functioning w/cleanup required - audius data txs ingested sucessfully
hareeshnagaraj Jul 1, 2022
75e3b81
Fully functioning createPlaylist in manageEntity
hareeshnagaraj Jul 1, 2022
77cbabc
Fix return type, minor update
hareeshnagaraj Jul 5, 2022
8d81f19
-
hareeshnagaraj Jul 5, 2022
9442133
Lint errors
hareeshnagaraj Jul 5, 2022
55d3db4
-
hareeshnagaraj Jul 5, 2022
a24e51e
NIT
hareeshnagaraj Jul 5, 2022
af6bfb9
Adding is private + fixing bool format
hareeshnagaraj Jul 5, 2022
dc4104a
Libs lint
hareeshnagaraj Jul 5, 2022
7a65bc3
Hardcoded local dev values
hareeshnagaraj Jul 5, 2022
fcacc74
Caching local setup
hareeshnagaraj Jul 6, 2022
cc38f16
Improved example
hareeshnagaraj Jul 6, 2022
7eb8751
Local disc prov config
hareeshnagaraj Jul 6, 2022
b9a13c9
Pull address from config
hareeshnagaraj Jul 6, 2022
e9c7a2d
More e2e libs work
hareeshnagaraj Jul 6, 2022
479330f
Black formatting
hareeshnagaraj Jul 6, 2022
0a039a1
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jul 6, 2022
0196574
Fix ref
hareeshnagaraj Jul 6, 2022
701664d
NIT
hareeshnagaraj Jul 6, 2022
9c68d72
Adding new config
hareeshnagaraj Jul 6, 2022
747da8d
Fixing local errors - e2e w/configs should be functioning now
hareeshnagaraj Jul 6, 2022
cb1ddec
Fix metadata parsing to match
hareeshnagaraj Jul 6, 2022
f1f292e
Save migration output for data contracts
hareeshnagaraj Jul 6, 2022
33ce72b
ABI nit
hareeshnagaraj Jul 7, 2022
3a7d424
Adding schema validation flow
hareeshnagaraj Jul 7, 2022
c70fa03
Merging master
hareeshnagaraj Jul 7, 2022
fb85c52
Removing base.d.ts
hareeshnagaraj Jul 7, 2022
dcda604
LINT
hareeshnagaraj Jul 7, 2022
f4ca0d7
Add delete playlist to audius data libs + indexing (#3403)
isaacsolo Jul 7, 2022
d06fb8e
Merge branch 'hn_audius_data_write_path' of github.com:AudiusProject/…
hareeshnagaraj Jul 8, 2022
22a4608
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jul 8, 2022
c81f1c0
Propagating name change
hareeshnagaraj Jul 8, 2022
a5d0e56
Further changes
hareeshnagaraj Jul 8, 2022
dda6872
Conditional init
hareeshnagaraj Jul 8, 2022
afc7639
Address lint
hareeshnagaraj Jul 8, 2022
7ac5abf
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jul 12, 2022
c2864d9
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jul 13, 2022
6e0f058
Update playlist on EntityManager (#3417)
isaacsolo Jul 13, 2022
1fdb31c
Fix init bug
hareeshnagaraj Jul 13, 2022
ba20453
Merge branch 'hn_audius_data_write_path' of github.com:AudiusProject/…
hareeshnagaraj Jul 13, 2022
854cdfd
Debug commit
hareeshnagaraj Jul 13, 2022
8a2f545
Fixing up enum during processing
hareeshnagaraj Jul 14, 2022
7403d8c
Use .value everywhere
hareeshnagaraj Jul 14, 2022
c34a176
Incorrect import
hareeshnagaraj Jul 14, 2022
7b5c82f
Remove debug logs
hareeshnagaraj Jul 14, 2022
fa60d11
Calculate valid playlist ID
hareeshnagaraj Jul 14, 2022
d168c39
Another entity type NIT fix
hareeshnagaraj Jul 14, 2022
79d645b
Merged master
hareeshnagaraj Jul 14, 2022
aaa03b7
Use new image w/EntityManager deployed
hareeshnagaraj Jul 14, 2022
55851c9
Merge branch 'hn_prebake_update_with_entity_manager' into hn_audius_d…
hareeshnagaraj Jul 15, 2022
e61c2ea
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jul 15, 2022
2347bc0
Config
hareeshnagaraj Jul 15, 2022
f06dbfa
Fix output
hareeshnagaraj Jul 15, 2022
4422784
Config in libs for rename
hareeshnagaraj Jul 15, 2022
7148015
default config update
hareeshnagaraj Jul 15, 2022
9994bb4
Updated schema
hareeshnagaraj Jul 15, 2022
c435036
Lint
hareeshnagaraj Jul 15, 2022
ee8ecd2
PARITY E2E w/CREATE - Contract Name fix
hareeshnagaraj Jul 15, 2022
1a43ce1
Fixing types and such
hareeshnagaraj Jul 15, 2022
7d0c081
Aggregating types
hareeshnagaraj Jul 15, 2022
2da18dd
More cleanup work
hareeshnagaraj Jul 15, 2022
0eb7c5f
Add EntityManager functionality to libs, minor local dev updates, new…
hareeshnagaraj Jul 15, 2022
4a6f178
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jul 15, 2022
246cefe
Reorder imports
hareeshnagaraj Jul 18, 2022
0ddbd68
Merge branch 'master' into hn_audius_data_write_path
hareeshnagaraj Jul 18, 2022
37f488f
Merge branch 'master' into hn_entity_manager_libs_local_integ
hareeshnagaraj Jul 18, 2022
52fc104
Addressing PR comments, removed entity type / entity action from meta…
hareeshnagaraj Jul 18, 2022
e539fa8
Merging libs changes
hareeshnagaraj Jul 18, 2022
f08e4d8
Minor touchups, fixed playlist_content parsing
hareeshnagaraj Jul 18, 2022
4fb6ce5
Playlist validation and batching (#3484)
isaacsolo Jul 18, 2022
3d8fb12
Fixing lint issues
hareeshnagaraj Jul 21, 2022
f797ab7
Fix missing values
hareeshnagaraj Jul 21, 2022
9af986c
Nullable and type added to CreatorNote.ts
hareeshnagaraj Jul 22, 2022
0e51335
Add playlist id offset to legacy indexing
isaacsolo Jul 29, 2022
17418bf
add ID offset enforcement on playlist creation in entity manager
isaacsolo Jul 29, 2022
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 contracts/scripts/migrate-contracts.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const outputJsonConfigFile = async (outputPath) => {
let addressInfo = require(migrationOutputPath)
let outputDictionary = {}
outputDictionary['registryAddress'] = addressInfo.registryAddress
outputDictionary['audiusDataAddress'] = addressInfo.audiusDataProxyAddress
outputDictionary['entityManagerProxyAddress'] = addressInfo.entityManagerProxyAddress
outputDictionary['ursmAddress'] = addressInfo.ursmAddress
outputDictionary['ownerWallet'] = await getDefaultAccount()
outputDictionary['allWallets'] = await web3.eth.getAccounts()
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/startup/socks5-proxy-pac.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env python

import socket
import http
import http.server
import socket

IP_ADDRESS = socket.gethostbyname(socket.gethostname())
TLD = socket.getfqdn().split(".")[-1]
Expand Down
1 change: 1 addition & 0 deletions discovery-provider/default_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ allow_all = false

[contracts]
registry =
entity_manager_address =

[eth_contracts]
registry =
Expand Down
12 changes: 12 additions & 0 deletions discovery-provider/src/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
playlist_factory = None
user_library_factory = None
user_replica_set_manager = None
audius_data = None
contract_addresses: Dict[str, Any] = defaultdict()

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -126,6 +127,13 @@ def init_contracts():
abi=abi_values["UserReplicaSetManager"]["abi"],
)

audius_data_address = web3.toChecksumAddress(
shared_config["contracts"]["entity_manager_address"]
)
audius_data_inst = web3.eth.contract(
address=audius_data_address, abi=abi_values["AudiusData"]["abi"]
)

contract_address_dict = {
"registry": registry_address,
"user_factory": user_factory_address,
Expand All @@ -134,6 +142,7 @@ def init_contracts():
"playlist_factory": playlist_factory_address,
"user_library_factory": user_library_factory_address,
"user_replica_set_manager": user_replica_set_manager_address,
"audius_data": audius_data_address,
}

return (
Expand All @@ -144,6 +153,7 @@ def init_contracts():
playlist_factory_inst,
user_library_factory_inst,
user_replica_set_manager_inst,
audius_data_inst,
contract_address_dict,
)

Expand Down Expand Up @@ -176,6 +186,7 @@ def create_celery(test_config=None):
global playlist_factory
global user_library_factory
global user_replica_set_manager
global audius_data
global contract_addresses
# pylint: enable=W0603

Expand All @@ -187,6 +198,7 @@ def create_celery(test_config=None):
playlist_factory,
user_library_factory,
user_replica_set_manager,
audius_data,
contract_addresses,
) = init_contracts()

Expand Down
Loading