don't set position to null in stake form

.dockerignore

@@ -2,4 +2,8 @@ pkg/target
 pkg/*.wasm
 pkg/out
 pkg/*.rlib
+# TODO does this fuck up web docker build??
+web/node_modules
+# TODO should be in a more specific dockerignore, this almost definitely fucks up web docker build
+web/.next
 Dockerfile.*

Dockerfile.graphql

@@ -10,6 +10,8 @@ RUN apk add --no-cache \
 	gcc \
 	musl-dev
 
+# RUN apk --no-cache add ca-certificates
+
 ENV SUPERPOSITION_DIR /usr/local/src/superposition
 
 WORKDIR ${SUPERPOSITION_DIR}
@@ -29,4 +31,5 @@ RUN sh -c 'cd cmd/graphql.ethereum && make install'
 FROM scratch
 WORKDIR /bin
 COPY --from=builder /bin/graphql.ethereum .
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 CMD ["graphql.ethereum"]

db/migrations/1713545565-seawater_positions.sql

@@ -26,4 +26,13 @@ CREATE VIEW seawater_active_positions_1 AS
 
 CREATE UNIQUE INDEX ON seawater_active_positions_1 (pos_id);
 
+CREATE FUNCTION refresh_position_views()
+RETURNS VOID LANGUAGE PLPGSQL
+AS $$
+BEGIN
+	REFRESH MATERIALIZED VIEW seawater_positions_1;
+	REFRESH MATERIALIZED VIEW CONCURRENTLY seawater_active_positions_1;
+END $$;
+
+SELECT cron.schedule('refresh-positions', '5 seconds', $$SELECT refresh_position_views()$$);
 -- migrate:down

db/migrations/1714115853-checkpoint_seawater_volume_timeseries.sql

@@ -164,6 +164,6 @@ BEGIN
 	REFRESH MATERIALIZED VIEW seawater_pool_swap_volume_monthly_1;
 END $$;
 
-SELECT cron.schedule('refresh-swap-price-volume', '*/30 * * * *', $$SELECT refresh_swap_price_volume_views()$$);
+SELECT cron.schedule('refresh-swap-price-volume', '30 seconds', $$SELECT refresh_swap_price_volume_views()$$);
 
 -- migrate:down

db/migrations/1716273125-seawater_swaps.sql

@@ -13,6 +13,7 @@ CREATE TABLE seawater_swaps_1_return(
 );
 
 -- TODO ideally this should be a (materialized) view, which would require constant lookup of fUSDC address/decimals
+-- we can assume decimals as 6
 CREATE FUNCTION seawater_swaps_1(fusdcAddress ADDRESS, fusdcDecimals HUGEINT)
 RETURNS SETOF seawater_swaps_1_return
 LANGUAGE SQL
@@ -86,7 +87,13 @@ FROM (
 ) AS swaps
 ORDER BY created_by DESC;
 
-CREATE VIEW seawater_final_ticks_daily_1 AS
+-- TODO doesn't work but could maybe materialize these, then also make monthly build on top of this one (daily)
+--CREATE MATERIALIZED VIEW seawater_final_ticks_daily_1 WITH (
+--    timescaledb.continuous, 
+--    timescaledb.materialized_only = false
+--) AS
+CREATE VIEW seawater_final_ticks_daily_1
+AS
 SELECT
 	-- TODO it may make sense to average this over the day.
 	LAST(final_tick, created_by) AS final_tick,
@@ -98,9 +105,23 @@ GROUP BY
 	pool,
 	day
 ORDER BY
+<<<<<<< Updated upstream
 	day DESC;
+=======
+    day DESC;
+--WITH NO DATA;
+>>>>>>> Stashed changes
+
+--SELECT add_continuous_aggregate_policy('seawater_final_ticks_daily_1',
+--  start_offset => NULL,
+--  end_offset => INTERVAL '1 hour',
+--  schedule_interval => INTERVAL '1 day');
 
-CREATE VIEW seawater_final_ticks_monthly_1 AS
+--CREATE MATERIALIZED VIEW seawater_final_ticks_monthly_1 WITH (
+--    timescaledb.continuous, 
+--    timescaledb.materialized_only = false
+--) AS
+CREATE VIEW seawater_final_ticks_monthly_1 AS 
 SELECT
 	-- TODO it may make sense to average this over the month.
 	LAST(final_tick, created_by) AS final_tick,
@@ -112,6 +133,16 @@ GROUP BY
 	pool,
 	month
 ORDER BY
+<<<<<<< Updated upstream
 	month DESC;
+=======
+    month DESC;
+--WITH NO DATA;
+
+--SELECT add_continuous_aggregate_policy('seawater_final_ticks_monthly_1',
+--  start_offset => NULL,
+--  end_offset => INTERVAL '1 hour',
+--  schedule_interval => INTERVAL '1 month');
+>>>>>>> Stashed changes
 
 -- migrate:down

go.mod

@@ -30,12 +30,12 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
-	github.com/jackc/pgx/v5 v5.5.5 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.6.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -45,16 +45,15 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/sosodev/duration v1.3.1 // indirect
-	github.com/supranational/blst v0.3.11 // indirect
+	github.com/supranational/blst v0.3.12 // indirect
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
 	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/urfave/cli/v2 v2.27.2 // indirect
-	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.21.0 // indirect
 	golang.org/x/text v0.16.0 // indirect

go.sum

@@ -97,8 +97,8 @@ github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
@@ -113,10 +113,10 @@ github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
-github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw=
-github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY=
+github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw=
 github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
@@ -193,8 +193,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
-github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
+github.com/supranational/blst v0.3.12 h1:Vfas2U2CFHhniv2QkUm2OVa1+pGTdqtpqm9NnhUUbZ8=
+github.com/supranational/blst v0.3.12/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
@@ -207,14 +207,14 @@ github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
 github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
 github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0vy5p8=
 github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
-github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
-github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
 golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
-golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
-golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
 golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=

lib/events/seawater/seawater.go

@@ -29,6 +29,8 @@ var abiBytes []byte
 
 var abi, _ = ethAbi.JSON(bytes.NewReader(abiBytes))
 
+func PositionLiquidity(client *ethClient.Client, address ethCommon.Address, id )
+
 func UnpackMintPosition(topic1, topic2, topic3 ethCommon.Hash, d []byte) (*MintPosition, error) {
 	i, err := abi.Unpack("MintPosition", d)
 	if err != nil {

lib/types/seawater/seawater.go

@@ -29,6 +29,8 @@ type Position struct {
 	Pool            types.Address `json:"pool"`
 	Lower           types.Number  `json:"lower"`
 	Upper           types.Number  `json:"upper"`
+	// Token0          types.Number  `json:"token0"`
+	// Token1          types.Number  `json:"token1"`
 }
 
 // PositionSnapshot taken from snapshot_positions_log_1. Used to service

lib/types/types.go

@@ -7,9 +7,10 @@
 package types
 
 import (
-	"fmt"
 	sqlDriver "database/sql/driver"
 	"encoding/hex"
+	"fmt"
+	"io"
 	"math/big"
 	"strings"
 )
@@ -75,6 +76,7 @@ func (u Number) Hex() string {
 	}
 	return u.Int.Text(16)
 }
+
 // String the Number, printing its base10
 func (u Number) String() string {
 	if u.Int == nil {
@@ -127,7 +129,6 @@ func (int *Number) Scan(v interface{}) error {
 	return nil
 }
 
-
 func EmptyUnscaledNumber() UnscaledNumber {
 	return UnscaledNumber{new(big.Int)}
 }
@@ -158,6 +159,7 @@ func UnscaledNumberFromHex(v string) (*UnscaledNumber, error) {
 func (u UnscaledNumber) Hex() string {
 	return u.Int.Text(16)
 }
+
 // String the UnscaledNumber, printing its base 10 form
 func (u UnscaledNumber) String() string {
 	return u.Int.Text(10)
@@ -218,6 +220,46 @@ func (a Address) String() string {
 func (a Address) Value() (sqlDriver.Value, error) {
 	return a.String(), nil
 }
+func (a *Address) UnmarshalGQL(v interface{}) error {
+	address, ok := v.(string)
+	if !ok {
+		return fmt.Errorf("expected to unmarshal string")
+	}
+	*a = AddressFromString(address)
+	return nil
+}
+func (a *Address) MarshalGQL(w io.Writer) {
+	w.Write([]byte(a.String()))
+}
+
+type Marshaler interface {
+	MarshalGQL(w io.Writer)
+}
+
+type Unmarshaler interface {
+	UnmarshalGQL(v any) error
+}
+type WriterFunc func(writer io.Writer)
+
+func (f WriterFunc) MarshalGQL(w io.Writer) {
+	f(w)
+}
+
+func MarshalAddress(s Address) Marshaler {
+	return WriterFunc(func(w io.Writer) {
+		io.WriteString(w, `"`)
+		io.WriteString(w, s.String())
+		io.WriteString(w, `"`)
+	})
+}
+func UnmarshalString(v any) (Address, error) {
+	address, ok := v.(string)
+	if !ok {
+		return Address(""), fmt.Errorf("expected to unmarshal string")
+	}
+	return AddressFromString(address), nil
+}
+
 
 func DataFromString(s string) Data {
 	return Data(strings.ToLower(s))

pkg/Makefile

@@ -34,7 +34,7 @@ ownership-nfts: ${OUT_OWNERSHIP_NFTS}
 solidity: amm-entrypoint ownership-nfts
 
 CARGO_BUILD_STYLUS := \
-	cargo +nightly build \
+	cargo build \
 		-Z build-std=std,panic_abort \
 		-Z build-std-features=panic_immediate_abort \
 		-Z unstable-options \

pkg/deploy-seawater.sh

@@ -4,6 +4,6 @@ wasm_file="$1"
 
 cargo stylus deploy \
 	--endpoint $STYLUS_ENDPOINT \
-	--wasm-file "$wasm_file" \
+	--wasm-file-path "$wasm_file" \
 	--private-key $STYLUS_PRIVATE_KEY \
 	        | sed -nr 's/.*deployed code: +.*(0x.{40}).*$/\1/p'

pkg/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2023-10-02"

web/src/app/SwapForm.tsx

@@ -251,6 +251,7 @@ export const SwapForm = () => {
   const [quoteAmount, quoteIsLoading] = useMemo(() => {
     const quoteError = isSwap1 ? quote1Error : quote2Error
     const quoteIsLoading = isSwap1 ? quote1IsLoading : quote2IsLoading
+    console.log("quoteer",quoteError)
     const [, quoteAmountString] =
       quoteError?.message.match(
         /reverted with the following reason:\n(.+)\n/,
@@ -261,6 +262,7 @@ export const SwapForm = () => {
 
   // update the token1 amount when the quote amount changes
   useEffect(() => {
+    console.log("quoted",quoteAmount)
     setToken1AmountRaw(quoteAmount.toString() ?? "0");
   }, [quoteAmount, setToken1AmountRaw]);
 

web/src/app/stake/AllPools.tsx

@@ -24,6 +24,8 @@ import { sum } from "lodash";
 import { graphql, useFragment } from "@/gql";
 import { useRouter } from "next/navigation";
 import { getFormattedPriceFromTick } from "@/lib/amounts";
+import { useStakeStore } from "@/stores/useStakeStore";
+import { getTokenFromAddress } from "@/config/tokens";
 
 const DisplayModeMenu = ({
   setDisplayMode,
@@ -102,6 +104,11 @@ export const AllPoolsFragment = graphql(`
 export const AllPools = () => {
   const [displayMode, setDisplayMode] = useState<"list" | "grid">("list");
 
+  const {
+    setToken0,
+    setToken1,
+  } = useStakeStore()
+
   const { data, isLoading } = useGraphqlGlobal();
 
   const router = useRouter()
@@ -331,7 +338,7 @@ export const AllPools = () => {
 
                 <div className={"mt-[10px] flex flex-row gap-2 px-2"}>
                   <Button
-                    onClick={() => router.push(`/stake/pool?id=${pool.id}`)}
+                    // onClick={() =>{setToken0(getTokenFromAddress(pool.id)); router.push(`/stake/pool?id=${pool.id}`)}}
                     variant={"secondary"}
                     size={"sm"}
                     className={"flex h-[23px] flex-1 text-[9px]"}

web/src/app/stake/_MyPositionsTable/MyPositionsTable.tsx

@@ -32,6 +32,7 @@ export function MyPositionsTable<TData, TValue>({
     getCoreRowModel: getCoreRowModel(),
   });
 
+  console.log("data",data)
   const router = useRouter();
 
   return (