governance abi support

src/components/Balance.svelte

@@ -7,8 +7,8 @@
 	import { asyncTimeout, formatBigInt, parseDecimal } from '../lib/utils'
 	import { showToast } from '../stores/toasts'
 
-	import deposit from '../lib/deposit'
-	import withdraw from '../lib/withdraw'
+	import deposit from '../lib/trading/deposit'
+	import withdraw from '../lib/trading/withdraw'
 
 	let input;
 

src/components/NewOrder.svelte

@@ -5,8 +5,8 @@
 	import Button from './Button.svelte'
 
 	import { productToFigi } from '../lib/products'
-	import getProductInfo from '../lib/getProductInfo'
-	import submitOrder from '../lib/submitOrder'
+	import getProductInfo from '../lib/products/getProductInfo'
+	import submitOrder from '../lib/trading/submitOrder'
 	import { selectedProduct } from '../stores/main'
 	import { showToast } from '../stores/toasts'
 	import { formatBigInt, parseDecimal } from '../lib/utils'

src/components/Positions.svelte

@@ -6,8 +6,8 @@
 	import { positions } from '../stores/positions'
 	import { showToast } from '../stores/toasts'
 	import { formatBigInt, parseDecimal } from '../lib/utils'
-	import submitOrderUpdate from '../lib/submitOrderUpdate'
-	import getProductInfo from '../lib/getProductInfo'
+	import submitOrderUpdate from '../lib/trading/submitOrderUpdate'
+	import getProductInfo from '../lib/products/getProductInfo'
 	import getBlockByNumber from '../lib/getBlockByNumber'
 	import { figiToProduct } from '../lib/products'
 

src/lib/constants.js

@@ -9,9 +9,11 @@ export const EMPTY_BYTES32 = '0x' + '0'.repeat(64);
 export const CONTRACTS = {
 	'0x8376940b1db0': { // arbitrum testnet 5
 		DAI: '0xf011dd14767Da5506c46b2bC3D1659dB758e0683'.toLowerCase(),
+		CAP: '0x26b8c17B21B52B265fC05eC367D621eb02a8726f'.toLowerCase(),
 		PRODUCTS: '0x76511C9cC16248E6BaF6EC0D514986d41BE888Ee'.toLowerCase(),
 		TRADING: '0x427ABE67aEBBdC1382d97B656cC67c53D91a03e7'.toLowerCase(),
-		TREASURY: '0xFb78eeFaE670a001edA2216894eE252b612AF903'.toLowerCase()
+		TREASURY: '0xFb78eeFaE670a001edA2216894eE252b612AF903'.toLowerCase(),
+		GOVERNANCE: '0xe9CFBDE58582732c03E191f13A837e23cEdA366C'.toLowerCase()
 	}
 	/*
 	'0x1': {

src/lib/governance/castVote.js

@@ -0,0 +1,19 @@
+import { getAddress, encodeUint, encodeBool } from '../utils'
+import ethSend from '../ethSend'
+
+export default async function castVote(params) {
+
+	console.log('params', params);
+
+	const {
+		proposalId,
+		support
+	} = params;
+
+	return ethSend({
+		address: getAddress('GOVERNANCE'),
+		method: 'castVote(uint256,bool)',
+		data: encodeUint(proposalId) + encodeBool(support)
+	});
+
+}

src/lib/governance/executeProposal.js

@@ -0,0 +1,18 @@
+import { getAddress, encodeUint } from '../utils'
+import ethSend from '../ethSend'
+
+export default async function executeProposal(params) {
+
+  console.log('params', params);
+
+  const {
+    proposalId
+  } = params;
+
+  return ethSend({
+    address: getAddress('GOVERNANCE'),
+    method: 'executeProposal(uint256)',
+    data: encodeUint(proposalId)
+  });
+
+}

src/lib/governance/getProposal.js

@@ -0,0 +1,29 @@
+import ethCall from '../ethCall'
+import { getAddress, encodeUint, abiDecodeOutput } from '../utils'
+
+export default function proposals(params) {
+
+	const {
+		proposal_id
+	} = params;
+
+	return ethCall({
+		address: getAddress('GOVERNANCE'),
+		method: 'proposals(uint256)',
+		data: encodeUint(proposal_id)
+	}).then((result) => {
+		return abiDecodeOutput(result, [
+			{name: 'id', type: 'uint256'},
+			{name: 'proposer', type: 'address'},
+			{name: 'startBlock', type: 'uint256'},
+			{name: 'endBlock', type: 'uint256'},
+			{name: 'expirationBlock', type: 'uint256'},
+			{name: 'forVotes', type: 'uint256'},
+			{name: 'againstVotes', type: 'uint256'},
+			{name: 'canceled', type: 'bool'},
+			{name: 'executed', type: 'bool'},
+			{name: 'expedited', type: 'bool'}
+		]);
+	});
+
+}

src/lib/governance/getStakedBalance.js

@@ -0,0 +1,24 @@
+import ethCall from '../ethCall'
+import { get } from 'svelte/store'
+import { user } from '../../stores/main'
+import { getAddress, encodeAddress } from '../utils'
+
+export default function getStakedBalance(params) {
+
+	const _user = get(user);
+
+	if (!_user) return 0n;
+
+	return ethCall({
+		address: getAddress('GOVERNANCE'),
+		method: 'balanceOf(address)',
+		data: encodeAddress(_user)
+	}).then((balance) => {
+		// console.log('got balance', balance);
+		if (balance == '0x') return 0n;
+		return BigInt(balance);
+	}).catch((e) => {
+		console.log('balance err', e);
+	});
+
+}

src/lib/governance/proposalCount.js

@@ -0,0 +1,12 @@
+import { getAddress } from '../utils'
+import ethCall from '../ethCall'
+
+export default function proposalCount(params) {
+
+	return ethCall({
+		address: getAddress('GOVERNANCE'),
+		method: 'proposalCount()',
+		data: ''
+	}).then(BigInt);
+
+}

src/lib/governance/releaseStaked.js

@@ -0,0 +1,18 @@
+import { getAddress, encodeUint } from '../utils'
+import ethSend from '../ethSend'
+
+export default async function stakeAmount(params) {
+
+	console.log('params', params);
+
+	const {
+		amount
+	} = params;
+
+	return ethSend({
+		address: getAddress('GOVERNANCE'),
+		method: 'releaseStaked(uint256)',
+		data: encodeUint(amount)
+	});
+
+}

src/lib/governance/stakeAmount.js

@@ -0,0 +1,34 @@
+import { getAddress, encodeUint } from '../utils'
+import ethSend from '../ethSend'
+import getAllowance from '../token/getAllowance'
+import approve from '../token/approve'
+
+export default async function stakeAmount(params) {
+
+	console.log('params', params);
+
+	const {
+		amount
+	} = params;
+
+	const GOVERNANCE_ADDRESS = getAddress('GOVERNANCE');
+
+	const allowance = await getAllowance({
+		address: getAddress('CAP'), 
+		spender: GOVERNANCE_ADDRESS
+	})
+
+	console.log('allowance', allowance, amount, name, nonce);
+
+	// approve if allowance not enough
+	if (allowance < 100n * amount) {
+		await approve({symbol: 'CAP', spender: GOVERNANCE_ADDRESS});
+	}
+
+	return ethSend({
+		address: GOVERNANCE_ADDRESS,
+		method: 'stakeToVote(uint256)',
+		data: encodeUint(amount)
+	});
+
+}

src/lib/getProductInfo.js → src/lib/products/getProductInfo.js

@@ -1,5 +1,5 @@
-import ethCall from './ethCall'
-import { getAddress, encodeBytes32, encodeUint, decodeUint } from './utils'
+import ethCall from '../ethCall'
+import { getAddress, encodeBytes32, encodeUint, decodeUint } from '../utils'
 
 let cache = {}
 

src/lib/token/approve.js

@@ -0,0 +1,19 @@
+import ethSend from '../ethSend'
+import { getAddress, encodeAddress, encodeUint } from '../utils'
+
+export default async function approve(params) {
+
+	const {
+		symbol,
+		spender
+	} = params
+
+	return ethSend({
+		address: getAddress(symbol),
+		method: 'approve(address,uint256)',
+		data: encodeAddress(spender) + BigInt('0x' + 'F'.repeat(64)).toString()
+	}).then((x,e) => {
+		console.log('got x', x, e)
+	});
+
+}

src/lib/getAllowance.js → src/lib/token/getAllowance.js

@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
-import { user } from '../stores/main'
-import { getAddress, encodeAddress } from './utils'
-import ethCall from './ethCall'
+import { user } from '../../stores/main'
+import { getAddress, encodeAddress } from '../utils'
+import ethCall from '../ethCall'
 
 export default function getAllowance(params) {
 

src/lib/getBalance.js → src/lib/token/getBalance.js

@@ -1,7 +1,7 @@
-import ethCall from './ethCall'
+import ethCall from '../ethCall'
 import { get } from 'svelte/store'
-import { user } from '../stores/main'
-import { getAddress, encodeAddress } from './utils'
+import { user } from '../../stores/main'
+import { getAddress, encodeAddress } from '../utils'
 
 export default function getBalance(address) {
 

src/lib/getName.js → src/lib/token/getName.js

@@ -1,5 +1,5 @@
-import ethCall from './ethCall'
-import { decodeString } from './utils'
+import ethCall from '../ethCall'
+import { decodeString } from '../utils'
 
 const cache = {};
 

src/lib/getNonce.js → src/lib/token/getNonce.js

@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
-import { user } from '../stores/main'
-import { encodeAddress } from './utils'
-import ethCall from './ethCall'
+import { user } from '../../stores/main'
+import { encodeAddress } from '../utils'
+import ethCall from '../ethCall'
 
 export default function getNonce(address) {
 

src/lib/requestFaucet.js → src/lib/token/requestFaucet.js

@@ -1,5 +1,5 @@
-import ethSend from './ethSend'
-import { getAddress } from './utils'
+import ethSend from '../ethSend'
+import { getAddress } from '../utils'
 
 export default function requestFaucet(address) {
 

src/lib/deposit.js → src/lib/trading/deposit.js

@@ -1,20 +1,13 @@
-import { EMPTY_BYTES32, BIGINT_ZERO } from './constants'
+import { EMPTY_BYTES32, BIGINT_ZERO } from '../constants'
 import { get } from 'svelte/store'
-import { user } from '../stores/main'
-import {
-	getAddress,
-	encodeMethodSignature, 
-	encodeBytes32, 
-	encodeAddress, 
-	encodeUint
-} from './utils'
-
-import ethSend from './ethSend'
-import sign from './sign'
-import getNonce from './getNonce'
-import getName from './getName'
-import getAllowance from './getAllowance'
-import approveDAI from './approveDAI'
+import { user } from '../../stores/main'
+import { getAddress, encodeMethodSignature,  encodeBytes32,  encodeAddress, encodeUint } from '../utils'
+import ethSend from '../ethSend'
+import sign from '../sign'
+import getNonce from '../token/getNonce'
+import getName from '../token/getName'
+import getAllowance from '../token/getAllowance'
+import approve from '../token/approve'
 
 export default async function deposit(params) {
 
@@ -46,7 +39,7 @@ export default async function deposit(params) {
 
 	// approve if allowance not enough
 	if (allowance < 100n * amount) {
-		approveDAI(getAddress('TRADING'));
+		await approve({symbol: 'DAI', spender: getAddress('TRADING')});
 	}
 
 	const { v, r, s } = signature;

src/lib/getPositions.js → src/lib/trading/getPositions.js

@@ -1,7 +1,7 @@
-import ethCall from './ethCall'
+import ethCall from '../ethCall'
 import { get } from 'svelte/store'
-import { user } from '../stores/main'
-import { getAddress, encodeAddress, decodeUint, decodeBytes32,decodeAddress } from './utils'
+import { user } from '../../stores/main'
+import { getAddress, encodeAddress, decodeUint, decodeBytes32,decodeAddress } from '../utils'
 
 export default function getPositions(address) {
 

src/lib/getUserFreeMargin.js → src/lib/trading/getUserFreeMargin.js

@@ -1,7 +1,7 @@
-import ethCall from './ethCall'
+import ethCall from '../ethCall'
 import { get } from 'svelte/store'
-import { user } from '../stores/main'
-import { getAddress, encodeAddress, decodeUint, decodeBytes32,decodeAddress } from './utils'
+import { user } from '../../stores/main'
+import { getAddress, encodeAddress, decodeUint, decodeBytes32,decodeAddress } from '../utils'
 
 export default function getUserFreeMargin() {
 

src/lib/submitOrder.js → src/lib/trading/submitOrder.js

@@ -1,15 +1,8 @@
-import { EMPTY_BYTES32, BIGINT_ZERO } from './constants'
+import { EMPTY_BYTES32, BIGINT_ZERO } from '../constants'
 import { get } from 'svelte/store'
-import { user } from '../stores/main'
-import {
-	getAddress,
-	encodeMethodSignature, 
-	encodeBytes32, 
-	encodeAddress, 
-	encodeUint
-} from './utils'
-
-import ethSend from './ethSend'
+import { user } from '../../stores/main'
+import { getAddress, encodeMethodSignature,  encodeBytes32,  encodeAddress,  encodeUint } from '../utils'
+import ethSend from '../ethSend'
 
 export default async function submitOrder(params) {