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

TESTNET: pulsar-3 vs. secret-4 changeset (DO NOT MERGE) #1559

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
93e9872
TESTNET: Update shade hardcoded admins
assafmo Sep 11, 2023
eb3d709
Create a separate upgrade handler for v1.11-testnet-shade-hardcoded-a…
assafmo Sep 12, 2023
566c638
Merge remote-tracking branch 'origin/master' into v1.11.0-beta.3-test…
assafmo Sep 12, 2023
c738b00
Hardcoded admins will fit every chain
liorbond Sep 23, 2023
8223071
Bump consensus
liorbond Sep 23, 2023
ff14e7c
fixed
liorbond Sep 23, 2023
aa6311e
remove windows
liorbond Sep 23, 2023
5b32e8f
please fix
liorbond Sep 23, 2023
f1e4026
fix
liorbond Sep 23, 2023
d0bb6e2
Fix an issue where the contractKey was broken when migrated from cons…
liorbond Sep 24, 2023
e06987b
Fix migration fixer
liorbond Sep 24, 2023
1db3d6f
"Upgrade handler to fix the prev migration problem"
liorbond Sep 24, 2023
e810040
fix
liorbond Sep 25, 2023
992a04d
Merge branch 'master' into testnet
assafmo Oct 8, 2023
4189343
Sync release.yaml from master
assafmo Oct 8, 2023
6b9d984
Merge branch 'master' into testnet
assafmo Oct 8, 2023
a4bd037
Update release.yaml for testnet
assafmo Oct 8, 2023
67d684f
Update release.yaml to skip build-deb-mainnet
assafmo Oct 8, 2023
96bc5e6
Update release.yaml
assafmo Oct 8, 2023
6e38e49
Merge branch 'master' into testnet
assafmo Oct 8, 2023
4a82e75
Merge branch 'master' into testnet
assafmo Oct 8, 2023
a4fa49e
Merge branch 'master' into testnet
assafmo Oct 9, 2023
ffcf30d
Merge branch 'master' into testnet
assafmo Oct 9, 2023
c7d44cb
Merge branch 'master' into testnet
assafmo Oct 9, 2023
068f533
Merge branch 'master' into testnet
assafmo Oct 9, 2023
2e414e4
Merge branch 'master' into testnet
toml01 Oct 9, 2023
9f68742
Merge branch 'master' into testnet
toml01 Oct 9, 2023
7c7f93c
Merge branch 'master' into testnet
Apr 11, 2024
77bc2ef
Merge branch 'master' into testnet
Apr 11, 2024
95515a4
Merge branch 'master' into testnet
Apr 15, 2024
018459c
Merge remote-tracking branch 'origin/master' into testnet
Apr 17, 2024
2abad2e
Merge branch 'master' into testnet
Apr 21, 2024
f3d8e2d
Merge branch 'master' into testnet
May 6, 2024
c63d853
Merge branch 'master' into testnet
May 7, 2024
2eddc33
Merge branch 'master' into testnet
May 14, 2024
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
6 changes: 2 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
path: secretnetwork_${{ steps.get_version.outputs.VERSION }}_testnet_${{ matrix.db_backend }}_amd64.deb

build-deb-mainnet:
if: false
runs-on: ubuntu-20.04
strategy:
fail-fast: false
Expand Down Expand Up @@ -278,7 +279,6 @@ jobs:
needs: [
native-build-cli,
build-deb-testnet,
build-deb-mainnet,
MacOS-ARM64-CLI,
check-hw-tool,
# check-hw-tool-mainnet
Expand All @@ -301,9 +301,6 @@ jobs:
- uses: actions/download-artifact@v3
with:
name: secretcli-MacOS-arm64
- uses: actions/download-artifact@v3
with:
name: secretnetwork_${{ steps.get_version.outputs.VERSION }}_mainnet_goleveldb_amd64.deb
- uses: actions/download-artifact@v3
with:
name: secretnetwork_${{ steps.get_version.outputs.VERSION }}_testnet_goleveldb_amd64.deb
Expand All @@ -317,6 +314,7 @@ jobs:
uses: softprops/action-gh-release@v1
with:
prerelease: true
body: "# ⚠️ TESTNET ⚠️"
files: |
secretnetwork_${{ steps.get_version.outputs.VERSION }}_mainnet_goleveldb_amd64.deb
secretnetwork_${{ steps.get_version.outputs.VERSION }}_testnet_goleveldb_amd64.deb
Expand Down
6 changes: 6 additions & 0 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ import (
"github.com/scrtlabs/SecretNetwork/app/upgrades"
v1_10 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.10"
v1_11 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.11"
v1_11_testnet_broken_state "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.11-testnet-broken-state"
v1_11_testnet_shade_hardcoded_admins "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.11-testnet-shade-hardcoded-admins"
v1_11_testnet_shade_hardcoded_admins_fix "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.11-testnet-shade-hardcoded-admins-fix"
v1_12 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.12"
v1_13 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.13"
v1_3 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.3"
Expand Down Expand Up @@ -107,6 +110,9 @@ var (
v1_9.Upgrade,
v1_10.Upgrade,
v1_11.Upgrade,
v1_11_testnet_shade_hardcoded_admins.Upgrade,
v1_11_testnet_shade_hardcoded_admins_fix.Upgrade,
v1_11_testnet_broken_state.Upgrade,
v1_12.Upgrade,
v1_13.Upgrade,
}
Expand Down
35 changes: 35 additions & 0 deletions app/upgrades/v1.11-testnet-broken-state/upgrade.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package v1_11_testnet_broken_state

import (
"fmt"

store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/scrtlabs/SecretNetwork/app/keepers"
"github.com/scrtlabs/SecretNetwork/app/upgrades"
)

const upgradeName = "v1.11-testnet-broken-state"

var Upgrade = upgrades.Upgrade{
UpgradeName: upgradeName,
CreateUpgradeHandler: createUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

func createUpgradeHandler(mm *module.Manager, _ *keepers.SecretAppKeepers, configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info(` _ _ _____ _____ _____ _____ ______ `)
ctx.Logger().Info(`| | | | __ \ / ____| __ \ /\ | __ \| ____|`)
ctx.Logger().Info(`| | | | |__) | | __| |__) | / \ | | | | |__ `)
ctx.Logger().Info(`| | | | ___/| | |_ | _ / / /\ \ | | | | __| `)
ctx.Logger().Info(`| |__| | | | |__| | | \ \ / ____ \| |__| | |____ `)
ctx.Logger().Info(` \____/|_| \_____|_| \_\/_/ \_\_____/|______|`)

ctx.Logger().Info(fmt.Sprintf("Running module migrations for %s...", upgradeName))
return mm.RunMigrations(ctx, configurator, vm)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package v1_11_testnet_shade_hardcoded_admins_fix

import (
"fmt"

store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/scrtlabs/SecretNetwork/app/keepers"
"github.com/scrtlabs/SecretNetwork/app/upgrades"
)

const upgradeName = "v1.11-testnet-shade-hardcoded-admins-fix"

var Upgrade = upgrades.Upgrade{
UpgradeName: upgradeName,
CreateUpgradeHandler: createUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

func createUpgradeHandler(mm *module.Manager, _ *keepers.SecretAppKeepers, configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info(` _ _ _____ _____ _____ _____ ______ `)
ctx.Logger().Info(`| | | | __ \ / ____| __ \ /\ | __ \| ____|`)
ctx.Logger().Info(`| | | | |__) | | __| |__) | / \ | | | | |__ `)
ctx.Logger().Info(`| | | | ___/| | |_ | _ / / /\ \ | | | | __| `)
ctx.Logger().Info(`| |__| | | | |__| | | \ \ / ____ \| |__| | |____ `)
ctx.Logger().Info(` \____/|_| \_____|_| \_\/_/ \_\_____/|______|`)

ctx.Logger().Info(fmt.Sprintf("Running module migrations for %s...", upgradeName))
return mm.RunMigrations(ctx, configurator, vm)
}
}
35 changes: 35 additions & 0 deletions app/upgrades/v1.11-testnet-shade-hardcoded-admins/upgrade.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package v1_11_testnet_shade_hardcoded_admins

import (
"fmt"

store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/scrtlabs/SecretNetwork/app/keepers"
"github.com/scrtlabs/SecretNetwork/app/upgrades"
)

const upgradeName = "v1.11-testnet-shade-hardcoded-admins"

var Upgrade = upgrades.Upgrade{
UpgradeName: upgradeName,
CreateUpgradeHandler: createUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

func createUpgradeHandler(mm *module.Manager, _ *keepers.SecretAppKeepers, configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info(` _ _ _____ _____ _____ _____ ______ `)
ctx.Logger().Info(`| | | | __ \ / ____| __ \ /\ | __ \| ____|`)
ctx.Logger().Info(`| | | | |__) | | __| |__) | / \ | | | | |__ `)
ctx.Logger().Info(`| | | | ___/| | |_ | _ / / /\ \ | | | | __| `)
ctx.Logger().Info(`| |__| | | | |__| | | \ \ / ____ \| |__| | |____ `)
ctx.Logger().Info(` \____/|_| \_____|_| \_\/_/ \_\_____/|______|`)

ctx.Logger().Info(fmt.Sprintf("Running module migrations for %s...", upgradeName))
return mm.RunMigrations(ctx, configurator, vm)
}
}
Loading
Loading