SPIKE: signing wallet actions with keplr, ledger

golang/cosmos/x/swingset/client/cli/tx.go

@@ -35,6 +35,7 @@ func GetTxCmd(storeKey string) *cobra.Command {
 		GetCmdDeliver(),
 		GetCmdProvisionOne(),
 		GetCmdInstallBundle(),
+		GetCmdWalletAction(),
 	)
 
 	return swingsetTxCmd

golang/cosmos/x/swingset/keeper/msg_server.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
@@ -69,6 +70,7 @@ type walletAction struct {
 }
 
 func (keeper msgServer) WalletAction(goCtx context.Context, msg *types.MsgWalletAction) (*types.MsgWalletActionResponse, error) {
+	fmt.Fprintf(os.Stderr, "WalletAction()...\n")
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	action := &walletAction{
@@ -78,10 +80,10 @@ func (keeper msgServer) WalletAction(goCtx context.Context, msg *types.MsgWallet
 		BlockHeight: ctx.BlockHeight(),
 		BlockTime:   ctx.BlockTime().Unix(),
 	}
-	// fmt.Fprintf(os.Stderr, "Context is %+v\n", ctx)
+	fmt.Fprintf(os.Stderr, "WalletAction: action %+v , context %+v\n", action, ctx)
 
 	err := keeper.PushAction(ctx, action)
-	// fmt.Fprintln(os.Stderr, "Returned from SwingSet", out, err)
+	fmt.Fprintln(os.Stderr, "Returned from SwingSet", err)
 	if err != nil {
 		return nil, err
 	}

golang/cosmos/x/swingset/types/codec.go

@@ -31,6 +31,8 @@ func init() {
 func RegisterCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&MsgDeliverInbound{}, ModuleName+"/DeliverInbound", nil)
 	cdc.RegisterConcrete(&MsgProvision{}, ModuleName+"/Provision", nil)
+	cdc.RegisterConcrete(&MsgWalletAction{}, ModuleName+"/WalletAction", nil)
+	cdc.RegisterConcrete(&MsgWalletSpendAction{}, ModuleName+"/WalletSpendAction", nil)
 }
 
 // RegisterInterfaces registers the x/swingset interfaces types with the interface registry

golang/cosmos/x/swingset/types/msgs.go

@@ -104,6 +104,28 @@ func (msg MsgWalletAction) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Owner}
 }
 
+// GetSignBytes encodes the message for signing
+func (msg MsgWalletAction) GetSignBytes() []byte {
+	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg))
+}
+
+// GetSignBytes encodes the message for signing
+func (msg MsgWalletSpendAction) GetSignBytes() []byte {
+	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg))
+}
+
+// Route should return the name of the module
+func (msg MsgWalletAction) Route() string { return RouterKey }
+
+// Type should return the action
+func (msg MsgWalletAction) Type() string { return "wallet_action" }
+
+// Route should return the name of the module
+func (msg MsgWalletSpendAction) Route() string { return RouterKey }
+
+// Type should return the action
+func (msg MsgWalletSpendAction) Type() string { return "wallet_spend_action" }
+
 // ValidateBasic runs stateless checks on the message
 func (msg MsgWalletAction) ValidateBasic() error {
 	if msg.Owner.Empty() {

packages/cosmic-swingset/Makefile

@@ -102,7 +102,7 @@ scenario1-run-chain:
 scenario1-run-client:
 	AG_SOLO_BASEDIR=$$PWD/t9/$(BASE_PORT) $(AG_SOLO) setup --network-config=http://localhost:8001/network-config --webport=$(BASE_PORT)
 
-BOOT_COINS=1000000000000000ubld,500000000000000urun,100provisionpass,100sendpacketpass,1000000000000ibc/usdc1234,1000000000000ibc/atom1234
+BOOT_COINS=1000000000000000ubld,500000000000000uist,100provisionpass,100sendpacketpass,1000000000000ibc/usdc1234,1000000000000ibc/atom1234
 
 scenario2-setup: all scenario2-setup-nobuild
 scenario2-setup-nobuild:
@@ -181,7 +181,7 @@ scenario2-run-client: t1-provision-one-with-powers t1-start-ag-solo
 
 # Provision the ag-solo from an provisionpass-holding address (idempotent).
 AGORIC_POWERS = agoric.ALL_THE_POWERS
-SOLO_COINS = 13000000ubld,12345000000urun,1122000000ibc/usdc1234,3344000000ibc/atom1234
+SOLO_COINS = 13000000ubld,12345000000uist,1122000000ibc/usdc1234,3344000000ibc/atom1234
 COSMOS_RPC_HOST = localhost
 COSMOS_RPC_PORT = 26657
 wait-for-cosmos:
@@ -210,6 +210,25 @@ t1-provision-one-with-powers: wait-for-cosmos
 		  --gas=auto --gas-adjustment=$(GAS_ADJUSTMENT) --broadcast-mode=block --yes --chain-id=$(CHAIN_ID) \
 		  t1/$(BASE_PORT) $$addr $(AGORIC_POWERS) -ojson | tee /dev/stderr | grep -q '"code":0'; }
 
+fund-acct: wait-for-cosmos
+	$(AGCH) \
+	  --home=t1/bootstrap --keyring-backend=test --from=bootstrap \
+	  tx bank send bootstrap $(ACCT_ADDR) $(SOLO_COINS) \
+	  --gas=auto --gas-adjustment=$(GAS_ADJUSTMENT) --broadcast-mode=block --yes --chain-id=$(CHAIN_ID)
+
+FROM_KEY=bootstrap
+SIGN_MODE=
+wallet-action: wait-for-cosmos
+	$(AGCH) \
+	  --home=t1/bootstrap --keyring-backend=test --from=$(FROM_KEY) $(SIGN_MODE)\
+	  tx swingset wallet-action '{"give": 10, "want": 1}' \
+	  --gas=auto --gas-adjustment=$(GAS_ADJUSTMENT) --broadcast-mode=block --yes --chain-id=$(CHAIN_ID)
+
+wallet-action-gen:
+	$(AGCH) --chain-id=$(CHAIN_ID) \
+	  --home=t1/bootstrap --keyring-backend=test --from=$$(cat t1/bootstrap-address) $(SIGN_MODE)\
+	  tx swingset wallet-action '{"action":1}' \
+	  --generate-only --offline
 
 t1-provision-one: wait-for-cosmos
 	@addrfile=t1/$(BASE_PORT)/cosmos-client-account; \
@@ -234,7 +253,7 @@ t1/$(BASE_PORT)/cosmos-fee-account.setup:
 	test ! -f t1/$(BASE_PORT)/cosmos-fee-account || \
 	  $(AGCH) --home=t1/$(BASE_PORT)/owner --keyring-backend=test tx feegrant grant \
 		--gas=auto --gas-adjustment=$(GAS_ADJUSTMENT) --broadcast-mode=block --yes --chain-id=$(CHAIN_ID) --from=owner \
-		--period=5 --period-limit=200urun $$(cat t1/$(BASE_PORT)/cosmos-fee-account) $$(cat t1/$(BASE_PORT)/ag-cosmos-helper-address)
+		--period=5 --period-limit=200uist $$(cat t1/$(BASE_PORT)/cosmos-fee-account) $$(cat t1/$(BASE_PORT)/ag-cosmos-helper-address)
 	date > $@
 
 # Actually start the ag-solo.
@@ -243,7 +262,7 @@ t1-start-ag-solo: t1/$(BASE_PORT)/cosmos-client-account.setup t1/$(BASE_PORT)/co
 	$(AGCH) query auth account $$addr >/dev/null 2>&1 || \
 		$(AGCH) --home=t1/bootstrap tx bank send --keyring-backend=test --from=bootstrap \
 		--gas=auto --gas-adjustment=$(GAS_ADJUSTMENT) --broadcast-mode=block --yes --chain-id=$(CHAIN_ID) \
-		bootstrap $$addr 1urun
+		bootstrap $$addr 1uist
 	cd t1/$(BASE_PORT) && \
 		SOLO_OTEL_EXPORTER_PROMETHEUS_PORT=$(SOLO_OTEL_EXPORTER_PROMETHEUS_PORT) \
 		$(AG_SOLO) start

packages/vats/src/bridge.js

@@ -18,7 +18,7 @@ import { Far } from '@endo/far';
 
 /**
  * @typedef {object} BridgeHandler An object that can receive messages from the bridge device
- * @property {(srcId: string, obj: any) => Promise<any>} fromBridge Handle an inbound message
+ * @property {(srcId: string, obj: any) => Promise<undefined>} fromBridge Handle an inbound message
  *
  * @typedef {object} BridgeManager The object to manage this bridge
  * @property {(dstID: string, obj: any) => any} toBridge
@@ -46,7 +46,7 @@ export function makeBridgeManager(E, D, bridgeDevice) {
     // );
 
     // Notify the specific handler, if there was one.
-    E(srcHandlers.get(srcID)).fromBridge(srcID, obj);
+    void E(srcHandlers.get(srcID)).fromBridge(srcID, obj);
 
     // No return value.
   }

packages/vats/src/core/basic-behaviors.js

@@ -233,6 +233,7 @@ export const makeClientBanks = async ({
     client,
     chainStorage,
     bankManager,
+    bridgeManager: bridgeManagerP,
     zoe,
   },
   installation: {
@@ -241,12 +242,15 @@ export const makeClientBanks = async ({
 }) => {
   const STORAGE_PATH = 'wallet';
 
-  const storageNode = await getChildNode(chainStorage, STORAGE_PATH);
+  const [storageNode, bridgeManager] = await Promise.all([
+    getChildNode(chainStorage, STORAGE_PATH),
+    bridgeManagerP,
+  ]);
   const { creatorFacet } = await E(zoe).startInstance(
     walletFactory,
     {},
     { agoricNames, namesByAddress, board },
-    { storageNode },
+    { storageNode, bridgeManager },
   );
   return E(client).assignBundle([
     address => {

packages/vats/src/core/manifest.js

@@ -108,6 +108,7 @@ const SHARED_CHAIN_BOOTSTRAP_MANIFEST = harden({
       namesByAddress: true,
       namesByAddressAdmin: true,
       bankManager: 'bank',
+      bridgeManager: true,
       board: 'board',
       client: true,
       chainStorage: true,

packages/vats/test/test-clientBundle.js

@@ -107,7 +107,7 @@ test('connectFaucet produces payments', async t => {
       board: true,
       zoe: true,
     };
-    E(client).assignBundle([_a => stub]);
+    void E(client).assignBundle([_a => stub]);
   };
 
   const vatPowers = {

packages/wallet/contract/package.json

@@ -24,6 +24,7 @@
     "@agoric/deploy-script-support": "^0.9.0",
     "@agoric/store": "^0.7.2",
     "@agoric/vat-data": "^0.3.1",
+    "@agoric/vats": "^0.10.0",
     "@agoric/zoe": "^0.24.0",
     "@agoric/notifier": "^0.4.0",
     "@endo/far": "^0.2.5"

packages/wallet/contract/src/walletFactory.js

@@ -10,7 +10,8 @@ import '@agoric/zoe/exported.js';
 
 import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { Far } from '@endo/far';
+import * as BRIDGE_ID from '@agoric/vats/src/bridge-ids.js';
+import { E, Far } from '@endo/far';
 import { makeSmartWallet } from './smartWallet';
 
 /**
@@ -19,13 +20,22 @@ import { makeSmartWallet } from './smartWallet';
  *   board: Board,
  *   namesByAddress: NameHub,
  * }} SmartWalletContractTerms
+ *
+ * @typedef {{
+ * 	 type: string, // WALLET_ACTION
+ *   owner: string,
+ *   spendAction: string,
+ *   blockHeight: unknown, // int64
+ *   blockTime: unknown, // int64
+ * }} WalletAction
  */
 
 /**
  *
  * @param {ZCF<SmartWalletContractTerms>} zcf
  * @param {{
  *   storageNode?: ERef<StorageNode>,
+ *   bridgeManager?: BridgeManager,
  * }} privateArgs
  */
 export const start = async (zcf, privateArgs) => {
@@ -34,12 +44,32 @@ export const start = async (zcf, privateArgs) => {
   assert(namesByAddress, 'missing namesByAddress');
   assert(agoricNames, 'missing agoricNames');
   const zoe = zcf.getZoeService();
-  const { storageNode } = privateArgs;
+  const { storageNode, bridgeManager } = privateArgs;
 
   /** @type {MapStore<string, import('./smartWallet').SmartWallet>} */
   const walletsByAddress = makeScalarBigMapStore('walletsByAddress');
   const provider = makeAtomicProvider(walletsByAddress);
 
+  const handleWalletAction = Far('walletActionHandler', {
+    /**
+     *
+     * @param {string} srcID
+     * @param {WalletAction} obj
+     */
+    fromBridge: async (srcID, obj) => {
+      console.log('walletFactory.fromBridge:', srcID, obj);
+      assert(obj, 'missing wallet action');
+      assert.typeof(obj, 'object');
+      assert.typeof(obj.owner, 'string');
+      const wallet = walletsByAddress.get(obj.owner); // or throw
+      console.log('walletFactory:', { wallet });
+      return E(wallet).performAction(obj); // TODO: add performAction to lib-wallet.js
+    },
+  });
+
+  await (bridgeManager &&
+    E(bridgeManager).register(BRIDGE_ID.WALLET, handleWalletAction));
+
   const shared = {
     agoricNames,
     board,

packages/wallet/ui/demo-signing/package.json

@@ -0,0 +1,21 @@
+{
+  "scripts": {
+    "build:proto-prep": "mkdir -p proto; cd proto; ln -s ../../../../../golang/cosmos/proto/agoric/swingset .; ln -s ../../../../../golang/cosmos/third_party/proto/gogoproto .; ln -s ../node_modules/protobufjs/google .",
+    "install:protoc": "sudo apt install protobuf-compiler",
+    "build:proto": "mkdir -p src/gen && protoc --plugin=node_modules/ts-proto/protoc-gen-ts_proto --ts_proto_opt='esModuleInterop=true,forceLong=long,useOptionals=true' --ts_proto_out=./src/gen ./proto/swingset/msgs.proto -I./proto",
+    "build:proto-js": "tsc --downlevelIteration --target esnext --allowSyntheticDefaultImports --moduleResolution node ./src/gen/**/*.ts",
+    "start": "parcel src/keplr-ledger-demo.html"
+  },
+  "devDependencies": {
+    "@keplr-wallet/types": "^0.10.13",
+    "crypto-browserify": "^3.12.0",
+    "parcel": "^2.6.2",
+    "path-browserify": "^1.0.1",
+    "stream-browserify": "^3.0.0",
+    "ts-proto": "^1.117.0",
+    "typescript": "^4.7.4"
+  },
+  "dependencies": {
+    "@cosmjs/stargate": "^0.28.10"
+  }
+}

packages/wallet/ui/demo-signing/proto/gogoproto

@@ -0,0 +1 @@
+../../../../../golang/cosmos/third_party/proto/gogoproto

packages/wallet/ui/demo-signing/proto/google

@@ -0,0 +1 @@
+../node_modules/protobufjs/google

packages/wallet/ui/demo-signing/proto/swingset

@@ -0,0 +1 @@
+../../../../../golang/cosmos/proto/agoric/swingset