diff --git a/proto/ibc/core/client/v1/client.proto b/proto/ibc/core/client/v1/client.proto index f6241439b8b2..4a6f8320e847 100644 --- a/proto/ibc/core/client/v1/client.proto +++ b/proto/ibc/core/client/v1/client.proto @@ -84,10 +84,12 @@ message MsgUpgradeClient { string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; // upgraded client state google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; + // height at which old chain halts and upgrades (i.e last block executed) + Height upgrade_height = 3 [(gogoproto.moretags) = "yaml:\"upgrade_height\""]; // proof that old chain committed to new client - bytes proof_upgrade = 3 [(gogoproto.moretags) = "yaml:\"proof_upgrade\""]; + bytes proof_upgrade = 4 [(gogoproto.moretags) = "yaml:\"proof_upgrade\""]; // signer address - string signer = 4; + string signer = 5; } // MsgSubmitMisbehaviour defines an sdk.Msg type that submits Evidence for diff --git a/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/proto/ibc/lightclients/tendermint/v1/tendermint.proto index f3b6fe1c312e..76e020010a7c 100644 --- a/proto/ibc/lightclients/tendermint/v1/tendermint.proto +++ b/proto/ibc/lightclients/tendermint/v1/tendermint.proto @@ -42,7 +42,7 @@ message ClientState { repeated ics23.ProofSpec proof_specs = 8 [(gogoproto.moretags) = "yaml:\"proof_specs\""]; // Path at which next upgraded client will be committed - ibc.core.commitment.v1.MerklePath upgrade_path = 9 [(gogoproto.moretags) = "yaml:\"upgrade_path\""]; + string upgrade_path = 9 [(gogoproto.moretags) = "yaml:\"upgrade_path\""]; // This flag, when set to true, will allow governance to recover a client // which has expired diff --git a/x/distribution/types/genesis.pb.go b/x/distribution/types/genesis.pb.go index b7c34c7386af..04069c435a0d 100644 --- a/x/distribution/types/genesis.pb.go +++ b/x/distribution/types/genesis.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -72,7 +73,7 @@ type ValidatorOutstandingRewardsRecord struct { // validator_address is the address of the validator. ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` // outstanding_rewards represents the oustanding rewards of a validator. - OutstandingRewards []types.DecCoin `protobuf:"bytes,2,rep,name=outstanding_rewards,json=outstandingRewards,proto3" json:"outstanding_rewards" yaml:"outstanding_rewards"` + OutstandingRewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=outstanding_rewards,json=outstandingRewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"outstanding_rewards" yaml:"outstanding_rewards"` } func (m *ValidatorOutstandingRewardsRecord) Reset() { *m = ValidatorOutstandingRewardsRecord{} } diff --git a/x/ibc/core/02-client/handler.go b/x/ibc/core/02-client/handler.go index 030a4c7a9310..55cf0862f84e 100644 --- a/x/ibc/core/02-client/handler.go +++ b/x/ibc/core/02-client/handler.go @@ -76,7 +76,7 @@ func HandleMsgUpgradeClient(ctx sdk.Context, k keeper.Keeper, msg *types.MsgUpgr return nil, err } - if err = k.UpgradeClient(ctx, msg.ClientId, upgradedClient, msg.ProofUpgrade); err != nil { + if err = k.UpgradeClient(ctx, msg.ClientId, upgradedClient, msg.UpgradeHeight, msg.ProofUpgrade); err != nil { return nil, err } diff --git a/x/ibc/core/02-client/handler_test.go b/x/ibc/core/02-client/handler_test.go index 93b96e33ce73..91652b6ed081 100644 --- a/x/ibc/core/02-client/handler_test.go +++ b/x/ibc/core/02-client/handler_test.go @@ -84,10 +84,11 @@ func (suite *ClientTestSuite) TestUpgradeClient() { var ( clientA string upgradedClient exported.ClientState + upgradeHeight exported.Height msg *clienttypes.MsgUpgradeClient ) - upgradeHeight := clienttypes.NewHeight(1, 1) + newClientHeight := clienttypes.NewHeight(1, 1) cases := []struct { name string @@ -98,9 +99,13 @@ func (suite *ClientTestSuite) TestUpgradeClient() { name: "successful upgrade", setup: func() { - upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod+ibctesting.TrustingPeriod, ibctesting.MaxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod+ibctesting.TrustingPeriod, ibctesting.MaxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -111,9 +116,9 @@ func (suite *ClientTestSuite) TestUpgradeClient() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ := suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ := suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) - msg, err = clienttypes.NewMsgUpgradeClient(clientA, upgradedClient, proofUpgrade, suite.chainA.SenderAccount.GetAddress()) + msg, err = clienttypes.NewMsgUpgradeClient(clientA, upgradedClient, upgradeHeight, proofUpgrade, suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) }, expPass: true, @@ -125,13 +130,18 @@ func (suite *ClientTestSuite) TestUpgradeClient() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ := suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + + proofUpgrade, _ := suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) consState := ibctmtypes.NewConsensusState(time.Now(), commitmenttypes.NewMerkleRoot([]byte("app_hash")), []byte("next_vals_hash")) consAny, err := clienttypes.PackConsensusState(consState) suite.Require().NoError(err) - msg = &types.MsgUpgradeClient{ClientId: clientA, ClientState: consAny, ProofUpgrade: proofUpgrade, Signer: suite.chainA.SenderAccount.GetAddress().String()} + height, _ := upgradeHeight.(types.Height) + + msg = &types.MsgUpgradeClient{ClientId: clientA, ClientState: consAny, UpgradeHeight: &height, ProofUpgrade: proofUpgrade, Signer: suite.chainA.SenderAccount.GetAddress().String()} }, expPass: false, }, @@ -139,9 +149,13 @@ func (suite *ClientTestSuite) TestUpgradeClient() { name: "invalid clientstate", setup: func() { - upgradedClient = ibctmtypes.NewClientState("", ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod+ibctesting.TrustingPeriod, ibctesting.MaxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + upgradedClient = ibctmtypes.NewClientState("", ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod+ibctesting.TrustingPeriod, ibctesting.MaxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -152,9 +166,9 @@ func (suite *ClientTestSuite) TestUpgradeClient() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ := suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ := suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) - msg, err = clienttypes.NewMsgUpgradeClient(clientA, upgradedClient, proofUpgrade, suite.chainA.SenderAccount.GetAddress()) + msg, err = clienttypes.NewMsgUpgradeClient(clientA, upgradedClient, upgradeHeight, proofUpgrade, suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) }, expPass: false, @@ -163,9 +177,13 @@ func (suite *ClientTestSuite) TestUpgradeClient() { name: "VerifyUpgrade fails", setup: func() { - upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod+ibctesting.TrustingPeriod, ibctesting.MaxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod+ibctesting.TrustingPeriod, ibctesting.MaxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -173,7 +191,7 @@ func (suite *ClientTestSuite) TestUpgradeClient() { err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) suite.Require().NoError(err) - msg, err = clienttypes.NewMsgUpgradeClient(clientA, upgradedClient, nil, suite.chainA.SenderAccount.GetAddress()) + msg, err = clienttypes.NewMsgUpgradeClient(clientA, upgradedClient, upgradeHeight, nil, suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) }, expPass: false, diff --git a/x/ibc/core/02-client/keeper/client.go b/x/ibc/core/02-client/keeper/client.go index 2ade9f1ad85d..edd568d2b864 100644 --- a/x/ibc/core/02-client/keeper/client.go +++ b/x/ibc/core/02-client/keeper/client.go @@ -82,7 +82,7 @@ func (k Keeper) UpdateClient(ctx sdk.Context, clientID string, header exported.H // UpgradeClient upgrades the client to a new client state if this new client was committed to // by the old client at the specified upgrade height -func (k Keeper) UpgradeClient(ctx sdk.Context, clientID string, upgradedClient exported.ClientState, proofUpgrade []byte) error { +func (k Keeper) UpgradeClient(ctx sdk.Context, clientID string, upgradedClient exported.ClientState, upgradeHeight exported.Height, proofUpgrade []byte) error { clientState, found := k.GetClientState(ctx, clientID) if !found { return sdkerrors.Wrapf(types.ErrClientNotFound, "cannot update client with ID %s", clientID) @@ -93,7 +93,7 @@ func (k Keeper) UpgradeClient(ctx sdk.Context, clientID string, upgradedClient e return sdkerrors.Wrapf(types.ErrClientFrozen, "cannot update client with ID %s", clientID) } - err := clientState.VerifyUpgrade(ctx, k.cdc, k.ClientStore(ctx, clientID), upgradedClient, proofUpgrade) + err := clientState.VerifyUpgrade(ctx, k.cdc, k.ClientStore(ctx, clientID), upgradedClient, upgradeHeight, proofUpgrade) if err != nil { return sdkerrors.Wrapf(err, "cannot upgrade client with ID: %s", clientID) } diff --git a/x/ibc/core/02-client/keeper/client_test.go b/x/ibc/core/02-client/keeper/client_test.go index edc66c1e4455..29c652fc9651 100644 --- a/x/ibc/core/02-client/keeper/client_test.go +++ b/x/ibc/core/02-client/keeper/client_test.go @@ -34,11 +34,11 @@ func (suite *KeeperTestSuite) TestCreateClient() { i := i if tc.expPanic { suite.Require().Panics(func() { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) suite.keeper.CreateClient(suite.ctx, tc.clientID, clientState, suite.consensusState) }, "Msg %d didn't panic: %s", i, tc.msg) } else { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) if tc.expPass { suite.Require().NotNil(clientState, "valid test case %d failed: %s", i, tc.msg) } @@ -81,7 +81,7 @@ func (suite *KeeperTestSuite) TestUpdateClientTendermint() { expPass bool }{ {"valid update", func() error { - clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) // store intermediate consensus state to check that trustedHeight does not need to be highest consensus state before header height @@ -99,7 +99,7 @@ func (suite *KeeperTestSuite) TestUpdateClientTendermint() { return err }, true}, {"valid past update", func() error { - clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) suite.Require().NoError(err) @@ -132,7 +132,7 @@ func (suite *KeeperTestSuite) TestUpdateClientTendermint() { return nil }, false}, {"consensus state not found", func() error { - clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) suite.keeper.SetClientState(suite.ctx, testClientID, clientState) updateHeader = createFutureUpdateFn(suite) @@ -146,7 +146,7 @@ func (suite *KeeperTestSuite) TestUpdateClientTendermint() { return nil }, false}, {"valid past update before client was frozen", func() error { - clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) clientState.FrozenHeight = types.NewHeight(0, testClientHeight.VersionHeight-1) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) suite.Require().NoError(err) @@ -166,7 +166,7 @@ func (suite *KeeperTestSuite) TestUpdateClientTendermint() { return nil }, true}, {"invalid header", func() error { - clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState = ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) suite.Require().NoError(err) updateHeader = createPastUpdateFn(suite) @@ -237,6 +237,7 @@ func (suite *KeeperTestSuite) TestUpdateClientLocalhost() { func (suite *KeeperTestSuite) TestUpgradeClient() { var ( upgradedClient exported.ClientState + upgradeHeight exported.Height clientA string proofUpgrade []byte ) @@ -250,9 +251,13 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { name: "successful upgrade", setup: func() { - upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -263,7 +268,7 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: true, }, @@ -271,9 +276,13 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { name: "client state not found", setup: func() { - upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -284,7 +293,7 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) clientA = "wrongclientid" }, @@ -294,9 +303,13 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { name: "client state frozen", setup: func() { - upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -307,7 +320,7 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) // set frozen client in store tmClient, ok := cs.(*ibctmtypes.ClientState) @@ -321,12 +334,16 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { name: "tendermint client VerifyUpgrade fails", setup: func() { - upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + upgradedClient = ibctmtypes.NewClientState("newChainId", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // change upgradedClient client-specified parameters - upgradedClient = ibctmtypes.NewClientState("wrongchainID", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, true, true) + upgradedClient = ibctmtypes.NewClientState("wrongchainID", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, true, true) suite.coordinator.CommitBlock(suite.chainB) err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) @@ -335,7 +352,7 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: false, }, @@ -347,7 +364,7 @@ func (suite *KeeperTestSuite) TestUpgradeClient() { tc.setup() - err := suite.chainA.App.IBCKeeper.ClientKeeper.UpgradeClient(suite.chainA.GetContext(), clientA, upgradedClient, proofUpgrade) + err := suite.chainA.App.IBCKeeper.ClientKeeper.UpgradeClient(suite.chainA.GetContext(), clientA, upgradedClient, upgradeHeight, proofUpgrade) if tc.expPass { suite.Require().NoError(err, "verify upgrade failed on valid case: %s", tc.name) @@ -402,7 +419,7 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { }, func() error { suite.consensusState.NextValidatorsHash = bothValsHash - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) return err @@ -419,7 +436,7 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { }, func() error { suite.consensusState.NextValidatorsHash = valsHash - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) // store intermediate consensus state to check that trustedHeight does not need to be highest consensus state before header height @@ -446,7 +463,7 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { }, func() error { suite.consensusState.NextValidatorsHash = valsHash - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) // store trusted consensus state for Header2 @@ -473,7 +490,7 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { }, func() error { suite.consensusState.NextValidatorsHash = valsHash - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) // intermediate consensus state at height + 3 is not created return err @@ -490,7 +507,7 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { }, func() error { suite.consensusState.NextValidatorsHash = valsHash - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) // intermediate consensus state at height + 3 is not created return err @@ -513,7 +530,7 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { }, func() error { suite.consensusState.NextValidatorsHash = bothValsHash - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) err := suite.keeper.CreateClient(suite.ctx, testClientID, clientState, suite.consensusState) clientState.FrozenHeight = types.NewHeight(0, 1) @@ -532,7 +549,7 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { ClientId: testClientID, }, func() error { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) if err != nil { return err } diff --git a/x/ibc/core/02-client/keeper/grpc_query_test.go b/x/ibc/core/02-client/keeper/grpc_query_test.go index 200a1d5ba06b..5b302e9034e9 100644 --- a/x/ibc/core/02-client/keeper/grpc_query_test.go +++ b/x/ibc/core/02-client/keeper/grpc_query_test.go @@ -43,7 +43,7 @@ func (suite *KeeperTestSuite) TestQueryClientState() { { "success", func() { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) suite.keeper.SetClientState(suite.ctx, testClientID, clientState) var err error @@ -209,7 +209,7 @@ func (suite *KeeperTestSuite) TestQueryConsensusState() { { "success latest height", func() { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) cs := ibctmtypes.NewConsensusState( suite.consensusState.Timestamp, commitmenttypes.NewMerkleRoot([]byte("hash1")), nil, ) diff --git a/x/ibc/core/02-client/keeper/keeper.go b/x/ibc/core/02-client/keeper/keeper.go index d4422301bbef..5bd029382ca3 100644 --- a/x/ibc/core/02-client/keeper/keeper.go +++ b/x/ibc/core/02-client/keeper/keeper.go @@ -2,6 +2,7 @@ package keeper import ( "fmt" + "net/url" "reflect" "strings" @@ -251,10 +252,12 @@ func (k Keeper) ValidateSelfClient(ctx sdk.Context, clientState exported.ClientS tmClient.UnbondingPeriod, tmClient.TrustingPeriod) } - if tmClient.UpgradePath != nil { + if tmClient.UpgradePath != "" { // For now, SDK IBC implementation assumes that upgrade path (if defined) is defined by SDK upgrade module - expectedUpgradePath := fmt.Sprintf("/%s/%s", upgradetypes.StoreKey, upgradetypes.KeyUpgradedClient) - if tmClient.UpgradePath.String() != expectedUpgradePath { + // Must escape any merkle key before adding it to upgrade path + upgradeKey := url.PathEscape(upgradetypes.KeyUpgradedClient) + expectedUpgradePath := fmt.Sprintf("%s/%s", upgradetypes.StoreKey, upgradeKey) + if tmClient.UpgradePath != expectedUpgradePath { return sdkerrors.Wrapf(types.ErrInvalidClient, "upgrade path must be the upgrade path defined by upgrade module. expected %s, got %s", expectedUpgradePath, tmClient.UpgradePath) } diff --git a/x/ibc/core/02-client/keeper/keeper_test.go b/x/ibc/core/02-client/keeper/keeper_test.go index 7dc6f54a58b7..0bc6a43af32b 100644 --- a/x/ibc/core/02-client/keeper/keeper_test.go +++ b/x/ibc/core/02-client/keeper/keeper_test.go @@ -44,7 +44,7 @@ const ( var ( testClientHeight = types.NewHeight(0, 5) testClientHeightEpoch1 = types.NewHeight(1, 5) - upgradeHeight = types.NewHeight(1, 1) + newClientHeight = types.NewHeight(1, 1) ) type KeeperTestSuite struct { @@ -120,7 +120,7 @@ func TestKeeperTestSuite(t *testing.T) { } func (suite *KeeperTestSuite) TestSetClientState() { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) suite.keeper.SetClientState(suite.ctx, testClientID, clientState) retrievedState, found := suite.keeper.GetClientState(suite.ctx, testClientID) @@ -140,7 +140,6 @@ func (suite *KeeperTestSuite) TestSetClientConsensusState() { } func (suite *KeeperTestSuite) TestValidateSelfClient() { - badUpgradePath := commitmenttypes.NewMerklePath([]string{"bad", "upgrade", "path"}) testCases := []struct { name string clientState exported.ClientState @@ -148,12 +147,12 @@ func (suite *KeeperTestSuite) TestValidateSelfClient() { }{ { "success", - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), true, }, { "success with nil UpgradePath", - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), nil, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), "", false, false), true, }, { @@ -163,47 +162,47 @@ func (suite *KeeperTestSuite) TestValidateSelfClient() { }, { "frozen client", - &ibctmtypes.ClientState{testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false}, + &ibctmtypes.ClientState{testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false}, false, }, { "incorrect chainID", - ibctmtypes.NewClientState("gaiatestnet", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState("gaiatestnet", ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), false, }, { "invalid client height", - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.NewHeight(0, testClientHeight.VersionHeight+10), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.NewHeight(0, testClientHeight.VersionHeight+10), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), false, }, { "invalid client version", - ibctmtypes.NewClientState(testChainIDEpoch1, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeightEpoch1, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainIDEpoch1, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeightEpoch1, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), false, }, { "invalid proof specs", - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, nil, &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, nil, ibctesting.UpgradePath, false, false), false, }, { "invalid trust level", - ibctmtypes.NewClientState(testChainID, ibctmtypes.Fraction{0, 1}, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.Fraction{0, 1}, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), false, }, { "invalid unbonding period", - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+10, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod+10, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), false, }, { "invalid trusting period", - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, ubdPeriod+10, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, ubdPeriod+10, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), false, }, { "invalid upgrade path", - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &badUpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), "bad/upgrade/path", false, false), false, }, } @@ -226,9 +225,9 @@ func (suite KeeperTestSuite) TestGetAllClients() { testClientID2, testClientID3, testClientID, } expClients := []exported.ClientState{ - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), } for i := range expClients { @@ -250,9 +249,9 @@ func (suite KeeperTestSuite) TestGetAllGenesisClients() { testClientID2, testClientID3, testClientID, } expClients := []exported.ClientState{ - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), - ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), } expGenClients := make([]types.IdentifiedClientState, len(expClients)) @@ -300,7 +299,7 @@ func (suite KeeperTestSuite) TestGetConsensusState() { func (suite KeeperTestSuite) TestConsensusStateHelpers() { // initial setup - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) suite.keeper.SetClientState(suite.ctx, testClientID, clientState) suite.keeper.SetClientConsensusState(suite.ctx, testClientID, testClientHeight, suite.consensusState) diff --git a/x/ibc/core/02-client/types/client.pb.go b/x/ibc/core/02-client/types/client.pb.go index a33771eb4718..f70ceca58c94 100644 --- a/x/ibc/core/02-client/types/client.pb.go +++ b/x/ibc/core/02-client/types/client.pb.go @@ -334,10 +334,12 @@ type MsgUpgradeClient struct { ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` // upgraded client state ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"` + // height at which old chain halts and upgrades (i.e last block executed) + UpgradeHeight *Height `protobuf:"bytes,3,opt,name=upgrade_height,json=upgradeHeight,proto3" json:"upgrade_height,omitempty" yaml:"upgrade_height"` // proof that old chain committed to new client - ProofUpgrade []byte `protobuf:"bytes,3,opt,name=proof_upgrade,json=proofUpgrade,proto3" json:"proof_upgrade,omitempty" yaml:"proof_upgrade"` + ProofUpgrade []byte `protobuf:"bytes,4,opt,name=proof_upgrade,json=proofUpgrade,proto3" json:"proof_upgrade,omitempty" yaml:"proof_upgrade"` // signer address - Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"` + Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` } func (m *MsgUpgradeClient) Reset() { *m = MsgUpgradeClient{} } @@ -387,6 +389,13 @@ func (m *MsgUpgradeClient) GetClientState() *types.Any { return nil } +func (m *MsgUpgradeClient) GetUpgradeHeight() *Height { + if m != nil { + return m.UpgradeHeight + } + return nil +} + func (m *MsgUpgradeClient) GetProofUpgrade() []byte { if m != nil { return m.ProofUpgrade @@ -508,51 +517,52 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/client.proto", fileDescriptor_b6bc4c8185546947) } var fileDescriptor_b6bc4c8185546947 = []byte{ - // 691 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x3b, 0x4f, 0x1b, 0x31, - 0x1c, 0x8f, 0x93, 0x34, 0x22, 0x4e, 0x78, 0xe8, 0x9a, 0x40, 0xc8, 0x90, 0x8b, 0x3c, 0x31, 0xc0, - 0x5d, 0x49, 0x87, 0xa2, 0x48, 0x95, 0xda, 0xb0, 0x94, 0x81, 0x8a, 0x1e, 0xaa, 0xfa, 0x58, 0xd0, - 0x3d, 0xcc, 0xc5, 0x6a, 0x72, 0x8e, 0xce, 0x4e, 0x44, 0xbe, 0x41, 0xc7, 0x4a, 0xad, 0xaa, 0x0e, - 0x1d, 0x98, 0x3a, 0x76, 0xeb, 0x37, 0xe8, 0xc0, 0xc8, 0xd8, 0xe9, 0x54, 0xc1, 0xd2, 0xa9, 0x43, - 0x3e, 0x41, 0x75, 0xb6, 0x21, 0x39, 0x20, 0x14, 0x31, 0x31, 0x9d, 0xed, 0xff, 0xdf, 0x3f, 0xff, - 0x1e, 0x96, 0x0f, 0xea, 0xc4, 0x71, 0x4d, 0x97, 0x86, 0xd8, 0x74, 0x3b, 0x04, 0x07, 0xdc, 0x1c, - 0xac, 0xab, 0x91, 0xd1, 0x0b, 0x29, 0xa7, 0x9a, 0x46, 0x1c, 0xd7, 0x88, 0x1b, 0x0c, 0xb5, 0x3c, - 0x58, 0xaf, 0x96, 0x7c, 0xea, 0x53, 0x51, 0x36, 0xe3, 0x91, 0xec, 0xac, 0x2e, 0xfb, 0x94, 0xfa, - 0x1d, 0x6c, 0x8a, 0x99, 0xd3, 0xdf, 0x37, 0xed, 0x60, 0x28, 0x4b, 0xe8, 0x2b, 0x80, 0xe5, 0x2d, - 0x0f, 0x07, 0x9c, 0xec, 0x13, 0xec, 0x6d, 0x0a, 0xa0, 0x5d, 0x6e, 0x73, 0xac, 0xad, 0xc3, 0xbc, - 0xc4, 0xdd, 0x23, 0x5e, 0x05, 0xd4, 0xc1, 0x4a, 0xbe, 0x55, 0x1a, 0x45, 0xfa, 0xc2, 0xd0, 0xee, - 0x76, 0x9a, 0xe8, 0xbc, 0x84, 0xac, 0x19, 0x39, 0xde, 0xf2, 0xb4, 0x1d, 0x58, 0x54, 0xeb, 0x2c, - 0x86, 0xa8, 0xa4, 0xeb, 0x60, 0xa5, 0xd0, 0x28, 0x19, 0xf2, 0x78, 0xe3, 0xec, 0x78, 0xe3, 0x69, - 0x30, 0x6c, 0x2d, 0x8d, 0x22, 0xfd, 0x7e, 0x02, 0x4b, 0xec, 0x41, 0x56, 0xc1, 0x1d, 0x93, 0x40, - 0xdf, 0x01, 0xac, 0x6c, 0xd2, 0x80, 0xe1, 0x80, 0xf5, 0x99, 0x58, 0x7a, 0x45, 0x78, 0xfb, 0x19, - 0x26, 0x7e, 0x9b, 0x6b, 0x1b, 0x30, 0xd7, 0x16, 0x23, 0x41, 0xaf, 0xd0, 0xa8, 0x1a, 0x97, 0x1d, - 0x31, 0x64, 0x6f, 0x2b, 0x7b, 0x14, 0xe9, 0x29, 0x4b, 0xf5, 0x6b, 0xaf, 0xe1, 0xbc, 0x7b, 0x86, - 0x7a, 0x03, 0xae, 0xcb, 0xa3, 0x48, 0x2f, 0xc7, 0x5c, 0xd1, 0x85, 0x5d, 0xc8, 0x9a, 0x73, 0x13, - 0xec, 0xd0, 0x4f, 0x00, 0xcb, 0xd2, 0xc5, 0x24, 0x6d, 0x76, 0x1b, 0x3f, 0x0f, 0xe0, 0xc2, 0x85, - 0x03, 0x59, 0x25, 0x5d, 0xcf, 0xac, 0x14, 0x1a, 0xab, 0x57, 0x49, 0x9d, 0x66, 0x54, 0x4b, 0x8f, - 0xc5, 0x8f, 0x22, 0x7d, 0x49, 0x9d, 0x75, 0x01, 0x13, 0x59, 0xf3, 0x49, 0x15, 0x0c, 0xfd, 0x00, - 0xb0, 0x24, 0x65, 0xbc, 0xec, 0x79, 0x36, 0xc7, 0x3b, 0x21, 0xed, 0x51, 0x66, 0x77, 0xb4, 0x12, - 0xbc, 0xc7, 0x09, 0xef, 0x60, 0xa9, 0xc0, 0x92, 0x13, 0xad, 0x0e, 0x0b, 0x1e, 0x66, 0x6e, 0x48, - 0x7a, 0x9c, 0xd0, 0x40, 0x78, 0x99, 0xb7, 0x26, 0x97, 0x92, 0xea, 0x33, 0x37, 0x52, 0xbf, 0x1a, - 0xc7, 0x6b, 0x7b, 0x38, 0xac, 0x64, 0xa7, 0x67, 0x63, 0xa9, 0x9e, 0x66, 0xf6, 0xfd, 0xa1, 0x9e, - 0x42, 0x1f, 0xd3, 0x70, 0x7e, 0x9b, 0xf9, 0x9b, 0x21, 0xb6, 0x39, 0x96, 0x02, 0xee, 0xc4, 0x45, - 0xd6, 0xde, 0x5c, 0xbe, 0x71, 0x99, 0x6b, 0x40, 0xab, 0xa3, 0x48, 0x5f, 0xbc, 0x32, 0xad, 0x4b, - 0x57, 0x4e, 0x5b, 0x84, 0x39, 0x46, 0xfc, 0x40, 0xf9, 0x94, 0xb7, 0xd4, 0xac, 0x39, 0x13, 0x3b, - 0xf2, 0x27, 0x76, 0xe5, 0x13, 0x10, 0xae, 0xc8, 0x28, 0x6f, 0xef, 0xca, 0x38, 0x90, 0xf4, 0xff, - 0x03, 0x99, 0xa0, 0x95, 0x99, 0x42, 0xeb, 0x2f, 0x80, 0x0b, 0x82, 0x96, 0x1f, 0xda, 0xde, 0x9d, - 0x4a, 0xeb, 0x31, 0x9c, 0xed, 0x85, 0x94, 0xee, 0xef, 0xf5, 0x25, 0x37, 0x21, 0xa1, 0xd8, 0xaa, - 0x8c, 0x22, 0xbd, 0x24, 0x37, 0x27, 0xca, 0xc8, 0x2a, 0x8a, 0xb9, 0x52, 0x32, 0x2d, 0x11, 0xf4, - 0x0d, 0xc0, 0xf2, 0x36, 0xf3, 0x77, 0xfb, 0x4e, 0x97, 0xf0, 0x6d, 0xc2, 0x1c, 0xdc, 0xb6, 0x07, - 0x84, 0xf6, 0xc3, 0xdb, 0xa8, 0xde, 0x80, 0xc5, 0xee, 0x04, 0xc4, 0xb5, 0x99, 0x24, 0x3a, 0x6f, - 0x90, 0xcc, 0x67, 0x00, 0x73, 0xea, 0x91, 0x7d, 0x02, 0xe7, 0x06, 0x38, 0x64, 0x84, 0x06, 0x7b, - 0x41, 0xbf, 0xeb, 0xe0, 0x50, 0xd0, 0xcb, 0x8e, 0xdf, 0xc4, 0x26, 0x4a, 0xd6, 0x91, 0x35, 0xab, - 0x16, 0x9e, 0x8b, 0xf9, 0x24, 0x82, 0x7a, 0xae, 0xd3, 0xd3, 0x10, 0x64, 0x7d, 0x8c, 0x20, 0x39, - 0x48, 0x62, 0x5f, 0x0e, 0xf5, 0x54, 0xeb, 0xc5, 0xd1, 0x49, 0x0d, 0x1c, 0x9f, 0xd4, 0xc0, 0xef, - 0x93, 0x1a, 0xf8, 0x70, 0x5a, 0x4b, 0x1d, 0x9f, 0xd6, 0x52, 0xbf, 0x4e, 0x6b, 0xa9, 0xb7, 0x8f, - 0x7c, 0xc2, 0xdb, 0x7d, 0xc7, 0x70, 0x69, 0xd7, 0x74, 0x29, 0xeb, 0x52, 0xa6, 0x3e, 0x6b, 0xcc, - 0x7b, 0x67, 0x1e, 0x98, 0xe7, 0x7f, 0xd3, 0x07, 0x8d, 0x35, 0xf5, 0x43, 0xe5, 0xc3, 0x1e, 0x66, - 0x4e, 0x4e, 0x38, 0xf5, 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xe9, 0x8c, 0xf0, 0x70, - 0x07, 0x00, 0x00, + // 718 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x3d, 0x4f, 0xdb, 0x4e, + 0x1c, 0x8e, 0x93, 0x10, 0x91, 0x4b, 0x78, 0x91, 0xff, 0x09, 0x84, 0x0c, 0x71, 0x74, 0x13, 0x03, + 0xd8, 0x7f, 0xd2, 0xa1, 0x28, 0x52, 0xa5, 0x36, 0x2c, 0x65, 0xa0, 0xa2, 0x46, 0x55, 0x5f, 0x54, + 0x29, 0xf2, 0xcb, 0xe1, 0x9c, 0x9a, 0xf8, 0x22, 0xdf, 0x25, 0x22, 0xdf, 0xa0, 0x63, 0xa5, 0x56, + 0x55, 0x87, 0x0e, 0x4c, 0x1d, 0xbb, 0xf5, 0x1b, 0x74, 0x60, 0xe8, 0xc0, 0xd8, 0xc9, 0xaa, 0x60, + 0xe9, 0x9c, 0x4f, 0x50, 0xf9, 0xee, 0x08, 0x36, 0x10, 0x40, 0x4c, 0x4c, 0xbe, 0xdf, 0xcb, 0x3d, + 0xf7, 0xfc, 0x9e, 0xe7, 0x74, 0x06, 0x1a, 0xb6, 0x1d, 0xc3, 0x21, 0x01, 0x32, 0x9c, 0x2e, 0x46, + 0x3e, 0x33, 0x86, 0x1b, 0x72, 0xa5, 0xf7, 0x03, 0xc2, 0x88, 0xaa, 0x62, 0xdb, 0xd1, 0xa3, 0x06, + 0x5d, 0xa6, 0x87, 0x1b, 0xd5, 0x92, 0x47, 0x3c, 0xc2, 0xcb, 0x46, 0xb4, 0x12, 0x9d, 0xd5, 0x15, + 0x8f, 0x10, 0xaf, 0x8b, 0x0c, 0x1e, 0xd9, 0x83, 0x7d, 0xc3, 0xf2, 0x47, 0xa2, 0x04, 0xbf, 0x2a, + 0xa0, 0xbc, 0xed, 0x22, 0x9f, 0xe1, 0x7d, 0x8c, 0xdc, 0x2d, 0x0e, 0xb4, 0xc7, 0x2c, 0x86, 0xd4, + 0x0d, 0x90, 0x17, 0xb8, 0x6d, 0xec, 0x56, 0x94, 0xba, 0xb2, 0x9a, 0x6f, 0x95, 0xc6, 0xa1, 0xb6, + 0x38, 0xb2, 0x7a, 0xdd, 0x26, 0x9c, 0x94, 0xa0, 0x39, 0x2b, 0xd6, 0xdb, 0xae, 0xba, 0x0b, 0x8a, + 0x32, 0x4f, 0x23, 0x88, 0x4a, 0xba, 0xae, 0xac, 0x16, 0x1a, 0x25, 0x5d, 0x1c, 0xaf, 0x9f, 0x1d, + 0xaf, 0x3f, 0xf1, 0x47, 0xad, 0xe5, 0x71, 0xa8, 0xfd, 0x97, 0xc0, 0xe2, 0x7b, 0xa0, 0x59, 0x70, + 0xce, 0x49, 0xc0, 0xef, 0x0a, 0xa8, 0x6c, 0x11, 0x9f, 0x22, 0x9f, 0x0e, 0x28, 0x4f, 0xbd, 0xc4, + 0xac, 0xf3, 0x14, 0x61, 0xaf, 0xc3, 0xd4, 0x4d, 0x90, 0xeb, 0xf0, 0x15, 0xa7, 0x57, 0x68, 0x54, + 0xf5, 0xcb, 0x8a, 0xe8, 0xa2, 0xb7, 0x95, 0x3d, 0x0a, 0xb5, 0x94, 0x29, 0xfb, 0xd5, 0x57, 0x60, + 0xc1, 0x39, 0x43, 0xbd, 0x05, 0xd7, 0x95, 0x71, 0xa8, 0x95, 0x23, 0xae, 0xf0, 0xc2, 0x2e, 0x68, + 0xce, 0x3b, 0x09, 0x76, 0xf0, 0xa7, 0x02, 0xca, 0x42, 0xc5, 0x24, 0x6d, 0x7a, 0x17, 0x3d, 0x0f, + 0xc0, 0xe2, 0x85, 0x03, 0x69, 0x25, 0x5d, 0xcf, 0xac, 0x16, 0x1a, 0x6b, 0x57, 0x8d, 0x3a, 0x4d, + 0xa8, 0x96, 0x16, 0x0d, 0x3f, 0x0e, 0xb5, 0x65, 0x79, 0xd6, 0x05, 0x4c, 0x68, 0x2e, 0x24, 0xa7, + 0xa0, 0xf0, 0x87, 0x02, 0x4a, 0x62, 0x8c, 0x17, 0x7d, 0xd7, 0x62, 0x68, 0x37, 0x20, 0x7d, 0x42, + 0xad, 0xae, 0x5a, 0x02, 0x33, 0x0c, 0xb3, 0x2e, 0x12, 0x13, 0x98, 0x22, 0x50, 0xeb, 0xa0, 0xe0, + 0x22, 0xea, 0x04, 0xb8, 0xcf, 0x30, 0xf1, 0xb9, 0x96, 0x79, 0x33, 0x9e, 0x4a, 0x4e, 0x9f, 0xb9, + 0xd5, 0xf4, 0x6b, 0x91, 0xbd, 0x96, 0x8b, 0x82, 0x4a, 0x76, 0xba, 0x37, 0xa6, 0xec, 0x69, 0x66, + 0xdf, 0x1f, 0x6a, 0x29, 0xf8, 0x31, 0x0d, 0x16, 0x76, 0xa8, 0xb7, 0x15, 0x20, 0x8b, 0x21, 0x31, + 0xc0, 0xbd, 0xb8, 0xc8, 0xea, 0xeb, 0xcb, 0x37, 0x2e, 0x73, 0x0d, 0x68, 0x75, 0x1c, 0x6a, 0x4b, + 0x57, 0xba, 0x75, 0xe9, 0xca, 0xa9, 0x4b, 0x20, 0x47, 0xb1, 0xe7, 0x4b, 0x9d, 0xf2, 0xa6, 0x8c, + 0x9a, 0xb3, 0x91, 0x22, 0x7f, 0x23, 0x55, 0x3e, 0x29, 0x5c, 0x15, 0x61, 0xe5, 0xdd, 0x55, 0x39, + 0x37, 0x24, 0x7d, 0xb3, 0x21, 0x31, 0x5a, 0x99, 0x29, 0xb4, 0x7e, 0xa5, 0xc1, 0x22, 0xa7, 0xe5, + 0x05, 0x96, 0x7b, 0xaf, 0xdc, 0x7a, 0x0b, 0xe6, 0x07, 0x82, 0x55, 0x5b, 0xbe, 0x30, 0x99, 0x1b, + 0x5f, 0x98, 0xc9, 0x23, 0xd1, 0x84, 0xc9, 0xbd, 0xd0, 0x9c, 0x93, 0x09, 0xf9, 0x6e, 0x3d, 0x02, + 0x73, 0xfd, 0x80, 0x90, 0xfd, 0xb6, 0x4c, 0x73, 0xdf, 0x8a, 0xad, 0xca, 0x38, 0xd4, 0x4a, 0x02, + 0x20, 0x51, 0x86, 0x66, 0x91, 0xc7, 0x52, 0xa7, 0x98, 0xb0, 0x33, 0x71, 0x61, 0xe1, 0x37, 0x05, + 0x94, 0x77, 0xa8, 0xb7, 0x37, 0xb0, 0x7b, 0x98, 0xed, 0x60, 0x6a, 0xa3, 0x8e, 0x35, 0xc4, 0x64, + 0x10, 0xdc, 0x45, 0xd3, 0x4d, 0x50, 0xec, 0xc5, 0x20, 0xae, 0x75, 0x3c, 0xd1, 0x79, 0x0b, 0xdf, + 0x3f, 0x2b, 0x20, 0x27, 0xa5, 0x78, 0x0c, 0xe6, 0x87, 0x28, 0xa0, 0x98, 0xf8, 0x6d, 0x7f, 0xd0, + 0xb3, 0x51, 0xc0, 0xe9, 0x65, 0xe3, 0x62, 0x26, 0xeb, 0xd0, 0x9c, 0x93, 0x89, 0x67, 0x3c, 0x8e, + 0x23, 0x48, 0xab, 0xd2, 0xd3, 0x10, 0x26, 0x76, 0xc8, 0x84, 0xe0, 0x20, 0x88, 0x7d, 0x39, 0xd4, + 0x52, 0xad, 0xe7, 0x47, 0x27, 0x35, 0xe5, 0xf8, 0xa4, 0xa6, 0xfc, 0x39, 0xa9, 0x29, 0x1f, 0x4e, + 0x6b, 0xa9, 0xe3, 0xd3, 0x5a, 0xea, 0xf7, 0x69, 0x2d, 0xf5, 0xe6, 0xa1, 0x87, 0x59, 0x67, 0x60, + 0xeb, 0x0e, 0xe9, 0x19, 0x0e, 0xa1, 0x3d, 0x42, 0xe5, 0x67, 0x9d, 0xba, 0xef, 0x8c, 0x03, 0x63, + 0xf2, 0xaf, 0xfe, 0xbf, 0xb1, 0x2e, 0x7f, 0xd7, 0x6c, 0xd4, 0x47, 0xd4, 0xce, 0x71, 0xa5, 0x1e, + 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x1c, 0xf5, 0xf4, 0xce, 0x07, 0x00, 0x00, } func (m *IdentifiedClientState) Marshal() (dAtA []byte, err error) { @@ -877,13 +887,25 @@ func (m *MsgUpgradeClient) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Signer) i = encodeVarintClient(dAtA, i, uint64(len(m.Signer))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } if len(m.ProofUpgrade) > 0 { i -= len(m.ProofUpgrade) copy(dAtA[i:], m.ProofUpgrade) i = encodeVarintClient(dAtA, i, uint64(len(m.ProofUpgrade))) i-- + dAtA[i] = 0x22 + } + if m.UpgradeHeight != nil { + { + size, err := m.UpgradeHeight.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintClient(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x1a } if m.ClientState != nil { @@ -1137,6 +1159,10 @@ func (m *MsgUpgradeClient) Size() (n int) { l = m.ClientState.Size() n += 1 + l + sovClient(uint64(l)) } + if m.UpgradeHeight != nil { + l = m.UpgradeHeight.Size() + n += 1 + l + sovClient(uint64(l)) + } l = len(m.ProofUpgrade) if l > 0 { n += 1 + l + sovClient(uint64(l)) @@ -2177,6 +2203,42 @@ func (m *MsgUpgradeClient) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field UpgradeHeight", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowClient + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthClient + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthClient + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.UpgradeHeight == nil { + m.UpgradeHeight = &Height{} + } + if err := m.UpgradeHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProofUpgrade", wireType) } @@ -2210,7 +2272,7 @@ func (m *MsgUpgradeClient) Unmarshal(dAtA []byte) error { m.ProofUpgrade = []byte{} } iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } diff --git a/x/ibc/core/02-client/types/codec_test.go b/x/ibc/core/02-client/types/codec_test.go index 5464f9ae7923..f41d05f9e492 100644 --- a/x/ibc/core/02-client/types/codec_test.go +++ b/x/ibc/core/02-client/types/codec_test.go @@ -30,7 +30,7 @@ func (suite *TypesTestSuite) TestPackClientState() { }, { "tendermint client", - ibctmtypes.NewClientState(chainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + ibctmtypes.NewClientState(chainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), true, }, { diff --git a/x/ibc/core/02-client/types/genesis_test.go b/x/ibc/core/02-client/types/genesis_test.go index e5652050935c..cfde5a6de82a 100644 --- a/x/ibc/core/02-client/types/genesis_test.go +++ b/x/ibc/core/02-client/types/genesis_test.go @@ -72,7 +72,7 @@ func TestValidateGenesis(t *testing.T) { genState: types.NewGenesisState( []types.IdentifiedClientState{ types.NewIdentifiedClientState( - clientID, ibctmtypes.NewClientState(chainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + clientID, ibctmtypes.NewClientState(chainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), types.NewIdentifiedClientState( exported.Localhost, localhosttypes.NewClientState("chainID", clientHeight), @@ -100,7 +100,7 @@ func TestValidateGenesis(t *testing.T) { genState: types.NewGenesisState( []types.IdentifiedClientState{ types.NewIdentifiedClientState( - "/~@$*", ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + "/~@$*", ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), types.NewIdentifiedClientState( exported.Localhost, localhosttypes.NewClientState("chainID", clientHeight), @@ -128,7 +128,7 @@ func TestValidateGenesis(t *testing.T) { genState: types.NewGenesisState( []types.IdentifiedClientState{ types.NewIdentifiedClientState( - clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), types.NewIdentifiedClientState(exported.Localhost, localhosttypes.NewClientState("chaindID", types.ZeroHeight())), }, @@ -142,7 +142,7 @@ func TestValidateGenesis(t *testing.T) { genState: types.NewGenesisState( []types.IdentifiedClientState{ types.NewIdentifiedClientState( - clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), types.NewIdentifiedClientState( exported.Localhost, localhosttypes.NewClientState("chaindID", clientHeight), @@ -170,7 +170,7 @@ func TestValidateGenesis(t *testing.T) { genState: types.NewGenesisState( []types.IdentifiedClientState{ types.NewIdentifiedClientState( - clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), types.NewIdentifiedClientState( exported.Localhost, localhosttypes.NewClientState("chaindID", clientHeight), diff --git a/x/ibc/core/02-client/types/msgs.go b/x/ibc/core/02-client/types/msgs.go index deb16e020aff..07738bfc2703 100644 --- a/x/ibc/core/02-client/types/msgs.go +++ b/x/ibc/core/02-client/types/msgs.go @@ -178,17 +178,23 @@ func (msg MsgUpdateClient) UnpackInterfaces(unpacker codectypes.AnyUnpacker) err // NewMsgUpgradeClient creates a new MsgUpgradeClient instance // nolint: interfacer -func NewMsgUpgradeClient(clientID string, clientState exported.ClientState, proofUpgrade []byte, signer sdk.AccAddress) (*MsgUpgradeClient, error) { +func NewMsgUpgradeClient(clientID string, clientState exported.ClientState, upgradeHeight exported.Height, proofUpgrade []byte, signer sdk.AccAddress) (*MsgUpgradeClient, error) { anyClient, err := PackClientState(clientState) if err != nil { return nil, err } + height, ok := upgradeHeight.(Height) + if !ok { + return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidHeight, "invalid height type. expected: %T, got: %T", &Height{}, upgradeHeight) + } + return &MsgUpgradeClient{ - ClientId: clientID, - ClientState: anyClient, - ProofUpgrade: proofUpgrade, - Signer: signer.String(), + ClientId: clientID, + ClientState: anyClient, + ProofUpgrade: proofUpgrade, + UpgradeHeight: &height, + Signer: signer.String(), }, nil } @@ -214,6 +220,12 @@ func (msg MsgUpgradeClient) ValidateBasic() error { if len(msg.ProofUpgrade) == 0 { return sdkerrors.Wrap(ErrInvalidUpgradeClient, "proof of upgrade cannot be empty") } + if msg.UpgradeHeight == nil { + return sdkerrors.Wrap(ErrInvalidUpgradeClient, "upgrade height cannot be nil") + } + if msg.UpgradeHeight.IsZero() { + return sdkerrors.Wrap(ErrInvalidUpgradeClient, "upgrade height cannot be zero") + } _, err = sdk.AccAddressFromBech32(msg.Signer) if err != nil { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err) diff --git a/x/ibc/core/02-client/types/msgs_test.go b/x/ibc/core/02-client/types/msgs_test.go index 6f6818dce1aa..f5a0fdd78395 100644 --- a/x/ibc/core/02-client/types/msgs_test.go +++ b/x/ibc/core/02-client/types/msgs_test.go @@ -56,7 +56,7 @@ func (suite *TypesTestSuite) TestMarshalMsgCreateClient() { }, { "tendermint client", func() { - tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) msg, err = types.NewMsgCreateClient("tendermint", tendermintClient, suite.chainA.CreateTMClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) }, @@ -108,7 +108,7 @@ func (suite *TypesTestSuite) TestMsgCreateClient_ValidateBasic() { { "valid - tendermint client", func() { - tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) msg, err = types.NewMsgCreateClient("tendermint", tendermintClient, suite.chainA.CreateTMClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) }, @@ -132,7 +132,7 @@ func (suite *TypesTestSuite) TestMsgCreateClient_ValidateBasic() { { "failed to unpack consensus state", func() { - tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) + tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) msg, err = types.NewMsgCreateClient("tendermint", tendermintClient, suite.chainA.CreateTMClientHeader().ConsensusState(), suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) msg.ConsensusState = nil @@ -339,6 +339,8 @@ func (suite *TypesTestSuite) TestMarshalMsgUpgradeClient() { err error ) + newClientHeight := types.NewHeight(1, 1) + testCases := []struct { name string malleate func() @@ -346,8 +348,8 @@ func (suite *TypesTestSuite) TestMarshalMsgUpgradeClient() { { "client upgrades to new tendermint client", func() { - tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) - msg, err = types.NewMsgUpgradeClient("clientid", tendermintClient, []byte("proofUpgrade"), suite.chainA.SenderAccount.GetAddress()) + tendermintClient := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + msg, err = types.NewMsgUpgradeClient("clientid", tendermintClient, newClientHeight, []byte("proofUpgrade"), suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) }, }, @@ -355,7 +357,7 @@ func (suite *TypesTestSuite) TestMarshalMsgUpgradeClient() { "client upgrades to new solomachine client", func() { soloMachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "solomachine", "", 1) - msg, err = types.NewMsgUpgradeClient("clientid", soloMachine.ClientState(), []byte("proofUpgrade"), suite.chainA.SenderAccount.GetAddress()) + msg, err = types.NewMsgUpgradeClient("clientid", soloMachine.ClientState(), newClientHeight, []byte("proofUpgrade"), suite.chainA.SenderAccount.GetAddress()) suite.Require().NoError(err) }, }, @@ -410,6 +412,20 @@ func (suite *TypesTestSuite) TestMsgUpgradeClient_ValidateBasic() { }, expPass: false, }, + { + name: "upgrade height is nil", + malleate: func(msg *types.MsgUpgradeClient) { + msg.UpgradeHeight = nil + }, + expPass: false, + }, + { + name: "upgrade height is zero", + malleate: func(msg *types.MsgUpgradeClient) { + msg.UpgradeHeight = &types.Height{} + }, + expPass: false, + }, { name: "unpacking clientstate fails", malleate: func(msg *types.MsgUpgradeClient) { @@ -446,8 +462,9 @@ func (suite *TypesTestSuite) TestMsgUpgradeClient_ValidateBasic() { for _, tc := range cases { tc := tc - clientState := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false) - msg, _ := types.NewMsgUpgradeClient("testclientid", clientState, []byte("proofUpgrade"), suite.chainA.SenderAccount.GetAddress()) + clientState := ibctmtypes.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + newClientHeight := types.NewHeight(1, 1) + msg, _ := types.NewMsgUpgradeClient("testclientid", clientState, newClientHeight, []byte("proofUpgrade"), suite.chainA.SenderAccount.GetAddress()) tc.malleate(msg) err := msg.ValidateBasic() diff --git a/x/ibc/core/03-connection/types/msgs_test.go b/x/ibc/core/03-connection/types/msgs_test.go index 922def08518b..ed3dd19a6689 100644 --- a/x/ibc/core/03-connection/types/msgs_test.go +++ b/x/ibc/core/03-connection/types/msgs_test.go @@ -101,7 +101,7 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenTry() { signer, _ := sdk.AccAddressFromBech32("cosmos1ckgw5d7jfj7wwxjzs9fdrdev9vc8dzcw3n2lht") clientState := ibctmtypes.NewClientState( - chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false, + chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false, ) // Pack consensus state into any to test unpacking error @@ -113,7 +113,7 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenTry() { // invalidClientState fails validateBasic invalidClient := ibctmtypes.NewClientState( - chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false, + chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false, ) provedID := "" @@ -155,7 +155,7 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenTry() { func (suite *MsgTestSuite) TestNewMsgConnectionOpenAck() { signer, _ := sdk.AccAddressFromBech32("cosmos1ckgw5d7jfj7wwxjzs9fdrdev9vc8dzcw3n2lht") clientState := ibctmtypes.NewClientState( - chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false, + chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false, ) // Pack consensus state into any to test unpacking error @@ -166,7 +166,7 @@ func (suite *MsgTestSuite) TestNewMsgConnectionOpenAck() { // invalidClientState fails validateBasic invalidClient := ibctmtypes.NewClientState( - chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false, + chainID, ibctmtypes.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false, ) connectionID := "ibcconntest" diff --git a/x/ibc/core/exported/client.go b/x/ibc/core/exported/client.go index 4d2af0e4ee66..d8d964b5c2c1 100644 --- a/x/ibc/core/exported/client.go +++ b/x/ibc/core/exported/client.go @@ -38,6 +38,7 @@ type ClientState interface { cdc codec.BinaryMarshaler, store sdk.KVStore, newClient ClientState, + upgradeHeight Height, proofUpgrade []byte, ) error // Utility function that zeroes out any client customizable fields in client state diff --git a/x/ibc/core/genesis_test.go b/x/ibc/core/genesis_test.go index b15a4f03c169..107bc4f10ce7 100644 --- a/x/ibc/core/genesis_test.go +++ b/x/ibc/core/genesis_test.go @@ -37,7 +37,7 @@ func (suite *IBCTestSuite) TestValidateGenesis() { ClientGenesis: clienttypes.NewGenesisState( []clienttypes.IdentifiedClientState{ clienttypes.NewIdentifiedClientState( - clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), clienttypes.NewIdentifiedClientState( exported.Localhost, localhosttypes.NewClientState("chaindID", clientHeight), @@ -100,7 +100,7 @@ func (suite *IBCTestSuite) TestValidateGenesis() { ClientGenesis: clienttypes.NewGenesisState( []clienttypes.IdentifiedClientState{ clienttypes.NewIdentifiedClientState( - clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), clienttypes.NewIdentifiedClientState( exported.Localhost, localhosttypes.NewClientState("(chaindID)", clienttypes.ZeroHeight()), @@ -169,7 +169,7 @@ func (suite *IBCTestSuite) TestInitGenesis() { ClientGenesis: clienttypes.NewGenesisState( []clienttypes.IdentifiedClientState{ clienttypes.NewIdentifiedClientState( - clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), &ibctesting.UpgradePath, false, false), + clientID, ibctmtypes.NewClientState(chainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false), ), clienttypes.NewIdentifiedClientState( exported.Localhost, localhosttypes.NewClientState("chaindID", clientHeight), diff --git a/x/ibc/light-clients/06-solomachine/types/client_state.go b/x/ibc/light-clients/06-solomachine/types/client_state.go index f2142a3871db..47a760170206 100644 --- a/x/ibc/light-clients/06-solomachine/types/client_state.go +++ b/x/ibc/light-clients/06-solomachine/types/client_state.go @@ -79,7 +79,7 @@ func (cs ClientState) ZeroCustomFields() exported.ClientState { // VerifyUpgrade returns an error since solomachine client does not support upgrades func (cs ClientState) VerifyUpgrade( _ sdk.Context, _ codec.BinaryMarshaler, _ sdk.KVStore, - _ exported.ClientState, _ []byte, + _ exported.ClientState, _ exported.Height, _ []byte, ) error { return sdkerrors.Wrap(clienttypes.ErrInvalidUpgradeClient, "cannot upgrade solomachine client") } diff --git a/x/ibc/light-clients/07-tendermint/client/cli/tx.go b/x/ibc/light-clients/07-tendermint/client/cli/tx.go index 41d3d9d6c9e2..ae4db90e1de6 100644 --- a/x/ibc/light-clients/07-tendermint/client/cli/tx.go +++ b/x/ibc/light-clients/07-tendermint/client/cli/tx.go @@ -120,12 +120,6 @@ func NewCreateClientCmd() *cobra.Command { allowUpdateAfterMisbehaviour, _ := cmd.Flags().GetBool(flagAllowUpdateAfterMisbehaviour) upgradePath, _ := cmd.Flags().GetString(flagUpgradePath) - keyPath := strings.Split(upgradePath, "/") - if keyPath[0] == upgradePath { - return fmt.Errorf("invalid merkle path %s", upgradePath) - } - - merklePath := commitmenttypes.NewMerklePath(keyPath) // validate header if err := header.ValidateBasic(); err != nil { @@ -136,7 +130,7 @@ func NewCreateClientCmd() *cobra.Command { clientState := types.NewClientState( header.GetHeader().GetChainID(), trustLevel, trustingPeriod, ubdPeriod, maxClockDrift, - height, specs, &merklePath, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, + height, specs, upgradePath, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, ) consensusState := header.ConsensusState() diff --git a/x/ibc/light-clients/07-tendermint/types/client_state.go b/x/ibc/light-clients/07-tendermint/types/client_state.go index 08acc4fca97b..427465b88e8c 100644 --- a/x/ibc/light-clients/07-tendermint/types/client_state.go +++ b/x/ibc/light-clients/07-tendermint/types/client_state.go @@ -28,7 +28,7 @@ func NewClientState( chainID string, trustLevel Fraction, trustingPeriod, ubdPeriod, maxClockDrift time.Duration, latestHeight clienttypes.Height, specs []*ics23.ProofSpec, - upgradePath *commitmenttypes.MerklePath, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, + upgradePath string, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, ) *ClientState { return &ClientState{ ChainId: chainID, @@ -112,6 +112,14 @@ func (cs ClientState) Validate() error { return sdkerrors.Wrap(ErrInvalidProofSpecs, "proof spec cannot be nil") } } + if cs.UpgradePath != "" { + keys := strings.Split(cs.UpgradePath, "/") + for _, k := range keys { + if strings.TrimSpace(k) == "" { + return sdkerrors.Wrapf(clienttypes.ErrInvalidUpgradeClient, "upgrade path contains an empty string when splitting by '/': %s", cs.UpgradePath) + } + } + } return nil } diff --git a/x/ibc/light-clients/07-tendermint/types/client_state_test.go b/x/ibc/light-clients/07-tendermint/types/client_state_test.go index 5c71ec4210fb..5fa8c0703ad6 100644 --- a/x/ibc/light-clients/07-tendermint/types/client_state_test.go +++ b/x/ibc/light-clients/07-tendermint/types/client_state_test.go @@ -32,57 +32,57 @@ func (suite *TendermintTestSuite) TestValidate() { }{ { name: "valid client", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: true, }, { name: "valid client with nil upgrade path", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), nil, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), "", false, false), expPass: true, }, { name: "invalid chainID", - clientState: types.NewClientState(" ", types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(" ", types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: false, }, { name: "invalid trust level", - clientState: types.NewClientState(chainID, types.Fraction{Numerator: 0, Denominator: 1}, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.Fraction{Numerator: 0, Denominator: 1}, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: false, }, { name: "invalid trusting period", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, 0, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, 0, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: false, }, { name: "invalid unbonding period", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, 0, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, 0, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: false, }, { name: "invalid max clock drift", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, 0, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, 0, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: false, }, { name: "invalid height", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: false, }, { name: "trusting period not less than unbonding period", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), expPass: false, }, { name: "proof specs is nil", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, nil, &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, nil, upgradePath, false, false), expPass: false, }, { name: "proof specs contains nil", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, []*ics23.ProofSpec{ics23.TendermintSpec, nil}, &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, []*ics23.ProofSpec{ics23.TendermintSpec, nil}, upgradePath, false, false), expPass: false, }, } @@ -118,7 +118,7 @@ func (suite *TendermintTestSuite) TestVerifyClientConsensusState() { // }, { name: "ApplyPrefix failed", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), consensusState: types.ConsensusState{ Root: commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), }, @@ -127,7 +127,7 @@ func (suite *TendermintTestSuite) TestVerifyClientConsensusState() { }, { name: "latest client height < height", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), consensusState: types.ConsensusState{ Root: commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), }, @@ -145,7 +145,7 @@ func (suite *TendermintTestSuite) TestVerifyClientConsensusState() { }, { name: "proof verification failed", - clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + clientState: types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), consensusState: types.ConsensusState{ Root: commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), NextValidatorsHash: suite.valsHash, diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go index 54fecf4ab977..923fe242f85b 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go @@ -53,7 +53,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }{ { "valid misbehavior misbehaviour", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -69,7 +69,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "valid misbehavior at height greater than last consensusState", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -85,7 +85,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "valid misbehaviour with different trusted heights", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), @@ -101,7 +101,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "valid misbehaviour at a previous version", - types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), @@ -117,7 +117,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "valid misbehaviour at a future version", - types.NewClientState(chainIDEpoch0, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainIDEpoch0, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), @@ -133,7 +133,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "valid misbehaviour with trusted heights at a previous version", - types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), @@ -149,7 +149,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "consensus state's valset hash different from misbehaviour should still pass", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), @@ -165,7 +165,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "invalid misbehavior misbehaviour from different chain", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -181,7 +181,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "invalid misbehavior misbehaviour with trusted height different from trusted consensus state", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), @@ -197,7 +197,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "invalid misbehavior misbehaviour with trusted validators different from trusted consensus state", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), suite.valsHash), @@ -229,7 +229,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "trusted consensus state does not exist", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), nil, // consensus state for trusted height - 1 does not exist in store clienttypes.Height{}, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -245,7 +245,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "invalid tendermint misbehaviour", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -256,7 +256,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "rejected misbehaviour due to expired age duration", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -272,7 +272,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "rejected misbehaviour due to expired block duration", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(0, uint64(versionHeight+simapp.DefaultConsensusParams.Evidence.MaxAgeNumBlocks+1)), commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(0, uint64(versionHeight+simapp.DefaultConsensusParams.Evidence.MaxAgeNumBlocks+1)), commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -288,7 +288,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "provided height > header height", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -304,7 +304,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "unbonding period expired", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(time.Time{}, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), heightMinus1, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -320,7 +320,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "trusted validators is incorrect for given consensus state", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -336,7 +336,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "first valset has too much change", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -352,7 +352,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "second valset has too much change", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), @@ -368,7 +368,7 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { }, { "both valsets have too much change", - types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false), + types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false), types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), height, types.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot(tmhash.Sum([]byte("app_hash"))), bothValsHash), diff --git a/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go b/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go index d80ade43ee77..c8515dd9158b 100644 --- a/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go +++ b/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go @@ -52,7 +52,7 @@ type ClientState struct { // Proof specifications used in verifying counterparty state ProofSpecs []*_go.ProofSpec `protobuf:"bytes,8,rep,name=proof_specs,json=proofSpecs,proto3" json:"proof_specs,omitempty" yaml:"proof_specs"` // Path at which next upgraded client will be committed - UpgradePath *types1.MerklePath `protobuf:"bytes,9,opt,name=upgrade_path,json=upgradePath,proto3" json:"upgrade_path,omitempty" yaml:"upgrade_path"` + UpgradePath string `protobuf:"bytes,9,opt,name=upgrade_path,json=upgradePath,proto3" json:"upgrade_path,omitempty" yaml:"upgrade_path"` // This flag, when set to true, will allow governance to recover a client // which has expired AllowUpdateAfterExpiry bool `protobuf:"varint,10,opt,name=allow_update_after_expiry,json=allowUpdateAfterExpiry,proto3" json:"allow_update_after_expiry,omitempty" yaml:"allow_update_after_expiry"` @@ -317,76 +317,76 @@ func init() { } var fileDescriptor_c6d6cf2b288949be = []byte{ - // 1101 bytes of a gzipped FileDescriptorProto + // 1096 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0x6e, 0xda, 0xd2, 0xa6, 0x93, 0x74, 0x5b, 0xdc, 0xd2, 0x4d, 0x4b, 0x37, 0x8e, 0x0c, 0x5a, - 0x2a, 0xa4, 0xda, 0x24, 0x8b, 0x84, 0x54, 0x71, 0xc1, 0x2d, 0xa8, 0x45, 0xac, 0x54, 0xb9, 0xfc, - 0x90, 0x90, 0x58, 0x33, 0xb1, 0x27, 0xc9, 0xa8, 0xb6, 0xc7, 0x78, 0x26, 0x21, 0xe5, 0x2f, 0x00, - 0x89, 0xc3, 0x1e, 0x57, 0x9c, 0x38, 0xf0, 0x8f, 0x70, 0xdb, 0x63, 0x8f, 0x9c, 0x0c, 0x6a, 0xff, - 0x83, 0x1c, 0x39, 0xa1, 0xf9, 0xe1, 0x78, 0x9a, 0xed, 0x52, 0xed, 0x5e, 0xda, 0x79, 0xef, 0x7d, - 0xef, 0xfb, 0xec, 0x99, 0x97, 0x6f, 0x0c, 0x1c, 0xdc, 0x0d, 0x9c, 0x08, 0xf7, 0x07, 0x2c, 0x88, - 0x30, 0x4a, 0x18, 0x75, 0x18, 0x4a, 0x42, 0x94, 0xc5, 0x38, 0x61, 0xce, 0xa8, 0xad, 0x45, 0x76, - 0x9a, 0x11, 0x46, 0x8c, 0x26, 0xee, 0x06, 0xb6, 0xde, 0x60, 0x6b, 0x90, 0x51, 0x7b, 0xa7, 0xa5, - 0xf5, 0xb3, 0x8b, 0x14, 0x51, 0x67, 0x04, 0x23, 0x1c, 0x42, 0x46, 0x32, 0xc9, 0xb0, 0xb3, 0xfb, - 0x02, 0x42, 0xfc, 0x55, 0xd5, 0x8d, 0x80, 0x24, 0x3d, 0x4c, 0x9c, 0x34, 0x23, 0xa4, 0x57, 0x24, - 0x9b, 0x7d, 0x42, 0xfa, 0x11, 0x72, 0x44, 0xd4, 0x1d, 0xf6, 0x9c, 0x70, 0x98, 0x41, 0x86, 0x49, - 0xa2, 0xea, 0xe6, 0x6c, 0x9d, 0xe1, 0x18, 0x51, 0x06, 0xe3, 0xb4, 0x00, 0xf0, 0xd7, 0x0c, 0x48, - 0x86, 0x1c, 0xf9, 0xd4, 0xfc, 0xd5, 0xe4, 0x4a, 0x01, 0xde, 0x2b, 0x01, 0x24, 0x8e, 0x31, 0x8b, - 0x0b, 0xd0, 0x34, 0x52, 0xc0, 0xcd, 0x3e, 0xe9, 0x13, 0xb1, 0x74, 0xf8, 0x4a, 0x66, 0xad, 0x5f, - 0xab, 0xa0, 0x76, 0x28, 0xf8, 0xce, 0x18, 0x64, 0xc8, 0xd8, 0x06, 0xd5, 0x60, 0x00, 0x71, 0xe2, - 0xe3, 0xb0, 0x51, 0x69, 0x55, 0xf6, 0x56, 0xbc, 0x65, 0x11, 0x9f, 0x84, 0x06, 0x02, 0x35, 0x96, - 0x0d, 0x29, 0xf3, 0x23, 0x34, 0x42, 0x51, 0x63, 0xbe, 0x55, 0xd9, 0xab, 0x75, 0xf6, 0xec, 0xff, - 0xdf, 0x56, 0xfb, 0xb3, 0x0c, 0x06, 0xfc, 0x85, 0xdd, 0x9d, 0xe7, 0xb9, 0x39, 0x37, 0xc9, 0x4d, - 0xe3, 0x02, 0xc6, 0xd1, 0x81, 0xa5, 0x51, 0x59, 0x1e, 0x10, 0xd1, 0x17, 0x3c, 0x30, 0x7a, 0x60, - 0x4d, 0x44, 0x38, 0xe9, 0xfb, 0x29, 0xca, 0x30, 0x09, 0x1b, 0x0b, 0x42, 0x6a, 0xdb, 0x96, 0x9b, - 0x65, 0x17, 0x9b, 0x65, 0x1f, 0xa9, 0xcd, 0x74, 0x2d, 0xc5, 0xbd, 0xa5, 0x71, 0x97, 0xfd, 0xd6, - 0xb3, 0xbf, 0xcd, 0x8a, 0x77, 0xaf, 0xc8, 0x9e, 0x8a, 0xa4, 0x81, 0xc1, 0xfa, 0x30, 0xe9, 0x92, - 0x24, 0xd4, 0x84, 0x16, 0xef, 0x12, 0x7a, 0x47, 0x09, 0xdd, 0x97, 0x42, 0xb3, 0x04, 0x52, 0x69, - 0x6d, 0x9a, 0x56, 0x52, 0x08, 0xac, 0xc5, 0x70, 0xec, 0x07, 0x11, 0x09, 0xce, 0xfd, 0x30, 0xc3, - 0x3d, 0xd6, 0x78, 0xe3, 0x15, 0x5f, 0x69, 0xa6, 0x5f, 0x0a, 0xad, 0xc6, 0x70, 0x7c, 0xc8, 0x93, - 0x47, 0x3c, 0x67, 0x7c, 0x07, 0x56, 0x7b, 0x19, 0xf9, 0x09, 0x25, 0xfe, 0x00, 0xf1, 0x03, 0x69, - 0x2c, 0x09, 0x91, 0x1d, 0x71, 0x44, 0x7c, 0x44, 0x6c, 0x35, 0x39, 0xa3, 0xb6, 0x7d, 0x2c, 0x10, - 0xee, 0xae, 0x52, 0xd9, 0x94, 0x2a, 0x37, 0xda, 0x2d, 0xaf, 0x2e, 0x63, 0x89, 0xe5, 0xf4, 0x11, - 0x64, 0x88, 0xb2, 0x82, 0x7e, 0xf9, 0x55, 0xe9, 0x6f, 0xb4, 0x5b, 0x5e, 0x5d, 0xc6, 0x8a, 0xfe, - 0x04, 0xd4, 0xc4, 0x4f, 0xc7, 0xa7, 0x29, 0x0a, 0x68, 0xa3, 0xda, 0x5a, 0xd8, 0xab, 0x75, 0xd6, - 0x6d, 0x1c, 0xd0, 0xce, 0x23, 0xfb, 0x94, 0x57, 0xce, 0x52, 0x14, 0xb8, 0x5b, 0xe5, 0x08, 0x69, - 0x70, 0xcb, 0x03, 0x69, 0x01, 0xa1, 0xc6, 0x13, 0x50, 0x1f, 0xa6, 0xfd, 0x0c, 0x86, 0xc8, 0x4f, - 0x21, 0x1b, 0x34, 0x56, 0xc4, 0x83, 0x5a, 0xda, 0x83, 0x96, 0x3f, 0x8e, 0x51, 0xdb, 0x7e, 0x8c, - 0xb2, 0xf3, 0x08, 0x9d, 0x42, 0x36, 0x70, 0xef, 0x4f, 0x72, 0x73, 0x43, 0x9d, 0xad, 0xc6, 0x60, - 0x79, 0x35, 0x15, 0x72, 0x94, 0xe1, 0x83, 0x6d, 0x18, 0x45, 0xe4, 0x47, 0x7f, 0x98, 0x86, 0x90, - 0x21, 0x1f, 0xf6, 0x18, 0xca, 0x7c, 0x34, 0x4e, 0x71, 0x76, 0xd1, 0x00, 0xad, 0xca, 0x5e, 0xd5, - 0x7d, 0x77, 0x92, 0x9b, 0x2d, 0x49, 0xf4, 0x52, 0xa8, 0xe5, 0x6d, 0x89, 0xda, 0x57, 0xa2, 0xf4, - 0x09, 0xaf, 0x7c, 0x2a, 0x0a, 0xc6, 0x0f, 0xc0, 0xbc, 0xa5, 0x2b, 0xc6, 0xb4, 0x8b, 0x06, 0x70, - 0x84, 0xc9, 0x30, 0x6b, 0xd4, 0x84, 0xcc, 0xfb, 0x93, 0xdc, 0x7c, 0xf8, 0x52, 0x19, 0xbd, 0xc1, - 0xf2, 0x76, 0x67, 0xc5, 0x1e, 0x6b, 0xe5, 0x83, 0xc5, 0x9f, 0x7f, 0x37, 0xe7, 0xac, 0x3f, 0xe6, - 0xc1, 0xbd, 0x43, 0x92, 0x50, 0x94, 0xd0, 0x21, 0x95, 0x8e, 0xe0, 0x82, 0x95, 0xa9, 0x29, 0x09, - 0x4b, 0xe0, 0x47, 0x3e, 0x3b, 0xb6, 0x5f, 0x16, 0x08, 0xb7, 0xca, 0x8f, 0xfc, 0x29, 0x9f, 0xce, - 0xb2, 0xcd, 0xf8, 0x18, 0x2c, 0x66, 0x84, 0x30, 0xe5, 0x19, 0x77, 0x1c, 0x84, 0x47, 0x08, 0x73, - 0x17, 0x39, 0x8d, 0x27, 0xba, 0x8c, 0x5f, 0x2a, 0x60, 0x33, 0x41, 0x63, 0xe6, 0x4f, 0x0d, 0x99, - 0xfa, 0x03, 0x48, 0x07, 0xc2, 0x17, 0xea, 0xee, 0x37, 0x93, 0xdc, 0x7c, 0x5b, 0xee, 0xc1, 0x6d, - 0x28, 0xeb, 0xdf, 0xdc, 0xfc, 0xb0, 0x8f, 0xd9, 0x60, 0xd8, 0xe5, 0x72, 0xfa, 0x35, 0xa1, 0x2d, - 0x23, 0xdc, 0xa5, 0x4e, 0xf7, 0x82, 0x21, 0x6a, 0x1f, 0xa3, 0xb1, 0xcb, 0x17, 0x9e, 0xc1, 0xe9, - 0xbe, 0x9e, 0xb2, 0x1d, 0x43, 0x3a, 0x50, 0xdb, 0xf4, 0xe7, 0x3c, 0xa8, 0xeb, 0xbb, 0x67, 0xb4, - 0xc1, 0x8a, 0x1c, 0xfe, 0xa9, 0x6f, 0xba, 0x9b, 0x93, 0xdc, 0x5c, 0x97, 0x8f, 0x35, 0x2d, 0x59, - 0x5e, 0x55, 0xae, 0x4f, 0x42, 0xc3, 0xd6, 0x9c, 0x76, 0x5e, 0x74, 0x6c, 0x4c, 0x72, 0x73, 0x4d, - 0x75, 0xa8, 0x8a, 0x55, 0xda, 0x2f, 0x04, 0xd5, 0x01, 0x82, 0x21, 0xca, 0xfc, 0xb6, 0x32, 0xc4, - 0x87, 0x77, 0x79, 0xef, 0xb1, 0xc0, 0xbb, 0xcd, 0xab, 0xdc, 0x5c, 0x96, 0xeb, 0x76, 0x29, 0x51, - 0x90, 0x59, 0xde, 0xb2, 0x5c, 0xb6, 0x35, 0x89, 0x8e, 0xb2, 0xc2, 0xd7, 0x90, 0xe8, 0xbc, 0x20, - 0xd1, 0x99, 0x4a, 0x74, 0x0e, 0xaa, 0x7c, 0xff, 0x9e, 0xf1, 0x3d, 0xfc, 0x6d, 0x01, 0x2c, 0xc9, - 0x0e, 0x03, 0x82, 0x55, 0x8a, 0xfb, 0x09, 0x0a, 0x7d, 0x09, 0x53, 0x63, 0xd6, 0xd4, 0xb5, 0xe4, - 0x55, 0x7b, 0x26, 0x60, 0x4a, 0x74, 0xf7, 0x32, 0x37, 0x2b, 0xa5, 0xbb, 0xdc, 0xa0, 0xb0, 0xbc, - 0x3a, 0xd5, 0xb0, 0xdc, 0xbc, 0xa6, 0x73, 0xe1, 0x53, 0x54, 0x8c, 0xe2, 0x2d, 0x12, 0xd3, 0x03, - 0x3f, 0x43, 0xcc, 0x6d, 0x94, 0xf4, 0x37, 0xda, 0x2d, 0xaf, 0x3e, 0xd2, 0x70, 0xc6, 0xf7, 0x40, - 0x5e, 0x2f, 0x42, 0x5f, 0x98, 0xe3, 0xc2, 0x9d, 0xe6, 0xf8, 0x40, 0x99, 0xe3, 0x5b, 0xda, 0xa5, - 0x35, 0xed, 0xb7, 0xbc, 0x55, 0x95, 0x50, 0xf6, 0x18, 0x01, 0xa3, 0x40, 0x94, 0x03, 0xae, 0x4e, - 0xe9, 0xae, 0xb7, 0x78, 0x30, 0xc9, 0xcd, 0xed, 0x9b, 0x2a, 0x25, 0x87, 0xe5, 0xbd, 0xa9, 0x92, - 0xe5, 0xa8, 0x5b, 0x9f, 0x83, 0x6a, 0x71, 0x71, 0x1b, 0xbb, 0x60, 0x25, 0x19, 0xc6, 0x28, 0xe3, - 0x15, 0x71, 0x32, 0x0b, 0x5e, 0x99, 0x30, 0x5a, 0xa0, 0x16, 0xa2, 0x84, 0xc4, 0x38, 0x11, 0xf5, - 0x79, 0x51, 0xd7, 0x53, 0xee, 0x93, 0xe7, 0x57, 0xcd, 0xca, 0xe5, 0x55, 0xb3, 0xf2, 0xcf, 0x55, - 0xb3, 0xf2, 0xf4, 0xba, 0x39, 0x77, 0x79, 0xdd, 0x9c, 0xfb, 0xeb, 0xba, 0x39, 0xf7, 0xed, 0x91, - 0xf6, 0xb3, 0x0c, 0x08, 0x8d, 0x09, 0x55, 0xff, 0xf6, 0x69, 0x78, 0xee, 0x8c, 0xcb, 0x4f, 0xbc, - 0xfd, 0xe2, 0x1b, 0xef, 0x83, 0x8f, 0xf6, 0x67, 0x3f, 0xc2, 0xba, 0x4b, 0xc2, 0x85, 0x1e, 0xfd, - 0x17, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x30, 0xa4, 0x19, 0x12, 0x0a, 0x00, 0x00, + 0x14, 0x6e, 0xda, 0xb2, 0x4d, 0x27, 0xe9, 0x76, 0xf1, 0x96, 0x6e, 0x5a, 0xba, 0x71, 0x64, 0xd0, + 0x52, 0x21, 0xd5, 0x26, 0x59, 0x24, 0xa4, 0x8a, 0x0b, 0x6e, 0x41, 0x2d, 0x62, 0xa5, 0xca, 0xe5, + 0x87, 0x84, 0x04, 0x66, 0x62, 0x4f, 0x92, 0x51, 0x6d, 0x8f, 0xf1, 0x4c, 0x42, 0xca, 0x5f, 0x00, + 0xb7, 0x3d, 0xae, 0x38, 0x71, 0xe0, 0x1f, 0xe1, 0xb6, 0xc7, 0x1e, 0x39, 0x19, 0xd4, 0x5e, 0x38, + 0xe7, 0xc8, 0x09, 0xcd, 0x0f, 0xdb, 0xd3, 0x6c, 0x97, 0x6a, 0xb9, 0xb4, 0xf3, 0xde, 0xfb, 0xde, + 0xf7, 0x65, 0xde, 0xbc, 0x79, 0x63, 0xe0, 0xe0, 0x7e, 0xe0, 0x44, 0x78, 0x38, 0x62, 0x41, 0x84, + 0x51, 0xc2, 0xa8, 0xc3, 0x50, 0x12, 0xa2, 0x2c, 0xc6, 0x09, 0x73, 0x26, 0x5d, 0xcd, 0xb2, 0xd3, + 0x8c, 0x30, 0x62, 0xb4, 0x71, 0x3f, 0xb0, 0xf5, 0x04, 0x5b, 0x83, 0x4c, 0xba, 0xdb, 0x1d, 0x2d, + 0x9f, 0x9d, 0xa7, 0x88, 0x3a, 0x13, 0x18, 0xe1, 0x10, 0x32, 0x92, 0x49, 0x86, 0xed, 0x9d, 0x17, + 0x10, 0xe2, 0xaf, 0x8a, 0xde, 0x0f, 0x48, 0x32, 0xc0, 0xc4, 0x49, 0x33, 0x42, 0x06, 0x85, 0xb3, + 0x3d, 0x24, 0x64, 0x18, 0x21, 0x47, 0x58, 0xfd, 0xf1, 0xc0, 0x09, 0xc7, 0x19, 0x64, 0x98, 0x24, + 0x2a, 0x6e, 0xce, 0xc7, 0x19, 0x8e, 0x11, 0x65, 0x30, 0x4e, 0x0b, 0x00, 0xdf, 0x66, 0x40, 0x32, + 0xe4, 0xc8, 0x5f, 0xcd, 0xb7, 0x26, 0x57, 0x0a, 0xf0, 0x4e, 0x05, 0x20, 0x71, 0x8c, 0x59, 0x5c, + 0x80, 0x4a, 0x4b, 0x01, 0x37, 0x86, 0x64, 0x48, 0xc4, 0xd2, 0xe1, 0x2b, 0xe9, 0xb5, 0xfe, 0x5e, + 0x01, 0x8d, 0x03, 0xc1, 0x77, 0xca, 0x20, 0x43, 0xc6, 0x16, 0xa8, 0x07, 0x23, 0x88, 0x13, 0x1f, + 0x87, 0xad, 0x5a, 0xa7, 0xb6, 0xbb, 0xea, 0xad, 0x08, 0xfb, 0x38, 0x34, 0x10, 0x68, 0xb0, 0x6c, + 0x4c, 0x99, 0x1f, 0xa1, 0x09, 0x8a, 0x5a, 0x8b, 0x9d, 0xda, 0x6e, 0xa3, 0xb7, 0x6b, 0xff, 0x77, + 0x59, 0xed, 0x4f, 0x32, 0x18, 0xf0, 0x0d, 0xbb, 0xdb, 0xcf, 0x73, 0x73, 0x61, 0x96, 0x9b, 0xc6, + 0x39, 0x8c, 0xa3, 0x7d, 0x4b, 0xa3, 0xb2, 0x3c, 0x20, 0xac, 0xcf, 0xb8, 0x61, 0x0c, 0xc0, 0xba, + 0xb0, 0x70, 0x32, 0xf4, 0x53, 0x94, 0x61, 0x12, 0xb6, 0x96, 0x84, 0xd4, 0x96, 0x2d, 0x8b, 0x65, + 0x17, 0xc5, 0xb2, 0x0f, 0x55, 0x31, 0x5d, 0x4b, 0x71, 0x6f, 0x6a, 0xdc, 0x55, 0xbe, 0xf5, 0xec, + 0x4f, 0xb3, 0xe6, 0xdd, 0x2d, 0xbc, 0x27, 0xc2, 0x69, 0x60, 0x70, 0x6f, 0x9c, 0xf4, 0x49, 0x12, + 0x6a, 0x42, 0xcb, 0xb7, 0x09, 0xbd, 0xa5, 0x84, 0x1e, 0x48, 0xa1, 0x79, 0x02, 0xa9, 0xb4, 0x5e, + 0xba, 0x95, 0x14, 0x02, 0xeb, 0x31, 0x9c, 0xfa, 0x41, 0x44, 0x82, 0x33, 0x3f, 0xcc, 0xf0, 0x80, + 0xb5, 0x5e, 0x7b, 0xc5, 0x2d, 0xcd, 0xe5, 0x4b, 0xa1, 0xb5, 0x18, 0x4e, 0x0f, 0xb8, 0xf3, 0x90, + 0xfb, 0x8c, 0x6f, 0xc0, 0xda, 0x20, 0x23, 0x3f, 0xa2, 0xc4, 0x1f, 0x21, 0x7e, 0x20, 0xad, 0x3b, + 0x42, 0x64, 0x5b, 0x1c, 0x11, 0x6f, 0x11, 0x5b, 0x75, 0xce, 0xa4, 0x6b, 0x1f, 0x09, 0x84, 0xbb, + 0xa3, 0x54, 0x36, 0xa4, 0xca, 0xb5, 0x74, 0xcb, 0x6b, 0x4a, 0x5b, 0x62, 0x39, 0x7d, 0x04, 0x19, + 0xa2, 0xac, 0xa0, 0x5f, 0x79, 0x55, 0xfa, 0x6b, 0xe9, 0x96, 0xd7, 0x94, 0xb6, 0xa2, 0x3f, 0x06, + 0x0d, 0x71, 0x75, 0x7c, 0x9a, 0xa2, 0x80, 0xb6, 0xea, 0x9d, 0xa5, 0xdd, 0x46, 0xef, 0x9e, 0x8d, + 0x03, 0xda, 0x7b, 0x6c, 0x9f, 0xf0, 0xc8, 0x69, 0x8a, 0x02, 0x77, 0xb3, 0x6a, 0x21, 0x0d, 0x6e, + 0x79, 0x20, 0x2d, 0x20, 0xd4, 0xd8, 0x07, 0xcd, 0x71, 0x3a, 0xcc, 0x60, 0x88, 0xfc, 0x14, 0xb2, + 0x51, 0x6b, 0x95, 0x37, 0xb2, 0xfb, 0x60, 0x96, 0x9b, 0xf7, 0xd5, 0xb9, 0x69, 0x51, 0xcb, 0x6b, + 0x28, 0xf3, 0x04, 0xb2, 0x91, 0xe1, 0x83, 0x2d, 0x18, 0x45, 0xe4, 0x07, 0x7f, 0x9c, 0x86, 0x90, + 0x21, 0x1f, 0x0e, 0x18, 0xca, 0x7c, 0x34, 0x4d, 0x71, 0x76, 0xde, 0x02, 0x9d, 0xda, 0x6e, 0xdd, + 0x7d, 0x7b, 0x96, 0x9b, 0x1d, 0x49, 0xf4, 0x52, 0xa8, 0xe5, 0x6d, 0x8a, 0xd8, 0x17, 0x22, 0xf4, + 0x11, 0x8f, 0x7c, 0x2c, 0x02, 0xc6, 0xf7, 0xc0, 0xbc, 0x21, 0x2b, 0xc6, 0xb4, 0x8f, 0x46, 0x70, + 0x82, 0xc9, 0x38, 0x6b, 0x35, 0x84, 0xcc, 0xbb, 0xb3, 0xdc, 0x7c, 0xf4, 0x52, 0x19, 0x3d, 0xc1, + 0xf2, 0x76, 0xe6, 0xc5, 0x9e, 0x68, 0xe1, 0xfd, 0xe5, 0x9f, 0x7e, 0x35, 0x17, 0xac, 0xdf, 0x16, + 0xc1, 0xdd, 0x03, 0x92, 0x50, 0x94, 0xd0, 0x31, 0x95, 0xb7, 0xdd, 0x05, 0xab, 0xe5, 0xc0, 0x11, + 0xd7, 0x9d, 0x1f, 0xe7, 0x7c, 0x4b, 0x7e, 0x5e, 0x20, 0xdc, 0x3a, 0x3f, 0xce, 0xa7, 0xbc, 0xf3, + 0xaa, 0x34, 0xe3, 0x43, 0xb0, 0x9c, 0x11, 0xc2, 0xd4, 0x3c, 0xb0, 0xb4, 0x6e, 0xa8, 0x26, 0xd0, + 0xa4, 0x6b, 0x3f, 0x41, 0xd9, 0x59, 0x84, 0x3c, 0x42, 0x98, 0xbb, 0xcc, 0x69, 0x3c, 0x91, 0x65, + 0xfc, 0x5c, 0x03, 0x1b, 0x09, 0x9a, 0x32, 0xbf, 0x1c, 0xb6, 0xd4, 0x1f, 0x41, 0x3a, 0x12, 0x77, + 0xbe, 0xe9, 0x7e, 0x35, 0xcb, 0xcd, 0x37, 0x65, 0x0d, 0x6e, 0x42, 0x59, 0xff, 0xe4, 0xe6, 0xfb, + 0x43, 0xcc, 0x46, 0xe3, 0x3e, 0x97, 0xd3, 0x9f, 0x00, 0x6d, 0x19, 0xe1, 0x3e, 0x75, 0xfa, 0xe7, + 0x0c, 0x51, 0xfb, 0x08, 0x4d, 0x5d, 0xbe, 0xf0, 0x0c, 0x4e, 0xf7, 0x65, 0xc9, 0x76, 0x04, 0xe9, + 0x48, 0x95, 0xe9, 0xf7, 0x45, 0xd0, 0xd4, 0xab, 0x67, 0x74, 0xc1, 0xaa, 0x6c, 0xec, 0x72, 0x26, + 0xba, 0x1b, 0xb3, 0xdc, 0xbc, 0x27, 0x7f, 0x56, 0x19, 0xb2, 0xbc, 0xba, 0x5c, 0x1f, 0x87, 0x86, + 0xad, 0x4d, 0xd1, 0x45, 0x91, 0x71, 0x7f, 0x96, 0x9b, 0xeb, 0x2a, 0x43, 0x45, 0xac, 0x6a, 0xb4, + 0x42, 0x50, 0x1f, 0x21, 0x18, 0xa2, 0xcc, 0xef, 0xaa, 0x61, 0xf7, 0xe8, 0xb6, 0xb9, 0x7a, 0x24, + 0xf0, 0x6e, 0xfb, 0x32, 0x37, 0x57, 0xe4, 0xba, 0x5b, 0x49, 0x14, 0x64, 0x96, 0xb7, 0x22, 0x97, + 0x5d, 0x4d, 0xa2, 0xa7, 0xc6, 0xdc, 0xff, 0x90, 0xe8, 0xbd, 0x20, 0xd1, 0x2b, 0x25, 0x7a, 0xfb, + 0x75, 0x5e, 0xbf, 0x67, 0xbc, 0x86, 0xbf, 0x2c, 0x81, 0x3b, 0x32, 0xc3, 0x80, 0x60, 0x8d, 0xe2, + 0x61, 0x82, 0x42, 0x5f, 0xc2, 0x54, 0x9b, 0xb5, 0x75, 0x2d, 0xf9, 0x8c, 0x9e, 0x0a, 0x98, 0x12, + 0xdd, 0xb9, 0xc8, 0xcd, 0x5a, 0x35, 0x39, 0xae, 0x51, 0x58, 0x5e, 0x93, 0x6a, 0x58, 0x3e, 0x98, + 0xca, 0xbe, 0xf0, 0x29, 0x2a, 0x5a, 0xf1, 0x06, 0x89, 0xf2, 0xc0, 0x4f, 0x11, 0x73, 0x5b, 0x15, + 0xfd, 0xb5, 0x74, 0xcb, 0x6b, 0x4e, 0x34, 0x9c, 0xf1, 0x1d, 0x90, 0x4f, 0x87, 0xd0, 0x17, 0x83, + 0x6f, 0xe9, 0xd6, 0xc1, 0xf7, 0x50, 0x0d, 0xbe, 0x37, 0xb4, 0x07, 0xa9, 0xcc, 0xb7, 0xbc, 0x35, + 0xe5, 0x50, 0xa3, 0x2f, 0x02, 0x46, 0x81, 0xa8, 0x1a, 0x5c, 0x9d, 0xd2, 0x6d, 0xbb, 0x78, 0x38, + 0xcb, 0xcd, 0xad, 0xeb, 0x2a, 0x15, 0x87, 0xe5, 0xbd, 0xae, 0x9c, 0x55, 0xab, 0x5b, 0x9f, 0x82, + 0x7a, 0xf1, 0x28, 0x1b, 0x3b, 0x60, 0x35, 0x19, 0xc7, 0x28, 0xe3, 0x11, 0x71, 0x32, 0x4b, 0x5e, + 0xe5, 0x30, 0x3a, 0xa0, 0x11, 0xa2, 0x84, 0xc4, 0x38, 0x11, 0xf1, 0x45, 0x11, 0xd7, 0x5d, 0xee, + 0xb7, 0xcf, 0x2f, 0xdb, 0xb5, 0x8b, 0xcb, 0x76, 0xed, 0xaf, 0xcb, 0x76, 0xed, 0xe9, 0x55, 0x7b, + 0xe1, 0xe2, 0xaa, 0xbd, 0xf0, 0xc7, 0x55, 0x7b, 0xe1, 0xeb, 0x43, 0xed, 0x5a, 0x06, 0x84, 0xc6, + 0x84, 0xaa, 0x7f, 0x7b, 0x34, 0x3c, 0x73, 0xa6, 0xd5, 0xe7, 0xdb, 0x5e, 0xf1, 0xfd, 0xf6, 0xde, + 0x07, 0x7b, 0xf3, 0x1f, 0x58, 0xfd, 0x3b, 0x62, 0x0a, 0x3d, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, + 0x6c, 0xfc, 0x74, 0x25, 0xee, 0x09, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { @@ -429,15 +429,10 @@ func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x50 } - if m.UpgradePath != nil { - { - size, err := m.UpgradePath.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTendermint(dAtA, i, uint64(size)) - } + if len(m.UpgradePath) > 0 { + i -= len(m.UpgradePath) + copy(dAtA[i:], m.UpgradePath) + i = encodeVarintTendermint(dAtA, i, uint64(len(m.UpgradePath))) i-- dAtA[i] = 0x4a } @@ -475,29 +470,29 @@ func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x32 - n4, err4 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxClockDrift, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxClockDrift):]) + n3, err3 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxClockDrift, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxClockDrift):]) + if err3 != nil { + return 0, err3 + } + i -= n3 + i = encodeVarintTendermint(dAtA, i, uint64(n3)) + i-- + dAtA[i] = 0x2a + n4, err4 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.UnbondingPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.UnbondingPeriod):]) if err4 != nil { return 0, err4 } i -= n4 i = encodeVarintTendermint(dAtA, i, uint64(n4)) i-- - dAtA[i] = 0x2a - n5, err5 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.UnbondingPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.UnbondingPeriod):]) + dAtA[i] = 0x22 + n5, err5 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.TrustingPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.TrustingPeriod):]) if err5 != nil { return 0, err5 } i -= n5 i = encodeVarintTendermint(dAtA, i, uint64(n5)) i-- - dAtA[i] = 0x22 - n6, err6 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.TrustingPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.TrustingPeriod):]) - if err6 != nil { - return 0, err6 - } - i -= n6 - i = encodeVarintTendermint(dAtA, i, uint64(n6)) - i-- dAtA[i] = 0x1a { size, err := m.TrustLevel.MarshalToSizedBuffer(dAtA[:i]) @@ -556,12 +551,12 @@ func (m *ConsensusState) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x12 - n9, err9 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err9 != nil { - return 0, err9 + n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err8 != nil { + return 0, err8 } - i -= n9 - i = encodeVarintTendermint(dAtA, i, uint64(n9)) + i -= n8 + i = encodeVarintTendermint(dAtA, i, uint64(n8)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -769,8 +764,8 @@ func (m *ClientState) Size() (n int) { n += 1 + l + sovTendermint(uint64(l)) } } - if m.UpgradePath != nil { - l = m.UpgradePath.Size() + l = len(m.UpgradePath) + if l > 0 { n += 1 + l + sovTendermint(uint64(l)) } if m.AllowUpdateAfterExpiry { @@ -1165,7 +1160,7 @@ func (m *ClientState) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field UpgradePath", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTendermint @@ -1175,27 +1170,23 @@ func (m *ClientState) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTendermint } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTendermint } if postIndex > l { return io.ErrUnexpectedEOF } - if m.UpgradePath == nil { - m.UpgradePath = &types1.MerklePath{} - } - if err := m.UpgradePath.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.UpgradePath = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 10: if wireType != 0 { diff --git a/x/ibc/light-clients/07-tendermint/types/tendermint_test.go b/x/ibc/light-clients/07-tendermint/types/tendermint_test.go index 466b62ff7fdc..a524216580fd 100644 --- a/x/ibc/light-clients/07-tendermint/types/tendermint_test.go +++ b/x/ibc/light-clients/07-tendermint/types/tendermint_test.go @@ -1,6 +1,7 @@ package types_test import ( + "fmt" "testing" "time" @@ -14,11 +15,9 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) const ( @@ -32,9 +31,9 @@ const ( ) var ( - height = clienttypes.NewHeight(0, 4) - upgradeHeight = clienttypes.NewHeight(1, 1) - upgradePath = commitmenttypes.NewMerklePath([]string{"upgrade", upgradetypes.KeyUpgradedClient}) + height = clienttypes.NewHeight(0, 4) + newClientHeight = clienttypes.NewHeight(1, 1) + upgradePath = fmt.Sprintf("%s/%s", "upgrade", "upgradedClient") ) type TendermintTestSuite struct { diff --git a/x/ibc/light-clients/07-tendermint/types/update_test.go b/x/ibc/light-clients/07-tendermint/types/update_test.go index cfb15b491b07..d3471a95102b 100644 --- a/x/ibc/light-clients/07-tendermint/types/update_test.go +++ b/x/ibc/light-clients/07-tendermint/types/update_test.go @@ -57,7 +57,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "successful update with next height and same validator set", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.headerTime, suite.valSet, suite.valSet, signers) currentTime = suite.now @@ -67,7 +67,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "successful update with future height and different validator set", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus5, height, suite.headerTime, bothValSet, suite.valSet, bothSigners) currentTime = suite.now @@ -77,7 +77,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "successful update with next height and different validator set", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), bothValSet.Hash()) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.headerTime, bothValSet, bothValSet, bothSigners) currentTime = suite.now @@ -87,7 +87,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "successful update for a previous height", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) consStateHeight = heightMinus3 newHeader = types.CreateTestHeader(chainID, heightMinus1, heightMinus3, suite.headerTime, bothValSet, suite.valSet, bothSigners) @@ -98,7 +98,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "successful update for a previous version", setup: func() { - clientState = types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainIDEpoch0, height, heightMinus3, suite.headerTime, bothValSet, suite.valSet, bothSigners) currentTime = suite.now @@ -108,7 +108,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update with incorrect header chain-id", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader("ethermint", heightPlus1, height, suite.headerTime, suite.valSet, suite.valSet, signers) currentTime = suite.now @@ -118,7 +118,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update to a future version", setup: func() { - clientState = types.NewClientState(chainIDEpoch0, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainIDEpoch0, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainIDEpoch1, clienttypes.NewHeight(1, 1), height, suite.headerTime, suite.valSet, suite.valSet, signers) currentTime = suite.now @@ -128,7 +128,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update: header height version and trusted height version mismatch", setup: func() { - clientState = types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainIDEpoch1, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainIDEpoch1, clienttypes.NewHeight(1, 3), height, suite.headerTime, suite.valSet, suite.valSet, signers) currentTime = suite.now @@ -138,7 +138,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update with next height: update header mismatches nextValSetHash", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.headerTime, bothValSet, suite.valSet, bothSigners) currentTime = suite.now @@ -148,7 +148,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update with next height: update header mismatches different nextValSetHash", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), bothValSet.Hash()) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.headerTime, suite.valSet, bothValSet, signers) currentTime = suite.now @@ -158,7 +158,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update with future height: too much change in validator set", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus5, height, suite.headerTime, altValSet, suite.valSet, altSigners) currentTime = suite.now @@ -168,7 +168,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful updates, passed in incorrect trusted validators for given consensus state", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus5, height, suite.headerTime, bothValSet, bothValSet, bothSigners) currentTime = suite.now @@ -178,7 +178,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update: trusting period has passed since last client timestamp", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.headerTime, suite.valSet, suite.valSet, signers) // make current time pass trusting period from last timestamp on clientstate @@ -189,7 +189,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update: header timestamp is past current timestamp", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.now.Add(time.Minute), suite.valSet, suite.valSet, signers) currentTime = suite.now @@ -199,7 +199,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "unsuccessful update: header timestamp is not past last client timestamp", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.clientTime, suite.valSet, suite.valSet, signers) currentTime = suite.now @@ -209,7 +209,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "header basic validation failed", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) newHeader = types.CreateTestHeader(chainID, heightPlus1, height, suite.headerTime, suite.valSet, suite.valSet, signers) // cause new header to fail validatebasic by changing commit height to mismatch header height @@ -221,7 +221,7 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { { name: "header height < consensus height", setup: func() { - clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, heightPlus5, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + clientState = types.NewClientState(chainID, types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, heightPlus5, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) consensusState = types.NewConsensusState(suite.clientTime, commitmenttypes.NewMerkleRoot(suite.header.Header.GetAppHash()), suite.valsHash) // Make new header at height less than latest client state newHeader = types.CreateTestHeader(chainID, heightMinus1, height, suite.headerTime, suite.valSet, suite.valSet, signers) diff --git a/x/ibc/light-clients/07-tendermint/types/upgrade.go b/x/ibc/light-clients/07-tendermint/types/upgrade.go index 42f6ea31f00f..537b3b1d9c67 100644 --- a/x/ibc/light-clients/07-tendermint/types/upgrade.go +++ b/x/ibc/light-clients/07-tendermint/types/upgrade.go @@ -1,7 +1,10 @@ package types import ( + "fmt" + "net/url" "reflect" + "strings" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -22,11 +25,22 @@ import ( // and ProofSpecs do not match parameters set by committed client func (cs ClientState) VerifyUpgrade( ctx sdk.Context, cdc codec.BinaryMarshaler, clientStore sdk.KVStore, - upgradedClient exported.ClientState, proofUpgrade []byte, + upgradedClient exported.ClientState, upgradeHeight exported.Height, proofUpgrade []byte, ) error { - if cs.UpgradePath == nil { + if cs.UpgradePath == "" { return sdkerrors.Wrap(clienttypes.ErrInvalidUpgradeClient, "cannot upgrade client, no upgrade path set") } + upgradePath, err := constructUpgradeMerklePath(cs.UpgradePath, upgradeHeight) + if err != nil { + return sdkerrors.Wrapf(clienttypes.ErrInvalidUpgradeClient, "cannot upgrade client, unescaping key with URL format failed: %v", err) + } + + // UpgradeHeight must be in same epoch as client state height + if cs.GetLatestHeight().GetEpochNumber() != upgradeHeight.GetEpochNumber() { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidHeight, "epoch at which upgrade occurs must be same as current client epoch. expected epoch %d, got %d", + cs.GetLatestHeight().GetEpochNumber(), upgradeHeight.GetEpochNumber()) + } + tmClient, ok := upgradedClient.(*ClientState) if !ok { return sdkerrors.Wrapf(clienttypes.ErrInvalidClientType, "upgraded client must be Tendermint client. expected: %T got: %T", @@ -34,7 +48,7 @@ func (cs ClientState) VerifyUpgrade( } if !upgradedClient.GetLatestHeight().GT(cs.GetLatestHeight()) { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidHeight, "upgrade client height %s must be greater than current client height %s", + return sdkerrors.Wrapf(sdkerrors.ErrInvalidHeight, "upgraded client height %s must be greater than current client height %s", upgradedClient.GetLatestHeight(), cs.GetLatestHeight()) } @@ -56,9 +70,11 @@ func (cs ClientState) VerifyUpgrade( } // Must prove against latest consensus state to ensure we are verifying against latest upgrade plan - consState, err := GetConsensusState(clientStore, cdc, cs.GetLatestHeight()) + // This verifies that upgrade is intended for the provided epoch, since committed client must exist + // at this consensus state + consState, err := GetConsensusState(clientStore, cdc, upgradeHeight) if err != nil { - return sdkerrors.Wrap(err, "could not retrieve latest consensus state") + return sdkerrors.Wrap(err, "could not retrieve consensus state for upgradeHeight") } if cs.IsExpired(consState.Timestamp, ctx.BlockTime()) { @@ -85,5 +101,21 @@ func (cs ClientState) VerifyUpgrade( expectedClient, tmClient) } - return merkleProof.VerifyMembership(cs.ProofSpecs, consState.GetRoot(), *cs.UpgradePath, bz) + return merkleProof.VerifyMembership(cs.ProofSpecs, consState.GetRoot(), upgradePath, bz) +} + +// construct MerklePath from upgradePath +func constructUpgradeMerklePath(upgradePath string, upgradeHeight exported.Height) (commitmenttypes.MerklePath, error) { + // assume that all keys here are separated by `/` and + // any `/` within a merkle key is correctly escaped + upgradeKeys := strings.Split(upgradePath, "/") + // unescape the last key so that we can append `/{height}` to the last key + lastKey, err := url.PathUnescape(upgradeKeys[len(upgradeKeys)-1]) + if err != nil { + return commitmenttypes.MerklePath{}, err + } + // append upgradeHeight to last key in merkle path + // this will create the IAVL key that is used to store client in upgrade store + upgradeKeys[len(upgradeKeys)-1] = fmt.Sprintf("%s/%d", lastKey, upgradeHeight.GetEpochHeight()) + return commitmenttypes.NewMerklePath(upgradeKeys), nil } diff --git a/x/ibc/light-clients/07-tendermint/types/upgrade_test.go b/x/ibc/light-clients/07-tendermint/types/upgrade_test.go index 7ba1ea6ac7ae..8a6c672e2f65 100644 --- a/x/ibc/light-clients/07-tendermint/types/upgrade_test.go +++ b/x/ibc/light-clients/07-tendermint/types/upgrade_test.go @@ -1,8 +1,7 @@ package types_test import ( - "fmt" - + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" @@ -13,6 +12,7 @@ import ( func (suite *TendermintTestSuite) TestVerifyUpgrade() { var ( upgradedClient exported.ClientState + upgradeHeight clienttypes.Height clientA string proofUpgrade []byte ) @@ -26,9 +26,13 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { name: "successful upgrade", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -39,7 +43,7 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: true, }, @@ -47,12 +51,16 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { name: "successful upgrade with different client chosen parameters", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // change upgradedClient client-specified parameters - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, ubdPeriod, ubdPeriod+trustingPeriod, maxClockDrift+5, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, true, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, ubdPeriod, ubdPeriod+trustingPeriod, maxClockDrift+5, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, true, false) suite.coordinator.CommitBlock(suite.chainB) err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) @@ -63,23 +71,52 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { // Previous client-chosen parameters must be the same as upgraded client chosen parameters tmClient, _ := cs.(*types.ClientState) - oldClient := types.NewClientState(tmClient.ChainId, types.DefaultTrustLevel, ubdPeriod, ubdPeriod+trustingPeriod, maxClockDrift+5, tmClient.LatestHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, true, false) + oldClient := types.NewClientState(tmClient.ChainId, types.DefaultTrustLevel, ubdPeriod, ubdPeriod+trustingPeriod, maxClockDrift+5, tmClient.LatestHeight, commitmenttypes.GetSDKSpecs(), upgradePath, true, false) suite.chainA.App.IBCKeeper.ClientKeeper.SetClientState(suite.chainA.GetContext(), clientA, oldClient) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: true, }, + { + name: "unsuccessful upgrade: upgrade height epoch does not match current client epoch", + setup: func() { + + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(10, uint64(suite.chainB.GetContext().BlockHeight()+1)) + + // zero custom fields and store in upgrade store + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) + + // commit upgrade store changes and update clients + + suite.coordinator.CommitBlock(suite.chainB) + err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) + suite.Require().NoError(err) + + cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) + suite.Require().True(found) + + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) + }, + expPass: false, + }, { name: "unsuccessful upgrade: chain-specified paramaters do not match committed client", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // change upgradedClient client-specified parameters - upgradedClient = types.NewClientState("wrongchainID", types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, true, true) + upgradedClient = types.NewClientState("wrongchainID", types.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, true, true) suite.coordinator.CommitBlock(suite.chainB) err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) @@ -88,7 +125,7 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: false, }, @@ -96,12 +133,12 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { name: "unsuccessful upgrade: client-specified parameters do not match previous client", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // change upgradedClient client-specified parameters - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, ubdPeriod, ubdPeriod+trustingPeriod, maxClockDrift+5, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, true, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, ubdPeriod, ubdPeriod+trustingPeriod, maxClockDrift+5, upgradeHeight, commitmenttypes.GetSDKSpecs(), upgradePath, true, false) suite.coordinator.CommitBlock(suite.chainB) err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) @@ -110,14 +147,14 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: false, }, { name: "unsuccessful upgrade: proof is empty", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) proofUpgrade = []byte{} }, expPass: false, @@ -125,7 +162,7 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { { name: "unsuccessful upgrade: proof unmarshal failed", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) proofUpgrade = []byte("proof") }, expPass: false, @@ -134,23 +171,59 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { name: "unsuccessful upgrade: proof verification failed", setup: func() { // create but do not store upgraded client - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + + cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) + suite.Require().True(found) + + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) + }, + expPass: false, + }, + { + name: "unsuccessful upgrade: upgrade path is empty", + setup: func() { + + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + + // zero custom fields and store in upgrade store + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) + + // commit upgrade store changes and update clients + + suite.coordinator.CommitBlock(suite.chainB) + err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) + suite.Require().NoError(err) cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) - fmt.Printf("%#v\n", proofUpgrade) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) + + // SetClientState with empty upgrade path + tmClient, _ := cs.(*types.ClientState) + tmClient.UpgradePath = "" + suite.chainA.App.IBCKeeper.ClientKeeper.SetClientState(suite.chainA.GetContext(), clientA, tmClient) }, expPass: false, }, { - name: "unsuccessful upgrade: upgrade path is nil", + name: "unsuccessful upgrade: upgrade path is malformed and cannot be correctly unescaped", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -161,11 +234,11 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) // SetClientState with nil upgrade path tmClient, _ := cs.(*types.ClientState) - tmClient.UpgradePath = nil + tmClient.UpgradePath = "upgraded%Client" suite.chainA.App.IBCKeeper.ClientKeeper.SetClientState(suite.chainA.GetContext(), clientA, tmClient) }, expPass: false, @@ -174,9 +247,38 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { name: "unsuccessful upgrade: upgraded height is not greater than current height", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+1)) + + // zero custom fields and store in upgrade store + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) + + // commit upgrade store changes and update clients + + suite.coordinator.CommitBlock(suite.chainB) + err := suite.coordinator.UpdateClient(suite.chainA, suite.chainB, clientA, ibctesting.Tendermint) + suite.Require().NoError(err) + + cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) + suite.Require().True(found) + + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) + }, + expPass: false, + }, + { + name: "unsuccessful upgrade: consensus state for upgrade height cannot be found", + setup: func() { + + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, newClientHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) + + // upgrade Height is at next block + upgradeHeight = clienttypes.NewHeight(0, uint64(suite.chainB.GetContext().BlockHeight()+100)) + // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -187,7 +289,7 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: false, }, @@ -195,9 +297,9 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { name: "unsuccessful upgrade: client is expired", setup: func() { - upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), &upgradePath, false, false) + upgradedClient = types.NewClientState("newChainId", types.DefaultTrustLevel, trustingPeriod, ubdPeriod+trustingPeriod, maxClockDrift, upgradeHeight, commitmenttypes.GetSDKSpecs(), upgradePath, false, false) // zero custom fields and store in upgrade store - suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), upgradedClient) + suite.chainB.App.UpgradeKeeper.SetUpgradedClient(suite.chainB.GetContext(), int64(upgradeHeight.GetEpochHeight()), upgradedClient) // commit upgrade store changes and update clients @@ -211,7 +313,7 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { cs, found := suite.chainA.App.IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), clientA) suite.Require().True(found) - proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(), cs.GetLatestHeight().GetEpochHeight()) + proofUpgrade, _ = suite.chainB.QueryUpgradeProof(upgradetypes.UpgradedClientKey(int64(upgradeHeight.GetEpochHeight())), cs.GetLatestHeight().GetEpochHeight()) }, expPass: false, }, @@ -235,6 +337,7 @@ func (suite *TendermintTestSuite) TestVerifyUpgrade() { suite.cdc, clientStore, upgradedClient, + upgradeHeight, proofUpgrade, ) diff --git a/x/ibc/light-clients/09-localhost/types/client_state.go b/x/ibc/light-clients/09-localhost/types/client_state.go index 639d160841d3..edaa74c68713 100644 --- a/x/ibc/light-clients/09-localhost/types/client_state.go +++ b/x/ibc/light-clients/09-localhost/types/client_state.go @@ -105,7 +105,7 @@ func (cs ClientState) CheckProposedHeaderAndUpdateState( // VerifyUpgrade returns an error since localhost cannot be upgraded func (cs ClientState) VerifyUpgrade( _ sdk.Context, _ codec.BinaryMarshaler, _ sdk.KVStore, - _ exported.ClientState, _ []byte, + _ exported.ClientState, _ exported.Height, _ []byte, ) error { return sdkerrors.Wrap(clienttypes.ErrInvalidUpgradeClient, "cannot upgrade localhost client") } diff --git a/x/ibc/testing/chain.go b/x/ibc/testing/chain.go index 654fe473316e..e2bdeefe7849 100644 --- a/x/ibc/testing/chain.go +++ b/x/ibc/testing/chain.go @@ -37,7 +37,6 @@ import ( ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) const ( @@ -71,7 +70,7 @@ var ( TestHash = tmhash.Sum([]byte("TESTING HASH")) TestCoin = sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100)) - UpgradePath = commitmenttypes.NewMerklePath([]string{"upgrade", upgradetypes.KeyUpgradedClient}) + UpgradePath = fmt.Sprintf("%s/%s", "upgrade", "upgradedClient") ConnectionVersion = connectiontypes.GetCompatibleEncodedVersions()[0] @@ -206,7 +205,7 @@ func (chain *TestChain) QueryUpgradeProof(key []byte, height uint64) ([]byte, cl res := chain.App.Query(abci.RequestQuery{ Path: "store/upgrade/key", Height: int64(height - 1), - Data: upgradetypes.UpgradedClientKey(), + Data: key, Prove: true, }) @@ -421,7 +420,7 @@ func (chain *TestChain) ConstructMsgCreateClient(counterparty *TestChain, client clientState = ibctmtypes.NewClientState( counterparty.ChainID, DefaultTrustLevel, TrustingPeriod, UnbondingPeriod, MaxClockDrift, height, commitmenttypes.GetSDKSpecs(), - &UpgradePath, false, false, + UpgradePath, false, false, ) consensusState = counterparty.LastHeader.ConsensusState() case SoloMachine: diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index c1108cab32cf..9951a8174013 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -1167,582 +1167,584 @@ func (this *Pool) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 9197 bytes of a gzipped FileDescriptorSet + // 9223 bytes of a gzipped FileDescriptorSet 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x74, 0x1c, 0xd7, - 0x75, 0x18, 0x67, 0x3f, 0x80, 0xdd, 0xbb, 0x0b, 0x60, 0xf1, 0x00, 0x42, 0xcb, 0x25, 0x09, 0x40, - 0x23, 0x59, 0xa2, 0x28, 0x09, 0x90, 0x28, 0x92, 0x22, 0x97, 0xb1, 0x64, 0x2c, 0xb0, 0x04, 0x41, - 0xe2, 0x4b, 0x03, 0x90, 0xf2, 0x47, 0xd2, 0x3d, 0x83, 0xdd, 0x87, 0xc5, 0x88, 0xbb, 0x33, 0xe3, - 0x99, 0x59, 0x12, 0x90, 0xed, 0x73, 0x94, 0xd8, 0x75, 0x6d, 0xa5, 0xa9, 0xed, 0x38, 0x27, 0xf5, - 0x97, 0x5c, 0x39, 0x4e, 0xeb, 0xd4, 0x49, 0x9b, 0x0f, 0xa7, 0x69, 0xd3, 0xf6, 0x9c, 0x3a, 0x3d, - 0x4d, 0xe3, 0xb4, 0xa7, 0x39, 0xd2, 0x69, 0xce, 0x69, 0x9a, 0xd3, 0x30, 0xa9, 0xac, 0xa6, 0xaa, - 0xeb, 0xb6, 0x0e, 0xab, 0xa6, 0x69, 0xfd, 0xa3, 0x3d, 0xef, 0x6b, 0xbe, 0x76, 0x17, 0xb3, 0x0b, - 0x91, 0x92, 0xd3, 0xf4, 0x17, 0xf6, 0xdd, 0x77, 0xef, 0x7d, 0xf7, 0xde, 0x77, 0xef, 0x7d, 0xf7, - 0xbd, 0x79, 0x33, 0x80, 0x2f, 0x5e, 0x80, 0xe9, 0xba, 0x61, 0xd4, 0x1b, 0x78, 0xd6, 0xb4, 0x0c, - 0xc7, 0xd8, 0x6a, 0x6d, 0xcf, 0xd6, 0xb0, 0x5d, 0xb5, 0x34, 0xd3, 0x31, 0xac, 0x19, 0x0a, 0x43, - 0x23, 0x0c, 0x63, 0x46, 0x60, 0xc8, 0x2b, 0x30, 0x7a, 0x51, 0x6b, 0xe0, 0x05, 0x17, 0x71, 0x03, - 0x3b, 0xe8, 0x1c, 0x24, 0xb6, 0xb5, 0x06, 0xce, 0x4b, 0xd3, 0xf1, 0x13, 0x99, 0x53, 0xf7, 0xcf, - 0x84, 0x88, 0x66, 0x82, 0x14, 0xeb, 0x04, 0xac, 0x50, 0x0a, 0xf9, 0xf5, 0x04, 0x8c, 0x75, 0xe8, - 0x45, 0x08, 0x12, 0xba, 0xda, 0x24, 0x1c, 0xa5, 0x13, 0x69, 0x85, 0xfe, 0x46, 0x79, 0x18, 0x34, - 0xd5, 0xea, 0x75, 0xb5, 0x8e, 0xf3, 0x31, 0x0a, 0x16, 0x4d, 0x34, 0x09, 0x50, 0xc3, 0x26, 0xd6, - 0x6b, 0x58, 0xaf, 0xee, 0xe5, 0xe3, 0xd3, 0xf1, 0x13, 0x69, 0xc5, 0x07, 0x41, 0x0f, 0xc3, 0xa8, - 0xd9, 0xda, 0x6a, 0x68, 0xd5, 0x8a, 0x0f, 0x0d, 0xa6, 0xe3, 0x27, 0x92, 0x4a, 0x8e, 0x75, 0x2c, - 0x78, 0xc8, 0x0f, 0xc2, 0xc8, 0x4d, 0xac, 0x5e, 0xf7, 0xa3, 0x66, 0x28, 0xea, 0x30, 0x01, 0xfb, - 0x10, 0xe7, 0x21, 0xdb, 0xc4, 0xb6, 0xad, 0xd6, 0x71, 0xc5, 0xd9, 0x33, 0x71, 0x3e, 0x41, 0xb5, - 0x9f, 0x6e, 0xd3, 0x3e, 0xac, 0x79, 0x86, 0x53, 0x6d, 0xee, 0x99, 0x18, 0xcd, 0x41, 0x1a, 0xeb, + 0x75, 0x18, 0x67, 0x3f, 0x80, 0xdd, 0xbb, 0xf8, 0x58, 0x3c, 0x80, 0xd0, 0x72, 0x49, 0x02, 0xd0, + 0x48, 0x96, 0x28, 0x4a, 0x5a, 0x48, 0x14, 0x49, 0x91, 0xcb, 0x58, 0x32, 0x16, 0x58, 0x82, 0x20, + 0xf1, 0xa5, 0x01, 0x48, 0xf9, 0x23, 0xe9, 0x9e, 0xc1, 0xee, 0xc3, 0x62, 0xc4, 0xdd, 0x99, 0xf1, + 0xcc, 0x2c, 0x09, 0xc8, 0xf6, 0x39, 0x4a, 0xec, 0xba, 0xb6, 0xd2, 0xd4, 0x76, 0x9d, 0x93, 0xda, + 0x8e, 0xe5, 0xca, 0x71, 0x5a, 0xa7, 0x4e, 0xda, 0x7c, 0x38, 0x4d, 0x9b, 0xb6, 0xe7, 0xd4, 0x6e, + 0x9b, 0xc6, 0x69, 0x4f, 0x73, 0xa4, 0xd3, 0x9c, 0xd3, 0x34, 0xa7, 0x61, 0x52, 0x59, 0x4d, 0x55, + 0xd7, 0x6d, 0x1d, 0x56, 0x4d, 0xd3, 0xfa, 0x47, 0x7b, 0xde, 0xd7, 0x7c, 0xed, 0x2e, 0x66, 0x17, + 0x22, 0x25, 0xa7, 0xe9, 0x2f, 0xec, 0xbb, 0xef, 0xde, 0xfb, 0xee, 0xbd, 0xef, 0xde, 0xfb, 0xee, + 0x7b, 0xf3, 0x66, 0x00, 0xff, 0xf4, 0x02, 0xcc, 0xd4, 0x0d, 0xa3, 0xde, 0xc0, 0xb3, 0xa6, 0x65, + 0x38, 0xc6, 0x56, 0x6b, 0x7b, 0xb6, 0x86, 0xed, 0xaa, 0xa5, 0x99, 0x8e, 0x61, 0x15, 0x28, 0x0c, + 0x8d, 0x32, 0x8c, 0x82, 0xc0, 0x90, 0x57, 0x60, 0xec, 0xa2, 0xd6, 0xc0, 0x0b, 0x2e, 0xe2, 0x06, + 0x76, 0xd0, 0x39, 0x48, 0x6c, 0x6b, 0x0d, 0x9c, 0x93, 0x66, 0xe2, 0x27, 0x32, 0xa7, 0xee, 0x2f, + 0x84, 0x88, 0x0a, 0x41, 0x8a, 0x75, 0x02, 0x56, 0x28, 0x85, 0xfc, 0x7a, 0x02, 0xc6, 0x3b, 0xf4, + 0x22, 0x04, 0x09, 0x5d, 0x6d, 0x12, 0x8e, 0xd2, 0x89, 0xb4, 0x42, 0x7f, 0xa3, 0x1c, 0x0c, 0x9a, + 0x6a, 0xf5, 0xba, 0x5a, 0xc7, 0xb9, 0x18, 0x05, 0x8b, 0x26, 0x9a, 0x02, 0xa8, 0x61, 0x13, 0xeb, + 0x35, 0xac, 0x57, 0xf7, 0x72, 0xf1, 0x99, 0xf8, 0x89, 0xb4, 0xe2, 0x83, 0xa0, 0x87, 0x61, 0xcc, + 0x6c, 0x6d, 0x35, 0xb4, 0x6a, 0xc5, 0x87, 0x06, 0x33, 0xf1, 0x13, 0x49, 0x25, 0xcb, 0x3a, 0x16, + 0x3c, 0xe4, 0x07, 0x61, 0xf4, 0x26, 0x56, 0xaf, 0xfb, 0x51, 0x33, 0x14, 0x75, 0x84, 0x80, 0x7d, + 0x88, 0xf3, 0x30, 0xd4, 0xc4, 0xb6, 0xad, 0xd6, 0x71, 0xc5, 0xd9, 0x33, 0x71, 0x2e, 0x41, 0xb5, + 0x9f, 0x69, 0xd3, 0x3e, 0xac, 0x79, 0x86, 0x53, 0x6d, 0xee, 0x99, 0x18, 0xcd, 0x41, 0x1a, 0xeb, 0xad, 0x26, 0xe3, 0x90, 0xec, 0x62, 0xbf, 0xb2, 0xde, 0x6a, 0x86, 0xb9, 0xa4, 0x08, 0x19, 0x67, - 0x31, 0x68, 0x63, 0xeb, 0x86, 0x56, 0xc5, 0xf9, 0x01, 0xca, 0xe0, 0xc1, 0x36, 0x06, 0x1b, 0xac, - 0x3f, 0xcc, 0x43, 0xd0, 0xa1, 0x79, 0x48, 0xe3, 0x5d, 0x07, 0xeb, 0xb6, 0x66, 0xe8, 0xf9, 0x41, + 0x31, 0x68, 0x63, 0xeb, 0x86, 0x56, 0xc5, 0xb9, 0x01, 0xca, 0xe0, 0xc1, 0x36, 0x06, 0x1b, 0xac, + 0x3f, 0xcc, 0x43, 0xd0, 0xa1, 0x79, 0x48, 0xe3, 0x5d, 0x07, 0xeb, 0xb6, 0x66, 0xe8, 0xb9, 0x41, 0xca, 0xe4, 0x5d, 0x1d, 0x66, 0x11, 0x37, 0x6a, 0x61, 0x16, 0x1e, 0x1d, 0x3a, 0x0b, 0x83, 0x86, - 0xe9, 0x68, 0x86, 0x6e, 0xe7, 0x53, 0xd3, 0xd2, 0x89, 0xcc, 0xa9, 0x63, 0x1d, 0x1d, 0x61, 0x8d, - 0xe1, 0x28, 0x02, 0x19, 0x2d, 0x41, 0xce, 0x36, 0x5a, 0x56, 0x15, 0x57, 0xaa, 0x46, 0x0d, 0x57, - 0x34, 0x7d, 0xdb, 0xc8, 0xa7, 0x29, 0x83, 0xa9, 0x76, 0x45, 0x28, 0xe2, 0xbc, 0x51, 0xc3, 0x4b, - 0xfa, 0xb6, 0xa1, 0x0c, 0xdb, 0x81, 0x36, 0x9a, 0x80, 0x01, 0x7b, 0x4f, 0x77, 0xd4, 0xdd, 0x7c, - 0x96, 0x7a, 0x08, 0x6f, 0xc9, 0xbf, 0x3e, 0x00, 0x23, 0xbd, 0xb8, 0xd8, 0x05, 0x48, 0x6e, 0x13, - 0x2d, 0xf3, 0xb1, 0x7e, 0x6c, 0xc0, 0x68, 0x82, 0x46, 0x1c, 0x38, 0xa0, 0x11, 0xe7, 0x20, 0xa3, - 0x63, 0xdb, 0xc1, 0x35, 0xe6, 0x11, 0xf1, 0x1e, 0x7d, 0x0a, 0x18, 0x51, 0xbb, 0x4b, 0x25, 0x0e, - 0xe4, 0x52, 0xef, 0x85, 0x11, 0x57, 0xa4, 0x8a, 0xa5, 0xea, 0x75, 0xe1, 0x9b, 0xb3, 0x51, 0x92, - 0xcc, 0x94, 0x05, 0x9d, 0x42, 0xc8, 0x94, 0x61, 0x1c, 0x68, 0xa3, 0x05, 0x00, 0x43, 0xc7, 0xc6, - 0x76, 0xa5, 0x86, 0xab, 0x8d, 0x7c, 0xaa, 0x8b, 0x95, 0xd6, 0x08, 0x4a, 0x9b, 0x95, 0x0c, 0x06, + 0xe9, 0x68, 0x86, 0x6e, 0xe7, 0x52, 0x33, 0xd2, 0x89, 0xcc, 0xa9, 0x63, 0x1d, 0x1d, 0x61, 0x8d, + 0xe1, 0x28, 0x02, 0x19, 0x2d, 0x41, 0xd6, 0x36, 0x5a, 0x56, 0x15, 0x57, 0xaa, 0x46, 0x0d, 0x57, + 0x34, 0x7d, 0xdb, 0xc8, 0xa5, 0x29, 0x83, 0xe9, 0x76, 0x45, 0x28, 0xe2, 0xbc, 0x51, 0xc3, 0x4b, + 0xfa, 0xb6, 0xa1, 0x8c, 0xd8, 0x81, 0x36, 0x9a, 0x84, 0x01, 0x7b, 0x4f, 0x77, 0xd4, 0xdd, 0xdc, + 0x10, 0xf5, 0x10, 0xde, 0x92, 0x7f, 0x7d, 0x00, 0x46, 0x7b, 0x71, 0xb1, 0x0b, 0x90, 0xdc, 0x26, + 0x5a, 0xe6, 0x62, 0xfd, 0xd8, 0x80, 0xd1, 0x04, 0x8d, 0x38, 0x70, 0x40, 0x23, 0xce, 0x41, 0x46, + 0xc7, 0xb6, 0x83, 0x6b, 0xcc, 0x23, 0xe2, 0x3d, 0xfa, 0x14, 0x30, 0xa2, 0x76, 0x97, 0x4a, 0x1c, + 0xc8, 0xa5, 0xde, 0x0b, 0xa3, 0xae, 0x48, 0x15, 0x4b, 0xd5, 0xeb, 0xc2, 0x37, 0x67, 0xa3, 0x24, + 0x29, 0x94, 0x05, 0x9d, 0x42, 0xc8, 0x94, 0x11, 0x1c, 0x68, 0xa3, 0x05, 0x00, 0x43, 0xc7, 0xc6, + 0x76, 0xa5, 0x86, 0xab, 0x8d, 0x5c, 0xaa, 0x8b, 0x95, 0xd6, 0x08, 0x4a, 0x9b, 0x95, 0x0c, 0x06, 0xad, 0x36, 0xd0, 0x79, 0xcf, 0xd5, 0x06, 0xbb, 0x78, 0xca, 0x0a, 0x0b, 0xb2, 0x36, 0x6f, 0xbb, - 0x0a, 0xc3, 0x16, 0x26, 0x7e, 0x8f, 0x6b, 0x5c, 0xb3, 0x34, 0x15, 0x62, 0x26, 0x52, 0x33, 0x85, - 0x93, 0x31, 0xc5, 0x86, 0x2c, 0x7f, 0x13, 0xdd, 0x07, 0x2e, 0xa0, 0x42, 0xdd, 0x0a, 0x68, 0x16, - 0xca, 0x0a, 0xe0, 0xaa, 0xda, 0xc4, 0x85, 0xe7, 0x61, 0x38, 0x68, 0x1e, 0x34, 0x0e, 0x49, 0xdb, - 0x51, 0x2d, 0x87, 0x7a, 0x61, 0x52, 0x61, 0x0d, 0x94, 0x83, 0x38, 0xd6, 0x6b, 0x34, 0xcb, 0x25, + 0x0a, 0x23, 0x16, 0x26, 0x7e, 0x8f, 0x6b, 0x5c, 0xb3, 0x34, 0x15, 0xa2, 0x10, 0xa9, 0x99, 0xc2, + 0xc9, 0x98, 0x62, 0xc3, 0x96, 0xbf, 0x89, 0xee, 0x03, 0x17, 0x50, 0xa1, 0x6e, 0x05, 0x34, 0x0b, + 0x0d, 0x09, 0xe0, 0xaa, 0xda, 0xc4, 0xf9, 0xe7, 0x61, 0x24, 0x68, 0x1e, 0x34, 0x01, 0x49, 0xdb, + 0x51, 0x2d, 0x87, 0x7a, 0x61, 0x52, 0x61, 0x0d, 0x94, 0x85, 0x38, 0xd6, 0x6b, 0x34, 0xcb, 0x25, 0x15, 0xf2, 0x13, 0xbd, 0xc7, 0x53, 0x38, 0x4e, 0x15, 0x7e, 0xa0, 0x7d, 0x46, 0x03, 0x9c, 0xc3, - 0x7a, 0x17, 0x9e, 0x84, 0xa1, 0x80, 0x02, 0xbd, 0x0e, 0x2d, 0x7f, 0x18, 0x0e, 0x77, 0x64, 0x8d, - 0xde, 0x0b, 0xe3, 0x2d, 0x5d, 0xd3, 0x1d, 0x6c, 0x99, 0x16, 0x26, 0x1e, 0xcb, 0x86, 0xca, 0xff, - 0xc7, 0xc1, 0x2e, 0x3e, 0x77, 0xd5, 0x8f, 0xcd, 0xb8, 0x28, 0x63, 0xad, 0x76, 0xe0, 0xc9, 0x74, - 0xea, 0x8d, 0xc1, 0xdc, 0x0b, 0x2f, 0xbc, 0xf0, 0x42, 0x4c, 0xfe, 0xdc, 0x00, 0x8c, 0x77, 0x8a, - 0x99, 0x8e, 0xe1, 0x3b, 0x01, 0x03, 0x7a, 0xab, 0xb9, 0x85, 0x2d, 0x6a, 0xa4, 0xa4, 0xc2, 0x5b, - 0x68, 0x0e, 0x92, 0x0d, 0x75, 0x0b, 0x37, 0xf2, 0x89, 0x69, 0xe9, 0xc4, 0xf0, 0xa9, 0x87, 0x7b, - 0x8a, 0xca, 0x99, 0x65, 0x42, 0xa2, 0x30, 0x4a, 0xf4, 0x14, 0x24, 0x78, 0x8a, 0x26, 0x1c, 0x4e, - 0xf6, 0xc6, 0x81, 0xc4, 0x92, 0x42, 0xe9, 0xd0, 0x51, 0x48, 0x93, 0xbf, 0xcc, 0x37, 0x06, 0xa8, - 0xcc, 0x29, 0x02, 0x20, 0x7e, 0x81, 0x0a, 0x90, 0xa2, 0x61, 0x52, 0xc3, 0x62, 0x69, 0x73, 0xdb, - 0xc4, 0xb1, 0x6a, 0x78, 0x5b, 0x6d, 0x35, 0x9c, 0xca, 0x0d, 0xb5, 0xd1, 0xc2, 0xd4, 0xe1, 0xd3, - 0x4a, 0x96, 0x03, 0xaf, 0x11, 0x18, 0x9a, 0x82, 0x0c, 0x8b, 0x2a, 0x4d, 0xaf, 0xe1, 0x5d, 0x9a, + 0x7a, 0xe7, 0x9f, 0x84, 0xe1, 0x80, 0x02, 0xbd, 0x0e, 0x2d, 0x7f, 0x18, 0x0e, 0x77, 0x64, 0x8d, + 0xde, 0x0b, 0x13, 0x2d, 0x5d, 0xd3, 0x1d, 0x6c, 0x99, 0x16, 0x26, 0x1e, 0xcb, 0x86, 0xca, 0xfd, + 0xc7, 0xc1, 0x2e, 0x3e, 0x77, 0xd5, 0x8f, 0xcd, 0xb8, 0x28, 0xe3, 0xad, 0x76, 0xe0, 0xc9, 0x74, + 0xea, 0x8d, 0xc1, 0xec, 0x0b, 0x2f, 0xbc, 0xf0, 0x42, 0x4c, 0xfe, 0xe6, 0x00, 0x4c, 0x74, 0x8a, + 0x99, 0x8e, 0xe1, 0x3b, 0x09, 0x03, 0x7a, 0xab, 0xb9, 0x85, 0x2d, 0x6a, 0xa4, 0xa4, 0xc2, 0x5b, + 0x68, 0x0e, 0x92, 0x0d, 0x75, 0x0b, 0x37, 0x72, 0x89, 0x19, 0xe9, 0xc4, 0xc8, 0xa9, 0x87, 0x7b, + 0x8a, 0xca, 0xc2, 0x32, 0x21, 0x51, 0x18, 0x25, 0x7a, 0x0a, 0x12, 0x3c, 0x45, 0x13, 0x0e, 0x27, + 0x7b, 0xe3, 0x40, 0x62, 0x49, 0xa1, 0x74, 0xe8, 0x28, 0xa4, 0xc9, 0x5f, 0xe6, 0x1b, 0x03, 0x54, + 0xe6, 0x14, 0x01, 0x10, 0xbf, 0x40, 0x79, 0x48, 0xd1, 0x30, 0xa9, 0x61, 0xb1, 0xb4, 0xb9, 0x6d, + 0xe2, 0x58, 0x35, 0xbc, 0xad, 0xb6, 0x1a, 0x4e, 0xe5, 0x86, 0xda, 0x68, 0x61, 0xea, 0xf0, 0x69, + 0x65, 0x88, 0x03, 0xaf, 0x11, 0x18, 0x9a, 0x86, 0x0c, 0x8b, 0x2a, 0x4d, 0xaf, 0xe1, 0x5d, 0x9a, 0x3d, 0x93, 0x0a, 0x0b, 0xb4, 0x25, 0x02, 0x21, 0xc3, 0x3f, 0x67, 0x1b, 0xba, 0x70, 0x4d, 0x3a, - 0x04, 0x01, 0xd0, 0xe1, 0x9f, 0x0c, 0x27, 0xee, 0xe3, 0x9d, 0xd5, 0x0b, 0xfb, 0x94, 0xfc, 0x6b, - 0x31, 0x48, 0xd0, 0x7c, 0x31, 0x02, 0x99, 0xcd, 0xf7, 0xad, 0x97, 0x2b, 0x0b, 0x6b, 0x57, 0x4b, - 0xcb, 0xe5, 0x9c, 0x84, 0x86, 0x01, 0x28, 0xe0, 0xe2, 0xf2, 0xda, 0xdc, 0x66, 0x2e, 0xe6, 0xb6, - 0x97, 0x56, 0x37, 0xcf, 0x9e, 0xce, 0xc5, 0x5d, 0x82, 0xab, 0x0c, 0x90, 0xf0, 0x23, 0x3c, 0x71, - 0x2a, 0x97, 0x44, 0x39, 0xc8, 0x32, 0x06, 0x4b, 0xef, 0x2d, 0x2f, 0x9c, 0x3d, 0x9d, 0x1b, 0x08, - 0x42, 0x9e, 0x38, 0x95, 0x1b, 0x44, 0x43, 0x90, 0xa6, 0x90, 0xd2, 0xda, 0xda, 0x72, 0x2e, 0xe5, - 0xf2, 0xdc, 0xd8, 0x54, 0x96, 0x56, 0x17, 0x73, 0x69, 0x97, 0xe7, 0xa2, 0xb2, 0x76, 0x75, 0x3d, - 0x07, 0x2e, 0x87, 0x95, 0xf2, 0xc6, 0xc6, 0xdc, 0x62, 0x39, 0x97, 0x71, 0x31, 0x4a, 0xef, 0xdb, - 0x2c, 0x6f, 0xe4, 0xb2, 0x01, 0xb1, 0x9e, 0x38, 0x95, 0x1b, 0x72, 0x87, 0x28, 0xaf, 0x5e, 0x5d, - 0xc9, 0x0d, 0xa3, 0x51, 0x18, 0x62, 0x43, 0x08, 0x21, 0x46, 0x42, 0xa0, 0xb3, 0xa7, 0x73, 0x39, - 0x4f, 0x10, 0xc6, 0x65, 0x34, 0x00, 0x38, 0x7b, 0x3a, 0x87, 0xe4, 0x79, 0x48, 0x52, 0xef, 0x42, - 0x08, 0x86, 0x97, 0xe7, 0x4a, 0xe5, 0xe5, 0xca, 0xda, 0xfa, 0xe6, 0xd2, 0xda, 0xea, 0xdc, 0x72, - 0x4e, 0xf2, 0x60, 0x4a, 0xf9, 0x99, 0xab, 0x4b, 0x4a, 0x79, 0x21, 0x17, 0xf3, 0xc3, 0xd6, 0xcb, - 0x73, 0x9b, 0xe5, 0x85, 0x5c, 0x5c, 0xae, 0xc2, 0x78, 0xa7, 0x3c, 0xd9, 0x31, 0x32, 0x7c, 0x53, - 0x1c, 0xeb, 0x32, 0xc5, 0x94, 0x57, 0xdb, 0x14, 0x7f, 0x3b, 0x06, 0x63, 0x1d, 0xd6, 0x8a, 0x8e, - 0x83, 0x3c, 0x0d, 0x49, 0xe6, 0xa2, 0x6c, 0xf5, 0x7c, 0xa8, 0xe3, 0xa2, 0x43, 0x1d, 0xb6, 0x6d, - 0x05, 0xa5, 0x74, 0xfe, 0x0a, 0x22, 0xde, 0xa5, 0x82, 0x20, 0x2c, 0xda, 0x72, 0xfa, 0x8f, 0xb4, - 0xe5, 0x74, 0xb6, 0xec, 0x9d, 0xed, 0x65, 0xd9, 0xa3, 0xb0, 0xfe, 0x72, 0x7b, 0xb2, 0x43, 0x6e, - 0xbf, 0x00, 0xa3, 0x6d, 0x8c, 0x7a, 0xce, 0xb1, 0x1f, 0x95, 0x20, 0xdf, 0xcd, 0x38, 0x11, 0x99, - 0x2e, 0x16, 0xc8, 0x74, 0x17, 0xc2, 0x16, 0xbc, 0xb7, 0xfb, 0x24, 0xb4, 0xcd, 0xf5, 0xd7, 0x24, - 0x98, 0xe8, 0x5c, 0x29, 0x76, 0x94, 0xe1, 0x29, 0x18, 0x68, 0x62, 0x67, 0xc7, 0x10, 0xd5, 0xd2, - 0x03, 0x1d, 0xd6, 0x60, 0xd2, 0x1d, 0x9e, 0x6c, 0x4e, 0xe5, 0x5f, 0xc4, 0xe3, 0xdd, 0xca, 0x3d, - 0x26, 0x4d, 0x9b, 0xa4, 0x9f, 0x8c, 0xc1, 0xe1, 0x8e, 0xcc, 0x3b, 0x0a, 0x7a, 0x1c, 0x40, 0xd3, - 0xcd, 0x96, 0xc3, 0x2a, 0x22, 0x96, 0x60, 0xd3, 0x14, 0x42, 0x93, 0x17, 0x49, 0x9e, 0x2d, 0xc7, - 0xed, 0x8f, 0xd3, 0x7e, 0x60, 0x20, 0x8a, 0x70, 0xce, 0x13, 0x34, 0x41, 0x05, 0x9d, 0xec, 0xa2, - 0x69, 0x9b, 0x63, 0x3e, 0x06, 0xb9, 0x6a, 0x43, 0xc3, 0xba, 0x53, 0xb1, 0x1d, 0x0b, 0xab, 0x4d, - 0x4d, 0xaf, 0xd3, 0x15, 0x24, 0x55, 0x4c, 0x6e, 0xab, 0x0d, 0x1b, 0x2b, 0x23, 0xac, 0x7b, 0x43, - 0xf4, 0x12, 0x0a, 0xea, 0x40, 0x96, 0x8f, 0x62, 0x20, 0x40, 0xc1, 0xba, 0x5d, 0x0a, 0xf9, 0x27, - 0xd3, 0x90, 0xf1, 0xd5, 0xd5, 0xe8, 0x5e, 0xc8, 0x3e, 0xa7, 0xde, 0x50, 0x2b, 0x62, 0xaf, 0xc4, - 0x2c, 0x91, 0x21, 0xb0, 0x75, 0xbe, 0x5f, 0x7a, 0x0c, 0xc6, 0x29, 0x8a, 0xd1, 0x72, 0xb0, 0x55, - 0xa9, 0x36, 0x54, 0xdb, 0xa6, 0x46, 0x4b, 0x51, 0x54, 0x44, 0xfa, 0xd6, 0x48, 0xd7, 0xbc, 0xe8, - 0x41, 0x67, 0x60, 0x8c, 0x52, 0x34, 0x5b, 0x0d, 0x47, 0x33, 0x1b, 0xb8, 0x42, 0x76, 0x6f, 0x36, - 0x5d, 0x49, 0x5c, 0xc9, 0x46, 0x09, 0xc6, 0x0a, 0x47, 0x20, 0x12, 0xd9, 0x68, 0x01, 0x8e, 0x53, - 0xb2, 0x3a, 0xd6, 0xb1, 0xa5, 0x3a, 0xb8, 0x82, 0x3f, 0xd8, 0x52, 0x1b, 0x76, 0x45, 0xd5, 0x6b, - 0x95, 0x1d, 0xd5, 0xde, 0xc9, 0x8f, 0x13, 0x06, 0xa5, 0x58, 0x5e, 0x52, 0x8e, 0x10, 0xc4, 0x45, - 0x8e, 0x57, 0xa6, 0x68, 0x73, 0x7a, 0xed, 0x92, 0x6a, 0xef, 0xa0, 0x22, 0x4c, 0x50, 0x2e, 0xb6, - 0x63, 0x69, 0x7a, 0xbd, 0x52, 0xdd, 0xc1, 0xd5, 0xeb, 0x95, 0x96, 0xb3, 0x7d, 0x2e, 0x7f, 0xd4, - 0x3f, 0x3e, 0x95, 0x70, 0x83, 0xe2, 0xcc, 0x13, 0x94, 0xab, 0xce, 0xf6, 0x39, 0xb4, 0x01, 0x59, - 0x32, 0x19, 0x4d, 0xed, 0x79, 0x5c, 0xd9, 0x36, 0x2c, 0xba, 0x34, 0x0e, 0x77, 0x48, 0x4d, 0x3e, - 0x0b, 0xce, 0xac, 0x71, 0x82, 0x15, 0xa3, 0x86, 0x8b, 0xc9, 0x8d, 0xf5, 0x72, 0x79, 0x41, 0xc9, - 0x08, 0x2e, 0x17, 0x0d, 0x8b, 0x38, 0x54, 0xdd, 0x70, 0x0d, 0x9c, 0x61, 0x0e, 0x55, 0x37, 0x84, - 0x79, 0xcf, 0xc0, 0x58, 0xb5, 0xca, 0x74, 0xd6, 0xaa, 0x15, 0xbe, 0xc7, 0xb2, 0xf3, 0xb9, 0x80, - 0xb1, 0xaa, 0xd5, 0x45, 0x86, 0xc0, 0x7d, 0xdc, 0x46, 0xe7, 0xe1, 0xb0, 0x67, 0x2c, 0x3f, 0xe1, - 0x68, 0x9b, 0x96, 0x61, 0xd2, 0x33, 0x30, 0x66, 0xee, 0xb5, 0x13, 0xa2, 0xc0, 0x88, 0xe6, 0x5e, - 0x98, 0xec, 0x49, 0x18, 0x37, 0x77, 0xcc, 0x76, 0xba, 0x93, 0x7e, 0x3a, 0x64, 0xee, 0x98, 0x61, - 0xc2, 0x77, 0xd1, 0x0d, 0xb7, 0x85, 0xab, 0xaa, 0x83, 0x6b, 0xf9, 0x7b, 0xfc, 0xe8, 0xbe, 0x0e, - 0x34, 0x0b, 0xb9, 0x6a, 0xb5, 0x82, 0x75, 0x75, 0xab, 0x81, 0x2b, 0xaa, 0x85, 0x75, 0xd5, 0xce, - 0x4f, 0xf9, 0x91, 0x87, 0xab, 0xd5, 0x32, 0xed, 0x9d, 0xa3, 0x9d, 0xe8, 0x24, 0x8c, 0x1a, 0x5b, - 0xcf, 0x55, 0x99, 0x4b, 0x56, 0x4c, 0x0b, 0x6f, 0x6b, 0xbb, 0xf9, 0xfb, 0xa9, 0x7d, 0x47, 0x48, - 0x07, 0x75, 0xc8, 0x75, 0x0a, 0x46, 0x0f, 0x41, 0xae, 0x6a, 0xef, 0xa8, 0x96, 0x49, 0x73, 0xb2, - 0x6d, 0xaa, 0x55, 0x9c, 0x7f, 0x17, 0x43, 0x65, 0xf0, 0x55, 0x01, 0x26, 0x21, 0x61, 0xdf, 0xd4, - 0xb6, 0x1d, 0xc1, 0xf1, 0x41, 0x16, 0x12, 0x14, 0xc6, 0xb9, 0x9d, 0x80, 0x1c, 0x31, 0x45, 0x60, - 0xe0, 0x13, 0x14, 0x6d, 0xd8, 0xdc, 0x31, 0xfd, 0xe3, 0xde, 0x07, 0x43, 0x04, 0xd3, 0x1b, 0xf4, - 0x21, 0x56, 0x90, 0x99, 0x3b, 0xbe, 0x11, 0x4f, 0xc3, 0x04, 0x41, 0x6a, 0x62, 0x47, 0xad, 0xa9, - 0x8e, 0xea, 0xc3, 0x7e, 0x84, 0x62, 0x13, 0xbb, 0xaf, 0xf0, 0xce, 0x80, 0x9c, 0x56, 0x6b, 0x6b, - 0xcf, 0xf5, 0xac, 0x47, 0x99, 0x9c, 0x04, 0x26, 0x7c, 0xeb, 0xae, 0x15, 0xdd, 0x72, 0x11, 0xb2, - 0x7e, 0xc7, 0x47, 0x69, 0x60, 0xae, 0x9f, 0x93, 0x48, 0x15, 0x34, 0xbf, 0xb6, 0x40, 0xea, 0x97, - 0xf7, 0x97, 0x73, 0x31, 0x52, 0x47, 0x2d, 0x2f, 0x6d, 0x96, 0x2b, 0xca, 0xd5, 0xd5, 0xcd, 0xa5, - 0x95, 0x72, 0x2e, 0xee, 0x2b, 0xd8, 0x2f, 0x27, 0x52, 0x0f, 0xe4, 0x1e, 0x94, 0x5f, 0x8d, 0xc1, - 0x70, 0x70, 0x07, 0x86, 0x7e, 0x08, 0xee, 0x11, 0xc7, 0x25, 0x36, 0x76, 0x2a, 0x37, 0x35, 0x8b, - 0x46, 0x64, 0x53, 0x65, 0xab, 0xa3, 0xeb, 0x13, 0xe3, 0x1c, 0x6b, 0x03, 0x3b, 0xcf, 0x6a, 0x16, - 0x89, 0xb7, 0xa6, 0xea, 0xa0, 0x65, 0x98, 0xd2, 0x8d, 0x8a, 0xed, 0xa8, 0x7a, 0x4d, 0xb5, 0x6a, - 0x15, 0xef, 0xa0, 0xaa, 0xa2, 0x56, 0xab, 0xd8, 0xb6, 0x0d, 0xb6, 0x12, 0xba, 0x5c, 0x8e, 0xe9, - 0xc6, 0x06, 0x47, 0xf6, 0x96, 0x88, 0x39, 0x8e, 0x1a, 0xf2, 0xdf, 0x78, 0x37, 0xff, 0x3d, 0x0a, - 0xe9, 0xa6, 0x6a, 0x56, 0xb0, 0xee, 0x58, 0x7b, 0xb4, 0xee, 0x4e, 0x29, 0xa9, 0xa6, 0x6a, 0x96, - 0x49, 0xfb, 0x6d, 0xd9, 0xfe, 0x5c, 0x4e, 0xa4, 0x52, 0xb9, 0xf4, 0xe5, 0x44, 0x2a, 0x9d, 0x03, - 0xf9, 0xb5, 0x38, 0x64, 0xfd, 0x75, 0x38, 0xd9, 0xd6, 0x54, 0xe9, 0x92, 0x25, 0xd1, 0xa4, 0x76, - 0xdf, 0xbe, 0x55, 0xfb, 0xcc, 0x3c, 0x59, 0xcb, 0x8a, 0x03, 0xac, 0x3a, 0x56, 0x18, 0x25, 0xa9, - 0x23, 0x88, 0xb3, 0x61, 0x56, 0x8d, 0xa4, 0x14, 0xde, 0x42, 0x8b, 0x30, 0xf0, 0x9c, 0x4d, 0x79, - 0x0f, 0x50, 0xde, 0xf7, 0xef, 0xcf, 0xfb, 0xf2, 0x06, 0x65, 0x9e, 0xbe, 0xbc, 0x51, 0x59, 0x5d, - 0x53, 0x56, 0xe6, 0x96, 0x15, 0x4e, 0x8e, 0x8e, 0x40, 0xa2, 0xa1, 0x3e, 0xbf, 0x17, 0x5c, 0xf5, - 0x28, 0xa8, 0xd7, 0x49, 0x38, 0x02, 0x89, 0x9b, 0x58, 0xbd, 0x1e, 0x5c, 0x6b, 0x28, 0xe8, 0x2e, - 0x06, 0xc3, 0x2c, 0x24, 0xa9, 0xbd, 0x10, 0x00, 0xb7, 0x58, 0xee, 0x10, 0x4a, 0x41, 0x62, 0x7e, - 0x4d, 0x21, 0x01, 0x91, 0x83, 0x2c, 0x83, 0x56, 0xd6, 0x97, 0xca, 0xf3, 0xe5, 0x5c, 0x4c, 0x3e, - 0x03, 0x03, 0xcc, 0x08, 0x24, 0x58, 0x5c, 0x33, 0xe4, 0x0e, 0xf1, 0x26, 0xe7, 0x21, 0x89, 0xde, - 0xab, 0x2b, 0xa5, 0xb2, 0x92, 0x8b, 0x05, 0xa7, 0x3a, 0x91, 0x4b, 0xca, 0x36, 0x64, 0xfd, 0x85, - 0xf8, 0xdb, 0xb3, 0xc9, 0xfe, 0xa6, 0x04, 0x19, 0x5f, 0x61, 0x4d, 0x2a, 0x22, 0xb5, 0xd1, 0x30, - 0x6e, 0x56, 0xd4, 0x86, 0xa6, 0xda, 0xdc, 0x35, 0x80, 0x82, 0xe6, 0x08, 0xa4, 0xd7, 0xa9, 0x7b, - 0x9b, 0x42, 0x24, 0x99, 0x1b, 0x90, 0xbf, 0x2c, 0x41, 0x2e, 0x5c, 0xd9, 0x86, 0xc4, 0x94, 0xde, - 0x49, 0x31, 0xe5, 0x2f, 0x49, 0x30, 0x1c, 0x2c, 0x67, 0x43, 0xe2, 0xdd, 0xfb, 0x8e, 0x8a, 0xf7, - 0x47, 0x31, 0x18, 0x0a, 0x14, 0xb1, 0xbd, 0x4a, 0xf7, 0x41, 0x18, 0xd5, 0x6a, 0xb8, 0x69, 0x1a, - 0x0e, 0xd6, 0xab, 0x7b, 0x95, 0x06, 0xbe, 0x81, 0x1b, 0x79, 0x99, 0x26, 0x8d, 0xd9, 0xfd, 0xcb, - 0xe4, 0x99, 0x25, 0x8f, 0x6e, 0x99, 0x90, 0x15, 0xc7, 0x96, 0x16, 0xca, 0x2b, 0xeb, 0x6b, 0x9b, - 0xe5, 0xd5, 0xf9, 0xf7, 0x55, 0xae, 0xae, 0x5e, 0x59, 0x5d, 0x7b, 0x76, 0x55, 0xc9, 0x69, 0x21, - 0xb4, 0xbb, 0x18, 0xf6, 0xeb, 0x90, 0x0b, 0x0b, 0x85, 0xee, 0x81, 0x4e, 0x62, 0xe5, 0x0e, 0xa1, - 0x31, 0x18, 0x59, 0x5d, 0xab, 0x6c, 0x2c, 0x2d, 0x94, 0x2b, 0xe5, 0x8b, 0x17, 0xcb, 0xf3, 0x9b, - 0x1b, 0xec, 0xe0, 0xc3, 0xc5, 0xde, 0x0c, 0x04, 0xb8, 0xfc, 0x85, 0x38, 0x8c, 0x75, 0x90, 0x04, - 0xcd, 0xf1, 0x2d, 0x0b, 0xdb, 0x45, 0x3d, 0xda, 0x8b, 0xf4, 0x33, 0xa4, 0x66, 0x58, 0x57, 0x2d, - 0x87, 0xef, 0x70, 0x1e, 0x02, 0x62, 0x25, 0xdd, 0xd1, 0xb6, 0x35, 0x6c, 0xf1, 0x73, 0x22, 0xb6, - 0x8f, 0x19, 0xf1, 0xe0, 0xec, 0xa8, 0xe8, 0x11, 0x40, 0xa6, 0x61, 0x6b, 0x8e, 0x76, 0x03, 0x57, - 0x34, 0x5d, 0x1c, 0x2a, 0x91, 0x7d, 0x4d, 0x42, 0xc9, 0x89, 0x9e, 0x25, 0xdd, 0x71, 0xb1, 0x75, - 0x5c, 0x57, 0x43, 0xd8, 0x24, 0x99, 0xc7, 0x95, 0x9c, 0xe8, 0x71, 0xb1, 0xef, 0x85, 0x6c, 0xcd, - 0x68, 0x91, 0x62, 0x8f, 0xe1, 0x91, 0xb5, 0x43, 0x52, 0x32, 0x0c, 0xe6, 0xa2, 0xf0, 0x32, 0xde, - 0x3b, 0xcd, 0xca, 0x2a, 0x19, 0x06, 0x63, 0x28, 0x0f, 0xc2, 0x88, 0x5a, 0xaf, 0x5b, 0x84, 0xb9, - 0x60, 0xc4, 0x36, 0x26, 0xc3, 0x2e, 0x98, 0x22, 0x16, 0x2e, 0x43, 0x4a, 0xd8, 0x81, 0x2c, 0xd5, - 0xc4, 0x12, 0x15, 0x93, 0xed, 0xb6, 0x63, 0x27, 0xd2, 0x4a, 0x4a, 0x17, 0x9d, 0xf7, 0x42, 0x56, - 0xb3, 0x2b, 0xde, 0xe1, 0x7c, 0x6c, 0x3a, 0x76, 0x22, 0xa5, 0x64, 0x34, 0xdb, 0x3d, 0xd8, 0x94, - 0xbf, 0x16, 0x83, 0xe1, 0xe0, 0xc3, 0x05, 0xb4, 0x00, 0xa9, 0x86, 0x51, 0x55, 0xa9, 0x6b, 0xb1, - 0x27, 0x5b, 0x27, 0x22, 0x9e, 0x47, 0xcc, 0x2c, 0x73, 0x7c, 0xc5, 0xa5, 0x2c, 0xfc, 0x8e, 0x04, - 0x29, 0x01, 0x46, 0x13, 0x90, 0x30, 0x55, 0x67, 0x87, 0xb2, 0x4b, 0x96, 0x62, 0x39, 0x49, 0xa1, - 0x6d, 0x02, 0xb7, 0x4d, 0x55, 0xa7, 0x2e, 0xc0, 0xe1, 0xa4, 0x4d, 0xe6, 0xb5, 0x81, 0xd5, 0x1a, - 0xdd, 0xf5, 0x18, 0xcd, 0x26, 0xd6, 0x1d, 0x5b, 0xcc, 0x2b, 0x87, 0xcf, 0x73, 0x30, 0x7a, 0x18, - 0x46, 0x1d, 0x4b, 0xd5, 0x1a, 0x01, 0xdc, 0x04, 0xc5, 0xcd, 0x89, 0x0e, 0x17, 0xb9, 0x08, 0x47, - 0x04, 0xdf, 0x1a, 0x76, 0xd4, 0xea, 0x0e, 0xae, 0x79, 0x44, 0x03, 0xf4, 0x74, 0xe3, 0x1e, 0x8e, - 0xb0, 0xc0, 0xfb, 0x05, 0xad, 0xfc, 0xaa, 0x04, 0xa3, 0x62, 0x9f, 0x56, 0x73, 0x8d, 0xb5, 0x02, - 0xa0, 0xea, 0xba, 0xe1, 0xf8, 0xcd, 0xd5, 0xee, 0xca, 0x6d, 0x74, 0x33, 0x73, 0x2e, 0x91, 0xe2, - 0x63, 0x50, 0x68, 0x02, 0x78, 0x3d, 0x5d, 0xcd, 0x36, 0x05, 0x19, 0xfe, 0xe4, 0x88, 0x3e, 0x7e, - 0x64, 0x3b, 0x7b, 0x60, 0x20, 0xb2, 0xa1, 0x43, 0xe3, 0x90, 0xdc, 0xc2, 0x75, 0x4d, 0xe7, 0xe7, - 0xc1, 0xac, 0x21, 0xce, 0x5f, 0x12, 0xee, 0xf9, 0x4b, 0xe9, 0x53, 0x12, 0x8c, 0x55, 0x8d, 0x66, - 0x58, 0xde, 0x52, 0x2e, 0x74, 0xbc, 0x60, 0x5f, 0x92, 0xde, 0xff, 0x54, 0x5d, 0x73, 0x76, 0x5a, - 0x5b, 0x33, 0x55, 0xa3, 0x39, 0x5b, 0x37, 0x1a, 0xaa, 0x5e, 0xf7, 0x9e, 0x9f, 0xd2, 0x1f, 0xd5, - 0x47, 0xeb, 0x58, 0x7f, 0xb4, 0x6e, 0xf8, 0x9e, 0xa6, 0x5e, 0xf0, 0x7e, 0xfe, 0x99, 0x24, 0xfd, - 0x4c, 0x2c, 0xbe, 0xb8, 0x5e, 0xfa, 0x7a, 0xac, 0xb0, 0xc8, 0x86, 0x5b, 0x17, 0xe6, 0x51, 0xf0, - 0x76, 0x03, 0x57, 0x89, 0xca, 0xf0, 0x9d, 0x87, 0x61, 0xbc, 0x6e, 0xd4, 0x0d, 0xca, 0x71, 0x96, - 0xfc, 0xe2, 0x4f, 0x64, 0xd3, 0x2e, 0xb4, 0x10, 0xf9, 0xf8, 0xb6, 0xb8, 0x0a, 0x63, 0x1c, 0xb9, - 0x42, 0x1f, 0x09, 0xb1, 0x8d, 0x0d, 0xda, 0xf7, 0x58, 0x2d, 0xff, 0xcb, 0xaf, 0xd3, 0x05, 0x5d, - 0x19, 0xe5, 0xa4, 0xa4, 0x8f, 0xed, 0x7d, 0x8a, 0x0a, 0x1c, 0x0e, 0xf0, 0x63, 0x61, 0x8b, 0xad, - 0x08, 0x8e, 0xbf, 0xc9, 0x39, 0x8e, 0xf9, 0x38, 0x6e, 0x70, 0xd2, 0xe2, 0x3c, 0x0c, 0xf5, 0xc3, - 0xeb, 0x9f, 0x73, 0x5e, 0x59, 0xec, 0x67, 0xb2, 0x08, 0x23, 0x94, 0x49, 0xb5, 0x65, 0x3b, 0x46, - 0x93, 0xe6, 0xc4, 0xfd, 0xd9, 0xfc, 0xd6, 0xeb, 0x2c, 0x8e, 0x86, 0x09, 0xd9, 0xbc, 0x4b, 0x55, - 0x2c, 0x02, 0x7d, 0x0a, 0x56, 0xc3, 0xd5, 0x46, 0x04, 0x87, 0x6f, 0x71, 0x41, 0x5c, 0xfc, 0xe2, - 0x35, 0x18, 0x27, 0xbf, 0x69, 0xca, 0xf2, 0x4b, 0x12, 0x7d, 0x06, 0x97, 0x7f, 0xf5, 0xa3, 0x2c, - 0x54, 0xc7, 0x5c, 0x06, 0x3e, 0x99, 0x7c, 0xb3, 0x58, 0xc7, 0x8e, 0x83, 0x2d, 0xbb, 0xa2, 0x36, - 0x3a, 0x89, 0xe7, 0x3b, 0xc4, 0xc8, 0x7f, 0xfe, 0xbb, 0xc1, 0x59, 0x5c, 0x64, 0x94, 0x73, 0x8d, - 0x46, 0xf1, 0x2a, 0xdc, 0xd3, 0xc1, 0x2b, 0x7a, 0xe0, 0xf9, 0x05, 0xce, 0x73, 0xbc, 0xcd, 0x33, - 0x08, 0xdb, 0x75, 0x10, 0x70, 0x77, 0x2e, 0x7b, 0xe0, 0xf9, 0x45, 0xce, 0x13, 0x71, 0x5a, 0x31, - 0xa5, 0x84, 0xe3, 0x65, 0x18, 0xbd, 0x81, 0xad, 0x2d, 0xc3, 0xe6, 0x07, 0x47, 0x3d, 0xb0, 0xfb, - 0x12, 0x67, 0x37, 0xc2, 0x09, 0xe9, 0x49, 0x12, 0xe1, 0x75, 0x1e, 0x52, 0xdb, 0x6a, 0x15, 0xf7, - 0xc0, 0xe2, 0x25, 0xce, 0x62, 0x90, 0xe0, 0x13, 0xd2, 0x39, 0xc8, 0xd6, 0x0d, 0xbe, 0x6a, 0x45, - 0x93, 0x7f, 0x99, 0x93, 0x67, 0x04, 0x0d, 0x67, 0x61, 0x1a, 0x66, 0xab, 0x41, 0x96, 0xb4, 0x68, - 0x16, 0x7f, 0x43, 0xb0, 0x10, 0x34, 0x9c, 0x45, 0x1f, 0x66, 0x7d, 0x59, 0xb0, 0xb0, 0x7d, 0xf6, - 0x7c, 0x1a, 0x32, 0x86, 0xde, 0xd8, 0x33, 0xf4, 0x5e, 0x84, 0xf8, 0x0a, 0xe7, 0x00, 0x9c, 0x84, - 0x30, 0xb8, 0x00, 0xe9, 0x5e, 0x27, 0xe2, 0x6f, 0x7e, 0x57, 0x84, 0x87, 0x98, 0x81, 0x45, 0x18, - 0x11, 0x09, 0x4a, 0x33, 0xf4, 0x1e, 0x58, 0xfc, 0x2d, 0xce, 0x62, 0xd8, 0x47, 0xc6, 0xd5, 0x70, - 0xb0, 0xed, 0xd4, 0x71, 0x2f, 0x4c, 0xbe, 0x26, 0xd4, 0xe0, 0x24, 0xdc, 0x94, 0x5b, 0x58, 0xaf, - 0xee, 0xf4, 0xc6, 0xe1, 0xe7, 0x84, 0x29, 0x05, 0x0d, 0x61, 0x31, 0x0f, 0x43, 0x4d, 0xd5, 0xb2, - 0x77, 0xd4, 0x46, 0x4f, 0xd3, 0xf1, 0xb7, 0x39, 0x8f, 0xac, 0x4b, 0xc4, 0x2d, 0xd2, 0xd2, 0xfb, - 0x61, 0xf3, 0x75, 0x61, 0x11, 0x1f, 0x19, 0x0f, 0x3d, 0xdb, 0xa1, 0xa7, 0x6c, 0xfd, 0x70, 0xfb, - 0x79, 0x11, 0x7a, 0x8c, 0x76, 0xc5, 0xcf, 0xf1, 0x02, 0xa4, 0x6d, 0xed, 0xf9, 0x9e, 0xd8, 0xfc, - 0x82, 0x98, 0x69, 0x4a, 0x40, 0x88, 0xdf, 0x07, 0x47, 0x3a, 0x2e, 0x13, 0x3d, 0x30, 0xfb, 0x3b, - 0x9c, 0xd9, 0x44, 0x87, 0xa5, 0x82, 0xa7, 0x84, 0x7e, 0x59, 0xfe, 0x5d, 0x91, 0x12, 0x70, 0x88, - 0xd7, 0x3a, 0xd9, 0x47, 0xd8, 0xea, 0x76, 0x7f, 0x56, 0xfb, 0x45, 0x61, 0x35, 0x46, 0x1b, 0xb0, - 0xda, 0x26, 0x4c, 0x70, 0x8e, 0xfd, 0xcd, 0xeb, 0x2f, 0x89, 0xc4, 0xca, 0xa8, 0xaf, 0x06, 0x67, - 0xf7, 0x03, 0x50, 0x70, 0xcd, 0x29, 0x0a, 0x56, 0xbb, 0xd2, 0x54, 0xcd, 0x1e, 0x38, 0xff, 0x32, - 0xe7, 0x2c, 0x32, 0xbe, 0x5b, 0xf1, 0xda, 0x2b, 0xaa, 0x49, 0x98, 0xbf, 0x17, 0xf2, 0x82, 0x79, - 0x4b, 0xb7, 0x70, 0xd5, 0xa8, 0xeb, 0xda, 0xf3, 0xb8, 0xd6, 0x03, 0xeb, 0x5f, 0x09, 0x4d, 0xd5, - 0x55, 0x1f, 0x39, 0xe1, 0xbc, 0x04, 0x39, 0xb7, 0x56, 0xa9, 0x68, 0x4d, 0xd3, 0xb0, 0x9c, 0x08, - 0x8e, 0xdf, 0x10, 0x33, 0xe5, 0xd2, 0x2d, 0x51, 0xb2, 0x62, 0x19, 0x86, 0x69, 0xb3, 0x57, 0x97, - 0xfc, 0x55, 0xce, 0x68, 0xc8, 0xa3, 0xe2, 0x89, 0xa3, 0x6a, 0x34, 0x4d, 0xd5, 0xea, 0x25, 0xff, - 0xfd, 0x3d, 0x91, 0x38, 0x38, 0x09, 0x4f, 0x1c, 0xce, 0x9e, 0x89, 0xc9, 0x6a, 0xdf, 0x03, 0x87, - 0x5f, 0x13, 0x89, 0x43, 0xd0, 0x70, 0x16, 0xa2, 0x60, 0xe8, 0x81, 0xc5, 0xdf, 0x17, 0x2c, 0x04, - 0x0d, 0x61, 0xf1, 0x8c, 0xb7, 0xd0, 0x5a, 0xb8, 0xae, 0xd9, 0x8e, 0xc5, 0xca, 0xe4, 0xfd, 0x59, - 0xfd, 0x83, 0xef, 0x06, 0x8b, 0x30, 0xc5, 0x47, 0x4a, 0x32, 0x11, 0x3f, 0x76, 0xa5, 0xbb, 0xa8, - 0x68, 0xc1, 0x7e, 0x5d, 0x64, 0x22, 0x1f, 0x19, 0x91, 0xcd, 0x57, 0x21, 0x12, 0xb3, 0x57, 0xc9, - 0xde, 0xa1, 0x07, 0x76, 0xff, 0x30, 0x24, 0xdc, 0x86, 0xa0, 0x25, 0x3c, 0x7d, 0xf5, 0x4f, 0x4b, - 0xbf, 0x8e, 0xf7, 0x7a, 0xf2, 0xce, 0x7f, 0x14, 0xaa, 0x7f, 0xae, 0x32, 0x4a, 0x96, 0x43, 0x46, - 0x42, 0xf5, 0x14, 0x8a, 0xba, 0x3f, 0x94, 0xff, 0xd1, 0x37, 0xb9, 0xbe, 0xc1, 0x72, 0xaa, 0xb8, - 0x4c, 0x9c, 0x3c, 0x58, 0xf4, 0x44, 0x33, 0xfb, 0xe8, 0x9b, 0xae, 0x9f, 0x07, 0x6a, 0x9e, 0xe2, - 0x45, 0x18, 0x0a, 0x14, 0x3c, 0xd1, 0xac, 0x3e, 0xc6, 0x59, 0x65, 0xfd, 0xf5, 0x4e, 0xf1, 0x0c, - 0x24, 0x48, 0xf1, 0x12, 0x4d, 0xfe, 0x97, 0x39, 0x39, 0x45, 0x2f, 0xbe, 0x1b, 0x52, 0xa2, 0x68, - 0x89, 0x26, 0xfd, 0x38, 0x27, 0x75, 0x49, 0x08, 0xb9, 0x28, 0x58, 0xa2, 0xc9, 0xff, 0x8a, 0x20, - 0x17, 0x24, 0x84, 0xbc, 0x77, 0x13, 0x7e, 0xf3, 0xc7, 0x13, 0x7c, 0xd1, 0x11, 0xb6, 0xbb, 0x00, - 0x83, 0xbc, 0x52, 0x89, 0xa6, 0xfe, 0x24, 0x1f, 0x5c, 0x50, 0x14, 0x9f, 0x84, 0x64, 0x8f, 0x06, - 0xff, 0x09, 0x4e, 0xca, 0xf0, 0x8b, 0xf3, 0x90, 0xf1, 0x55, 0x27, 0xd1, 0xe4, 0x7f, 0x8d, 0x93, - 0xfb, 0xa9, 0x88, 0xe8, 0xbc, 0x3a, 0x89, 0x66, 0xf0, 0x29, 0x21, 0x3a, 0xa7, 0x20, 0x66, 0x13, - 0x85, 0x49, 0x34, 0xf5, 0xa7, 0x85, 0xd5, 0x05, 0x49, 0xf1, 0x69, 0x48, 0xbb, 0x8b, 0x4d, 0x34, - 0xfd, 0x67, 0x38, 0xbd, 0x47, 0x43, 0x2c, 0xe0, 0x5b, 0xec, 0xa2, 0x59, 0xfc, 0xa4, 0xb0, 0x80, - 0x8f, 0x8a, 0x84, 0x51, 0xb8, 0x80, 0x89, 0xe6, 0xf4, 0x59, 0x11, 0x46, 0xa1, 0xfa, 0x85, 0xcc, - 0x26, 0xcd, 0xf9, 0xd1, 0x2c, 0x7e, 0x4a, 0xcc, 0x26, 0xc5, 0x27, 0x62, 0x84, 0x2b, 0x82, 0x68, - 0x1e, 0x7f, 0x5d, 0x88, 0x11, 0x2a, 0x08, 0x8a, 0xeb, 0x80, 0xda, 0xab, 0x81, 0x68, 0x7e, 0x9f, - 0xe3, 0xfc, 0x46, 0xdb, 0x8a, 0x81, 0xe2, 0xb3, 0x30, 0xd1, 0xb9, 0x12, 0x88, 0xe6, 0xfa, 0xf9, - 0x37, 0x43, 0x7b, 0x37, 0x7f, 0x21, 0x50, 0xdc, 0xf4, 0x96, 0x14, 0x7f, 0x15, 0x10, 0xcd, 0xf6, - 0x0b, 0x6f, 0x06, 0x13, 0xb7, 0xbf, 0x08, 0x28, 0xce, 0x01, 0x78, 0x0b, 0x70, 0x34, 0xaf, 0x2f, - 0x71, 0x5e, 0x3e, 0x22, 0x12, 0x1a, 0x7c, 0xfd, 0x8d, 0xa6, 0x7f, 0x49, 0x84, 0x06, 0xa7, 0x20, - 0xa1, 0x21, 0x96, 0xde, 0x68, 0xea, 0x2f, 0x8b, 0xd0, 0x10, 0x24, 0xc4, 0xb3, 0x7d, 0xab, 0x5b, - 0x34, 0x87, 0xaf, 0x08, 0xcf, 0xf6, 0x51, 0x15, 0x57, 0x61, 0xb4, 0x6d, 0x41, 0x8c, 0x66, 0xf5, - 0x33, 0x9c, 0x55, 0x2e, 0xbc, 0x1e, 0xfa, 0x17, 0x2f, 0xbe, 0x18, 0x46, 0x73, 0xfb, 0x6a, 0x68, - 0xf1, 0xe2, 0x6b, 0x61, 0xf1, 0x02, 0xa4, 0xf4, 0x56, 0xa3, 0x41, 0x82, 0x07, 0xed, 0x7f, 0xe7, - 0x2f, 0xff, 0x9f, 0xbe, 0xcf, 0xad, 0x23, 0x08, 0x8a, 0x67, 0x20, 0x89, 0x9b, 0x5b, 0xb8, 0x16, - 0x45, 0xf9, 0x9d, 0xef, 0x8b, 0x84, 0x49, 0xb0, 0x8b, 0x4f, 0x03, 0xb0, 0xa3, 0x11, 0xfa, 0x78, - 0x30, 0x82, 0xf6, 0x3f, 0x7f, 0x9f, 0xdf, 0xc6, 0xf1, 0x48, 0x3c, 0x06, 0xec, 0x6e, 0xcf, 0xfe, - 0x0c, 0xbe, 0x1b, 0x64, 0x40, 0x67, 0xe4, 0x3c, 0x0c, 0x3e, 0x67, 0x1b, 0xba, 0xa3, 0xd6, 0xa3, - 0xa8, 0xff, 0x0b, 0xa7, 0x16, 0xf8, 0xc4, 0x60, 0x4d, 0xc3, 0xc2, 0x8e, 0x5a, 0xb7, 0xa3, 0x68, - 0xff, 0x2b, 0xa7, 0x75, 0x09, 0x08, 0x71, 0x55, 0xb5, 0x9d, 0x5e, 0xf4, 0xfe, 0x6f, 0x82, 0x58, - 0x10, 0x10, 0xa1, 0xc9, 0xef, 0xeb, 0x78, 0x2f, 0x8a, 0xf6, 0x7b, 0x42, 0x68, 0x8e, 0x5f, 0x7c, - 0x37, 0xa4, 0xc9, 0x4f, 0x76, 0xc5, 0x2e, 0x82, 0xf8, 0x4f, 0x38, 0xb1, 0x47, 0x41, 0x46, 0xb6, - 0x9d, 0x9a, 0xa3, 0x45, 0x1b, 0xfb, 0x36, 0x9f, 0x69, 0x81, 0x5f, 0x9c, 0x83, 0x8c, 0xed, 0xd4, - 0x6a, 0x2d, 0x5e, 0x9f, 0x46, 0x90, 0xff, 0xf7, 0xef, 0xbb, 0x47, 0x16, 0x2e, 0x0d, 0x99, 0xed, - 0x9b, 0xd7, 0x1d, 0xd3, 0xa0, 0x8f, 0x40, 0xa2, 0x38, 0xbc, 0xc9, 0x39, 0xf8, 0x48, 0x8a, 0xf3, - 0x90, 0x25, 0xba, 0x58, 0xd8, 0xc4, 0xf4, 0x79, 0x55, 0x04, 0x8b, 0xff, 0xc1, 0x0d, 0x10, 0x20, - 0x2a, 0xfd, 0xc8, 0xb7, 0x5e, 0x9b, 0x94, 0x5e, 0x79, 0x6d, 0x52, 0xfa, 0xa3, 0xd7, 0x26, 0xa5, - 0x4f, 0x7f, 0x7b, 0xf2, 0xd0, 0x2b, 0xdf, 0x9e, 0x3c, 0xf4, 0x7b, 0xdf, 0x9e, 0x3c, 0xd4, 0xf9, - 0xd8, 0x18, 0x16, 0x8d, 0x45, 0x83, 0x1d, 0x18, 0xbf, 0x5f, 0x0e, 0x1c, 0x17, 0xd7, 0x0d, 0xef, - 0xb4, 0xd6, 0xdd, 0xe4, 0xc0, 0xc7, 0xe2, 0x30, 0x59, 0x35, 0xec, 0xa6, 0x61, 0xcf, 0x6e, 0xa9, - 0x36, 0x9e, 0xbd, 0xf1, 0xf8, 0x16, 0x76, 0xd4, 0xc7, 0x67, 0xab, 0x86, 0xa6, 0xf3, 0x63, 0xdf, - 0x31, 0xd6, 0x3f, 0x43, 0xfa, 0x67, 0x78, 0x7f, 0xa1, 0xe3, 0x09, 0xb1, 0xbc, 0x08, 0x89, 0x79, - 0x43, 0xd3, 0xd1, 0x38, 0x24, 0x6b, 0x58, 0x37, 0x9a, 0xfc, 0x06, 0x18, 0x6b, 0xa0, 0xfb, 0x60, - 0x40, 0x6d, 0x1a, 0x2d, 0xdd, 0x61, 0xc7, 0xe5, 0xa5, 0xcc, 0xb7, 0x6e, 0x4d, 0x1d, 0xfa, 0xfd, - 0x5b, 0x53, 0xf1, 0x25, 0xdd, 0x51, 0x78, 0x57, 0x31, 0xf1, 0xc6, 0xcb, 0x53, 0x92, 0x7c, 0x19, - 0x06, 0x17, 0x70, 0xf5, 0x20, 0xbc, 0x16, 0x70, 0x35, 0xc4, 0xeb, 0x21, 0x48, 0x2d, 0xe9, 0x0e, - 0xbb, 0xa3, 0x77, 0x1c, 0xe2, 0x9a, 0xce, 0x6e, 0x7d, 0x84, 0xc6, 0x27, 0x70, 0x82, 0xba, 0x80, - 0xab, 0x2e, 0x6a, 0x0d, 0x57, 0xc3, 0xa8, 0x84, 0x3d, 0x81, 0x97, 0x16, 0x7e, 0xef, 0xdf, 0x4f, - 0x1e, 0x7a, 0xe1, 0xb5, 0xc9, 0x43, 0xdd, 0xe6, 0x27, 0x60, 0x7e, 0x6e, 0x62, 0xf6, 0xe7, 0x51, - 0xbb, 0x76, 0x7d, 0x96, 0x84, 0x96, 0xbd, 0x35, 0x40, 0xed, 0xf6, 0x04, 0x7c, 0x3a, 0x06, 0x53, - 0xe1, 0x23, 0x75, 0xe2, 0xc7, 0xb6, 0xa3, 0x36, 0xcd, 0x6e, 0x2f, 0x44, 0x5d, 0x80, 0xf4, 0xa6, - 0xc0, 0x41, 0x79, 0x18, 0xb4, 0x71, 0xd5, 0xd0, 0x6b, 0x36, 0x15, 0x39, 0xae, 0x88, 0x26, 0x31, - 0xa0, 0xae, 0xea, 0x86, 0xcd, 0xef, 0x6b, 0xb2, 0x46, 0xe9, 0xa7, 0xa5, 0xfe, 0x1c, 0x6b, 0xd8, - 0x1d, 0x8a, 0x9a, 0x67, 0x5d, 0x7a, 0xff, 0xc3, 0xfb, 0x3d, 0x8d, 0xa0, 0xea, 0x79, 0x2a, 0xf8, - 0x1e, 0x3d, 0x4c, 0x86, 0x1f, 0x3d, 0x3c, 0x8b, 0x1b, 0x8d, 0x2b, 0xba, 0x71, 0x53, 0xdf, 0x0c, - 0x98, 0xe4, 0x5f, 0x49, 0x30, 0x4d, 0x2f, 0xa2, 0x5b, 0x4d, 0x4d, 0x77, 0x66, 0x1b, 0xda, 0x96, - 0x3d, 0xbb, 0xa5, 0x39, 0x36, 0xb3, 0x1c, 0xb7, 0xc9, 0xb8, 0x87, 0x31, 0x43, 0x30, 0x66, 0x08, - 0x86, 0x7c, 0x1a, 0x52, 0x25, 0xcd, 0x99, 0xb3, 0x2c, 0x75, 0x0f, 0x21, 0x48, 0x10, 0x18, 0x37, - 0x0a, 0xfd, 0x4d, 0x2c, 0x82, 0x1b, 0xb8, 0x69, 0xd3, 0x87, 0x5e, 0x09, 0x85, 0x35, 0x4a, 0x57, - 0xbb, 0xce, 0xe4, 0x05, 0x9f, 0xa6, 0x3e, 0x91, 0x7c, 0x3f, 0x59, 0x24, 0x74, 0x12, 0xd7, 0xd5, - 0xe7, 0xeb, 0x09, 0x38, 0xee, 0x43, 0xa8, 0x5a, 0x7b, 0xa6, 0x43, 0x43, 0xd2, 0xd8, 0xe6, 0xca, - 0x8c, 0xfa, 0x94, 0x61, 0xdd, 0x5d, 0xc2, 0x6c, 0x1b, 0x92, 0xeb, 0x84, 0x8e, 0x28, 0xe2, 0x18, - 0x8e, 0xda, 0xe0, 0xda, 0xb1, 0x06, 0x81, 0xb2, 0xcb, 0xf8, 0x31, 0x06, 0xd5, 0xc4, 0x3d, 0xfc, - 0x06, 0x56, 0xb7, 0xd9, 0xe5, 0xc7, 0x38, 0x7d, 0xf6, 0x99, 0x22, 0x00, 0x7a, 0xcf, 0x71, 0x1c, - 0x92, 0x6a, 0x8b, 0x3d, 0xb6, 0x8b, 0x9f, 0xc8, 0x2a, 0xac, 0x21, 0x5f, 0x81, 0x41, 0xfe, 0xa8, - 0x00, 0xe5, 0x20, 0x7e, 0x1d, 0xef, 0xd1, 0x71, 0xb2, 0x0a, 0xf9, 0x89, 0x66, 0x20, 0x49, 0x85, - 0xe7, 0xb7, 0xba, 0xf3, 0x33, 0x6d, 0xd2, 0xcf, 0x50, 0x21, 0x15, 0x86, 0x26, 0x5f, 0x86, 0xd4, - 0x82, 0xd1, 0xd4, 0x74, 0x23, 0xc8, 0x2d, 0xcd, 0xb8, 0x51, 0x99, 0xcd, 0x16, 0x0f, 0x67, 0x85, - 0x35, 0xd0, 0x04, 0x0c, 0xb0, 0xcb, 0xb0, 0xfc, 0xd1, 0x23, 0x6f, 0xc9, 0xf3, 0x30, 0x48, 0x79, - 0xaf, 0x99, 0x64, 0x7e, 0xdd, 0x8b, 0x48, 0x69, 0xfe, 0xc6, 0x03, 0x67, 0x1f, 0xf3, 0x84, 0x45, - 0x90, 0xa8, 0xa9, 0x8e, 0xca, 0xf5, 0xa6, 0xbf, 0xe5, 0xa7, 0x20, 0xc5, 0x99, 0xd8, 0xe8, 0x14, - 0xc4, 0x0d, 0xd3, 0xe6, 0x0f, 0x0f, 0x0b, 0xdd, 0x54, 0x59, 0x33, 0x4b, 0x09, 0x92, 0x08, 0x14, - 0x82, 0x5c, 0x52, 0xba, 0xfa, 0xcb, 0xb9, 0xfe, 0xfd, 0x85, 0x0d, 0xe3, 0x3a, 0xcb, 0x57, 0x62, - 0x30, 0xe9, 0xeb, 0xbd, 0x81, 0x2d, 0x52, 0x2f, 0x07, 0x5c, 0x1f, 0xf9, 0x84, 0xe4, 0xfd, 0x5d, - 0xdc, 0xe5, 0xdd, 0x10, 0x9f, 0x33, 0x4d, 0x54, 0x80, 0x14, 0x7b, 0x48, 0x68, 0x30, 0x7f, 0x49, - 0x28, 0x6e, 0x9b, 0xf4, 0xd9, 0xc6, 0xb6, 0x73, 0x53, 0xb5, 0xdc, 0xd7, 0x40, 0x44, 0x5b, 0x3e, - 0x0f, 0xe9, 0x79, 0x43, 0xb7, 0xb1, 0x6e, 0xb7, 0x68, 0xe8, 0x6c, 0x35, 0x8c, 0xea, 0x75, 0xce, - 0x81, 0x35, 0x88, 0xc1, 0x55, 0xd3, 0xa4, 0x94, 0x09, 0x85, 0xfc, 0x64, 0xa9, 0xb7, 0xb4, 0xd1, - 0xd5, 0x44, 0xe7, 0xfb, 0x37, 0x11, 0x57, 0xd2, 0xb5, 0xd1, 0x1f, 0x48, 0x70, 0xac, 0x3d, 0xa0, - 0xae, 0xe3, 0x3d, 0xbb, 0xdf, 0x78, 0x3a, 0x07, 0xe9, 0x75, 0xfa, 0x2e, 0xe6, 0x15, 0xbc, 0x87, - 0x0a, 0x30, 0x88, 0x6b, 0xa7, 0xce, 0x9c, 0x79, 0xfc, 0x3c, 0xf3, 0xf6, 0x4b, 0x87, 0x14, 0x01, - 0x28, 0xa6, 0x88, 0x56, 0x6f, 0x7c, 0x65, 0x4a, 0x2a, 0x25, 0x21, 0x6e, 0xb7, 0x9a, 0x77, 0xd5, - 0x07, 0xbe, 0x90, 0x0c, 0x24, 0x40, 0x96, 0x51, 0x6f, 0xa8, 0x0d, 0xad, 0xa6, 0x7a, 0x6f, 0xc9, - 0xe6, 0x7c, 0x3a, 0x52, 0x8c, 0xce, 0x2a, 0x16, 0xf6, 0xb5, 0x94, 0xfc, 0x2b, 0x12, 0x64, 0xaf, - 0x09, 0xce, 0x1b, 0xd8, 0x41, 0x17, 0x00, 0xdc, 0x91, 0x44, 0x58, 0x1c, 0x9d, 0x09, 0x8f, 0x35, - 0xe3, 0xd2, 0x28, 0x3e, 0x74, 0xf4, 0x24, 0x75, 0x34, 0xd3, 0xb0, 0xf9, 0x3b, 0x02, 0x11, 0xa4, - 0x2e, 0x32, 0x7a, 0x04, 0x10, 0xcd, 0x60, 0x95, 0x1b, 0x86, 0xa3, 0xe9, 0xf5, 0x8a, 0x69, 0xdc, - 0xe4, 0x2f, 0x54, 0xc5, 0x95, 0x1c, 0xed, 0xb9, 0x46, 0x3b, 0xd6, 0x09, 0x9c, 0x08, 0x9d, 0x76, - 0xb9, 0x90, 0xf5, 0x4f, 0xad, 0xd5, 0x2c, 0x6c, 0xdb, 0x3c, 0x49, 0x89, 0x26, 0xba, 0x00, 0x83, - 0x66, 0x6b, 0xab, 0x22, 0x32, 0x42, 0xe6, 0xd4, 0xb1, 0x4e, 0xf1, 0x2d, 0xe6, 0x9f, 0x47, 0xf8, - 0x80, 0xd9, 0xda, 0x22, 0xde, 0x70, 0x2f, 0x64, 0x3b, 0x08, 0x93, 0xb9, 0xe1, 0xc9, 0x41, 0x5f, - 0xf1, 0xe5, 0x1a, 0x54, 0x4c, 0x4b, 0x33, 0x2c, 0xcd, 0xd9, 0xa3, 0x4f, 0xf8, 0xe3, 0x4a, 0x4e, - 0x74, 0xac, 0x73, 0xb8, 0x7c, 0x1d, 0x46, 0x36, 0xb4, 0xa6, 0x49, 0xef, 0xa4, 0x70, 0xc9, 0xcf, - 0x78, 0xf2, 0x49, 0xd1, 0xf2, 0x75, 0x95, 0x2c, 0xd6, 0x26, 0x59, 0xe9, 0x99, 0xae, 0xde, 0xf9, - 0x64, 0xff, 0xde, 0x19, 0x2c, 0x58, 0xfe, 0xb4, 0x10, 0x08, 0x3e, 0xbe, 0xdc, 0xfb, 0xd2, 0x53, - 0xaf, 0x8e, 0x19, 0x55, 0xf6, 0x14, 0x22, 0x8b, 0x80, 0xc2, 0xfe, 0xcb, 0x6a, 0x21, 0x22, 0x91, - 0x16, 0x22, 0x83, 0x4c, 0x3e, 0x0f, 0x43, 0xeb, 0xaa, 0xe5, 0x6c, 0x60, 0xe7, 0x12, 0x56, 0x6b, - 0xd8, 0x0a, 0xae, 0xbb, 0x43, 0x62, 0xdd, 0x45, 0x90, 0xa0, 0x8b, 0x2b, 0x5b, 0x77, 0xe8, 0x6f, - 0x79, 0x07, 0x12, 0xf4, 0x1e, 0x90, 0xbb, 0x26, 0x73, 0x0a, 0xb6, 0x26, 0x93, 0x6c, 0xba, 0xe7, - 0x60, 0x9b, 0x93, 0xb0, 0x06, 0x3a, 0x2d, 0x56, 0xd6, 0xf8, 0xfe, 0x2b, 0x2b, 0x77, 0x55, 0xbe, - 0xbe, 0x36, 0x60, 0xb0, 0x44, 0x92, 0xf1, 0xd2, 0x82, 0x2b, 0x88, 0xe4, 0x09, 0x82, 0x56, 0x60, - 0xc4, 0x54, 0x2d, 0x87, 0x5e, 0x80, 0xde, 0xa1, 0x5a, 0xf0, 0x68, 0x98, 0x6a, 0x8f, 0xcd, 0x80, - 0xb2, 0x7c, 0x94, 0x21, 0xd3, 0x0f, 0x94, 0xff, 0x38, 0x01, 0x03, 0xdc, 0x18, 0xef, 0x86, 0x41, - 0x6e, 0x56, 0xee, 0xbf, 0xc7, 0x67, 0xda, 0x97, 0xa6, 0x19, 0x77, 0x09, 0xe1, 0xfc, 0x04, 0x0d, - 0x7a, 0x00, 0x52, 0xd5, 0x1d, 0x55, 0xd3, 0x2b, 0x5a, 0x4d, 0xd4, 0xf2, 0xaf, 0xdd, 0x9a, 0x1a, - 0x9c, 0x27, 0xb0, 0xa5, 0x05, 0x65, 0x90, 0x76, 0x2e, 0xd5, 0x48, 0x2d, 0xb0, 0x83, 0xb5, 0xfa, - 0x8e, 0xc3, 0x63, 0x90, 0xb7, 0xd0, 0x39, 0x48, 0x10, 0x97, 0xe1, 0xef, 0xc7, 0x14, 0xda, 0xf6, - 0x58, 0x6e, 0xdd, 0x5a, 0x4a, 0x91, 0x81, 0x3f, 0xfd, 0x87, 0x53, 0x92, 0x42, 0x29, 0xd0, 0x3c, - 0x0c, 0x35, 0x54, 0xdb, 0xa9, 0xd0, 0x35, 0x8c, 0x0c, 0x9f, 0xa4, 0x2c, 0x8e, 0xb4, 0x1b, 0x84, - 0x1b, 0x96, 0x8b, 0x9e, 0x21, 0x54, 0x0c, 0x54, 0x43, 0x27, 0x20, 0x47, 0x99, 0x54, 0x8d, 0x66, - 0x53, 0x73, 0x58, 0x75, 0x35, 0x40, 0xed, 0x3e, 0x4c, 0xe0, 0xf3, 0x14, 0x4c, 0x6b, 0xac, 0xa3, - 0x90, 0xa6, 0x17, 0xf2, 0x29, 0x0a, 0xbb, 0x7c, 0x96, 0x22, 0x00, 0xda, 0xf9, 0x20, 0x8c, 0x78, - 0x19, 0x94, 0xa1, 0xa4, 0x18, 0x17, 0x0f, 0x4c, 0x11, 0x1f, 0x83, 0x71, 0x1d, 0xef, 0xd2, 0xeb, - 0x70, 0x01, 0xec, 0x34, 0xc5, 0x46, 0xa4, 0xef, 0x5a, 0x90, 0xe2, 0x5d, 0x30, 0x5c, 0x15, 0xc6, - 0x67, 0xb8, 0x40, 0x71, 0x87, 0x5c, 0x28, 0x45, 0x3b, 0x02, 0x29, 0xd5, 0x34, 0x19, 0x42, 0x86, - 0x67, 0x50, 0xd3, 0xa4, 0x5d, 0x27, 0x61, 0x94, 0xea, 0x68, 0x61, 0xbb, 0xd5, 0x70, 0x38, 0x93, - 0x2c, 0xc5, 0x19, 0x21, 0x1d, 0x0a, 0x83, 0x53, 0xdc, 0xfb, 0x60, 0x08, 0xdf, 0xd0, 0x6a, 0x58, - 0xaf, 0x62, 0x86, 0x37, 0x44, 0xf1, 0xb2, 0x02, 0x48, 0x91, 0x1e, 0x02, 0x37, 0x33, 0x56, 0x44, - 0xd6, 0x1e, 0x66, 0xfc, 0x04, 0x7c, 0x8e, 0x81, 0xe5, 0x47, 0x20, 0xb1, 0xa0, 0x3a, 0x2a, 0x29, - 0x31, 0x9c, 0x5d, 0xb6, 0x14, 0x65, 0x15, 0xf2, 0xb3, 0x63, 0xb8, 0xbd, 0x11, 0x83, 0xc4, 0x35, - 0xc3, 0xc1, 0xe8, 0x09, 0x5f, 0x59, 0x38, 0xdc, 0xc9, 0xc7, 0x37, 0xb4, 0xba, 0x8e, 0x6b, 0x2b, - 0x76, 0xdd, 0xf7, 0xa6, 0xac, 0xe7, 0x62, 0xb1, 0x80, 0x8b, 0x8d, 0x43, 0xd2, 0x32, 0x5a, 0x7a, - 0x4d, 0xdc, 0xe5, 0xa2, 0x0d, 0x54, 0x86, 0x94, 0xeb, 0x39, 0x89, 0x28, 0xcf, 0x19, 0x21, 0x9e, - 0x43, 0xfc, 0x9a, 0x03, 0x94, 0xc1, 0x2d, 0xee, 0x40, 0x25, 0x48, 0xbb, 0x29, 0x8f, 0x7b, 0x60, - 0x6f, 0x4e, 0xec, 0x91, 0x91, 0x25, 0xc8, 0xf5, 0x07, 0xd7, 0xa0, 0xcc, 0x0b, 0x73, 0x6e, 0x07, - 0xb7, 0x68, 0xc0, 0xd5, 0xf8, 0x5b, 0xbb, 0x83, 0x54, 0x2f, 0xcf, 0xd5, 0xd8, 0x9b, 0xbb, 0xc7, - 0x20, 0x6d, 0x6b, 0x75, 0x5d, 0x75, 0x5a, 0x16, 0xe6, 0xde, 0xe8, 0x01, 0xe4, 0xcf, 0xc4, 0x60, - 0x80, 0x79, 0xb7, 0xcf, 0x6e, 0x52, 0x67, 0xbb, 0xc5, 0xba, 0xd9, 0x2d, 0x7e, 0x70, 0xbb, 0xcd, - 0x01, 0xb8, 0xc2, 0xd8, 0xfc, 0xad, 0xcb, 0x0e, 0x75, 0x06, 0x13, 0x71, 0x43, 0xab, 0xf3, 0xe0, - 0xf5, 0x11, 0xb9, 0x1e, 0x94, 0xf4, 0xe5, 0xc9, 0x0b, 0x90, 0xde, 0xd2, 0x9c, 0x8a, 0x4a, 0x36, - 0x8f, 0xd4, 0x84, 0x99, 0x53, 0x93, 0x33, 0x9d, 0x76, 0x99, 0x33, 0x62, 0x8b, 0xa9, 0xa4, 0xb6, - 0xf8, 0x2f, 0xf9, 0x0f, 0x24, 0x52, 0x2b, 0xf3, 0x01, 0xd1, 0x1c, 0x0c, 0x09, 0x45, 0x2b, 0xdb, - 0x0d, 0xb5, 0xce, 0x9d, 0xf1, 0x78, 0x57, 0x6d, 0x2f, 0x36, 0xd4, 0xba, 0x92, 0xe1, 0x0a, 0x92, - 0x46, 0xe7, 0x89, 0x8d, 0x75, 0x99, 0xd8, 0x80, 0x27, 0xc5, 0x0f, 0xe6, 0x49, 0x81, 0x39, 0x4f, - 0x84, 0xe7, 0xfc, 0x1b, 0x31, 0xba, 0x67, 0x32, 0x0d, 0x5b, 0x6d, 0xbc, 0x1d, 0x21, 0x76, 0x14, - 0xd2, 0xa6, 0xd1, 0xa8, 0xb0, 0x1e, 0x76, 0x69, 0x32, 0x65, 0x1a, 0x0d, 0xa5, 0xcd, 0x8f, 0x92, - 0x77, 0x28, 0xfe, 0x06, 0xee, 0x80, 0xd5, 0x06, 0xc3, 0x56, 0xb3, 0x20, 0xcb, 0x4c, 0xc1, 0x17, - 0xcc, 0xc7, 0x88, 0x0d, 0xe8, 0x0a, 0x2c, 0xb5, 0x2f, 0xf0, 0x4c, 0x6c, 0x86, 0xa9, 0x70, 0x3c, - 0x42, 0xc1, 0xd6, 0x97, 0x4e, 0x9b, 0x6d, 0xbf, 0x9f, 0x2b, 0x1c, 0x4f, 0xfe, 0x69, 0x09, 0x60, - 0x99, 0x58, 0x96, 0xea, 0x4b, 0x96, 0x3a, 0x9b, 0x8a, 0x50, 0x09, 0x8c, 0x3c, 0xd9, 0x6d, 0xd2, - 0xf8, 0xf8, 0x59, 0xdb, 0x2f, 0xf7, 0x3c, 0x0c, 0x79, 0xce, 0x68, 0x63, 0x21, 0xcc, 0xe4, 0x3e, - 0xc5, 0xfd, 0x06, 0x76, 0x94, 0xec, 0x0d, 0x5f, 0x4b, 0xfe, 0xa7, 0x12, 0xa4, 0xa9, 0x4c, 0x2b, - 0xd8, 0x51, 0x03, 0x73, 0x28, 0x1d, 0x7c, 0x0e, 0x8f, 0x03, 0x30, 0x36, 0xb6, 0xf6, 0x3c, 0xe6, - 0x9e, 0x95, 0xa6, 0x90, 0x0d, 0xed, 0x79, 0x8c, 0xce, 0xba, 0x06, 0x8f, 0xef, 0x6f, 0x70, 0x51, - 0xfc, 0x73, 0xb3, 0xdf, 0x03, 0x83, 0xf4, 0x6b, 0x26, 0xbb, 0x36, 0xaf, 0xe7, 0x07, 0xf4, 0x56, - 0x73, 0x73, 0xd7, 0x96, 0x9f, 0x83, 0xc1, 0xcd, 0x5d, 0x76, 0x04, 0x73, 0x14, 0xd2, 0x96, 0x61, - 0xf0, 0x85, 0x9f, 0x15, 0x5c, 0x29, 0x02, 0xa0, 0xeb, 0x9c, 0x38, 0x76, 0x88, 0x79, 0xc7, 0x0e, - 0xde, 0xb9, 0x49, 0xbc, 0xa7, 0x73, 0x93, 0x93, 0xff, 0x46, 0x82, 0x8c, 0x2f, 0x3f, 0xa0, 0xc7, - 0xe1, 0x70, 0x69, 0x79, 0x6d, 0xfe, 0x4a, 0x65, 0x69, 0xa1, 0x72, 0x71, 0x79, 0x6e, 0xd1, 0x7b, - 0x2d, 0xa0, 0x30, 0xf1, 0xe2, 0x4b, 0xd3, 0xc8, 0x87, 0x7b, 0x55, 0xbf, 0xae, 0x1b, 0x37, 0x75, - 0x34, 0x0b, 0xe3, 0x41, 0x92, 0xb9, 0xd2, 0x46, 0x79, 0x75, 0x33, 0x27, 0x15, 0x0e, 0xbf, 0xf8, - 0xd2, 0xf4, 0xa8, 0x8f, 0x62, 0x6e, 0xcb, 0xc6, 0xba, 0xd3, 0x4e, 0x30, 0xbf, 0xb6, 0xb2, 0xb2, - 0xb4, 0x99, 0x8b, 0xb5, 0x11, 0xf0, 0x15, 0xe0, 0x21, 0x18, 0x0d, 0x12, 0xac, 0x2e, 0x2d, 0xe7, - 0xe2, 0x05, 0xf4, 0xe2, 0x4b, 0xd3, 0xc3, 0x3e, 0xec, 0x55, 0xad, 0x51, 0x48, 0x7d, 0xe2, 0xab, - 0x93, 0x87, 0x7e, 0xee, 0x67, 0x27, 0x25, 0xa2, 0xd9, 0x50, 0x20, 0x47, 0xa0, 0x47, 0xe0, 0x9e, - 0x8d, 0xa5, 0xc5, 0xd5, 0xf2, 0x42, 0x65, 0x65, 0x63, 0xb1, 0xc2, 0xbe, 0x87, 0xe0, 0x6a, 0x37, - 0xf2, 0xe2, 0x4b, 0xd3, 0x19, 0xae, 0x52, 0x37, 0xec, 0x75, 0xa5, 0x7c, 0x6d, 0x6d, 0xb3, 0x9c, - 0x93, 0x18, 0xf6, 0xba, 0x85, 0x6f, 0x18, 0x0e, 0xfb, 0xdc, 0xd1, 0x63, 0x70, 0xa4, 0x03, 0xb6, - 0xab, 0xd8, 0xe8, 0x8b, 0x2f, 0x4d, 0x0f, 0xad, 0x5b, 0x98, 0xc5, 0x0f, 0xa5, 0x98, 0x81, 0x7c, - 0x3b, 0xc5, 0xda, 0xfa, 0xda, 0xc6, 0xdc, 0x72, 0x6e, 0xba, 0x90, 0x7b, 0xf1, 0xa5, 0xe9, 0xac, - 0x48, 0x86, 0x04, 0xdf, 0xd3, 0xec, 0x6e, 0x6e, 0xbc, 0xfe, 0x6a, 0x0c, 0x26, 0xdb, 0x2e, 0x5f, - 0xf3, 0x47, 0x16, 0xdd, 0x0e, 0x8a, 0x8b, 0x90, 0x5a, 0x10, 0x4f, 0x42, 0xfa, 0x3d, 0x27, 0xfe, - 0xa9, 0x3e, 0xcf, 0x89, 0x87, 0xc4, 0x48, 0xe2, 0x98, 0xf8, 0x64, 0xf4, 0x31, 0xb1, 0x90, 0xff, - 0x00, 0xa7, 0xc4, 0xff, 0xe1, 0x61, 0xb8, 0x9f, 0x1f, 0xae, 0xdb, 0x8e, 0x7a, 0x5d, 0xd3, 0xeb, - 0xee, 0x23, 0x0c, 0xde, 0xe6, 0x46, 0x99, 0xe0, 0x4f, 0x31, 0x04, 0x74, 0xdf, 0x07, 0x19, 0x85, - 0x7d, 0xf7, 0xb6, 0xd1, 0x7b, 0xd6, 0x88, 0x19, 0x2a, 0x44, 0x3c, 0x72, 0x91, 0x3f, 0x29, 0xc1, - 0xf0, 0x25, 0xcd, 0x76, 0x0c, 0x4b, 0xab, 0xaa, 0x0d, 0xfa, 0x96, 0xc3, 0xd9, 0x5e, 0x17, 0x8d, - 0x50, 0x0e, 0x7b, 0x1a, 0x06, 0x6e, 0xa8, 0x0d, 0x96, 0xad, 0xe3, 0xf4, 0xab, 0x0c, 0x9d, 0x0d, - 0xe1, 0xe5, 0x6c, 0xc1, 0x80, 0x91, 0xc9, 0xbf, 0x18, 0x83, 0x11, 0x1a, 0xe5, 0x36, 0xfb, 0x0c, - 0x0f, 0xd9, 0xa1, 0x96, 0x20, 0x61, 0xa9, 0x0e, 0x3f, 0x74, 0x2d, 0xcd, 0xf0, 0x87, 0x23, 0x0f, - 0x44, 0x3f, 0xf0, 0x98, 0x59, 0xc0, 0x55, 0x85, 0xd2, 0xa2, 0x1f, 0x86, 0x54, 0x53, 0xdd, 0xad, - 0x50, 0x3e, 0x6c, 0xdf, 0x37, 0xd7, 0x1f, 0x9f, 0xdb, 0xb7, 0xa6, 0x46, 0xf6, 0xd4, 0x66, 0xa3, - 0x28, 0x0b, 0x3e, 0xb2, 0x32, 0xd8, 0x54, 0x77, 0x89, 0x88, 0xc8, 0x84, 0x11, 0x02, 0xad, 0xee, - 0xa8, 0x7a, 0x1d, 0xb3, 0x41, 0xe8, 0x11, 0x72, 0xe9, 0x52, 0xdf, 0x83, 0x4c, 0x78, 0x83, 0xf8, - 0xd8, 0xc9, 0xca, 0x50, 0x53, 0xdd, 0x9d, 0xa7, 0x00, 0x32, 0x62, 0x31, 0xf5, 0xb9, 0x97, 0xa7, - 0x0e, 0xd1, 0x07, 0x4e, 0xaf, 0x4a, 0x00, 0x9e, 0xc5, 0xd0, 0x0f, 0x43, 0xae, 0xea, 0xb6, 0x28, - 0xad, 0xcd, 0xe7, 0xf0, 0xc1, 0x6e, 0x73, 0x11, 0xb2, 0x37, 0x2b, 0x3a, 0x5e, 0xb9, 0x35, 0x25, - 0x29, 0x23, 0xd5, 0xd0, 0x54, 0x7c, 0x00, 0x32, 0x2d, 0xb3, 0xa6, 0x3a, 0xb8, 0x42, 0x77, 0xc1, - 0xb1, 0xc8, 0x02, 0x66, 0x92, 0xf0, 0xba, 0x7d, 0x6b, 0x0a, 0x31, 0xb5, 0x7c, 0xc4, 0x32, 0x2d, - 0x6b, 0x80, 0x41, 0x08, 0x81, 0x4f, 0xa7, 0xdf, 0x96, 0x20, 0xb3, 0xe0, 0xbb, 0x6d, 0x94, 0x87, - 0xc1, 0xa6, 0xa1, 0x6b, 0xd7, 0xb9, 0x3f, 0xa6, 0x15, 0xd1, 0x44, 0x05, 0x48, 0xb1, 0x17, 0xbf, - 0x9c, 0x3d, 0x71, 0x94, 0x2c, 0xda, 0x84, 0xea, 0x26, 0xde, 0xb2, 0x35, 0x31, 0x1b, 0x8a, 0x68, - 0xa2, 0x8b, 0x90, 0xb3, 0x71, 0xb5, 0x65, 0x69, 0xce, 0x5e, 0xa5, 0x6a, 0xe8, 0x8e, 0x5a, 0x75, - 0xd8, 0x2b, 0x44, 0xa5, 0xa3, 0xb7, 0x6f, 0x4d, 0xdd, 0xc3, 0x64, 0x0d, 0x63, 0xc8, 0xca, 0x88, - 0x00, 0xcd, 0x33, 0x08, 0x19, 0xa1, 0x86, 0x1d, 0x55, 0x6b, 0xd8, 0xb4, 0x26, 0x4c, 0x2b, 0xa2, - 0xe9, 0xd3, 0xe5, 0x27, 0x06, 0xfd, 0x07, 0x87, 0x17, 0x21, 0x67, 0x98, 0xd8, 0x0a, 0x54, 0xd8, - 0x52, 0x78, 0xe4, 0x30, 0x86, 0xac, 0x8c, 0x08, 0x90, 0xa8, 0xbe, 0x2f, 0x92, 0x69, 0x16, 0xdb, - 0x6c, 0xb3, 0xb5, 0x25, 0xce, 0x1b, 0x03, 0x7c, 0xc2, 0x18, 0x32, 0x99, 0x50, 0x0e, 0x5a, 0xa7, - 0x10, 0x52, 0x21, 0x3f, 0xa7, 0x6a, 0x0d, 0xf1, 0x72, 0xab, 0xc2, 0x5b, 0x68, 0x09, 0x06, 0x6c, - 0x47, 0x75, 0x5a, 0xac, 0x16, 0x49, 0x96, 0x1e, 0xff, 0xdf, 0xb7, 0xa6, 0x1e, 0xed, 0xc1, 0x89, - 0x4b, 0x86, 0x5e, 0xdb, 0xa0, 0x84, 0x0a, 0x67, 0x80, 0x2e, 0xc2, 0x80, 0x63, 0x5c, 0xc7, 0x3a, - 0xb7, 0x51, 0x5f, 0x01, 0x4c, 0x9f, 0xd5, 0x32, 0x6a, 0xe4, 0x40, 0xae, 0x86, 0x1b, 0xb8, 0xce, - 0x0a, 0xc2, 0x1d, 0x95, 0x6c, 0xc4, 0xe8, 0x07, 0xa6, 0x4a, 0x4b, 0x7d, 0x47, 0x19, 0x37, 0x50, - 0x98, 0x9f, 0xac, 0x8c, 0xb8, 0xa0, 0x0d, 0x0a, 0x41, 0x57, 0x02, 0xf7, 0xde, 0xf8, 0x57, 0xd8, - 0xee, 0xeb, 0x16, 0x4a, 0x3e, 0xa7, 0x15, 0xc7, 0x37, 0xfe, 0x5b, 0x73, 0x17, 0x21, 0xd7, 0xd2, - 0xb7, 0x0c, 0x9d, 0xbe, 0x90, 0xc6, 0x77, 0x26, 0x64, 0xab, 0x1b, 0xf7, 0xcf, 0x5a, 0x18, 0x43, - 0x56, 0x46, 0x5c, 0xd0, 0x25, 0xb6, 0x7f, 0xa9, 0xc1, 0xb0, 0x87, 0x45, 0x23, 0x31, 0x1d, 0x19, - 0x89, 0xf7, 0xf2, 0x48, 0x3c, 0x1c, 0x1e, 0xc5, 0x0b, 0xc6, 0x21, 0x17, 0x48, 0xc8, 0xd0, 0x25, - 0x00, 0x2f, 0xfe, 0xe9, 0x31, 0x4e, 0xe6, 0x94, 0x1c, 0x9d, 0x44, 0xc4, 0xd6, 0xd7, 0xa3, 0x45, - 0x1f, 0x86, 0xb1, 0xa6, 0xa6, 0x57, 0x6c, 0xdc, 0xd8, 0xae, 0x70, 0x03, 0x13, 0x96, 0xf4, 0x83, - 0x22, 0xa5, 0xe5, 0xfe, 0xfc, 0xe1, 0xf6, 0xad, 0xa9, 0x02, 0xcf, 0x91, 0xed, 0x2c, 0x65, 0x65, - 0xb4, 0xa9, 0xe9, 0x1b, 0xb8, 0xb1, 0xbd, 0xe0, 0xc2, 0x8a, 0xd9, 0x4f, 0xbc, 0x3c, 0x75, 0x88, - 0xc7, 0xe3, 0x21, 0xf9, 0x2c, 0x7d, 0xf8, 0xc0, 0xe3, 0x08, 0xdb, 0x64, 0x37, 0xa5, 0x8a, 0x06, - 0x3d, 0xf0, 0x49, 0x2b, 0x1e, 0x80, 0xc5, 0xf1, 0x0b, 0xff, 0x6e, 0x5a, 0x92, 0x7f, 0x41, 0x82, - 0x81, 0x85, 0x6b, 0xeb, 0xaa, 0x66, 0xa1, 0x25, 0x18, 0xf5, 0x3c, 0x27, 0x18, 0xc5, 0xc7, 0x6e, - 0xdf, 0x9a, 0xca, 0x87, 0x9d, 0xcb, 0x0d, 0x63, 0xcf, 0x81, 0x45, 0x1c, 0x2f, 0x75, 0xdb, 0x72, - 0x07, 0x58, 0xb5, 0xa1, 0xc8, 0xed, 0x1b, 0xf2, 0x90, 0x9a, 0x65, 0x18, 0x64, 0xd2, 0xda, 0xa8, - 0x08, 0x49, 0x93, 0xfc, 0xe0, 0x4f, 0x56, 0x26, 0xbb, 0x3a, 0x2f, 0xc5, 0x77, 0xcf, 0x79, 0x09, - 0x89, 0xfc, 0x99, 0x18, 0xc0, 0xc2, 0xb5, 0x6b, 0x9b, 0x96, 0x66, 0x36, 0xb0, 0x73, 0x27, 0x35, - 0xdf, 0x84, 0xc3, 0xbe, 0xfd, 0x9d, 0x55, 0x0d, 0x69, 0x3f, 0x7d, 0xfb, 0xd6, 0xd4, 0xb1, 0xb0, - 0xf6, 0x3e, 0x34, 0x59, 0x19, 0xf3, 0x76, 0x7a, 0x56, 0xb5, 0x23, 0xd7, 0x9a, 0xed, 0xb8, 0x5c, - 0xe3, 0xdd, 0xb9, 0xfa, 0xd0, 0xfc, 0x5c, 0x17, 0x6c, 0xa7, 0xb3, 0x69, 0x37, 0x20, 0xe3, 0x99, - 0xc4, 0x46, 0x0b, 0x90, 0x72, 0xf8, 0x6f, 0x6e, 0x61, 0xb9, 0xbb, 0x85, 0x05, 0x19, 0xb7, 0xb2, - 0x4b, 0x29, 0xff, 0x99, 0x04, 0xe0, 0xf9, 0xec, 0x0f, 0xa6, 0x8b, 0x91, 0x54, 0xce, 0x13, 0x6f, - 0xfc, 0x40, 0xb5, 0x18, 0xa7, 0x0e, 0xd9, 0xf3, 0xc7, 0x63, 0x30, 0x76, 0x55, 0x64, 0x9e, 0x1f, - 0x78, 0x1b, 0xac, 0xc3, 0x20, 0xd6, 0x1d, 0x4b, 0xa3, 0x46, 0x20, 0xb3, 0xfd, 0x58, 0xb7, 0xd9, - 0xee, 0xa0, 0x13, 0xfd, 0xa2, 0x8a, 0x78, 0x26, 0xc1, 0xd9, 0x84, 0xac, 0xf1, 0xa9, 0x38, 0xe4, - 0xbb, 0x51, 0xa2, 0x79, 0x18, 0xa9, 0x5a, 0x98, 0x02, 0x2a, 0xfe, 0x43, 0xd0, 0x52, 0xc1, 0x2b, - 0x1d, 0x43, 0x08, 0xb2, 0x32, 0x2c, 0x20, 0x7c, 0xf5, 0xa8, 0x03, 0xa9, 0xeb, 0x88, 0xdb, 0x11, - 0xac, 0x1e, 0x0b, 0x39, 0x99, 0x2f, 0x1f, 0x62, 0x90, 0x20, 0x03, 0xb6, 0x7e, 0x0c, 0x7b, 0x50, - 0xba, 0x80, 0x7c, 0x10, 0x46, 0x34, 0x5d, 0x73, 0x34, 0xb5, 0x51, 0xd9, 0x52, 0x1b, 0xaa, 0x5e, - 0x3d, 0x48, 0x59, 0xcc, 0x52, 0x3e, 0x1f, 0x36, 0xc4, 0x4e, 0x56, 0x86, 0x39, 0xa4, 0xc4, 0x00, - 0xe8, 0x12, 0x0c, 0x8a, 0xa1, 0x12, 0x07, 0xaa, 0x36, 0x04, 0xb9, 0xbf, 0x82, 0x8b, 0xc3, 0xa8, - 0x82, 0x6b, 0xff, 0x7f, 0x2a, 0xfa, 0x9b, 0x8a, 0x15, 0x00, 0x16, 0xee, 0x24, 0xc1, 0x1e, 0x60, - 0x36, 0x48, 0xc2, 0x48, 0x33, 0x0e, 0x0b, 0xb6, 0xe3, 0x9b, 0x8f, 0x5b, 0x31, 0xc8, 0xfa, 0xe7, - 0xe3, 0x2f, 0xe8, 0xaa, 0x84, 0x96, 0xbc, 0x4c, 0x94, 0xe0, 0x1f, 0xa2, 0xec, 0x92, 0x89, 0xda, - 0xbc, 0x77, 0xff, 0x14, 0xf4, 0xa7, 0x31, 0x18, 0x58, 0x57, 0x2d, 0xb5, 0x69, 0xa3, 0x6a, 0x5b, - 0xa5, 0x29, 0x0e, 0x4e, 0xdb, 0xbe, 0x22, 0xcc, 0x0f, 0x1d, 0x22, 0x0a, 0xcd, 0xcf, 0x75, 0x28, - 0x34, 0xdf, 0x03, 0xc3, 0x64, 0xbf, 0xeb, 0xbb, 0x03, 0x42, 0xac, 0x3d, 0x54, 0x3a, 0xe2, 0x71, - 0x09, 0xf6, 0xb3, 0xed, 0xf0, 0x35, 0xff, 0x25, 0x90, 0x0c, 0xc1, 0xf0, 0x12, 0x33, 0x21, 0x9f, - 0xf0, 0xf6, 0x9d, 0xbe, 0x4e, 0x59, 0x81, 0xa6, 0xba, 0x5b, 0x66, 0x0d, 0xb4, 0x0c, 0x68, 0xc7, - 0x3d, 0xfa, 0xa8, 0x78, 0xe6, 0x24, 0xf4, 0xc7, 0x6f, 0xdf, 0x9a, 0x3a, 0xc2, 0xe8, 0xdb, 0x71, - 0x64, 0x65, 0xd4, 0x03, 0x0a, 0x6e, 0xa7, 0x01, 0x88, 0x5e, 0x15, 0x76, 0x85, 0x94, 0x6d, 0x77, - 0x0e, 0xdf, 0xbe, 0x35, 0x35, 0xca, 0xb8, 0x78, 0x7d, 0xb2, 0x92, 0x26, 0x8d, 0x05, 0xf2, 0xdb, - 0xe7, 0xd9, 0x5f, 0x95, 0x00, 0x79, 0x29, 0x5f, 0xc1, 0xb6, 0x49, 0xb6, 0x6b, 0xa4, 0x10, 0xf7, - 0x55, 0xcd, 0xd2, 0xfe, 0x85, 0xb8, 0x47, 0x2f, 0x0a, 0x71, 0x5f, 0xa4, 0x9c, 0xf7, 0xd2, 0x63, - 0x8c, 0xcf, 0x63, 0x87, 0xfb, 0xb6, 0x33, 0xf3, 0x86, 0x26, 0xa8, 0xdb, 0xf2, 0xe1, 0x21, 0xf9, - 0x5f, 0x4a, 0x70, 0xa4, 0xcd, 0xa3, 0x5c, 0x61, 0xff, 0x12, 0x20, 0xcb, 0xd7, 0xc9, 0x3f, 0x2a, - 0xc6, 0x84, 0xee, 0xdb, 0x41, 0x47, 0xad, 0xb6, 0xbc, 0x7b, 0xe7, 0x32, 0x3c, 0xbb, 0xb0, 0xfb, - 0x4f, 0x24, 0x18, 0xf7, 0x0f, 0xef, 0x2a, 0xb2, 0x0a, 0x59, 0xff, 0xe8, 0x5c, 0x85, 0xfb, 0x7b, - 0x51, 0x81, 0x4b, 0x1f, 0xa0, 0x47, 0xcf, 0x78, 0xe1, 0xca, 0x0e, 0xc7, 0x1e, 0xef, 0xd9, 0x1a, - 0x42, 0xa6, 0x70, 0xd8, 0x26, 0xe8, 0x7c, 0xfc, 0x1f, 0x09, 0x12, 0xeb, 0x86, 0xd1, 0x40, 0x06, - 0x8c, 0xea, 0x86, 0x53, 0x21, 0x9e, 0x85, 0x6b, 0x15, 0xbe, 0xe9, 0x66, 0x79, 0x70, 0xbe, 0x3f, - 0x23, 0x7d, 0xe7, 0xd6, 0x54, 0x3b, 0x2b, 0x65, 0x44, 0x37, 0x9c, 0x12, 0x85, 0x6c, 0xb2, 0x2d, - 0xf9, 0x87, 0x61, 0x28, 0x38, 0x18, 0xcb, 0x92, 0xcf, 0xf6, 0x3d, 0x58, 0x90, 0xcd, 0xed, 0x5b, - 0x53, 0xe3, 0x5e, 0xc4, 0xb8, 0x60, 0x59, 0xc9, 0x6e, 0xf9, 0x46, 0x67, 0xf7, 0xe3, 0xbe, 0xf7, - 0xf2, 0x94, 0x54, 0xba, 0xd8, 0xf5, 0x04, 0xfc, 0x91, 0x7d, 0x45, 0xd8, 0x75, 0x8f, 0x71, 0x83, - 0xc7, 0xde, 0xdf, 0x1c, 0x81, 0xa9, 0x2e, 0xe7, 0xbc, 0xce, 0xee, 0x81, 0x8e, 0x78, 0x23, 0xce, - 0x60, 0x0b, 0x3d, 0x1d, 0x2b, 0xcb, 0x2f, 0x25, 0x00, 0xad, 0xd8, 0xf5, 0x79, 0x52, 0x44, 0xf8, - 0xee, 0x74, 0x85, 0xce, 0x28, 0xa4, 0xb7, 0x74, 0x46, 0xb1, 0x12, 0xd8, 0xf5, 0xc7, 0xfa, 0x3b, - 0x3a, 0xec, 0x79, 0xeb, 0x1f, 0x7f, 0x5b, 0xb6, 0xfe, 0x9d, 0x2b, 0x83, 0xc4, 0x9d, 0xdb, 0x42, - 0x24, 0x0f, 0xb4, 0x85, 0x98, 0x80, 0x01, 0x7e, 0x64, 0xc7, 0x3e, 0x90, 0xce, 0x5b, 0xe8, 0x8c, - 0xf8, 0xae, 0xf4, 0x60, 0x6f, 0xb9, 0x99, 0x61, 0x17, 0x53, 0x9f, 0x10, 0x99, 0xf9, 0xb3, 0x71, - 0xc8, 0xad, 0xd8, 0xf5, 0x72, 0x4d, 0x73, 0xee, 0x92, 0x77, 0x3c, 0xdd, 0x7d, 0x23, 0x85, 0x6e, - 0xdf, 0x9a, 0x1a, 0x66, 0x56, 0xd8, 0x47, 0xf7, 0x26, 0x8c, 0x84, 0xce, 0xa7, 0xb9, 0x2f, 0x2c, - 0x1c, 0xe4, 0x98, 0x3c, 0xc4, 0x4a, 0xa6, 0x75, 0xaf, 0xcf, 0x23, 0xd1, 0x6e, 0x67, 0xf7, 0x63, - 0x2e, 0x70, 0xe9, 0x6e, 0x9e, 0x3a, 0x79, 0xb3, 0xf2, 0xc7, 0x12, 0x64, 0x56, 0x6c, 0xb1, 0x97, - 0xc3, 0x3f, 0xa0, 0xfb, 0xda, 0x27, 0xdd, 0x77, 0x5c, 0xe2, 0xbd, 0x79, 0x9f, 0x78, 0xef, 0xc5, - 0x53, 0xf4, 0x77, 0x62, 0x34, 0x3d, 0x95, 0x70, 0x5d, 0xd3, 0xdd, 0x35, 0x0c, 0xff, 0x45, 0x2d, - 0xcf, 0x3d, 0x83, 0x26, 0x0e, 0x6a, 0xd0, 0x37, 0x24, 0x18, 0x5a, 0xb1, 0xeb, 0x57, 0xf5, 0xda, - 0xff, 0xeb, 0xbe, 0x73, 0xc7, 0x97, 0xf0, 0x7f, 0x16, 0x83, 0x93, 0xfe, 0x35, 0xf7, 0x83, 0x2d, - 0x6c, 0xed, 0xb9, 0xcb, 0xaa, 0xa9, 0xd6, 0x35, 0xdd, 0xff, 0x14, 0xfb, 0x88, 0x5f, 0x60, 0x8a, - 0x2b, 0xc4, 0x96, 0x75, 0xc8, 0xac, 0xab, 0x75, 0xac, 0xe0, 0x0f, 0xb6, 0xb0, 0xed, 0x74, 0x78, - 0x37, 0x65, 0x02, 0x06, 0x8c, 0xed, 0x6d, 0x71, 0x45, 0x25, 0xa1, 0xf0, 0x16, 0x1a, 0x87, 0x64, - 0x43, 0x6b, 0x6a, 0xcc, 0x28, 0x09, 0x85, 0x35, 0xd0, 0x14, 0x64, 0xaa, 0x44, 0xf7, 0x0a, 0xbb, - 0xd3, 0x9b, 0x10, 0xdf, 0xde, 0x68, 0xe9, 0xce, 0x26, 0x81, 0xc8, 0x4f, 0x43, 0x96, 0x8d, 0xc7, - 0xeb, 0xd0, 0x23, 0x90, 0xa2, 0x77, 0x30, 0xbd, 0x51, 0x07, 0x49, 0xfb, 0x0a, 0x7b, 0x8f, 0x85, - 0x71, 0x61, 0x03, 0xb3, 0x46, 0xa9, 0xd4, 0xd5, 0x94, 0x27, 0xa2, 0x93, 0x1d, 0x33, 0x94, 0x6b, - 0xc6, 0xdf, 0x4c, 0xc2, 0x61, 0xfe, 0x78, 0x59, 0x35, 0xb5, 0xd9, 0x1d, 0xc7, 0x11, 0x2f, 0x88, - 0x01, 0xdf, 0x00, 0xaa, 0xa6, 0x26, 0xef, 0x41, 0xe2, 0x92, 0xe3, 0x98, 0xe8, 0x24, 0x24, 0xad, - 0x56, 0x03, 0x8b, 0x73, 0xd0, 0xf1, 0x19, 0x0f, 0x67, 0x86, 0x20, 0x28, 0xad, 0x06, 0x56, 0x18, - 0x0a, 0x2a, 0xc3, 0xd4, 0x76, 0xab, 0xd1, 0xd8, 0xab, 0xd4, 0x30, 0xfd, 0x77, 0x48, 0xee, 0x7f, - 0x1e, 0xc0, 0xbb, 0xa6, 0xaa, 0xbb, 0xc5, 0x47, 0x4a, 0x39, 0x46, 0xd1, 0x16, 0x28, 0x96, 0xf8, - 0xaf, 0x03, 0x65, 0x81, 0x23, 0xff, 0x7e, 0x0c, 0x52, 0x82, 0x35, 0x7d, 0xb1, 0x04, 0x37, 0x70, - 0xd5, 0x31, 0xc4, 0x83, 0x42, 0xb7, 0x8d, 0x10, 0xc4, 0xeb, 0x7c, 0x8a, 0xd2, 0x97, 0x0e, 0x29, - 0xa4, 0x41, 0x60, 0xee, 0xeb, 0x3e, 0x04, 0x66, 0xb6, 0xc8, 0xac, 0x25, 0x4c, 0x43, 0x1c, 0x58, - 0x5c, 0x3a, 0xa4, 0xd0, 0x16, 0xca, 0xc3, 0x00, 0x09, 0x20, 0x87, 0x7d, 0x13, 0x92, 0xc0, 0x79, - 0x1b, 0x4d, 0x40, 0xd2, 0x54, 0x9d, 0x2a, 0xbb, 0x87, 0x4b, 0x3a, 0x58, 0x93, 0xc4, 0x04, 0x7b, - 0x17, 0x37, 0xfc, 0xbf, 0x46, 0x88, 0x31, 0xd8, 0x47, 0xcf, 0x88, 0xdc, 0xeb, 0xaa, 0xe3, 0x60, - 0x4b, 0x27, 0x0c, 0x19, 0x3a, 0x7d, 0x87, 0xcc, 0xa8, 0xed, 0xf1, 0xff, 0x7f, 0x42, 0x7f, 0xf3, - 0xff, 0xcc, 0x40, 0xfd, 0xa1, 0x42, 0x3b, 0xd9, 0xbf, 0x7d, 0xca, 0x0a, 0x60, 0x89, 0x20, 0x95, - 0x61, 0x4c, 0xad, 0xd5, 0x34, 0xe2, 0xd5, 0x6a, 0xa3, 0xb2, 0xa5, 0xd1, 0x0d, 0xb6, 0x4d, 0xff, - 0xa9, 0x57, 0xb7, 0xb9, 0x40, 0x1e, 0x41, 0x89, 0xe3, 0x97, 0xd2, 0x30, 0x68, 0x32, 0xa1, 0xe4, - 0x0b, 0x30, 0xda, 0x26, 0x29, 0x91, 0xef, 0xba, 0xa6, 0xd7, 0xc4, 0x3b, 0x50, 0xe4, 0x37, 0x81, - 0xd1, 0x0f, 0x17, 0xb2, 0x47, 0xb0, 0xf4, 0x77, 0xe9, 0xc7, 0xba, 0xdf, 0xe5, 0x18, 0xf6, 0xdd, - 0xe5, 0x50, 0x4d, 0xad, 0x94, 0xa6, 0xfc, 0xf9, 0x15, 0x8e, 0x39, 0xde, 0xc1, 0xae, 0x6f, 0xcc, - 0x18, 0x56, 0x7d, 0xb6, 0x8e, 0x75, 0x51, 0x51, 0x93, 0x2e, 0xd5, 0xd4, 0x6c, 0xea, 0x8e, 0xde, - 0x87, 0x14, 0xed, 0x0b, 0xbe, 0xdf, 0xf4, 0x66, 0x47, 0x62, 0x71, 0x6e, 0x7d, 0xc9, 0xf5, 0xe3, - 0xdf, 0x88, 0xc1, 0x31, 0x9f, 0x1f, 0xfb, 0x90, 0xdb, 0xdd, 0xb9, 0xd0, 0xd9, 0xe3, 0x7b, 0xf8, - 0x0c, 0xe1, 0x15, 0x48, 0x10, 0x7c, 0x14, 0xf1, 0x7f, 0x13, 0xf2, 0xbf, 0xf4, 0x2f, 0xfe, 0xb1, - 0x4c, 0x9d, 0xa2, 0xf3, 0xac, 0x50, 0x26, 0xa5, 0x8f, 0xf7, 0x6e, 0xbf, 0x9c, 0xf7, 0x0d, 0x49, - 0xfb, 0xce, 0x99, 0x31, 0x6c, 0xc3, 0xd7, 0xcf, 0x80, 0xdc, 0x65, 0x9b, 0xc2, 0x32, 0xe6, 0xfe, - 0x1b, 0xa3, 0x3e, 0xd2, 0x71, 0xb7, 0x7b, 0x32, 0xfb, 0xcd, 0x60, 0x8f, 0x5b, 0xa8, 0x5d, 0x98, - 0x78, 0x86, 0x8c, 0xed, 0x1d, 0x1e, 0x89, 0xc4, 0x3e, 0xe1, 0x3e, 0xf2, 0x96, 0xf8, 0xff, 0x54, - 0x13, 0xcf, 0xaf, 0xc1, 0x93, 0x8f, 0x6f, 0x88, 0x1e, 0x98, 0xe9, 0xba, 0x5e, 0xcc, 0xf8, 0x16, - 0x0b, 0xc5, 0x47, 0x29, 0xff, 0xbc, 0x04, 0xf7, 0xb4, 0x0d, 0xcd, 0x73, 0xfc, 0x62, 0x87, 0x37, - 0xa0, 0x7a, 0xbe, 0x3b, 0xe3, 0x7f, 0x1b, 0x6a, 0xb1, 0x83, 0xb0, 0x0f, 0x46, 0x0a, 0xcb, 0xa4, - 0x08, 0x48, 0xfb, 0x14, 0x1c, 0x0e, 0x0a, 0x2b, 0xcc, 0xf4, 0x2e, 0x18, 0x0e, 0xd6, 0x04, 0xdc, - 0x5c, 0x43, 0x81, 0xaa, 0x40, 0xae, 0x84, 0xed, 0xec, 0xea, 0x5a, 0x86, 0xb4, 0x8b, 0xca, 0x77, - 0x23, 0x3d, 0xab, 0xea, 0x51, 0xca, 0x9f, 0x91, 0x60, 0x3a, 0x38, 0x82, 0x57, 0x7c, 0xdb, 0xfd, - 0x09, 0x7b, 0xc7, 0xa6, 0xf8, 0x0d, 0x09, 0xee, 0xdd, 0x47, 0x26, 0x6e, 0x80, 0xe7, 0x61, 0xdc, - 0x77, 0x3e, 0x26, 0x52, 0xb8, 0x98, 0xf6, 0x93, 0xd1, 0x07, 0x7b, 0xee, 0x71, 0xd0, 0x51, 0x62, - 0x94, 0xaf, 0xff, 0xe1, 0xd4, 0x58, 0x7b, 0x9f, 0xad, 0x8c, 0xb5, 0x9f, 0x69, 0xdd, 0x41, 0xff, - 0xf8, 0x82, 0x04, 0x0f, 0x05, 0x55, 0xed, 0xf0, 0xd0, 0xea, 0x9d, 0x9a, 0x87, 0x7f, 0x2b, 0xc1, - 0xc9, 0x5e, 0x84, 0xe3, 0x13, 0xb2, 0x05, 0x63, 0xde, 0x29, 0x75, 0x78, 0x3e, 0x1e, 0xee, 0xe3, - 0xf1, 0x1e, 0xf7, 0x52, 0xe4, 0x72, 0xbb, 0x0b, 0x86, 0x37, 0x79, 0x60, 0xf9, 0xa7, 0xdc, 0x35, - 0x72, 0xb0, 0xf0, 0x17, 0x46, 0x0e, 0x94, 0xfe, 0x1d, 0xe6, 0x22, 0xd6, 0x61, 0x2e, 0x7c, 0xbb, - 0x90, 0x1b, 0x3c, 0x6f, 0x75, 0x38, 0x99, 0xfe, 0x00, 0x8c, 0x75, 0x70, 0x65, 0x1e, 0xd5, 0x7d, - 0x78, 0xb2, 0x82, 0xda, 0x9d, 0x55, 0xde, 0x83, 0x29, 0x3a, 0x6e, 0x07, 0x43, 0xdf, 0x6d, 0x95, - 0x9b, 0x3c, 0xb7, 0x74, 0x1c, 0x9a, 0xeb, 0xbe, 0x04, 0x03, 0x6c, 0x9e, 0xb9, 0xba, 0x07, 0x70, - 0x14, 0xce, 0x40, 0xfe, 0xa2, 0xc8, 0x65, 0x0b, 0x42, 0xec, 0xce, 0x31, 0xd4, 0x8b, 0xae, 0x77, - 0x28, 0x86, 0x7c, 0xc6, 0x78, 0x55, 0x64, 0xb5, 0xce, 0xd2, 0x71, 0x73, 0x54, 0xef, 0x58, 0x56, - 0x63, 0xb6, 0xb9, 0xbb, 0xe9, 0xeb, 0x67, 0x45, 0xfa, 0x72, 0x75, 0x8a, 0x48, 0x5f, 0xef, 0x8c, - 0xe9, 0xdd, 0x44, 0x16, 0x21, 0xe6, 0x9f, 0xc7, 0x44, 0xf6, 0x3d, 0x09, 0x8e, 0x50, 0xdd, 0xfc, - 0x8f, 0x3b, 0xfa, 0x35, 0xf9, 0x23, 0x80, 0x6c, 0xab, 0x5a, 0xe9, 0x18, 0xdd, 0x39, 0xdb, 0xaa, - 0x5e, 0x0b, 0xac, 0x2f, 0x8f, 0x00, 0xaa, 0xd9, 0x4e, 0x18, 0x9b, 0x5d, 0x0e, 0xcd, 0xd5, 0x6c, - 0xe7, 0xda, 0x3e, 0xab, 0x51, 0xe2, 0x0e, 0x4c, 0xe7, 0x2b, 0x12, 0x14, 0x3a, 0xa9, 0xcc, 0xa7, - 0x4f, 0x83, 0x89, 0xc0, 0xa3, 0xb3, 0xf0, 0x0c, 0x3e, 0xd2, 0xcb, 0x03, 0xa3, 0x50, 0x18, 0x1d, - 0xb6, 0xf0, 0xdd, 0xae, 0x03, 0xa6, 0x82, 0x1e, 0xda, 0x5e, 0x59, 0xbf, 0x63, 0xe1, 0xf3, 0xab, - 0x6d, 0x79, 0xf5, 0xcf, 0x45, 0xed, 0xbd, 0x0b, 0x93, 0x5d, 0xa4, 0xbe, 0xdb, 0xeb, 0xde, 0x4e, - 0xd7, 0xc9, 0xbc, 0xd3, 0xe5, 0xfb, 0x69, 0x1e, 0x09, 0xc1, 0x17, 0x0f, 0x7c, 0x7b, 0xb1, 0x4e, - 0xef, 0x78, 0xca, 0xef, 0x83, 0xa3, 0x1d, 0xa9, 0xb8, 0x6c, 0x45, 0x48, 0xec, 0x68, 0xb6, 0xc3, - 0xc5, 0x7a, 0xa0, 0x9b, 0x58, 0x21, 0x6a, 0x4a, 0x23, 0x23, 0xc8, 0x51, 0xd6, 0xeb, 0x86, 0xd1, - 0xe0, 0x62, 0xc8, 0x57, 0x60, 0xd4, 0x07, 0xe3, 0x83, 0x9c, 0x85, 0x84, 0x69, 0xf0, 0xaf, 0x9a, - 0x64, 0x4e, 0x1d, 0xeb, 0x36, 0x08, 0xa1, 0xe1, 0x6a, 0x53, 0x7c, 0x79, 0x1c, 0x10, 0x63, 0x46, - 0x6f, 0x56, 0x88, 0x21, 0x36, 0x60, 0x2c, 0x00, 0xe5, 0x83, 0xfc, 0x10, 0x0c, 0x98, 0x14, 0xe2, - 0xbe, 0x3b, 0xd7, 0x6d, 0x18, 0x8a, 0xe5, 0x7e, 0x47, 0x82, 0xb6, 0x4e, 0x7d, 0xe7, 0x30, 0x24, - 0x29, 0x57, 0xf4, 0x79, 0x09, 0xc0, 0x77, 0x4f, 0x62, 0xa6, 0x1b, 0x9b, 0xce, 0x7b, 0xe2, 0xc2, - 0x6c, 0xcf, 0xf8, 0xbc, 0x66, 0x3b, 0xf9, 0x63, 0xff, 0xfa, 0xf5, 0xcf, 0xc6, 0xee, 0x47, 0xf2, - 0x6c, 0x97, 0xdd, 0xb8, 0x2f, 0x5e, 0xbe, 0x16, 0xf8, 0xa4, 0xc6, 0xa3, 0xbd, 0x0d, 0x25, 0x24, - 0x9b, 0xe9, 0x15, 0x9d, 0x0b, 0x76, 0x81, 0x0a, 0x76, 0x06, 0x3d, 0x11, 0x2d, 0xd8, 0xec, 0x87, - 0x82, 0x41, 0xf3, 0x11, 0xf4, 0xbb, 0x12, 0x8c, 0x77, 0xda, 0xd2, 0xa1, 0x73, 0xbd, 0x49, 0xd1, - 0x5e, 0x52, 0x14, 0xce, 0x1f, 0x80, 0x92, 0xab, 0xb2, 0x48, 0x55, 0x99, 0x43, 0x4f, 0x1f, 0x40, - 0x95, 0x59, 0xdf, 0xba, 0x83, 0xfe, 0x97, 0x04, 0xc7, 0xf7, 0xdd, 0x21, 0xa1, 0xb9, 0xde, 0xa4, - 0xdc, 0xa7, 0x76, 0x2a, 0x94, 0xde, 0x0a, 0x0b, 0xae, 0xf1, 0x33, 0x54, 0xe3, 0x2b, 0x68, 0xe9, - 0x20, 0x1a, 0x7b, 0x15, 0x91, 0x5f, 0xf7, 0xdf, 0x0a, 0xde, 0xb7, 0xdd, 0xdf, 0x9d, 0xda, 0x36, - 0x1e, 0x11, 0x81, 0xd1, 0x5e, 0xd4, 0xca, 0xef, 0xa5, 0x2a, 0x28, 0x68, 0xfd, 0x2d, 0x4e, 0xda, - 0xec, 0x87, 0x82, 0x89, 0xff, 0x23, 0xe8, 0x7f, 0x4a, 0x9d, 0xaf, 0xcf, 0x3e, 0xb9, 0xaf, 0x88, - 0xdd, 0x37, 0x55, 0x85, 0x73, 0xfd, 0x13, 0x72, 0x25, 0x9b, 0x54, 0xc9, 0x3a, 0xc2, 0x77, 0x5a, - 0xc9, 0x8e, 0x93, 0x88, 0x7e, 0x5b, 0x82, 0xf1, 0x4e, 0x7b, 0x92, 0x88, 0xb0, 0xdc, 0x67, 0x93, - 0x15, 0x11, 0x96, 0xfb, 0x6d, 0x80, 0xe4, 0x1f, 0xa2, 0xca, 0x9f, 0x45, 0xa7, 0xbb, 0x29, 0xbf, - 0xef, 0x2c, 0x92, 0x58, 0xdc, 0xb7, 0xc8, 0x8f, 0x88, 0xc5, 0x5e, 0xf6, 0x31, 0x11, 0xb1, 0xd8, - 0xd3, 0x1e, 0x23, 0x3a, 0x16, 0x5d, 0xcd, 0x7a, 0x9c, 0x46, 0x1b, 0xfd, 0x86, 0x04, 0x43, 0x81, - 0x8a, 0x18, 0x3d, 0xbe, 0xaf, 0xa0, 0x9d, 0x36, 0x0c, 0x85, 0x53, 0xfd, 0x90, 0x70, 0x5d, 0x96, - 0xa8, 0x2e, 0xf3, 0x68, 0xee, 0x20, 0xba, 0x58, 0x01, 0x89, 0x5f, 0x91, 0x60, 0xac, 0x43, 0x95, - 0x19, 0x11, 0x85, 0xdd, 0x8b, 0xe6, 0xc2, 0xb9, 0xfe, 0x09, 0xb9, 0x56, 0x17, 0xa9, 0x56, 0xef, - 0x41, 0x4f, 0x1d, 0x44, 0x2b, 0xdf, 0xfa, 0x7c, 0xcb, 0xbb, 0x8d, 0xe8, 0x1b, 0x07, 0x9d, 0xed, - 0x53, 0x30, 0xa1, 0xd0, 0x93, 0x7d, 0xd3, 0x71, 0x7d, 0x9e, 0xa5, 0xfa, 0x3c, 0x83, 0xd6, 0xde, - 0x9a, 0x3e, 0xed, 0xcb, 0xfa, 0x37, 0xda, 0x5f, 0x7c, 0xdd, 0xdf, 0x8b, 0x3a, 0x16, 0xab, 0x85, - 0x27, 0xfa, 0xa2, 0xe1, 0x4a, 0x9d, 0xa3, 0x4a, 0x9d, 0x42, 0x8f, 0x75, 0x53, 0xca, 0x77, 0xe5, - 0x54, 0xd3, 0xb7, 0x8d, 0xd9, 0x0f, 0xb1, 0x12, 0xf8, 0x23, 0xe8, 0x47, 0xc5, 0x75, 0xbf, 0x13, - 0xfb, 0x8e, 0xeb, 0xab, 0x63, 0x0b, 0x0f, 0xf5, 0x80, 0xc9, 0xe5, 0xba, 0x9f, 0xca, 0x35, 0x89, - 0x8e, 0x75, 0x93, 0x8b, 0xd4, 0xb2, 0xe8, 0x93, 0x92, 0x7b, 0x43, 0xf8, 0xe4, 0xfe, 0xbc, 0xfd, - 0xc5, 0x6e, 0xe1, 0xe1, 0x9e, 0x70, 0xb9, 0x24, 0x0f, 0x50, 0x49, 0xa6, 0xd1, 0x64, 0x57, 0x49, - 0x58, 0xe9, 0x7b, 0xa7, 0x6f, 0x0e, 0xfc, 0xc9, 0x60, 0xd7, 0x97, 0xbc, 0xeb, 0x58, 0xc7, 0xb6, - 0x66, 0x1f, 0xe8, 0x06, 0x60, 0x6f, 0x8f, 0xa7, 0x7e, 0x37, 0x09, 0xd9, 0x45, 0x36, 0xca, 0x86, - 0xa3, 0x3a, 0x6f, 0x71, 0x23, 0x80, 0x6c, 0xfe, 0xbd, 0x28, 0xf6, 0xa1, 0x3b, 0xef, 0xd3, 0x6d, - 0xd9, 0xbe, 0xde, 0x99, 0x64, 0xf7, 0x9f, 0xf8, 0xeb, 0x89, 0x61, 0x7e, 0x32, 0xfb, 0xf4, 0x14, - 0xbd, 0xbb, 0xc0, 0x3e, 0x51, 0xf7, 0x31, 0x09, 0x0e, 0x53, 0x2c, 0x2f, 0xde, 0x28, 0xa6, 0x78, - 0x61, 0xa6, 0xab, 0xc7, 0x2c, 0xab, 0xbe, 0x23, 0x18, 0xf6, 0x51, 0xb9, 0xfb, 0xf9, 0x65, 0xf2, - 0x63, 0xbe, 0xc1, 0xc3, 0x6c, 0x65, 0x65, 0xac, 0xd1, 0x46, 0x69, 0x87, 0xf6, 0xf5, 0x89, 0x83, - 0xef, 0xeb, 0x2f, 0x43, 0xc6, 0x97, 0xe9, 0xf3, 0xc9, 0x88, 0x77, 0xbc, 0xc2, 0x87, 0x68, 0x7e, - 0x62, 0xf4, 0x71, 0x09, 0x0e, 0x77, 0x5c, 0x04, 0xe9, 0x7f, 0x23, 0xec, 0xf3, 0x90, 0x2e, 0x64, - 0x9c, 0x8e, 0x7c, 0x65, 0x65, 0xbc, 0xd5, 0xa9, 0x9a, 0x58, 0x87, 0xa1, 0xc0, 0x02, 0x96, 0x17, - 0xff, 0x53, 0xb4, 0xf7, 0xeb, 0xcd, 0x41, 0x06, 0xa8, 0x00, 0x29, 0xbc, 0x6b, 0x1a, 0x96, 0x83, - 0x6b, 0xf4, 0xca, 0x43, 0x4a, 0x71, 0xdb, 0xf2, 0x2a, 0xa0, 0xf6, 0xc9, 0x0d, 0x7f, 0x45, 0x31, - 0xed, 0x7d, 0x45, 0x71, 0x1c, 0x92, 0xfe, 0xef, 0x0c, 0xb2, 0xc6, 0xdd, 0xbb, 0x2d, 0xf4, 0x7f, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x67, 0xcd, 0x4f, 0x75, 0x24, 0x8e, 0x00, 0x00, + 0x04, 0x01, 0xd0, 0xe1, 0x9f, 0x0c, 0x27, 0xee, 0xe3, 0x9d, 0xd5, 0x6b, 0x8b, 0xa5, 0x07, 0x61, + 0x94, 0x62, 0x3c, 0xc1, 0xa7, 0x5e, 0x6d, 0xe4, 0xc6, 0x66, 0xa4, 0x13, 0x29, 0x65, 0x84, 0x81, + 0xd7, 0x38, 0x54, 0xfe, 0xb5, 0x18, 0x24, 0x68, 0x62, 0x19, 0x85, 0xcc, 0xe6, 0xfb, 0xd6, 0xcb, + 0x95, 0x85, 0xb5, 0xab, 0xa5, 0xe5, 0x72, 0x56, 0x42, 0x23, 0x00, 0x14, 0x70, 0x71, 0x79, 0x6d, + 0x6e, 0x33, 0x1b, 0x73, 0xdb, 0x4b, 0xab, 0x9b, 0x67, 0x4f, 0x67, 0xe3, 0x2e, 0xc1, 0x55, 0x06, + 0x48, 0xf8, 0x11, 0x9e, 0x38, 0x95, 0x4d, 0xa2, 0x2c, 0x0c, 0x31, 0x06, 0x4b, 0xef, 0x2d, 0x2f, + 0x9c, 0x3d, 0x9d, 0x1d, 0x08, 0x42, 0x9e, 0x38, 0x95, 0x1d, 0x44, 0xc3, 0x90, 0xa6, 0x90, 0xd2, + 0xda, 0xda, 0x72, 0x36, 0xe5, 0xf2, 0xdc, 0xd8, 0x54, 0x96, 0x56, 0x17, 0xb3, 0x69, 0x97, 0xe7, + 0xa2, 0xb2, 0x76, 0x75, 0x3d, 0x0b, 0x2e, 0x87, 0x95, 0xf2, 0xc6, 0xc6, 0xdc, 0x62, 0x39, 0x9b, + 0x71, 0x31, 0x4a, 0xef, 0xdb, 0x2c, 0x6f, 0x64, 0x87, 0x02, 0x62, 0x3d, 0x71, 0x2a, 0x3b, 0xec, + 0x0e, 0x51, 0x5e, 0xbd, 0xba, 0x92, 0x1d, 0x41, 0x63, 0x30, 0xcc, 0x86, 0x10, 0x42, 0x8c, 0x86, + 0x40, 0x67, 0x4f, 0x67, 0xb3, 0x9e, 0x20, 0x8c, 0xcb, 0x58, 0x00, 0x70, 0xf6, 0x74, 0x16, 0xc9, + 0xf3, 0x90, 0xa4, 0x6e, 0x88, 0x10, 0x8c, 0x2c, 0xcf, 0x95, 0xca, 0xcb, 0x95, 0xb5, 0xf5, 0xcd, + 0xa5, 0xb5, 0xd5, 0xb9, 0xe5, 0xac, 0xe4, 0xc1, 0x94, 0xf2, 0x33, 0x57, 0x97, 0x94, 0xf2, 0x42, + 0x36, 0xe6, 0x87, 0xad, 0x97, 0xe7, 0x36, 0xcb, 0x0b, 0xd9, 0xb8, 0x5c, 0x85, 0x89, 0x4e, 0x09, + 0xb5, 0x63, 0x08, 0xf9, 0x7c, 0x21, 0xd6, 0xc5, 0x17, 0x28, 0xaf, 0xb0, 0x2f, 0xc8, 0xdf, 0x8e, + 0xc1, 0x78, 0x87, 0x45, 0xa5, 0xe3, 0x20, 0x4f, 0x43, 0x92, 0xf9, 0x32, 0x5b, 0x66, 0x1f, 0xea, + 0xb8, 0x3a, 0x51, 0xcf, 0x6e, 0x5b, 0x6a, 0x29, 0x9d, 0xbf, 0xd4, 0x88, 0x77, 0x29, 0x35, 0x08, + 0x8b, 0x36, 0x87, 0xfd, 0x91, 0xb6, 0xe4, 0xcf, 0xd6, 0xc7, 0xb3, 0xbd, 0xac, 0x8f, 0x14, 0xd6, + 0xdf, 0x22, 0x90, 0xec, 0xb0, 0x08, 0x5c, 0x80, 0xb1, 0x36, 0x46, 0x3d, 0x27, 0xe3, 0x8f, 0x4a, + 0x90, 0xeb, 0x66, 0x9c, 0x88, 0x94, 0x18, 0x0b, 0xa4, 0xc4, 0x0b, 0x61, 0x0b, 0xde, 0xdb, 0x7d, + 0x12, 0xda, 0xe6, 0xfa, 0xab, 0x12, 0x4c, 0x76, 0x2e, 0x29, 0x3b, 0xca, 0xf0, 0x14, 0x0c, 0x34, + 0xb1, 0xb3, 0x63, 0x88, 0xb2, 0xea, 0x81, 0x0e, 0x8b, 0x35, 0xe9, 0x0e, 0x4f, 0x36, 0xa7, 0xf2, + 0xaf, 0xf6, 0xf1, 0x6e, 0x75, 0x21, 0x93, 0xa6, 0x4d, 0xd2, 0x4f, 0xc6, 0xe0, 0x70, 0x47, 0xe6, + 0x1d, 0x05, 0x3d, 0x0e, 0xa0, 0xe9, 0x66, 0xcb, 0x61, 0xa5, 0x13, 0xcb, 0xc4, 0x69, 0x0a, 0xa1, + 0xc9, 0x8b, 0x64, 0xd9, 0x96, 0xe3, 0xf6, 0xc7, 0x69, 0x3f, 0x30, 0x10, 0x45, 0x38, 0xe7, 0x09, + 0x9a, 0xa0, 0x82, 0x4e, 0x75, 0xd1, 0xb4, 0xcd, 0x31, 0x1f, 0x83, 0x6c, 0xb5, 0xa1, 0x61, 0xdd, + 0xa9, 0xd8, 0x8e, 0x85, 0xd5, 0xa6, 0xa6, 0xd7, 0xe9, 0x52, 0x93, 0x2a, 0x26, 0xb7, 0xd5, 0x86, + 0x8d, 0x95, 0x51, 0xd6, 0xbd, 0x21, 0x7a, 0x09, 0x05, 0x75, 0x20, 0xcb, 0x47, 0x31, 0x10, 0xa0, + 0x60, 0xdd, 0x2e, 0x85, 0xfc, 0x99, 0x34, 0x64, 0x7c, 0x05, 0x38, 0xba, 0x17, 0x86, 0x9e, 0x53, + 0x6f, 0xa8, 0x15, 0xb1, 0xa9, 0x62, 0x96, 0xc8, 0x10, 0xd8, 0x3a, 0xdf, 0x58, 0x3d, 0x06, 0x13, + 0x14, 0xc5, 0x68, 0x39, 0xd8, 0xaa, 0x54, 0x1b, 0xaa, 0x6d, 0x53, 0xa3, 0xa5, 0x28, 0x2a, 0x22, + 0x7d, 0x6b, 0xa4, 0x6b, 0x5e, 0xf4, 0xa0, 0x33, 0x30, 0x4e, 0x29, 0x9a, 0xad, 0x86, 0xa3, 0x99, + 0x0d, 0x5c, 0x21, 0xdb, 0x3c, 0x9b, 0x2e, 0x39, 0xae, 0x64, 0x63, 0x04, 0x63, 0x85, 0x23, 0x10, + 0x89, 0x6c, 0xb4, 0x00, 0xc7, 0x29, 0x59, 0x1d, 0xeb, 0xd8, 0x52, 0x1d, 0x5c, 0xc1, 0x1f, 0x6c, + 0xa9, 0x0d, 0xbb, 0xa2, 0xea, 0xb5, 0xca, 0x8e, 0x6a, 0xef, 0xe4, 0x26, 0x08, 0x83, 0x52, 0x2c, + 0x27, 0x29, 0x47, 0x08, 0xe2, 0x22, 0xc7, 0x2b, 0x53, 0xb4, 0x39, 0xbd, 0x76, 0x49, 0xb5, 0x77, + 0x50, 0x11, 0x26, 0x29, 0x17, 0xdb, 0xb1, 0x34, 0xbd, 0x5e, 0xa9, 0xee, 0xe0, 0xea, 0xf5, 0x4a, + 0xcb, 0xd9, 0x3e, 0x97, 0x3b, 0xea, 0x1f, 0x9f, 0x4a, 0xb8, 0x41, 0x71, 0xe6, 0x09, 0xca, 0x55, + 0x67, 0xfb, 0x1c, 0xda, 0x80, 0x21, 0x32, 0x19, 0x4d, 0xed, 0x79, 0x5c, 0xd9, 0x36, 0x2c, 0xba, + 0x86, 0x8e, 0x74, 0x48, 0x4d, 0x3e, 0x0b, 0x16, 0xd6, 0x38, 0xc1, 0x8a, 0x51, 0xc3, 0xc5, 0xe4, + 0xc6, 0x7a, 0xb9, 0xbc, 0xa0, 0x64, 0x04, 0x97, 0x8b, 0x86, 0x45, 0x1c, 0xaa, 0x6e, 0xb8, 0x06, + 0xce, 0x30, 0x87, 0xaa, 0x1b, 0xc2, 0xbc, 0x67, 0x60, 0xbc, 0x5a, 0x65, 0x3a, 0x6b, 0xd5, 0x0a, + 0xdf, 0x8c, 0xd9, 0xb9, 0x6c, 0xc0, 0x58, 0xd5, 0xea, 0x22, 0x43, 0xe0, 0x3e, 0x6e, 0xa3, 0xf3, + 0x70, 0xd8, 0x33, 0x96, 0x9f, 0x70, 0xac, 0x4d, 0xcb, 0x30, 0xe9, 0x19, 0x18, 0x37, 0xf7, 0xda, + 0x09, 0x51, 0x60, 0x44, 0x73, 0x2f, 0x4c, 0xf6, 0x24, 0x4c, 0x98, 0x3b, 0x66, 0x3b, 0xdd, 0x49, + 0x3f, 0x1d, 0x32, 0x77, 0xcc, 0x30, 0xe1, 0xbb, 0xe8, 0xce, 0xdc, 0xc2, 0x55, 0xd5, 0xc1, 0xb5, + 0xdc, 0x3d, 0x7e, 0x74, 0x5f, 0x07, 0x2a, 0x40, 0xb6, 0x5a, 0xad, 0x60, 0x5d, 0xdd, 0x6a, 0xe0, + 0x8a, 0x6a, 0x61, 0x5d, 0xb5, 0x73, 0xd3, 0x14, 0x39, 0xe1, 0x58, 0x2d, 0xac, 0x8c, 0x54, 0xab, + 0x65, 0xda, 0x39, 0x47, 0xfb, 0xd0, 0x49, 0x18, 0x33, 0xb6, 0x9e, 0xab, 0x32, 0x8f, 0xac, 0x98, + 0x16, 0xde, 0xd6, 0x76, 0x73, 0xf7, 0x53, 0xf3, 0x8e, 0x92, 0x0e, 0xea, 0x8f, 0xeb, 0x14, 0x8c, + 0x1e, 0x82, 0x6c, 0xd5, 0xde, 0x51, 0x2d, 0x93, 0xa6, 0x64, 0xdb, 0x54, 0xab, 0x38, 0xf7, 0x2e, + 0x86, 0xca, 0xe0, 0xab, 0x02, 0x4c, 0x22, 0xc2, 0xbe, 0xa9, 0x6d, 0x3b, 0x82, 0xe3, 0x83, 0x2c, + 0x22, 0x28, 0x8c, 0x73, 0x3b, 0x01, 0x59, 0x62, 0x89, 0xc0, 0xc0, 0x27, 0x28, 0xda, 0x88, 0xb9, + 0x63, 0xfa, 0xc7, 0xbd, 0x0f, 0x86, 0x09, 0xa6, 0x37, 0xe8, 0x43, 0xac, 0x70, 0x33, 0x77, 0x7c, + 0x23, 0x9e, 0x86, 0x49, 0x82, 0xd4, 0xc4, 0x8e, 0x5a, 0x53, 0x1d, 0xd5, 0x87, 0xfd, 0x08, 0xc5, + 0x26, 0x66, 0x5f, 0xe1, 0x9d, 0x01, 0x39, 0xad, 0xd6, 0xd6, 0x9e, 0xeb, 0x58, 0x8f, 0x32, 0x39, + 0x09, 0x4c, 0xb8, 0xd6, 0x5d, 0x2b, 0xce, 0xe5, 0x22, 0x0c, 0xf9, 0xfd, 0x1e, 0xa5, 0x81, 0x79, + 0x7e, 0x56, 0x22, 0x45, 0xd0, 0xfc, 0xda, 0x02, 0x29, 0x5f, 0xde, 0x5f, 0xce, 0xc6, 0x48, 0x19, + 0xb5, 0xbc, 0xb4, 0x59, 0xae, 0x28, 0x57, 0x57, 0x37, 0x97, 0x56, 0xca, 0xd9, 0xb8, 0xaf, 0xb0, + 0xbf, 0x9c, 0x48, 0x3d, 0x90, 0x7d, 0x50, 0x7e, 0x35, 0x06, 0x23, 0xc1, 0x9d, 0x1a, 0xfa, 0x21, + 0xb8, 0x47, 0x1c, 0xab, 0xd8, 0xd8, 0xa9, 0xdc, 0xd4, 0x2c, 0x1a, 0x90, 0x4d, 0x95, 0x2d, 0x8e, + 0xae, 0xff, 0x4c, 0x70, 0xac, 0x0d, 0xec, 0x3c, 0xab, 0x59, 0x24, 0xdc, 0x9a, 0xaa, 0x83, 0x96, + 0x61, 0x5a, 0x37, 0x2a, 0xb6, 0xa3, 0xea, 0x35, 0xd5, 0xaa, 0x55, 0xbc, 0x03, 0xad, 0x8a, 0x5a, + 0xad, 0x62, 0xdb, 0x36, 0xd8, 0x42, 0xe8, 0x72, 0x39, 0xa6, 0x1b, 0x1b, 0x1c, 0xd9, 0x5b, 0x21, + 0xe6, 0x38, 0x6a, 0xc8, 0x7d, 0xe3, 0xdd, 0xdc, 0xf7, 0x28, 0xa4, 0x9b, 0xaa, 0x59, 0xc1, 0xba, + 0x63, 0xed, 0xd1, 0xfa, 0x3c, 0xa5, 0xa4, 0x9a, 0xaa, 0x59, 0x26, 0xed, 0xb7, 0x65, 0x9b, 0x74, + 0x39, 0x91, 0x4a, 0x65, 0xd3, 0x97, 0x13, 0xa9, 0x74, 0x16, 0xe4, 0xd7, 0xe2, 0x30, 0xe4, 0xaf, + 0xd7, 0xc9, 0xf6, 0xa7, 0x4a, 0x57, 0x2c, 0x89, 0xe6, 0xb4, 0xfb, 0xf6, 0xad, 0xee, 0x0b, 0xf3, + 0x64, 0x29, 0x2b, 0x0e, 0xb0, 0xe2, 0x58, 0x61, 0x94, 0xa4, 0x8c, 0x20, 0xce, 0x86, 0x59, 0x31, + 0x92, 0x52, 0x78, 0x0b, 0x2d, 0xc2, 0xc0, 0x73, 0x36, 0xe5, 0x3d, 0x40, 0x79, 0xdf, 0xbf, 0x3f, + 0xef, 0xcb, 0x1b, 0x94, 0x79, 0xfa, 0xf2, 0x46, 0x65, 0x75, 0x4d, 0x59, 0x99, 0x5b, 0x56, 0x38, + 0x39, 0x3a, 0x02, 0x89, 0x86, 0xfa, 0xfc, 0x5e, 0x70, 0xd1, 0xa3, 0xa0, 0x5e, 0x27, 0xe1, 0x08, + 0x24, 0x6e, 0x62, 0xf5, 0x7a, 0x70, 0xa9, 0xa1, 0xa0, 0xbb, 0x18, 0x0c, 0xb3, 0x90, 0xa4, 0xf6, + 0x42, 0x00, 0xdc, 0x62, 0xd9, 0x43, 0x28, 0x05, 0x89, 0xf9, 0x35, 0x85, 0x04, 0x44, 0x16, 0x86, + 0x18, 0xb4, 0xb2, 0xbe, 0x54, 0x9e, 0x2f, 0x67, 0x63, 0xf2, 0x19, 0x18, 0x60, 0x46, 0x20, 0xc1, + 0xe2, 0x9a, 0x21, 0x7b, 0x88, 0x37, 0x39, 0x0f, 0x49, 0xf4, 0x5e, 0x5d, 0x29, 0x95, 0x95, 0x6c, + 0x2c, 0x38, 0xd5, 0x89, 0x6c, 0x52, 0xb6, 0x61, 0xc8, 0x5f, 0x87, 0xbf, 0x3d, 0x9b, 0xf1, 0x6f, + 0x48, 0x90, 0xf1, 0xd5, 0xd5, 0xa4, 0x20, 0x52, 0x1b, 0x0d, 0xe3, 0x66, 0x45, 0x6d, 0x68, 0xaa, + 0xcd, 0x5d, 0x03, 0x28, 0x68, 0x8e, 0x40, 0x7a, 0x9d, 0xba, 0xb7, 0x29, 0x44, 0x92, 0xd9, 0x01, + 0xf9, 0x4b, 0x12, 0x64, 0xc3, 0x85, 0x6d, 0x48, 0x4c, 0xe9, 0x9d, 0x14, 0x53, 0xfe, 0xa2, 0x04, + 0x23, 0xc1, 0x6a, 0x36, 0x24, 0xde, 0xbd, 0xef, 0xa8, 0x78, 0x7f, 0x18, 0x83, 0xe1, 0x40, 0x0d, + 0xdb, 0xab, 0x74, 0x1f, 0x84, 0x31, 0xad, 0x86, 0x9b, 0xa6, 0xe1, 0x60, 0xbd, 0xba, 0x57, 0x69, + 0xe0, 0x1b, 0xb8, 0x91, 0x93, 0x69, 0xd2, 0x98, 0xdd, 0xbf, 0x4a, 0x2e, 0x2c, 0x79, 0x74, 0xcb, + 0x84, 0xac, 0x38, 0xbe, 0xb4, 0x50, 0x5e, 0x59, 0x5f, 0xdb, 0x2c, 0xaf, 0xce, 0xbf, 0xaf, 0x72, + 0x75, 0xf5, 0xca, 0xea, 0xda, 0xb3, 0xab, 0x4a, 0x56, 0x0b, 0xa1, 0xdd, 0xc5, 0xb0, 0x5f, 0x87, + 0x6c, 0x58, 0x28, 0x74, 0x0f, 0x74, 0x12, 0x2b, 0x7b, 0x08, 0x8d, 0xc3, 0xe8, 0xea, 0x5a, 0x65, + 0x63, 0x69, 0xa1, 0x5c, 0x29, 0x5f, 0xbc, 0x58, 0x9e, 0xdf, 0xdc, 0x60, 0xe7, 0x1e, 0x2e, 0xf6, + 0x66, 0x20, 0xc0, 0xe5, 0x2f, 0xc4, 0x61, 0xbc, 0x83, 0x24, 0x68, 0x8e, 0xef, 0x58, 0xd8, 0x26, + 0xea, 0xd1, 0x5e, 0xa4, 0x2f, 0x90, 0x9a, 0x61, 0x5d, 0xb5, 0x1c, 0xbe, 0xc1, 0x79, 0x08, 0x88, + 0x95, 0x74, 0x47, 0xdb, 0xd6, 0xb0, 0xc5, 0xcf, 0x93, 0xd8, 0x36, 0x66, 0xd4, 0x83, 0xb3, 0x23, + 0xa5, 0x47, 0x00, 0x99, 0x86, 0xad, 0x39, 0xda, 0x0d, 0x5c, 0xd1, 0x74, 0x71, 0xf8, 0x44, 0xb6, + 0x35, 0x09, 0x25, 0x2b, 0x7a, 0x96, 0x74, 0xc7, 0xc5, 0xd6, 0x71, 0x5d, 0x0d, 0x61, 0x93, 0x64, + 0x1e, 0x57, 0xb2, 0xa2, 0xc7, 0xc5, 0xbe, 0x17, 0x86, 0x6a, 0x46, 0x8b, 0xd4, 0x7a, 0x0c, 0x8f, + 0xac, 0x1d, 0x92, 0x92, 0x61, 0x30, 0x17, 0x85, 0x57, 0xf1, 0xde, 0xa9, 0xd7, 0x90, 0x92, 0x61, + 0x30, 0x86, 0xf2, 0x20, 0x8c, 0xaa, 0xf5, 0xba, 0x45, 0x98, 0x0b, 0x46, 0x6c, 0x5f, 0x32, 0xe2, + 0x82, 0x29, 0x62, 0xfe, 0x32, 0xa4, 0x84, 0x1d, 0xc8, 0x52, 0x4d, 0x2c, 0x51, 0x31, 0xd9, 0x66, + 0x3b, 0x76, 0x22, 0xad, 0xa4, 0x74, 0xd1, 0x79, 0x2f, 0x0c, 0x69, 0x76, 0xc5, 0x3b, 0xc4, 0x8f, + 0xcd, 0xc4, 0x4e, 0xa4, 0x94, 0x8c, 0x66, 0xbb, 0x07, 0xa0, 0xf2, 0x57, 0x63, 0x30, 0x12, 0x7c, + 0x08, 0x81, 0x16, 0x20, 0xd5, 0x30, 0xaa, 0x2a, 0x75, 0x2d, 0xf6, 0x04, 0xec, 0x44, 0xc4, 0x73, + 0x8b, 0xc2, 0x32, 0xc7, 0x57, 0x5c, 0xca, 0xfc, 0x6f, 0x4b, 0x90, 0x12, 0x60, 0x34, 0x09, 0x09, + 0x53, 0x75, 0x76, 0x28, 0xbb, 0x64, 0x29, 0x96, 0x95, 0x14, 0xda, 0x26, 0x70, 0xdb, 0x54, 0x75, + 0xea, 0x02, 0x1c, 0x4e, 0xda, 0x64, 0x5e, 0x1b, 0x58, 0xad, 0xd1, 0x4d, 0x8f, 0xd1, 0x6c, 0x62, + 0xdd, 0xb1, 0xc5, 0xbc, 0x72, 0xf8, 0x3c, 0x07, 0xa3, 0x87, 0x61, 0xcc, 0xb1, 0x54, 0xad, 0x11, + 0xc0, 0x4d, 0x50, 0xdc, 0xac, 0xe8, 0x70, 0x91, 0x8b, 0x70, 0x44, 0xf0, 0xad, 0x61, 0x47, 0xad, + 0xee, 0xe0, 0x9a, 0x47, 0x34, 0x40, 0x0f, 0x37, 0xee, 0xe1, 0x08, 0x0b, 0xbc, 0x5f, 0xd0, 0xca, + 0xaf, 0x4a, 0x30, 0x26, 0xb6, 0x69, 0x35, 0xd7, 0x58, 0x2b, 0x00, 0xaa, 0xae, 0x1b, 0x8e, 0xdf, + 0x5c, 0xed, 0xae, 0xdc, 0x46, 0x57, 0x98, 0x73, 0x89, 0x14, 0x1f, 0x83, 0x7c, 0x13, 0xc0, 0xeb, + 0xe9, 0x6a, 0xb6, 0x69, 0xc8, 0xf0, 0x27, 0x4c, 0xf4, 0x31, 0x25, 0xdb, 0xd8, 0x03, 0x03, 0x91, + 0xfd, 0x1c, 0x9a, 0x80, 0xe4, 0x16, 0xae, 0x6b, 0x3a, 0x3f, 0x37, 0x66, 0x0d, 0x71, 0xfc, 0x92, + 0x70, 0x8f, 0x5f, 0x4a, 0x9f, 0x92, 0x60, 0xbc, 0x6a, 0x34, 0xc3, 0xf2, 0x96, 0xb2, 0xa1, 0xd3, + 0x05, 0xfb, 0x92, 0xf4, 0xfe, 0xa7, 0xea, 0x9a, 0xb3, 0xd3, 0xda, 0x2a, 0x54, 0x8d, 0xe6, 0x6c, + 0xdd, 0x68, 0xa8, 0x7a, 0xdd, 0x7b, 0xce, 0x4a, 0x7f, 0x54, 0x1f, 0xad, 0x63, 0xfd, 0xd1, 0xba, + 0xe1, 0x7b, 0xea, 0x7a, 0xc1, 0xfb, 0xf9, 0xa7, 0x92, 0xf4, 0x33, 0xb1, 0xf8, 0xe2, 0x7a, 0xe9, + 0x6b, 0xb1, 0xfc, 0x22, 0x1b, 0x6e, 0x5d, 0x98, 0x47, 0xc1, 0xdb, 0x0d, 0x5c, 0x25, 0x2a, 0xc3, + 0x77, 0x1e, 0x86, 0x89, 0xba, 0x51, 0x37, 0x28, 0xc7, 0x59, 0xf2, 0x8b, 0x3f, 0xb9, 0x4d, 0xbb, + 0xd0, 0x7c, 0xe4, 0x63, 0xde, 0xe2, 0x2a, 0x8c, 0x73, 0xe4, 0x0a, 0x7d, 0x74, 0xc4, 0x36, 0x36, + 0x68, 0xdf, 0x53, 0xb5, 0xdc, 0x2f, 0xbf, 0x4e, 0x17, 0x74, 0x65, 0x8c, 0x93, 0x92, 0x3e, 0xb6, + 0xf7, 0x29, 0x2a, 0x70, 0x38, 0xc0, 0x8f, 0x85, 0x2d, 0xb6, 0x22, 0x38, 0xfe, 0x06, 0xe7, 0x38, + 0xee, 0xe3, 0xb8, 0xc1, 0x49, 0x8b, 0xf3, 0x30, 0xdc, 0x0f, 0xaf, 0x7f, 0xce, 0x79, 0x0d, 0x61, + 0x3f, 0x93, 0x45, 0x18, 0xa5, 0x4c, 0xaa, 0x2d, 0xdb, 0x31, 0x9a, 0x34, 0x27, 0xee, 0xcf, 0xe6, + 0x37, 0x5f, 0x67, 0x71, 0x34, 0x42, 0xc8, 0xe6, 0x5d, 0xaa, 0x62, 0x11, 0xe8, 0xd3, 0xb2, 0x1a, + 0xae, 0x36, 0x22, 0x38, 0x7c, 0x8b, 0x0b, 0xe2, 0xe2, 0x17, 0xaf, 0xc1, 0x04, 0xf9, 0x4d, 0x53, + 0x96, 0x5f, 0x92, 0xe8, 0x23, 0xb8, 0xdc, 0xab, 0x1f, 0x65, 0xa1, 0x3a, 0xee, 0x32, 0xf0, 0xc9, + 0xe4, 0x9b, 0xc5, 0x3a, 0x76, 0x1c, 0x6c, 0xd9, 0x15, 0xb5, 0xd1, 0x49, 0x3c, 0xdf, 0x19, 0x46, + 0xee, 0xf3, 0xdf, 0x0d, 0xce, 0xe2, 0x22, 0xa3, 0x9c, 0x6b, 0x34, 0x8a, 0x57, 0xe1, 0x9e, 0x0e, + 0x5e, 0xd1, 0x03, 0xcf, 0x2f, 0x70, 0x9e, 0x13, 0x6d, 0x9e, 0x41, 0xd8, 0xae, 0x83, 0x80, 0xbb, + 0x73, 0xd9, 0x03, 0xcf, 0x9f, 0xe6, 0x3c, 0x11, 0xa7, 0x15, 0x53, 0x4a, 0x38, 0x5e, 0x86, 0xb1, + 0x1b, 0xd8, 0xda, 0x32, 0x6c, 0x7e, 0x6e, 0xd4, 0x03, 0xbb, 0x2f, 0x72, 0x76, 0xa3, 0x9c, 0x90, + 0x1e, 0x24, 0x11, 0x5e, 0xe7, 0x21, 0xb5, 0xad, 0x56, 0x71, 0x0f, 0x2c, 0x5e, 0xe2, 0x2c, 0x06, + 0x09, 0x3e, 0x21, 0x9d, 0x83, 0xa1, 0xba, 0xc1, 0x57, 0xad, 0x68, 0xf2, 0x2f, 0x71, 0xf2, 0x8c, + 0xa0, 0xe1, 0x2c, 0x4c, 0xc3, 0x6c, 0x35, 0xc8, 0x92, 0x16, 0xcd, 0xe2, 0xaf, 0x0b, 0x16, 0x82, + 0x86, 0xb3, 0xe8, 0xc3, 0xac, 0x2f, 0x0b, 0x16, 0xb6, 0xcf, 0x9e, 0x4f, 0x43, 0xc6, 0xd0, 0x1b, + 0x7b, 0x86, 0xde, 0x8b, 0x10, 0x5f, 0xe6, 0x1c, 0x80, 0x93, 0x10, 0x06, 0x17, 0x20, 0xdd, 0xeb, + 0x44, 0xfc, 0x8d, 0xef, 0x8a, 0xf0, 0x10, 0x33, 0xb0, 0x08, 0xa3, 0x22, 0x41, 0x69, 0x86, 0xde, + 0x03, 0x8b, 0xbf, 0xc9, 0x59, 0x8c, 0xf8, 0xc8, 0xb8, 0x1a, 0x0e, 0xb6, 0x9d, 0x3a, 0xee, 0x85, + 0xc9, 0x57, 0x85, 0x1a, 0x9c, 0x84, 0x9b, 0x72, 0x0b, 0xeb, 0xd5, 0x9d, 0xde, 0x38, 0xfc, 0x9c, + 0x30, 0xa5, 0xa0, 0x21, 0x2c, 0xe6, 0x61, 0xb8, 0xa9, 0x5a, 0xf6, 0x8e, 0xda, 0xe8, 0x69, 0x3a, + 0xfe, 0x16, 0xe7, 0x31, 0xe4, 0x12, 0x71, 0x8b, 0xb4, 0xf4, 0x7e, 0xd8, 0x7c, 0x4d, 0x58, 0xc4, + 0x47, 0xc6, 0x43, 0xcf, 0x76, 0xe8, 0x21, 0x5b, 0x3f, 0xdc, 0x7e, 0x5e, 0x84, 0x1e, 0xa3, 0x5d, + 0xf1, 0x73, 0xbc, 0x00, 0x69, 0x5b, 0x7b, 0xbe, 0x27, 0x36, 0xbf, 0x20, 0x66, 0x9a, 0x12, 0x10, + 0xe2, 0xf7, 0xc1, 0x91, 0x8e, 0xcb, 0x44, 0x0f, 0xcc, 0xfe, 0x36, 0x67, 0x36, 0xd9, 0x61, 0xa9, + 0xe0, 0x29, 0xa1, 0x5f, 0x96, 0x7f, 0x47, 0xa4, 0x04, 0x1c, 0xe2, 0xb5, 0x4e, 0xf6, 0x11, 0xb6, + 0xba, 0xdd, 0x9f, 0xd5, 0x7e, 0x51, 0x58, 0x8d, 0xd1, 0x06, 0xac, 0xb6, 0x09, 0x93, 0x9c, 0x63, + 0x7f, 0xf3, 0xfa, 0x4b, 0x22, 0xb1, 0x32, 0xea, 0xab, 0xc1, 0xd9, 0xfd, 0x00, 0xe4, 0x5d, 0x73, + 0x8a, 0x82, 0xd5, 0xae, 0x34, 0x55, 0xb3, 0x07, 0xce, 0xbf, 0xcc, 0x39, 0x8b, 0x8c, 0xef, 0x56, + 0xbc, 0xf6, 0x8a, 0x6a, 0x12, 0xe6, 0xef, 0x85, 0x9c, 0x60, 0xde, 0xd2, 0x2d, 0x5c, 0x35, 0xea, + 0xba, 0xf6, 0x3c, 0xae, 0xf5, 0xc0, 0xfa, 0x57, 0x42, 0x53, 0x75, 0xd5, 0x47, 0x4e, 0x38, 0x2f, + 0x41, 0xd6, 0xad, 0x55, 0x2a, 0x5a, 0xd3, 0x34, 0x2c, 0x27, 0x82, 0xe3, 0xd7, 0xc5, 0x4c, 0xb9, + 0x74, 0x4b, 0x94, 0xac, 0x58, 0x06, 0xf6, 0xe4, 0xb9, 0x57, 0x97, 0xfc, 0x55, 0xce, 0x68, 0xd8, + 0xa3, 0xe2, 0x89, 0xa3, 0x6a, 0x34, 0x4d, 0xd5, 0xea, 0x25, 0xff, 0xfd, 0x5d, 0x91, 0x38, 0x38, + 0x09, 0x4f, 0x1c, 0xce, 0x9e, 0x89, 0xc9, 0x6a, 0xdf, 0x03, 0x87, 0x5f, 0x13, 0x89, 0x43, 0xd0, + 0x70, 0x16, 0xa2, 0x60, 0xe8, 0x81, 0xc5, 0xdf, 0x13, 0x2c, 0x04, 0x0d, 0x61, 0xf1, 0x8c, 0xb7, + 0xd0, 0x5a, 0xb8, 0xae, 0xd9, 0x8e, 0xc5, 0xca, 0xe4, 0xfd, 0x59, 0xfd, 0xfd, 0xef, 0x06, 0x8b, + 0x30, 0xc5, 0x47, 0x4a, 0x32, 0x11, 0x3f, 0x76, 0xa5, 0xbb, 0xa8, 0x68, 0xc1, 0x7e, 0x5d, 0x64, + 0x22, 0x1f, 0x19, 0x91, 0xcd, 0x57, 0x21, 0x12, 0xb3, 0x57, 0xc9, 0xde, 0xa1, 0x07, 0x76, 0xff, + 0x20, 0x24, 0xdc, 0x86, 0xa0, 0x25, 0x3c, 0x7d, 0xf5, 0x4f, 0x4b, 0xbf, 0x8e, 0xf7, 0x7a, 0xf2, + 0xce, 0x7f, 0x18, 0xaa, 0x7f, 0xae, 0x32, 0x4a, 0x96, 0x43, 0x46, 0x43, 0xf5, 0x14, 0x8a, 0xba, + 0x67, 0x94, 0xfb, 0xd1, 0x37, 0xb9, 0xbe, 0xc1, 0x72, 0xaa, 0xb8, 0x4c, 0x9c, 0x3c, 0x58, 0xf4, + 0x44, 0x33, 0xfb, 0xe8, 0x9b, 0xae, 0x9f, 0x07, 0x6a, 0x9e, 0xe2, 0x45, 0x18, 0x0e, 0x14, 0x3c, + 0xd1, 0xac, 0x3e, 0xc6, 0x59, 0x0d, 0xf9, 0xeb, 0x9d, 0xe2, 0x19, 0x48, 0x90, 0xe2, 0x25, 0x9a, + 0xfc, 0x2f, 0x72, 0x72, 0x8a, 0x5e, 0x7c, 0x37, 0xa4, 0x44, 0xd1, 0x12, 0x4d, 0xfa, 0x71, 0x4e, + 0xea, 0x92, 0x10, 0x72, 0x51, 0xb0, 0x44, 0x93, 0xff, 0x25, 0x41, 0x2e, 0x48, 0x08, 0x79, 0xef, + 0x26, 0xfc, 0xc6, 0x8f, 0x27, 0xf8, 0xa2, 0x23, 0x6c, 0x77, 0x01, 0x06, 0x79, 0xa5, 0x12, 0x4d, + 0xfd, 0x49, 0x3e, 0xb8, 0xa0, 0x28, 0x3e, 0x09, 0xc9, 0x1e, 0x0d, 0xfe, 0x13, 0x9c, 0x94, 0xe1, + 0x17, 0xe7, 0x21, 0xe3, 0xab, 0x4e, 0xa2, 0xc9, 0xff, 0x0a, 0x27, 0xf7, 0x53, 0x11, 0xd1, 0x79, + 0x75, 0x12, 0xcd, 0xe0, 0x53, 0x42, 0x74, 0x4e, 0x41, 0xcc, 0x26, 0x0a, 0x93, 0x68, 0xea, 0x4f, + 0x0b, 0xab, 0x0b, 0x92, 0xe2, 0xd3, 0x90, 0x76, 0x17, 0x9b, 0x68, 0xfa, 0xcf, 0x70, 0x7a, 0x8f, + 0x86, 0x58, 0xc0, 0xb7, 0xd8, 0x45, 0xb3, 0xf8, 0xab, 0xc2, 0x02, 0x3e, 0x2a, 0x12, 0x46, 0xe1, + 0x02, 0x26, 0x9a, 0xd3, 0x67, 0x45, 0x18, 0x85, 0xea, 0x17, 0x32, 0x9b, 0x34, 0xe7, 0x47, 0xb3, + 0xf8, 0x49, 0x31, 0x9b, 0x14, 0x9f, 0x88, 0x11, 0xae, 0x08, 0xa2, 0x79, 0xfc, 0x35, 0x21, 0x46, + 0xa8, 0x20, 0x28, 0xae, 0x03, 0x6a, 0xaf, 0x06, 0xa2, 0xf9, 0x7d, 0x8e, 0xf3, 0x1b, 0x6b, 0x2b, + 0x06, 0x8a, 0xcf, 0xc2, 0x64, 0xe7, 0x4a, 0x20, 0x9a, 0xeb, 0xe7, 0xdf, 0x0c, 0xed, 0xdd, 0xfc, + 0x85, 0x40, 0x71, 0xd3, 0x5b, 0x52, 0xfc, 0x55, 0x40, 0x34, 0xdb, 0x2f, 0xbc, 0x19, 0x4c, 0xdc, + 0xfe, 0x22, 0xa0, 0x38, 0x07, 0xe0, 0x2d, 0xc0, 0xd1, 0xbc, 0xbe, 0xc8, 0x79, 0xf9, 0x88, 0x48, + 0x68, 0xf0, 0xf5, 0x37, 0x9a, 0xfe, 0x25, 0x11, 0x1a, 0x9c, 0x82, 0x84, 0x86, 0x58, 0x7a, 0xa3, + 0xa9, 0xbf, 0x24, 0x42, 0x43, 0x90, 0x10, 0xcf, 0xf6, 0xad, 0x6e, 0xd1, 0x1c, 0xbe, 0x2c, 0x3c, + 0xdb, 0x47, 0x55, 0x5c, 0x85, 0xb1, 0xb6, 0x05, 0x31, 0x9a, 0xd5, 0xcf, 0x70, 0x56, 0xd9, 0xf0, + 0x7a, 0xe8, 0x5f, 0xbc, 0xf8, 0x62, 0x18, 0xcd, 0xed, 0x2b, 0xa1, 0xc5, 0x8b, 0xaf, 0x85, 0xc5, + 0x0b, 0x90, 0xd2, 0x5b, 0x8d, 0x06, 0x09, 0x1e, 0xb4, 0xff, 0xdd, 0xc0, 0xdc, 0x7f, 0xfa, 0x3e, + 0xb7, 0x8e, 0x20, 0x28, 0x9e, 0x81, 0x24, 0x6e, 0x6e, 0xe1, 0x5a, 0x14, 0xe5, 0x77, 0xbe, 0x2f, + 0x12, 0x26, 0xc1, 0x2e, 0x3e, 0x0d, 0xc0, 0x8e, 0x46, 0xe8, 0xe3, 0xc1, 0x08, 0xda, 0xff, 0xfc, + 0x7d, 0x7e, 0x19, 0xc7, 0x23, 0xf1, 0x18, 0xb0, 0xab, 0x3d, 0xfb, 0x33, 0xf8, 0x6e, 0x90, 0x01, + 0x9d, 0x91, 0xf3, 0x30, 0xf8, 0x9c, 0x6d, 0xe8, 0x8e, 0x5a, 0x8f, 0xa2, 0xfe, 0x2f, 0x9c, 0x5a, + 0xe0, 0x13, 0x83, 0x35, 0x0d, 0x0b, 0x3b, 0x6a, 0xdd, 0x8e, 0xa2, 0xfd, 0xaf, 0x9c, 0xd6, 0x25, + 0x20, 0xc4, 0x55, 0xd5, 0x76, 0x7a, 0xd1, 0xfb, 0xbf, 0x09, 0x62, 0x41, 0x40, 0x84, 0x26, 0xbf, + 0xaf, 0xe3, 0xbd, 0x28, 0xda, 0xef, 0x09, 0xa1, 0x39, 0x7e, 0xf1, 0xdd, 0x90, 0x26, 0x3f, 0xd9, + 0x0d, 0xbb, 0x08, 0xe2, 0x3f, 0xe6, 0xc4, 0x1e, 0x05, 0x19, 0xd9, 0x76, 0x6a, 0x8e, 0x16, 0x6d, + 0xec, 0xdb, 0x7c, 0xa6, 0x05, 0x7e, 0x71, 0x0e, 0x32, 0xb6, 0x53, 0xab, 0xb5, 0x78, 0x7d, 0x1a, + 0x41, 0xfe, 0xdf, 0xbf, 0xef, 0x1e, 0x59, 0xb8, 0x34, 0x64, 0xb6, 0x6f, 0x5e, 0x77, 0x4c, 0x83, + 0x3e, 0x02, 0x89, 0xe2, 0xf0, 0x26, 0xe7, 0xe0, 0x23, 0x29, 0xce, 0xc3, 0x10, 0xd1, 0xc5, 0xc2, + 0x26, 0xa6, 0xcf, 0xab, 0x22, 0x58, 0xfc, 0x0f, 0x6e, 0x80, 0x00, 0x51, 0xe9, 0x47, 0xbe, 0xf5, + 0xda, 0x94, 0xf4, 0xca, 0x6b, 0x53, 0xd2, 0x1f, 0xbe, 0x36, 0x25, 0x7d, 0xfa, 0xdb, 0x53, 0x87, + 0x5e, 0xf9, 0xf6, 0xd4, 0xa1, 0xdf, 0xfd, 0xf6, 0xd4, 0xa1, 0xce, 0xc7, 0xc6, 0xb0, 0x68, 0x2c, + 0x1a, 0xec, 0xc0, 0xf8, 0xfd, 0x72, 0xe0, 0xb8, 0xb8, 0x6e, 0x78, 0xa7, 0xb5, 0xee, 0x26, 0x07, + 0x3e, 0x16, 0x87, 0xa9, 0xaa, 0x61, 0x37, 0x0d, 0x7b, 0x76, 0x4b, 0xb5, 0xf1, 0xec, 0x8d, 0xc7, + 0xb7, 0xb0, 0xa3, 0x3e, 0x3e, 0x5b, 0x35, 0x34, 0x9d, 0x1f, 0xfb, 0x8e, 0xb3, 0xfe, 0x02, 0xe9, + 0x2f, 0xf0, 0xfe, 0x7c, 0xc7, 0x13, 0x62, 0x79, 0x11, 0x12, 0xf3, 0x86, 0xa6, 0xa3, 0x09, 0x48, + 0xd6, 0xb0, 0x6e, 0x34, 0xf9, 0x05, 0x30, 0xd6, 0x40, 0xf7, 0xc1, 0x80, 0xda, 0x34, 0x5a, 0xba, + 0xc3, 0x8e, 0xcb, 0x4b, 0x99, 0x6f, 0xdd, 0x9a, 0x3e, 0xf4, 0x7b, 0xb7, 0xa6, 0xe3, 0x4b, 0xba, + 0xa3, 0xf0, 0xae, 0x62, 0xe2, 0x8d, 0x97, 0xa7, 0x25, 0xf9, 0x32, 0x0c, 0x2e, 0xe0, 0xea, 0x41, + 0x78, 0x2d, 0xe0, 0x6a, 0x88, 0xd7, 0x43, 0x90, 0x5a, 0xd2, 0x1d, 0x76, 0x45, 0xef, 0x38, 0xc4, + 0x35, 0x9d, 0xdd, 0xfa, 0x08, 0x8d, 0x4f, 0xe0, 0x04, 0x75, 0x01, 0x57, 0x5d, 0xd4, 0x1a, 0xae, + 0x86, 0x51, 0x09, 0x7b, 0x02, 0x2f, 0x2d, 0xfc, 0xee, 0xbf, 0x9f, 0x3a, 0xf4, 0xc2, 0x6b, 0x53, + 0x87, 0xba, 0xcd, 0x4f, 0xc0, 0xfc, 0xdc, 0xc4, 0xec, 0xcf, 0xa3, 0x76, 0xed, 0xfa, 0x2c, 0x09, + 0x2d, 0x7b, 0x6b, 0x80, 0xdd, 0x6a, 0x86, 0x4f, 0xc7, 0x60, 0x3a, 0x7c, 0xa4, 0x4e, 0xfc, 0xd8, + 0x76, 0xd4, 0xa6, 0xd9, 0xed, 0xc5, 0xa9, 0x0b, 0x90, 0xde, 0x14, 0x38, 0x28, 0x07, 0x83, 0x36, + 0xae, 0x1a, 0x7a, 0xcd, 0xa6, 0x22, 0xc7, 0x15, 0xd1, 0x24, 0x06, 0xd4, 0x55, 0xdd, 0xb0, 0xf9, + 0x75, 0x4d, 0xd6, 0x28, 0xfd, 0x94, 0xd4, 0x9f, 0x63, 0x8d, 0xb8, 0x43, 0x51, 0xf3, 0xac, 0x4b, + 0xef, 0x7f, 0x78, 0xbf, 0xa7, 0x11, 0x54, 0x3d, 0x4f, 0x05, 0xdf, 0xa3, 0x87, 0xa9, 0xf0, 0xa3, + 0x87, 0x67, 0x71, 0xa3, 0x71, 0x45, 0x37, 0x6e, 0xea, 0x9b, 0x01, 0x93, 0xfc, 0x2b, 0x09, 0x66, + 0xe8, 0x85, 0x75, 0xab, 0xa9, 0xe9, 0xce, 0x6c, 0x43, 0xdb, 0xb2, 0x67, 0xb7, 0x34, 0xc7, 0x66, + 0x96, 0xe3, 0x36, 0x99, 0xf0, 0x30, 0x0a, 0x04, 0xa3, 0x40, 0x30, 0xe4, 0xd3, 0x90, 0x2a, 0x69, + 0xce, 0x9c, 0x65, 0xa9, 0x7b, 0x08, 0x41, 0x82, 0xc0, 0xb8, 0x51, 0xe8, 0x6f, 0x62, 0x11, 0xdc, + 0xc0, 0x4d, 0x9b, 0x3e, 0xf4, 0x4a, 0x28, 0xac, 0x51, 0xba, 0xda, 0x75, 0x26, 0x2f, 0xf8, 0x34, + 0xf5, 0x89, 0xe4, 0xfb, 0xc9, 0x22, 0xa1, 0x93, 0xb8, 0xae, 0x3e, 0x5f, 0x4b, 0xc0, 0x71, 0x1f, + 0x42, 0xd5, 0xda, 0x33, 0x1d, 0x1a, 0x92, 0xc6, 0x36, 0x57, 0x66, 0xcc, 0xa7, 0x0c, 0xeb, 0xee, + 0x12, 0x66, 0xdb, 0x90, 0x5c, 0x27, 0x74, 0x44, 0x11, 0xc7, 0x70, 0xd4, 0x06, 0xd7, 0x8e, 0x35, + 0x08, 0x94, 0x5d, 0xda, 0x8f, 0x31, 0xa8, 0x26, 0xee, 0xeb, 0x37, 0xb0, 0xba, 0xcd, 0xee, 0x3e, + 0xc6, 0xe9, 0xb3, 0xcf, 0x14, 0x01, 0xd0, 0x6b, 0x8e, 0x13, 0x90, 0x54, 0x5b, 0xec, 0xb1, 0x5d, + 0xfc, 0xc4, 0x90, 0xc2, 0x1a, 0xf2, 0x15, 0x18, 0xe4, 0x8f, 0x0a, 0x50, 0x16, 0xe2, 0xd7, 0xf1, + 0x1e, 0x1d, 0x67, 0x48, 0x21, 0x3f, 0x51, 0x01, 0x92, 0x54, 0x78, 0x7e, 0xa9, 0x3b, 0x57, 0x68, + 0x93, 0xbe, 0x40, 0x85, 0x54, 0x18, 0x9a, 0x7c, 0x19, 0x52, 0x0b, 0x46, 0x53, 0xd3, 0x8d, 0x20, + 0xb7, 0x34, 0xe3, 0x46, 0x65, 0x36, 0x5b, 0x3c, 0x9c, 0x15, 0xd6, 0x40, 0x93, 0x30, 0xc0, 0xee, + 0xc2, 0xf2, 0x47, 0x8f, 0xbc, 0x25, 0xcf, 0xc3, 0x20, 0xe5, 0xbd, 0x66, 0x92, 0xf9, 0x75, 0x2f, + 0x22, 0xa5, 0xf9, 0x9b, 0x11, 0x9c, 0x7d, 0xcc, 0x13, 0x16, 0x41, 0xa2, 0xa6, 0x3a, 0x2a, 0xd7, + 0x9b, 0xfe, 0x96, 0x9f, 0x82, 0x14, 0x67, 0x62, 0xa3, 0x53, 0x10, 0x37, 0x4c, 0x9b, 0x3f, 0x3c, + 0xcc, 0x77, 0x53, 0x65, 0xcd, 0x2c, 0x25, 0x48, 0x22, 0x50, 0x08, 0x72, 0x49, 0xe9, 0xea, 0x2f, + 0xe7, 0xfa, 0xf7, 0x17, 0x36, 0x8c, 0xeb, 0x2c, 0x5f, 0x8e, 0xc1, 0x94, 0xaf, 0xf7, 0x06, 0xb6, + 0x48, 0xbd, 0x1c, 0x70, 0x7d, 0xe4, 0x13, 0x92, 0xf7, 0x77, 0x71, 0x97, 0x77, 0x43, 0x7c, 0xce, + 0x34, 0x51, 0x1e, 0x52, 0xec, 0x21, 0xa1, 0xc1, 0xfc, 0x25, 0xa1, 0xb8, 0x6d, 0xd2, 0x67, 0x1b, + 0xdb, 0xce, 0x4d, 0xd5, 0x72, 0x5f, 0x17, 0x11, 0x6d, 0xf9, 0x3c, 0xa4, 0xe7, 0x0d, 0xdd, 0xc6, + 0xba, 0xdd, 0xa2, 0xa1, 0xb3, 0xd5, 0x30, 0xaa, 0xd7, 0x39, 0x07, 0xd6, 0x20, 0x06, 0x57, 0x4d, + 0x93, 0x52, 0x26, 0x14, 0xf2, 0x93, 0xa5, 0xde, 0xd2, 0x46, 0x57, 0x13, 0x9d, 0xef, 0xdf, 0x44, + 0x5c, 0x49, 0xd7, 0x46, 0xbf, 0x2f, 0xc1, 0xb1, 0xf6, 0x80, 0xba, 0x8e, 0xf7, 0xec, 0x7e, 0xe3, + 0xe9, 0x1c, 0xa4, 0xd7, 0xe9, 0x3b, 0x9b, 0x57, 0xf0, 0x1e, 0xca, 0xc3, 0x20, 0xae, 0x9d, 0x3a, + 0x73, 0xe6, 0xf1, 0xf3, 0xcc, 0xdb, 0x2f, 0x1d, 0x52, 0x04, 0xa0, 0x98, 0x22, 0x5a, 0xbd, 0xf1, + 0xe5, 0x69, 0xa9, 0x94, 0x84, 0xb8, 0xdd, 0x6a, 0xde, 0x55, 0x1f, 0xf8, 0x42, 0x32, 0x90, 0x00, + 0x59, 0x46, 0xbd, 0xa1, 0x36, 0xb4, 0x9a, 0xea, 0xbd, 0x4d, 0x9b, 0xf5, 0xe9, 0x48, 0x31, 0x3a, + 0xab, 0x98, 0xdf, 0xd7, 0x52, 0xf2, 0xaf, 0x48, 0x30, 0x74, 0x4d, 0x70, 0xde, 0xc0, 0x0e, 0xba, + 0x00, 0xe0, 0x8e, 0x24, 0xc2, 0xe2, 0x68, 0x21, 0x3c, 0x56, 0xc1, 0xa5, 0x51, 0x7c, 0xe8, 0xe8, + 0x49, 0xea, 0x68, 0xa6, 0x61, 0xf3, 0x57, 0x04, 0x22, 0x48, 0x5d, 0x64, 0xf4, 0x08, 0x20, 0x9a, + 0xc1, 0x2a, 0x37, 0x0c, 0x47, 0xd3, 0xeb, 0x15, 0xd3, 0xb8, 0xc9, 0x5f, 0xbc, 0x8a, 0x2b, 0x59, + 0xda, 0x73, 0x8d, 0x76, 0xac, 0x13, 0x38, 0x11, 0x3a, 0xed, 0x72, 0x21, 0xeb, 0x9f, 0x5a, 0xab, + 0x59, 0xd8, 0xb6, 0x79, 0x92, 0x12, 0x4d, 0x74, 0x01, 0x06, 0xcd, 0xd6, 0x56, 0x45, 0x64, 0x84, + 0xcc, 0xa9, 0x63, 0x9d, 0xe2, 0x5b, 0xcc, 0x3f, 0x8f, 0xf0, 0x01, 0xb3, 0xb5, 0x45, 0xbc, 0xe1, + 0x5e, 0x18, 0xea, 0x20, 0x4c, 0xe6, 0x86, 0x27, 0x07, 0x7d, 0x15, 0x98, 0x6b, 0x50, 0x31, 0x2d, + 0xcd, 0xb0, 0x34, 0x67, 0x8f, 0x3e, 0xe1, 0x8f, 0x2b, 0x59, 0xd1, 0xb1, 0xce, 0xe1, 0xf2, 0x75, + 0x18, 0xdd, 0xd0, 0x9a, 0x26, 0xbd, 0x93, 0xc2, 0x25, 0x3f, 0xe3, 0xc9, 0x27, 0x45, 0xcb, 0xd7, + 0x55, 0xb2, 0x58, 0x9b, 0x64, 0xa5, 0x67, 0xba, 0x7a, 0xe7, 0x93, 0xfd, 0x7b, 0x67, 0xb0, 0x60, + 0xf9, 0x93, 0x7c, 0x20, 0xf8, 0xf8, 0x72, 0xef, 0x4b, 0x4f, 0xbd, 0x3a, 0x66, 0x54, 0xd9, 0x93, + 0x8f, 0x2c, 0x02, 0xf2, 0xfb, 0x2f, 0xab, 0xf9, 0x88, 0x44, 0x9a, 0x8f, 0x0c, 0x32, 0xf9, 0x3c, + 0x0c, 0xaf, 0xab, 0x96, 0xb3, 0x81, 0x9d, 0x4b, 0x58, 0xad, 0x61, 0x2b, 0xb8, 0xee, 0x0e, 0x8b, + 0x75, 0x17, 0x41, 0x82, 0x2e, 0xae, 0x6c, 0xdd, 0xa1, 0xbf, 0xe5, 0x1d, 0x48, 0xd0, 0x7b, 0x40, + 0xee, 0x9a, 0xcc, 0x29, 0xd8, 0x9a, 0x4c, 0xb2, 0xe9, 0x9e, 0x83, 0x6d, 0x4e, 0xc2, 0x1a, 0xe8, + 0xb4, 0x58, 0x59, 0xe3, 0xfb, 0xaf, 0xac, 0xdc, 0x55, 0xf9, 0xfa, 0xda, 0x80, 0xc1, 0x12, 0x49, + 0xc6, 0x4b, 0x0b, 0xae, 0x20, 0x92, 0x27, 0x08, 0x5a, 0x81, 0x51, 0x53, 0xb5, 0x1c, 0x7a, 0x01, + 0x7a, 0x87, 0x6a, 0xc1, 0xa3, 0x61, 0xba, 0x3d, 0x36, 0x03, 0xca, 0xf2, 0x51, 0x86, 0x4d, 0x3f, + 0x50, 0xfe, 0xa3, 0x04, 0x0c, 0x70, 0x63, 0xbc, 0x1b, 0x06, 0xb9, 0x59, 0xb9, 0xff, 0x1e, 0x2f, + 0xb4, 0x2f, 0x4d, 0x05, 0x77, 0x09, 0xe1, 0xfc, 0x04, 0x0d, 0x7a, 0x00, 0x52, 0xd5, 0x1d, 0x55, + 0xd3, 0x2b, 0x5a, 0x4d, 0xd4, 0xf2, 0xaf, 0xdd, 0x9a, 0x1e, 0x9c, 0x27, 0xb0, 0xa5, 0x05, 0x65, + 0x90, 0x76, 0x2e, 0xd5, 0x48, 0x2d, 0xb0, 0x83, 0xb5, 0xfa, 0x8e, 0xc3, 0x63, 0x90, 0xb7, 0xd0, + 0x39, 0x48, 0x10, 0x97, 0xe1, 0xaf, 0xc7, 0xe4, 0xdb, 0xf6, 0x58, 0x6e, 0xdd, 0x5a, 0x4a, 0x91, + 0x81, 0x3f, 0xfd, 0x07, 0xd3, 0x92, 0x42, 0x29, 0xd0, 0x3c, 0x0c, 0x37, 0x54, 0xdb, 0xa9, 0xd0, + 0x35, 0x8c, 0x0c, 0x9f, 0xa4, 0x2c, 0x8e, 0xb4, 0x1b, 0x84, 0x1b, 0x96, 0x8b, 0x9e, 0x21, 0x54, + 0x0c, 0x54, 0x43, 0x27, 0x20, 0x4b, 0x99, 0x54, 0x8d, 0x66, 0x53, 0x73, 0x58, 0x75, 0x35, 0x40, + 0xed, 0x3e, 0x42, 0xe0, 0xf3, 0x14, 0x4c, 0x6b, 0xac, 0xa3, 0x90, 0xa6, 0x17, 0xf2, 0x29, 0x0a, + 0xbb, 0x7c, 0x96, 0x22, 0x00, 0xda, 0xf9, 0x20, 0x8c, 0x7a, 0x19, 0x94, 0xa1, 0xa4, 0x18, 0x17, + 0x0f, 0x4c, 0x11, 0x1f, 0x83, 0x09, 0x1d, 0xef, 0xd2, 0xeb, 0x70, 0x01, 0xec, 0x34, 0xc5, 0x46, + 0xa4, 0xef, 0x5a, 0x90, 0xe2, 0x5d, 0x30, 0x52, 0x15, 0xc6, 0x67, 0xb8, 0x40, 0x71, 0x87, 0x5d, + 0x28, 0x45, 0x3b, 0x02, 0x29, 0xd5, 0x34, 0x19, 0x42, 0x86, 0x67, 0x50, 0xd3, 0xa4, 0x5d, 0x27, + 0x61, 0x8c, 0xea, 0x68, 0x61, 0xbb, 0xd5, 0x70, 0x38, 0x93, 0x21, 0x8a, 0x33, 0x4a, 0x3a, 0x14, + 0x06, 0xa7, 0xb8, 0xf7, 0xc1, 0x30, 0xbe, 0xa1, 0xd5, 0xb0, 0x5e, 0xc5, 0x0c, 0x6f, 0x98, 0xe2, + 0x0d, 0x09, 0x20, 0x45, 0x7a, 0x08, 0xdc, 0xcc, 0x58, 0x11, 0x59, 0x7b, 0x84, 0xf1, 0x13, 0xf0, + 0x39, 0x06, 0x96, 0x1f, 0x81, 0xc4, 0x82, 0xea, 0xa8, 0xa4, 0xc4, 0x70, 0x76, 0xd9, 0x52, 0x34, + 0xa4, 0x90, 0x9f, 0x1d, 0xc3, 0xed, 0x8d, 0x18, 0x24, 0xae, 0x19, 0x0e, 0x46, 0x4f, 0xf8, 0xca, + 0xc2, 0x91, 0x4e, 0x3e, 0xbe, 0xa1, 0xd5, 0x75, 0x5c, 0x5b, 0xb1, 0xeb, 0xbe, 0x37, 0x6a, 0x3d, + 0x17, 0x8b, 0x05, 0x5c, 0x6c, 0x02, 0x92, 0x96, 0xd1, 0xd2, 0x6b, 0xe2, 0x2e, 0x17, 0x6d, 0xa0, + 0x32, 0xa4, 0x5c, 0xcf, 0x49, 0x44, 0x79, 0xce, 0x28, 0xf1, 0x1c, 0xe2, 0xd7, 0x1c, 0xa0, 0x0c, + 0x6e, 0x71, 0x07, 0x2a, 0x41, 0xda, 0x4d, 0x79, 0xdc, 0x03, 0x7b, 0x73, 0x62, 0x8f, 0x8c, 0x2c, + 0x41, 0xae, 0x3f, 0xb8, 0x06, 0x65, 0x5e, 0x98, 0x75, 0x3b, 0xb8, 0x45, 0x03, 0xae, 0xc6, 0xdf, + 0xee, 0x1d, 0xa4, 0x7a, 0x79, 0xae, 0xc6, 0xde, 0xf0, 0x3d, 0x06, 0x69, 0x5b, 0xab, 0xeb, 0xaa, + 0xd3, 0xb2, 0x30, 0xf7, 0x46, 0x0f, 0x20, 0x7f, 0x26, 0x06, 0x03, 0xcc, 0xbb, 0x7d, 0x76, 0x93, + 0x3a, 0xdb, 0x2d, 0xd6, 0xcd, 0x6e, 0xf1, 0x83, 0xdb, 0x6d, 0x0e, 0xc0, 0x15, 0xc6, 0xe6, 0x2f, + 0x5d, 0x76, 0xa8, 0x33, 0x98, 0x88, 0x1b, 0x5a, 0x9d, 0x07, 0xaf, 0x8f, 0xc8, 0xf5, 0xa0, 0xa4, + 0x2f, 0x4f, 0x5e, 0x80, 0xf4, 0x96, 0xe6, 0x54, 0x54, 0xb2, 0x79, 0xa4, 0x26, 0xcc, 0x9c, 0x9a, + 0x2a, 0x74, 0xda, 0x65, 0x16, 0xc4, 0x16, 0x53, 0x49, 0x6d, 0xf1, 0x5f, 0xf2, 0xef, 0x4b, 0xa4, + 0x56, 0xe6, 0x03, 0xa2, 0x39, 0x18, 0x16, 0x8a, 0x56, 0xb6, 0x1b, 0x6a, 0x9d, 0x3b, 0xe3, 0xf1, + 0xae, 0xda, 0x5e, 0x6c, 0xa8, 0x75, 0x25, 0xc3, 0x15, 0x24, 0x8d, 0xce, 0x13, 0x1b, 0xeb, 0x32, + 0xb1, 0x01, 0x4f, 0x8a, 0x1f, 0xcc, 0x93, 0x02, 0x73, 0x9e, 0x08, 0xcf, 0xf9, 0xd7, 0x63, 0x74, + 0xcf, 0x64, 0x1a, 0xb6, 0xda, 0x78, 0x3b, 0x42, 0xec, 0x28, 0xa4, 0x4d, 0xa3, 0x51, 0x61, 0x3d, + 0xec, 0xd2, 0x64, 0xca, 0x34, 0x1a, 0x4a, 0x9b, 0x1f, 0x25, 0xef, 0x50, 0xfc, 0x0d, 0xdc, 0x01, + 0xab, 0x0d, 0x86, 0xad, 0x66, 0xc1, 0x10, 0x33, 0x05, 0x5f, 0x30, 0x1f, 0x23, 0x36, 0xa0, 0x2b, + 0xb0, 0xd4, 0xbe, 0xc0, 0x33, 0xb1, 0x19, 0xa6, 0xc2, 0xf1, 0x08, 0x05, 0x5b, 0x5f, 0x3a, 0x6d, + 0xb6, 0xfd, 0x7e, 0xae, 0x70, 0x3c, 0xf9, 0xa7, 0x24, 0x80, 0x65, 0x62, 0x59, 0xaa, 0x2f, 0x59, + 0xea, 0x6c, 0x2a, 0x42, 0x25, 0x30, 0xf2, 0x54, 0xb7, 0x49, 0xe3, 0xe3, 0x0f, 0xd9, 0x7e, 0xb9, + 0xe7, 0x61, 0xd8, 0x73, 0x46, 0x1b, 0x0b, 0x61, 0xa6, 0xf6, 0x29, 0xee, 0x37, 0xb0, 0xa3, 0x0c, + 0xdd, 0xf0, 0xb5, 0xe4, 0x7f, 0x22, 0x41, 0x9a, 0xca, 0xb4, 0x82, 0x1d, 0x35, 0x30, 0x87, 0xd2, + 0xc1, 0xe7, 0xf0, 0x38, 0x00, 0x63, 0x63, 0x6b, 0xcf, 0x63, 0xee, 0x59, 0x69, 0x0a, 0xd9, 0xd0, + 0x9e, 0xc7, 0xe8, 0xac, 0x6b, 0xf0, 0xf8, 0xfe, 0x06, 0x17, 0xc5, 0x3f, 0x37, 0xfb, 0x3d, 0x30, + 0x48, 0xbf, 0x7a, 0xb2, 0x6b, 0xf3, 0x7a, 0x7e, 0x40, 0x6f, 0x35, 0x37, 0x77, 0x6d, 0xf9, 0x39, + 0x18, 0xdc, 0xdc, 0x65, 0x47, 0x30, 0x47, 0x21, 0x6d, 0x19, 0x06, 0x5f, 0xf8, 0x59, 0xc1, 0x95, + 0x22, 0x00, 0xba, 0xce, 0x89, 0x63, 0x87, 0x98, 0x77, 0xec, 0xe0, 0x9d, 0x9b, 0xc4, 0x7b, 0x3a, + 0x37, 0x39, 0xf9, 0x6f, 0x24, 0xc8, 0xf8, 0xf2, 0x03, 0x7a, 0x1c, 0x0e, 0x97, 0x96, 0xd7, 0xe6, + 0xaf, 0x54, 0x96, 0x16, 0x2a, 0x17, 0x97, 0xe7, 0x16, 0xbd, 0xd7, 0x02, 0xf2, 0x93, 0x2f, 0xbe, + 0x34, 0x83, 0x7c, 0xb8, 0x57, 0xf5, 0xeb, 0xba, 0x71, 0x53, 0x47, 0xb3, 0x30, 0x11, 0x24, 0x99, + 0x2b, 0x6d, 0x94, 0x57, 0x37, 0xb3, 0x52, 0xfe, 0xf0, 0x8b, 0x2f, 0xcd, 0x8c, 0xf9, 0x28, 0xe6, + 0xb6, 0x6c, 0xac, 0x3b, 0xed, 0x04, 0xf3, 0x6b, 0x2b, 0x2b, 0x4b, 0x9b, 0xd9, 0x58, 0x1b, 0x01, + 0x5f, 0x01, 0x1e, 0x82, 0xb1, 0x20, 0xc1, 0xea, 0xd2, 0x72, 0x36, 0x9e, 0x47, 0x2f, 0xbe, 0x34, + 0x33, 0xe2, 0xc3, 0x5e, 0xd5, 0x1a, 0xf9, 0xd4, 0x27, 0xbe, 0x32, 0x75, 0xe8, 0xe7, 0x7e, 0x76, + 0x4a, 0x22, 0x9a, 0x0d, 0x07, 0x72, 0x04, 0x7a, 0x04, 0xee, 0xd9, 0x58, 0x5a, 0x5c, 0x2d, 0x2f, + 0x54, 0x56, 0x36, 0x16, 0x2b, 0xec, 0x73, 0x08, 0xae, 0x76, 0xa3, 0x2f, 0xbe, 0x34, 0x93, 0xe1, + 0x2a, 0x75, 0xc3, 0x5e, 0x57, 0xca, 0xd7, 0xd6, 0x36, 0xcb, 0x59, 0x89, 0x61, 0xaf, 0x5b, 0xf8, + 0x86, 0xe1, 0xb0, 0xcf, 0x22, 0x3d, 0x06, 0x47, 0x3a, 0x60, 0xbb, 0x8a, 0x8d, 0xbd, 0xf8, 0xd2, + 0xcc, 0xf0, 0xba, 0x85, 0x59, 0xfc, 0x50, 0x8a, 0x02, 0xe4, 0xda, 0x29, 0xd6, 0xd6, 0xd7, 0x36, + 0xe6, 0x96, 0xb3, 0x33, 0xf9, 0xec, 0x8b, 0x2f, 0xcd, 0x0c, 0x89, 0x64, 0x48, 0xf0, 0x3d, 0xcd, + 0xee, 0xe6, 0xc6, 0xeb, 0x2f, 0xc7, 0x60, 0xaa, 0xed, 0xf2, 0x35, 0x7f, 0x64, 0xd1, 0xed, 0xa0, + 0xb8, 0x08, 0xa9, 0x05, 0xf1, 0x24, 0xa4, 0xdf, 0x73, 0xe2, 0x9f, 0xec, 0xf3, 0x9c, 0x78, 0x58, + 0x8c, 0x24, 0x8e, 0x89, 0x4f, 0x46, 0x1f, 0x13, 0x0b, 0xf9, 0x0f, 0x70, 0x4a, 0xfc, 0x1f, 0x1e, + 0x86, 0xfb, 0xf9, 0xe1, 0xba, 0xed, 0xa8, 0xd7, 0x35, 0xbd, 0xee, 0x3e, 0xc2, 0xe0, 0x6d, 0x6e, + 0x94, 0x49, 0xfe, 0x14, 0x43, 0x40, 0xf7, 0x7d, 0x90, 0x91, 0xdf, 0x77, 0x6f, 0x1b, 0xbd, 0x67, + 0x8d, 0x98, 0xa1, 0x7c, 0xc4, 0x23, 0x17, 0xf9, 0x93, 0x12, 0x8c, 0x5c, 0xd2, 0x6c, 0xc7, 0xb0, + 0xb4, 0xaa, 0xda, 0xa0, 0x6f, 0x39, 0x9c, 0xed, 0x75, 0xd1, 0x08, 0xe5, 0xb0, 0xa7, 0x61, 0xe0, + 0x86, 0xda, 0x60, 0xd9, 0x3a, 0x4e, 0x3f, 0xca, 0xd0, 0xd9, 0x10, 0x5e, 0xce, 0x16, 0x0c, 0x18, + 0x99, 0xfc, 0x8b, 0x31, 0x18, 0xa5, 0x51, 0x6e, 0xb3, 0xcf, 0xf5, 0x90, 0x1d, 0x6a, 0x09, 0x12, + 0x96, 0xea, 0xf0, 0x43, 0xd7, 0x52, 0x81, 0x3f, 0x1c, 0x79, 0x20, 0xfa, 0x81, 0x47, 0x61, 0x01, + 0x57, 0x15, 0x4a, 0x8b, 0x7e, 0x18, 0x52, 0x4d, 0x75, 0xb7, 0x42, 0xf9, 0xb0, 0x7d, 0xdf, 0x5c, + 0x7f, 0x7c, 0x6e, 0xdf, 0x9a, 0x1e, 0xdd, 0x53, 0x9b, 0x8d, 0xa2, 0x2c, 0xf8, 0xc8, 0xca, 0x60, + 0x53, 0xdd, 0x25, 0x22, 0x22, 0x13, 0x46, 0x09, 0xb4, 0xba, 0xa3, 0xea, 0x75, 0xcc, 0x06, 0xa1, + 0x47, 0xc8, 0xa5, 0x4b, 0x7d, 0x0f, 0x32, 0xe9, 0x0d, 0xe2, 0x63, 0x27, 0x2b, 0xc3, 0x4d, 0x75, + 0x77, 0x9e, 0x02, 0xc8, 0x88, 0xc5, 0xd4, 0xe7, 0x5e, 0x9e, 0x3e, 0x44, 0x1f, 0x38, 0xbd, 0x2a, + 0x01, 0x78, 0x16, 0x43, 0x3f, 0x0c, 0xd9, 0xaa, 0xdb, 0xa2, 0xb4, 0x36, 0x9f, 0xc3, 0x07, 0xbb, + 0xcd, 0x45, 0xc8, 0xde, 0xac, 0xe8, 0x78, 0xe5, 0xd6, 0xb4, 0xa4, 0x8c, 0x56, 0x43, 0x53, 0xf1, + 0x01, 0xc8, 0xb4, 0xcc, 0x9a, 0xea, 0xe0, 0x0a, 0xdd, 0x05, 0xc7, 0x22, 0x0b, 0x98, 0x29, 0xc2, + 0xeb, 0xf6, 0xad, 0x69, 0xc4, 0xd4, 0xf2, 0x11, 0xcb, 0xb4, 0xac, 0x01, 0x06, 0x21, 0x04, 0x3e, + 0x9d, 0x7e, 0x4b, 0x82, 0xcc, 0x82, 0xef, 0xb6, 0x51, 0x0e, 0x06, 0x9b, 0x86, 0xae, 0x5d, 0xe7, + 0xfe, 0x98, 0x56, 0x44, 0x13, 0xe5, 0x21, 0xc5, 0x5e, 0xfc, 0x72, 0xf6, 0xc4, 0x51, 0xb2, 0x68, + 0x13, 0xaa, 0x9b, 0x78, 0xcb, 0xd6, 0xc4, 0x6c, 0x28, 0xa2, 0x89, 0x2e, 0x42, 0xd6, 0xc6, 0xd5, + 0x96, 0xa5, 0x39, 0x7b, 0x95, 0xaa, 0xa1, 0x3b, 0x6a, 0xd5, 0x61, 0xaf, 0x10, 0x95, 0x8e, 0xde, + 0xbe, 0x35, 0x7d, 0x0f, 0x93, 0x35, 0x8c, 0x21, 0x2b, 0xa3, 0x02, 0x34, 0xcf, 0x20, 0x64, 0x84, + 0x1a, 0x76, 0x54, 0xad, 0x61, 0xd3, 0x9a, 0x30, 0xad, 0x88, 0xa6, 0x4f, 0x97, 0x9f, 0x18, 0xf4, + 0x1f, 0x1c, 0x5e, 0x84, 0xac, 0x61, 0x62, 0x2b, 0x50, 0x61, 0x4b, 0xe1, 0x91, 0xc3, 0x18, 0xb2, + 0x32, 0x2a, 0x40, 0xa2, 0xfa, 0xbe, 0x48, 0xa6, 0x59, 0x6c, 0xb3, 0xcd, 0xd6, 0x96, 0x38, 0x6f, + 0x0c, 0xf0, 0x09, 0x63, 0xc8, 0x64, 0x42, 0x39, 0x68, 0x9d, 0x42, 0x48, 0x85, 0xfc, 0x9c, 0xaa, + 0x35, 0xc4, 0xcb, 0xad, 0x0a, 0x6f, 0xa1, 0x25, 0x18, 0xb0, 0x1d, 0xd5, 0x69, 0xb1, 0x5a, 0x24, + 0x59, 0x7a, 0xfc, 0x7f, 0xdf, 0x9a, 0x7e, 0xb4, 0x07, 0x27, 0x2e, 0x19, 0x7a, 0x6d, 0x83, 0x12, + 0x2a, 0x9c, 0x01, 0xba, 0x08, 0x03, 0x8e, 0x71, 0x1d, 0xeb, 0xdc, 0x46, 0x7d, 0x05, 0x30, 0x7d, + 0x56, 0xcb, 0xa8, 0x91, 0x03, 0xd9, 0x1a, 0x6e, 0xe0, 0x3a, 0x2b, 0x08, 0x77, 0x54, 0xb2, 0x11, + 0xa3, 0x1f, 0xa2, 0x2a, 0x2d, 0xf5, 0x1d, 0x65, 0xdc, 0x40, 0x61, 0x7e, 0xb2, 0x32, 0xea, 0x82, + 0x36, 0x28, 0x04, 0x5d, 0x09, 0xdc, 0x7b, 0xe3, 0x5f, 0x6b, 0xbb, 0xaf, 0x5b, 0x28, 0xf9, 0x9c, + 0x56, 0x1c, 0xdf, 0xf8, 0x6f, 0xcd, 0x5d, 0x84, 0x6c, 0x4b, 0xdf, 0x32, 0x74, 0xfa, 0x42, 0x1a, + 0xdf, 0x99, 0x90, 0xad, 0x6e, 0xdc, 0x3f, 0x6b, 0x61, 0x0c, 0x59, 0x19, 0x75, 0x41, 0x97, 0xd8, + 0xfe, 0xa5, 0x06, 0x23, 0x1e, 0x16, 0x8d, 0xc4, 0x74, 0x64, 0x24, 0xde, 0xcb, 0x23, 0xf1, 0x70, + 0x78, 0x14, 0x2f, 0x18, 0x87, 0x5d, 0x20, 0x21, 0x43, 0x97, 0x00, 0xbc, 0xf8, 0xa7, 0xc7, 0x38, + 0x99, 0x53, 0x72, 0x74, 0x12, 0x11, 0x5b, 0x5f, 0x8f, 0x16, 0x7d, 0x18, 0xc6, 0x9b, 0x9a, 0x5e, + 0xb1, 0x71, 0x63, 0xbb, 0xc2, 0x0d, 0x4c, 0x58, 0xd2, 0xef, 0x89, 0x94, 0x96, 0xfb, 0xf3, 0x87, + 0xdb, 0xb7, 0xa6, 0xf3, 0x3c, 0x47, 0xb6, 0xb3, 0x94, 0x95, 0xb1, 0xa6, 0xa6, 0x6f, 0xe0, 0xc6, + 0xf6, 0x82, 0x0b, 0x2b, 0x0e, 0x7d, 0xe2, 0xe5, 0xe9, 0x43, 0x3c, 0x1e, 0x0f, 0xc9, 0x67, 0xe9, + 0xc3, 0x07, 0x1e, 0x47, 0xd8, 0x26, 0xbb, 0x29, 0x55, 0x34, 0xe8, 0x81, 0x4f, 0x5a, 0xf1, 0x00, + 0x2c, 0x8e, 0x5f, 0xf8, 0x77, 0x33, 0x92, 0xfc, 0x0b, 0x12, 0x0c, 0x2c, 0x5c, 0x5b, 0x57, 0x35, + 0x0b, 0x2d, 0xc1, 0x98, 0xe7, 0x39, 0xc1, 0x28, 0x3e, 0x76, 0xfb, 0xd6, 0x74, 0x2e, 0xec, 0x5c, + 0x6e, 0x18, 0x7b, 0x0e, 0x2c, 0xe2, 0x78, 0xa9, 0xdb, 0x96, 0x3b, 0xc0, 0xaa, 0x0d, 0x45, 0x6e, + 0xdf, 0x90, 0x87, 0xd4, 0x2c, 0xc3, 0x20, 0x93, 0xd6, 0x46, 0x45, 0x48, 0x9a, 0xe4, 0x07, 0x7f, + 0xb2, 0x32, 0xd5, 0xd5, 0x79, 0x29, 0xbe, 0x7b, 0xce, 0x4b, 0x48, 0xe4, 0xcf, 0xc4, 0x00, 0x16, + 0xae, 0x5d, 0xdb, 0xb4, 0x34, 0xb3, 0x81, 0x9d, 0x3b, 0xa9, 0xf9, 0x26, 0x1c, 0xf6, 0xed, 0xef, + 0xac, 0x6a, 0x48, 0xfb, 0x99, 0xdb, 0xb7, 0xa6, 0x8f, 0x85, 0xb5, 0xf7, 0xa1, 0xc9, 0xca, 0xb8, + 0xb7, 0xd3, 0xb3, 0xaa, 0x1d, 0xb9, 0xd6, 0x6c, 0xc7, 0xe5, 0x1a, 0xef, 0xce, 0xd5, 0x87, 0xe6, + 0xe7, 0xba, 0x60, 0x3b, 0x9d, 0x4d, 0xbb, 0x01, 0x19, 0xcf, 0x24, 0x36, 0x5a, 0x80, 0x94, 0xc3, + 0x7f, 0x73, 0x0b, 0xcb, 0xdd, 0x2d, 0x2c, 0xc8, 0xb8, 0x95, 0x5d, 0x4a, 0xf9, 0x4f, 0x25, 0x00, + 0xcf, 0x67, 0x7f, 0x30, 0x5d, 0x8c, 0xa4, 0x72, 0x9e, 0x78, 0xe3, 0x07, 0xaa, 0xc5, 0x38, 0x75, + 0xc8, 0x9e, 0x3f, 0x1e, 0x83, 0xf1, 0xab, 0x22, 0xf3, 0xfc, 0xc0, 0xdb, 0x60, 0x1d, 0x06, 0xb1, + 0xee, 0x58, 0x1a, 0x35, 0x02, 0x99, 0xed, 0xc7, 0xba, 0xcd, 0x76, 0x07, 0x9d, 0xe8, 0x17, 0x55, + 0xc4, 0x33, 0x09, 0xce, 0x26, 0x64, 0x8d, 0x4f, 0xc5, 0x21, 0xd7, 0x8d, 0x12, 0xcd, 0xc3, 0x68, + 0xd5, 0xc2, 0x14, 0x50, 0xf1, 0x1f, 0x82, 0x96, 0xf2, 0x5e, 0xe9, 0x18, 0x42, 0x90, 0x95, 0x11, + 0x01, 0xe1, 0xab, 0x47, 0x1d, 0x48, 0x5d, 0x47, 0xdc, 0x8e, 0x60, 0xf5, 0x58, 0xc8, 0xc9, 0x7c, + 0xf9, 0x10, 0x83, 0x04, 0x19, 0xb0, 0xf5, 0x63, 0xc4, 0x83, 0xd2, 0x05, 0xe4, 0x83, 0x30, 0xaa, + 0xe9, 0x9a, 0xa3, 0xa9, 0x8d, 0xca, 0x96, 0xda, 0x50, 0xf5, 0xea, 0x41, 0xca, 0x62, 0x96, 0xf2, + 0xf9, 0xb0, 0x21, 0x76, 0xb2, 0x32, 0xc2, 0x21, 0x25, 0x06, 0x40, 0x97, 0x60, 0x50, 0x0c, 0x95, + 0x38, 0x50, 0xb5, 0x21, 0xc8, 0xfd, 0x15, 0x5c, 0x1c, 0xc6, 0x14, 0x5c, 0xfb, 0xff, 0x53, 0xd1, + 0xdf, 0x54, 0xac, 0x00, 0xb0, 0x70, 0x27, 0x09, 0xf6, 0x00, 0xb3, 0x41, 0x12, 0x46, 0x9a, 0x71, + 0x58, 0xb0, 0x1d, 0xdf, 0x7c, 0xdc, 0x8a, 0xc1, 0x90, 0x7f, 0x3e, 0xfe, 0x9c, 0xae, 0x4a, 0x68, + 0xc9, 0xcb, 0x44, 0x09, 0xfe, 0x1d, 0xca, 0x2e, 0x99, 0xa8, 0xcd, 0x7b, 0xf7, 0x4f, 0x41, 0x7f, + 0x12, 0x83, 0x81, 0x75, 0xd5, 0x52, 0x9b, 0x36, 0xaa, 0xb6, 0x55, 0x9a, 0xe2, 0xe0, 0xb4, 0xed, + 0x6b, 0xc3, 0xfc, 0xd0, 0x21, 0xa2, 0xd0, 0xfc, 0x5c, 0x87, 0x42, 0xf3, 0x3d, 0x30, 0x42, 0xf6, + 0xbb, 0xbe, 0x3b, 0x20, 0xc4, 0xda, 0xc3, 0xa5, 0x23, 0x1e, 0x97, 0x60, 0x3f, 0xdb, 0x0e, 0x5f, + 0xf3, 0x5f, 0x02, 0xc9, 0x10, 0x0c, 0x2f, 0x31, 0x13, 0xf2, 0x49, 0x6f, 0xdf, 0xe9, 0xeb, 0x94, + 0x15, 0x68, 0xaa, 0xbb, 0x65, 0xd6, 0x40, 0xcb, 0x80, 0x76, 0xdc, 0xa3, 0x8f, 0x8a, 0x67, 0x4e, + 0x42, 0x7f, 0xfc, 0xf6, 0xad, 0xe9, 0x23, 0x8c, 0xbe, 0x1d, 0x47, 0x56, 0xc6, 0x3c, 0xa0, 0xe0, + 0x76, 0x1a, 0x80, 0xe8, 0x55, 0x61, 0x57, 0x48, 0xd9, 0x76, 0xe7, 0xf0, 0xed, 0x5b, 0xd3, 0x63, + 0x8c, 0x8b, 0xd7, 0x27, 0x2b, 0x69, 0xd2, 0x58, 0x20, 0xbf, 0x7d, 0x9e, 0xfd, 0x15, 0x09, 0x90, + 0x97, 0xf2, 0x15, 0x6c, 0x9b, 0x64, 0xbb, 0x46, 0x0a, 0x71, 0x5f, 0xd5, 0x2c, 0xed, 0x5f, 0x88, + 0x7b, 0xf4, 0xa2, 0x10, 0xf7, 0x45, 0xca, 0x79, 0x2f, 0x3d, 0xc6, 0xf8, 0x3c, 0x76, 0xb8, 0x6f, + 0x5b, 0x98, 0x37, 0x34, 0x41, 0xdd, 0x96, 0x0f, 0x0f, 0xc9, 0xff, 0x52, 0x82, 0x23, 0x6d, 0x1e, + 0xe5, 0x0a, 0xfb, 0x17, 0x00, 0x59, 0xbe, 0x4e, 0xfe, 0x51, 0x31, 0x26, 0x74, 0xdf, 0x0e, 0x3a, + 0x66, 0xb5, 0xe5, 0xdd, 0x3b, 0x97, 0xe1, 0xd9, 0x85, 0xdd, 0x7f, 0x2c, 0xc1, 0x84, 0x7f, 0x78, + 0x57, 0x91, 0x55, 0x18, 0xf2, 0x8f, 0xce, 0x55, 0xb8, 0xbf, 0x17, 0x15, 0xb8, 0xf4, 0x01, 0x7a, + 0xf4, 0x8c, 0x17, 0xae, 0xec, 0x70, 0xec, 0xf1, 0x9e, 0xad, 0x21, 0x64, 0x0a, 0x87, 0x6d, 0x82, + 0xce, 0xc7, 0xff, 0x91, 0x20, 0xb1, 0x6e, 0x18, 0x0d, 0x64, 0xc0, 0x98, 0x6e, 0x38, 0x15, 0xe2, + 0x59, 0xb8, 0x56, 0xe1, 0x9b, 0x6e, 0x96, 0x07, 0xe7, 0xfb, 0x33, 0xd2, 0x77, 0x6e, 0x4d, 0xb7, + 0xb3, 0x52, 0x46, 0x75, 0xc3, 0x29, 0x51, 0xc8, 0x26, 0xdb, 0x92, 0x7f, 0x18, 0x86, 0x83, 0x83, + 0xb1, 0x2c, 0xf9, 0x6c, 0xdf, 0x83, 0x05, 0xd9, 0xdc, 0xbe, 0x35, 0x3d, 0xe1, 0x45, 0x8c, 0x0b, + 0x96, 0x95, 0xa1, 0x2d, 0xdf, 0xe8, 0xec, 0x7e, 0xdc, 0xf7, 0x5e, 0x9e, 0x96, 0x4a, 0x17, 0xbb, + 0x9e, 0x80, 0x3f, 0xb2, 0xaf, 0x08, 0xbb, 0xee, 0x31, 0x6e, 0xf0, 0xd8, 0xfb, 0x1b, 0xa3, 0x30, + 0xdd, 0xe5, 0x9c, 0xd7, 0xd9, 0x3d, 0xd0, 0x11, 0x6f, 0xc4, 0x19, 0x6c, 0xbe, 0xa7, 0x63, 0x65, + 0xf9, 0xa5, 0x04, 0xa0, 0x15, 0xbb, 0x3e, 0x4f, 0x8a, 0x08, 0xdf, 0x9d, 0xae, 0xd0, 0x19, 0x85, + 0xf4, 0x96, 0xce, 0x28, 0x56, 0x02, 0xbb, 0xfe, 0x58, 0x7f, 0x47, 0x87, 0x3d, 0x6f, 0xfd, 0xe3, + 0x6f, 0xcb, 0xd6, 0xbf, 0x73, 0x65, 0x90, 0xb8, 0x73, 0x5b, 0x88, 0xe4, 0x81, 0xb6, 0x10, 0x93, + 0x30, 0xc0, 0x8f, 0xec, 0xd8, 0x87, 0xd4, 0x79, 0x0b, 0x9d, 0x11, 0x9f, 0x95, 0x1e, 0xec, 0x2d, + 0x37, 0x33, 0xec, 0x62, 0xea, 0x13, 0x22, 0x33, 0x7f, 0x36, 0x0e, 0xd9, 0x15, 0xbb, 0x5e, 0xae, + 0x69, 0xce, 0x5d, 0xf2, 0x8e, 0xa7, 0xbb, 0x6f, 0xa4, 0xd0, 0xed, 0x5b, 0xd3, 0x23, 0xcc, 0x0a, + 0xfb, 0xe8, 0xde, 0x84, 0xd1, 0xd0, 0xf9, 0x34, 0xf7, 0x85, 0x85, 0x83, 0x1c, 0x93, 0x87, 0x58, + 0xc9, 0xb4, 0xee, 0xf5, 0x79, 0x24, 0xda, 0xed, 0xec, 0x7e, 0xcc, 0x05, 0x2e, 0xdd, 0xcd, 0x53, + 0x27, 0x6f, 0x56, 0xfe, 0x48, 0x82, 0xcc, 0x8a, 0x2d, 0xf6, 0x72, 0xf8, 0x07, 0x74, 0x5f, 0xfb, + 0xa4, 0xfb, 0x8e, 0x4b, 0xbc, 0x37, 0xef, 0x13, 0xef, 0xbd, 0x78, 0x8a, 0xfe, 0x76, 0x8c, 0xa6, + 0xa7, 0x12, 0xae, 0x6b, 0xba, 0xbb, 0x86, 0xe1, 0x3f, 0xaf, 0xe5, 0xb9, 0x67, 0xd0, 0xc4, 0x41, + 0x0d, 0xfa, 0x86, 0x04, 0xc3, 0x2b, 0x76, 0xfd, 0xaa, 0x5e, 0xfb, 0x7f, 0xdd, 0x77, 0xee, 0xf8, + 0x12, 0xfe, 0xcf, 0x62, 0x70, 0xd2, 0xbf, 0xe6, 0x7e, 0xb0, 0x85, 0xad, 0x3d, 0x77, 0x59, 0x35, + 0xd5, 0xba, 0xa6, 0xfb, 0x9f, 0x62, 0x1f, 0xf1, 0x0b, 0x4c, 0x71, 0x85, 0xd8, 0xb2, 0x0e, 0x99, + 0x75, 0xb5, 0x8e, 0x15, 0xfc, 0xc1, 0x16, 0xb6, 0x9d, 0x0e, 0xef, 0xa6, 0x4c, 0xc2, 0x80, 0xb1, + 0xbd, 0x2d, 0xae, 0xa8, 0x24, 0x14, 0xde, 0x42, 0x13, 0x90, 0x6c, 0x68, 0x4d, 0x8d, 0x19, 0x25, + 0xa1, 0xb0, 0x06, 0x9a, 0x86, 0x4c, 0x95, 0xe8, 0x5e, 0x61, 0x77, 0x7a, 0x13, 0xe2, 0xdb, 0x1b, + 0x2d, 0xdd, 0xd9, 0x24, 0x10, 0xf9, 0x69, 0x18, 0x62, 0xe3, 0xf1, 0x3a, 0xf4, 0x08, 0xa4, 0xe8, + 0x1d, 0x4c, 0x6f, 0xd4, 0x41, 0xd2, 0xbe, 0xc2, 0xde, 0x63, 0x61, 0x5c, 0xd8, 0xc0, 0xac, 0x51, + 0x2a, 0x75, 0x35, 0xe5, 0x89, 0xe8, 0x64, 0xc7, 0x0c, 0xe5, 0x9a, 0xf1, 0x37, 0x92, 0x70, 0x98, + 0x3f, 0x5e, 0x56, 0x4d, 0x6d, 0x76, 0xc7, 0x71, 0xc4, 0x0b, 0x62, 0xc0, 0x37, 0x80, 0xaa, 0xa9, + 0xc9, 0x7b, 0x90, 0xb8, 0xe4, 0x38, 0x26, 0x3a, 0x09, 0x49, 0xab, 0xd5, 0xc0, 0xe2, 0x1c, 0x74, + 0xa2, 0xe0, 0xe1, 0x14, 0x08, 0x82, 0xd2, 0x6a, 0x60, 0x85, 0xa1, 0xa0, 0x32, 0x4c, 0x6f, 0xb7, + 0x1a, 0x8d, 0xbd, 0x4a, 0x0d, 0xd3, 0x7f, 0x9b, 0xe4, 0xfe, 0xe3, 0x01, 0xbc, 0x6b, 0xaa, 0xba, + 0x5b, 0x7c, 0xa4, 0x94, 0x63, 0x14, 0x6d, 0x81, 0x62, 0x89, 0x7f, 0x3a, 0x50, 0x16, 0x38, 0xf2, + 0xef, 0xc5, 0x20, 0x25, 0x58, 0xd3, 0x17, 0x4b, 0x70, 0x03, 0x57, 0x1d, 0x43, 0x3c, 0x28, 0x74, + 0xdb, 0x08, 0x41, 0xbc, 0xce, 0xa7, 0x28, 0x7d, 0xe9, 0x90, 0x42, 0x1a, 0x04, 0xe6, 0xbe, 0xee, + 0x43, 0x60, 0x66, 0x8b, 0xcc, 0x5a, 0xc2, 0x34, 0xc4, 0x81, 0xc5, 0xa5, 0x43, 0x0a, 0x6d, 0xa1, + 0x1c, 0x0c, 0x90, 0x00, 0x72, 0xd8, 0x37, 0x21, 0x09, 0x9c, 0xb7, 0xd1, 0x24, 0x24, 0x4d, 0xd5, + 0xa9, 0xb2, 0x7b, 0xb8, 0xa4, 0x83, 0x35, 0x49, 0x4c, 0xb0, 0x77, 0x71, 0xc3, 0xff, 0x93, 0x84, + 0x18, 0x83, 0x7d, 0xf4, 0x8c, 0xc8, 0xbd, 0xae, 0x3a, 0x0e, 0xb6, 0x74, 0xc2, 0x90, 0xa1, 0xd3, + 0x77, 0xc8, 0x8c, 0xda, 0x1e, 0xff, 0x3f, 0x29, 0xf4, 0x37, 0xff, 0xc7, 0x0c, 0xd4, 0x1f, 0x2a, + 0xb4, 0x93, 0xfd, 0x7b, 0xa8, 0x21, 0x01, 0x2c, 0x11, 0xa4, 0x32, 0x8c, 0xab, 0xb5, 0x9a, 0xc6, + 0xfe, 0x65, 0x49, 0x65, 0x4b, 0xa3, 0x1b, 0x6c, 0x9b, 0xfe, 0xf3, 0xaf, 0x6e, 0x73, 0x81, 0x3c, + 0x82, 0x12, 0xc7, 0x2f, 0xa5, 0x61, 0xd0, 0x64, 0x42, 0xc9, 0x17, 0x60, 0xac, 0x4d, 0x52, 0x22, + 0xdf, 0x75, 0x4d, 0xaf, 0x89, 0x77, 0xa0, 0xc8, 0x6f, 0x02, 0xa3, 0x1f, 0x2e, 0x64, 0x8f, 0x60, + 0xe9, 0xef, 0xd2, 0x8f, 0x75, 0xbf, 0xcb, 0x31, 0xe2, 0xbb, 0xcb, 0xa1, 0x9a, 0x5a, 0x29, 0x4d, + 0xf9, 0xf3, 0x2b, 0x1c, 0x73, 0xbc, 0x83, 0x5d, 0xdf, 0x28, 0x18, 0x56, 0x7d, 0xb6, 0x8e, 0x75, + 0x51, 0x51, 0x93, 0x2e, 0xd5, 0xd4, 0x6c, 0xea, 0x8e, 0xde, 0x87, 0x14, 0xed, 0x0b, 0xbe, 0xdf, + 0xf4, 0x66, 0x47, 0x62, 0x71, 0x6e, 0x7d, 0xc9, 0xf5, 0xe3, 0x6f, 0xc6, 0xe0, 0x98, 0xcf, 0x8f, + 0x7d, 0xc8, 0xed, 0xee, 0x9c, 0xef, 0xec, 0xf1, 0x3d, 0x7c, 0x86, 0xf0, 0x0a, 0x24, 0x08, 0x3e, + 0x8a, 0xf8, 0xb7, 0x09, 0xb9, 0x5f, 0xfa, 0x17, 0xff, 0x48, 0xa6, 0x4e, 0xd1, 0x79, 0x56, 0x28, + 0x93, 0xd2, 0xc7, 0x7b, 0xb7, 0x5f, 0xd6, 0xfb, 0x86, 0xa4, 0x7d, 0xe7, 0xcc, 0x18, 0xb6, 0xe1, + 0xeb, 0x67, 0x40, 0xee, 0xb2, 0x4d, 0x61, 0x19, 0x73, 0xff, 0x8d, 0x51, 0x1f, 0xe9, 0xb8, 0xdb, + 0x3d, 0x99, 0xfd, 0x66, 0xb0, 0xc7, 0x2d, 0xd4, 0x2e, 0x4c, 0x3e, 0x43, 0xc6, 0xf6, 0x0e, 0x8f, + 0x44, 0x62, 0x9f, 0x74, 0x1f, 0x79, 0x4b, 0xfc, 0x7f, 0xaf, 0x89, 0xe7, 0xd7, 0xe0, 0xc9, 0xc7, + 0x37, 0x44, 0x0f, 0x14, 0xba, 0xae, 0x17, 0x05, 0xdf, 0x62, 0xa1, 0xf8, 0x28, 0xe5, 0x9f, 0x97, + 0xe0, 0x9e, 0xb6, 0xa1, 0x79, 0x8e, 0x5f, 0xec, 0xf0, 0x06, 0x54, 0xcf, 0x77, 0x67, 0xfc, 0x6f, + 0x43, 0x2d, 0x76, 0x10, 0xf6, 0xc1, 0x48, 0x61, 0x99, 0x14, 0x01, 0x69, 0x9f, 0x82, 0xc3, 0x41, + 0x61, 0x85, 0x99, 0xde, 0x05, 0x23, 0xc1, 0x9a, 0x80, 0x9b, 0x6b, 0x38, 0x50, 0x15, 0xc8, 0x95, + 0xb0, 0x9d, 0x5d, 0x5d, 0xcb, 0x90, 0x76, 0x51, 0xf9, 0x6e, 0xa4, 0x67, 0x55, 0x3d, 0x4a, 0xf9, + 0x33, 0x12, 0xcc, 0x04, 0x47, 0xf0, 0x8a, 0x6f, 0xbb, 0x3f, 0x61, 0xef, 0xd8, 0x14, 0xbf, 0x21, + 0xc1, 0xbd, 0xfb, 0xc8, 0xc4, 0x0d, 0xf0, 0x3c, 0x4c, 0xf8, 0xce, 0xc7, 0x44, 0x0a, 0x17, 0xd3, + 0x7e, 0x32, 0xfa, 0x60, 0xcf, 0x3d, 0x0e, 0x3a, 0x4a, 0x8c, 0xf2, 0xb5, 0x3f, 0x98, 0x1e, 0x6f, + 0xef, 0xb3, 0x95, 0xf1, 0xf6, 0x33, 0xad, 0x3b, 0xe8, 0x1f, 0x5f, 0x90, 0xe0, 0xa1, 0xa0, 0xaa, + 0x1d, 0x1e, 0x5a, 0xbd, 0x53, 0xf3, 0xf0, 0x6f, 0x25, 0x38, 0xd9, 0x8b, 0x70, 0x7c, 0x42, 0xb6, + 0x60, 0xdc, 0x3b, 0xa5, 0x0e, 0xcf, 0xc7, 0xc3, 0x7d, 0x3c, 0xde, 0xe3, 0x5e, 0x8a, 0x5c, 0x6e, + 0x77, 0xc1, 0xf0, 0x26, 0x0f, 0x2c, 0xff, 0x94, 0xbb, 0x46, 0x0e, 0x16, 0xfe, 0xc2, 0xc8, 0x81, + 0xd2, 0xbf, 0xc3, 0x5c, 0xc4, 0x3a, 0xcc, 0x85, 0x6f, 0x17, 0x72, 0x83, 0xe7, 0xad, 0x0e, 0x27, + 0xd3, 0x1f, 0x80, 0xf1, 0x0e, 0xae, 0xcc, 0xa3, 0xba, 0x0f, 0x4f, 0x56, 0x50, 0xbb, 0xb3, 0xca, + 0x7b, 0x30, 0x4d, 0xc7, 0xed, 0x60, 0xe8, 0xbb, 0xad, 0x72, 0x93, 0xe7, 0x96, 0x8e, 0x43, 0x73, + 0xdd, 0x97, 0x60, 0x80, 0xcd, 0x33, 0x57, 0xf7, 0x00, 0x8e, 0xc2, 0x19, 0xc8, 0x3f, 0x2d, 0x72, + 0xd9, 0x82, 0x10, 0xbb, 0x73, 0x0c, 0xf5, 0xa2, 0xeb, 0x1d, 0x8a, 0x21, 0x9f, 0x31, 0x5e, 0x15, + 0x59, 0xad, 0xb3, 0x74, 0xdc, 0x1c, 0xd5, 0x3b, 0x96, 0xd5, 0x98, 0x6d, 0xee, 0x6e, 0xfa, 0xfa, + 0x59, 0x91, 0xbe, 0x5c, 0x9d, 0x22, 0xd2, 0xd7, 0x3b, 0x63, 0x7a, 0x37, 0x91, 0x45, 0x88, 0xf9, + 0x67, 0x31, 0x91, 0x7d, 0x4f, 0x82, 0x23, 0x54, 0x37, 0xff, 0xe3, 0x8e, 0x7e, 0x4d, 0xfe, 0x08, + 0x20, 0xdb, 0xaa, 0x56, 0x3a, 0x46, 0x77, 0xd6, 0xb6, 0xaa, 0xd7, 0x02, 0xeb, 0xcb, 0x23, 0x80, + 0x6a, 0xb6, 0x13, 0xc6, 0x66, 0x97, 0x43, 0xb3, 0x35, 0xdb, 0xb9, 0xb6, 0xcf, 0x6a, 0x94, 0xb8, + 0x03, 0xd3, 0xf9, 0x8a, 0x04, 0xf9, 0x4e, 0x2a, 0xf3, 0xe9, 0xd3, 0x60, 0x32, 0xf0, 0xe8, 0x2c, + 0x3c, 0x83, 0x8f, 0xf4, 0xf2, 0xc0, 0x28, 0x14, 0x46, 0x87, 0x2d, 0x7c, 0xb7, 0xeb, 0x80, 0xe9, + 0xa0, 0x87, 0xb6, 0x57, 0xd6, 0xef, 0x58, 0xf8, 0xfc, 0x6a, 0x5b, 0x5e, 0xfd, 0x33, 0x51, 0x7b, + 0xef, 0xc2, 0x54, 0x17, 0xa9, 0xef, 0xf6, 0xba, 0xb7, 0xd3, 0x75, 0x32, 0xef, 0x74, 0xf9, 0x7e, + 0x9a, 0x47, 0x42, 0xf0, 0xc5, 0x03, 0xdf, 0x5e, 0xac, 0xd3, 0x3b, 0x9e, 0xf2, 0xfb, 0xe0, 0x68, + 0x47, 0x2a, 0x2e, 0x5b, 0x11, 0x12, 0x3b, 0x9a, 0xed, 0x70, 0xb1, 0x1e, 0xe8, 0x26, 0x56, 0x88, + 0x9a, 0xd2, 0xc8, 0x08, 0xb2, 0x94, 0xf5, 0xba, 0x61, 0x34, 0xb8, 0x18, 0xf2, 0x15, 0x18, 0xf3, + 0xc1, 0xf8, 0x20, 0x67, 0x21, 0x61, 0x1a, 0xfc, 0xab, 0x26, 0x99, 0x53, 0xc7, 0xba, 0x0d, 0x42, + 0x68, 0xb8, 0xda, 0x14, 0x5f, 0x9e, 0x00, 0xc4, 0x98, 0xd1, 0x9b, 0x15, 0x62, 0x88, 0x0d, 0x18, + 0x0f, 0x40, 0xf9, 0x20, 0x3f, 0x04, 0x03, 0x26, 0x85, 0xb8, 0xef, 0xce, 0x75, 0x1b, 0x86, 0x62, + 0xb9, 0xdf, 0x91, 0xa0, 0xad, 0x53, 0xdf, 0x39, 0x0c, 0x49, 0xca, 0x15, 0x7d, 0x5e, 0x02, 0xf0, + 0xdd, 0x93, 0x28, 0x74, 0x63, 0xd3, 0x79, 0x4f, 0x9c, 0x9f, 0xed, 0x19, 0x9f, 0xd7, 0x6c, 0x27, + 0x7f, 0xec, 0x5f, 0xbf, 0xfe, 0xd9, 0xd8, 0xfd, 0x48, 0x9e, 0xed, 0xb2, 0x1b, 0xf7, 0xc5, 0xcb, + 0x57, 0x03, 0x9f, 0xd4, 0x78, 0xb4, 0xb7, 0xa1, 0x84, 0x64, 0x85, 0x5e, 0xd1, 0xb9, 0x60, 0x17, + 0xa8, 0x60, 0x67, 0xd0, 0x13, 0xd1, 0x82, 0xcd, 0x7e, 0x28, 0x18, 0x34, 0x1f, 0x41, 0xbf, 0x23, + 0xc1, 0x44, 0xa7, 0x2d, 0x1d, 0x3a, 0xd7, 0x9b, 0x14, 0xed, 0x25, 0x45, 0xfe, 0xfc, 0x01, 0x28, + 0xb9, 0x2a, 0x8b, 0x54, 0x95, 0x39, 0xf4, 0xf4, 0x01, 0x54, 0x99, 0xf5, 0xad, 0x3b, 0xe8, 0x7f, + 0x49, 0x70, 0x7c, 0xdf, 0x1d, 0x12, 0x9a, 0xeb, 0x4d, 0xca, 0x7d, 0x6a, 0xa7, 0x7c, 0xe9, 0xad, + 0xb0, 0xe0, 0x1a, 0x3f, 0x43, 0x35, 0xbe, 0x82, 0x96, 0x0e, 0xa2, 0xb1, 0x57, 0x11, 0xf9, 0x75, + 0xff, 0xcd, 0xe0, 0x7d, 0xdb, 0xfd, 0xdd, 0xa9, 0x6d, 0xe3, 0x11, 0x11, 0x18, 0xed, 0x45, 0xad, + 0xfc, 0x5e, 0xaa, 0x82, 0x82, 0xd6, 0xdf, 0xe2, 0xa4, 0xcd, 0x7e, 0x28, 0x98, 0xf8, 0x3f, 0x82, + 0xfe, 0xa7, 0xd4, 0xf9, 0xfa, 0xec, 0x93, 0xfb, 0x8a, 0xd8, 0x7d, 0x53, 0x95, 0x3f, 0xd7, 0x3f, + 0x21, 0x57, 0xb2, 0x49, 0x95, 0xac, 0x23, 0x7c, 0xa7, 0x95, 0xec, 0x38, 0x89, 0xe8, 0xb7, 0x24, + 0x98, 0xe8, 0xb4, 0x27, 0x89, 0x08, 0xcb, 0x7d, 0x36, 0x59, 0x11, 0x61, 0xb9, 0xdf, 0x06, 0x48, + 0xfe, 0x21, 0xaa, 0xfc, 0x59, 0x74, 0xba, 0x9b, 0xf2, 0xfb, 0xce, 0x22, 0x89, 0xc5, 0x7d, 0x8b, + 0xfc, 0x88, 0x58, 0xec, 0x65, 0x1f, 0x13, 0x11, 0x8b, 0x3d, 0xed, 0x31, 0xa2, 0x63, 0xd1, 0xd5, + 0xac, 0xc7, 0x69, 0xb4, 0xd1, 0x37, 0x25, 0x18, 0x0e, 0x54, 0xc4, 0xe8, 0xf1, 0x7d, 0x05, 0xed, + 0xb4, 0x61, 0xc8, 0x9f, 0xea, 0x87, 0x84, 0xeb, 0xb2, 0x44, 0x75, 0x99, 0x47, 0x73, 0x07, 0xd1, + 0xc5, 0x0a, 0x48, 0xfc, 0x8a, 0x04, 0xe3, 0x1d, 0xaa, 0xcc, 0x88, 0x28, 0xec, 0x5e, 0x34, 0xe7, + 0xcf, 0xf5, 0x4f, 0xc8, 0xb5, 0xba, 0x48, 0xb5, 0x7a, 0x0f, 0x7a, 0xea, 0x20, 0x5a, 0xf9, 0xd6, + 0xe7, 0x5b, 0xde, 0x6d, 0x44, 0xdf, 0x38, 0xe8, 0x6c, 0x9f, 0x82, 0x09, 0x85, 0x9e, 0xec, 0x9b, + 0x8e, 0xeb, 0xf3, 0x2c, 0xd5, 0xe7, 0x19, 0xb4, 0xf6, 0xd6, 0xf4, 0x69, 0x5f, 0xd6, 0xbf, 0xde, + 0xfe, 0xe2, 0xeb, 0xfe, 0x5e, 0xd4, 0xb1, 0x58, 0xcd, 0x3f, 0xd1, 0x17, 0x0d, 0x57, 0xea, 0x1c, + 0x55, 0xea, 0x14, 0x7a, 0xac, 0x9b, 0x52, 0xbe, 0x2b, 0xa7, 0x9a, 0xbe, 0x6d, 0xcc, 0x7e, 0x88, + 0x95, 0xc0, 0x1f, 0x41, 0x3f, 0x2a, 0xae, 0xfb, 0x9d, 0xd8, 0x77, 0x5c, 0x5f, 0x1d, 0x9b, 0x7f, + 0xa8, 0x07, 0x4c, 0x2e, 0xd7, 0xfd, 0x54, 0xae, 0x29, 0x74, 0xac, 0x9b, 0x5c, 0xa4, 0x96, 0x45, + 0x9f, 0x94, 0xdc, 0x1b, 0xc2, 0x27, 0xf7, 0xe7, 0xed, 0x2f, 0x76, 0xf3, 0x0f, 0xf7, 0x84, 0xcb, + 0x25, 0x79, 0x80, 0x4a, 0x32, 0x83, 0xa6, 0xba, 0x4a, 0xc2, 0x4a, 0xdf, 0x3b, 0x7d, 0x73, 0xe0, + 0x8f, 0x07, 0xbb, 0xbe, 0xe4, 0x5d, 0xc7, 0x3a, 0xb6, 0x35, 0xfb, 0x40, 0x37, 0x00, 0x7b, 0x7b, + 0x3c, 0xf5, 0x3b, 0x49, 0x18, 0x5a, 0x64, 0xa3, 0x6c, 0x38, 0xaa, 0xf3, 0x16, 0x37, 0x02, 0xc8, + 0xe6, 0xdf, 0x8b, 0x62, 0x1f, 0xba, 0xf3, 0x3e, 0xdd, 0x36, 0xd4, 0xd7, 0x3b, 0x93, 0xec, 0xfe, + 0x13, 0x7f, 0x3d, 0x31, 0xcc, 0x4f, 0x66, 0x9f, 0x9e, 0xa2, 0x77, 0x17, 0xd8, 0x27, 0xea, 0x3e, + 0x26, 0xc1, 0x61, 0x8a, 0xe5, 0xc5, 0x1b, 0xc5, 0x14, 0x2f, 0xcc, 0x74, 0xf5, 0x98, 0x65, 0xd5, + 0x77, 0x04, 0xc3, 0x3e, 0x2a, 0x77, 0x3f, 0xbf, 0x4c, 0x7e, 0xcc, 0x37, 0x78, 0x98, 0xad, 0xac, + 0x8c, 0x37, 0xda, 0x28, 0xed, 0xd0, 0xbe, 0x3e, 0x71, 0xf0, 0x7d, 0xfd, 0x65, 0xc8, 0xf8, 0x32, + 0x7d, 0x2e, 0x19, 0xf1, 0x8e, 0x57, 0xf8, 0x10, 0xcd, 0x4f, 0x8c, 0x3e, 0x2e, 0xc1, 0xe1, 0x8e, + 0x8b, 0x20, 0xfd, 0x6f, 0x84, 0x7d, 0x1e, 0xd2, 0x85, 0x8c, 0xd3, 0x91, 0xaf, 0xac, 0x4c, 0xb4, + 0x3a, 0x55, 0x13, 0xeb, 0x30, 0x1c, 0x58, 0xc0, 0x72, 0xe2, 0x7f, 0x8a, 0xf6, 0x7e, 0xbd, 0x39, + 0xc8, 0x00, 0xe5, 0x21, 0x85, 0x77, 0x4d, 0xc3, 0x72, 0x70, 0x8d, 0x5e, 0x79, 0x48, 0x29, 0x6e, + 0x5b, 0x5e, 0x05, 0xd4, 0x3e, 0xb9, 0xe1, 0xaf, 0x28, 0xa6, 0xbd, 0xaf, 0x28, 0x4e, 0x40, 0xd2, + 0xff, 0x9d, 0x41, 0xd6, 0xb8, 0x7b, 0xb7, 0x85, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, + 0x63, 0xc7, 0x34, 0x4c, 0x8e, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index 42ae20d7511e..cc9965f7a7e3 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -8,6 +8,8 @@ import ( "os" "path" "path/filepath" + "strconv" + "strings" "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" @@ -74,24 +76,39 @@ func (k Keeper) ScheduleUpgrade(ctx sdk.Context, plan types.Plan) error { } store := ctx.KVStore(k.storeKey) - bz := k.cdc.MustMarshalBinaryBare(&plan) store.Set(types.PlanKey(), bz) - if plan.UpgradedClientState != nil { - clientState, err := clienttypes.UnpackClientState(plan.UpgradedClientState) - if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "could not unpack clientstate: %v", err) + if plan.UpgradedClientState == nil { + // if latest UpgradedClientState is nil, but upgraded client exists in store, + // then delete client state from store. + _, height, _ := k.GetUpgradedClient(ctx) + if height != 0 { + store.Delete(types.UpgradedClientKey(height)) } - return k.SetUpgradedClient(ctx, clientState) + return nil } - // delete upgraded client key to remove any upgraded client set by outdated plan - store.Delete(types.UpgradedClientKey()) - return nil + + // Set UpgradedClientState in store + clientState, err := clienttypes.UnpackClientState(plan.UpgradedClientState) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "could not unpack clientstate: %v", err) + } + // deletes any previously stored upgraded client and sets the new upgraded client in + return k.SetUpgradedClient(ctx, plan.Height, clientState) } // SetUpgradedClient sets the expected upgraded client for the next version of this chain -func (k Keeper) SetUpgradedClient(ctx sdk.Context, cs ibcexported.ClientState) error { +func (k Keeper) SetUpgradedClient(ctx sdk.Context, upgradeHeight int64, cs ibcexported.ClientState) error { + store := ctx.KVStore(k.storeKey) + + // delete any previously stored upgraded client before setting a new one + // since there should only ever be one upgraded client in the store at any given time + _, setHeight, _ := k.GetUpgradedClient(ctx) + if setHeight != 0 { + store.Delete(types.UpgradedClientKey(setHeight)) + } + // zero out any custom fields before setting cs = cs.ZeroCustomFields() bz, err := clienttypes.MarshalClientState(k.cdc, cs) @@ -99,20 +116,49 @@ func (k Keeper) SetUpgradedClient(ctx sdk.Context, cs ibcexported.ClientState) e return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "could not marshal clientstate: %v", err) } - store := ctx.KVStore(k.storeKey) - store.Set(types.UpgradedClientKey(), bz) + store.Set(types.UpgradedClientKey(upgradeHeight), bz) return nil } // GetUpgradedClient gets the expected upgraded client for the next version of this chain -func (k Keeper) GetUpgradedClient(ctx sdk.Context) (ibcexported.ClientState, error) { +// along with the planned upgrade height +// Since there is only ever one upgraded client in store, we do not need to know key beforehand +func (k Keeper) GetUpgradedClient(ctx sdk.Context) (ibcexported.ClientState, int64, error) { store := ctx.KVStore(k.storeKey) - bz := store.Get(types.UpgradedClientKey()) - if len(bz) == 0 { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "no upgraded client in store") + iterator := sdk.KVStorePrefixIterator(store, []byte(types.KeyUpgradedClient)) + var ( + count, height int + bz []byte + ) + + defer iterator.Close() + for ; iterator.Valid(); iterator.Next() { + count++ + // we must panic if the upgraded clients in store is ever more than one since + // that would break upgrade functionality and chain must halt and fix issue manually + if count > 1 { + panic("more than 1 upgrade client stored in state") + } + + keySplit := strings.Split(string(iterator.Key()), "/") + var err error + height, err = strconv.Atoi(keySplit[len(keySplit)-1]) + if err != nil { + return nil, 0, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "could not parse upgrade height from key: %s", err) + } + + bz = iterator.Value() + } + + if count == 0 { + return nil, 0, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "upgrade client not found in store") } - return clienttypes.UnmarshalClientState(k.cdc, bz) + clientState, err := clienttypes.UnmarshalClientState(k.cdc, bz) + if err != nil { + return nil, 0, err + } + return clientState, int64(height), nil } // GetDoneHeight returns the height at which the given upgrade was executed diff --git a/x/upgrade/keeper/keeper_test.go b/x/upgrade/keeper/keeper_test.go index 8f420e10f488..c53a2d38576c 100644 --- a/x/upgrade/keeper/keeper_test.go +++ b/x/upgrade/keeper/keeper_test.go @@ -13,6 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" + ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" "github.com/cosmos/cosmos-sdk/x/upgrade/types" @@ -234,12 +235,13 @@ func (s *KeeperTestSuite) TestScheduleUpgrade() { if tc.expPass { s.Require().NoError(err, "valid test case failed") if tc.plan.UpgradedClientState != nil { - got, err := s.app.UpgradeKeeper.GetUpgradedClient(s.ctx) + got, height, err := s.app.UpgradeKeeper.GetUpgradedClient(s.ctx) s.Require().NoError(err) + s.Require().Equal(tc.plan.Height, height, "upgradedClient not stored at correct upgrade height") s.Require().Equal(clientState, got, "upgradedClient not equal to expected value") } else { // check that upgraded client is empty if latest plan does not specify an upgraded client - got, err := s.app.UpgradeKeeper.GetUpgradedClient(s.ctx) + got, _, err := s.app.UpgradeKeeper.GetUpgradedClient(s.ctx) s.Require().Error(err) s.Require().Nil(got) } @@ -250,6 +252,66 @@ func (s *KeeperTestSuite) TestScheduleUpgrade() { } } +func (s *KeeperTestSuite) TestSetUpgradedClient() { + var ( + clientState ibcexported.ClientState + height int64 + ) + cases := []struct { + name string + setup func() + exists bool + }{ + { + name: "no upgraded client exists", + setup: func() {}, + exists: false, + }, + { + name: "success", + setup: func() { + clientState = &ibctmtypes.ClientState{ChainId: "gaiachain"} + height = 10 + + s.app.UpgradeKeeper.SetUpgradedClient(s.ctx, 10, clientState) + }, + exists: true, + }, + { + name: "successful overwrite", + setup: func() { + clientState = &ibctmtypes.ClientState{ChainId: "gaiachain"} + altCs := &ibctmtypes.ClientState{ChainId: "ethermint"} + height = 10 + + s.app.UpgradeKeeper.SetUpgradedClient(s.ctx, 50, altCs) + s.app.UpgradeKeeper.SetUpgradedClient(s.ctx, 10, clientState) + }, + exists: true, + }, + } + + for _, tc := range cases { + // reset suite + s.SetupTest() + + // setup test case + tc.setup() + + gotCs, gotHeight, err := s.app.UpgradeKeeper.GetUpgradedClient(s.ctx) + if tc.exists { + s.Require().Equal(clientState, gotCs, "valid case: %s did not retrieve correct client state", tc.name) + s.Require().Equal(height, gotHeight, "valid case: %s did not retrieve correct upgrade height", tc.name) + s.Require().NoError(err, "valid case: %s returned error") + } else { + s.Require().Nil(gotCs, "invalid case: %s retrieved valid client state", tc.name) + s.Require().Equal(int64(0), gotHeight, "invalid case: %s retrieved valid upgrade height", tc.name) + s.Require().Error(err, "invalid case: %s did not return error", tc.name) + } + } + +} + func TestKeeperTestSuite(t *testing.T) { suite.Run(t, new(KeeperTestSuite)) } diff --git a/x/upgrade/types/keys.go b/x/upgrade/types/keys.go index 593cd52f5fca..cef1f09366ad 100644 --- a/x/upgrade/types/keys.go +++ b/x/upgrade/types/keys.go @@ -1,5 +1,7 @@ package types +import "fmt" + const ( // ModuleName is the name of this module ModuleName = "upgrade" @@ -33,6 +35,6 @@ func PlanKey() []byte { // UpgradedClientKey is the key under which the upgraded client state is saved // Connecting IBC chains can verify against the upgraded client in this path before // upgrading their clients -func UpgradedClientKey() []byte { - return []byte(KeyUpgradedClient) +func UpgradedClientKey(height int64) []byte { + return []byte(fmt.Sprintf("%s/%d", KeyUpgradedClient, height)) }