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

Fix(xcc): Store the first upgradable XCC version in state #877

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

birchmd
Copy link
Member

@birchmd birchmd commented Dec 4, 2023

Description

In #866 I introduced a change to the XCC router where the contract became upgradable. In that PR I hardcoded that any XCC Router that was version 1 could not be upgraded, however this logic did not work on testnet where the XCC Router code had already been set twice, so it was actually version 3 which became the first upgradable version.

In this PR I add a new key to the engine which stores the first upgradable XCC version so that it does not need to be hardcoded. This should allow the logic to work properly on both testnet and mainnet.

Performance / NEAR gas cost considerations

N/A

Testing

Existing tests + testnet deployment (manual test)

@aleksuss aleksuss added this pull request to the merge queue Dec 5, 2023
Merged via the queue into develop with commit 755a341 Dec 5, 2023
24 checks passed
@aleksuss aleksuss deleted the fix/birchmd/dynamic-xcc-upgrade-version branch December 5, 2023 13:59
aleksuss pushed a commit that referenced this pull request Dec 6, 2023
## Description

In #866 I introduced a change to the XCC router where the contract
became upgradable. In that PR I hardcoded that any XCC Router that was
version 1 could not be upgraded, however this logic did not work on
testnet where the XCC Router code had already been set twice, so it was
actually version 3 which became the first upgradable version.

In this PR I add a new key to the engine which stores the first
upgradable XCC version so that it does not need to be hardcoded. This
should allow the logic to work properly on both testnet and mainnet.

## Performance / NEAR gas cost considerations

N/A

## Testing

Existing tests + testnet deployment (manual test)
@aleksuss aleksuss mentioned this pull request Dec 6, 2023
aleksuss added a commit that referenced this pull request Dec 6, 2023
## 3.5.0 2023-12-06

### Additions

- Added a new transaction `upgrade` which allows upgrading the contract
and invoking the `state_migration` callback
  with one call by [@aleksuss]. ([#878])

### Fixes

- Updated the logic of upgrading XCC router which works properly on both
`mainnet` and `testnet` by [@birchmd]. ([#877])

[#877]: #877
[#878]: #878

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Michael Birch <michael.birch@aurora.dev>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
aleksuss added a commit to aleksuss/aurora-engine that referenced this pull request Dec 6, 2023
## 3.5.0 2023-12-06

### Additions

- Added a new transaction `upgrade` which allows upgrading the contract
and invoking the `state_migration` callback
  with one call by [@aleksuss]. ([aurora-is-near#878])

### Fixes

- Updated the logic of upgrading XCC router which works properly on both
`mainnet` and `testnet` by [@birchmd]. ([aurora-is-near#877])

[aurora-is-near#877]: aurora-is-near#877
[aurora-is-near#878]: aurora-is-near#878

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Michael Birch <michael.birch@aurora.dev>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
aleksuss added a commit that referenced this pull request Dec 6, 2023
## 3.5.0 2023-12-06

### Additions

- Added a new transaction `upgrade` which allows upgrading the contract
and invoking the `state_migration` callback
  with one call by [@aleksuss]. ([#878])

### Fixes

- Updated the logic of upgrading XCC router which works properly on both
`mainnet` and `testnet` by [@birchmd]. ([#877])

[#877]: #877
[#878]: #878

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Michael Birch <michael.birch@aurora.dev>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants