Skip to content

Eth 138 migrate streams to ocr #102

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
merged 14 commits into from
Dec 14, 2021
Merged

Eth 138 migrate streams to ocr #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
72e8de8
added bulk add stream function and test to migrate streams from core-api
samt1803 Nov 10, 2021
088b7d2
added first draft of script, parsing tsv file with all streams, check…
samt1803 Nov 11, 2021
f109773
further into migration script, nonce is issue
samt1803 Nov 15, 2021
200d139
migrate script is working with manual nonces
samt1803 Nov 16, 2021
a55d07e
adding an array of permissions per stream into registry ([][] not sup…
samt1803 Nov 19, 2021
78b2013
migrate script does not spam mempool and saves progress to disk
samt1803 Nov 22, 2021
3a8caa2
added stream data clean script
samt1803 Nov 24, 2021
123bdb6
refactores migration script to use new cleanded up data
samt1803 Nov 24, 2021
1967c6e
little linting
samt1803 Nov 24, 2021
acc4b31
detect stuck transactions, resend them with higher gasPrice working
samt1803 Nov 25, 2021
378613d
renaming of permission attributes cherrypicked from master
samt1803 Dec 8, 2021
3fa1995
reset progress file
samt1803 Dec 14, 2021
aaf80d8
fixed possible timing async issue
samt1803 Dec 14, 2021
6d6e43d
Merge remote-tracking branch 'origin/master' into ETH-138_migrate_str…
samt1803 Dec 14, 2021
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
37 changes: 28 additions & 9 deletions packages/smartcontracts/.vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,38 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch via NPM",
"request": "launch",
"runtimeArgs": [
"run",
"e2etest"
"test"
],
"runtimeExecutable": "npm",
"skipFiles": [
"<node_internals>/**"
],
"type": "pwa-node"
},
{
"name": "migrate",
"request": "launch",
"runtimeArgs": [
"run",
"migrateStreams"
],
"runtimeExecutable": "npm",
"skipFiles": [
"<node_internals>/**"
],
"type": "pwa-node"
},
{
"name": "cleanup",
"request": "launch",
"runtimeArgs": [
"run",
"cleanupStreams"
],
"runtimeExecutable": "npm",
"skipFiles": [
Expand All @@ -23,14 +46,10 @@
"name": "Mocha Test All with Options",
"program": "${workspaceFolder}/node_modules/ts-mocha/bin/ts-mocha",
"args": [
// "--opts",
// "${workspaceFolder}/support/mocha.opts",
"${workspaceFolder}/test/*.test.ts",
"--timeout", // so it doesnt run into timeouts while debugging
"--timeout",
"200000"
],
// "console": "integratedTerminal",
// "internalConsoleOptions": "neverOpen",
"skipFiles": [
"<node_internals>/**/*.js"
]
Expand Down
22 changes: 11 additions & 11 deletions packages/smartcontracts/contracts/StreamRegistry/StreamRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,17 +286,17 @@ contract StreamRegistry is ERC2771Context, AccessControl {
_setPermissionBooleans(streamId, user, canEdit, deletePerm, publishExpiration, subscribeExpiration, canGrant);
}

// not in current apidefinition, might speed up migratrion, needs to be tested
// function bulkmigrate(string[] calldata streamids, address[] calldata users, string[] calldata metadatas, Permission[] calldata permissions) public isMigrator() migrationIsActive() {
// uint arrayLength = streamids.length;
// for (uint i=0; i<arrayLength; i++) {
// string calldata streamId = streamids[i];
// streamIdToMetadata[streamId] = metadatas[i];
// emit StreamUpdated(streamId, metadatas[i]);
// Permission memory permission = permissions[i];
// _setPermission(streamId, users[i], permission.edit, permission.canDelete, permission.publishExpiration, permission.subscribeExpiration, permission.share);
// }
// }
function trustedSetStreams(string[] calldata streamids, address[] calldata users, string[] calldata metadatas, Permission[] calldata permissions) public isTrusted() {
uint arrayLength = streamids.length;
for (uint i=0; i<arrayLength; i++) {
string calldata streamId = streamids[i];
streamIdToMetadata[streamId] = metadatas[i];
Permission memory permission = permissions[i];
_setPermissionBooleans(streamId, users[i], permission.canEdit, permission.canDelete, permission.publishExpiration, permission.subscribeExpiration, permission.canGrant);
emit StreamCreated(streamId, metadatas[i]);
emit PermissionUpdated(streamId, users[i], permission.canEdit, permission.canDelete, permission.publishExpiration, permission.subscribeExpiration, permission.canGrant);
}
}

function addressToString(address _address) public pure returns(string memory) {
bytes32 _bytes = bytes32(uint256(uint160(_address)));
Expand Down
6 changes: 5 additions & 1 deletion packages/smartcontracts/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ const config: HardhatUserConfig = {

defaultNetwork: 'hardhat',
networks: {
hardhat: {},
hardhat: {
gas: 12000000,
blockGasLimit: 0x1fffffffffffff,
allowUnlimitedContractSize: true
},
localsidechain: {
chainId: 8997,
url: 'http://localhost:8546'
Expand Down
Loading