Additional Fees feature

Makefile

@@ -0,0 +1,59 @@
+.PHONY: clean-cache
+clean-cache:
+	@rm -rf ./node_modules
+	@rm -rf ./packages/client/node_modules
+	@rm -rf ./packages/currency/node_modules
+	@rm -rf ./packages/elements/node_modules
+	@rm -rf ./packages/events/node_modules
+	@rm -rf ./packages/flags/node_modules
+	@rm -rf ./packages/intents/node_modules
+	@rm -rf ./packages/keys/node_modules
+	@rm -rf ./packages/kikcode/node_modules
+	@rm -rf ./packages/mnemonic/node_modules
+	@rm -rf ./packages/programs/node_modules
+	@rm -rf ./packages/proxy/node_modules
+	@rm -rf ./packages/rpc/node_modules
+	@rm -rf ./packages/views/node_modules
+	@rm -rf ./packages/web/node_modules
+
+.PHONY: clean-dist
+clean-dist:
+	@rm -rf ./packages/client/dist
+	@rm -rf ./packages/currency/dist
+	@rm -rf ./packages/elements/dist
+	@rm -rf ./packages/events/dist
+	@rm -rf ./packages/flags/dist
+	@rm -rf ./packages/intents/dist
+	@rm -rf ./packages/keys/dist
+	@rm -rf ./packages/kikcode/dist
+	@rm -rf ./packages/mnemonic/dist
+	@rm -rf ./packages/programs/dist
+	@rm -rf ./packages/proxy/dist
+	@rm -rf ./packages/rpc/dist
+	@rm -rf ./packages/views/dist
+	@rm -rf ./packages/web/dist
+
+
+.PHONY: build-sdk
+build-sdk: clean-dist
+	npm install --workspaces
+	cd packages/keys && npm run build && cd ../..
+	cd packages/mnemonic && npm run build && cd ../..
+	cd packages/currency && npm run build && cd ../..
+	cd packages/flags && npm run build && cd ../..
+	cd packages/rpc && npm run build && cd ../..
+	cd packages/kikcode && npm run build && cd ../..
+	cd packages/programs && npm run build && cd ../..
+	cd packages/intents && npm run build && cd ../..
+	cd packages/events && npm run build && cd ../..
+	cd packages/client && npm run build && cd ../..
+	cd packages/elements && npm run build && cd ../..
+	cd packages/views && npm run build && cd ../..
+	cd packages/web && npm run build && cd ../..
+	cd packages/proxy && npm run build && cd ../..
+
+.PHONY: build
+build: build-sdk
+
+.PHONY: clean
+clean: clean-cache clean-dist

examples/4-minimal-with-webhook/package.json

@@ -12,7 +12,7 @@
   "license": "ISC",
   "dependencies": {
     "@code-wallet/client": "^2.0.7",
-    "@code-wallet/library": "^1.3.3",
+    "@code-wallet/keys": "^1.0.0",
     "body-parser": "^1.20.2",
     "ejs": "^3.1.9",
     "express": "^4.18.2",

examples/4-minimal-with-webhook/server.js

@@ -1,7 +1,7 @@
 import express from "express";
 import bodyParser from "body-parser";
 import { jwtVerify, importJWK } from 'jose';
-import { PublicKey } from "@code-wallet/library";
+import { PublicKey } from "@code-wallet/keys";
 import * as code from "@code-wallet/client";
 
 const port = 3030;

examples/5-example-purchase-flow/package.json

@@ -12,7 +12,7 @@
   "license": "ISC",
   "dependencies": {
     "@code-wallet/client": "^2.0.2",
-    "@code-wallet/library": "^1.3.1",
+    "@code-wallet/currency": "^1.0.0",
     "@markdoc/markdoc": "^0.3.2",
     "body-parser": "^1.20.2",
     "dotenv": "^16.3.1",

examples/5-example-purchase-flow/src/models/articles.ts

@@ -1,4 +1,4 @@
-import { CurrencyCode } from '@code-wallet/library';
+import { CurrencyCode } from '@code-wallet/currency';
 
 const defaultCurrency: CurrencyCode = 'usd';
 const defaultPrice = 0.25;

examples/5-example-purchase-flow/src/utils/jwt.ts

@@ -1,5 +1,5 @@
 import { jwtVerify } from 'jose';
-import { PublicKey } from '@code-wallet/library';
+import { PublicKey } from '@code-wallet/keys';
 import { createPublicKey } from 'crypto';
 
 export async function verifyToken(token: string, publicKey: string) {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@code-wallet/client",
-    "version": "2.0.7",
+    "version": "2.0.8",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -23,7 +23,8 @@
         "maintained node versions"
     ],
     "dependencies": {
-        "@code-wallet/library": "^1.3.2",
+        "@code-wallet/keys": "^1.0.0",
+        "@code-wallet/intents": "^1.0.0",
         "@code-wallet/rpc": "^1.3.1",
         "bs58": "^5.0.0",
         "buffer": "6.0.3"

packages/client/src/intents/login.ts

@@ -4,7 +4,7 @@ import {
     LoginRequestOptions,
     WebhookParams,
     LoginRequestIntent,
-} from "@code-wallet/library";
+} from "@code-wallet/intents";
 
 import { useClient } from "../utils/useClient";
 import { createIntent } from "../utils/createIntent";

packages/client/src/intents/payments.ts

@@ -7,7 +7,7 @@ import {
     LoginRequestOptions,
     WebhookParams,
     Intent,
-} from "@code-wallet/library";
+} from "@code-wallet/intents";
 
 import { useClient } from "../utils/useClient";
 import { createIntent } from "../utils/createIntent";
@@ -52,7 +52,7 @@ const paymentIntents = {
 
         let intent : Intent;
         if (opt.login) {
-            intent = new PaymentRequestWithLoginIntent(opt);
+            intent = new PaymentRequestWithLoginIntent(opt as CreatePaymentIntentOptions & LoginRequestOptions);
         } else {
             intent = new PaymentRequestIntent(opt);
         }

packages/client/src/requests/getStatus.ts

@@ -1,5 +1,5 @@
 import * as proto from "@code-wallet/rpc";
-import { PublicKey, } from "@code-wallet/library";
+import { PublicKey } from "@code-wallet/keys";
 import { CodeRequest } from "../request";
 import { Client } from "../client";
 

packages/client/src/requests/getUserId.ts

@@ -1,5 +1,5 @@
 import * as proto from "@code-wallet/rpc";
-import { Keypair, PublicKey, } from "@code-wallet/library";
+import { Keypair, PublicKey, } from "@code-wallet/keys";
 import { CodeRequest, } from "../request";
 import { Client } from "../client";
 import { ErrSignerRequired } from "../errors";

packages/client/src/requests/registerWebhook.ts

@@ -1,5 +1,5 @@
 import * as proto from "@code-wallet/rpc";
-import { PublicKey, } from "@code-wallet/library";
+import { PublicKey, } from "@code-wallet/keys";
 import { CodeRequest } from "../request";
 import { Client } from "../client";
 

packages/client/src/utils/createIntent.ts

@@ -1,5 +1,5 @@
 import { Client } from "../client";
-import { Intent, } from "@code-wallet/library";
+import { Intent, } from "@code-wallet/intents";
 import * as proto from "@code-wallet/rpc";
 import { ErrUnexpectedError } from "../errors";
 

packages/client/test/client.test.ts

@@ -1,8 +1,8 @@
+import { PublicKey } from "@code-wallet/keys";
 import * as proto from "@code-wallet/rpc";
 import * as client from "../src/";
 
 import { Client } from "../src/";
-import { PublicKey } from "@code-wallet/library";
 import { expect } from 'chai';
 
 describe('Low level client', () => {

packages/currency/README.md

@@ -0,0 +1,23 @@
+[![npm][npm-image]][npm-url]
+[![npm-downloads][npm-downloads-image]][npm-url]
+
+[npm-downloads-image]: https://img.shields.io/npm/dt/@code-wallet/currency?style=flat
+[npm-image]: https://img.shields.io/npm/v/@code-wallet/currency?style=flat
+[npm-url]: https://www.npmjs.com/package/@code-wallet/currency
+
+# @code-wallet/currency
+Handle operations and conversions related to different currencies, with a
+particular focus on the Kin cryptocurrency. This is an internal toolkit designed
+to support the core functionalities of the Code SDK. 
+
+Learn more about Code at https://getcode.com. See the [docs](https://code-wallet.github.io/code-sdk/docs) for more information.
+
+## Getting Started
+As an internal package, `@code-wallet/currency` is tailored for developers within
+the Code team. For detailed information on each module and its functionalities,
+please refer to the [documentation](https://code-wallet.github.io/code-sdk).
+
+## Need Help?
+If you have any questions or need help integrating Code into your website or
+application, please reach out to us on [Discord](https://discord.gg/T8Tpj8DBFp) or
+[Twitter](https://twitter.com/getcode).

packages/currency/package.json

@@ -0,0 +1,38 @@
+{
+    "name": "@code-wallet/currency",
+    "version": "1.0.0",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/code-payments/code-sdk.git"
+    },
+    "source": "src/index.ts",
+    "main": "dist/cjs/index.js",
+    "module": "dist/esm/index.js",
+    "types": "dist/esm/index.d.ts",
+    "files": [
+        "./dist/"
+    ],
+    "scripts": {
+        "test": "TS_NODE_COMPILER_OPTIONS='{ \"module\": \"commonjs\", \"target\": \"es2019\" }' ts-mocha --require esm './test/**/*.test.ts'",
+        "clean": "rm -rf ./dist",
+        "build": "npm run clean && tsc && tsc -p tsconfig.cjs.json"
+    },
+    "browserslist": [
+        "supports bigint and not dead",
+        "maintained node versions"
+    ],
+    "dependencies": {
+        "@code-wallet/keys": "^1.0.0"
+    },
+    "devDependencies": {
+        "@types/chai": "^4.3.5",
+        "@types/mocha": "^10.0.1",
+        "@types/node": "^20.5.7",
+        "chai": "^4.3.8",
+        "ts-mocha": "^10.0.0",
+        "ts-node": "^10.9.1",
+        "typescript": "^5.1.6",
+        "esm": "^3.2.25"
+    }
+}

packages/currency/src/errors.ts

@@ -0,0 +1,7 @@
+const ErrCurrencyRequired = () => new Error("currency is required");
+const ErrInvalidCurrency = () => new Error("invalid currency");
+
+export {
+    ErrCurrencyRequired,
+    ErrInvalidCurrency,
+};

packages/currency/src/index.ts

@@ -0,0 +1,4 @@
+export * from './errors';
+export * from './types';
+export * from './utils';
+export * from './mints/kin';

packages/library/src/kin.ts → packages/currency/src/mints/kin.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from './keys';
+import { PublicKey } from '@code-wallet/keys';
 
 /**
  * Represents the Kin cryptocurrency with operations to handle whole and fractional units.

packages/currency/src/types.ts

@@ -0,0 +1,23 @@
+/**
+ * Represents a currency code.
+ */
+export type CurrencyCode = 
+// Crypto
+    "kin" |
+// Fiat
+    "aed" | "afn" | "all" | "amd" | "ang" | "aoa" | "ars" | "aud" | "awg" | "azn" |
+    "bam" | "bbd" | "bdt" | "bgn" | "bhd" | "bif" | "bmd" | "bnd" | "bob" | "brl" |
+    "bsd" | "btn" | "bwp" | "byn" | "bzd" | "cad" | "cdf" | "chf" | "clp" | "cny" |
+    "cop" | "crc" | "cup" | "cve" | "czk" | "djf" | "dkk" | "dop" | "dzd" | "egp" |
+    "ern" | "etb" | "eur" | "fjd" | "fkp" | "gbp" | "gel" | "ghs" | "gip" | "gmd" |
+    "gnf" | "gtq" | "gyd" | "hkd" | "hnl" | "hrk" | "htg" | "huf" | "idr" | "ils" |
+    "inr" | "iqd" | "irr" | "isk" | "jmd" | "jod" | "jpy" | "kes" | "kgs" | "khr" |
+    "kmf" | "kpw" | "krw" | "kwd" | "kyd" | "kzt" | "lak" | "lbp" | "lkr" | "lrd" |
+    "lyd" | "mad" | "mdl" | "mga" | "mkd" | "mmk" | "mnt" | "mop" | "mru" | "mur" |
+    "mvr" | "mwk" | "mxn" | "myr" | "mzn" | "nad" | "ngn" | "nio" | "nok" | "npr" |
+    "nzd" | "omr" | "pab" | "pen" | "pgk" | "php" | "pkr" | "pln" | "pyg" | "qar" |
+    "ron" | "rsd" | "rub" | "rwf" | "sar" | "sbd" | "scr" | "sdg" | "sek" | "sgd" |
+    "shp" | "sll" | "sos" | "srd" | "ssp" | "stn" | "syp" | "szl" | "thb" | "tjs" |
+    "tmt" | "tnd" | "top" | "try" | "ttd" | "twd" | "tzs" | "uah" | "ugx" | "usd" |
+    "uyu" | "uzs" | "ves" | "vnd" | "vuv" | "wst" | "xaf" | "xcd" | "xof" | "xpf" |
+    "yer" | "zar" | "zmw";

packages/library/src/currency.ts → packages/currency/src/utils.ts

@@ -1,28 +1,5 @@
 import { ErrInvalidCurrency } from "./errors";
-
-/**
- * Represents a currency code.
- */
-export type CurrencyCode = 
-// Crypto
-    "kin" |
-// Fiat
-    "aed" | "afn" | "all" | "amd" | "ang" | "aoa" | "ars" | "aud" | "awg" | "azn" |
-    "bam" | "bbd" | "bdt" | "bgn" | "bhd" | "bif" | "bmd" | "bnd" | "bob" | "brl" |
-    "bsd" | "btn" | "bwp" | "byn" | "bzd" | "cad" | "cdf" | "chf" | "clp" | "cny" |
-    "cop" | "crc" | "cup" | "cve" | "czk" | "djf" | "dkk" | "dop" | "dzd" | "egp" |
-    "ern" | "etb" | "eur" | "fjd" | "fkp" | "gbp" | "gel" | "ghs" | "gip" | "gmd" |
-    "gnf" | "gtq" | "gyd" | "hkd" | "hnl" | "hrk" | "htg" | "huf" | "idr" | "ils" |
-    "inr" | "iqd" | "irr" | "isk" | "jmd" | "jod" | "jpy" | "kes" | "kgs" | "khr" |
-    "kmf" | "kpw" | "krw" | "kwd" | "kyd" | "kzt" | "lak" | "lbp" | "lkr" | "lrd" |
-    "lyd" | "mad" | "mdl" | "mga" | "mkd" | "mmk" | "mnt" | "mop" | "mru" | "mur" |
-    "mvr" | "mwk" | "mxn" | "myr" | "mzn" | "nad" | "ngn" | "nio" | "nok" | "npr" |
-    "nzd" | "omr" | "pab" | "pen" | "pgk" | "php" | "pkr" | "pln" | "pyg" | "qar" |
-    "ron" | "rsd" | "rub" | "rwf" | "sar" | "sbd" | "scr" | "sdg" | "sek" | "sgd" |
-    "shp" | "sll" | "sos" | "srd" | "ssp" | "stn" | "syp" | "szl" | "thb" | "tjs" |
-    "tmt" | "tnd" | "top" | "try" | "ttd" | "twd" | "tzs" | "uah" | "ugx" | "usd" |
-    "uyu" | "uzs" | "ves" | "vnd" | "vuv" | "wst" | "xaf" | "xcd" | "xof" | "xpf" |
-    "yer" | "zar" | "zmw";
+import { CurrencyCode } from "./types";
 
 /**
  * Index of currency codes in the lookup table.

packages/elements/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@code-wallet/elements",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -26,7 +26,7 @@
     ],
     "dependencies": {
         "@code-wallet/events": "^1.4.0",
-        "@code-wallet/library": "^1.3.3",
+        "@code-wallet/intents": "^1.0.0",
         "@code-wallet/client": "^2.0.6",
         "@code-wallet/rpc": "^1.3.1",
         "vue": "^3.2.45"

packages/elements/src/components/elements/IntentRequestButton.vue

@@ -2,7 +2,7 @@
     import { inject, onMounted, ref } from 'vue';
     import { useConfig } from '../../config';
     import { EventChannel, InternalButtonEvents, InternalElementEvents } from '@code-wallet/events';
-    import { ElementOptions, encode } from '@code-wallet/library';
+    import { ElementOptions, encode } from '@code-wallet/intents';
 
     const config = useConfig();
     const options = inject<ElementOptions>('options');

packages/elements/src/components/elements/IntentRequestModalDesktop.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
     import { EventChannel, InternalEvents } from '@code-wallet/events';
-    import { ElementOptions, encode } from '@code-wallet/library';
+    import { ElementOptions, encode } from '@code-wallet/intents';
     import { useConfig } from '../../config';
     import { inject, onMounted, ref, watchEffect } from 'vue';
 

packages/elements/src/components/elements/IntentRequestModalMobile.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
     import { EventChannel, InternalEvents } from '@code-wallet/events';
-    import { ElementOptions, encode } from '@code-wallet/library';
+    import { ElementOptions, encode } from '@code-wallet/intents';
     import { useConfig } from '../../config';
     import { inject, onMounted, ref, watchEffect } from 'vue';
 

packages/elements/src/components/flows/ButtonFlow.vue

@@ -4,8 +4,10 @@ import {
   ElementEventEmitter, 
   ElementOptions, 
   LoginRequestIntent, 
-  PaymentRequestIntent
-} from '@code-wallet/library';
+  LoginRequestOptions, 
+  PaymentRequestIntent,
+PaymentRequestOptions
+} from '@code-wallet/intents';
 import { EventChannel, InternalEvents } from '@code-wallet/events';
 import * as code from "@code-wallet/client";
 
@@ -76,9 +78,9 @@ async function onInvoke() {
 
   // Get the intent id from the receiving app or iframe
   if (options.mode === 'payment') {
-    intent.value = new PaymentRequestIntent(options).getIntentId();
+    intent.value = new PaymentRequestIntent(options as ElementOptions & PaymentRequestOptions).getIntentId();
   } else {
-    intent.value = new LoginRequestIntent(options).getIntentId();
+    intent.value = new LoginRequestIntent(options as ElementOptions & LoginRequestOptions).getIntentId();
   }
 
   const variables = {

packages/elements/src/components/preload/PreloadIntentRequestModalDesktop.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-    import { ElementOptions, encode } from '@code-wallet/library';
+    import { ElementOptions, encode } from '@code-wallet/intents';
     import { useConfig } from '../../config';
     import { inject, ref } from 'vue';