-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #149 from xpladev/release/v1.6.x
v1.6.0
- Loading branch information
Showing
17 changed files
with
355 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package v1_6 | ||
|
|
||
| import ( | ||
| store "github.com/cosmos/cosmos-sdk/store/types" | ||
|
|
||
| "github.com/xpladev/xpla/app/upgrades" | ||
| ) | ||
|
|
||
| const ( | ||
| UpgradeName = "v1_6" | ||
| ) | ||
|
|
||
| var Upgrade = upgrades.Upgrade{ | ||
| UpgradeName: UpgradeName, | ||
| CreateUpgradeHandler: CreateUpgradeHandler, | ||
| StoreUpgrades: store.StoreUpgrades{ | ||
| Added: []string{}, | ||
| Deleted: []string{}, | ||
| }, | ||
| } | ||
|
|
||
| const ( | ||
| // https://github.com/Arachnid/deterministic-deployment-proxy | ||
| thirdwebProxy = "0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222" | ||
|
|
||
| upgradeFeeSupporter = "xpla1xj3vn9a27u5q945e2xvwfdh3hv6zuy0qkx9d4l" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package v1_6 | ||
|
|
||
| import ( | ||
| "math/big" | ||
|
|
||
| "cosmossdk.io/errors" | ||
| sdkmath "cosmossdk.io/math" | ||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/types/module" | ||
| authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" | ||
| upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" | ||
| "github.com/ethereum/go-ethereum/common/hexutil" | ||
| ethtypes "github.com/ethereum/go-ethereum/core/types" | ||
|
|
||
| evmtypes "github.com/xpladev/ethermint/x/evm/types" | ||
| "github.com/xpladev/xpla/app/keepers" | ||
| ) | ||
|
|
||
| func CreateUpgradeHandler( | ||
| mm *module.Manager, | ||
| configurator module.Configurator, | ||
| keepers *keepers.AppKeepers, | ||
| cdc codec.BinaryCodec, | ||
| ) upgradetypes.UpgradeHandler { | ||
| return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { | ||
| data, err := hexutil.Decode(thirdwebProxy) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to decode ethereum tx hex bytes") | ||
| } | ||
|
|
||
| msg := &evmtypes.MsgEthereumTx{} | ||
| if err := msg.UnmarshalBinary(data); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := msg.ValidateBasic(); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // fund fee collector by upgrade fee supporter | ||
| upgradeFeeSupporterAccout, err := sdk.AccAddressFromBech32(upgradeFeeSupporter) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| evmDenom := keepers.EvmKeeper.GetParams(ctx).EvmDenom | ||
| borrowedCoins := sdk.NewCoin(evmDenom, sdk.DefaultPowerReduction) | ||
| err = keepers.BankKeeper.SendCoinsFromAccountToModule(ctx, upgradeFeeSupporterAccout, authtypes.FeeCollectorName, sdk.NewCoins(borrowedCoins)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // execute thiredweb proxy contract | ||
| res, err := keepers.EvmKeeper.EthereumTx(ctx, msg) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if res.Failed() { | ||
| return nil, errors.ErrPanic.Wrap(res.VmError) | ||
| } | ||
|
|
||
| // Gas refunded rollback without use | ||
| tx := msg.AsTransaction() | ||
|
|
||
| signer := ethtypes.NewLondonSigner(keepers.EvmKeeper.ChainID()) | ||
| from, err := signer.Sender(tx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // sender -> rewardDistributeAccount | ||
| refundedGas := msg.GetGas() - res.GasUsed | ||
| refundAmount := new(big.Int).Mul(new(big.Int).SetUint64(refundedGas), tx.GasPrice()) | ||
| refundCoin := sdk.NewCoin(evmDenom, sdkmath.NewIntFromBigInt(refundAmount)) | ||
| err = keepers.BankKeeper.SendCoins(ctx, from.Bytes(), upgradeFeeSupporterAccout, sdk.NewCoins(refundCoin)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // feeCollector -> rewardDistributeAccount | ||
| err = keepers.BankKeeper.SendCoinsFromModuleToAccount(ctx, authtypes.FeeCollectorName, upgradeFeeSupporterAccout, sdk.NewCoins(borrowedCoins.Sub(refundCoin))) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return mm.RunMigrations(ctx, configurator, fromVM) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.