P2P economy layer, on-chain escrow, ERC-7579 smart accounts, and agent UX improvements

.gitignore

@@ -35,6 +35,8 @@ go.work.sum
 passphrase.txt
 
 !lango.example.json
+!contracts/deployments/*.json
+!internal/**/abi/*.json
 /lango
 
 .cursor/
@@ -45,6 +47,11 @@ passphrase.txt
 bin/
 dist/
 
+# Foundry
+contracts/out/
+contracts/cache/
+contracts/lib/
+
 # Coverage reports
 .coverage/
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "contracts/lib/forge-std"]
+	path = contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

Makefile

@@ -96,6 +96,10 @@ lint:
 generate:
 	$(GOCMD) generate ./...
 
+## check-abi: Verify ABI bindings match Solidity sources
+check-abi:
+	@bash scripts/check-abi.sh
+
 ## ci: Run full local CI pipeline (fmt-check → vet → lint → test)
 ci: fmt-check vet lint test
 
@@ -176,7 +180,7 @@ help:
 .PHONY: build build-linux build-darwin build-all install \
         dev run \
         test test-short test-p2p bench coverage \
-        fmt fmt-check vet lint generate ci \
+        fmt fmt-check vet lint generate check-abi ci \
         deps \
         codesign \
         sandbox-image \

cmd/lango/main.go

@@ -21,19 +21,23 @@ import (
 	cliagent "github.com/langoai/lango/internal/cli/agent"
 	cliapproval "github.com/langoai/lango/internal/cli/approval"
 	clibg "github.com/langoai/lango/internal/cli/bg"
+	clicontract "github.com/langoai/lango/internal/cli/contract"
 	clicron "github.com/langoai/lango/internal/cli/cron"
-	climcp "github.com/langoai/lango/internal/cli/mcp"
 	"github.com/langoai/lango/internal/cli/doctor"
+	clieconomy "github.com/langoai/lango/internal/cli/economy"
 	cligraph "github.com/langoai/lango/internal/cli/graph"
 	clilearning "github.com/langoai/lango/internal/cli/learning"
 	clilibrarian "github.com/langoai/lango/internal/cli/librarian"
+	climcp "github.com/langoai/lango/internal/cli/mcp"
 	climemory "github.com/langoai/lango/internal/cli/memory"
+	climetrics "github.com/langoai/lango/internal/cli/metrics"
 	"github.com/langoai/lango/internal/cli/onboard"
 	clip2p "github.com/langoai/lango/internal/cli/p2p"
-	"github.com/langoai/lango/internal/cli/tui"
 	clipayment "github.com/langoai/lango/internal/cli/payment"
 	clisecurity "github.com/langoai/lango/internal/cli/security"
 	"github.com/langoai/lango/internal/cli/settings"
+	cliaccount "github.com/langoai/lango/internal/cli/smartaccount"
+	"github.com/langoai/lango/internal/cli/tui"
 	cliworkflow "github.com/langoai/lango/internal/cli/workflow"
 	"github.com/langoai/lango/internal/config"
 	"github.com/langoai/lango/internal/configstore"
@@ -207,6 +211,40 @@ func main() {
 	mcpCmd.GroupID = "infra"
 	rootCmd.AddCommand(mcpCmd)
 
+	economyCfgLoader := func() (*config.Config, error) {
+		boot, err := bootstrap.Run(bootstrap.Options{})
+		if err != nil {
+			return nil, err
+		}
+		defer boot.DBClient.Close()
+		return boot.Config, nil
+	}
+	economyCmd := clieconomy.NewEconomyCmd(economyCfgLoader)
+	economyCmd.GroupID = "infra"
+	rootCmd.AddCommand(economyCmd)
+
+	contractCfgLoader := func() (*config.Config, error) {
+		boot, err := bootstrap.Run(bootstrap.Options{})
+		if err != nil {
+			return nil, err
+		}
+		defer boot.DBClient.Close()
+		return boot.Config, nil
+	}
+	contractCmd := clicontract.NewContractCmd(contractCfgLoader)
+	contractCmd.GroupID = "infra"
+	rootCmd.AddCommand(contractCmd)
+
+	accountCmd := cliaccount.NewAccountCmd(func() (*bootstrap.Result, error) {
+		return bootstrap.Run(bootstrap.Options{})
+	})
+	accountCmd.GroupID = "infra"
+	rootCmd.AddCommand(accountCmd)
+
+	metricsCmd := climetrics.NewMetricsCmd()
+	metricsCmd.GroupID = "data"
+	rootCmd.AddCommand(metricsCmd)
+
 	cronCmd := clicron.NewCronCmd(func() (*bootstrap.Result, error) {
 		return bootstrap.Run(bootstrap.Options{})
 	})

contracts/.env.example

@@ -0,0 +1,3 @@
+BASE_SEPOLIA_RPC_URL=https://sepolia.base.org
+BASESCAN_API_KEY=
+DEPLOY_MOCK_USDC=false

contracts/.gitignore

@@ -0,0 +1,3 @@
+out/
+cache/
+lib/

contracts/deployments/84532.json

@@ -0,0 +1,11 @@
+{
+  "chainId": 84532,
+  "deployer": "0x4BDBDE4A725A83820B7A94cD5dB523eb4515dDAd",
+  "escrowExecutor": "0x5d08310987C5B59cB03F01363142656C5AE23997",
+  "escrowHub": "0x1820A1C403A5811660a4893Ae028862208e4f7A8",
+  "sessionValidator": "0xB52877B5E27F77795Fbe59101D07CA81dbd3f8aC",
+  "spendingHook": "0xc428774991dBDf6645E254be793cb93A66cd9b4B",
+  "tokenAddress": "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+  "vaultFactory": "0x1CA47128D7fdDD0D875C3AeC7274C894F2c792C2",
+  "vaultImplementation": "0x18167Daeca7A09B32D8BE93c73737B95B64A7ff8"
+}

contracts/foundry.lock

@@ -0,0 +1,8 @@
+{
+  "lib/forge-std": {
+    "tag": {
+      "name": "v1.15.0",
+      "rev": "0844d7e1fc5e60d77b68e469bff60265f236c398"
+    }
+  }
+}

contracts/foundry.toml

@@ -0,0 +1,20 @@
+[profile.default]
+src = "src"
+out = "out"
+libs = ["lib"]
+remappings = ["forge-std/=lib/forge-std/src/"]
+solc = "0.8.24"
+optimizer = true
+optimizer_runs = 200
+fs_permissions = [{ access = "read-write", path = "deployments" }]
+
+[profile.default.fmt]
+line_length = 120
+tab_width = 4
+bracket_spacing = false
+
+[rpc_endpoints]
+base_sepolia = "${BASE_SEPOLIA_RPC_URL}"
+
+[etherscan]
+base_sepolia = { key = "${BASESCAN_API_KEY}", url = "https://api-sepolia.basescan.org/api", chain = 84532 }

contracts/script/Deploy.s.sol

@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import "forge-std/Script.sol";
+import "../src/LangoEscrowHub.sol";
+import "../src/LangoVault.sol";
+import "../src/LangoVaultFactory.sol";
+import "../src/modules/LangoSessionValidator.sol";
+import "../src/modules/LangoSpendingHook.sol";
+import "../src/modules/LangoEscrowExecutor.sol";
+import "../test/mocks/MockUSDC.sol";
+
+/// @title Deploy — deploy all Lango infrastructure contracts.
+/// @notice Outputs deployed addresses to deployments/<chainId>.json.
+contract DeployScript is Script {
+    // Base Sepolia canonical USDC
+    address constant CANONICAL_USDC = 0x036CbD53842c5426634e7929541eC2318f3dCF7e;
+
+    function run() external {
+        bool deployMockUsdc = vm.envOr("DEPLOY_MOCK_USDC", false);
+
+        // Signing method is determined by CLI flags:
+        //   --account <name>   → Foundry encrypted keystore (recommended)
+        //   --interactive      → prompt for private key at runtime
+        //   --ledger / --trezor→ hardware wallet
+        //   --private-key $KEY → direct key (CI only)
+        vm.startBroadcast();
+
+        address deployer = msg.sender;
+
+        // 1. Token — MockUSDC or canonical
+        address tokenAddress;
+        if (deployMockUsdc) {
+            MockUSDC mockUsdc = new MockUSDC();
+            tokenAddress = address(mockUsdc);
+        } else {
+            tokenAddress = CANONICAL_USDC;
+        }
+
+        // 2. Escrow Hub — deployer is testnet arbitrator
+        LangoEscrowHub escrowHub = new LangoEscrowHub(deployer);
+
+        // 3. Vault implementation (clone target, no constructor args)
+        LangoVault vaultImpl = new LangoVault();
+
+        // 4. Vault Factory — needs vault implementation address
+        LangoVaultFactory vaultFactory = new LangoVaultFactory(address(vaultImpl));
+
+        // 5. ERC-7579 Modules (no constructor args)
+        LangoSessionValidator sessionValidator = new LangoSessionValidator();
+        LangoSpendingHook spendingHook = new LangoSpendingHook();
+        LangoEscrowExecutor escrowExecutor = new LangoEscrowExecutor();
+
+        vm.stopBroadcast();
+
+        // Write deployment addresses to JSON
+        string memory obj = "deployment";
+        vm.serializeAddress(obj, "deployer", deployer);
+        vm.serializeUint(obj, "chainId", block.chainid);
+        vm.serializeAddress(obj, "tokenAddress", tokenAddress);
+        vm.serializeAddress(obj, "escrowHub", address(escrowHub));
+        vm.serializeAddress(obj, "vaultImplementation", address(vaultImpl));
+        vm.serializeAddress(obj, "vaultFactory", address(vaultFactory));
+        vm.serializeAddress(obj, "sessionValidator", address(sessionValidator));
+        vm.serializeAddress(obj, "spendingHook", address(spendingHook));
+        string memory json = vm.serializeAddress(obj, "escrowExecutor", address(escrowExecutor));
+
+        string memory path = string.concat("deployments/", vm.toString(block.chainid), ".json");
+        vm.writeJson(json, path);
+    }
+}