Bitcoin

app/app.go

@@ -154,8 +154,6 @@ func New(
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 	txConfig := encodingConfig.TxConfig
 
-	//bitcoincdc.RegisterInterfaces(interfaceRegistry)
-	//bitcoincdc.RegisterCrypto(cdc)
 	bApp := baseapp.NewBaseApp(
 		Name,
 		logger,
@@ -461,8 +459,8 @@ func (app *App) ModuleManager() *module.Manager {
 	return app.mm
 }
 
-func GetWasmOpts(appOpts servertypes.AppOptions) []wasm.Option {
-	var wasmOpts []wasm.Option
+func GetWasmOpts(appOpts servertypes.AppOptions) []wasmkeeper.Option {
+	var wasmOpts []wasmkeeper.Option
 	if cast.ToBool(appOpts.Get("telemetry.enabled")) {
 		wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer))
 	}

app/keepers/keepers.go

@@ -80,10 +80,6 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-
-	"github.com/sideprotocol/packet-forward-middleware/v7/packetforward"
-	packetforwardkeeper "github.com/sideprotocol/packet-forward-middleware/v7/packetforward/keeper"
-	packetforwardtypes "github.com/sideprotocol/packet-forward-middleware/v7/packetforward/types"
 )
 
 const (
@@ -120,7 +116,7 @@ type AppKeepers struct {
 	FeeGrantKeeper        feegrantkeeper.Keeper
 	GroupKeeper           groupkeeper.Keeper
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
-	WasmKeeper            wasm.Keeper
+	WasmKeeper            wasmkeeper.Keeper
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper   capabilitykeeper.ScopedKeeper
@@ -134,8 +130,6 @@ type AppKeepers struct {
 
 	YieldKeeper yieldmodulekeeper.Keeper
 
-	PacketForwardKeeper *packetforwardkeeper.Keeper
-
 	// keys to access the substores
 	keys    map[string]*storetypes.KVStoreKey
 	tkeys   map[string]*storetypes.TransientStoreKey
@@ -178,7 +172,7 @@ func (appKeepers *AppKeepers) InitSpecialKeepers(
 	appKeepers.ScopedIBCKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)
 	appKeepers.ScopedICAHostKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
 	appKeepers.ScopedTransferKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
-	appKeepers.scopedWasmKeeper = appKeepers.CapabilityKeeper.ScopeToModule(wasm.ModuleName)
+	appKeepers.scopedWasmKeeper = appKeepers.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName)
 
 	// TODO: Make a SetInvCheckPeriod fn on CrisisKeeper.
 	// IMO, its bad design atm that it requires this in state machine initialization
@@ -328,19 +322,6 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 		scopedICAControllerKeeper, bApp.MsgServiceRouter(),
 	)
 
-	// Initialize the packet forward middleware Keeper
-	// It's important to note that the PFM Keeper must be initialized before the Transfer Keeper
-	appKeepers.PacketForwardKeeper = packetforwardkeeper.NewKeeper(
-		appCodec,
-		appKeepers.keys[packetforwardtypes.StoreKey],
-		nil, // will be zero-value here, reference is set later on with SetTransferKeeper.
-		appKeepers.IBCKeeper.ChannelKeeper,
-		appKeepers.DistrKeeper,
-		appKeepers.BankKeeper,
-		appKeepers.IBCKeeper.ChannelKeeper,
-		govAuthor,
-	)
-
 	// Create Transfer Keepers
 	appKeepers.TransferKeeper = ibctransferkeeper.NewKeeper(
 		appCodec,
@@ -445,20 +426,19 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 	// wire up x/wasm to IBC
 	// Create static IBC router, add transfer route, then set and seal it
 
-	var ics101WasmStack ibcporttypes.IBCModule
-	ics101WasmStack = wasm.NewIBCHandler(appKeepers.WasmKeeper, appKeepers.IBCKeeper.ChannelKeeper, appKeepers.IBCKeeper.ChannelKeeper)
-	ics101WasmStack = packetforward.NewIBCMiddleware(
-		ics101WasmStack,
-		appKeepers.PacketForwardKeeper,
-		0, // retries on timeout
-		packetforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp, // forward timeout
-		packetforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,  // refund timeout
-	)
+	ics101WasmStack := wasm.NewIBCHandler(appKeepers.WasmKeeper, appKeepers.IBCKeeper.ChannelKeeper, appKeepers.IBCKeeper.ChannelKeeper)
+	// ics101WasmStack = packetforward.NewIBCMiddleware(
+	// 	ics101WasmStack,
+	// 	appKeepers.PacketForwardKeeper,
+	// 	0, // retries on timeout
+	// 	packetforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp, // forward timeout
+	// 	packetforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,  // refund timeout
+	// )
 
 	ibcRouter := ibcporttypes.NewRouter()
 	ibcRouter.AddRoute(icahosttypes.SubModuleName, icaHostIBCModule).
 		AddRoute(ibctransfertypes.ModuleName, transferIBCModule)
-	ibcRouter.AddRoute(wasm.ModuleName, ics101WasmStack)
+	ibcRouter.AddRoute(wasmtypes.ModuleName, ics101WasmStack)
 	// this line is used by starport scaffolding # ibc/app/router
 	appKeepers.IBCKeeper.SetRouter(ibcRouter)
 }
@@ -481,8 +461,6 @@ func (appKeepers *AppKeepers) initParamsKeeper(appCodec codec.BinaryCodec, legac
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
 	paramsKeeper.Subspace(gmmmoduletypes.ModuleName)
 	paramsKeeper.Subspace(yieldmoduletypes.ModuleName)
-	paramsKeeper.Subspace(packetforwardtypes.ModuleName).WithKeyTable(packetforwardtypes.ParamKeyTable())
-	// this line is used by starport scaffolding # stargate/app/paramSubspace
 
 	return paramsKeeper
 }
@@ -515,7 +493,6 @@ func KVStoreKeys() []string {
 		ibcfeetypes.StoreKey,
 		gmmmoduletypes.StoreKey,
 		yieldmoduletypes.StoreKey,
-		packetforwardtypes.StoreKey,
 	}
 }
 

app/keepers/modules.go

@@ -43,7 +43,6 @@ import (
 	// wasmd module integrate
 	"github.com/CosmWasm/wasmd/x/wasm"
 	// upgrades
-	"github.com/sideprotocol/packet-forward-middleware/v7/packetforward"
 )
 
 // AppModuleBasics returns ModuleBasics for the module BasicManager.
@@ -75,7 +74,6 @@ var AppModuleBasics = module.NewBasicManager(
 	wasm.AppModuleBasic{},
 	gmmmodule.AppModuleBasic{},
 	yieldmodule.AppModuleBasic{},
-	packetforward.AppModuleBasic{},
 )
 
 func getGovProposalHandlers() []govclient.ProposalHandler {

app/modules.go

@@ -89,7 +89,7 @@ var moduleAccountPermissions = map[string][]string{
 	govtypes.ModuleName:            {authtypes.Burner},
 	ibcfeetypes.ModuleName:         nil,
 	ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
-	wasm.ModuleName:                {authtypes.Burner},
+	wasmTypes.ModuleName:           {authtypes.Burner},
 	gmmmoduletypes.ModuleName:      {authtypes.Minter, authtypes.Burner, authtypes.Staking},
 	yieldmoduletypes.ModuleName:    {authtypes.Minter, authtypes.Burner, authtypes.Staking},
 }

app/upgrades/v2/constants.go

@@ -2,7 +2,6 @@ package v02
 
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
-	packetforwardtypes "github.com/sideprotocol/packet-forward-middleware/v7/packetforward/types"
 	"github.com/sideprotocol/side/app/upgrades"
 )
 
@@ -14,9 +13,7 @@ var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
-		Added: []string{
-			packetforwardtypes.ModuleName,
-		},
+		Added:   []string{},
 		Deleted: []string{},
 	},
 }

app/upgrades/v2/upgrades.go

@@ -16,6 +16,7 @@ func CreateUpgradeHandler(
 	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
 		logger := ctx.Logger().With("upgrade", UpgradeName)
 		logger.Debug("running module migrations ...")
+		_ = keepers
 		return mm.RunMigrations(ctx, configurator, vm)
 	}
 }

app/wasm_config.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 const (
@@ -12,16 +12,16 @@ const (
 )
 
 // MunGasRegisterConfig is defaults plus a custom compile amount
-func GasRegisterConfig() wasmkeeper.WasmGasRegisterConfig {
-	gasConfig := wasmkeeper.DefaultGasRegisterConfig()
+func GasRegisterConfig() wasmtypes.WasmGasRegisterConfig {
+	gasConfig := wasmtypes.DefaultGasRegisterConfig()
 	gasConfig.InstanceCost = DefaultInstanceCost
 	gasConfig.CompileCost = DefaultCompileCost
 
 	return gasConfig
 }
 
-func NewSideWasmGasRegister() wasmkeeper.WasmGasRegister {
-	return wasmkeeper.NewWasmGasRegister(GasRegisterConfig())
+func NewSideWasmGasRegister() wasmtypes.WasmGasRegister {
+	return wasmtypes.NewWasmGasRegister(GasRegisterConfig())
 }
 
 func AllCapabilities() []string {

cmd/sided/cmd/genaccounts.go

@@ -50,17 +50,13 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 			}
 
 			addr, err := sdk.AccAddressFromBech32(args[0])
-
 			if err != nil {
 				inBuf := bufio.NewReader(cmd.InOrStdin())
 				keyringBackend, err := cmd.Flags().GetString(flags.FlagKeyringBackend)
 				if err != nil {
 					return err
 				}
 
-				// attempt to lookup address from Keybase if no address was provided
-				//registry := codectypes.NewInterfaceRegistry()
-				//codec.NewProtoCodec(registry)
 				kb, err := keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf, cdc)
 				if err != nil {
 					return err

config.yml

@@ -14,7 +14,7 @@ accounts:
       - 10000000000000000000000000000000uusdt
 
   - name: bob
-    mnemonic: actress letter whip youth flip sort announce chief traffic side destroy seek parade warrior awake scan panther nominee harsh spawn differ enroll glue become
+    mnemonic: "furnace wild gravity resist heavy beef bundle deliver design service cycle monkey"
     coins:
       - 10000000000000000000000000000000uside
       - 10000000000000000000000000000000uusdc