From 99ce71bca3072d1ee8dcc633dff31034b2f71b97 Mon Sep 17 00:00:00 2001 From: Giovanni Sanchez <108043524+sisyphusSmiling@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:17:13 -0500 Subject: [PATCH 1/3] update go assets --- lib/go/templates/internal/assets/assets.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/go/templates/internal/assets/assets.go b/lib/go/templates/internal/assets/assets.go index e535991..05aa235 100644 --- a/lib/go/templates/internal/assets/assets.go +++ b/lib/go/templates/internal/assets/assets.go @@ -29,7 +29,7 @@ // transactions/migration-contract-staging/admin/set_staging_cutoff.cdc (606B) // transactions/migration-contract-staging/delegated-staging/claim_published_host_capability.cdc (1.598kB) // transactions/migration-contract-staging/delegated-staging/setup_host_optional_publish.cdc (2.245kB) -// transactions/migration-contract-staging/delegated-staging/stage_contract_from_stored_host_capability.cdc (2.183kB) +// transactions/migration-contract-staging/delegated-staging/stage_contract_from_stored_host_capability.cdc (2.32kB) // transactions/migration-contract-staging/stage_contract.cdc (1.841kB) // transactions/migration-contract-staging/unstage_contract.cdc (1.251kB) // transactions/test/setup_updater_with_empty_deployment.cdc (467B) @@ -688,7 +688,7 @@ func transactionsMigrationContractStagingDelegatedStagingSetup_host_optional_pub return a, nil } -var _transactionsMigrationContractStagingDelegatedStagingStage_contract_from_stored_host_capabilityCdc = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\xdb\x6e\xdb\x46\x10\x7d\xd7\x57\x0c\x58\xa0\xa0\x00\x99\x8a\x5f\x89\x38\x69\x20\xd4\x68\x1e\x52\x04\x70\xf2\x01\x23\xee\x88\x1c\x80\xdc\x25\x76\x87\x52\x8c\x20\xff\x5e\xec\x2c\x6f\x72\x6d\xb5\x7c\xb0\xa1\xbd\x9c\x73\xe6\xcc\x65\xb9\xeb\x9d\x17\xc8\xbe\x70\xed\x51\xd8\xd9\x83\xb3\xe2\xb1\x92\x27\xc1\x9a\x6d\x9d\x6d\x36\xbf\xb1\x15\x8a\x4b\xec\x2c\xe4\x1b\x00\x80\x33\xf9\xc0\xce\x96\x90\xdd\x17\xf7\xc5\xbb\x6c\xa7\xab\xc2\xd2\x52\x09\x59\xbc\x4a\x30\x01\xc1\xf7\xde\xa0\x10\x3c\x7a\xd7\xc1\x93\x38\x4f\x06\xfe\x72\x41\xe0\x80\x3d\x1e\xb9\x65\x79\x1e\xef\x1b\x0a\x95\xe7\x5e\x12\xb2\xa2\x04\x90\x86\xa0\xf7\xee\xcc\x86\x0c\x54\x13\x66\xe5\x0c\x01\x5b\xdd\x0d\x49\xe9\xb2\x79\x72\x1e\x0e\x68\xc8\x56\x04\xf7\xc5\xbb\x65\xa3\x9b\x82\x0c\x05\x7c\x6b\x38\x40\x8f\x5e\xb8\x1a\x5a\xf4\x20\x1e\x6d\x18\x83\xc4\x10\x86\x8e\x02\xe0\x4b\xa1\xd0\x60\x80\x23\x91\x85\x80\x67\x32\x51\x41\x10\xe7\xb1\xa6\x1d\x60\x80\x8b\x1b\x5a\x03\x47\x52\x59\x15\x06\x52\x29\x58\x55\x6e\xb0\x12\xa0\x6a\x9c\x0b\x51\xa9\x38\x30\xd4\x52\x1d\x6d\x99\xd4\x9f\x06\xab\xe4\xa8\x3c\xe2\x00\xc1\xd0\x19\x84\xb0\x2b\x46\x7f\x5a\xb4\xf5\x80\x75\xb4\x98\xec\xdd\xf7\xa7\x6c\xb7\xd9\x6e\x36\xfb\xfd\x3e\x05\xb3\x8e\x80\x03\x0c\x81\x4c\xc4\x09\x9a\x0d\x5c\x5c\x18\x52\x3e\xfe\x8f\x4b\x11\x5c\x09\xfe\xb4\x61\xf0\x31\x2e\x14\x90\x57\xc8\x02\xd7\x96\x0c\x1c\x9f\x35\xf4\x31\xe2\x74\xdc\x5d\x6c\xca\xe2\x4c\x20\x2e\x7a\x94\x64\x18\x40\x6b\x26\xdc\xe5\x8c\x92\x46\xb3\xb1\xf5\x84\xe6\x39\x99\x6e\xa8\x6f\xdd\x73\x0a\x4b\x33\xcf\xb5\x8d\xde\x8d\x7c\x8b\xdc\x47\xe7\xa1\x73\x3e\xe1\xd1\x0f\xd9\x41\xa0\x94\x15\x4f\xbd\x83\x3b\x68\x44\xfa\x50\xee\xf7\x35\x4b\x33\x1c\x8b\xca\x75\x7b\x67\x4f\xad\xbb\xec\x27\x05\x77\x49\x9f\x9f\x31\xff\xe8\xd1\x63\x07\x8d\x0b\x72\xc0\xfe\x29\xa5\xfd\x2b\x4a\xf3\xd9\x90\x15\x3e\x31\xf9\x12\xbe\x35\x04\x3c\xff\x9e\x73\x60\xc8\xf3\x99\xc6\x6a\xd5\x8b\xd0\xa3\x34\x70\x69\xc8\xa7\xe5\x97\x85\xc6\x41\x49\xe3\xa7\xa5\x56\xac\x35\x4c\x1a\xff\xc6\x8e\x12\xa7\xc5\x8e\xc0\x9d\x6e\xf9\x7c\x61\x69\x74\xbf\xe6\x33\x59\xed\xa0\xd7\x30\x0f\xce\x8c\x98\xd3\xc5\xab\xa6\x53\x3b\x56\xc9\xcf\x6f\xfb\xf1\x24\x9e\x6d\xbd\x7b\xa1\xf8\xe5\x6a\xe2\x4c\xab\x5b\xf8\x99\x8a\x9d\x44\xbd\x2e\xe1\xf7\xb7\x66\x53\x11\x4d\xd3\xc3\xfa\xa7\xf7\xd4\xa3\xa7\x5c\x6b\xd1\x97\xf0\x69\x90\xe6\x53\xaa\x8c\x09\x34\x7e\xfb\x3d\x1c\x5c\x9f\x0a\x75\x65\xf8\x29\x8e\xa7\x31\x39\xf3\xd9\x28\x22\x2c\x91\xc1\x03\xac\xe2\xcc\x79\x15\xe8\x2d\x1b\xb6\x33\x5e\xfc\x3e\x7e\x84\x1e\x2d\x57\x79\xf6\x88\xdc\xde\xae\x0f\x15\x75\x35\x01\x17\xce\x6c\x7b\x25\x73\x14\x00\x0f\xa9\x17\x7d\x51\xb9\xfe\xf9\xfd\x12\xe0\xfb\xdb\x36\x7e\xf8\x90\x47\xb2\x72\x1d\xee\x5b\xba\xbf\x70\xd0\x31\xa6\x35\x5b\xad\x6a\x76\x9e\x86\x2b\x6d\x81\xda\x53\x11\xc5\xc1\xc3\xa4\xb1\x38\x3a\xef\xdd\x25\xdf\xae\x30\xa7\xfa\x5f\x81\xc4\xb9\xc2\xf6\x8c\x2d\x9b\x11\xef\xd7\x46\xff\xd1\x0f\xaa\x06\xa1\x17\x39\xc5\xb6\xfd\xd7\x53\xb0\x53\x2c\x1d\xb9\xeb\xc6\xd0\xd7\x43\x67\xce\x85\xdb\x76\x1a\x88\x66\xd0\x93\xeb\x99\x38\x8f\xc2\x35\xd3\xe7\xd3\xf8\xfc\x2c\xd3\x49\x67\xac\xd1\x91\xba\xee\xb0\x49\x04\x8f\x44\x47\x02\x77\x26\x7f\xf1\x2c\x42\xb6\x98\x41\xdf\xcc\x8c\xe2\x4e\x8b\x79\x6a\x87\xd9\xd0\x9d\x76\x7d\x79\xd5\x5b\x3b\x95\x56\x5e\x75\xd6\x95\x77\x7d\xf4\xf9\xe7\x7f\x33\x73\xd0\xf7\xd7\xe4\x68\x8c\xa7\x10\x56\xbc\xc5\xb8\x94\x6f\x5f\x53\xb0\x2d\xaf\xaa\x26\xfb\xea\xdd\xb1\xa5\x0e\x2e\x0d\xb7\xcb\x6b\x97\x2c\xcf\x46\x65\xbf\x36\xff\x04\x00\x00\xff\xff\xed\x92\x28\x51\x87\x08\x00\x00" +var _transactionsMigrationContractStagingDelegatedStagingStage_contract_from_stored_host_capabilityCdc = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x56\xdb\x6e\xdb\x46\x10\x7d\xd7\x57\x0c\x58\xa0\xa0\x00\x99\x8a\x5f\x89\x38\x69\x20\xd4\x68\x1e\x52\x04\x50\xf3\x01\x23\xee\x88\x1c\x80\xdc\x25\x76\x87\x52\x84\x20\xff\x5e\xec\x2c\x49\x51\x8e\xad\x96\x0f\x36\xbc\x97\x73\xce\x9c\xb9\xac\xb9\xeb\x9d\x17\xc8\xbe\x70\xed\x51\xd8\xd9\x9d\xb3\xe2\xb1\x92\xbd\x60\xcd\xb6\xce\x56\xab\xdf\xd8\x0a\xc5\x25\x76\x16\xf2\x15\x00\xc0\x89\x7c\x60\x67\x4b\xc8\x1e\x8b\xc7\xe2\x5d\xb6\xd1\x55\x61\x69\xa9\x84\x2c\x5e\x25\x98\x80\xe0\x5b\x6f\x50\x08\x9e\xbd\xeb\x60\x2f\xce\x93\x81\xbf\x5c\x10\xd8\x61\x8f\x07\x6e\x59\x2e\xe3\x7d\x43\xa1\xf2\xdc\x4b\x42\x56\x94\x00\xd2\x10\xf4\xde\x9d\xd8\x90\x81\x6a\xc2\xac\x9c\x21\x60\xab\xbb\x21\x29\xbd\x6e\x1e\x9d\x87\x1d\x1a\xb2\x15\xc1\x63\xf1\xee\xba\xd1\x4d\x41\x86\x02\xfe\x69\x38\x40\x8f\x5e\xb8\x1a\x5a\xf4\x20\x1e\x6d\x18\x83\xc4\x10\x86\x8e\x02\xe0\x4b\xa1\xd0\x60\x80\x03\x91\x85\x80\x27\x32\x51\x41\x10\xe7\xb1\xa6\x0d\x60\x80\xb3\x1b\x5a\x03\x07\x52\x59\x15\x06\x52\x29\x58\x55\x6e\xb0\x12\xa0\x6a\x9c\x0b\x51\xa9\x38\x30\xd4\x52\x1d\x6d\x99\xd4\x1f\x07\xab\xe4\xa8\x3c\xe2\x00\xc1\xd0\x09\x84\xb0\x2b\x46\x7f\x5a\xb4\xf5\x80\x75\xb4\x98\xec\xc3\xb7\x7d\xb6\x59\xad\x57\xab\xed\x76\x9b\x82\x59\x46\xc0\x01\x86\x40\x26\xe2\x04\xcd\x06\x5e\x5d\x18\x52\x3e\xfe\x87\x4b\x70\x62\xd4\x00\x7f\x4d\x59\x11\x79\x95\xfb\x4f\x1b\x06\x1f\x43\x46\x01\x79\x45\x47\xe0\xda\x92\x81\xc3\x05\xd0\x4e\x5e\xa4\xd3\xb3\x99\xb5\x47\x2b\x64\x00\xad\x49\x74\xaf\x58\x1f\x33\x46\xa3\x18\xe5\x5d\x64\x25\x34\x6a\xbc\xa0\xaf\x49\xa6\xab\x63\x75\xdc\x30\xba\xb3\x4d\x15\x35\x07\x2b\x2e\xe6\x2b\x59\x92\x04\x8c\x81\x2c\xce\x34\x18\x94\x11\x5b\x4f\x68\x2e\x49\xb3\xa1\xbe\x75\x97\x64\x71\x3c\xad\x9c\x23\xd9\xd5\x9c\x67\xe7\xa1\x73\x3e\x81\xd1\x77\xd9\x40\xa0\x54\x1e\x9e\x7a\x07\x0f\xd0\x88\xf4\xa1\xdc\x6e\x6b\x96\x66\x38\x14\x95\xeb\xb6\xce\x1e\x5b\x77\xde\x4e\xf4\x0f\x49\x9c\x9f\x31\xff\xe8\xd1\x63\x07\x8d\x0b\xb2\xc3\x7e\x9f\xea\xef\x2b\x4a\xf3\xd9\x90\x15\x3e\x32\xf9\x52\xcd\xe2\xf9\xef\xb9\x18\x0c\x79\x3e\xd1\xd8\x36\x7a\x11\x7a\x94\x06\xce\x0d\x79\xba\xc6\xb1\xf0\x96\x53\xec\xf1\xd3\x9a\x2f\x96\x1a\x26\x8d\x7f\x63\x47\x89\xd3\x62\x47\xe0\x8e\xf7\x4c\x3e\xb3\x34\xba\x5f\xf3\x89\xac\xb6\xf2\x6b\x98\x3b\x67\x46\xcc\xe9\xe2\x4d\xf7\xab\x1d\x8b\x52\xcb\xef\xfb\xb1\x17\xcf\xb6\xde\xbc\x50\xfc\x72\x35\x71\xa6\xd5\x35\xfc\x48\x5d\x47\xa2\x5e\x97\xf0\xfb\x5b\x43\xb2\x88\xa6\xe9\x61\xfd\xd1\x7b\xea\xd1\x53\xae\x95\xef\x4b\xf8\x34\x48\xf3\x29\x55\xc6\x04\x1a\xbf\x58\xc3\xae\xbf\xa8\x15\x0b\xc3\x8f\x71\x4e\x8e\xc9\x99\xcf\x46\x11\xe1\x1a\x19\x3c\xc1\x22\xce\x9c\x17\x81\xde\xb3\x61\x3d\xe3\xc5\xef\xe3\x47\xe8\xd1\x72\x95\x67\xcf\xc8\xed\xfd\xfa\x50\x51\x37\xa3\xf8\xca\x99\xad\x6f\x64\x8e\x02\xe0\x29\x75\xbe\x2f\x2a\xd7\x5f\xde\x5f\x03\x7c\x7f\xdf\xc6\x0f\x1f\xf2\x48\x56\x2e\xc3\x7d\x4b\xf7\x17\x0e\x3a\x4f\xb5\x66\xab\x45\xcd\xce\x63\x79\xa1\x2d\x50\x7b\x2c\xa2\x38\x78\x9a\x34\x16\x07\xe7\xbd\x3b\xe7\xeb\x05\xe6\x54\xff\x0b\x90\x38\xc5\xd8\x9e\xb0\x65\x33\xe2\xfd\x5c\xe9\x2f\xfa\x4e\xd5\x20\xf4\x22\xa7\xd8\xb6\xbf\xbc\x49\x1b\xc5\xd2\xd9\xbf\x6c\x0c\x7d\xc6\x74\xe0\x9c\xb9\x6d\xa7\xc9\x6c\x06\x3d\xb9\x1c\xce\xf3\x4c\x5e\x32\x7d\x3e\x8e\xef\x60\x98\x47\x93\x0e\x7b\xa3\xb3\x7d\xd9\x61\x93\x08\x1e\x89\x0e\x04\xee\x44\xfe\xec\x59\x84\x6c\x31\x83\xbe\x99\x19\xc5\x9d\x16\xf3\xd4\x0e\xb3\xa1\x1b\xed\xfa\xf2\xa6\xb7\x36\x2a\xad\xbc\xe9\xac\x1b\xef\xfa\xe8\xf3\x8f\xff\x66\xe6\xa0\xff\x08\x98\x1c\x8d\xf1\x14\xc2\x82\xb7\x18\x97\xf2\xf5\x6b\x0a\xd6\xe5\x4d\xd5\x64\x5f\xbd\x3b\xb4\xd4\xc1\xb9\xe1\xf6\xfa\xec\x26\xcb\xb3\x51\xd9\xcf\xd5\xbf\x01\x00\x00\xff\xff\x25\xe1\x38\xb0\x10\x09\x00\x00" func transactionsMigrationContractStagingDelegatedStagingStage_contract_from_stored_host_capabilityCdcBytes() ([]byte, error) { return bindataRead( @@ -704,7 +704,7 @@ func transactionsMigrationContractStagingDelegatedStagingStage_contract_from_sto } info := bindataFileInfo{name: "transactions/migration-contract-staging/delegated-staging/stage_contract_from_stored_host_capability.cdc", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb7, 0x66, 0xdb, 0xb0, 0xdb, 0x71, 0x6d, 0x44, 0xb7, 0xfd, 0xa1, 0x6, 0xe5, 0xb6, 0xa2, 0x93, 0xf3, 0x77, 0x72, 0xcb, 0x2d, 0x80, 0x6b, 0xce, 0x3, 0xf2, 0x85, 0x5c, 0x72, 0xc8, 0x55, 0xc2}} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc8, 0xf3, 0x87, 0x65, 0x21, 0x2f, 0x78, 0xb9, 0x85, 0x79, 0xb5, 0x82, 0xd2, 0x2f, 0x37, 0xf, 0x63, 0xe9, 0xcb, 0x22, 0x7f, 0x6a, 0x27, 0x1d, 0xc, 0xaa, 0xc9, 0xbc, 0xca, 0x3a, 0xbf, 0xb1}} return a, nil } From 5fb0e1bb01db2d6c3ef6c8067c2a4556602435a5 Mon Sep 17 00:00:00 2001 From: Giovanni Sanchez <108043524+sisyphusSmiling@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:11:49 -0500 Subject: [PATCH 2/3] add Mainnet MigrationContractStaging deployment to flow.json --- flow.json | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/flow.json b/flow.json index 3a91838..5e013e9 100644 --- a/flow.json +++ b/flow.json @@ -49,8 +49,9 @@ "aliases": { "crescendo": "27b2302520211b67", "emulator": "f8d6e0586b0a20c7", - "testnet": "2ceae959ed1a7e7a", - "testing": "0000000000000007" + "mainnet": "56100d46aa9b0212", + "testing": "0000000000000007", + "testnet": "2ceae959ed1a7e7a" } }, "NonFungibleToken": { @@ -110,19 +111,20 @@ "resourceID": "projects/dl-flow-admin/locations/global/keyRings/migration-contract-staging-testnet/cryptoKeys/evm-storage-testnet-key/cryptoKeyVersions/1" } }, - "migration-contract-staging-testnet": { - "address": "2ceae959ed1a7e7a", + "migration-contract-staging-mainnet": { + "address": "56100d46aa9b0212", "key": { "type": "google-kms", "hashAlgorithm": "SHA2_256", - "resourceID": "projects/dl-flow-admin/locations/global/keyRings/migration-contract-staging-testnet/cryptoKeys/evm-storage-testnet-key/cryptoKeyVersions/1" + "resourceID": "projects/dl-flow-admin/locations/global/keyRings/migration-contract-staging-mainnet/cryptoKeys/evm-storage-mainnet-key/cryptoKeyVersions/1" } }, - "originator-crescendo": { - "address": "c3d589f831db1bb8", + "migration-contract-staging-testnet": { + "address": "2ceae959ed1a7e7a", "key": { - "type": "file", - "location": "crescendo-originator.pkey" + "type": "google-kms", + "hashAlgorithm": "SHA2_256", + "resourceID": "projects/dl-flow-admin/locations/global/keyRings/migration-contract-staging-testnet/cryptoKeys/evm-storage-testnet-key/cryptoKeyVersions/1" } } }, @@ -150,6 +152,11 @@ "Foo" ] }, + "mainnet": { + "migration-contract-staging-mainnet": [ + "MigrationContractStaging" + ] + }, "testnet": { "migration-contract-staging-testnet": [ "MigrationContractStaging" From ce663e8b307e19ca18eb2e0f823b1d6673cc2c9d Mon Sep 17 00:00:00 2001 From: Giovanni Sanchez <108043524+sisyphusSmiling@users.noreply.github.com> Date: Thu, 18 Apr 2024 13:20:26 -0500 Subject: [PATCH 3/3] update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee019df..d956984 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Coordinated Upgrade. | --------- | ------------------------------------------------------------------------------------------------------------------------- | | Crescendo | [0x27b2302520211b67](https://crescendo.flowdiver.io/contract/A.27b2302520211b67.MigrationContractStaging?tab=deployments) | | Testnet | [0x2ceae959ed1a7e7a](https://contractbrowser.com/A.2ceae959ed1a7e7a.MigrationContractStaging) | -| Mainnet | TBD | +| Mainnet | [56100d46aa9b0212](https://contractbrowser.com/A.56100d46aa9b0212.MigrationContractStaging) | ### Pre-Requisites