Reconciliation contract: Full state instantiation (#365)

Author: pbukva

cmd/fetchd/cmd/gen_asi_upgrade_manifest.go

@@ -9,20 +9,64 @@ import (
 	"path"
 )
 
-type ASIUpgradeTransfer struct {
-	From   string      `json:"from"`
-	Amount types.Coins `json:"amount"`
+type ASIUpgradeIBCTransfer struct {
+	From      string      `json:"from"`
+	ChannelID string      `json:"channel_id"`
+	Amount    types.Coins `json:"amount"`
 }
 
-type ASIUpgradeTransfers struct {
-	Transfer []ASIUpgradeTransfer `json:"transfer"`
-	To       string               `json:"to"`
+type ASIUpgradeIBCTransfers struct {
+	Transfers                   []ASIUpgradeIBCTransfer `json:"transfer"`
+	To                          string                  `json:"to"`
+	AggregatedTransferredAmount types.Coins             `json:"aggregated_transferred_amount"`
+	NumberOfTransfers           int                     `json:"number_of_transfers"`
+}
+
+type ASIUpgradeReconciliationTransfer struct {
+	From    string      `json:"from"`
+	EthAddr string      `json:"eth_addr"`
+	Amount  types.Coins `json:"amount"`
+}
+
+type ASIUpgradeReconciliationTransfers struct {
+	Transfers                   []ASIUpgradeReconciliationTransfer `json:"transfers"`
+	To                          string                             `json:"to"`
+	AggregatedTransferredAmount types.Coins                        `json:"aggregated_transferred_amount"`
+	NumberOfTransfers           int                                `json:"number_of_transfers"`
+}
+
+type ASIUpgradeReconciliationContractStateBalanceRecord struct {
+	EthAddr  string      `json:"eth_addr"`
+	Balances types.Coins `json:"balances"`
+}
+
+type ASIUpgradeReconciliationContractState struct {
+	Balances                 []ASIUpgradeReconciliationContractStateBalanceRecord `json:"balances"`
+	AggregatedBalancesAmount types.Coins                                          `json:"aggregated_balances_amount"`
+	NumberOfBalanceRecords   int                                                  `json:"number_of_balance_records"`
+}
+
+func NewASIUpgradeReconciliationContractState() *ASIUpgradeReconciliationContractState {
+	return &ASIUpgradeReconciliationContractState{
+		Balances: make([]ASIUpgradeReconciliationContractStateBalanceRecord, 0),
+	}
+}
+
+type ASIUpgradeReconciliation struct {
+	Transfers     ASIUpgradeReconciliationTransfers      `json:"transfers"`
+	ContractState *ASIUpgradeReconciliationContractState `json:"contract_state"`
 }
 
 type ASIUpgradeSupply struct {
 	LandingAddress       string      `json:"landing_address"`
 	MintedAmount         types.Coins `json:"minted_amount"`
-	ResultingSupplyTotal types.Coins `json:"resulting_supply_total"`
+	ResultingTotalSupply types.Coins `json:"resulting_total_supply"`
+}
+
+type ContractValueUpdate struct {
+	Address string `json:"address"`
+	From    string `json:"from"`
+	To      string `json:"to"`
 }
 
 type ValueUpdate struct {
@@ -38,9 +82,12 @@ type MainParams struct {
 }
 
 type ASIUpgradeManifest struct {
-	Main           *MainParams          `json:"main,omitempty"`
-	IBC            *ASIUpgradeTransfers `json:"ibc,omitempty"`
-	Reconciliation *ASIUpgradeTransfers `json:"reconciliation,omitempty"`
+	Main                  *MainParams               `json:"main,omitempty"`
+	IBC                   *ASIUpgradeIBCTransfers   `json:"ibc,omitempty"`
+	Reconciliation        *ASIUpgradeReconciliation `json:"reconciliation,omitempty"`
+	ContractsStateCleaned []string                  `json:"contracts_state_cleaned,omitempty"`
+	ContractsAdminUpdated []ContractValueUpdate     `json:"contracts_admin_updated,omitempty"`
+	ContractsLabelUpdated []ContractValueUpdate     `json:"contracts_label_updated,omitempty"`
 }
 
 func SaveASIManifest(manifest *ASIUpgradeManifest, config *config2.Config) error {