Skip to content

[Stacks v1 → v2 Upgrade] Import STX balances & vesting into Stacks 2.0 #2105

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 10 commits into from
Dec 8, 2020
Merged

[Stacks v1 → v2 Upgrade] Import STX balances & vesting into Stacks 2.0 #2105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a27c63
feat: import STX balances & vesting into Stacks 2.0
zone117x Dec 4, 2020
a8d957c
chore: cleanup boot receipt processing
zone117x Dec 7, 2020
60af68a
fix: `mstx` to `ustx`
zone117x Dec 8, 2020
d569bde
chore: fix warnings (remove used imports)
zone117x Dec 8, 2020
026c54b
Merge next into feat/v1-to-v2-import
zone117x Dec 8, 2020
f477e12
chore: add some vesting entries that unlock after a couple blocks
zone117x Dec 8, 2020
94626cb
fix: genesis-stx lib build fix
zone117x Dec 8, 2020
3d81bb2
chore: use Arc<Mutex<...>> for boot_receipts
zone117x Dec 8, 2020
48f1d54
chore: rustfmt
zone117x Dec 8, 2020
8cbf0fa
chore: descriptive error message for boot_receipts mutex cross thread…
zone117x Dec 8, 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
180 changes: 142 additions & 38 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
{
// 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": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'blockstack_lib'",
"name": "executable 'blockstack-core'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"build",
"--bin=blockstack-core",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack_lib",
"kind": "lib"
"name": "blockstack-core",
"kind": "bin"
}
},
"args": [],
Expand All @@ -26,39 +22,51 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'blockstack-core' testnet",
"name": "executable 'clarity-cli'",
"cargo": {
"args": [
"build",
"--bin=blockstack-core",
"--bin=clarity-cli",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack-core",
"name": "clarity-cli",
"kind": "bin"
}
},
"args": [
"testnet",
"${workspaceFolder}/Stacks.toml"
],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "full",
}
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'blockstack-core'",
"name": "executable 'blockstack-cli'",
"cargo": {
"args": [
"build",
"--bin=blockstack-core",
"--bin=blockstack-cli",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack-core",
"name": "blockstack-cli",
"kind": "bin"
}
},
"args": ["generate-sk"],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "executable 'bitcoin-neon-controller'",
"cargo": {
"args": [
"build",
"--bin=bitcoin-neon-controller",
"--package=bitcoin-neon-controller"
],
"filter": {
"name": "bitcoin-neon-controller",
"kind": "bin"
}
},
Expand All @@ -68,17 +76,35 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'blockstack-core'",
"name": "executable 'stacks-node' -- mocknet",
"cargo": {
"args": [
"build",
"--bin=stacks-node",
"--package=stacks-node"
],
"filter": {
"name": "stacks-node",
"kind": "bin"
}
},
"args": ["mocknet"],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "unit tests in library 'blockstack_lib'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=blockstack-core",
"--lib",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack-core",
"kind": "bin"
"name": "blockstack_lib",
"kind": "lib"
}
},
"args": [],
Expand All @@ -87,15 +113,16 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'clarity-cli'",
"name": "unit tests in executable 'blockstack-core'",
"cargo": {
"args": [
"build",
"--bin=clarity-cli",
"test",
"--no-run",
"--bin=blockstack-core",
"--package=blockstack-core"
],
"filter": {
"name": "clarity-cli",
"name": "blockstack-core",
"kind": "bin"
}
},
Expand All @@ -105,7 +132,7 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'clarity-cli'",
"name": "unit tests in executable 'clarity-cli'",
"cargo": {
"args": [
"test",
Expand All @@ -124,10 +151,11 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'blockstack-cli'",
"name": "unit tests in executable 'blockstack-cli'",
"cargo": {
"args": [
"build",
"test",
"--no-run",
"--bin=blockstack-cli",
"--package=blockstack-core"
],
Expand All @@ -142,21 +170,97 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'blockstack-cli'",
"name": "unit tests in executable 'stacks-node'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=blockstack-cli",
"--package=blockstack-core"
"--bin=stacks-node",
"--package=stacks-node"
],
"filter": {
"name": "blockstack-cli",
"name": "stacks-node",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "unit tests in executable 'bitcoin-neon-controller'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=bitcoin-neon-controller",
"--package=bitcoin-neon-controller"
],
"filter": {
"name": "bitcoin-neon-controller",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "benchmark 'marf_bench'",
"cargo": {
"args": [
"test",
"--no-run",
"--bench=marf_bench",
"--package=blockstack-core"
],
"filter": {
"name": "marf_bench",
"kind": "bench"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "benchmark 'large_contract_bench'",
"cargo": {
"args": [
"test",
"--no-run",
"--bench=large_contract_bench",
"--package=blockstack-core"
],
"filter": {
"name": "large_contract_bench",
"kind": "bench"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "benchmark 'block_limits'",
"cargo": {
"args": [
"test",
"--no-run",
"--bench=block_limits",
"--package=blockstack-core"
],
"filter": {
"name": "block_limits",
"kind": "bench"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}
Loading