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

Upgrade Framework Script w/ Burn #1084

Merged
merged 173 commits into from
Mar 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
d842b40
fix: messing around.
l-monninger Dec 17, 2024
642227e
fix: google and amazon.
l-monninger Dec 17, 2024
873d1ff
Server for HSM demo (#962)
andygolay Dec 18, 2024
df28163
feat: generics for cryptography.
l-monninger Dec 18, 2024
2093ac1
fix: hsm demo CLI.
l-monninger Dec 18, 2024
8477374
first draf of the API
musitdev Dec 18, 2024
37cfc8e
correct get_public_key call
musitdev Dec 18, 2024
7ba55d9
add error to sign API
musitdev Dec 18, 2024
50bbc98
set API function pub
musitdev Dec 18, 2024
dfa32da
fix: structuring.
l-monninger Dec 18, 2024
14fef3c
Merge branch 'l-monninger/hsm-demo' of https://github.com/movementlab…
l-monninger Dec 18, 2024
2f5636f
chore: scaffold signing api.
l-monninger Dec 18, 2024
e461221
Alloy signing integration
musitdev Dec 19, 2024
653adf7
feat(signing): byte array conversions for ed25519
mzabaluev Dec 20, 2024
53e08b7
feat(signing): movement-signer-test crate
mzabaluev Dec 20, 2024
43c974b
simple transfer test for AWS signing
musitdev Dec 23, 2024
7929c21
refactor(signing): no need for custom trait
mzabaluev Dec 23, 2024
a50bf0e
test(signing): test TestSigner
mzabaluev Dec 23, 2024
ca1ffac
chore: clean up unused rand_core dep
mzabaluev Dec 23, 2024
436b21b
adapte AWS provider to new API version
musitdev Dec 23, 2024
ca9c370
use AwsKmsCryptography trait
musitdev Dec 24, 2024
1f522d5
rename new to try_new
musitdev Jan 2, 2025
7f6c6b3
correct build
musitdev Jan 2, 2025
4d6faa8
add rustls-tls to allow https connections
musitdev Jan 2, 2025
7ad333d
correct Cargo.lock file
musitdev Jan 2, 2025
a8ae7d1
Merge branch 'musitdev/alloy-integration' of github.com:movementlabsx…
musitdev Jan 2, 2025
82b7b68
test(signing): Add executor test for signed transactions
mzabaluev Jan 3, 2025
0018145
test: add signer tests to the unit-tests workflow
mzabaluev Jan 3, 2025
a2439bb
feat: key standard.
l-monninger Jan 7, 2025
99875dc
feat: create key.
l-monninger Jan 7, 2025
cb0d91e
fix: update SocketAddr to 0.0.0.0
andygolay Jan 8, 2025
e5ee02f
feat: stash da.
l-monninger Jan 9, 2025
61ca16d
feat: update signing.
l-monninger Jan 9, 2025
725bf22
Convert DER signature to raw signature for AWS KMS signing (#988)
andygolay Jan 9, 2025
e1b9590
fix: refactor digest.
l-monninger Jan 9, 2025
4249635
fix: merge.
l-monninger Jan 9, 2025
a0dca6a
feat: signing works with HashiCorp Vault with underscore delineator i…
andygolay Jan 9, 2025
4395ae8
fix: signing.
l-monninger Jan 10, 2025
638b519
fix: refactor digester.
l-monninger Jan 10, 2025
3d44299
feat: rewrite light node.
l-monninger Jan 10, 2025
02bdf46
feat: merge in signer identifier.
l-monninger Jan 10, 2025
6d4fed3
fix: loader.
l-monninger Jan 10, 2025
a17a508
fix: loaded signer refactor.
l-monninger Jan 10, 2025
2ca0906
fix: unused import.
l-monninger Jan 10, 2025
9e959aa
fix: aptos core integration.
l-monninger Jan 10, 2025
d4aa17c
fix: merge in eth signing.
l-monninger Jan 10, 2025
9eaadd2
feat: merge in overlay.
l-monninger Jan 10, 2025
ee2febe
fix: wrong branch.
l-monninger Jan 10, 2025
eca26ef
feat: health check endpoint
andygolay Jan 10, 2025
9fea297
fix: use alias for aws kms signing
andygolay Jan 13, 2025
47b73bd
fix: canonical string.
l-monninger Jan 13, 2025
2c68dad
fix: stream crashing.
l-monninger Jan 13, 2025
aa6d928
fix: Cargo.lock
l-monninger Jan 13, 2025
be23e69
fix: setting up for mocks.
l-monninger Jan 13, 2025
5f9d045
fix: refactor light node.
l-monninger Jan 13, 2025
4f8f2a3
fix: refactor stream.
l-monninger Jan 13, 2025
0aca5a7
fix: remove need for AWS_KMS_KEY_ID env var
andygolay Jan 13, 2025
ff9136a
fix: reworking stream api.
l-monninger Jan 13, 2025
480bee7
fix: types.
l-monninger Jan 14, 2025
8ab44be
feat: add verify endpoint
andygolay Jan 14, 2025
07cc911
feat: public_key/get and public_key/set endpoints with axum::Extensio…
andygolay Jan 14, 2025
0313369
fix: remove unneeded comments
andygolay Jan 14, 2025
7aa181b
fix: refactor celestia provider.
l-monninger Jan 14, 2025
b4dc706
fix: celestia provider.
l-monninger Jan 14, 2025
40293f9
fix: refactor passthrough.
l-monninger Jan 14, 2025
80555de
Add public key state to HSM Demo (#1001)
andygolay Jan 15, 2025
7ceab36
fix: remove unneeded comments
andygolay Jan 15, 2025
4ec5f63
fix: remove auto-setting public key, only use set endpoint
andygolay Jan 15, 2025
1a952af
fix: remove faulty check for existing public key
andygolay Jan 15, 2025
3d4ea57
feat: merge in digest da.
l-monninger Jan 15, 2025
881b7d4
feat: light node refactor.
l-monninger Jan 15, 2025
d32fdf7
feat: accept both sequenced and passed through blobs.
l-monninger Jan 15, 2025
71c0ecf
fix: runners.
l-monninger Jan 15, 2025
a3d808a
fix: update build scripts.
l-monninger Jan 15, 2025
b708ae8
fix: remove cachix.
l-monninger Jan 15, 2025
2628c73
feat: merge disk-fifo.
l-monninger Jan 15, 2025
c008e29
fix: reintegrate inknown signers verifier.
l-monninger Jan 15, 2025
1e288a3
fix: use http1.
l-monninger Jan 15, 2025
54e27fa
debug: additional certificate logging.
l-monninger Jan 15, 2025
09af380
fix: enhance logging.
l-monninger Jan 15, 2025
6b43c13
fix: enhance logging.
l-monninger Jan 15, 2025
81b761f
fix: containers workflow.
l-monninger Jan 15, 2025
28c91f8
fix: use pr labels contains.
l-monninger Jan 15, 2025
c6a8593
debug: log event.
l-monninger Jan 15, 2025
9ff4337
debug: log containers.
l-monninger Jan 15, 2025
3969f77
fix: label filter.
l-monninger Jan 15, 2025
b4c0392
fix: working to fix merge.
l-monninger Jan 15, 2025
523ee4f
fix: merge.
l-monninger Jan 15, 2025
6847f78
fix: working on merge.
l-monninger Jan 15, 2025
a2fd6e2
fix: hashicorp signing and public key retrieval
andygolay Jan 15, 2025
2c49fea
fix: consistent public key retrieval
andygolay Jan 16, 2025
d78b8bf
fix: working through refactor.
l-monninger Jan 17, 2025
d530ba3
fix: serialization and deserialization.
l-monninger Jan 17, 2025
0ec5f5c
chore: supported curves serialization and deserialization.
l-monninger Jan 17, 2025
112cd64
fix: refactor.
l-monninger Jan 17, 2025
a27e65b
chore: logging for loader.
l-monninger Jan 21, 2025
ff49b15
Secure signing: Key rotation with CLI (#1002)
andygolay Jan 21, 2025
3d971c6
Signing: Settlement signing integration (#995)
musitdev Jan 21, 2025
a669be2
fix: change VAULT_ADDRESS to VAULT_ADDR
andygolay Jan 21, 2025
9c415ad
fix: injective mapping with different delineators for aws and vault
andygolay Jan 21, 2025
309df7a
fix: default to uncompressed bytes.
l-monninger Jan 22, 2025
7ca2d9f
fix: ensure vault test readability.
l-monninger Jan 22, 2025
c238379
fix: merge.
l-monninger Jan 22, 2025
7596d3f
fix: merge.
l-monninger Jan 22, 2025
f47ce67
fix: add key roation subcommand.
l-monninger Jan 22, 2025
3e873e8
fix: add key roation subcommand.
l-monninger Jan 22, 2025
31827be
fix: stash.
l-monninger Jan 23, 2025
280c548
fix: stash.
l-monninger Jan 23, 2025
c92884d
fix: aptos signer e2e test.
l-monninger Jan 23, 2025
9bdabaf
Mainnet Target Branch (#1017)
l-monninger Jan 24, 2025
1900145
fix: framework.
l-monninger Jan 26, 2025
8e3b690
fix: add mint lock.
l-monninger Jan 26, 2025
87c68d6
fix: add governed gas pool ops.
l-monninger Jan 26, 2025
bc40426
Upgrade GGP Framework Script and Framework Migration Standards (#1018)
l-monninger Jan 28, 2025
2b62a93
Config Migration (#1024)
l-monninger Jan 28, 2025
2407bd9
SignerIdentifier::try_raw_private_key (#1019)
mzabaluev Jan 28, 2025
235178a
Migration Bring Up (#1025)
l-monninger Feb 5, 2025
b696cb5
fix: stash cargo lock.
l-monninger Feb 5, 2025
d10a8e9
fix: Cargo.lock.
l-monninger Feb 5, 2025
a9331fa
fix: merge.
l-monninger Feb 5, 2025
de20e49
fix: merge.
l-monninger Feb 5, 2025
e737faa
feat: movement-full-node-v0.0.1-beta (#1039)
l-monninger Feb 11, 2025
d2b9198
fix: merge conflict.
l-monninger Feb 11, 2025
64f3bfa
Merge branch 'l-monninger/secure-signing-e2e-integration' of https://…
l-monninger Feb 11, 2025
3ec4505
fix: NoSpecLocalSigner.
l-monninger Feb 14, 2025
ee0a940
fix: no spec local signer.
l-monninger Feb 14, 2025
5a0ce23
fix: no spec comment.
l-monninger Feb 14, 2025
3fe352e
fix: unsupported signer.
l-monninger Feb 15, 2025
cd950b1
fix: use movement compiler by default for simplicity.
l-monninger Feb 15, 2025
c02c82e
fix: movement-da-util unit test.
l-monninger Feb 15, 2025
635c082
correct unit test build
musitdev Feb 16, 2025
7c76ce7
fix: needs git.
l-monninger Feb 17, 2025
604348a
Merge branch 'l-monninger/gas-upgrades-beta-fixes' of https://github.…
l-monninger Feb 17, 2025
27370eb
remove bridge crate from build because of Diesel and Aptos core versi…
musitdev Feb 17, 2025
3609344
enable bridge and avoid Diesel bidecimal issue for Bridger indexer db
musitdev Feb 17, 2025
8bb0fb1
merge from main
musitdev Feb 18, 2025
6ad828a
ci/cd: fix container checks
radupopa369 Feb 19, 2025
b63dbfc
change block timestamp from sec to microsec
musitdev Feb 26, 2025
a8c174f
fix: transaction pipe.
l-monninger Feb 26, 2025
c7dc78a
Merge branch 'main' of https://github.com/movementlabsxyz/movement in…
l-monninger Feb 26, 2025
c73de9f
Merge branch 'l-monninger/gas-upgrades-beta-fixes' of https://github.…
l-monninger Feb 26, 2025
bdb09ac
fix: this should not just have min gas price.
l-monninger Feb 26, 2025
10d31f6
fix: stop switching back to 8vcpu.
l-monninger Feb 26, 2025
339b06c
fix: inverse gas scaling factor.
l-monninger Feb 27, 2025
e6b76f3
stash: script.
l-monninger Feb 27, 2025
7b77ca8
fix: use usecs for expirations in upgrade script.
l-monninger Feb 27, 2025
6cee3ed
fix: full elsa to biarritz rc1.
l-monninger Feb 28, 2025
3329ef1
feat: with feature upgrade.
l-monninger Feb 28, 2025
b8af60b
fix: gas fee.
l-monninger Feb 28, 2025
8b5190a
fix: revert.
l-monninger Feb 28, 2025
9f8caf9
fix: revert.
l-monninger Feb 28, 2025
3c3181f
fix: stash exploit tests.
l-monninger Feb 28, 2025
dfcc5e5
fix: include burn_from.
l-monninger Mar 2, 2025
a5ffdae
fix: include burn_from.
l-monninger Mar 2, 2025
6a65aef
fix: version.
l-monninger Mar 2, 2025
c9fb4d0
fix: burn.
l-monninger Mar 2, 2025
d533783
fix: minter.
l-monninger Mar 5, 2025
870a1ac
burn mint capabilit.
l-monninger Mar 5, 2025
18997fc
update: aptos-core
0xmovses Mar 6, 2025
8475aac
update: aptos-core cached
0xmovses Mar 6, 2025
f31cb58
update: commit-hash lib
0xmovses Mar 6, 2025
446b718
fix: update upgrade script
0xmovses Mar 6, 2025
a415986
fix: bring back gov
0xmovses Mar 7, 2025
85377ac
update: commit hash
0xmovses Mar 7, 2025
0e7a3fe
fix: upgrade script
0xmovses Mar 8, 2025
1ad7268
fix: use reference for upgrade script
0xmovses Mar 8, 2025
ab15dc5
fix: signer_of
0xmovses Mar 8, 2025
440b821
update: latest aptos-core
0xmovses Mar 8, 2025
6db532e
feat: latest mrb cache
0xmovses Mar 8, 2025
1720a08
chore: remove unused mrb_cache files
0xmovses Mar 8, 2025
a2fb25c
fix: merge conflicts
0xmovses Mar 8, 2025
69d9f29
chore: remove println and improve move script fmt
0xmovses Mar 8, 2025
cfede54
chore: remove old mrb, update new aptos-core commit
0xmovses Mar 9, 2025
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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ processes:
setup:
environment:
- "KNOWN_FRAMEWORK_RELEASE=elsa"
- APTOS_ACCOUNT_WHITELIST=$DOT_MOVEMENT_PATH/default_signer_address_whitelist
- MAPTOS_PRIVATE_KEY=random

test-migrate-elsa-to-biarritz-rc1:
command: |
Expand Down
10 changes: 4 additions & 6 deletions protocol-units/bridge/contracts/minter/sources/minter.move
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ script {

fun main(core_resources: &signer) {

let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0x1);

let framework_signer = &core_signer;

transaction_fee::burn_from(framework_signer, @0xdead, 4);
let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0x1);

let framework_signer = &core_signer;
transaction_fee::burn_from(framework_signer, @0xdead, 4);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use maptos_framework_release_util::commit_hash_with_script;
commit_hash_with_script!(
BiarritzRc1, // Struct name
"https://github.com/movementlabsxyz/aptos-core.git", // Repository URL
"aa45303216be96ea30d361ab7eb2e95fb08c2dcb", // Commit hash
"27397b5835e6a466c06c884a395653c9ff13d1fe", // Commit hash
6, // Bytecode version
"biarritz-rc1.mrb", // MRB file name
"CACHE_BIARRITZ_RC1_FRAMEWORK_RELEASE" // Cache environment variable for Elsa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use maptos_framework_release_util::mrb_release;
mrb_release!(
BiarritzRc1,
BIARRTIZ_RC1,
"aa45303216be96ea30d361ab7eb2e95fb08c2dcb-biarritz-rc1.mrb"
"27397b5835e6a466c06c884a395653c9ff13d1fe-biarritz-rc1.mrb"
);

generate_gas_upgrade_module!(gas_upgrade, BiarritzRc1, {
Expand All @@ -28,16 +28,21 @@ pub mod script {
script {
use aptos_framework::aptos_governance;
use aptos_framework::gas_schedule;
use aptos_framework::governed_gas_pool;
use aptos_framework::governed_gas_pool;
use aptos_framework::aptos_coin;
use aptos_framework::signer;

fun main(core_resources: &signer) {
let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0x1);
let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);

let framework_signer = &core_signer;
let core_address: address = signer::address_of(core_resources);

governed_gas_pool::initialize(framework_signer, b"aptos_framework::governed_gas_pool");
// this initialize function is idempotent, already initialized GGP will not error.
governed_gas_pool::initialize(&core_signer, b"aptos_framework::governed_gas_pool");

}
// this will burn the mint capability for the core_resource signer
aptos_coin::destroy_mint_capability_from(&core_signer, core_address);
}
}
"#
.to_string()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use maptos_framework_release_util::commit_hash_with_script;
commit_hash_with_script!(
BiarritzRc1, // Struct name
"https://github.com/movementlabsxyz/aptos-core.git", // Repository URL
"aa45303216be96ea30d361ab7eb2e95fb08c2dcb", // Commit hash
"27397b5835e6a466c06c884a395653c9ff13d1fe", // Commit hash
6, // Bytecode version
"biarritz-rc1.mrb", // MRB file name
"CACHE_BIARRITZ_RC1_FRAMEWORK_RELEASE" // Cache environment variable for Elsa
Expand Down
1 change: 1 addition & 0 deletions protocol-units/settlement/mcr/contracts/lib/v2-periphery
Submodule v2-periphery added at 0335e8
Loading